Hi!
I've been asked to add an unrelated fix, for #810873 (pam_getenv: "Unescaped
left brace in regex" with Perl 5.22) to the NMU.

Here's an updated debdiff.  I'll upload to where it was (DELAYED-5) once
I've done some more testing.


Meow!
-- 
Autotools hint: to do a zx-spectrum build on a pdp11 host, type:
  ./configure --host=zx-spectrum --build=pdp11
diff -u pam-1.1.8/debian/changelog pam-1.1.8/debian/changelog
--- pam-1.1.8/debian/changelog
+++ pam-1.1.8/debian/changelog
@@ -1,3 +1,12 @@
+pam (1.1.8-3.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build-Depend on libfl-dev:native as well, for cross builds.
+    Re-closes: #846459
+  * Fix "Unescaped left brace in regex" with Perl 5.22. Closes: #810873
+
+ -- Adam Borowski <kilob...@angband.pl>  Fri, 30 Dec 2016 14:37:29 +0100
+
 pam (1.1.8-3.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u pam-1.1.8/debian/control pam-1.1.8/debian/control
--- pam-1.1.8/debian/control
+++ pam-1.1.8/debian/control
@@ -4,7 +4,7 @@
 Uploaders: Sam Hartman <hartm...@debian.org>, Roger Leigh <rle...@debian.org>
 Maintainer: Steve Langasek <vor...@debian.org>
 Standards-Version: 3.9.8
-Build-Depends: libcrack2-dev (>= 2.8), bzip2, debhelper (>= 9), quilt (>= 
0.48-1), flex, libdb-dev, libselinux1-dev [linux-any], po-debconf, 
dh-autoreconf, autopoint, libaudit-dev [linux-any], pkg-config, libfl-dev, 
docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
+Build-Depends: libcrack2-dev (>= 2.8), bzip2, debhelper (>= 9), quilt (>= 
0.48-1), flex, libdb-dev, libselinux1-dev [linux-any], po-debconf, 
dh-autoreconf, autopoint, libaudit-dev [linux-any], pkg-config, libfl-dev, 
libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
 Build-Conflicts-Indep: fop
 Build-Conflicts: libdb4.2-dev, libxcrypt-dev
 Vcs-Bzr: https://alioth.debian.org/scm/loggerhead/pkg-pam/debian/sid
diff -u pam-1.1.8/debian/local/pam_getenv pam-1.1.8/debian/local/pam_getenv
--- pam-1.1.8/debian/local/pam_getenv
+++ pam-1.1.8/debian/local/pam_getenv
@@ -75,7 +75,7 @@
   my ($val) = @_;
 return undef unless $val;
        die "Cannot handle PAM items\n" if /(?<!\\)\@/;
-  $val =~ s/(?<!\\)\${([^}]+)}/$ENV{$1}||""/eg;
+  $val =~ s/(?<!\\)\$\{([^}]+)\}/$ENV{$1}||""/eg;
   return $val;
 }
 

Reply via email to