diff --git a/debugsource-package.diff b/debugsource-package.diff index e0428d0..775fcb2 100644 --- a/debugsource-package.diff +++ b/debugsource-package.diff @@ -40,9 +40,9 @@ Index: b/scripts/find-debuginfo.sh $strict || strict_error=WARNING -# Strip ELF binaries --find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | +-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort | +# Strip ELF binaries (and no static libraries) -+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | ++find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort | xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' | while read nlinks inum f; do case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in diff --git a/finddebuginfo.diff b/finddebuginfo.diff index d4d2efc..d32d5b6 100644 --- a/finddebuginfo.diff +++ b/finddebuginfo.diff @@ -45,7 +45,7 @@ Index: scripts/find-debuginfo.sh - -print | -file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | -xargs --no-run-if-empty stat -c '%h %D_%i %n' | -+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | ++find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort | +xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' | while read nlinks inum f; do + case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in diff --git a/lzma-payload-2.diff b/lzma-payload-2.diff index c3a4115..d0e9993 100644 --- a/lzma-payload-2.diff +++ b/lzma-payload-2.diff @@ -399,3 +399,56 @@ Index: rpmio/rpmio.c } else { /* XXX need to check ufdio/gzdio/bzdio/fdio errors correctly. */ ec = (fdFileno(fd) < 0 ? -1 : 0); +--- rpmio/rpmio.c 2009-02-11 10:48:50.000000000 +0100 ++++ rpmio.c 2009-02-11 12:32:05.000000000 +0100 +@@ -2834,11 +2834,12 @@ + lzfile->file = fp; + lzfile->encoding = encoding; + lzfile->eof = 0; +- lzfile->strm = LZMA_STREAM_INIT_VAR; ++ lzma_stream tmp = LZMA_STREAM_INIT; ++ lzfile->strm = tmp; ++ + if (encoding) { +- lzma_options_alone alone; +- alone.uncompressed_size = LZMA_VLI_VALUE_UNKNOWN; +- memcpy(&alone.lzma, &lzma_preset_lzma[level - 1], sizeof(alone.lzma)); ++ lzma_options_lzma alone; ++ lzma_lzma_preset(&alone, level - 1); + ret = lzma_alone_encoder(&lzfile->strm, &alone); + } else { + ret = lzma_auto_decoder(&lzfile->strm, 0, 0); +--- rpmio.orig/rpmio.c 2009-02-12 15:13:46.000000000 +0100 ++++ rpmio/rpmio.c 2009-02-12 15:58:36.000000000 +0100 +@@ -2842,7 +2842,7 @@ + lzma_lzma_preset(&alone, level - 1); + ret = lzma_alone_encoder(&lzfile->strm, &alone); + } else { +- ret = lzma_auto_decoder(&lzfile->strm, 0, 0); ++ ret = lzma_alone_decoder(&lzfile->strm, UINT64_C(1) << 24); + } + if (ret != LZMA_OK) { + fclose(fp); +@@ -2918,12 +2918,19 @@ + lzfile->eof = 1; + return len - lzfile->strm.avail_out; + } +- if (ret != LZMA_OK) ++ if (ret == LZMA_MEMLIMIT_ERROR) { ++ ret = lzma_memlimit_set(&lzfile->strm, 1 << 31); ++ continue; ++ } ++ if (ret != LZMA_OK) { + return -1; +- if (!lzfile->strm.avail_out) ++ } ++ if (!lzfile->strm.avail_out) { + return len; +- if (eof) ++ } ++ if (eof) { + return -1; ++ } + } + } + diff --git a/rpm-python.changes b/rpm-python.changes index a5a836a..fb4f96b 100644 --- a/rpm-python.changes +++ b/rpm-python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 12 16:52:26 CET 2009 - ro@suse.de + +- adapt buildrequires + ------------------------------------------------------------------- Wed Oct 8 11:24:22 CEST 2008 - cthiel@suse.de diff --git a/rpm-python.spec b/rpm-python.spec index 57ff87a..f396cfd 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -19,12 +19,12 @@ Name: rpm-python -BuildRequires: libbz2-devel libelf-devel libselinux-devel lzma-alpha-devel ncurses-devel python-devel zlib-devel +BuildRequires: libbz2-devel libelf-devel libselinux-devel ncurses-devel python-devel xz-devel zlib-devel License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 27 +Release: 33 Requires: rpm = %{version} %py_requires Source99: rpm.spec @@ -69,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python* %changelog +* Thu Feb 12 2009 ro@suse.de +- adapt buildrequires * Wed Oct 08 2008 cthiel@suse.de - added libelf-devel to BuildRequires to fix build * Thu Sep 11 2008 mls@suse.de diff --git a/rpm.changes b/rpm.changes index 6b96a6f..5c8516f 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Feb 11 14:01:51 CET 2009 - coolo@suse.de + +- sort the result of find to make symlinks stable in finddebuginfo + +------------------------------------------------------------------- +Wed Feb 11 13:02:12 CET 2009 - coolo@suse.de + +- adapt to new API of xz, sticking with the old LZMA format (not XZ) + ------------------------------------------------------------------- Mon Feb 9 14:16:52 CET 2009 - ro@suse.de diff --git a/rpm.spec b/rpm.spec index b38cb2f..0204042 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,14 +20,14 @@ Name: rpm License: GPL v2 or later Group: System/Packages -BuildRequires: libbz2-devel libelf-devel libselinux-devel lzma-alpha-devel ncurses-devel zlib-devel +BuildRequires: libbz2-devel libelf-devel libselinux-devel ncurses-devel xz-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.3 -Release: 27 +Release: 33 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -146,7 +146,7 @@ Summary: Include Files and Libraries mandatory for Development License: GPL v2 or later Group: System/Packages Requires: rpm-devel = %{version} -Requires: zlib-devel bzip2 libbz2-devel lzma-alpha-devel libselinux-devel libebl-devel +Requires: zlib-devel bzip2 libbz2-devel xz-devel libselinux-devel libebl-devel %description devel-static This package contains the RPM C library and header files. These @@ -332,7 +332,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 475 +Release: 481 # bug437293 %ifarch ppc64 Obsoletes: popt-64bit @@ -360,7 +360,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 475 +Release: 481 Requires: popt = 1.7 Requires: glibc-devel # bug437293 @@ -400,6 +400,10 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Wed Feb 11 2009 coolo@suse.de +- sort the result of find to make symlinks stable in finddebuginfo +* Wed Feb 11 2009 coolo@suse.de +- adapt to new API of xz, sticking with the old LZMA format (not XZ) * Mon Feb 09 2009 ro@suse.de - define disttag as optional tag with macro just like disturl * Thu Jan 29 2009 olh@suse.de