head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.20 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.18 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.16 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 pgoyette-compat-0625:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.14 pgoyette-compat-base:1.2 perseant-stdc-iso10646:1.2.0.12 perseant-stdc-iso10646-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.10 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.8 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 localcount-20160914:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.6 pgoyette-localcount-base:1.2 netbsd-5-2-3-RELEASE:1.1.1.1.2.2 netbsd-5-1-5-RELEASE:1.1.1.1.2.2 netbsd-6-0-6-RELEASE:1.1.1.1 netbsd-6-1-5-RELEASE:1.1.1.1 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.1.1.1.10.1 netbsd-6-1-4-RELEASE:1.1.1.1 netbsd-6-0-5-RELEASE:1.1.1.1 tls-earlyentropy:1.2.0.2 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-6-1-3-RELEASE:1.1.1.1 netbsd-6-0-4-RELEASE:1.1.1.1 netbsd-5-2-2-RELEASE:1.1.1.1.2.2 netbsd-5-1-4-RELEASE:1.1.1.1.2.2 netbsd-6-1-2-RELEASE:1.1.1.1 netbsd-6-0-3-RELEASE:1.1.1.1 netbsd-5-2-1-RELEASE:1.1.1.1.2.2 netbsd-5-1-3-RELEASE:1.1.1.1.2.2 netbsd-6-1-1-RELEASE:1.1.1.1 netbsd-6-1:1.1.1.1.0.20 netbsd-6-0-2-RELEASE:1.1.1.1 netbsd-6-1-RELEASE:1.1.1.1 netbsd-6-1-RC4:1.1.1.1 netbsd-6-1-RC3:1.1.1.1 agc-symver:1.2.0.4 agc-symver-base:1.2 netbsd-6-1-RC2:1.1.1.1 netbsd-6-1-RC1:1.1.1.1 yamt-pagecache-base8:1.2 netbsd-5-2:1.1.1.1.2.2.0.6 PFIX-2-8-13:1.1.1.1 netbsd-6-0-1-RELEASE:1.1.1.1 yamt-pagecache-base7:1.1.1.1 netbsd-5-2-RELEASE:1.1.1.1.2.2 netbsd-5-2-RC1:1.1.1.1.2.2 matt-nb6-plus-nbase:1.1.1.1 yamt-pagecache-base6:1.1.1.1 netbsd-6-0:1.1.1.1.0.18 netbsd-6-0-RELEASE:1.1.1.1 netbsd-6-0-RC2:1.1.1.1 tls-maxphys:1.1.1.1.0.16 tls-maxphys-base:1.2 matt-nb6-plus:1.1.1.1.0.14 matt-nb6-plus-base:1.1.1.1 netbsd-6-0-RC1:1.1.1.1 PFIX-2-8-12:1.1.1.1 PFIX-2-8-11:1.1.1.1 yamt-pagecache-base5:1.1.1.1 yamt-pagecache-base4:1.1.1.1 PFIX-2-8-8:1.1.1.1 netbsd-6:1.1.1.1.0.12 netbsd-6-base:1.1.1.1 netbsd-5-1-2-RELEASE:1.1.1.1.2.2 netbsd-5-1-1-RELEASE:1.1.1.1.2.2 yamt-pagecache-base3:1.1.1.1 PFIX-2-8-7:1.1.1.1 yamt-pagecache-base2:1.1.1.1 yamt-pagecache:1.1.1.1.0.10 yamt-pagecache-base:1.1.1.1 PFIX-2-8-6:1.1.1.1 PFIX-2-8-5:1.1.1.1 PFIX-2-8-4:1.1.1.1 cherry-xenmp:1.1.1.1.0.8 cherry-xenmp-base:1.1.1.1 PFIX-2-8-3:1.1.1.1 PFIX-2-8-2:1.1.1.1 PFIX-2-8-1:1.1.1.1 bouyer-quota2-nbase:1.1.1.1 bouyer-quota2:1.1.1.1.0.6 bouyer-quota2-base:1.1.1.1 matt-mips64-premerge-20101231:1.1.1.1 matt-nb5-mips64-premerge-20101231:1.1.1.1.4.2 matt-nb5-pq3:1.1.1.1.2.2.0.4 matt-nb5-pq3-base:1.1.1.1.2.2 PFIX-2-7-2:1.1.1.1 netbsd-5-1:1.1.1.1.2.2.0.2 netbsd-5-1-RELEASE:1.1.1.1.2.2 netbsd-5-1-RC4:1.1.1.1.2.2 matt-nb5-mips64-k15:1.1.1.1.4.2 PFIX-2-7-1:1.1.1.1 netbsd-5-1-RC3:1.1.1.1.2.2 netbsd-5-1-RC2:1.1.1.1.2.2 netbsd-5-1-RC1:1.1.1.1.2.2 matt-nb5-mips64:1.1.1.1.0.4 PFIX-2-6-6:1.1.1.1 matt-premerge-20091211:1.1.1.1 netbsd-5:1.1.1.1.0.2 PFIX-2-6-5:1.1.1.1 PFIX-2-6-2:1.1.1.1 VENEMA:1.1.1; locks; strict; comment @# @; 1.2 date 2013.01.02.19.18.30; author tron; state dead; branches; next 1.1; 1.1 date 2009.06.23.10.08.18; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.06.23.10.08.18; author tron; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1 1.1.1.1.10.1 1.1.1.1.16.1; next ; 1.1.1.1.2.1 date 2009.06.23.10.08.18; author snj; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2009.09.15.06.01.41; author snj; state Exp; branches; next ; 1.1.1.1.4.1 date 2009.06.23.10.08.18; author matt; state dead; branches; next 1.1.1.1.4.2; 1.1.1.1.4.2 date 2010.04.21.05.23.23; author matt; state Exp; branches; next ; 1.1.1.1.10.1 date 2013.01.23.00.04.48; author yamt; state dead; branches; next ; 1.1.1.1.16.1 date 2013.02.25.00.27.03; author tls; state dead; branches; next ; desc @@ 1.2 log @Resolve conflicts from last import. @ text @This patch adds support for logfiles with conn_use, delays, and dsn attributes. --- pflogsumm.pl.orig 2005-04-09 12:54:44.000000000 +0200 +++ pflogsumm.pl 2005-11-07 21:50:05.483199193 +0100 @@@@ -696,7 +696,7 @@@@ } } elsif((($addr, $relay, $delay, $status, $toRmdr) = $logRmdr =~ - /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), delay=([^,]+), status=(\S+)(.*)$/o) >= 4) + /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), (?:conn_use=[^,]+, )?delay=([^,]+), (?:delays=[^,]+, )?(?:dsn=[^,]+, )?status=(\S+)(.*)$/o) >= 4) { if($opts{'m'} && $addr =~ /^(.*!)*([^!]+)!([^!@@]+)@@([^\.]+)$/o) { @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import Postfix 2.6.2. @ text @@ 1.1.1.1.16.1 log @resync with head @ text @@ 1.1.1.1.10.1 log @sync with head @ text @@ 1.1.1.1.4.1 log @file pflogsumm-conn-delays-dsn-patch was added on branch matt-nb5-mips64 on 2010-04-21 05:23:23 +0000 @ text @d1 14 @ 1.1.1.1.4.2 log @sync to netbsd-5 @ text @a0 14 This patch adds support for logfiles with conn_use, delays, and dsn attributes. --- pflogsumm.pl.orig 2005-04-09 12:54:44.000000000 +0200 +++ pflogsumm.pl 2005-11-07 21:50:05.483199193 +0100 @@@@ -696,7 +696,7 @@@@ } } elsif((($addr, $relay, $delay, $status, $toRmdr) = $logRmdr =~ - /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), delay=([^,]+), status=(\S+)(.*)$/o) >= 4) + /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), (?:conn_use=[^,]+, )?delay=([^,]+), (?:delays=[^,]+, )?(?:dsn=[^,]+, )?status=(\S+)(.*)$/o) >= 4) { if($opts{'m'} && $addr =~ /^(.*!)*([^!]+)!([^!@@]+)@@([^\.]+)$/o) { @ 1.1.1.1.2.1 log @file pflogsumm-conn-delays-dsn-patch was added on branch netbsd-5 on 2009-09-15 06:01:41 +0000 @ text @d1 14 @ 1.1.1.1.2.2 log @Apply patch (requested by tron in ticket #944): Update Postfix to 2.6.5. @ text @a0 14 This patch adds support for logfiles with conn_use, delays, and dsn attributes. --- pflogsumm.pl.orig 2005-04-09 12:54:44.000000000 +0200 +++ pflogsumm.pl 2005-11-07 21:50:05.483199193 +0100 @@@@ -696,7 +696,7 @@@@ } } elsif((($addr, $relay, $delay, $status, $toRmdr) = $logRmdr =~ - /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), delay=([^,]+), status=(\S+)(.*)$/o) >= 4) + /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), (?:conn_use=[^,]+, )?delay=([^,]+), (?:delays=[^,]+, )?(?:dsn=[^,]+, )?status=(\S+)(.*)$/o) >= 4) { if($opts{'m'} && $addr =~ /^(.*!)*([^!]+)!([^!@@]+)@@([^\.]+)$/o) { @