[arch-commits] Commit in make/trunk (PKGBUILD make-3.82-bug30612.patch)

[Allan McRae]

    Date: Monday, July 1, 2013 @ 07:59:48
  Author: allan
Revision: 189235

upgpkg: make 3.82-6

update patch with additional upstream fix

Modified:
  make/trunk/PKGBUILD
  make/trunk/make-3.82-bug30612.patch

--------------------------+
 PKGBUILD                 |    7 +++----
 make-3.82-bug30612.patch |   27 ++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-01 01:03:08 UTC (rev 189234)
+++ PKGBUILD	2013-07-01 05:59:48 UTC (rev 189235)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=5
+pkgrel=6
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
@@ -20,15 +20,14 @@
         make-3.82-expensive_glob.patch
         make-3.82-dont-prune-intermediate.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
-         'c78daf24f4ec5900c8f81e89a6e1cd5a'
-         'c8f496b22191f9fb9420ab14c1a19a47'
+         'SKIP'
+         '8714ba22911a58ab3eb42ac3f4c6c3bd'
          '662e6450e19a5acdaa5c9fcb8ad78dea'
          '7d01a99f389d8f08dec93ed479071ee4'
          'bc12ad4d0c6e6c0e72d9fb61054f446b'
          'e58d4211c5b29d7d927a304d082849e7'
          '45ac9e987f4bf16c0d7e1685db943917')
 
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   

Modified: make-3.82-bug30612.patch
===================================================================
--- make-3.82-bug30612.patch	2013-07-01 01:03:08 UTC (rev 189234)
+++ make-3.82-bug30612.patch	2013-07-01 05:59:48 UTC (rev 189235)
@@ -1,4 +1,3 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
 --- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
 +++ make-3.82-fix30612//main.c	2010-09-23 23:33:37.908855839 +1000
 @@ -1,3 +1,4 @@
@@ -64,3 +63,29 @@
  
                  /* Find and set the new end.  Massage names if necessary.  */
                  while (1)
+diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c
+index c87d4a7..b012094 100644
+--- make-3.82-orig/read.c
++++ make-3.82-fix30612/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;
+             }
+         }
+