gentoo resync : 14.05.2020

4 files changed, 93 insertions, 1 deletions

diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index e8f42fa1e193..8a0ea5305f00 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1,5 +1,7 @@
 AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b605f0072a15af174f8462f1983833d1314eb3b7dc7763af60f32e6baa054ad00abf4ca4a10a7ae88b59415ab8ea9de3cb674ccf67 SHA512 6415da74c4f6f203bc4ad617bd05fa6ac86e1079538236148763e0b5e81ca8ea4004ea58e9e4755ba371246a7c469ef1e421576260494043d3ce3fc80e73cf69
+AUX sharutils-4.15.2-gcc-10.patch 1048 BLAKE2B 4148ca1ffd1fd5469234a0af1efefa38f179a19527fc18b4df638d63a3d128f4f2f3934b94e3c862a515555199d16da4d59a508cc4aab1d097aa6e390967be2a SHA512 75fcd9ea81d1d8c63eee8525aac8eeeaa4c8caebf223670951489f0869dc50f0af84b647443df60927f184a89659c44c91c6f6a7ce12b874821037322ce079ae
 AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
-EBUILD sharutils-4.15.2-r1.ebuild 1048 BLAKE2B 32c50ea346aa801e50081c4291fe6a4d2eaaf248abb7e4017d64d8e17a7063a877656e2854dfc5781b6896f12d77aa646355efc4fb6dc1d96d6b27e8dc584df7 SHA512 0f52dd9e622e3900b9198b9ec248b3c32b041a86dbcee63e5e99ddf4c0c76bda5cdfffcf59def0438f2a6dfaf094fdb27ccc411e7e09ab681f166f99cb7f0f60
+EBUILD sharutils-4.15.2-r1.ebuild 1100 BLAKE2B d3ca42174d648e988149f4d00df6772c3d530696414ed40ab195419a48c570af871f9a1f97139ff6b62c2d8b11b1d2e03da48db162852fc87b8c19073e7b0cfa SHA512 2b8bfba8fa8c430f8eb948e844629fd4916588c278eebbbfcd6387a617dac17a2d0c77c89bbbcb2e3162825d240966c5f2e43c9a3fd2308aae6889a13b5094f6
+EBUILD sharutils-4.15.2-r2.ebuild 1088 BLAKE2B fe83829e4a3d8fd938d2c2fd3d1773705b9cb673c501a1faf015f7aa701da0bc48c373b0de14085118d55b159a1149815275c9a11f8ffd4bbd1fe48e840f02f3 SHA512 74bc3c664e0dcdc5b5b1b6710dfb1ff2ec35fa2a97f4dc1c00591f2cec3cd897ad60d6fdffa751028e2a8b350df7b3f34314642431eeb4f634b922275f9c7e92
 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/files/sharutils-4.15.2-gcc-10.patch b/app-arch/sharutils/files/sharutils-4.15.2-gcc-10.patch
new file mode 100644
index 000000000000..4a0c02f5ba9b
--- /dev/null
+++ b/app-arch/sharutils/files/sharutils-4.15.2-gcc-10.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/706256
+
+Fix build failure on gcc-10/-fno-common.
+
+--- a/src/shar-opts.h
++++ b/src/shar-opts.h
+@@ -352,7 +352,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ extern bool initialization_done;
+ extern int optidx;
+--- a/src/unshar-opts.h
++++ b/src/unshar-opts.h
+@@ -192,7 +192,7 @@ extern "C" {
+ extern size_t       separator_str_len;
+ 
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+--- a/src/uudecode-opts.h
++++ b/src/uudecode-opts.h
+@@ -170,7 +170,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+--- a/src/uuencode-opts.h
++++ b/src/uuencode-opts.h
+@@ -166,7 +166,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
index dc4356b4ead7..00e6532922b5 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
@@ -26,6 +26,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/sharutils-4.15.2-glibc228.patch"
 	epatch "${FILESDIR}/sharutils-4.15.2-CVE-2018-1000097.patch"
+	epatch "${FILESDIR}/sharutils-4.15.2-gcc-10.patch"
 
 	# Upstream is aware but thinks this isn't a bug/problem in sharutils itself
 	# See http://lists.gnu.org/archive/html/bug-gnu-utils/2013-10/msg00011.html
diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
new file mode 100644
index 000000000000..2aaa0c101dea
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils flag-o-matic
+
+MY_P="${P/_/-}"
+DESCRIPTION="Tools to deal with shar archives"
+HOMEPAGE="https://www.gnu.org/software/sharutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.2-glibc228.patch
+	"${FILESDIR}"/${PN}-4.15.2-CVE-2018-1000097.patch
+	"${FILESDIR}"/${PN}-4.15.2-gcc-10.patch
+)
+
+src_prepare() {
+	default
+
+	# Upstream is aware but thinks this isn't a bug/problem in sharutils itself
+	# See http://lists.gnu.org/archive/html/bug-gnu-utils/2013-10/msg00011.html
+	append-cflags $(test-flags-CC -Wno-error=format-security)
+}
+
+src_configure() {
+	strip-linguas -u po
+	econf $(use_enable nls)
+}