rpms/patch/F-10 .cvsignore, 1.2, 1.3 patch-2.5.4-sigsegv.patch, 1.1, 1.2 patch-selinux.patch, 1.4, 1.5 patch.spec, 1.36, 1.37 sources, 1.2, 1.3 patch-2.5-stderr.patch, 1.1, NONE patch-2.5.4-ifdef.patch, 1.1, NONE patch-2.5.4-program_name.patch, 1.1, NONE patch-2.5.4-suffix.patch, 1.1, NONE patch-allow-spaces.patch, 1.1, NONE patch-parse.patch, 1.1, NONE patch-posix-backup.patch, 1.1, NONE patch-stripcr.patch, 1.3, NONE
Tim Waugh
twaugh at fedoraproject.org
Mon Nov 16 17:39:18 UTC 2009
- Previous message (by thread): rpms/patch/F-11 patch-2.6.tar.xz.sig, NONE, 1.1 upstream-key.gpg, NONE, 1.1 .cvsignore, 1.2, 1.3 patch-2.5.4-sigsegv.patch, 1.1, 1.2 patch-selinux.patch, 1.5, 1.6 patch.spec, 1.39, 1.40 sources, 1.2, 1.3 patch-2.5-stderr.patch, 1.1, NONE patch-2.5.4-ifdef.patch, 1.1, NONE patch-2.5.4-program_name.patch, 1.1, NONE patch-2.5.4-suffix.patch, 1.1, NONE patch-allow-spaces.patch, 1.1, NONE patch-parse.patch, 1.1, NONE patch-posix-backup.patch, 1.1, NONE patch-stripcr.patch, 1.3, NONE
- Next message (by thread): [pkgdb] perl-DBIx-Safe EL-5 cloned from devel
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/patch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10921
Modified Files:
.cvsignore patch-2.5.4-sigsegv.patch patch-selinux.patch
patch.spec sources
Removed Files:
patch-2.5-stderr.patch patch-2.5.4-ifdef.patch
patch-2.5.4-program_name.patch patch-2.5.4-suffix.patch
patch-allow-spaces.patch patch-parse.patch
patch-posix-backup.patch patch-stripcr.patch
Log Message:
* Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 2.6-1
- 2.6. No longer need stderr, suffix, stripcr, parse, allow-spaces,
ifdef, program_name, or posix-backup patches.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 9 Sep 2004 09:54:08 -0000 1.2
+++ .cvsignore 16 Nov 2009 17:39:16 -0000 1.3
@@ -1 +1,2 @@
patch-2.5.4.tar.gz
+patch-2.6.tar.xz
patch-2.5.4-sigsegv.patch:
inp.c | 8 ++++++++
inp.h | 1 +
patch.c | 5 ++++-
3 files changed, 13 insertions(+), 1 deletion(-)
Index: patch-2.5.4-sigsegv.patch
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-10/patch-2.5.4-sigsegv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- patch-2.5.4-sigsegv.patch 9 Sep 2004 09:54:22 -0000 1.1
+++ patch-2.5.4-sigsegv.patch 16 Nov 2009 17:39:17 -0000 1.2
@@ -1,11 +1,7 @@
-Bug report: #14693
-Reported by: Vincent Renardias <vincent at waw.com>
-Patch: jdassen at wi.leidenuniv.nl (J.H.M.Dassen)
-Since Version: 2.5-2
-
---- patch-2.5.orig/inp.c
-+++ patch-2.5/inp.c
-@@ -71,6 +71,14 @@
+diff -up patch-2.6/src/inp.c.sigsegv patch-2.6/src/inp.c
+--- patch-2.6/src/inp.c.sigsegv 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/inp.c 2009-11-16 09:31:52.305022200 +0000
+@@ -77,6 +77,14 @@ re_input (void)
}
}
@@ -20,9 +16,19 @@ Since Version: 2.5-2
/* Construct the line index, somehow or other. */
void
---- patch-2.5.orig/patch.c
-+++ patch-2.5/patch.c
-@@ -210,7 +210,10 @@
+diff -up patch-2.6/src/inp.h.sigsegv patch-2.6/src/inp.h
+--- patch-2.6/src/inp.h.sigsegv 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/inp.h 2009-11-16 09:32:24.440021838 +0000
+@@ -24,4 +24,5 @@ XTERN LINENUM input_lines; /* how long
+ char const *ifetch (LINENUM, bool, size_t *);
+ void get_input_file (char const *, char const *);
+ void re_input (void);
++void reset_scan_input_vars (void);
+ void scan_input (char *);
+diff -up patch-2.6/src/patch.c.sigsegv patch-2.6/src/patch.c
+--- patch-2.6/src/patch.c.sigsegv 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/patch.c 2009-11-16 09:31:52.306021801 +0000
+@@ -210,7 +210,10 @@ main (int argc, char **argv)
/* find out where all the lines are */
if (!skip_rest_of_patch)
@@ -34,11 +40,3 @@ Since Version: 2.5-2
/* from here on, open no standard i/o files, because malloc */
/* might misfire and we can't catch it easily */
---- patch-2.5.orig/inp.h
-+++ patch-2.5/inp.h
-@@ -7,4 +7,5 @@
- char const *ifetch PARAMS ((LINENUM, int, size_t *));
- void get_input_file PARAMS ((char const *, char const *));
- void re_input PARAMS ((void));
-+void reset_scan_input_vars PARAMS (());
- void scan_input PARAMS ((char *));
patch-selinux.patch:
Makefile.in | 2 +-
src/common.h | 3 +++
src/inp.c | 18 ++++++++++++++++--
src/patch.c | 15 +++++++++++++++
src/pch.c | 10 ++++++++--
src/util.c | 10 +++++++++-
src/util.h | 2 +-
7 files changed, 53 insertions(+), 7 deletions(-)
Index: patch-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-10/patch-selinux.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- patch-selinux.patch 17 Feb 2009 15:38:01 -0000 1.4
+++ patch-selinux.patch 16 Nov 2009 17:39:17 -0000 1.5
@@ -1,7 +1,19 @@
-diff -up patch-2.5.4/common.h.selinux patch-2.5.4/common.h
---- patch-2.5.4/common.h.selinux 1999-08-30 07:20:08.000000000 +0100
-+++ patch-2.5.4/common.h 2009-02-17 15:33:13.000000000 +0000
-@@ -39,6 +39,8 @@
+diff -up patch-2.6/Makefile.in.selinux patch-2.6/Makefile.in
+--- patch-2.6/Makefile.in.selinux 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/Makefile.in 2009-11-16 09:38:44.171021894 +0000
+@@ -40,7 +40,7 @@ EXEEXT = @EXEEXT@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJDIR = gl/lib/
+ LIBOBJS = @LIBOBJS@ ${LIBOBJDIR}full-write$U.o
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lselinux
+ OBJEXT = @OBJEXT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+diff -up patch-2.6/src/common.h.selinux patch-2.6/src/common.h
+--- patch-2.6/src/common.h.selinux 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/common.h 2009-11-16 09:38:12.579147244 +0000
+@@ -32,6 +32,8 @@
#include <sys/types.h>
#include <time.h>
@@ -10,7 +22,7 @@ diff -up patch-2.5.4/common.h.selinux pa
#include <sys/stat.h>
#if ! defined S_ISDIR && defined S_IFDIR
# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-@@ -168,6 +170,7 @@ XTERN char *outfile;
+@@ -118,6 +120,7 @@ XTERN char *outfile;
XTERN int inerrno;
XTERN int invc;
XTERN struct stat instat;
@@ -18,16 +30,16 @@ diff -up patch-2.5.4/common.h.selinux pa
XTERN bool dry_run;
XTERN bool posixly_correct;
-diff -up patch-2.5.4/inp.c.selinux patch-2.5.4/inp.c
---- patch-2.5.4/inp.c.selinux 2009-02-17 15:33:13.000000000 +0000
-+++ patch-2.5.4/inp.c 2009-02-17 15:33:13.000000000 +0000
-@@ -154,7 +154,20 @@ get_input_file (char const *filename, ch
+diff -up patch-2.6/src/inp.c.selinux patch-2.6/src/inp.c
+--- patch-2.6/src/inp.c.selinux 2009-11-16 09:37:57.515147431 +0000
++++ patch-2.6/src/inp.c 2009-11-16 09:40:04.782022221 +0000
+@@ -153,7 +153,20 @@ get_input_file (char const *filename, ch
char *getbuf;
if (inerrno == -1)
-- inerrno = stat (inname, &instat) == 0 ? 0 : errno;
+- inerrno = stat (filename, &instat) == 0 ? 0 : errno;
+ {
-+ inerrno = stat (inname, &instat) == 0 ? 0 : errno;
++ inerrno = stat (filename, &instat) == 0 ? 0 : errno;
+ if (inerrno == 0)
+ {
+ inerrno = getfilecon (inname, &incontext) == -1 ? errno : 0;
@@ -43,7 +55,7 @@ diff -up patch-2.5.4/inp.c.selinux patch
/* Perhaps look for RCS or SCCS versions. */
if (patch_get
-@@ -196,7 +209,7 @@ get_input_file (char const *filename, ch
+@@ -197,7 +210,7 @@ get_input_file (char const *filename, ch
}
if (cs && version_get (filename, cs, ! inerrno, elsewhere, getbuf,
@@ -52,7 +64,7 @@ diff -up patch-2.5.4/inp.c.selinux patch
inerrno = 0;
free (getbuf);
-@@ -213,6 +226,7 @@ get_input_file (char const *filename, ch
+@@ -209,6 +222,7 @@ get_input_file (char const *filename, ch
{
instat.st_mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
instat.st_size = 0;
@@ -60,43 +72,36 @@ diff -up patch-2.5.4/inp.c.selinux patch
}
else if (! S_ISREG (instat.st_mode))
fatal ("File %s is not a regular file -- can't patch",
-diff -up patch-2.5.4/Makefile.in.selinux patch-2.5.4/Makefile.in
---- patch-2.5.4/Makefile.in.selinux 1999-08-30 07:37:54.000000000 +0100
-+++ patch-2.5.4/Makefile.in 2009-02-17 15:33:13.000000000 +0000
-@@ -36,7 +36,7 @@ DEFS = @DEFS@
- EXEEXT = @EXEEXT@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lselinux
- PACKAGE = @PACKAGE@
- U = @U@
- VERSION = @VERSION@
-diff -up patch-2.5.4/patch.c.selinux patch-2.5.4/patch.c
---- patch-2.5.4/patch.c.selinux 2009-02-17 15:33:13.000000000 +0000
-+++ patch-2.5.4/patch.c 2009-02-17 15:34:42.000000000 +0000
-@@ -414,6 +414,16 @@ main (int argc, char **argv)
- if (! inerrno && chmod (outname, instat.st_mode) != 0)
- pfatal ("Can't set permissions on file %s",
- quotearg (outname));
-+ if (! inerrno && incontext) {
-+ security_context_t outcontext;
-+ getfilecon (outname, &outcontext);
-+ if (strcmp(outcontext, incontext) &&
-+ setfilecon (outname, incontext) != 0) {
+diff -up patch-2.6/src/patch.c.selinux patch-2.6/src/patch.c
+--- patch-2.6/src/patch.c.selinux 2009-11-16 09:37:57.516146641 +0000
++++ patch-2.6/src/patch.c 2009-11-16 09:41:47.676147549 +0000
+@@ -421,6 +421,21 @@ main (int argc, char **argv)
+ /* Fails if we are not in group instat.st_gid. */
+ chown (outname, -1, instat.st_gid);
+ }
++
++ if (! inerrno && incontext)
++ {
++ security_context_t outcontext;
++ if (! getfilecon (outname, &outcontext) &&
++ outcontext &&
++ strcmp(outcontext, incontext) &&
++ setfilecon (outname, incontext) != 0)
++ {
+ if (errno != ENOTSUP && errno != EPERM)
-+ pfatal ("Can't set security context on file %s",
-+ quotearg (outname));
-+ }
-+ }
- }
- }
- }
-diff -up patch-2.5.4/pch.c.selinux patch-2.5.4/pch.c
---- patch-2.5.4/pch.c.selinux 2009-02-17 15:33:13.000000000 +0000
-+++ patch-2.5.4/pch.c 2009-02-17 15:33:13.000000000 +0000
-@@ -258,7 +258,12 @@ there_is_another_patch (void)
- {
++ pfatal ("Can't set security context "
++ "on file %s", quotearg (outname));
++ }
++ }
++
+ /* FIXME: There may be other attributes to preserve. */
+ }
+ }
+diff -up patch-2.6/src/pch.c.selinux patch-2.6/src/pch.c
+--- patch-2.6/src/pch.c.selinux 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/pch.c 2009-11-16 09:42:17.453147283 +0000
+@@ -288,7 +288,12 @@ there_is_another_patch (bool need_header
+ inname[t - buf - 1] = 0;
if (stat (inname, &instat) == 0)
{
- inerrno = 0;
@@ -109,37 +114,37 @@ diff -up patch-2.5.4/pch.c.selinux patch
invc = -1;
}
else
-@@ -573,7 +578,7 @@ intuit_diff_type (void)
+@@ -662,7 +667,7 @@ intuit_diff_type (bool need_header)
if (cs)
{
- if (version_get (name[i], cs, 0, readonly,
+ if (version_get (p_name[i], cs, false, readonly,
- getbuf, &st[i]))
+ getbuf, &st[i], NULL))
stat_errno[i] = 0;
else
version_controlled[i] = 0;
-@@ -641,6 +646,7 @@ intuit_diff_type (void)
+@@ -727,6 +732,7 @@ intuit_diff_type (bool need_header)
inerrno = stat_errno[i];
invc = version_controlled[i];
instat = st[i];
+ getfilecon (inname, &incontext);
}
- for (i = OLD; i <= INDEX; i++)
-diff -up patch-2.5.4/util.c.selinux patch-2.5.4/util.c
---- patch-2.5.4/util.c.selinux 2009-02-17 15:33:13.000000000 +0000
-+++ patch-2.5.4/util.c 2009-02-17 15:33:13.000000000 +0000
-@@ -375,7 +375,8 @@ version_controller (char const *filename
- Return nonzero if successful. */
- int
- version_get (char const *filename, char const *cs, int exists, int readonly,
+ return retval;
+diff -up patch-2.6/src/util.c.selinux patch-2.6/src/util.c
+--- patch-2.6/src/util.c.selinux 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/util.c 2009-11-16 09:40:27.472147644 +0000
+@@ -574,7 +574,8 @@ version_controller (char const *filename
+ Return true if successful. */
+ bool
+ version_get (char const *filename, char const *cs, bool exists, bool readonly,
- char const *getbuf, struct stat *filestat)
+ char const *getbuf, struct stat *filestat,
+ security_context_t *filecontext)
{
if (patch_get < 0)
{
-@@ -400,6 +401,13 @@ version_get (char const *filename, char
+@@ -599,6 +600,13 @@ version_get (char const *filename, char
fatal ("Can't get file %s from %s", quotearg (filename), cs);
if (stat (filename, filestat) != 0)
pfatal ("%s", quotearg (filename));
@@ -153,15 +158,15 @@ diff -up patch-2.5.4/util.c.selinux patc
}
return 1;
-diff -up patch-2.5.4/util.h.selinux patch-2.5.4/util.h
---- patch-2.5.4/util.h.selinux 1999-08-30 07:20:08.000000000 +0100
-+++ patch-2.5.4/util.h 2009-02-17 15:33:13.000000000 +0000
-@@ -21,7 +21,7 @@ char *fetchname PARAMS ((char *, int, ti
- char *savebuf PARAMS ((char const *, size_t));
- char *savestr PARAMS ((char const *));
- char const *version_controller PARAMS ((char const *, int, struct stat const *, char **, char **));
--int version_get PARAMS ((char const *, char const *, int, int, char const *, struct stat *));
-+int version_get PARAMS ((char const *, char const *, int, int, char const *, struct stat *, security_context_t *));
- int create_file PARAMS ((char const *, int, mode_t));
- int systemic PARAMS ((char const *));
- char *format_linenum PARAMS ((char[LINENUM_LENGTH_BOUND + 1], LINENUM));
+diff -up patch-2.6/src/util.h.selinux patch-2.6/src/util.h
+--- patch-2.6/src/util.h.selinux 2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/util.h 2009-11-16 09:42:48.750148164 +0000
+@@ -51,7 +51,7 @@ char *fetchname (char *, int, char **, t
+ char *savebuf (char const *, size_t);
+ char *savestr (char const *);
+ char const *version_controller (char const *, bool, struct stat const *, char **, char **);
+-bool version_get (char const *, char const *, bool, bool, char const *, struct stat *);
++bool version_get (char const *, char const *, bool, bool, char const *, struct stat *, security_context_t *);
+ int create_file (char const *, int, mode_t, bool);
+ int systemic (char const *);
+ char *format_linenum (char[LINENUM_LENGTH_BOUND + 1], LINENUM);
Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-10/patch.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- patch.spec 17 Feb 2009 15:38:01 -0000 1.36
+++ patch.spec 16 Nov 2009 17:39:18 -0000 1.37
@@ -1,21 +1,13 @@
Summary: Utility for modifying/upgrading files
Name: patch
-Version: 2.5.4
-Release: 37%{?dist}
+Version: 2.6
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools
-Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
-Patch1: patch-2.5-stderr.patch
-Patch2: patch-2.5.4-suffix.patch
-Patch3: patch-2.5.4-sigsegv.patch
-Patch4: patch-2.5.4-ifdef.patch
-Patch5: patch-2.5.4-program_name.patch
-Patch6: patch-stripcr.patch
-Patch7: patch-parse.patch
-Patch8: patch-allow-spaces.patch
-Patch9: patch-selinux.patch
-Patch10: patch-posix-backup.patch
+Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
+Patch1: patch-2.5.4-sigsegv.patch
+Patch100: patch-selinux.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libselinux-devel
@@ -32,16 +24,8 @@ applications.
%prep
%setup -q
-%patch1 -p1 -b .stderr
-%patch2 -p1 -b .suffix
-%patch3 -p1 -b .sigsegv
-%patch4 -p1 -b .ifdef
-%patch5 -p1 -b .program_name
-%patch6 -p1 -b .stripcr
-%patch7 -p1 -b .parse
-%patch8 -p1 -b .allow-spaces
-%patch9 -p1 -b .selinux
-%patch10 -p1 -b .posix-backup
+%patch1 -p1 -b .sigsegv
+%patch100 -p1 -b .selinux
%build
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -54,6 +38,9 @@ make CPPFLAGS=""
make %{?smp_mflags}
%endif
+%check
+make check
+
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
@@ -68,6 +55,20 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/*
%changelog
+* Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 2.6-1
+- 2.6. No longer need stderr, suffix, stripcr, parse, allow-spaces,
+ ifdef, program_name, or posix-backup patches.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.4-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
+- Fixed operation when SELinux is disabled (bug #498102). Patch from
+ Jan Kratochvil.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.4-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Tue Feb 17 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-37
- Don't set SELinux file context if it is already correct.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 9 Sep 2004 09:54:08 -0000 1.2
+++ sources 16 Nov 2009 17:39:18 -0000 1.3
@@ -1 +1 @@
-ee5ae84d115f051d87fcaaef3b4ae782 patch-2.5.4.tar.gz
+d9d62cb7b98a8a17e42dab910fd2adc9 patch-2.6.tar.xz
--- patch-2.5-stderr.patch DELETED ---
--- patch-2.5.4-ifdef.patch DELETED ---
--- patch-2.5.4-program_name.patch DELETED ---
--- patch-2.5.4-suffix.patch DELETED ---
--- patch-allow-spaces.patch DELETED ---
--- patch-parse.patch DELETED ---
--- patch-posix-backup.patch DELETED ---
--- patch-stripcr.patch DELETED ---
- Previous message (by thread): rpms/patch/F-11 patch-2.6.tar.xz.sig, NONE, 1.1 upstream-key.gpg, NONE, 1.1 .cvsignore, 1.2, 1.3 patch-2.5.4-sigsegv.patch, 1.1, 1.2 patch-selinux.patch, 1.5, 1.6 patch.spec, 1.39, 1.40 sources, 1.2, 1.3 patch-2.5-stderr.patch, 1.1, NONE patch-2.5.4-ifdef.patch, 1.1, NONE patch-2.5.4-program_name.patch, 1.1, NONE patch-2.5.4-suffix.patch, 1.1, NONE patch-allow-spaces.patch, 1.1, NONE patch-parse.patch, 1.1, NONE patch-posix-backup.patch, 1.1, NONE patch-stripcr.patch, 1.3, NONE
- Next message (by thread): [pkgdb] perl-DBIx-Safe EL-5 cloned from devel
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list