From 9664bee729d487bcc0a0bc35859f8e13d5421c75 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 26 Sep 2012 01:10:42 +0000 Subject: Slackware 14.0 Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-) --- ...h.281537bcd92515ae3b9f154acd579ce97260f99b.diff | 78 +++++++++++++++++++ ...h.99f2638763845d8173a0c9f9209ac2b4be947165.diff | 88 ++++++++++++++++++++++ source/a/patch/patch.SlackBuild | 12 ++- 3 files changed, 174 insertions(+), 4 deletions(-) create mode 100644 source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff create mode 100644 source/a/patch/patch.99f2638763845d8173a0c9f9209ac2b4be947165.diff (limited to 'source/a/patch') diff --git a/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff b/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff new file mode 100644 index 000000000..b882b725c --- /dev/null +++ b/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff @@ -0,0 +1,78 @@ +From 281537bcd92515ae3b9f154acd579ce97260f99b Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Thu, 13 Sep 2012 14:13:08 +0000 +Subject: In a git-style diff, make sure not to unlink the original by accident + +* src/patch.c (main): Fail if a file is not empty as expected. +(output_files): In a git-style diff, make sure not to unlink the original when +making a backup of an unmodified file. +* tests/create-delete: Fix failed-file-deletion test and add +successful-file-deletion test. +--- +diff --git a/src/patch.c b/src/patch.c +index 1c6fb4b..ce81bbe 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -508,6 +508,7 @@ main (int argc, char **argv) + && ! (merge && somefailed)) + { + mismatch = true; ++ somefailed = true; + if (verbosity != SILENT) + say ("File %s is not empty after patch, as expected\n", + quotearg (outname)); +@@ -1865,7 +1866,7 @@ output_files (struct stat const *st) + output_file_now (file_to_output->from, &from_needs_removal, + from_st, file_to_output->to, + file_to_output->mode, file_to_output->backup); +- if (from_needs_removal) ++ if (file_to_output->to && from_needs_removal) + unlink (file_to_output->from); + + if (st && st->st_dev == from_st->st_dev && st->st_ino == from_st->st_ino) +diff --git a/tests/create-delete b/tests/create-delete +index 9a6e1bb..7eed11f 100644 +--- a/tests/create-delete ++++ b/tests/create-delete +@@ -176,12 +176,37 @@ EOF + echo data > target + cat > p.diff < p.diff < +Date: Tue, 18 Sep 2012 10:51:17 +0000 +Subject: Fix file truncation when switching from git diff to non-git diff + +* src/patch.c (main): Output queued output files only when switching from a git +diff to a non-git diff. This can modify the input file, so make sure to +stat() it again. +* tests/concat-git-diff: Add test case growing a file with a git diff and then +with a non-git diff; without this fix; the result would be truncated. +--- +diff --git a/src/patch.c b/src/patch.c +index 0bce8fb..0b0fdd4 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -196,8 +196,12 @@ main (int argc, char **argv) + + if (have_git_diff != pch_git_diff ()) + { ++ if (have_git_diff) ++ { ++ output_files (NULL); ++ inerrno = -1; ++ } + have_git_diff = ! have_git_diff; +- output_files (NULL); + } + + if (TMPREJNAME_needs_removal) +diff --git a/tests/concat-git-diff b/tests/concat-git-diff +index 927eb5a..c78da53 100644 +--- a/tests/concat-git-diff ++++ b/tests/concat-git-diff +@@ -56,11 +56,7 @@ check 'cat f' < f < f + + cat > concat2.diff < f ++ ++cat > concat3.diff <