Skip to contentSkip to conversation

package/log4cxx: bump to version 0.11.0

PATCH New Fabrice Fontaine 2 participants 2 messages Sep 21, 2020 – Sep 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/log4cxx: bump to version 0.11.0

- Retrieve sha512 from upstream
- Drop first patch (not needed since
https://github.com/apache/logging-log4cxx/commit/33ca357ea075fabf74d50b2a2c8420ae39a8b453)
- Drop second patch (already in version:
https://github.com/apache/logging-log4cxx/commit/1f6bf7e11963849f44e65ed32eb8e2fea35e2065)
- Drop third patch (already in version:
https://github.com/apache/logging-log4cxx/commit/0319bfa7f64048efeff954e4c5da055711b28ce4)
- Drop fourth patch (already in version:
https://github.com/apache/logging-log4cxx/commit/3d96b34921913aed39b61b7c617bda285889887c)
- Drop fifth patch (not needed since
https://github.com/apache/logging-log4cxx/commit/d6776be8f280914982c4f0d6ad979607e91fb89a)
- Add LOG4CXX_AUTORECONF = YES as running the bundled configure fails during the build step on:
configure.ac:47: error: required file './compile' not found
configure.ac:47: 'automake --add-missing' can install 'compile'

https://logging.apache.org/log4cxx/latest_stable/changes-report.html#a0.11.0

---
 package/log4cxx/0001-charset-fixes.patch      |  43 -----
 package/log4cxx/0002-missing-includes.patch   |  44 -----
 package/log4cxx/0003-missing-includes.patch   |  21 --
 ...r-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch | 180 ------------------
 ...fix-narrowing-conversion-compile-err.patch |  36 ----
 package/log4cxx/log4cxx.hash                  |   4 +-
 package/log4cxx/log4cxx.mk                    |   4 +-
 7 files changed, 5 insertions(+), 327 deletions(-)
 delete mode 100644 package/log4cxx/0001-charset-fixes.patch
 delete mode 100644 package/log4cxx/0002-missing-includes.patch
 delete mode 100644 package/log4cxx/0003-missing-includes.patch
 delete mode 100644 package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch
 delete mode 100644 package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch
package/log4cxx/0001-charset-fixes.patch deleted +0 -43
deleted file mode 100644
index 75567fdad1..0000000000
@@ -1,43 +0,0 @@
-Fix build when iconv support is not available
-
-When iconv support is not available, the apr-util library does not
-provide character set conversion features, and therefore APR_HAS_XLATE
-is false.
-
-However, on Linux !defined(_WIN32) is always true, but the part of the
-code that defines the APRCharsetDecoder and APRCharsetEncoder are only
-enclosed in a #if APR_HAS_XLATE, without the "|| defined(_WIN32)"
-which leads to build failures: the APRCharsetEncoder and
-APRCharsetDecoder classes are used without being defined.
-
-This patch removes the || !defined(_WIN32) so that when iconv support
-is not here, we fall back to raising an exception at runtime.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/src/main/cpp/charsetdecoder.cpp
-===================================================================
---- a/src/main/cpp/charsetdecoder.cpp
-+++ b/src/main/cpp/charsetdecoder.cpp
-@@ -476,7 +476,7 @@
-         StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("ISO-LATIN-1"), LOG4CXX_STR("iso-latin-1"))) {
-         return new ISOLatinCharsetDecoder();
-     }
--#if APR_HAS_XLATE || !defined(_WIN32)
-+#if APR_HAS_XLATE
-     return new APRCharsetDecoder(charset);
- #else    
-     throw IllegalArgumentException(charset);
-Index: b/src/main/cpp/charsetencoder.cpp
-===================================================================
---- a/src/main/cpp/charsetencoder.cpp
-+++ b/src/main/cpp/charsetencoder.cpp
-@@ -484,7 +484,7 @@
-     } else if (StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("UTF-16LE"), LOG4CXX_STR("utf-16le"))) {
-         return new UTF16LECharsetEncoder();
-     }
--#if APR_HAS_XLATE || !defined(_WIN32)
-+#if APR_HAS_XLATE
-     return new APRCharsetEncoder(charset);
- #else    
-     throw IllegalArgumentException(charset);
package/log4cxx/0002-missing-includes.patch deleted +0 -44

44 lines not on this page · raw message

package/log4cxx/0003-missing-includes.patch deleted +0 -21
deleted file mode 100644
index cd21bbab3e..0000000000
@@ -1,21 +0,0 @@
-commit ce62c00ea5f9bf2f0740ecde5b245c9b7edc80ff
-Author: Curtis William Arnold <[email protected]>
-Date:   Mon Apr 27 03:53:50 2009 +0000
-
-    LOGCXX-332: fails to build with gcc 4.4
-    
-    git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk at 768863 13f79535-47bb-0310-9956-ffa450edef68
-
-diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
-index a673a10..f44c944 100755
---- a/src/examples/cpp/console.cpp
-+++ b/src/examples/cpp/console.cpp
-@@ -23,6 +23,8 @@
- #include <iostream>
- #include <locale.h>
- #include <cstring>
-+#include <cstdio>
-+#include <stdint.h>
- 
- using namespace log4cxx;
- using namespace log4cxx::helpers;
package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch deleted +0 -180

180 lines not on this page · raw message

package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch deleted +0 -36
deleted file mode 100644
index b3f43bfd7c..0000000000
@@ -1,36 +0,0 @@
-From afc191aec355619d6ebabb2cad660a5a8ad4569b Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Mon, 30 Jan 2017 23:13:43 +0100
-Subject: [PATCH] domtestcase.cpp: fix narrowing conversion compile error with
- gcc 6+ / signed char
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/test/cpp/xml/domtestcase.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp
-index ad276d1a..2a1e6e2e 100644
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@ public:
-                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
-                 LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3")
- #if LOG4CXX_LOGCHAR_IS_UTF8
--                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xC2), static_cast<logchar>(0xB3), 0 };
- #else
-                 const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@ public:
-                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
-                 LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4")
- #if LOG4CXX_LOGCHAR_IS_UTF8
--                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xE3), static_cast<logchar>(0x86), static_cast<logchar>(0x95), 0 };
- #else
-                 const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
--- 
-2.11.0
-
package/log4cxx/log4cxx.hash +2 -2
index 90fa2e73d3..535a0c4aac 100644
@@ -1,4 +1,4 @@
-# Locally calculated after checking pgp signature
-sha256  0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c  apache-log4cxx-0.10.0.tar.gz
+# From https://www.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz.sha512
+sha512  f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd  apache-log4cxx-0.11.0.tar.gz
 # Locally computed
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
package/log4cxx/log4cxx.mk +3 -1
index 7d7e2e9bb2..0ddea9466a 100644
@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-LOG4CXX_VERSION = 0.10.0
+LOG4CXX_VERSION = 0.11.0
 LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
 LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
 LOG4CXX_INSTALL_STAGING = YES
 LOG4CXX_LICENSE = Apache-2.0
 LOG4CXX_LICENSE_FILES = LICENSE
