Browse Source

Refresh patch queue

Christoph Biedl 1 year ago
parent
commit
135c30bc9a

File diff suppressed because it is too large
+ 0 - 7355
debian/patches/cherry-pick-all-since-5.43-release.patch


+ 1 - 1
debian/patches/local.don-t-include-libs-in-build.patch

@@ -6,7 +6,7 @@ Last-Update: 2016-06-27
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -502,7 +502,7 @@
+@@ -501,7 +501,7 @@
  
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)

+ 1 - 1
debian/patches/local.support-local-definitions-in-etc-magic.patch

@@ -47,7 +47,7 @@ Last-Update: 2016-06-27
  libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -361,7 +361,7 @@
+@@ -360,7 +360,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  nodist_include_HEADERS = magic.h

+ 0 - 1
debian/patches/series

@@ -1,7 +1,6 @@
 # reverted upstream commits
 
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick-all-since-5.43-release.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch

+ 2 - 2
debian/patches/upstream.mute-debug-warning.patch

@@ -7,8 +7,8 @@ Forwarded: https://mailman.astron.com/pipermail/file/2022-December/001018.html
 +++ b/src/softmagic.c
 @@ -1461,7 +1461,7 @@
  	// On purpose not INTMAX_MAX
- 	if (lhs >= INT_MAX || lhs <= INT_MIN ||
- 	    off >= INT_MAX || off <= INT_MIN) {
+ 	if (lhs >= UINT_MAX || lhs <= INT_MIN ||
+ 	    off >= UINT_MAX || off <= INT_MIN) {
 -		fprintf(stderr, "lhs/off overflow %jd %jd\n", lhs, off);
 +/*		fprintf(stderr, "lhs/off overflow %jd %jd\n", lhs, off); */
  		return 1;