From fbf185c2207166e357a2c9d6e39475785d741367 Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Apr 23 2007 10:37:25 +0000 Subject: - Fix debugedit for relative paths (#232222) - Resolves: rhbz#232222 --- diff --git a/rpm-debugedit-incremental-fix.patch b/rpm-debugedit-incremental-fix.patch new file mode 100644 index 0000000..0935a63 --- /dev/null +++ b/rpm-debugedit-incremental-fix.patch @@ -0,0 +1,33 @@ +--- rpm-4.4.2/tools/debugedit.c.jj 2007-04-20 21:27:50.000000000 +0200 ++++ rpm-4.4.2/tools/debugedit.c 2007-04-20 23:07:27.000000000 +0200 +@@ -371,9 +371,10 @@ canonicalize_path (const char *s, char * + + if (s[0] == '.' && (s[1] == 0 || IS_DIR_SEPARATOR (s[1]))) + { +- s ++; +- if (!*s && d > droot) +- d--; ++ s++; ++ if (*s) ++ while (IS_DIR_SEPARATOR (*s)) ++ ++s; + } + + else if (s[0] == '.' && s[1] == '.' +@@ -401,8 +402,6 @@ canonicalize_path (const char *s, char * + if (*s) + while (IS_DIR_SEPARATOR (*s)) + s++; +- else if (d > droot) +- d--; + } + } + else +@@ -411,7 +410,6 @@ canonicalize_path (const char *s, char * + *d++ = *s++; + } + } +- + else + { + while (*s && ! IS_DIR_SEPARATOR (*s)) diff --git a/rpm.spec b/rpm.spec index c3c9ed4..af1873e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -17,7 +17,7 @@ Summary: The RPM package management system Name: rpm Version: 4.4.2 %{expand: %%define rpm_version %{version}} -Release: 44%{?dist} +Release: 45%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source: rpm-%{rpm_version}.tar.gz @@ -66,6 +66,7 @@ Patch39: rpm-4.4.2-no-ppc-asm.patch Patch40: rpm-4.4.2-forkfailed.patch Patch41: rpm-4.4.2-cdiff.patch Patch42: rpm-4.4.2-docflags.patch +Patch43: rpm-debugedit-incremental-fix.patch License: GPL Requires: patch > 2.5 Prereq: shadow-utils @@ -210,6 +211,7 @@ shell-like rules. %patch40 -p0 -b .forkfail %patch41 -p1 -b .cdiff %patch42 -p1 -b .docflags +%patch43 -p1 -b .debugcan2 # rebuild configure for ipv6 autoconf @@ -571,6 +573,9 @@ exit 0 %{__includedir}/popt.h %changelog +* Mon Apr 23 2007 Paul Nasrat - 4.4.2-45 +- Fix debugedit for relative paths (#232222) + * Mon Apr 16 2007 Paul Nasrat - 4.4.2-44 - Set default verify flags for %%doc (#235353) - Revert to old configure line