rpms/sed/F-10 sed-4.1.5-follow.patch,1.1,1.2 sed.spec,1.45,1.46
Jiří Moskovčák
jmoskovc at fedoraproject.org
Thu Nov 13 16:10:16 UTC 2008
Author: jmoskovc
Update of /cvs/extras/rpms/sed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21876
Modified Files:
sed-4.1.5-follow.patch sed.spec
Log Message:
Improved follow.patch to handle symlinks.
sed-4.1.5-follow.patch:
Index: sed-4.1.5-follow.patch
===================================================================
RCS file: /cvs/extras/rpms/sed/F-10/sed-4.1.5-follow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sed-4.1.5-follow.patch 8 Dec 2006 21:06:49 -0000 1.1
+++ sed-4.1.5-follow.patch 13 Nov 2008 16:09:45 -0000 1.2
@@ -71,10 +71,10 @@
+ buf2 [err] = '\0';
+
+ /* need to handle relative paths with care */
-+ if (buf2[0] != '/')
-+ {
+ dir = dirname (buf); // dir part of orig path
+ int len = strlen (dir); // orig path len
++ if (buf2[0] != '/' && len != 1 && dir[0] != '.')
++ {
+ buf[len] = '/';
+ strncpy (buf+len+1, buf2, bufsize - len - 1);
+ if (buf[bufsize-1] != 0)
Index: sed.spec
===================================================================
RCS file: /cvs/extras/rpms/sed/F-10/sed.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sed.spec 19 Feb 2008 20:02:13 -0000 1.45
+++ sed.spec 13 Nov 2008 16:09:46 -0000 1.46
@@ -6,7 +6,7 @@
Summary: A GNU stream text editor
Name: sed
Version: 4.1.5
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: Applications/Text
URL: http://sed.sourceforge.net/
@@ -70,6 +70,10 @@
%{_mandir}/man*/*
%changelog
+* Thu Nov 13 2008 Jiri Moskovcak <jmoskovc at redhat.com> 4.1.5-11
+- improved follow.patch (thanks to Arkadiusz Miskiewicz for initial patch)
+- Resolves: #470912
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.1.5-10
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list