diff --git a/packages/devel/file-host/build b/packages/devel/file-host/build index a70d4f2173..0cb938066b 100755 --- a/packages/devel/file-host/build +++ b/packages/devel/file-host/build @@ -28,11 +28,12 @@ setup_toolchain host cd $BUILD/file-* -do_autoreconf mkdir -p .build-host && cd .build-host ../configure --prefix=$ROOT/$TOOLCHAIN \ --enable-shared \ --disable-static \ + --enable-fsect-man5 \ + --disable-rpath make make install diff --git a/packages/devel/file/build b/packages/devel/file/build index 5476956c60..fe6b7fee2e 100755 --- a/packages/devel/file/build +++ b/packages/devel/file/build @@ -32,5 +32,8 @@ cd .build-target --localstatedir=/var \ --enable-shared \ --disable-static \ + --enable-fsect-man5 \ + --disable-rpath + make diff --git a/packages/devel/file/meta b/packages/devel/file/meta index 87def95308..5f4974fc87 100644 --- a/packages/devel/file/meta +++ b/packages/devel/file/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="file" -PKG_VERSION="5.04" +PKG_VERSION="5.07" 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 new file mode 100644 index 0000000000..9e173555b0 --- /dev/null +++ b/packages/devel/file/patches/file-5.07-dos.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 0000000000..23d2fb49b6 --- /dev/null +++ b/packages/devel/file/patches/file-5.07-rpm-archs.patch @@ -0,0 +1,57 @@ +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-zip.patch b/packages/devel/file/patches/file-5.07-zip.patch new file mode 100644 index 0000000000..f16e3126e9 --- /dev/null +++ b/packages/devel/file/patches/file-5.07-zip.patch @@ -0,0 +1,26 @@ +From e990dc53f658cb67ec7b33c32e0bc24e65801792 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sat, 14 May 2011 15:04:15 +0000 +Subject: [PATCH] small archive + +--- + magic/Magdir/archive | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/magic/Magdir/archive b/magic/Magdir/archive +index e84c8e3..5ad1ce3 100644 +--- a/magic/Magdir/archive ++++ b/magic/Magdir/archive +@@ -654,6 +654,9 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + ++>26 byte x Zip archive data ++ ++ + # StarView Metafile + # From Pierre Ducroquet + 0 string VCLMTF StarView MetaFile +-- +1.7.4.1 + diff --git a/packages/devel/file/patches/file-5.07-zip64.patch b/packages/devel/file/patches/file-5.07-zip64.patch new file mode 100644 index 0000000000..e4115ee1ff --- /dev/null +++ b/packages/devel/file/patches/file-5.07-zip64.patch @@ -0,0 +1,12 @@ +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