diff --git a/postgrey-1.34-perl-5.18.patch b/postgrey-1.34-perl-5.18.patch new file mode 100644 index 0000000..13ec89c --- /dev/null +++ b/postgrey-1.34-perl-5.18.patch @@ -0,0 +1,33 @@ +From 9673b54064691a5b9c295ffea340d8a1f9ee1cb8 Mon Sep 17 00:00:00 2001 +From: Yasuhiro KIMURA +Date: Sat, 17 Aug 2013 22:05:27 +0900 +Subject: [PATCH] Make postgrey work with Perl 5.18 + +--- + postgrey | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +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; +-- +1.8.4.2 + diff --git a/postgrey.spec b/postgrey.spec index 532052c..c4d99b2 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 7%{?dist} +Release: 8%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -14,6 +14,7 @@ Source1: postgrey.service Source2: README-rpm Source3: postgrey.sysconfig Patch0: postgrey-1.28-group.patch +Patch1: postgrey-1.34-perl-5.18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: systemd-units # We require postfix for its directories and gid @@ -39,6 +40,7 @@ again later, as it is however required per RFC. %prep %setup -q %patch0 -p1 -b .group +%patch1 -p1 -b .perl-5.18 %{__install} -p -m 0644 %{SOURCE2} README-rpm @@ -145,6 +147,9 @@ fi %changelog +* Wed Jan 01 2014 Nils Philippsen - 1.34-8 +- make postgrey work with perl 5.18 (#1039551) + * Sun Aug 04 2013 Fedora Release Engineering - 1.34-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild