gentoo resync : 30.12.2017

4 files changed, 83 insertions, 17 deletions

diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
index b99c7ba7e181..ab1d11f64299 100644
--- a/app-arch/unarj/Manifest
+++ b/app-arch/unarj/Manifest
@@ -1,6 +1,7 @@
 AUX unarj-2.65-CAN-2004-0947.patch 1523 BLAKE2B f746d4a06119c6c8b926e208d122dc54338706f13534badbdf66edae0bbe6551afdca0de235553812fb258db4f55029ad54832f5625cd1e5e8c1595e2af06e88 SHA512 714580c0602b12013ca39fc3850298c1fe11d48ac156a5883a3d7b0c5a8adabd96d85963e5e4500df82ebc9300366d437be0f67bf6577739da9ce880eaa44b85
-AUX unarj-2.65-gentoo-fbsd.patch 220 BLAKE2B 5252a5138452497709b6fc72690a55d2372ac5788126327416b2a1ffc18c684c3b8a01bea3ef36c01f43ee955d2614c9a2710e00a5d3d42c4a52fa6325331b8e SHA512 4f6949bb8c65d9cf86846cf57c6e51ef13d6d419a76b19e90ed39c776e08e3ca212ec731f13d3f209d979239a7a3302bbbdeff36af3962ac6841d2829691a6bd
+AUX unarj-2.65-Wformat-security.patch 1303 BLAKE2B c13a77846264f9e5e8ab552179d005ead44e5c4418a58206cea3d00a2f3470b5176c82558a0ad2e1765c9a3d14760e941324af3057de9cf21f6d2c6191442600 SHA512 498386e182976b97f46614b73d345836b60440236b71d41bedd9b7671331d98dd485554eb93353055ae5d93619a8eeed0dc84a558cafb1c84188cb5fc865415e
+AUX unarj-2.65-gentoo-fbsd.patch 168 BLAKE2B db8ad647f7666cc2e0032b35f5cfc36d63a38f918e4424681778f8d3ad599a1356c4c0733c35d4140618a311b8e07da61b035d7ff391efec1f1ae6fea7de9a78 SHA512 fc3d42d7ee9b38e871938c159398e773102e9d83896393f074f0cf02b4619d6d663668cea50d84d04b1372b7b5d4f6e46db36345123a65750b545416ef7f2eb2
 AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
 DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
-EBUILD unarj-2.65.ebuild 783 BLAKE2B b11a53d890bab3fbe13b5a4c30390e77672064d24a378e87e3d2aacf497fca815f7184448fae454c4b89b911c67fe22eb664dd7fa95e59664b14a3e42e8e828f SHA512 bd42993bc7a866dddc7822c269d8bd64952bf4e5291b777e522668a4a44e374bec204ba2e66989805a403be1bfbf0a40337234e7f0631d264a6def4e72c4f0c7
+EBUILD unarj-2.65.ebuild 726 BLAKE2B 9d30c053d0671c7b804734afbea557a7f1c86213c3bce1d5d29b44371cb81408d45d52e0acadab67280e9cec5381c4a94fc227edabfa5585beedc3a9a68cf8d5 SHA512 171e05906682922bd79516ab32a628a6e7fbe3229b370cbe16c616d5ae29cd47eb04182712d55329d7c6d443d43d745a5cf5e58ea0d8a091f541a68c49b7561c
 MISC metadata.xml 515 BLAKE2B ef334f1e25735b01d99508a442cd6e2e1d499449bf52c0e408b0cbeec374f96dc388781228a6a63ef536a4751d8130e17aec005d4261234a52cd3e6d909cdf32 SHA512 72e4397504e316cca89b760d909cf151146f122e349283d4509f40036eee1272008ca8cfa2f2dc4b4204ecd450e6135f9ca1ffd8670aef6cda29d0865a61907e
diff --git a/app-arch/unarj/files/unarj-2.65-Wformat-security.patch b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
new file mode 100644
index 000000000000..a076dd91f13d
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
@@ -0,0 +1,66 @@
+Bug: https://bugs.gentoo.org/520478
+
+--- a/unarj.c
++++ b/unarj.c
+@@ -699,7 +699,7 @@
+     }
+     if ((arj_flags & GARBLE_FLAG) != 0)
+     {
+-        printf(M_ENCRYPT);
++        puts(M_ENCRYPT);
+         printf(M_SKIPPED, filename);
+         skip();
+         return -1;
+@@ -763,7 +763,7 @@
+     }
+     printf(M_EXTRACT, name);
+     if (host_os != OS && file_type == BINARY_TYPE)
+-        printf(M_DIFFHOST);
++        puts(M_DIFFHOST);
+     printf("  ");
+ 
+     crc = CRC_MASK;
+@@ -779,10 +779,10 @@
+     set_ftime_mode(name, time_stamp, file_mode, (uint) host_os);
+ 
+     if ((crc ^ CRC_MASK) == file_crc)
+-        printf(M_CRCOK);
++        puts(M_CRCOK);
+     else
+     {
+-        printf(M_CRCERROR);
++        puts(M_CRCERROR);
+         error_count++;
+     }
+     return 1;
+@@ -808,10 +808,10 @@
+         decode_f();
+ 
+     if ((crc ^ CRC_MASK) == file_crc)
+-        printf(M_CRCOK);
++        puts(M_CRCOK);
+     else
+     {
+-        printf(M_CRCERROR);
++        puts(M_CRCERROR);
+         error_count++;
+     }
+     return 1;
+@@ -958,7 +958,7 @@
+     int i;
+ 
+     for (i = 0; M_USAGE[i] != NULL; i++)
+-        printf(M_USAGE[i]);
++        puts(M_USAGE[i]);
+ }
+ 
+ int
+@@ -973,7 +973,7 @@
+     argc = ccommand(&argv);
+ #endif
+ 
+-    printf(M_VERSION);
++    puts(M_VERSION);
+ 
+     if (argc == 1)
+     {
diff --git a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
index 755b9b696cc9..2091f091e2d2 100644
--- a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
+++ b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
@@ -1,5 +1,5 @@
---- environ.c	2007-06-19 12:44:09 +0200
-+++ environ.c.new	2007-06-19 12:44:37 +0200
+--- a/environ.c
++++ b/environ.c
 @@ -437,7 +437,6 @@
  #endif
  
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
index d579027e1d33..ec1cba73be8e 100644
--- a/app-arch/unarj/unarj-2.65.ebuild
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Utility for opening arj archives"
 HOMEPAGE="http://www.arjsoftware.com/"
@@ -12,21 +14,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-CAN-2004-0947.patch
-	epatch "${FILESDIR}"/${P}-sanitation.patch
-	epatch "${FILESDIR}"/${P}-gentoo-fbsd.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-CAN-2004-0947.patch
+	"${FILESDIR}"/${P}-sanitation.patch
+	"${FILESDIR}"/${P}-gentoo-fbsd.patch
+	"${FILESDIR}"/${PN}-2.65-Wformat-security.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die
 }
 
 src_install() {
-	dobin unarj || die 'dobin failed'
-	dodoc unarj.txt technote.txt || die 'dodoc failed'
+	dobin unarj
+	dodoc unarj.txt technote.txt
 }