Hello community,
here is the log from the commit of package rpm
checked in at Fri Mar 21 02:12:37 CET 2008.
--------
--- rpm/rpm.changes 2008-02-21 22:00:52.000000000 +0100
+++ rpm/rpm.changes 2008-03-21 02:09:52.999594000 +0100
@@ -1,0 +2,28 @@
+Tue Mar 18 17:12:00 CET 2008 - mls@suse.de
+
+- make ia32 compatible to ia64, like it was in SLES9 [bnc#367705]
+- fix memory leak and endless loops in lzma code
+- make rpm provide the right lzma rpmlib name
+
+-------------------------------------------------------------------
+Tue Mar 18 13:33:25 CET 2008 - schwab@suse.de
+
+- Fix broken db configuration.
+
+-------------------------------------------------------------------
+Fri Mar 14 21:54:57 CET 2008 - coolo@suse.de
+
+- change it to the "alone" file format used by stable
+ distributions of 7zip and lzma
+
+-------------------------------------------------------------------
+Fri Mar 14 18:05:18 CET 2008 - coolo@suse.de
+
+- daring some more compression time to get an overall picture
+
+-------------------------------------------------------------------
+Thu Mar 13 08:11:47 CET 2008 - coolo@suse.de
+
+- support lzma payload using liblzma
+
+-------------------------------------------------------------------
New:
----
lzma-payload-2.diff
lzma-payload.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.ro6615/_old 2008-03-21 02:11:27.000000000 +0100
+++ /var/tmp/diff_new_pack.ro6615/_new 2008-03-21 02:11:27.000000000 +0100
@@ -17,7 +17,7 @@
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
-Release: 212
+Release: 220
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.ro6615/_old 2008-03-21 02:11:27.000000000 +0100
+++ /var/tmp/diff_new_pack.ro6615/_new 2008-03-21 02:11:27.000000000 +0100
@@ -14,14 +14,14 @@
Name: rpm
License: GPL v2 or later
Group: System/Packages
-BuildRequires: libbz2-devel ncurses-devel zlib-devel
+BuildRequires: libbz2-devel lzma-alpha-devel ncurses-devel zlib-devel
Provides: rpminst
%define popt_version 1.7
PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2
-Release: 170
+Release: 177
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@@ -130,6 +130,8 @@
Patch101: lzma.diff
Patch102: rpm-shorten-changelog.diff
Patch103: noautoreloc.diff
+Patch104: lzma-payload.diff
+Patch105: lzma-payload-2.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -201,6 +203,7 @@
%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
%patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
%patch -P 100 -P 101 -P 102 -P 103
+%patch -P 104 -P 105 -b .lzma
chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
tar -xjvf %{SOURCE1}
@@ -231,8 +234,6 @@
make %{?jobs:-j%jobs}
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/lib
mkdir -p $RPM_BUILD_ROOT/usr/share/locale
ln -s ../share/locale $RPM_BUILD_ROOT/usr/lib/locale
@@ -347,7 +348,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
-Release: 398
+Release: 405
#
%description -n popt
@@ -370,7 +371,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
-Release: 398
+Release: 405
Requires: popt = 1.7
Requires: glibc-devel
@@ -405,6 +406,19 @@
%doc %{_mandir}/man3/popt.3*
%changelog
+* Tue Mar 18 2008 mls@suse.de
+- make ia32 compatible to ia64, like it was in SLES9 [bnc#367705]
+- fix memory leak and endless loops in lzma code
+- make rpm provide the right lzma rpmlib name
+* Tue Mar 18 2008 schwab@suse.de
+- Fix broken db configuration.
+* Fri Mar 14 2008 coolo@suse.de
+- change it to the "alone" file format used by stable
+ distributions of 7zip and lzma
+* Fri Mar 14 2008 coolo@suse.de
+- daring some more compression time to get an overall picture
+* Thu Mar 13 2008 coolo@suse.de
+- support lzma payload using liblzma
* Thu Feb 21 2008 mls@suse.de
- do not configure autoreloc or colors
* Thu Jan 31 2008 ro@suse.de
++++++ build.diff ++++++
--- /var/tmp/diff_new_pack.ro6615/_old 2008-03-21 02:11:27.000000000 +0100
+++ /var/tmp/diff_new_pack.ro6615/_new 2008-03-21 02:11:27.000000000 +0100
@@ -2,10 +2,10 @@
on SUSE systems.
Index: Makefile.am
-===================================================================
---- Makefile.am.orig
+================================================================================
+--- Makefile.am
+++ Makefile.am
-@@ -15,7 +15,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader
+@@ -15,7 +15,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
@@ -14,9 +14,7 @@
INCLUDES = \
-I$(top_srcdir)/build \
-Index: autogen.sh
-===================================================================
---- autogen.sh.orig
+--- autogen.sh
+++ autogen.sh
@@ -26,12 +26,12 @@ case $libtoolize in
esac
@@ -49,11 +47,11 @@
if [ -d neon ]; then
(echo "--- neon"; cd neon; ./autogen.sh "$@")
fi
-+(echo "--- db"; cd db/dist; libtoolize --copy --force ; cp /usr/share/aclocal/libtool.m4 aclocal/libtool.ac ; ./s_config )
++(echo "--- db"; cd db/dist; libtoolize --copy --force ; rm aclocal/libtool.ac ; ./s_config )
echo "--- rpm"
$libtoolize --copy --force
-@@ -66,7 +68,7 @@ if [ "$1" = "--noconfigure" ]; then
+@@ -66,7 +68,7 @@ if [ "$1" = "--noconfigure" ]; then
exit 0;
fi
@@ -62,9 +60,7 @@
if [ -d /usr/share/man ]; then
mandir=/usr/share/man
infodir=/usr/share/info
-Index: build/Makefile.am
-===================================================================
---- build/Makefile.am.orig
+--- build/Makefile.am
+++ build/Makefile.am
@@ -22,7 +22,7 @@ pkgincdir = $(pkgincludedir)
pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
@@ -75,9 +71,7 @@
usrlibdir = $(libdir)@MARK64@
usrlib_LTLIBRARIES = librpmbuild.la
-Index: configure.ac
-===================================================================
---- configure.ac.orig
+--- configure.ac
+++ configure.ac
@@ -1,30 +1,3 @@
-
@@ -316,9 +310,7 @@
AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
-Index: db3/configure
-===================================================================
---- db3/configure.orig
+--- db3/configure
+++ db3/configure
@@ -10,9 +10,9 @@ rm -f config.cache
# XXX edit CFLAGS= ... out of invocation args ???
@@ -333,9 +325,7 @@
mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
-Index: file/src/Makefile.am
-===================================================================
---- file/src/Makefile.am.orig
+--- file/src/Makefile.am
+++ file/src/Makefile.am
@@ -26,7 +26,7 @@ libmagic_la_LDFLAGS = -version-info 1:0:
@@ -346,9 +336,7 @@
file_LDADD = libmagic.la
listobjs:
-Index: installplatform
-===================================================================
---- installplatform.orig
+--- installplatform
+++ installplatform
@@ -62,11 +62,11 @@ for SUBST in $SUBSTS ; do
sparcv9-linux) MULTILIBNO=1 ;;
@@ -375,9 +363,7 @@
esac
cat $PLATFORM \
-Index: lib/Makefile.am
-===================================================================
---- lib/Makefile.am.orig
+--- lib/Makefile.am
+++ lib/Makefile.am
@@ -29,7 +29,7 @@ noinst_HEADERS = \
mylibs = librpm.la
@@ -388,9 +374,7 @@
usrlibdir = $(libdir)@MARK64@
usrlib_LTLIBRARIES = librpm.la
-Index: po/Makefile.in
-===================================================================
---- po/Makefile.in.orig
+--- po/Makefile.in
+++ po/Makefile.in
@@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = /usr/bin/install -c
@@ -401,9 +385,7 @@
CC = gcc
GMSGFMT = /usr/bin/msgfmt
-Index: po/Makefile.in.in
-===================================================================
---- po/Makefile.in.in.orig
+--- po/Makefile.in.in
+++ po/Makefile.in.in
@@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
@@ -414,9 +396,7 @@
CC = @CC@
GMSGFMT = @GMSGFMT@
-Index: popt/autogen.sh
-===================================================================
---- popt/autogen.sh.orig
+--- popt/autogen.sh
+++ popt/autogen.sh
@@ -28,7 +28,7 @@ fi
@@ -427,9 +407,7 @@
$srcdir/configure --prefix=/usr "$@"
else
$srcdir/configure "$@"
-Index: popt/configure.ac
-===================================================================
---- popt/configure.ac.orig
+--- popt/configure.ac
+++ popt/configure.ac
@@ -1,11 +1,12 @@
AC_INIT(popt.h)
@@ -446,9 +424,7 @@
AC_ISC_POSIX
-Index: popt/po/Makefile.in
-===================================================================
---- popt/po/Makefile.in.orig
+--- popt/po/Makefile.in
+++ popt/po/Makefile.in
@@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = /usr/bin/install -c
@@ -459,9 +435,7 @@
CC = gcc
GMSGFMT = /usr/bin/msgfmt
-Index: popt/po/Makefile.in.in
-===================================================================
---- popt/po/Makefile.in.in.orig
+--- popt/po/Makefile.in.in
+++ popt/po/Makefile.in.in
@@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
@@ -472,9 +446,7 @@
CC = @CC@
GMSGFMT = @GMSGFMT@
-Index: rpmdb/Makefile.am
-===================================================================
---- rpmdb/Makefile.am.orig
+--- rpmdb/Makefile.am
+++ rpmdb/Makefile.am
@@ -31,7 +31,7 @@ noinst_HEADERS = fprint.h header_interna
pkgbindir = @RPMCONFIGDIR@
@@ -494,9 +466,7 @@
usrlibdir = $(libdir)@MARK64@
usrlib_LTLIBRARIES = librpmdb.la
-Index: rpmio/Makefile.am
-===================================================================
---- rpmio/Makefile.am.orig
+--- rpmio/Makefile.am
+++ rpmio/Makefile.am
@@ -24,9 +24,9 @@ pkginc_HEADERS = \
rpmsq.h rpmsw.h ugid.h
@@ -528,9 +498,7 @@
done \
fi
touch $@
-Index: scripts/Makefile.am
-===================================================================
---- scripts/Makefile.am.orig
+--- scripts/Makefile.am
+++ scripts/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = \
brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \
++++++ db.diff ++++++
--- /var/tmp/diff_new_pack.ro6615/_old 2008-03-21 02:11:27.000000000 +0100
+++ /var/tmp/diff_new_pack.ro6615/_new 2008-03-21 02:11:27.000000000 +0100
@@ -1,5 +1,5 @@
---- db/db/db.c.orig 2004-11-11 15:58:46.000000000 +0000
-+++ db/db/db.c 2005-12-15 16:17:45.000000000 +0000
+--- db/db/db.c
++++ db/db/db.c
@@ -591,6 +591,8 @@ __db_dbenv_mpool(dbp, fname, flags)
(F_ISSET(dbp, DB_AM_NOT_DURABLE) ? DB_TXN_NOT_DURABLE : 0),
0, dbp->pgsize)) != 0)
@@ -9,8 +9,8 @@
return (0);
}
---- db/db/db_iface.c.orig 2004-10-16 01:31:54.000000000 +0000
-+++ db/db/db_iface.c 2005-12-15 16:17:45.000000000 +0000
+--- db/db/db_iface.c
++++ db/db/db_iface.c
@@ -1068,7 +1068,7 @@ __db_open_arg(dbp, txn, fname, dname, ty
#define OKFLAGS \
(DB_AUTO_COMMIT | DB_CREATE | DB_DIRTY_READ | DB_EXCL | \
@@ -20,8 +20,8 @@
if ((ret = __db_fchk(dbenv, "DB->open", flags, OKFLAGS)) != 0)
return (ret);
if (LF_ISSET(DB_EXCL) && !LF_ISSET(DB_CREATE))
---- db/dbinc/db.in.orig 2004-10-16 01:31:54.000000000 +0000
-+++ db/dbinc/db.in 2005-12-15 16:17:45.000000000 +0000
+--- db/dbinc/db.in
++++ db/dbinc/db.in
@@ -260,6 +260,7 @@ struct __db_dbt {
#define DB_FCNTL_LOCKING 0x0002000 /* UNDOC: fcntl(2) locking. */
#define DB_RDWRMASTER 0x0004000 /* UNDOC: allow subdb master open R/W */
@@ -30,8 +30,8 @@
/*
* Flags private to DB_ENV->txn_begin.
---- db/dbinc/mp.h.orig 2004-10-16 01:31:54.000000000 +0000
-+++ db/dbinc/mp.h 2005-12-15 16:25:56.000000000 +0000
+--- db/dbinc/mp.h
++++ db/dbinc/mp.h
@@ -309,6 +309,7 @@ struct __mpoolfile {
#define MP_FAKE_UOC 0x080 /* Unlink_on_close field: fake flag. */
#define MP_NOT_DURABLE 0x100 /* File is not durable. */
@@ -40,8 +40,55 @@
u_int32_t flags;
};
---- db/mp/mp_sync.c.orig 2004-11-11 15:58:48.000000000 +0000
-+++ db/mp/mp_sync.c 2005-12-15 16:23:57.000000000 +0000
+--- db/dist/aclocal/options.ac
++++ db/dist/aclocal/options.ac
+@@ -277,10 +277,6 @@ fi
+
+ # Uniquename excludes C++, Java, RPC.
+ if test "$db_cv_uniquename" = "yes"; then
+- if test "$db_cv_rpc" = "yes"; then
+- AC_MSG_ERROR(
+- [--with-uniquename is not compatible with --enable-rpc])
+- fi
+ if test "$db_cv_cxx" = "yes"; then
+ AC_MSG_ERROR(
+ [--with-uniquename is not compatible with --enable-cxx])
+--- db/dist/s_config
++++ db/dist/s_config
+@@ -8,7 +8,8 @@ trap 'rm -f aclocal.m4 ; exit 0' 0 1 2 3
+ . ./RELEASE
+
+ echo "autoconf: building aclocal.m4..."
+-cat aclocal/*.ac aclocal_java/*.ac > aclocal.m4
++cat aclocal/*.ac aclocal_java/*.ac > acinclude.m4
++aclocal
+
+ echo "autoconf: running autoheader to build config.hin..."
+ rm -f config.hin
+@@ -20,14 +21,13 @@ rm -f configure
+ autoconf
+
+ # Edit version information we couldn't pre-compute.
+-(echo "1,\$s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" &&
+- echo "1,\$s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" &&
+- echo "1,\$s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" &&
+- echo "1,\$s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" &&
+- echo "1,\$s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" &&
+- echo "1,\$s/__EDIT_DB_VERSION__/$DB_VERSION/g" &&
+- echo "w" &&
+- echo "q") | ed configure
++sed -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
++ -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
++ -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
++ -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
++ -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
++ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
++ -i configure
+
+ rm -rf autom4te.cache
+ chmod 555 configure
+--- db/mp/mp_sync.c
++++ db/mp/mp_sync.c
@@ -553,7 +553,7 @@ done: /*
if (ret == 0 && (op == DB_SYNC_CACHE || op == DB_SYNC_FILE)) {
if (dbmfp == NULL)
@@ -70,42 +117,3 @@
/*
* Expects caller to be holding the region lock: we're using the path
* name and __memp_nameop might try and rename the file.
---- db/dist/s_config.orig 2003-12-15 21:42:41.000000000 +0000
-+++ db/dist/s_config 2005-02-11 14:44:09.018907747 +0000
-@@ -20,14 +20,15 @@
- autoconf
-
- # Edit version information we couldn't pre-compute.
--(echo "1,\$s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" &&
-- echo "1,\$s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" &&
-- echo "1,\$s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" &&
-- echo "1,\$s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" &&
-- echo "1,\$s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" &&
-- echo "1,\$s/__EDIT_DB_VERSION__/$DB_VERSION/g" &&
-- echo "w" &&
-- echo "q") | ed configure
-+mv configure configure.old
-+sed -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-+ -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-+ -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-+ -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-+ -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-+ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
-+< configure.old > configure
-+rm -f configure.old
-
- rm -rf autom4te.cache
- chmod 555 configure
---- db/dist/aclocal/options.ac.orig 2005-12-15 16:43:14.000000000 +0000
-+++ db/dist/aclocal/options.ac 2005-12-15 16:43:40.000000000 +0000
-@@ -277,10 +277,6 @@ fi
-
- # Uniquename excludes C++, Java, RPC.
- if test "$db_cv_uniquename" = "yes"; then
-- if test "$db_cv_rpc" = "yes"; then
-- AC_MSG_ERROR(
-- [--with-uniquename is not compatible with --enable-rpc])
-- fi
- if test "$db_cv_cxx" = "yes"; then
- AC_MSG_ERROR(
- [--with-uniquename is not compatible with --enable-cxx])
++++++ lzma-payload-2.diff ++++++
--- rpmio/rpmio.c.orig 2008-03-18 13:29:28.000000000 +0000
+++ rpmio/rpmio.c 2008-03-18 15:41:14.000000000 +0000
@@ -80,6 +80,7 @@ static int inet_aton(const char *cp, str
#define FDONLY(fd) assert(fdGetIo(fd) == fdio)
#define GZDONLY(fd) assert(fdGetIo(fd) == gzdio)
#define BZDONLY(fd) assert(fdGetIo(fd) == bzdio)
+#define LZDONLY(fd) assert(fdGetIo(fd) == lzdio)
#define UFDONLY(fd) /* assert(fdGetIo(fd) == ufdio) */
@@ -185,6 +186,8 @@ static /*@observer@*/ const char * fdbg(
} else if (fps->io == bzdio) {
sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
#endif
+ } else if (fps->io == lzdio) {
+ sprintf(be, "LZD %p fdno %d", fps->fp, fps->fdno);
} else if (fps->io == fpio) {
/*@+voidabstract@*/
sprintf(be, "%s %p(%d) fdno %d",
@@ -2629,6 +2632,348 @@ FDIO_t bzdio = /*@-compmempass@*/ &bzdio
/*@=moduncon@*/
#endif /* HAVE_BZLIB_H */
+#include