Browse Source

Replace fix for #948269 with upstream commit

Christoph Biedl 9 months ago
parent
commit
5ac18743c2

+ 28 - 0
debian/patches/cherry-pick.FILE5_38-98-g028a1561.pr-93-undo-previous-there-are-dynamic-objects-shared-libraries-for-example.patch

@@ -0,0 +1,28 @@
+Subject: PR/93: Undo previous: There are dynamic objects (shared libraries for example) (...)
+Origin: FILE5_38-98-g028a1561 <https://github.com/file/file/commit/FILE5_38-98-g028a1561>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sun Apr 26 17:43:13 2020 +0000
+Bug-Debian: https://bugs.debian.org/948269
+
+    PR/93: Undo previous: There are dynamic objects (shared libraries for example)
+    that don't have interpeters and should not be counted as static. We
+    need to figure out what to do with static-pie and gcc-9 separately.
+
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1639,6 +1639,7 @@
+ 		switch (xph_type) {
+ 		case PT_DYNAMIC:
+ 			doread = 1;
++			linking_style = "dynamically";
+ 			break;
+ 		case PT_NOTE:
+ 			if (sh_num)	/* Did this through section headers */
+@@ -1653,7 +1654,6 @@
+ 			}
+ 			/*FALLTHROUGH*/
+ 		case PT_INTERP:
+-			linking_style = "dynamically";
+ 			doread = 1;
+ 			break;
+ 		default:

+ 0 - 28
debian/patches/cherry-pick.revert.FILE5_37-59-g24c9c086.revert-pr-93-iaeiaeiaeiae-do-as-the-comment-says-and-count-as-dynamically-linked.patch

@@ -1,28 +0,0 @@
-Subject: Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and count as dynamically linked (...)"
-Origin: FILE5_37-59-g24c9c086 <https://github.com/file/file/commit/FILE5_37-59-g24c9c086>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Jul 23 21:33:45 2019 +0000
-Bug-Debian: https://bugs.debian.org/948269
-
-    PR/93: iaeiaeiaeiae: Do as the comment says, and count as dynamically linked
-    only the binaries that have an interpreter, not the ones that contain a
-    dynamic section. Fixes issue with -static-pie from gcc-9.x
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -1638,6 +1638,7 @@
- 		/* 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 @@
- 			}
- 			/*FALLTHROUGH*/
- 		case PT_INTERP:
--			linking_style = "dynamically";
- 			doread = 1;
- 			break;
- 		default:

+ 1 - 1
debian/patches/series

@@ -1,8 +1,8 @@
 # reverted upstream commits
-cherry-pick.revert.FILE5_37-59-g24c9c086.revert-pr-93-iaeiaeiaeiae-do-as-the-comment-says-and-count-as-dynamically-linked.patch
 
 # cherry-picked commits. Keep in upstream's chronological order
 cherry-pick.FILE5_38-1-gd955cefc.-td-is-for-ptrdiff-t-not-for-off-t.patch
+cherry-pick.FILE5_38-98-g028a1561.pr-93-undo-previous-there-are-dynamic-objects-shared-libraries-for-example.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch