From 212b886518b9d39006cfe07f3651d04b67b8fa10eee590a6da418e3c191f4f93 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:15:11 +0000 Subject: [PATCH 1/6] Updating link to change in openSUSE:Factory/patch revision 18.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=c3be1f47245ce36da5cdc505c399bb9e From 3b8bf5d048d6377a6ca97188987a9776de1165b6513b5ad71164d207a507130e Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 2 May 2010 12:11:50 +0000 Subject: [PATCH 2/6] - Version 2.6.1.64: + Support for most features of the "diff --git" format: renames and copies, permission changes, symlink diffs. (Binary diffs are not supported yet; patch will complain and skip them.) + Support for double-quoted filenames: when a filename in a context diff starts with a double quote, it is interpreted as a C string literal. The escape sequences \\, \", \a, \b, \f, \n, \r, \t, \v, and \ooo (a three-digit octal number between 0 and 255) are recognized. + Refuse to patch read-only files by default, or at least warn when patching such files with --force or --batch. + Refuse to apply a normal patch to a symlink. (Previous versions of patch were wrongly replacing the symlink with a regular file.) + When a timestamp specifies a time zone, honor that instead of assuming the local time zone (--set-date) or Universal Coordinated Time (--set-utc). + Support for nanosecond precision timestamps. + Many portability and bug fixes. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=14 --- patch-2.6.1-9-gf376c5d.tar.bz2 | 3 --- patch-2.6.1.64-4762.tar.bz2 | 3 +++ patch.changes | 23 +++++++++++++++++++++++ patch.spec | 4 ++-- unified-reject-files-compat.diff | 10 +++++----- 5 files changed, 33 insertions(+), 10 deletions(-) delete mode 100644 patch-2.6.1-9-gf376c5d.tar.bz2 create mode 100644 patch-2.6.1.64-4762.tar.bz2 diff --git a/patch-2.6.1-9-gf376c5d.tar.bz2 b/patch-2.6.1-9-gf376c5d.tar.bz2 deleted file mode 100644 index e993144..0000000 --- a/patch-2.6.1-9-gf376c5d.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5fbb52fed5c34cb3571296bbc4b48908c3ffacae5d010f0c48f5b762a4e478b -size 254560 diff --git a/patch-2.6.1.64-4762.tar.bz2 b/patch-2.6.1.64-4762.tar.bz2 new file mode 100644 index 0000000..73560c9 --- /dev/null +++ b/patch-2.6.1.64-4762.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d063523f39300792ea4512bfb6a82003d1f74d72387cc4763a8972ace3403ed9 +size 590607 diff --git a/patch.changes b/patch.changes index 3c2bfc3..68a8fdf 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun May 2 14:01:47 CEST 2010 - agruen@suse.de + +- Version 2.6.1.64: + + Support for most features of the "diff --git" format: renames + and copies, permission changes, symlink diffs. (Binary diffs + are not supported yet; patch will complain and skip them.) + + Support for double-quoted filenames: when a filename in a + context diff starts with a double quote, it is interpreted as + a C string literal. The escape sequences \\, \", \a, \b, \f, \n, + \r, \t, \v, and \ooo (a three-digit octal number between 0 and + 255) are recognized. + + Refuse to patch read-only files by default, or at least warn + when patching such files with --force or --batch. + + Refuse to apply a normal patch to a symlink. (Previous + versions of patch were wrongly replacing the symlink with a + regular file.) + + When a timestamp specifies a time zone, honor that instead of + assuming the local time zone (--set-date) or Universal + Coordinated Time (--set-utc). + + Support for nanosecond precision timestamps. + + Many portability and bug fixes. + ------------------------------------------------------------------- Sun Jan 31 16:22:05 CET 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index 7a70c29..4042fb4 100644 --- a/patch.spec +++ b/patch.spec @@ -18,13 +18,13 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define ver 2.6.1-9-gf376c5d +%define ver 2.6.1.64-4762 Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6.1.9 +Version: 2.6.1.64 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 diff --git a/unified-reject-files-compat.diff b/unified-reject-files-compat.diff index 9633c0c..343bf24 100644 --- a/unified-reject-files-compat.diff +++ b/unified-reject-files-compat.diff @@ -1,8 +1,8 @@ -Index: patch-2.5.9-122-gba37782/src/patch.c +Index: patch-2.6.1.64-4762/src/patch.c =================================================================== ---- patch-2.5.9-122-gba37782.orig/src/patch.c -+++ patch-2.5.9-122-gba37782/src/patch.c -@@ -572,6 +572,7 @@ static struct option const longopts[] = +--- patch-2.6.1.64-4762.orig/src/patch.c ++++ patch-2.6.1.64-4762/src/patch.c +@@ -622,6 +622,7 @@ static struct option const longopts[] = {"posix", no_argument, NULL, CHAR_MAX + 7}, {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, {"reject-format", required_argument, NULL, CHAR_MAX + 9}, @@ -10,7 +10,7 @@ Index: patch-2.5.9-122-gba37782/src/patch.c {NULL, no_argument, NULL, 0} }; -@@ -841,6 +842,11 @@ get_some_switches (void) +@@ -902,6 +903,11 @@ get_some_switches (void) else usage (stderr, 2); break; From 34ab43d3ca0c84932b0b882653dc9c1126961897edb22759e2cc8403cd396ac8 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 2 May 2010 12:41:33 +0000 Subject: [PATCH 3/6] - Be more verbose when %verbose is defined. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=15 --- patch.changes | 5 +++++ patch.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/patch.changes b/patch.changes index 68a8fdf..b2cc396 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 2 14:40:09 CEST 2010 - agruen@suse.de + +- Be more verbose when %verbose is defined. + ------------------------------------------------------------------- Sun May 2 14:01:47 CEST 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index 4042fb4..fc96f6b 100644 --- a/patch.spec +++ b/patch.spec @@ -49,13 +49,13 @@ Authors: %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?jobs:-j%jobs}; +make %{?jobs:-j%jobs} %{verbose:V=1}; %check -make check +make check %{verbose:V=1} %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT %{verbose:V=1} %files %defattr(-,root,root) From 0a6686df2c7ef2f5c14c8dac86a81a74155ff0becb457c05f4b0ce376c5e0f99 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 2 May 2010 13:58:21 +0000 Subject: [PATCH 4/6] - Fix the linker library order. OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=16 --- patch-2.6.1.64-4762.tar.bz2 | 3 --- patch-2.6.1.65-0c83.tar.bz2 | 3 +++ patch.changes | 5 +++++ patch.spec | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 patch-2.6.1.64-4762.tar.bz2 create mode 100644 patch-2.6.1.65-0c83.tar.bz2 diff --git a/patch-2.6.1.64-4762.tar.bz2 b/patch-2.6.1.64-4762.tar.bz2 deleted file mode 100644 index 73560c9..0000000 --- a/patch-2.6.1.64-4762.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d063523f39300792ea4512bfb6a82003d1f74d72387cc4763a8972ace3403ed9 -size 590607 diff --git a/patch-2.6.1.65-0c83.tar.bz2 b/patch-2.6.1.65-0c83.tar.bz2 new file mode 100644 index 0000000..76d7c0a --- /dev/null +++ b/patch-2.6.1.65-0c83.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcf36e73f3ad03978350a1064b02fe3e187d1e5d77936eb326d9bb123bcca58b +size 590393 diff --git a/patch.changes b/patch.changes index b2cc396..b55c852 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 2 15:57:54 CEST 2010 - agruen@suse.de + +- Fix the linker library order. + ------------------------------------------------------------------- Sun May 2 14:40:09 CEST 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index fc96f6b..1a18ef3 100644 --- a/patch.spec +++ b/patch.spec @@ -18,13 +18,13 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define ver 2.6.1.64-4762 +%define ver 2.6.1.65-0c83 Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6.1.64 +Version: 2.6.1.65 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 From c18f09dedde37ec59196cb9d86a2d39f43e0b1477b83affb98f2288a55c42edf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 3 May 2010 19:38:59 +0000 Subject: [PATCH 5/6] Accepting request 39270 from devel:tools checked in (request 39270) OBS-URL: https://build.opensuse.org/request/show/39270 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=17 --- patch-2.6.1-9-gf376c5d.tar.bz2 | 3 +++ patch-2.6.1.65-0c83.tar.bz2 | 3 --- patch.changes | 33 -------------------------------- patch.spec | 10 +++++----- unified-reject-files-compat.diff | 10 +++++----- 5 files changed, 13 insertions(+), 46 deletions(-) create mode 100644 patch-2.6.1-9-gf376c5d.tar.bz2 delete mode 100644 patch-2.6.1.65-0c83.tar.bz2 diff --git a/patch-2.6.1-9-gf376c5d.tar.bz2 b/patch-2.6.1-9-gf376c5d.tar.bz2 new file mode 100644 index 0000000..e993144 --- /dev/null +++ b/patch-2.6.1-9-gf376c5d.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5fbb52fed5c34cb3571296bbc4b48908c3ffacae5d010f0c48f5b762a4e478b +size 254560 diff --git a/patch-2.6.1.65-0c83.tar.bz2 b/patch-2.6.1.65-0c83.tar.bz2 deleted file mode 100644 index 76d7c0a..0000000 --- a/patch-2.6.1.65-0c83.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcf36e73f3ad03978350a1064b02fe3e187d1e5d77936eb326d9bb123bcca58b -size 590393 diff --git a/patch.changes b/patch.changes index b55c852..3c2bfc3 100644 --- a/patch.changes +++ b/patch.changes @@ -1,36 +1,3 @@ -------------------------------------------------------------------- -Sun May 2 15:57:54 CEST 2010 - agruen@suse.de - -- Fix the linker library order. - -------------------------------------------------------------------- -Sun May 2 14:40:09 CEST 2010 - agruen@suse.de - -- Be more verbose when %verbose is defined. - -------------------------------------------------------------------- -Sun May 2 14:01:47 CEST 2010 - agruen@suse.de - -- Version 2.6.1.64: - + Support for most features of the "diff --git" format: renames - and copies, permission changes, symlink diffs. (Binary diffs - are not supported yet; patch will complain and skip them.) - + Support for double-quoted filenames: when a filename in a - context diff starts with a double quote, it is interpreted as - a C string literal. The escape sequences \\, \", \a, \b, \f, \n, - \r, \t, \v, and \ooo (a three-digit octal number between 0 and - 255) are recognized. - + Refuse to patch read-only files by default, or at least warn - when patching such files with --force or --batch. - + Refuse to apply a normal patch to a symlink. (Previous - versions of patch were wrongly replacing the symlink with a - regular file.) - + When a timestamp specifies a time zone, honor that instead of - assuming the local time zone (--set-date) or Universal - Coordinated Time (--set-utc). - + Support for nanosecond precision timestamps. - + Many portability and bug fixes. - ------------------------------------------------------------------- Sun Jan 31 16:22:05 CET 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index 1a18ef3..7a70c29 100644 --- a/patch.spec +++ b/patch.spec @@ -18,13 +18,13 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define ver 2.6.1.65-0c83 +%define ver 2.6.1-9-gf376c5d Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6.1.65 +Version: 2.6.1.9 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 @@ -49,13 +49,13 @@ Authors: %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?jobs:-j%jobs} %{verbose:V=1}; +make %{?jobs:-j%jobs}; %check -make check %{verbose:V=1} +make check %install -make install DESTDIR=$RPM_BUILD_ROOT %{verbose:V=1} +make install DESTDIR=$RPM_BUILD_ROOT %files %defattr(-,root,root) diff --git a/unified-reject-files-compat.diff b/unified-reject-files-compat.diff index 343bf24..9633c0c 100644 --- a/unified-reject-files-compat.diff +++ b/unified-reject-files-compat.diff @@ -1,8 +1,8 @@ -Index: patch-2.6.1.64-4762/src/patch.c +Index: patch-2.5.9-122-gba37782/src/patch.c =================================================================== ---- patch-2.6.1.64-4762.orig/src/patch.c -+++ patch-2.6.1.64-4762/src/patch.c -@@ -622,6 +622,7 @@ static struct option const longopts[] = +--- patch-2.5.9-122-gba37782.orig/src/patch.c ++++ patch-2.5.9-122-gba37782/src/patch.c +@@ -572,6 +572,7 @@ static struct option const longopts[] = {"posix", no_argument, NULL, CHAR_MAX + 7}, {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, {"reject-format", required_argument, NULL, CHAR_MAX + 9}, @@ -10,7 +10,7 @@ Index: patch-2.6.1.64-4762/src/patch.c {NULL, no_argument, NULL, 0} }; -@@ -902,6 +903,11 @@ get_some_switches (void) +@@ -841,6 +842,11 @@ get_some_switches (void) else usage (stderr, 2); break; From 7c1a299de103ddec2425d7ada53bddb5558af5262cf2adb04d15d2720ce22801 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 3 May 2010 19:39:00 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/patch revision 19.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=d8fc6c51ce681fb6c01e6f1d9cced28f --- patch-2.6.1-9-gf376c5d.tar.bz2 | 3 --- patch-2.6.1.65-0c83.tar.bz2 | 3 +++ patch.changes | 33 ++++++++++++++++++++++++++++++++ patch.spec | 12 ++++++------ unified-reject-files-compat.diff | 10 +++++----- 5 files changed, 47 insertions(+), 14 deletions(-) delete mode 100644 patch-2.6.1-9-gf376c5d.tar.bz2 create mode 100644 patch-2.6.1.65-0c83.tar.bz2 diff --git a/patch-2.6.1-9-gf376c5d.tar.bz2 b/patch-2.6.1-9-gf376c5d.tar.bz2 deleted file mode 100644 index e993144..0000000 --- a/patch-2.6.1-9-gf376c5d.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5fbb52fed5c34cb3571296bbc4b48908c3ffacae5d010f0c48f5b762a4e478b -size 254560 diff --git a/patch-2.6.1.65-0c83.tar.bz2 b/patch-2.6.1.65-0c83.tar.bz2 new file mode 100644 index 0000000..76d7c0a --- /dev/null +++ b/patch-2.6.1.65-0c83.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcf36e73f3ad03978350a1064b02fe3e187d1e5d77936eb326d9bb123bcca58b +size 590393 diff --git a/patch.changes b/patch.changes index 3c2bfc3..b55c852 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sun May 2 15:57:54 CEST 2010 - agruen@suse.de + +- Fix the linker library order. + +------------------------------------------------------------------- +Sun May 2 14:40:09 CEST 2010 - agruen@suse.de + +- Be more verbose when %verbose is defined. + +------------------------------------------------------------------- +Sun May 2 14:01:47 CEST 2010 - agruen@suse.de + +- Version 2.6.1.64: + + Support for most features of the "diff --git" format: renames + and copies, permission changes, symlink diffs. (Binary diffs + are not supported yet; patch will complain and skip them.) + + Support for double-quoted filenames: when a filename in a + context diff starts with a double quote, it is interpreted as + a C string literal. The escape sequences \\, \", \a, \b, \f, \n, + \r, \t, \v, and \ooo (a three-digit octal number between 0 and + 255) are recognized. + + Refuse to patch read-only files by default, or at least warn + when patching such files with --force or --batch. + + Refuse to apply a normal patch to a symlink. (Previous + versions of patch were wrongly replacing the symlink with a + regular file.) + + When a timestamp specifies a time zone, honor that instead of + assuming the local time zone (--set-date) or Universal + Coordinated Time (--set-utc). + + Support for nanosecond precision timestamps. + + Many portability and bug fixes. + ------------------------------------------------------------------- Sun Jan 31 16:22:05 CET 2010 - agruen@suse.de diff --git a/patch.spec b/patch.spec index 7a70c29..85b4036 100644 --- a/patch.spec +++ b/patch.spec @@ -1,5 +1,5 @@ # -# spec file for package patch (Version 2.6.1.9) +# spec file for package patch (Version 2.6.1.65) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,13 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define ver 2.6.1-9-gf376c5d +%define ver 2.6.1.65-0c83 Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6.1.9 +Version: 2.6.1.65 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 @@ -49,13 +49,13 @@ Authors: %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?jobs:-j%jobs}; +make %{?jobs:-j%jobs} %{verbose:V=1}; %check -make check +make check %{verbose:V=1} %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT %{verbose:V=1} %files %defattr(-,root,root) diff --git a/unified-reject-files-compat.diff b/unified-reject-files-compat.diff index 9633c0c..343bf24 100644 --- a/unified-reject-files-compat.diff +++ b/unified-reject-files-compat.diff @@ -1,8 +1,8 @@ -Index: patch-2.5.9-122-gba37782/src/patch.c +Index: patch-2.6.1.64-4762/src/patch.c =================================================================== ---- patch-2.5.9-122-gba37782.orig/src/patch.c -+++ patch-2.5.9-122-gba37782/src/patch.c -@@ -572,6 +572,7 @@ static struct option const longopts[] = +--- patch-2.6.1.64-4762.orig/src/patch.c ++++ patch-2.6.1.64-4762/src/patch.c +@@ -622,6 +622,7 @@ static struct option const longopts[] = {"posix", no_argument, NULL, CHAR_MAX + 7}, {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, {"reject-format", required_argument, NULL, CHAR_MAX + 9}, @@ -10,7 +10,7 @@ Index: patch-2.5.9-122-gba37782/src/patch.c {NULL, no_argument, NULL, 0} }; -@@ -841,6 +842,11 @@ get_some_switches (void) +@@ -902,6 +903,11 @@ get_some_switches (void) else usage (stderr, 2); break;