From: Arkadiusz Miśkiewicz Date: Tue, 17 Oct 2006 18:59:50 +0000 (+0000) Subject: - update for 4.4.7 X-Git-Tag: auto/th/rpm-4_4_7-0_1~11 X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=ed809d1d4f61edb01b21523b99f09fdf7b9f02db - update for 4.4.7 Changed files: rpm-lzma2.patch -> 1.6 rpm-magic-usesystem.patch -> 1.8 rpm-old-fileconflicts-behaviour.patch -> 1.2 rpm-provides-dont-obsolete.patch -> 1.2 rpm-rpmpopt.patch -> 1.22 rpm-rpmrc.patch -> 1.37 rpm-skip-backups.patch -> 1.2 rpm-system_libs-more.patch -> 1.8 rpm-system_libs.patch -> 1.18 --- diff --git a/rpm-lzma2.patch b/rpm-lzma2.patch index 437e08b..3db9c47 100644 --- a/rpm-lzma2.patch +++ b/rpm-lzma2.patch @@ -36,9 +36,9 @@ diff -Nru rpm-4.4.5.old/lib/rpmds.c rpm-4.4.5/lib/rpmds.c + { "rpmlib(PayloadIsLzma)", "4.4.6-1", + (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), + N_("package payload can be compressed using lzma.") }, - { NULL, NULL, 0, NULL } - }; - + { "rpmlib(FileDigestParameterized)", "4.4.6-1", + (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), + N_("file digests can be other than MD5.") }, diff -Nru rpm-4.4.5.old/rpm2cpio.c rpm-4.4.5/rpm2cpio.c --- rpm-4.4.5.old/rpm2cpio.c 2005-01-17 19:46:16.000000000 +0100 +++ rpm-4.4.5/rpm2cpio.c 2006-04-22 17:18:55.000000000 +0200 @@ -65,23 +65,25 @@ diff -Nru rpm-4.4.5.old/rpmio/librpmio.vers rpm-4.4.5/rpmio/librpmio.vers diff -Nru rpm-4.4.5.old/rpmio/Makefile.am rpm-4.4.5/rpmio/Makefile.am --- rpm-4.4.5.old/rpmio/Makefile.am 2006-04-22 15:02:56.000000000 +0200 +++ rpm-4.4.5/rpmio/Makefile.am 2006-04-23 13:31:09.000000000 +0200 -@@ -22,14 +22,14 @@ - argv.h fts.h rmd128.h rmd160.h rpmdav.h \ +@@ -24,7 +24,7 @@ rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \ rpmsq.h rpmsw.h ugid.h --noinst_HEADERS = rpmio_internal.h rpmlua.h rpmhook.h -+noinst_HEADERS = LzmaDecode.h rpmio_internal.h rpmlua.h rpmhook.h + noinst_HEADERS = md2.h md4.h rmd128.h rmd160.h tiger.h \ +- rpmio_internal.h rpmlua.h rpmhook.h ++ LzmaDecode.h rpmio_internal.h rpmlua.h rpmhook.h BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) - usrlibdir = $(libdir)@MARK64@ - usrlib_LTLIBRARIES = librpmio.la - librpmio_la_SOURCES = \ -- argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \ -+ LzmaDecode.c argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \ - rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \ +@@ -34,7 +34,8 @@ + argv.c digest.c fts.c macro.c md2.c md4.c rmd128.c rmd160.c tiger.c \ + rpmdav.c rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \ rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c strtolocale.c \ - stubs.c url.c ugid.c +- stubs.c url.c ugid.c ++ stubs.c url.c ugid.c \ ++ LzmaDecode.c + librpmio_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \ + @WITH_BEECRYPT_LIB@ \ + @WITH_NEON_LIB@ \ diff -Nru rpm-4.4.5.old/rpmio/rpmio.c rpm-4.4.5/rpmio/rpmio.c --- rpm-4.4.5.old/rpmio/rpmio.c 2006-04-22 15:02:55.000000000 +0200 +++ rpm-4.4.5/rpmio/rpmio.c 2006-04-23 14:43:10.000000000 +0200 diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch index 84d8339..b1b148d 100644 --- a/rpm-magic-usesystem.patch +++ b/rpm-magic-usesystem.patch @@ -1,14 +1,3 @@ ---- rpm/build/rpmfc.c.orig 2004-11-22 11:39:55.000000000 +0100 -+++ rpm/build/rpmfc.c 2004-11-22 18:09:14.400710096 +0100 -@@ -1432,7 +1432,7 @@ - int fcolor; - int xx; - /*@observer@*/ -- static const char * magicfile = "/usr/lib/rpm/magic"; -+ static const char * magicfile = "/usr/share/file/magic"; - int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ - magic_t ms = NULL; - diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am --- rpm.org/file/doc/Makefile.am 2004-11-18 15:04:33.000000000 +0100 +++ rpm/file/doc/Makefile.am 2004-11-22 01:02:30.114807597 +0100 @@ -18,7 +7,6 @@ diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am if FSECT5 man_MAGIC = magic.5 else -Tylko w rpm/file/doc: Makefile.am~ diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am --- rpm.org/file/Makefile.am 2004-11-18 15:04:32.000000000 +0100 +++ rpm/file/Makefile.am 2004-11-22 01:01:36.817958788 +0100 @@ -28,7 +16,6 @@ diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am -SUBDIRS = src magic doc python +SUBDIRS = src magic python -Tylko w rpm/file: Makefile.am.orig diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am --- rpm.org/file/src/Makefile.am 2004-11-18 15:04:33.000000000 +0100 +++ rpm/file/src/Makefile.am 2004-11-22 01:01:36.823963503 +0100 @@ -45,13 +32,13 @@ diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am --- rpm.org/tools/Makefile.am 2004-11-22 00:56:22.484205000 +0100 +++ rpm/tools/Makefile.am 2004-11-22 01:03:05.178339563 +0100 @@ -30,7 +30,7 @@ - pkgbindir = @RPMCONFIGDIR@ - pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile + pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \ + rpmcache rpmdeps rpmfile -MAGIC = $(pkgbindir)/magic +MAGIC = /usr/share/file/magic - bin_PROGRAMS = rpmgraph + bin_PROGRAMS = rpmdigest rpmgraph diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am --- rpm-4.4.2.org/tools/Makefile.am 2005-09-03 16:35:22.169432000 +0200 @@ -60,8 +47,9 @@ diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am noinst_PROGRAMS = dumpdb pkgbindir = @RPMCONFIGDIR@ --pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile -+pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps @WITH_RPMFILE@ + pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \ +- rpmcache rpmdeps rpmfile ++ rpmcache rpmdeps @WITH_RPMFILE@ MAGIC = /usr/share/file/magic - bin_PROGRAMS = rpmgraph + bin_PROGRAMS = rpmdigest rpmgraph diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch index 1535409..9869de2 100644 --- a/rpm-old-fileconflicts-behaviour.patch +++ b/rpm-old-fileconflicts-behaviour.patch @@ -1,15 +1,14 @@ --- rpm-4.4.4/lib/poptI.c.orig 2005-11-27 13:50:16.000000000 +0000 +++ rpm-4.4.4/lib/poptI.c 2005-12-28 02:43:01.029574304 +0000 -@@ -16,8 +16,7 @@ +@@ -16,7 +16,7 @@ + /*@-fullinitblock@*/ /*@unchecked@*/ - struct rpmInstallArguments_s rpmIArgs = { - 0, /* transFlags */ -- /* probFilter */ -- (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), -+ 0, /* probFilter */ - 0, /* installInterfaceFlags */ - 0, /* eraseInterfaceFlags */ - 0, /* qva_flags */ + struct rpmQVKArguments_s rpmIArgs = { +- .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), ++ .probFilter = 0, + }; + /*@=fullinitblock@*/ + @@ -274,9 +273,6 @@ N_("skip files with leading component "), N_("") }, diff --git a/rpm-provides-dont-obsolete.patch b/rpm-provides-dont-obsolete.patch index 51d1d7f..1054bdc 100644 --- a/rpm-provides-dont-obsolete.patch +++ b/rpm-provides-dont-obsolete.patch @@ -1,15 +1,17 @@ --- rpm-4.3/lib/depends.c.orig 2003-05-15 18:16:51.000000000 +0200 +++ rpm-4.3/lib/depends.c 2003-06-29 00:17:42.000000000 +0200 -@@ -254,7 +254,11 @@ +@@ -343,8 +343,12 @@ /* On upgrade, erase older packages of same color (if any). */ -- mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, rpmteN(p), 0); + /* NOTE: in PLD we don't want to remove packages which only provided + * %{name} (e.g. perl-modules in case of some newer perl modules), + * so we use NAME instead of PROVIDENAME (as in vanilla rpm) here */ + + if (!(depFlags & RPMDEPS_FLAG_NOUPGRADE)) { +- mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, rpmteN(p), 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0); while((oh = rpmdbNextIterator(mi)) != NULL) { - - /* Ignore colored packages not in our rainbow. */ + int lastx; + rpmte q; + diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch index bf8d6af..f3adb43 100644 --- a/rpm-rpmpopt.patch +++ b/rpm-rpmpopt.patch @@ -17,9 +17,9 @@ rpmbuild alias --dbpath --define '_dbpath !#:+' \ --POPTdesc=$"use database in DIRECTORY" \ @@ -261,6 +270,15 @@ - rpmbuild alias --without --define "_without_!#:+ --without-!#:+" \ - --POPTdesc=$"disable configure