Browse Source

Refresh patch queue

Christoph Biedl 6 years ago
parent
commit
20dc20b248

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

@@ -6,8 +6,8 @@ Last-Update: 2016-06-27
 
 
 --- a/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -481,7 +481,7 @@
- 
+@@ -439,7 +439,7 @@
+ 	rm -f $$list
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)
  	@rm -f file$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
 -	$(AM_V_CCLD)$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)

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

@@ -44,17 +44,17 @@ Last-Update: 2016-06-27
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  
  
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
+ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
 --- a/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -340,7 +340,7 @@
+@@ -299,7 +299,7 @@
  MAGIC = $(pkgdatadir)/magic
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  lib_LTLIBRARIES = libmagic.la
  nodist_include_HEADERS = magic.h
  nodist_include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
+ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
  	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
  	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
 --- a/doc/file.man
 --- a/doc/file.man
 +++ b/doc/file.man
 +++ b/doc/file.man
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
  magic file
  magic file
  .Pa __MAGIC__.mgc ,
  .Pa __MAGIC__.mgc ,
  or the files in the directory
  or the files in the directory
-@@ -472,12 +473,6 @@
+@@ -549,12 +550,6 @@
  The order of entries in the magic file is significant.
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  Depending on what system you are using, the order that
  they are put together may be incorrect.
  they are put together may be incorrect.
@@ -87,6 +87,6 @@ Last-Update: 2016-06-27
 -keep the old magic file around for comparison purposes
 -keep the old magic file around for comparison purposes
 -(rename it to
 -(rename it to
 -.Pa __MAGIC__.orig ) .
 -.Pa __MAGIC__.orig ) .
- .Sh EXAMPLES
- .Bd -literal -offset indent
- $ file file.c file /dev/{wd0a,hda}
+ .Sh HISTORY
+ There has been a
+ .Nm