Browse Source

Refresh patches

The problem behind "upstream.mute-debug-warning" was fixed in commit
FILE5_44-61-gd328a461 ("PR/426: claudiu: don't print garbage to
stderr.")
Christoph Biedl 9 months ago
parent
commit
55062b92c5

+ 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
-@@ -501,7 +501,7 @@
+@@ -502,7 +502,7 @@
  
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)

+ 1 - 1
debian/patches/local.manpage-seccomp-is-disabled.patch

@@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/917930
 
 --- a/doc/file.man
 +++ b/doc/file.man
-@@ -387,6 +387,10 @@
+@@ -390,6 +390,10 @@
  .Fl z
  option is specified and the built-in decompressors are not available.
  On systems where sandboxing is not available, this option has no effect.

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

@@ -25,7 +25,7 @@ Last-Update: 2016-06-27
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -496,7 +496,7 @@
+@@ -495,7 +495,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
@@ -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
-@@ -360,7 +360,7 @@
+@@ -361,7 +361,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  nodist_include_HEADERS = magic.h
@@ -55,7 +55,7 @@ Last-Update: 2016-06-27
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
- 	encoding.c compress.c is_csv.c is_json.c is_tar.c readelf.c print.c \
+ 	encoding.c compress.c is_csv.c is_json.c is_simh.c is_tar.c readelf.c \
 --- a/doc/file.man
 +++ b/doc/file.man
 @@ -59,7 +59,7 @@
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -572,12 +573,6 @@
+@@ -575,12 +576,6 @@
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.

+ 0 - 1
debian/patches/series

@@ -4,7 +4,6 @@
 
 # patches that should go upstream
 upstream.disable.att3b.patch
-upstream.mute-debug-warning.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch

+ 0 - 25
debian/patches/upstream.mute-debug-warning.patch

@@ -1,25 +0,0 @@
-Subject: Disable debug messages
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2022-12-20
-Forwarded: https://mailman.astron.com/pipermail/file/2022-December/001018.html
-
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1461,7 +1461,7 @@
- 	// On purpose not INTMAX_MAX
- 	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;
- 	}
- 	   
-@@ -1497,7 +1497,7 @@
- 	if (m->in_op & FILE_OPINVERSE)
- 		offset = ~offset;
- 	if (offset >= UINT_MAX) {
--		fprintf(stderr, "offset overflow %jd\n", offset);
-+/*		fprintf(stderr, "offset overflow %jd\n", offset); */
- 		return 1;
- 	}
- 	*rv = CAST(uint32_t, offset);