Bug#622644: make-dfsg: diff for NMU version 3.81-8.2

[Tim Retout]

tags 622644 + pending
thanks

Dear maintainer,

I've prepared an NMU for make-dfsg (versioned as 3.81-8.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -u make-dfsg-3.81/debian/changelog make-dfsg-3.81/debian/changelog
--- make-dfsg-3.81/debian/changelog
+++ make-dfsg-3.81/debian/changelog
@@ -1,3 +1,11 @@
+make-dfsg (3.81-8.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * expand.c: Apply patch from Savannah #20033 to fix segfault when
+    using parallel (-j2) make with $(eval).  (Closes: #622644)
+
+ -- Tim Retout <dioc...@debian.org>  Mon, 09 Apr 2012 19:36:11 +0100
+
 make-dfsg (3.81-8.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- make-dfsg-3.81.orig/expand.c
+++ make-dfsg-3.81/expand.c
@@ -449,20 +449,25 @@
 variable_expand_for_file (char *line, struct file *file)
 {
   char *result;
-  struct variable_set_list *save;
+  struct variable_set_list *savev;
+  const struct floc *savef;
 
   if (file == 0)
     return variable_expand (line);
 
-  save = current_variable_set_list;
+  savev = current_variable_set_list;
   current_variable_set_list = file->variables;
+
+  savef = reading_file;
   if (file->cmds && file->cmds->fileinfo.filenm)
     reading_file = &file->cmds->fileinfo;
   else
     reading_file = 0;
+
   result = variable_expand (line);
-  current_variable_set_list = save;
-  reading_file = 0;
+
+  current_variable_set_list = savev;
+  reading_file = savef;
 
   return result;
 }