Commit f16a9799 authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Bumped rpm

parent 9400c735

package/rpm/Config.in

+23 −4
Original line number Diff line number Diff line 
config BR2_PACKAGE_RPM

	bool "rpm"

	select BR2_PACKAGE_ZLIB

	select BR2_PACKAGE_BZIP2

	select BR2_PACKAGE_BEECRYPT

	select BR2_PACKAGE_POPT

	select BR2_PACKAGE_OPENSSL

	select BR2_PACKAGE_NEON

	select BR2_PACKAGE_NEON_ZLIB

	select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2

	select BR2_PACKAGE_NEON_SSL

	help

	  The RPM package management system.



	  http://rpm5.org



config BR2_PACKAGE_RPM_BZIP2_PAYLOADS

	bool "support for bzip2 payloads"

	depends on BR2_PACKAGE_RPM

	select BR2_PACKAGE_BZIP2

	help

	  Support for bzip2 payloads in RPM.



config BR2_PACKAGE_RPM_XZ_PAYLOADS

	bool "support for xz payloads"

	depends on BR2_PACKAGE_RPM

	depends on BR2_GCC_CROSS_CXX

	help

	  Support for xz payloads in RPM.



comment "xz payload support requires a toolchain with c++ support"

	depends on !BR2_GCC_CROSS_CXX

package/rpm/rpm-5.1.6_exclude-some-tools.patch

deleted100755 → 0
+0 −12
Original line number Diff line number Diff line 
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@

package/rpm/rpm-5.1.6_magic-file-fix.patch

deleted100755 → 0
+0 −40
Original line number Diff line number Diff line 
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,

package/rpm/rpm-5.2.0_depends-fix.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Bugfix included upstream



diff -u --new-file --recursive rpm-5.2.0_vanilla/lib/depends.c rpm-5.2.0_depends-fix/lib/depends.c

--- rpm-5.2.0_vanilla/lib/depends.c	2009-05-23 01:23:46.000000000 +0000

+++ rpm-5.2.0_depends-fix/lib/depends.c	2009-09-22 06:33:37.950783501 +0000

@@ -2371,11 +2371,11 @@

 

 	memset(selected, 0, sizeof(*selected) * ts->orderCount);

 

-      if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) {

-

 	/* Avoid narcisstic relations. */

 	selected[rpmtsiOc(pi)] = 1;

 

+      if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) {

+

 	/* T2. Next "q <- p" relation. */

 

 	/* First, do pre-requisites. */

package/rpm/rpm-5.2.0_exclude-some-tools.patch

0 → 100644
+30 −0
Original line number Diff line number Diff line 
diff -ru rpm-5.2.0_vanilla/tools/Makefile.am rpm-5.2.0_exclude-some-tools/tools/Makefile.am

--- rpm-5.2.0_vanilla/tools/Makefile.am	2009-06-03 01:24:42.000000000 +0000

+++ rpm-5.2.0_exclude-some-tools/tools/Makefile.am	2009-12-20 07:47:13.000000000 +0000

@@ -45,9 +45,7 @@

 bin_PROGRAMS =		rpm2cpio

 

 pkgbindir =		@USRLIBRPM@/bin

-pkgbin_PROGRAMS =	\

-	rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \

-	rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@

+pkgbin_PROGRAMS =	

 dist_man_MANS =		rpmgrep.1

 

 debugedit_SOURCES =	debugedit.c hashtab.c

diff -ru rpm-5.2.0_vanilla/tools/Makefile.in rpm-5.2.0_exclude-some-tools/tools/Makefile.in

--- rpm-5.2.0_vanilla/tools/Makefile.in	2009-07-07 21:14:06.000000000 +0000

+++ rpm-5.2.0_exclude-some-tools/tools/Makefile.in	2009-12-20 07:47:37.000000000 +0000

@@ -39,11 +39,7 @@

 target_triplet = @target@

 EXTRA_PROGRAMS = rpmkey$(EXEEXT) debugedit$(EXEEXT)

 bin_PROGRAMS = rpm2cpio$(EXEEXT)

-pkgbin_PROGRAMS = rpmcache$(EXEEXT) rpmdigest$(EXEEXT) grep$(EXEEXT) \

-	mtree$(EXEEXT) rpmrepo$(EXEEXT) rpmspecdump$(EXEEXT) \

-	wget$(EXEEXT) rpmcmp$(EXEEXT) rpmdeps$(EXEEXT) \

-	@WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ $(am__EXEEXT_1) \

-	$(am__EXEEXT_2)

+pkgbin_PROGRAMS = 

 @WITH_XAR_TRUE@am__append_1 = txar

 @WITH_DB_INTERNAL_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_2 = db_tool

 @WITH_DB_INTERNAL_TRUE@@WITH_DB_RPC_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_3 = \