From b5280b8b3f7940456afe583eebc27ab71d5066d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 25 Oct 2014 14:18:36 +0200 Subject: [PATCH] - updated to 5.4.15 --- rpm-db5.2.patch | 6 +++--- rpm-payload-use-hashed-inode.patch | 18 ------------------ rpm-verify-ghosts-broken-logic.patch | 4 ++-- rpm.spec | 23 ++++++----------------- 4 files changed, 11 insertions(+), 40 deletions(-) diff --git a/rpm-db5.2.patch b/rpm-db5.2.patch index 4530ba8..08e5602 100644 --- a/rpm-db5.2.patch +++ b/rpm-db5.2.patch @@ -4,7 +4,7 @@ MYPATH=$PATH fi --DBXY=db60 +-DBXY=db61 +DBXY=db5.2 AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH) @@ -13,7 +13,7 @@ CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}" RPM_CHECK_LIB( [Berkeley-DB], [db], -- [db-6.0], [db_create], [db.h], +- [db-6.1], [db_create], [db.h], + [db-5.2], [db_create], [db.h], [yes,external], [db3], [ DBLIBSRCS="$DBLIBSRCS db3.c" @@ -22,7 +22,7 @@ dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS. RPM_CHECK_LIB( [Berkeley-DB (+SQLite3)], [dbsql], -- [db_sql-6.0], [sqlite3_open], [dbsql.h], +- [db_sql-6.1], [sqlite3_open], [dbsql.h], + [db_sql-5.2], [sqlite3_open], [dbsql.h], [yes,external], [db3/sql], [ diff --git a/rpm-payload-use-hashed-inode.patch b/rpm-payload-use-hashed-inode.patch index f3d860b..05e2447 100644 --- a/rpm-payload-use-hashed-inode.patch +++ b/rpm-payload-use-hashed-inode.patch @@ -103,21 +103,3 @@ diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c } ui32 = fl->totalFileSize; ---- rpm-5.4.10/lib/fsm.c~ -+++ rpm-5.4.10/lib/fsm.c -@@ -898,6 +898,7 @@ int fsmMapAttrs(IOSM_t fsm) - - if (fi && i >= 0 && i < (int) fi->fc) { - mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms); -+ ino_t finalInode = (fi->finodes ? (ino_t)fi->finodes[i] : 0); - mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms); - dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0); - rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0); -@@ -937,6 +938,7 @@ int fsmMapAttrs(IOSM_t fsm) - if ((S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) - && st->st_nlink == 0) - st->st_nlink = 1; -+ st->st_ino = finalInode; - st->st_rdev = finalRdev; - st->st_mtime = finalMtime; - } diff --git a/rpm-verify-ghosts-broken-logic.patch b/rpm-verify-ghosts-broken-logic.patch index 07b6ab7..a9284c8 100644 --- a/rpm-verify-ghosts-broken-logic.patch +++ b/rpm-verify-ghosts-broken-logic.patch @@ -1,10 +1,10 @@ --- rpm-5.4.10/lib/verify.c.orig 2012-09-22 18:33:59.791810053 +0200 +++ rpm-5.4.10/lib/verify.c 2012-09-22 18:33:34.921810920 +0200 @@ -594,7 +594,7 @@ + continue; /* If not verifying %ghost, skip ghost files. */ - /* XXX the broken!!! logic disables %ghost queries always. */ -- if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST))) +- if (!FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)) + if (FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)) continue; diff --git a/rpm.spec b/rpm.spec index d4ae0e6..a7b2b2f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -49,13 +49,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 5.4.14 -Release: 6 +Version: 5.4.15 +Release: 0.1 License: LGPL v2.1 Group: Base -# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm +# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm Source0: %{name}-%{version}.tar.gz -# Source0-md5: 9bd3fef1170f26a223a149dc1113c23c +# Source0-md5: 4067f83ca8b5bf1a21e443c0cff3efa0 Source100: cpu-os-macros.tar.gz # Source100-md5: 928034a5bdceb398881bc14b5f29973b Source1: %{name}.groups @@ -960,7 +960,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch1038 -p1 %patch1039 -p1 %patch1040 -p1 -%patch1041 -p1 +# don't delete, may be usefull if jbj descides to enable this again +#%patch1041 -p1 %patch1042 -p1 %patch1043 -p1 %patch1044 -p1 @@ -1257,8 +1258,6 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio # wrong location, not used anyway %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd} -# utils dropped in 4.4.8 -- their manuals -%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/rpmgraph.8 # utils dropped in 5.4 -- their manuals %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rpmgrep.1 # script obsoleted by /usr/lib/rpm/bin/dbconvert binary @@ -1325,7 +1324,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_mandir}/man8/rpm.8* %lang(fr) %{_mandir}/fr/man8/rpm.8* %lang(ja) %{_mandir}/ja/man8/rpm.8* -%lang(ko) %{_mandir}/ko/man8/rpm.8* %lang(pl) %{_mandir}/pl/man8/rpm.8* %lang(ru) %{_mandir}/ru/man8/rpm.8* %lang(sk) %{_mandir}/sk/man8/rpm.8* @@ -1389,7 +1387,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rpm %dir %{_rpmlibdir} %attr(755,root,root) %{_bindir}/banner.sh -%attr(755,root,root) %{_bindir}/multiarch-dispatch %attr(755,root,root) %{_rpmlibdir}/user_group.sh %dir /var/lib/banner @@ -1418,7 +1415,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so %{_libdir}/librpm*.la %{_includedir}/rpm -%{_includedir}/multiarch-dispatch.h %{_pkgconfigdir}/*.pc %files static @@ -1455,15 +1451,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{?with_keyutils:%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey} %attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo %{_mandir}/man8/rpm2cpio.8* -%{_mandir}/man8/rpmcache.8* %{_mandir}/man8/rpmconstant.8* %{_mandir}/man8/rpmdeps.8* %{_mandir}/man8/rpmmtree.8* %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8* -%lang(ja) %{_mandir}/ja/man8/rpmcache.8* -%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8* %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8* -%lang(pl) %{_mandir}/pl/man8/rpmcache.8* %lang(pl) %{_mandir}/pl/man8/rpmdeps.8* %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8* @@ -1535,13 +1527,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/macros.php %{_rpmlibdir}/macros.python -%attr(755,root,root) %{_rpmlibdir}/check-multiarch-files %attr(755,root,root) %{_rpmlibdir}/gstreamer.sh %attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh -%attr(755,root,root) %{_rpmlibdir}/mkmultiarch %attr(755,root,root) %{_bindir}/gendiff -%attr(755,root,root) %{_bindir}/multiarch-platform %attr(755,root,root) %{_bindir}/rpmbuild %dir %{_rpmlibdir}/helpers -- 2.43.0