diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-05-03 20:08:29 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-05-03 20:08:29 +0400 |
| commit | 561147bf577092ac79d6d8a52491eee28e07273c (patch) | |
| tree | cee0dae05eb646fc39eecbd5ead007b7ed79df35 /debian/patches/bug30612.patch | |
| parent | 0d66b125183a647c0c1a25a21b6e68d793c85f1d (diff) | |
| download | make.old-master.tar.gz | |
Really fix Savannah bug #30612HEADdyson/3.82-3+dyson2master
Diffstat (limited to 'debian/patches/bug30612.patch')
| -rw-r--r-- | debian/patches/bug30612.patch | 29 |
1 files changed, 19 insertions, 10 deletions
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 |