2 files changed, 2 insertions, 43 deletions

diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch b/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch
deleted file mode 100644
index 44a835c35f..0000000000
--- a/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From da5338e68f146efadab7c221291ba4c949d8f12f Mon Sep 17 00:00:00 2001
-From: Vaclav Haisman <vhaisman@gmail.com>
-Date: Sun, 21 Jul 2019 23:23:16 -0700
-Subject: [PATCH] Remove log4cplus version entry from ELF .comment section
-
-Reverts
-https://github.com/log4cplus/log4cplus/commit/9cb0d4ade619da4e40628c9b95ff51de3df29f1b
-
-Upstream-Status: Backport [https://github.com/log4cplus/log4cplus/commit/7e6addc70dffd2e30e902efd18eb845c5d5dd7bb]
-
-Suggested-by: Adrian Bunk <bunk@stusta.de>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/version.cxx | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/src/version.cxx b/src/version.cxx
-index ce18212..e002de9 100644
---- a/src/version.cxx
-+++ b/src/version.cxx
-@@ -34,16 +34,4 @@ namespace log4cplus
- unsigned const version = LOG4CPLUS_VERSION;
- char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX;
- 
--namespace
--{
--
--#if defined (__ELF__) && (defined (__GNUC__) || defined (__clang__))
--char const versionStrComment[]
--    __attribute__ ((__used__, __section__ ((".comment"))))
--    = "log4cplus " LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX;
--#endif
--
--
--} // namespace
--
- } // namespace log4cplus
--- 
-2.22.0
-
diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb
index 566de28535..967ac7623a 100644
--- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb
+++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb
@@ -7,10 +7,9 @@ LICENSE = "Apache-2.0 & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \
-           file://0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch \
           "
-SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2"
-SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a"
+SRC_URI[md5sum] = "71dd956bf686195127559671f1426cff"
+SRC_URI[sha256sum] = "c07115c23219390633798def30b7b51a0f79fdeb857e4b49632f17746d0ceb97"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/"
 UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/"