From 9eda46db56a4d8f45124a09f24e2301d4cc6173cbf87794c1c0fc67ef7074f5f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 19 May 2011 14:04:31 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/rpm revision 133.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=3ed7e48fe091468a4171df6dc6eb3bdd --- rpm-python.spec | 2 +- rpm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 945b80f..d36cddf 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -26,7 +26,7 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.0 -Release: 2 +Release: 3 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.spec b/rpm.spec index 1f2b962..e5130ee 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.0 -Release: 3 +Release: 5 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 From 40d3d5dc9adf530c7e72c3d5fd32cb6cc57f91cd9234d13a4f51e89cd5a3340a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 20 May 2011 11:31:31 +0000 Subject: [PATCH 2/2] - get rid of "unexpectedly shrank by one" error OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=114 --- debugedit-canon-fix.diff | 26 ++++++++++++++++++-------- rpm.changes | 5 +++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/debugedit-canon-fix.diff b/debugedit-canon-fix.diff index 2434272..f2be21b 100644 --- a/debugedit-canon-fix.diff +++ b/debugedit-canon-fix.diff @@ -1,10 +1,5 @@ -Subject: Fix path canonicalization issues in debugedit - -This patch fixes multiple problems with path canonicalization in -debugedit. This version of debugedit is taken from the dwarftools repository. - ---- ./tools/debugedit.c.orig 2011-05-11 15:31:31.000000000 +0000 -+++ ./tools/debugedit.c 2011-05-11 15:54:49.000000000 +0000 +--- ./tools/debugedit.c.orig 2011-05-20 11:26:04.000000000 +0000 ++++ ./tools/debugedit.c 2011-05-20 11:27:56.000000000 +0000 @@ -158,7 +158,7 @@ strptr (DSO *dso, int sec, off_t offset) { if (data->d_buf @@ -76,7 +71,22 @@ debugedit. This version of debugedit is taken from the dwarftools repository. char *orig = strdup ((const char *) srcptr); -@@ -756,21 +761,26 @@ edit_dwarf2_line (DSO *dso, uint32_t off +@@ -717,10 +722,13 @@ edit_dwarf2_line (DSO *dso, uint32_t off + + if (shrank > 0) + { +- if (--shrank == 0) ++ --shrank; ++#if 0 ++ if (shrank == 0) + error (EXIT_FAILURE, 0, + "canonicalization unexpectedly shrank by one character"); + else ++#endif + { + memset (ptr, 'X', shrank); + ptr += shrank; +@@ -756,21 +764,26 @@ edit_dwarf2_line (DSO *dso, uint32_t off } dirty_section (DEBUG_STR); } diff --git a/rpm.changes b/rpm.changes index b507303..955ed73 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 20 13:28:37 CEST 2011 - mls@suse.de + +- get rid of "unexpectedly shrank by one" error + ------------------------------------------------------------------- Thu May 19 14:51:13 CEST 2011 - mls@suse.de