Jelajahi Sumber

o added support for Teapop POP3-Server o some code cosmetics o required openpkg >= 20021120 to ensure correct evaluation of 'pop_type' and 'pop_logfile' in rc.pb4sd

Christoph Schug 23 tahun lalu
induk
melakukan
455e686b87
2 mengubah file dengan 11 tambahan dan 5 penghapusan
  1. 8 2
      pb4sd/pb4sd
  2. 3 3
      pb4sd/pb4sd.spec

+ 8 - 2
pb4sd/pb4sd

@@ -29,7 +29,8 @@ my $pattern = {
     #   UW ipop3d/imapd
     'ipop3d' =>
         '^(... .. ..:..:..) \S+ (?:ipop3d|imapd)\[\d+\]: ' .
-        '(?:Login|Authenticated|Auth) user=\S+ host=(?:\S+)?\[(\d+\.\d+\.\d+\.\d+)\](?: nmsgs=\d+/\d+)?$',
+        '(?:Login|Authenticated|Auth) user=\S+ host=(?:\S+)?' .
+        '\[(\d+\.\d+\.\d+\.\d+)\](?: nmsgs=\d+/\d+)?$',
     #   GNU pop3d
     'popd3d' => 
         '^(... .. ..:..:..) \S+ gnu-pop3d\[\d+\]: ' .
@@ -52,7 +53,12 @@ my $pattern = {
         '(\d+\.\d+\.\d+\.\d+) \d+, \d+ \(\d+\), \d+ \(\d+\)',
     #   popa3d 
     'popa3d' => 
-        '^(... .. ..:..:..) \S+ popa3d\[\d+\]: Authentication passed for \S+ -- \[(\d+.\d+.\d+.\d+)\]$',
+        '^(... .. ..:..:..) \S+ popa3d\[\d+\]: Authentication passed for ' .
+        '\S+ -- \[(\d+.\d+.\d+.\d+)\]$',
+    #   Teapop with logging via OSSP fsl (OpenPKG)
+    'teapop' =>
+        '^(... .. ..:..:..) \S+ <\S+> teapop\[\d+\]: Successful login for ' .
+        '\S+ \[\d+.\d+.\d+.\d+\] from \S+ \[(\d+.\d+.\d+.\d+)\]$',
 };
 
 #   parameters and their defaults

+ 3 - 3
pb4sd/pb4sd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      PD
 Version:      1.2
-Release:      20020628
+Release:      20021120
 
 #   list of sources
 Source0:      pb4sd
@@ -42,8 +42,8 @@ Source1:      rc.pb4sd
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, perl, perl-db, perl-sys
-PreReq:       OpenPKG, openpkg >= 20020206, perl, perl-db, perl-sys, perl-net, POP
+BuildPreReq:  OpenPKG, openpkg >= 20021120, perl, perl-db, perl-sys
+PreReq:       OpenPKG, openpkg >= 20021120, perl, perl-db, perl-sys, perl-net, POP
 AutoReq:      no
 AutoReqProv:  no