Browse Source

Revert commits that introduce a regression

Christoph Biedl 7 years ago
parent
commit
f8ec138dfd

+ 39 - 0
debian/patches/revert.FILE5_29-39-g0e78a704.pr-591-print-if-the-file-has-debug-info.patch

@@ -0,0 +1,39 @@
+Subject: Revert: PR/591: Print if the file has debug info
+Origin: FILE5_29-39-g0e78a704
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sun Jan 29 19:34:24 2017 +0000
+
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1185,7 +1185,7 @@
+ {
+ 	Elf32_Shdr sh32;
+ 	Elf64_Shdr sh64;
+-	int stripped = 1, has_debug_info = 1;
++	int stripped = 1;
+ 	size_t nbadcap = 0;
+ 	void *nbuf;
+ 	off_t noff, coff, name_off;
+@@ -1216,10 +1216,8 @@
+ 			return -1;
+ 		}
+ 		name[namesize] = '\0';
+-		if (strcmp(name, ".debug_info") == 0) {
+-			has_debug_info = 1;
++		if (strcmp(name, ".debug_info") == 0)
+ 			stripped = 0;
+-		}
+ 
+ 		if (pread(fd, xsh_addr, xsh_sizeof, off) < (ssize_t)xsh_sizeof) {
+ 			file_badread(ms);
+@@ -1375,10 +1373,6 @@
+ 
+ 	if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1)
+ 		return -1;
+-	if (has_debug_info) {
+-		if (file_printf(ms, ", with debug_info") == -1)
+-			return -1;
+-	}
+ 	if (cap_hw1) {
+ 		const cap_desc_t *cdp;
+ 		switch (mach) {

+ 18 - 0
debian/patches/revert.FILE5_29-46-g53b8d4b0.add-ips-magic.patch

@@ -0,0 +1,18 @@
+Subject: Revert: Add IPS magic (Thomas Klausner)
+Origin: FILE5_29-46-g53b8d4b0
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Wed Feb 8 21:53:06 2017 +0000
+
+--- a/magic/Magdir/console
++++ b/magic/Magdir/console
+@@ -515,10 +515,6 @@
+ >3	byte		x	version %d,
+ >4	byte		x	%d tracks
+ 
+-# IPS Patch Files from: From: Thomas Klausner <tk@giga.or.at>
+-# see http://zerosoft.zophar.net/ips.php
+-0	string	PATCH			IPS patch file
+-
+ # Playstations Patch Files from: From: Thomas Klausner <tk@giga.or.at>
+ 0	string	PPF30			Playstation Patch File version 3.0
+ >5	byte	0			\b, PPF 1.0 patch

+ 4 - 0
debian/patches/series

@@ -1,3 +1,7 @@
+# reverted commits
+revert.FILE5_29-39-g0e78a704.pr-591-print-if-the-file-has-debug-info.patch
+revert.FILE5_29-46-g53b8d4b0.add-ips-magic.patch
+
 # cherry-picked commits. Keep in upstream's chronological order
 
 # local modifications