+# error: required file './compile' not found
+LOG4CXX_AUTORECONF = YES
 
 LOG4CXX_CONF_OPTS = \
 	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/log4cxx: bump to version 0.11.0

Quoted 19 lines · On Mon, 21 Sep 2020 23:31:43 +0200 Fabrice Fontaine…

- Retrieve sha512 from upstream
- Drop first patch (not needed since
https://github.com/apache/logging-log4cxx/commit/33ca357ea075fabf74d50b2a2c8420ae39a8b453)
- Drop second patch (already in version:
https://github.com/apache/logging-log4cxx/commit/1f6bf7e11963849f44e65ed32eb8e2fea35e2065)
- Drop third patch (already in version:
https://github.com/apache/logging-log4cxx/commit/0319bfa7f64048efeff954e4c5da055711b28ce4)
- Drop fourth patch (already in version:
https://github.com/apache/logging-log4cxx/commit/3d96b34921913aed39b61b7c617bda285889887c)
- Drop fifth patch (not needed since
https://github.com/apache/logging-log4cxx/commit/d6776be8f280914982c4f0d6ad979607e91fb89a)
- Add LOG4CXX_AUTORECONF = YES as running the bundled configure fails during the build step on:
configure.ac:47: error: required file './compile' not found
configure.ac:47: 'automake --add-missing' can install 'compile'

https://logging.apache.org/log4cxx/latest_stable/changes-report.html#a0.11.0

Quoted 14 lines
---
 package/log4cxx/0001-charset-fixes.patch      |  43 -----
 package/log4cxx/0002-missing-includes.patch   |  44 -----
 package/log4cxx/0003-missing-includes.patch   |  21 --
 ...r-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch | 180 ------------------
 ...fix-narrowing-conversion-compile-err.patch |  36 ----
 package/log4cxx/log4cxx.hash                  |   4 +-
 package/log4cxx/log4cxx.mk                    |   4 +-
 7 files changed, 5 insertions(+), 327 deletions(-)
 delete mode 100644 package/log4cxx/0001-charset-fixes.patch
 delete mode 100644 package/log4cxx/0002-missing-includes.patch
 delete mode 100644 package/log4cxx/0003-missing-includes.patch
 delete mode 100644 package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch
 delete mode 100644 package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com