SOURCES: file-fusecompress.patch, file-msdos.patch, file-selinux.p...
glen
glen at pld-linux.org
Wed Apr 23 22:54:48 CEST 2008
Author: glen Date: Wed Apr 23 20:54:48 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated against file 4.24 (with debian patches)
---- Files affected:
SOURCES:
file-fusecompress.patch (1.1 -> 1.2) , file-msdos.patch (1.3 -> 1.4) , file-selinux.patch (1.1 -> 1.2) , file-greedy-dump.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/file-fusecompress.patch
diff -u SOURCES/file-fusecompress.patch:1.1 SOURCES/file-fusecompress.patch:1.2
--- SOURCES/file-fusecompress.patch:1.1 Sun Apr 6 14:44:46 2008
+++ SOURCES/file-fusecompress.patch Wed Apr 23 22:54:43 2008
@@ -10,14 +10,13 @@
+>3 byte 0x04 (xor format)
+>3 byte >0x04 (unknown format)
+>4 long x uncompressed size: %d
-diff -urN file-4.23.org/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.org/magic/Makefile.am 2007-11-07 23:09:58.000000000 +0100
-+++ file-4.23/magic/Makefile.am 2008-04-06 14:26:21.492709654 +0200
-@@ -90,6 +90,7 @@
- Magdir/frame \
- Magdir/freebsd \
- Magdir/fsav \
-+Magdir/fusecompress \
- Magdir/games \
- Magdir/geos \
- Magdir/gcc \
+--- file-4.24/magic/Makefile.am~ 2008-04-23 23:49:51.000000000 +0300
++++ file-4.24/magic/Makefile.am 2008-04-23 23:50:10.685223161 +0300
+@@ -67,6 +67,7 @@
+ $(MAGIC_FRAGMENT_DIR)/frame \
+ $(MAGIC_FRAGMENT_DIR)/freebsd \
+ $(MAGIC_FRAGMENT_DIR)/fsav \
++$(MAGIC_FRAGMENT_DIR)/fusecompress \
+ $(MAGIC_FRAGMENT_DIR)/games \
+ $(MAGIC_FRAGMENT_DIR)/gcc \
+ $(MAGIC_FRAGMENT_DIR)/geos \
================================================================
Index: SOURCES/file-msdos.patch
diff -u SOURCES/file-msdos.patch:1.3 SOURCES/file-msdos.patch:1.4
--- SOURCES/file-msdos.patch:1.3 Fri Dec 28 00:50:35 2007
+++ SOURCES/file-msdos.patch Wed Apr 23 22:54:43 2008
@@ -1,5 +1,5 @@
---- file-4.19/magic/Magdir/msdos.orig 2006-11-17 16:56:05.000000000 +0100
-+++ file-4.19/magic/Magdir/msdos 2006-12-20 19:48:05.070673271 +0100
+--- file-4.19/magic/Magdir/msdos 2006-12-20 19:48:05.070673271 +0100
++++ file-4.24/magic/Magdir/msdos 2008-04-23 23:49:15.706057277 +0300
@@ -5,11 +5,10 @@
# .BAT files (Daniel Quinlan, quinlan at yggdrasil.com)
@@ -16,64 +16,31 @@
# OS/2 batch files are REXX. the second regex is a bit generic, oh well
-@@ -262,9 +261,9 @@
- # Uncommenting only the first two lines will cover about 2/3 of COM files,
- # but it isn't feasible to match all COM files since there must be at least
- # two dozen different one-byte "magics".
--0 byte 0xe9 DOS executable (COM)
-->0x1FE leshort 0xAA55 \b, boot code
-->6 string SFX\ of\ LHarc (%s)
-+#0 byte 0xe9
-+#>0x1FE leshort 0xAA55 DOS executable (COM), boot code
-+#>6 string SFX\ of\ LHarc DOS executable (COM) (%s)
- 0 belong 0xffffffff DOS executable (device driver)
- #CMD640X2.SYS
- >10 string >\x23
-@@ -286,49 +285,48 @@
- >>77 string >\x40
- >>>77 string <\x5B
- >>>>77 string x \b, name: %.8s
--0 byte 0x8c DOS executable (COM)
- # 0xeb conflicts with "sequent" magic
--0 byte 0xeb DOS executable (COM)
-->0x1FE leshort 0xAA55 \b, boot code
-->85 string UPX \b, UPX compressed
-->4 string \ $ARX \b, ARX self-extracting archive
-->4 string \ $LHarc \b, LHarc self-extracting archive
-->0x20e string SFX\ by\ LARC \b, LARC self-extracting archive
--0 byte 0xb8 COM executable
-+#0 byte 0xeb
-+#>0x1FE leshort 0xAA55 DOS executable (COM), boot code
-+#>85 string UPX DOS executable (COM), UPX compressed
-+#>4 string \ $ARX DOS executable (COM), ARX self-extracting archive
-+#>4 string \ $LHarc DOS executable (COM), LHarc self-extracting archive
-+#>0x20e string SFX\ by\ LARC DOS executable (COM), LARC self-extracting archive
-+#0 byte 0xb8
+@@ -304,11 +303,11 @@
+ #>0x20e string SFX\ by\ LARC \b, LARC self-extracting archive
+ #0 byte 0xb8 COM executable
# modified by Joerg Jenderek
->1 lelong !0x21cd4cff for DOS
-+#>1 lelong !0x21cd4cff COM executale for DOS
++#>1 lelong !0x21cd4cff for DOS
# http://syslinux.zytor.com/comboot.php
# (32-bit COMBOOT) programs *.C32 contain 32-bit code and run in flat-memory 32-bit protected mode
# start with assembler instructions mov eax,21cd4cffh
->1 lelong 0x21cd4cff (32-bit COMBOOT)
-+#>1 lelong 0x21cd4cff COM executable (32-bit COMBOOT)
++#>1 lelong 0x21cd4cff (32-bit COMBOOT)
0 string \x81\xfc
>4 string \x77\x02\xcd\x20\xb9
>>36 string UPX! FREE-DOS executable (COM), UPX compressed
- 252 string Must\ have\ DOS\ version DR-DOS executable (COM)
+@@ -316,27 +315,27 @@
# GRR search is not working
#2 search/28 \xcd\x21 COM executable for MS-DOS
--#WHICHFAT.cOM
+ #WHICHFAT.cOM
-2 string \xcd\x21 COM executable for DOS
--#DELTREE.cOM DELTREE2.cOM
--4 string \xcd\x21 COM executable for DOS
--#IFMEMDSK.cOM ASSIGN.cOM COMP.cOM
--5 string \xcd\x21 COM executable for DOS
-+##WHICHFAT.cOM
+#2 string \xcd\x21 COM executable for DOS
-+##DELTREE.cOM DELTREE2.cOM
+ #DELTREE.cOM DELTREE2.cOM
+-4 string \xcd\x21 COM executable for DOS
+#4 string \xcd\x21 COM executable for DOS
-+##IFMEMDSK.cOM ASSIGN.cOM COMP.cOM
+ #IFMEMDSK.cOM ASSIGN.cOM COMP.cOM
+-5 string \xcd\x21 COM executable for DOS
+#5 string \xcd\x21 COM executable for DOS
#DELTMP.COm HASFAT32.cOM
-7 string \xcd\x21
================================================================
Index: SOURCES/file-selinux.patch
diff -u SOURCES/file-selinux.patch:1.1 SOURCES/file-selinux.patch:1.2
--- SOURCES/file-selinux.patch:1.1 Sun Sep 11 12:58:21 2005
+++ SOURCES/file-selinux.patch Wed Apr 23 22:54:43 2008
@@ -7,13 +7,13 @@
+>20 lelong 1 MLS
+>24 lelong x %d symbols
+>28 lelong x %d ocons
---- file-4.02/magic/Makefile.am.selinux 2003-08-28 14:41:58.000000000 -0400
-+++ file-4.02/magic/Makefile.am 2003-08-28 14:45:15.000000000 -0400
-@@ -135,6 +135,7 @@
- Magdir/pgp \
- Magdir/pkgadd \
- Magdir/plus5 \
-+Magdir/policy \
- Magdir/printer \
- Magdir/project \
- Magdir/psdbms \
+--- file-4.24/magic/Makefile.am~ 2008-04-23 23:42:47.000000000 +0300
++++ file-4.24/magic/Makefile.am 2008-04-23 23:43:19.957572681 +0300
+@@ -148,6 +148,7 @@
+ $(MAGIC_FRAGMENT_DIR)/pkgadd \
+ $(MAGIC_FRAGMENT_DIR)/plan9 \
+ $(MAGIC_FRAGMENT_DIR)/plus5 \
++$(MAGIC_FRAGMENT_DIR)/policy \
+ $(MAGIC_FRAGMENT_DIR)/printer \
+ $(MAGIC_FRAGMENT_DIR)/project \
+ $(MAGIC_FRAGMENT_DIR)/psdbms \
================================================================
Index: SOURCES/file-greedy-dump.patch
diff -u SOURCES/file-greedy-dump.patch:1.1 SOURCES/file-greedy-dump.patch:1.2
--- SOURCES/file-greedy-dump.patch:1.1 Sun May 22 23:32:03 2005
+++ SOURCES/file-greedy-dump.patch Wed Apr 23 22:54:43 2008
@@ -1,17 +1,18 @@
---- file-4.13/magic/Makefile.am.orig 2005-05-22 23:26:16.000000000 +0200
-+++ file-4.13/magic/Makefile.am 2005-05-22 23:26:37.000000000 +0200
-@@ -66,7 +66,6 @@
- Magdir/diff \
- Magdir/digital \
- Magdir/dolby \
--Magdir/dump \
- Magdir/editors \
- Magdir/elf \
- Magdir/encore \
-@@ -203,4 +202,5 @@
- Magdir/xo65 \
- Magdir/xwindows \
- Magdir/zilog \
--Magdir/zyxel
-+Magdir/zyxel \
-+Magdir/dump
+--- file-4.24/magic/Makefile.am~ 2008-04-23 23:36:17.000000000 +0300
++++ file-4.24/magic/Makefile.am 2008-04-23 23:37:15.552589231 +0300
+@@ -51,7 +51,6 @@
+ $(MAGIC_FRAGMENT_DIR)/diff \
+ $(MAGIC_FRAGMENT_DIR)/digital \
+ $(MAGIC_FRAGMENT_DIR)/dolby \
+-$(MAGIC_FRAGMENT_DIR)/dump \
+ $(MAGIC_FRAGMENT_DIR)/dyadic \
+ $(MAGIC_FRAGMENT_DIR)/editors \
+ $(MAGIC_FRAGMENT_DIR)/efi \
+@@ -209,6 +208,7 @@
+ $(MAGIC_FRAGMENT_DIR)/xo65 \
+ $(MAGIC_FRAGMENT_DIR)/xwindows \
+ $(MAGIC_FRAGMENT_DIR)/zilog \
++$(MAGIC_FRAGMENT_DIR)/dump \
+ $(MAGIC_FRAGMENT_DIR)/zyxel
+
+ MAGIC = magic.mgc
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/file-fusecompress.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/file-msdos.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/file-selinux.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/file-greedy-dump.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list