OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-re Date: 28-Nov-2003 20:07:29
Branch: HEAD Handle: 2003112819072800
Modified files:
openpkg-re/vcheck vc.postfix
openpkg-src/postfix postfix.patch.pfls postfix.spec
Log:
modifying package: postfix-2.0.16 20031128 again
Summary:
Revision Changes Path
1.63 +1 -1 openpkg-re/vcheck/vc.postfix
1.2 +7 -8 openpkg-src/postfix/postfix.patch.pfls
1.182 +1 -1 openpkg-src/postfix/postfix.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.postfix
============================================================================
$ cvs diff -u -r1.62 -r1.63 vc.postfix
--- openpkg-re/vcheck/vc.postfix 23 Sep 2003 18:16:14 -0000 1.62
+++ openpkg-re/vcheck/vc.postfix 28 Nov 2003 19:07:28 -0000 1.63
@@ -12,7 +12,7 @@
regex = pfixtls-([^-]+-[^-]+-[^-]+)\.tar\.gz
}
prog postfix:pflogsumm = {
- version = 1.0.15
+ version = 1.0.16
url = http://jimsun.linxnet.com/postfix_contrib.html
regex = pflogsumm-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.patch.pfls
============================================================================
$ cvs diff -u -r1.1 -r1.2 postfix.patch.pfls
--- openpkg-src/postfix/postfix.patch.pfls 22 Jul 2003 14:19:09 -0000 1.1
+++ openpkg-src/postfix/postfix.patch.pfls 28 Nov 2003 19:07:28 -0000 1.2
@@ -1,13 +1,12 @@
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
+--- pflogsumm.pl.orig 2003-11-28 20:01:19.000000000 +0100
++++ pflogsumm.pl 2003-11-28 20:02:28.000000000 +0100
+@@ -516,8 +516,8 @@
my $logRmdr;
- ($msgMonStr, $msgDay, $msgTimeStr, $logRmdr) =
/^(...)\s+(\d+)\s(..:..:..)\s\S+\s(.+)$/o;
+ next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
+ /^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
- 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 ||
@@ -15,7 +14,7 @@
{
#print UNPROCD "$_";
next;
-@@ -1324,7 +1324,7 @@
+@@ -1378,7 +1378,7 @@
}
my ($t_mday, $t_mon) = (localtime($time))[3,4];
@@ -23,4 +22,4 @@
+ return sprintf("%s %02d", $monthNames[$t_mon], $t_mday);
}
- # if there's a real domain: uses that. Otherwise uses the first
+ # if there's a real domain: uses that. Otherwise uses the IP addr.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.181 -r1.182 postfix.spec
--- openpkg-src/postfix/postfix.spec 28 Nov 2003 14:15:57 -0000 1.181
+++ openpkg-src/postfix/postfix.spec 28 Nov 2003 19:07:28 -0000 1.182
@@ -26,7 +26,7 @@
# package versions
%define V_postfix 2.0.16
%define V_tls 0.8.16-2.0.16-0.9.7b
-%define V_pflogsumm 1.0.15
+%define V_pflogsumm 1.0.16
%define V_whoson 2.0.0.2
# package information
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
