Package: make
Version: 3.81-8
Severity: normal
Tags: patch upstream sid


Attached you find a debdiff to fix the bug described in:

 http://savannah.gnu.org/bugs/?20033

there is also a very good testcase in the bug comments. The
debdiff is generated from the patch attached to the issue.

This bug affects all recent LibreOffice development (3.4 and master).
Thus once those releases start showing up, severity will need to be
upgraded as it will cause FTBFS.

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages make depends on:
ii  libc6                         2.11.2-11  Embedded GNU C Library:
Shared lib

make recommends no packages.

Versions of packages make suggests:
pn  make-doc                      <none>     (no description available)

-- no debconf information


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages make depends on:
ii  libc6                         2.11.2-11  Embedded GNU C Library:
Shared lib

make recommends no packages.

Versions of packages make suggests:
pn  make-doc                      <none>     (no description available)

-- no debconf information

-- 
https://launchpad.net/~bjoern-michaelsen
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;
 }

Reply via email to