Hello community,
here is the log from the commit of package rpm for openSUSE:Factory
checked in at Fri May 20 14:41:23 CEST 2011.
--------
--- rpm/rpm.changes 2011-05-19 15:15:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2011-05-20
13:31:31.000000000 +0200
@@ -1,0 +2,5 @@
+Fri May 20 13:28:37 CEST 2011 - m...@suse.de
+
+- get rid of "unexpectedly shrank by one" error
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.XDOt29/_old 2011-05-20 14:40:48.000000000 +0200
+++ /var/tmp/diff_new_pack.XDOt29/_new 2011-05-20 14:40:48.000000000 +0200
@@ -26,7 +26,7 @@
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.9.0
-Release: 3
+Release: 4
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.XDOt29/_old 2011-05-20 14:40:48.000000000 +0200
+++ /var/tmp/diff_new_pack.XDOt29/_new 2011-05-20 14:40:48.000000000 +0200
@@ -29,7 +29,7 @@
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.9.0
-Release: 5
+Release: 7
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
++++++ debugedit-canon-fix.diff ++++++
--- /var/tmp/diff_new_pack.XDOt29/_old 2011-05-20 14:40:48.000000000 +0200
+++ /var/tmp/diff_new_pack.XDOt29/_new 2011-05-20 14:40:48.000000000 +0200
@@ -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 @@
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);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
