From a36ca7a8c5ebc54fee2672b8e0c378c03089daa7 Mon Sep 17 00:00:00 2001 From: Nigel Kukard Date: Wed, 31 Dec 2008 18:12:22 +0000 Subject: * Bump rpm to 5.1.6 - Remove patches comitted upstream - Exclude tools we don't need - Fix bundled magic mime data --- package/rpm/rpm-5.1.6_magic-file-fix.patch | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 package/rpm/rpm-5.1.6_magic-file-fix.patch (limited to 'package/rpm/rpm-5.1.6_magic-file-fix.patch') diff --git a/package/rpm/rpm-5.1.6_magic-file-fix.patch b/package/rpm/rpm-5.1.6_magic-file-fix.patch new file mode 100755 index 000000000..da0944571 --- /dev/null +++ b/package/rpm/rpm-5.1.6_magic-file-fix.patch @@ -0,0 +1,40 @@ +diff -u --new-file --recursive rpm-5.1.6_vanilla/file/magic/Magdir/audio rpm-5.1.6_magic-file-fix/file/magic/Magdir/audio +--- rpm-5.1.6_vanilla/file/magic/Magdir/audio 2007-05-31 02:19:30.000000000 +0000 ++++ rpm-5.1.6_magic-file-fix/file/magic/Magdir/audio 2008-11-29 15:45:32.000000000 +0000 +@@ -208,7 +208,7 @@ + >22 belong&0x00ffffff x %d Hz, + >18 beshort =0 no loop, + >18 beshort =-1 loop, +->21 ubyte <=127 note %d, ++>21 ubyte <128 note %d, + >22 byte =0 replay 5.485 KHz + >22 byte =1 replay 8.084 KHz + >22 byte =2 replay 10.971 Khz +diff -u --new-file --recursive rpm-5.1.6_vanilla/file/magic/Magdir/freebsd rpm-5.1.6_magic-file-fix/file/magic/Magdir/freebsd +--- rpm-5.1.6_vanilla/file/magic/Magdir/freebsd 2003-04-15 16:58:35.000000000 +0000 ++++ rpm-5.1.6_magic-file-fix/file/magic/Magdir/freebsd 2008-11-29 15:45:32.000000000 +0000 +@@ -128,10 +128,10 @@ + # What are you laughing about? + 0 lelong 011421044151 ld.so hints file (Little Endian + >4 lelong >0 \b, version %d) +->4 belong <=0 \b) ++>4 belong <1 \b) + 0 belong 011421044151 ld.so hints file (Big Endian + >4 belong >0 \b, version %d) +->4 belong <=0 \b) ++>4 belong <1 \b) + + # + # Files generated by FreeBSD scrshot(1)/vidcontrol(1) utilities +diff -u --new-file --recursive rpm-5.1.6_vanilla/file/magic/Magdir/linux rpm-5.1.6_magic-file-fix/file/magic/Magdir/linux +--- rpm-5.1.6_vanilla/file/magic/Magdir/linux 2007-05-31 02:19:30.000000000 +0000 ++++ rpm-5.1.6_magic-file-fix/file/magic/Magdir/linux 2008-11-29 15:45:32.000000000 +0000 +@@ -84,7 +84,7 @@ + # Linux kernel boot images (i386 arch) (Wolfram Kleff) + 514 string HdrS Linux kernel + >510 leshort 0xAA55 x86 boot executable +->>518 leshort >=0x200 ++>>518 leshort >0x1ff + >>529 byte 0 zImage, + >>>529 byte 1 bzImage, + >>>(526.s+0x200) string >\0 version %s, -- cgit v1.2.3