gentoo resync : 25.04.2020

7 files changed, 110 insertions, 5 deletions

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b6472c6a7b21..be6489455f7f 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,7 +1,10 @@
 AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f574aac769c7728bada7b622fd670616efc12d42cabf95b32a8a98c811e171059af2e127c170c1935dc00def4a1fc05b6 SHA512 3517e35db03944bcca6da28ddac9f0d08ce052b03d1508d26851fd6691bedc89f3974822a1559576987c8c10a0343bc8788cc7df52406d66a591ddcd39b23a5c
+AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c
+AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
+AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
-EBUILD file-5.37-r1.ebuild 3195 BLAKE2B 5df6a8ae357a37c141a628edec150a6ae0c7780eef35011e21c677c84b0e52166a4b536ca25bbfb5aab42d9a03be382a2d761571e8542bc1f991d9b2ae1f4efb SHA512 f62b0c4a564e166eba4f1f3dbf315057acbd801c308d6cd8d52b5114d43a3dcb80a4c644e8eae64f0c85cea035dac25b10350433f2607e3d9fb881db158fecd0
-EBUILD file-5.38.ebuild 3177 BLAKE2B a6901e580c6551934775041b33b9aea80074a143713ef066378cce5b45904ff772c9b521bae79b083dd8015aa92e0b93aa9c7f0e08144a2546f85750fbd11ecc SHA512 8c019cf0084126c99f2106a64c7ecb17fb68ad82ca88f5174db359a409d31f5e1726631072b4da4491cf02dc2dce2a0e9d57fb28d46a221508f524f2b7983e4c
+EBUILD file-5.37-r1.ebuild 3196 BLAKE2B 3ebbb65c3cc04cc172de71ab40788d82b7b0613796f5021b8cd341002d2584caf022861ae78d950b2b6e8533938493678cd575ee3bec5a05bc9d3d4c14c9aa64 SHA512 d9d154e08c9dbe51a65b72c6aad52558243e90a30fa3ed0e0bfa6f7743ef37c2af5c1a2e84689746afa93f8c62f558d879f7fdae3fa89638f7dcd4c1fe549e23
+EBUILD file-5.38-r1.ebuild 3408 BLAKE2B 8e485be7df8999d185acfbe231bb7e3a048424eda5a9c94a6344c9532eb2f67d0718d6122a357b57c54cc2285f537afcb93e21175d296ab380303952ece0544d SHA512 6666ffa51931a6df345cdd36e6f19cc179881751c3a45006bf5697ea1d050f4137efc85df20befb15199dd04149935a9f6a97f49df1563e771460bf2cd6a7c84
 EBUILD file-9999.ebuild 3251 BLAKE2B 8eff7461b8b76cc8f7cb8b20af8a894682ccf755dcf2314a6511346600ad62505568ab3e462f8c0efcf8c065e4983ac0edd1feec5cf67d1e9ac17e4f93a7c2a0 SHA512 7dc9131ffcc3fd30b988e5d97a08a382b9e9bf2f120d697f1ea39ab01701ef318a8fec688079bc67fec2b4006697093c212d417a188f312762a5e2f655f1f520
-MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
+MISC metadata.xml 321 BLAKE2B e75eee1637561112d5d6a25b7026376993ea50875f809b1b3fc79d0c35369de7002cc03fba5c73d14685eef20b1e1989f00de56a94761bf361aa845cdbfd709a SHA512 1f247eff54e5e7d109e19f5116176f3b2135319f2222a0bdfec482b7cefd23d6cbe75769f0afa385acd2f2cfdb62cccb4e5aa1aa148bf984579b6d3edd1a8ebc
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 074a9c05f917..a0cd2743c944 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-5.38.ebuild b/sys-apps/file/file-5.38-r1.ebuild
index db7ed0b820b3..58bb745b6b56 100644
--- a/sys-apps/file/file-5.38.ebuild
+++ b/sys-apps/file/file-5.38-r1.ebuild
@@ -35,6 +35,12 @@ DEPEND="
 RDEPEND="${DEPEND}
 	python? ( !dev-python/python-magic )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
+	"${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch
+	"${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch b/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
new file mode 100644
index 000000000000..240edc11f680
--- /dev/null
+++ b/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
@@ -0,0 +1,40 @@
+From c9d21a58bea2ecb2dc8876e09e471094d54a25e4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 13 Apr 2020 01:08:12 +0200
+Subject: [PATCH 1/3] Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and
+ count as dynamically linked"
+
+This reverts commit 24c9c086cd7c55b7b0a003a145b32466468e2608.
+
+Fixes misdetection of shared libraries as statically linked as
+reported in bug 717264.
+
+Bug: https://bugs.gentoo.org/717264
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ src/readelf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index 40bcfab1..afec31d1 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1638,6 +1638,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
+ 		/* Things we can determine before we seek */
+ 		switch (xph_type) {
+ 		case PT_DYNAMIC:
++			linking_style = "dynamically";
+ 			doread = 1;
+ 			break;
+ 		case PT_NOTE:
+@@ -1653,7 +1654,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
+ 			}
+ 			/*FALLTHROUGH*/
+ 		case PT_INTERP:
+-			linking_style = "dynamically";
+ 			doread = 1;
+ 			break;
+ 		default:
+-- 
+2.26.0
+
diff --git a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch b/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
new file mode 100644
index 000000000000..bb211f355f77
--- /dev/null
+++ b/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
@@ -0,0 +1,29 @@
+From ed971e5e3ae79bd28697d16c8b78b693052484e4 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Wed, 12 Feb 2020 22:17:33 +0000
+Subject: [PATCH 3/3] The executable bit is only set when DF_1_PIE bit is set
+ so it is fine.
+
+---
+ magic/Magdir/elf | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/magic/Magdir/elf b/magic/Magdir/elf
+index b5a2e00b..f5e1af9a 100644
+--- a/magic/Magdir/elf
++++ b/magic/Magdir/elf
+@@ -50,8 +50,9 @@
+ !:mime	application/x-object
+ >16	leshort		2		executable,
+ !:mime	application/x-executable
+->16	leshort		3		shared object,
+-!:mime	application/x-sharedlib
++>16	leshort		3		${x?pie executable:shared object},
++
++!:mime	application/x-${x?pie-executable:sharedlib}
+ >16	leshort		4		core file,
+ !:mime	application/x-coredump
+ # OS-specific
+-- 
+2.26.0
+
diff --git a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch b/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
new file mode 100644
index 000000000000..09fcaef151ea
--- /dev/null
+++ b/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
@@ -0,0 +1,27 @@
+From c49dc91df427f89ebcf9cdec556b8fc88cdfc3c1 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Tue, 17 Dec 2019 15:27:27 +0000
+Subject: [PATCH 2/3] %td is for ptrdiff_t not for off_t.
+
+---
+ src/readelf.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index afec31d1..8ac3b7d6 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1349,8 +1349,8 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
+ 	name_off = xsh_offset;
+ 
+ 	if (fsize != SIZE_UNKNOWN && fsize < name_off) {
+-		if (file_printf(ms, ", too large section header offset %td",
+-		    name_off) == -1)
++		if (file_printf(ms, ", too large section header offset %jd",
++		    (intmax_t)name_off) == -1)
+ 			return -1;
+ 		return 0;
+ 	}
+-- 
+2.26.0
+
diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index 2c14dbfaaad7..2617cfadadf1 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
-	<bugs-to>http://bugs.gw.com/</bugs-to>
+	<bugs-to>https://bugs.astron.com/</bugs-to>
 </upstream>
 </pkgmetadata>