diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2016-12-30 14:37:29 +0100 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:12:42 -0800 |
| commit | ed13e9dd8370ba974264f24333744df0c22e376f (patch) | |
| tree | 74afef4ae65c66ba6644efe2b8e56bba2f8a8834 /debian | |
| parent | f1c8161e9178fab49722d1deb0ed3a9f450245ec (diff) | |
Import Debian changes 1.1.8-3.5
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
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/local/pam_getenv | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index fc79ecd9..977612a8 100644 --- a/debian/changelog +++ b/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 <kilobyte@angband.pl> Fri, 30 Dec 2016 14:37:29 +0100 + pam (1.1.8-3.4) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 81a5a8b3..9c763807 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Uploaders: Sam Hartman <hartmans@debian.org>, Roger Leigh <rleigh@debian.org> Maintainer: Steve Langasek <vorlon@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 --git a/debian/local/pam_getenv b/debian/local/pam_getenv index 2abddcad..e409c3e5 100644 --- a/debian/local/pam_getenv +++ b/debian/local/pam_getenv @@ -75,7 +75,7 @@ sub expand_val($) { 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; } |