summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2013-11-27 21:36:55 +0100
committerAxel Beckert <abe@deuxchevaux.org>2014-06-11 16:36:31 +0200
commit5ad7457144a53148ddeb2bf5d89588252bd2de3a (patch)
tree317f2ddb48a20c669ef30add2d7f46cf5f024b3a
parentb869cb9d3cfe427c0bdb79ff2b1fba26050f2030 (diff)
Imported Debian patch 1.34-1.2
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/perl51823
-rw-r--r--debian/patches/series1
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 24f9799..bd5c23f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgrey (1.34-1.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Make postgrey work with Perl 5.18 (closes: #722136).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 27 Nov 2013 21:36:55 +0100
+
postgrey (1.34-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/patches/perl518 b/debian/patches/perl518
new file mode 100644
index 0000000..efbc61a
--- /dev/null
+++ b/debian/patches/perl518
@@ -0,0 +1,23 @@
+https://github.com/schweikert/postgrey/pull/4
+
+diff --git a/postgrey b/postgrey
+index 7cb0352..37f69bd 100755
+--- a/postgrey
++++ b/postgrey
+@@ -557,6 +557,16 @@ sub main()
+ if($opt{dbdir}) {
+ $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1;
+ }
++ # untaint what is given on --pidfile. It is not security sensitive since
++ # it is provided by the admin
++ if($opt{pidfile}) {
++ $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1;
++ }
++ # untaint what is given on --inet. It is not security sensitive since
++ # it is provided by the admin
++ if($opt{inet}) {
++ $opt{inet} =~ /^(.*)$/; $opt{inet} = $1;
++ }
+
+ # determine proper "logsock" for Sys::Syslog
+ my $syslog_logsock;
diff --git a/debian/patches/series b/debian/patches/series
index 1be4a73..0e6c3d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
imported-upstream-diff
disable-transaction-logic
+perl518