From 3b8bf5d048d6377a6ca97188987a9776de1165b6513b5ad71164d207a507130e Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 2 May 2010 12:11:50 +0000 Subject: [PATCH] - 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;