From 492989010fd370b40123de7036810dc87799fd64 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 4 Aug 2011 20:07:49 +0200 Subject: [PATCH] file: update to file-5.08 Signed-off-by: Stephan Raue --- packages/devel/file/meta | 2 +- .../devel/file/patches/file-5.07-dos.patch | 32 ----------- .../file/patches/file-5.07-rpm-archs.patch | 57 ------------------- .../devel/file/patches/file-5.07-zip64.patch | 12 ---- ...ile-5.07-zip.patch => file-5.08-zip.patch} | 0 5 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 packages/devel/file/patches/file-5.07-dos.patch delete mode 100644 packages/devel/file/patches/file-5.07-rpm-archs.patch delete mode 100644 packages/devel/file/patches/file-5.07-zip64.patch rename packages/devel/file/patches/{file-5.07-zip.patch => file-5.08-zip.patch} (100%) diff --git a/packages/devel/file/meta b/packages/devel/file/meta index 5f4974fc87..c4f4896f78 100644 --- a/packages/devel/file/meta +++ b/packages/devel/file/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="file" -PKG_VERSION="5.07" +PKG_VERSION="5.08" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" diff --git a/packages/devel/file/patches/file-5.07-dos.patch b/packages/devel/file/patches/file-5.07-dos.patch deleted file mode 100644 index 9e173555b0..0000000000 --- a/packages/devel/file/patches/file-5.07-dos.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 19f5096d0b4c1a49af6cc4e0d086d6128c493bd8 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Wed, 18 May 2011 18:11:23 +0000 -Subject: [PATCH] Fixed 0 file problem. - ---- - magic/Magdir/msdos | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos -index 731d50b..f8852cb 100644 ---- a/magic/Magdir/msdos -+++ b/magic/Magdir/msdos -@@ -389,10 +389,11 @@ - >>4 uleshort&0x4842 >0 \bsupport - >0 ubyte x \b) - # DOS driver cmd640x.sys has 0x12 instead of 0xffffffff for pointer field to next device header --0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable ( -->4 uleshort&0x8000 0x8000 \bcharacter device driver -->>10 string x %-.8s -->4 uleshort&0x4000 0x4000 \b,control strings-support) -+# Too weak, matches files that only contain 0's -+#0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable ( -+#>4 uleshort&0x8000 0x8000 \bcharacter device driver -+#>>10 string x %-.8s -+#>4 uleshort&0x4000 0x4000 \b,control strings-support) - - # test too generic ? - 0 byte 0x8c DOS executable (COM) --- -1.7.4.1 - diff --git a/packages/devel/file/patches/file-5.07-rpm-archs.patch b/packages/devel/file/patches/file-5.07-rpm-archs.patch deleted file mode 100644 index 23d2fb49b6..0000000000 --- a/packages/devel/file/patches/file-5.07-rpm-archs.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm -index c40e1b5..d252ced 100644 ---- a/magic/Magdir/rpm -+++ b/magic/Magdir/rpm -@@ -21,12 +21,29 @@ - >>>8 beshort 8 RS6000 - >>>8 beshort 9 IA64 - >>>8 beshort 10 Sparc64 -+>>>8 beshort 11 MIPSel -+>>>8 beshort 12 ARM -+>>>8 beshort 13 MiNT -+>>>8 beshort 14 S/390 -+>>>8 beshort 15 S/390x -+>>>8 beshort 16 PowerPC64 -+>>>8 beshort 17 SuperH -+>>>8 beshort 18 Xtensa - - #delta RPM Daniel Novotny (dnovotny@redhat.com) - 0 string drpm Delta RPM - !:mime application/x-rpm - >12 string x %s -- -+>>>8 beshort 1 i386/x86_64 -+>>>8 beshort 2 Alpha/Sparc64 -+>>>8 beshort 3 Sparc -+>>>8 beshort 4 MIPS -+>>>8 beshort 5 PowerPC -+>>>8 beshort 6 68000 -+>>>8 beshort 7 SGI -+>>>8 beshort 8 RS6000 -+>>>8 beshort 9 IA64 -+>>>8 beshort 10 Sparc64 - >>>8 beshort 11 MIPSel - >>>8 beshort 12 ARM - >>>8 beshort 13 MiNT -@@ -42,3 +59,21 @@ - 0 string drpm Delta RPM - !:mime application/x-rpm - >12 string x %s -+>>>8 beshort 1 i386/x86_64 -+>>>8 beshort 2 Alpha/Sparc64 -+>>>8 beshort 3 Sparc -+>>>8 beshort 4 MIPS -+>>>8 beshort 5 PowerPC -+>>>8 beshort 6 68000 -+>>>8 beshort 7 SGI -+>>>8 beshort 8 RS6000 -+>>>8 beshort 9 IA64 -+>>>8 beshort 10 Sparc64 -+>>>8 beshort 11 MIPSel -+>>>8 beshort 12 ARM -+>>>8 beshort 13 MiNT -+>>>8 beshort 14 S/390 -+>>>8 beshort 15 S/390x -+>>>8 beshort 16 PowerPC64 -+>>>8 beshort 17 SuperH -+>>>8 beshort 18 Xtensa diff --git a/packages/devel/file/patches/file-5.07-zip64.patch b/packages/devel/file/patches/file-5.07-zip64.patch deleted file mode 100644 index e4115ee1ff..0000000000 --- a/packages/devel/file/patches/file-5.07-zip64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/magic/Magdir/archive b/magic/Magdir/archive -index c998e5b..4da532a 100644 ---- a/magic/Magdir/archive -+++ b/magic/Magdir/archive -@@ -688,6 +688,7 @@ - >>4 byte 0x0b \b, at least v1.1 to extract - >>0x161 string WINZIP \b, WinZIP self-extracting - >>4 byte 0x14 \b, at least v2.0 to extract -+>>4 byte 0x2d Zip64, at least v3.0 to extract - - # Zoo archiver - 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/packages/devel/file/patches/file-5.07-zip.patch b/packages/devel/file/patches/file-5.08-zip.patch similarity index 100% rename from packages/devel/file/patches/file-5.07-zip.patch rename to packages/devel/file/patches/file-5.08-zip.patch