diff options
| -rwxr-xr-x | package/rpm/rpm-5.1.6_exclude-some-tools.patch | 12 | ||||
| -rwxr-xr-x | package/rpm/rpm-5.1.6_magic-file-fix.patch | 40 | ||||
| -rw-r--r-- | package/rpm/rpm-dirty-ssl-hack.patch | 12 | ||||
| -rw-r--r-- | package/rpm/rpm-uclibc-ifdefs.patch | 13 | ||||
| -rw-r--r-- | package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch | 12 | ||||
| -rw-r--r-- | package/rpm/rpm.mk | 3 |
6 files changed, 54 insertions, 38 deletions
diff --git a/package/rpm/rpm-5.1.6_exclude-some-tools.patch b/package/rpm/rpm-5.1.6_exclude-some-tools.patch new file mode 100755 index 000000000..04f1ccf6c --- /dev/null +++ b/package/rpm/rpm-5.1.6_exclude-some-tools.patch @@ -0,0 +1,12 @@ +diff -u --new-file --recursive rpm-5.1.6_vanilla/tools/Makefile.am rpm-5.1.6_no-noncompiling-tools/tools/Makefile.am +--- rpm-5.1.6_vanilla/tools/Makefile.am 2008-06-15 08:57:25.000000000 +0000 ++++ rpm-5.1.6_no-noncompiling-tools/tools/Makefile.am 2008-11-29 19:37:55.000000000 +0000 +@@ -39,7 +39,7 @@ + $(top_builddir)/build/librpmbuild.la \ + $(RPM_LDADD_COMMON) + +-bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmrepo ++bin_PROGRAMS = rpm2cpio + + pkglibdir = @USRLIBRPM@ + pkglib_PROGRAMS = rpmcmp rpmdeps @WITH_LIBELF_DEBUGEDIT@ 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, diff --git a/package/rpm/rpm-dirty-ssl-hack.patch b/package/rpm/rpm-dirty-ssl-hack.patch deleted file mode 100644 index 5f258fb47..000000000 --- a/package/rpm/rpm-dirty-ssl-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru rpm-5.0.3_vanilla/rpmio/rpmdav.c rpm-5.0.3_dirty-ssl-hack/rpmio/rpmdav.c ---- rpm-5.0.3_vanilla/rpmio/rpmdav.c 2008-01-29 13:57:50.000000000 +0000 -+++ rpm-5.0.3_dirty-ssl-hack/rpmio/rpmdav.c 2008-04-09 17:06:39.000000000 +0000 -@@ -84,7 +84,7 @@ - /* =============================================================== */ - void davDestroy(void) - { --#ifdef NE_FEATURE_SSL -+#if 0 - if (ne_has_support(NE_FEATURE_SSL)) { - /* XXX http://www.nabble.com/Memory-Leaks-in-SSL_Library_init()-t3431875.html */ - ENGINE_cleanup(); diff --git a/package/rpm/rpm-uclibc-ifdefs.patch b/package/rpm/rpm-uclibc-ifdefs.patch deleted file mode 100644 index 11cf2cd89..000000000 --- a/package/rpm/rpm-uclibc-ifdefs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur rpm-4.4.9_vanilla/rpmio/fts.c rpm-4.4.9_uclibc-ifdefs/rpmio/fts.c ---- rpm-4.4.9_vanilla/rpmio/fts.c 2007-01-21 15:18:00.000000000 +0000 -+++ rpm-4.4.9_uclibc-ifdefs/rpmio/fts.c 2008-03-22 13:26:40.000000000 +0000 -@@ -45,6 +47,9 @@ - #include <string.h> - #include <unistd.h> - #else -+#if defined(__UCLIBC__) -+# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp)) -+#endif - #if defined(hpux) || defined(__hpux) - # define _INCLUDE_POSIX_SOURCE - # define __errno_location() (&errno) diff --git a/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch b/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch deleted file mode 100644 index 60f1c78cc..000000000 --- a/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru rpm-4.4.9_vanilla/rpmio/rpmio.h rpm-4.4.9_uclibc-vs-cookie-seek-pointer/rpmio/rpmio.h ---- rpm-4.4.9_vanilla/rpmio/rpmio.h 2007-04-28 15:55:33.000000000 +0000 -+++ rpm-4.4.9_uclibc-vs-cookie-seek-pointer/rpmio/rpmio.h 2008-03-22 07:28:07.000000000 +0000 -@@ -31,7 +31,7 @@ - * typedefs to isolate the lossage. - */ - /*@{*/ --#if !defined(__LCLINT__) && defined(__GLIBC__) && \ -+#if !defined(__LCLINT__) && defined(__GLIBC__) && !defined(__UCLIBC__) && \ - (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) - #define USE_COOKIE_SEEK_POINTER 1 - typedef _IO_off64_t _libio_off_t; diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index d83f0d49e..2b83b6481 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -3,9 +3,10 @@ # rpm # ############################################################# -RPM_VERSION = 5.1.1 +RPM_VERSION = 5.1.6 RPM_SITE = http://rpm5.org/files/rpm/rpm-5.1/ RPM_AUTORECONF = YES +RPM_LIBTOOL_PATCH = NO RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt |