diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/bug30612-space.patch | 37 | ||||
| -rw-r--r-- | debian/patches/bug30612.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 64 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index a92e583..8cff64e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +make (3.82-3+dyson2) unstable; urgency=low + + * Really fix Savannah bug #30612: there was one more patch. Take both + patches from git (http://git.savannah.gnu.org/cgit/make.git/) + + -- Igor Pashev <pashev.igor@gmail.com> Fri, 03 May 2013 20:07:57 +0400 + make (3.82-3+dyson1) unstable; urgency=low * Patch: Fix Savannah bug #30612: handling of archive references with >1 diff --git a/debian/patches/bug30612-space.patch b/debian/patches/bug30612-space.patch new file mode 100644 index 0000000..1371687 --- /dev/null +++ b/debian/patches/bug30612-space.patch @@ -0,0 +1,37 @@ +From b06b8c64a29a5ba3a8daecd829fa2f98d42cb285 Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith@gnu.org> +Date: Sun, 12 Jun 2011 16:22:04 +0000 +Subject: Fix another error related to whitespace handling in archives. + +Newer version of VMS support strncasecmp() so update the config.h. +--- +(limited to 'read.c') + +diff --git a/read.c b/read.c +index c87d4a7..b012094 100644 +--- a/read.c ++++ b/read.c +@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, + nlen -= (n + 1) - tp; + tp = n + 1; + +- /* If we have just "lib(", part of something like +- "lib( a b)", go to the next item. */ +- if (! nlen) +- continue; +- + /* We can stop looking now. */ + break; + } + } + while (*e != '\0'); ++ ++ /* If we have just "lib(", part of something like "lib( a b)", ++ go to the next item. */ ++ if (! nlen) ++ continue; + } + } + +-- +cgit v0.9.0.2 diff --git a/debian/patches/bug30612.patch b/debian/patches/bug30612.patch index 673be1d..ded7ba6 100644 --- a/debian/patches/bug30612.patch +++ b/debian/patches/bug30612.patch @@ -1,11 +1,18 @@ -Description: Fix Savannah bug #30612: handling of archive references with >1 object -Source: http://cvs.savannah.gnu.org/viewvc/make/make/read.c?r1=1.193&r2=1.194 -Bug: https://savannah.gnu.org/bugs/?30612 -Index: make/read.c -=================================================================== ---- make.orig/read.c 2013-05-03 18:55:48.713768282 +0400 -+++ make/read.c 2013-05-03 18:55:48.910846433 +0400 -@@ -3033,7 +3033,7 @@ +From 5acda13ace0ae4443ed04c4f8a62512b00a2b656 Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith@gnu.org> +Date: Sat, 14 Aug 2010 02:50:14 +0000 +Subject: - Fix the NEWS file to be accurate + +- Add oneshell to $(.FEATURES) (forgot that!) +- Fix Savannah bug #30612: handling of archive references with >1 object +--- +(limited to 'read.c') + +diff --git a/read.c b/read.c +index a3ad88e..9dfd4ea 100644 +--- a/read.c ++++ b/read.c +@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, { /* This looks like the first element in an open archive group. A valid group MUST have ')' as the last character. */ @@ -14,7 +21,7 @@ Index: make/read.c do { e = next_token (e); -@@ -3089,19 +3089,19 @@ +@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, Go to the next item in the string. */ if (flags & PARSEFS_NOGLOB) { @@ -38,7 +45,7 @@ Index: make/read.c if (tildep != 0) name = tildep; } -@@ -3157,7 +3157,10 @@ +@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, else { /* We got a chain of items. Attach them. */ @@ -50,3 +57,5 @@ Index: make/read.c /* Find and set the new end. Massage names if necessary. */ while (1) +-- +cgit v0.9.0.2 diff --git a/debian/patches/series b/debian/patches/series index b796cb6..c5e45c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ sunmake.patch bug30612.patch +bug30612-space.patch |