OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Jul-2003 16:19:10 Branch: HEAD Handle: 2003072215190900 Added files: openpkg-src/postfix postfix.patch.pfls Modified files: openpkg-src/postfix postfix.patch postfix.spec Removed files: openpkg-src/postfix pflogsumm.patch Log: cleanup packaging Summary: Revision Changes Path 1.6 +0 -26 openpkg-src/postfix/pflogsumm.patch 1.2 +2 -0 openpkg-src/postfix/postfix.patch 1.1 +26 -0 openpkg-src/postfix/postfix.patch.pfls 1.160 +8 -7 openpkg-src/postfix/postfix.spec ____________________________________________________________________________ rm -f openpkg-src/postfix/pflogsumm.patch <<'@@ .' Index: openpkg-src/postfix/pflogsumm.patch ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: openpkg-src/postfix/postfix.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 postfix.patch --- openpkg-src/postfix/postfix.patch 2 Apr 2003 15:59:59 -0000 1.1 +++ openpkg-src/postfix/postfix.patch 22 Jul 2003 14:19:09 -0000 1.2 @@ -1,3 +1,5 @@ +This patch drops the deprecated OpenLDAP API. + --- src/util/dict_ldap.c.dist Wed Apr 2 17:31:29 2003 +++ src/util/dict_ldap.c Wed Apr 2 17:37:22 2003 @@ -400,20 +400,6 @@ @@ . patch -p0 <<'@@ .' Index: openpkg-src/postfix/postfix.patch.pfls ============================================================================ $ cvs diff -u -r0 -r1.1 postfix.patch.pfls --- /dev/null 2003-07-22 16:19:10.000000000 +0200 +++ postfix.patch.pfls 2003-07-22 16:19:10.000000000 +0200 @@ -0,0 +1,26 @@ +This patch makes Pflogsumm working with the particular format +of the OSSP fsl based Postfix logfile. + +--- pflogsumm.pl.orig Tue Jun 17 17:59:57 2003 ++++ pflogsumm.pl Tue Jun 24 11:41:59 2003 + +@@ -498,8 +498,8 @@ + s/: \[ID \d+\s+[^\]]+\] /: /o; # lose "[ID nnnnnn some.thing]" stuff + my $logRmdr; + ($msgMonStr, $msgDay, $msgTimeStr, $logRmdr) = /^(...)\s+(\d+)\s(..:..:..)\s\S+\s(.+)$/o; +- unless((($cmd, $qid) = $logRmdr =~ m#^(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 || +- (($cmd, $qid) = $logRmdr =~ m#^((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2) ++ unless((($cmd, $qid) = $logRmdr =~ m#^<[a-z]+>\s+(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 || ++ (($cmd, $qid) = $logRmdr =~ m#^<[a-z]+>\s+((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2) + { + #print UNPROCD "$_"; + next; +@@ -1324,7 +1324,7 @@ + } + my ($t_mday, $t_mon) = (localtime($time))[3,4]; + +- return sprintf("%s %2d", $monthNames[$t_mon], $t_mday); ++ return sprintf("%s %02d", $monthNames[$t_mon], $t_mday); + } + + # if there's a real domain: uses that. Otherwise uses the first @@ . patch -p0 <<'@@ .' Index: openpkg-src/postfix/postfix.spec ============================================================================ $ cvs diff -u -r1.159 -r1.160 postfix.spec --- openpkg-src/postfix/postfix.spec 22 Jul 2003 08:11:01 -0000 1.159 +++ openpkg-src/postfix/postfix.spec 22 Jul 2003 14:19:09 -0000 1.160 @@ -56,8 +56,8 @@ Source3: etc.tar Source4: fsl.postfix Source5: rc.postfix -Patch0: pflogsumm.patch -Patch1: postfix.patch +Patch0: postfix.patch +Patch1: postfix.patch.pfls Patch2: ftp://victor.teaser.fr/pub/lwa/postfix/postfix-%{V_whoson}-whoson.patch # build information @@ -120,17 +120,18 @@ %setup2 -q -T -D -a 2 %setup3 -q -T -D -a 3 - # apply external TLS patches + # apply SSL/TLS patch %if "%{with_tls}" == "yes" %{l_patch} -p1 <pfixtls-%{V_tls}/pfixtls.diff %endif - # apply pflogsumm patch - ( cd pflogsumm-%{V_pflogsumm}; %{l_patch} -p0 <%{PATCH pflogsumm.patch} ) + # apply OpenLDAP API patch + %patch0 -p0 - # drop deprecated openldap API - %patch1 -p0 + # apply pflogsumm patch + (cd pflogsumm-%{V_pflogsumm} && %{l_patch} -p0 <%{PATCH1}) + # apply WHOSON patch %if "%{with_whoson}" == "yes" %patch2 -p0 %endif @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]