Browse Source

Refresh patch queue

Christoph Biedl 1 year ago
parent
commit
f824c85a30

+ 0 - 15
debian/patches/cherry-pick.1645310132.FILE5_41-76-g394df3ed.pr-316-karagian-bump-strength-to-beat-amd-29k-a-out.patch

@@ -1,15 +0,0 @@
-Subject: PR/316: karagian: Bump strength to beat amd 29k a.out
-Origin: FILE5_41-76-g394df3ed <https://github.com/file/file/commit/FILE5_41-76-g394df3ed>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sat Feb 19 22:35:32 2022 +0000
-
---- a/magic/Magdir/database
-+++ b/magic/Magdir/database
-@@ -151,6 +151,7 @@
- # https://www.clicketyclick.dk/databases/xbase/format/dbf.html
- # inspect VVYYMMDD , where 1<= MM <= 12 and 1<= DD <= 31
- 0	ubelong&0x0000FFFF		<0x00000C20
-+!:strength +10
- # skip Infocom game Z-machine
- >2		ubyte			>0
- # skip Androids *.xml

+ 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)

+ 2 - 2
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
-@@ -462,7 +462,7 @@
+@@ -497,7 +497,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

+ 0 - 1
debian/patches/series

@@ -1,7 +1,6 @@
 # reverted upstream commits
 
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick.1645310132.FILE5_41-76-g394df3ed.pr-316-karagian-bump-strength-to-beat-amd-29k-a-out.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch