parent
d7fdf0810d
commit
cdeaa58178
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 28824 BLAKE2B 670cb5483856b6a13cff82cd68f5b069afa94c222761f0f2228d76a228974ff24d9499e8032c90a261f0570f878aa0a51dfab859b6f7dc3fcf1e44a0af901054 SHA512 f65287dc43c16af5f4c735013c625433b98064ec671791f69c1f41d98489c5f69204160f1661e993fb6556ef992f473bdec015413093307b9f606d08461c70d3
|
||||
TIMESTAMP 2018-12-28T15:08:39Z
|
||||
MANIFEST Manifest.files.gz 28820 BLAKE2B 1771d50b48a49991d243182619f67d20083387cec907fe11ceb34000e7fe1dc27c6ff6915ffb9e1a4142441c5f2f11e767db92b73869fa98aeb46f3ee6484743 SHA512 249d9279bb9c8b3d3ef8da94a77d6fb90c876012af95eb1f39c22123162036463f2854e263bca9a4ef54f63b012078800ea1412a838a8cc28aca5fa0f3d0c88b
|
||||
TIMESTAMP 2018-12-28T15:38:41Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwmPHdfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwmQ4FfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klD2tA//b9cM5MkmXI7wJZWIzIlVbCjk2LgEcpdykTvJrUlWAF+y2VccF3m0OoUv
|
||||
EZ7wRmvX/TJRPUqEGaXlXJdlnbgVOJ6/8d2AlaT+h5Ba98Hto2bFBIbJPXbswjv3
|
||||
mzH+euaeK2l9vneGK2XdoPlXyBmi41kw3SaG0qIEKpzWX6pThxFG35UL5LN16Gi0
|
||||
x1ZP9hQbcwp4UE12KSLsY1Lghog/YjUZFAxLjBMmufcziUhDBam58rgKrkBLAjPl
|
||||
N1OVmZIXDlCLwdqsJ5e2kd4rz4lhQdk1LPEtvlzRbWjKFcBQo+8QOToBN95V1Ipw
|
||||
NoGsPB9Soq3Vr1WPq5GZGtA8+C1AUrG+1WUhs2D+AGIkwx5Sp5YftPFAkhEAB80z
|
||||
3+3KotEYi7C3brIbZ5IwBw79shMRF7H5uFtSgR1uakJAbNIUGzFmZMEfJAF8Qvf/
|
||||
aQdeWWPSxO1w/3uDqQLiBWFoC61ld6GBckiedn1aif/aESuxLMK2B7ZqUs5I2dTk
|
||||
+pV+QLKCtpFy+a5YpxIhVuCoPSUYL4UQ2TRp6fhcnl6JIHeIo8VpYYnCKqqvzEoq
|
||||
jn9c+yL9nsCRQovu6GhLB4JOWjnsvtm9g9mx6AHefhwrYpQGeY961DToD0y2EXfv
|
||||
jkz1tiHxLziUiggEc8EcH5UTLvSvNj0bjbuEWf7WE8MlXhb8TcA=
|
||||
=OtxJ
|
||||
klAj3Q//enMTNHo4giPCbiEy/N6igw1sIIeXWgwShgyr8aRjMZU+8G0ExVwVKkme
|
||||
9dJsdI16ejdEvDeOf2a7oYwPg+7D+FhpQrkHsJYHOPFzMSRIsj9ohTj+AgvZMaHK
|
||||
DVgabuDB3iYb5bAEubsJuvur3Y0bA62CA3v7rTORaNfDTKZ4si5S8rqA9VU/Tlq7
|
||||
aW1qrwOqqlnel0Skbvjv5ldfXO00tzlq6KrN+b6cWzAwVRfFcsojjAtRUAFn77Hk
|
||||
9ae7DzRwCz+8g0ZFB06FwaCtTqwDQyWK1toYoSDyatoyPbT0amnJX3ncJPcLF5UB
|
||||
F1WCZMI4VwuwKE0exbTRJpx/sI/6cqhSTdBcg5lvpoi9ndhPIut45VNgSvJJcNHC
|
||||
jFOvUjLitz8VgOwGtAwMwftMLhvxUlYuOouL+eDE92lHSX67sOJbg/mk6X/AvG2X
|
||||
OnHrOBl7ByY2OK38zeJ2V7I3k72hBYSBK4QuJx8G7LtewRZNdOLT+vWdmxwJX4eL
|
||||
Tmo7+cy/Qo9pAW/bDf2Dex/p7fDdPHy56V89WcmPA+7iwVES7tH6M6qLy+rWZOsL
|
||||
HhrpJmY6HKyhNGoyr2RdMC/yvkbnpAoxZNO6fLTY69lFArXqRVfW8pMscvoy0h7l
|
||||
vxZgba+SEbUBJuXTW9mJQZ7jymZKhPXxdjhX1dqj2DpQ0V7998c=
|
||||
=BmYj
|
||||
-----END PGP SIGNATURE-----
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
Fri, 28 Dec 2018 15:08:34 +0000
|
||||
Fri, 28 Dec 2018 15:38:36 +0000
|
||||
|
@ -1 +1 @@
|
||||
Fri, 28 Dec 2018 15:08:34 +0000
|
||||
Fri, 28 Dec 2018 15:38:37 +0000
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,10 @@
|
||||
DEFINED_PHASES=compile install prepare
|
||||
DESCRIPTION=A log analyzer for amavisd-new
|
||||
EAPI=7
|
||||
HOMEPAGE=http://logreporters.sourceforge.net/
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-lang/perl
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/logreporters/amavis-logwatch-1.51.03.tgz
|
||||
_md5_=394a1fd585b5d3c5031e1c49d3b16c29
|
@ -0,0 +1,10 @@
|
||||
DEFINED_PHASES=compile install prepare
|
||||
DESCRIPTION=A log analyzer for postfix
|
||||
EAPI=7
|
||||
HOMEPAGE=http://logreporters.sourceforge.net/
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-lang/perl
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/logreporters/postfix-logwatch-1.40.03.tgz
|
||||
_md5_=d84434cba0c992e75d9bd98dfccd7ecc
|
@ -1 +1 @@
|
||||
Fri, 28 Dec 2018 15:08:34 +0000
|
||||
Fri, 28 Dec 2018 15:38:37 +0000
|
||||
|
@ -1 +1 @@
|
||||
Fri Dec 28 15:08:34 UTC 2018
|
||||
Fri Dec 28 15:38:36 UTC 2018
|
||||
|
@ -1 +1 @@
|
||||
Fri, 28 Dec 2018 15:30:01 +0000
|
||||
Fri, 28 Dec 2018 16:00:02 +0000
|
||||
|
@ -1 +1 @@
|
||||
a61c10eac67ab2bc9fa2f9e7d39dc3c27568f728 1546008922 2018-12-28T14:55:22+00:00
|
||||
54fd9e745a555871dd59174a48b3dd4218f3d210 1546010554 2018-12-28T15:22:34+00:00
|
||||
|
@ -1 +1 @@
|
||||
1546009501 Fri 28 Dec 2018 03:05:01 PM UTC
|
||||
1546011301 Fri 28 Dec 2018 03:35:01 PM UTC
|
||||
|
@ -1 +1 @@
|
||||
Fri, 28 Dec 2018 15:08:34 +0000
|
||||
Fri, 28 Dec 2018 15:38:36 +0000
|
||||
|
Binary file not shown.
@ -1,9 +1,14 @@
|
||||
AUX SANITIZED-NULL-bytes-messages.patch 1266 BLAKE2B e0bc9f068071c1adeb22c3f2c4b63a735f1af950bbde7f6f21909e66db36efb4914c86081839cd1e61af345006b9d31c80a2e40ccc456008ed3f4cd6c2971db9 SHA512 fa8cbd9e12a22e0a57c66cfd3a93f653780bc26c0bf15967fc423b34627567f976fbdae46c7e0a42afcbe328c9224e63c204b566f30da03b734aa206828d8413
|
||||
AUX file-libmagic-errors.patch 1330 BLAKE2B b21498826fb131bd1fd106c38eefdad35ace6465a026a624ce060d88ced90bee896ec28dac89bd678073911a35e8ee0bce88ee9d223df6186559481ed8a1d407 SHA512 8b2603ef414bd54fc2007bccfe6d12083c95f1f4fd81bdbd0bea4c45e6be57d6f1fd7851587ac95c0be740366f536e04512a2ea5220bf7fdb7e3a6317b0ae177
|
||||
AUX ignore-all-sd_notify-lines.patch 1251 BLAKE2B f855f68c90665679f4856bf8d521d26f38991b2f8065b8e25dc0ed141296438badf16aada1d16baeefcb597837d9673592f4b57686615d71fcdf29315f131a93 SHA512 6b575173856e97c551739ca6b90717af52788a65c5deaf8dde3128e3c14c949d7325b2bbe42c5c7ce82f0e873abb7f0559cb14f69d9fb88e0dcab61e165d247f
|
||||
AUX ignore-amavis-startup-notifications.patch 939 BLAKE2B ca89982945ab6256fb196f7c96bbd5dbdb655097394a1644fa893a58fc607ccc9a008f093357a66723e96b961caa726bbb5f412efa6004cd0ba073ff0c31afab SHA512 34f23c5ebf9676407cb4c16a6f273e7086de3f90587dd5ab2ecb1f20c035e3940fb3318a696f0d5e8901dad2908ef4d14b4489fcae822c83e4b9470d5d20f869
|
||||
AUX ignore-utf8smtp-lines.patch 1141 BLAKE2B c31c8928001ddebfd3542175f618ca0f0d5e92b28f697f6511785677bfc99111ca63827782b09bf23a325e98267856515a90d6bc2a8a22f517875a803794939e SHA512 4de215ca12ce744b0a9e22bd0e56702101b2ae122b342402eea1272b0e893ffe2f9bab2261eb626f5f9f7eb55ba0c527391d629f7dc2ce0faa3834d9c065f461
|
||||
AUX no-pid_file-configured.patch 1142 BLAKE2B 9c59e5d3612763a7c42161d93cd61c71081201f954f92c567c39795de176cbad494b2a9302e8db7286f9df488173c2a330745a60236f3ba7e63a6ac0cb80eb4b SHA512 d22fb6d55d36fc14fd5eaf7f2545bbde7150ff243bda3f925b807068fa5a6c22c0eb1096be775044cf912f9187fbfaa64aa3c52e6649e7c8d8bced3c0739a3b8
|
||||
AUX redundant-argument-to-sprintf.patch 1738 BLAKE2B 94c16b535dc20044ddac72af4a1b728d66702584ff9c93cec95c0881cfc6d13579202596753545e90e50666df3097dcdf68205352c72d0a59e6c54dc34f16d64 SHA512 51953b22000ee685e954967de3e8edd223400d1e9a5dab056258bbe3cad6795838aa1e20328b1f06dcc9de9e0900e1b87358b09b5845e1bdfb24119e94ab8db9
|
||||
AUX unchecked-encrypted.patch 2022 BLAKE2B fc09850f9b4aeeccb5047086ff32add53347c27e932733d7765c85a49f6b48f65f64ca06070bc71216e636da4b24a4b6f2842753d681bbec878643bb9a69fada SHA512 6fc07898123012d2755851fa9a4ab026174fb82f1a85361ddc95f407c0f4ac9b1e8979215c1264c21775f997dff343f209676b6055728a52590b37d8e7e2f4ba
|
||||
AUX unescaped-left-brace.patch 2043 BLAKE2B 4755ef33bbb8961fc69cee4276546724f1fb5e89b92107baa4b2a5a7f1c6b0f611bb24a5184c7657496784343f3b7639dcbe41bdc70d26de4343576c30bebceb SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745
|
||||
AUX will-bind-to-lines.patch 1077 BLAKE2B c96651f6a0b68a4b95eb571ecbe7a7002a20b765184d28ea21e32b96dcde67041bb03431674a9f51809a528f20e14e50337d2c1315a6e19f4bf5a2da5bcd11d4 SHA512 60a0844d7a6a17b7c79422e641660e20b69cf89844bcddf3356ff6a60b4c4ff2b2e90206248a5a5771e014edee2917eb47e83276a0e56aeb7f8dfd75d55190f4
|
||||
DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
|
||||
EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 BLAKE2B 24340243fd70ec8be31da53dead0e5de83faf88bbb2644bf17c063ee03e605cd009f7990bdd8479798c1959f1c58243de345bf52cf5007ba507f65aee0f3ff07 SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15
|
||||
EBUILD amavis-logwatch-1.51.03-r4.ebuild 1373 BLAKE2B c8366b674e0213538d61cdc2945e6ae9c3e4da9aa7a6040854581b0c54d0c4aabbf6b34dc44d1fe79ed11008cb8edf39d05d981015f3badf506e74cc46dd0658 SHA512 47bfa415b0f1d7a175457ae848ec98b9d32bed94017b4f69b6cd3e9c1fff3ec39790e38eef0e22319f2250832146381dcc9817267c65e28b5781a7a842a7e668
|
||||
MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
|
||||
|
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="A log analyzer for amavisd-new"
|
||||
HOMEPAGE="http://logreporters.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="dev-lang/perl"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/unescaped-left-brace.patch"
|
||||
"${FILESDIR}/redundant-argument-to-sprintf.patch"
|
||||
"${FILESDIR}/ignore-amavis-startup-notifications.patch"
|
||||
"${FILESDIR}/ignore-utf8smtp-lines.patch"
|
||||
"${FILESDIR}/unchecked-encrypted.patch"
|
||||
"${FILESDIR}/file-libmagic-errors.patch"
|
||||
"${FILESDIR}/ignore-all-sd_notify-lines.patch"
|
||||
"${FILESDIR}/no-pid_file-configured.patch"
|
||||
"${FILESDIR}/will-bind-to-lines.patch"
|
||||
"${FILESDIR}/SANITIZED-NULL-bytes-messages.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# Replace the default config file location with ours.
|
||||
local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
|
||||
local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
|
||||
sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
|
||||
|| die 'failed to update the default config location'
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The default make target just outputs instructions. We don't want
|
||||
# the user to see these, so we avoid the default emake.
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc Bugs Changes README
|
||||
doman ${PN}.1
|
||||
dobin ${PN}
|
||||
insinto /etc
|
||||
doins ${PN}.conf
|
||||
}
|
@ -0,0 +1,34 @@
|
||||
From 6d985d29d8be2b70ee7e4048a7ae95e2b4013f17 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Fri, 28 Dec 2018 10:01:56 -0500
|
||||
Subject: [PATCH 4/4] Ignore "SANITIZED ... NULL byte(s)" messages.
|
||||
|
||||
Newer versions of the amavisd daemon sanitize NULL bytes within the
|
||||
body of a message for the benefit of Cyrus IMAP. When it does this,
|
||||
the number of bytes sanitized is logged. This is an informational
|
||||
message only as far as I can tell, so it's been added to the list of
|
||||
messages to ignore.
|
||||
---
|
||||
amavis-logwatch | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/amavis-logwatch b/amavis-logwatch
|
||||
index 250a6ba..044c94d 100644
|
||||
--- a/amavis-logwatch
|
||||
+++ b/amavis-logwatch
|
||||
@@ -2052,6 +2052,12 @@ sub create_ignore_list() {
|
||||
# describe what is being sent to the systemd notification socket,
|
||||
# if one exists.
|
||||
push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/;
|
||||
+
|
||||
+ # In amavisd-new-2.11.0-rc1 and later, amavis will replace any null
|
||||
+ # bytes that it finds in the body of a message with a "modified
|
||||
+ # UTF-8" encoded null. The number of times it does this is then
|
||||
+ # logged with the following message.
|
||||
+ push @ignore_list_final, qr/^smtp forwarding: SANITIZED (\d+) NULL byte\(s\)/;
|
||||
}
|
||||
|
||||
# Notes:
|
||||
--
|
||||
2.19.2
|
||||
|
@ -0,0 +1,33 @@
|
||||
From 653f988ba163c74f3ebdb6e53f57db9d8e569b1f Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Fri, 28 Dec 2018 09:23:52 -0500
|
||||
Subject: [PATCH 1/4] Ignore all "sd_notify" lines.
|
||||
|
||||
Lines beginning with either "sd_notify:" or "sd_notify (no socket):"
|
||||
contain information about what is being sent to the systemd
|
||||
notification socket, if one exists. One such line was already being
|
||||
ignored, but we don't want any of them. So, the existing
|
||||
@ignore_list_final entry was expanded to encompass all such messages.
|
||||
---
|
||||
amavis-logwatch | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amavis-logwatch b/amavis-logwatch
|
||||
index ac93cbc..ffb502b 100644
|
||||
--- a/amavis-logwatch
|
||||
+++ b/amavis-logwatch
|
||||
@@ -2047,7 +2047,10 @@ sub create_ignore_list() {
|
||||
push @ignore_list_final, qr/\bRUSAGE\b/;
|
||||
push @ignore_list_final, qr/: Sending .* to UNIX socket/;
|
||||
|
||||
- push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./
|
||||
+ # Lines beginning with "sd_notify:" or "sd_notify (no socket):"
|
||||
+ # describe what is being sent to the systemd notification socket,
|
||||
+ # if one exists.
|
||||
+ push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/;
|
||||
}
|
||||
|
||||
# Notes:
|
||||
--
|
||||
2.19.2
|
||||
|
@ -0,0 +1,27 @@
|
||||
From a93ee5d433308d2cac76ac9502e34c953ff96337 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Fri, 28 Dec 2018 09:33:07 -0500
|
||||
Subject: [PATCH 2/4] Ignore "no $pid_file configured, not checking it" lines.
|
||||
|
||||
When no PID file is configured (for example, when amavisd is running
|
||||
in the foreground), this message is logged. We already ignore the
|
||||
other types of PID file notifications, so ignore this one too.
|
||||
---
|
||||
amavis-logwatch | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/amavis-logwatch b/amavis-logwatch
|
||||
index ffb502b..6d06793 100644
|
||||
--- a/amavis-logwatch
|
||||
+++ b/amavis-logwatch
|
||||
@@ -1958,6 +1958,7 @@ sub create_ignore_list() {
|
||||
push @ignore_list_final, qr/^fish_out_ip_from_received: /;
|
||||
push @ignore_list_final, qr/^Waiting for the process \S+ to terminate/;
|
||||
push @ignore_list_final, qr/^Valid PID file \(younger than sys uptime/;
|
||||
+ push @ignore_list_final, qr/^no \$pid_file configured, not checking it/;
|
||||
push @ignore_list_final, qr/^Sending SIG\S+ to amavisd/;
|
||||
push @ignore_list_final, qr/^Can't send SIG\S+ to process/;
|
||||
push @ignore_list_final, qr/^killing process/;
|
||||
--
|
||||
2.19.2
|
||||
|
@ -0,0 +1,29 @@
|
||||
From e53948a6909e98b63c63c97749c7d0eb534fa274 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Fri, 28 Dec 2018 09:40:36 -0500
|
||||
Subject: [PATCH 3/4] Ignore "will bind to" lines in addition to "bind to"
|
||||
lines.
|
||||
|
||||
In amavisd-new-2.11.0-rc1, the informational "bind to..." messages
|
||||
were changed to say "will bind to..." instead. This commit updates the
|
||||
@ignore_list_final regular expression to match both forms.
|
||||
---
|
||||
amavis-logwatch | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amavis-logwatch b/amavis-logwatch
|
||||
index 6d06793..250a6ba 100644
|
||||
--- a/amavis-logwatch
|
||||
+++ b/amavis-logwatch
|
||||
@@ -2029,7 +2029,7 @@ sub create_ignore_list() {
|
||||
push @ignore_list_final, qr/^address modified \(/;
|
||||
push @ignore_list_final, qr/^Request: AM\.PDP /;
|
||||
push @ignore_list_final, qr/^DSPAM result: /;
|
||||
- push @ignore_list_final, qr/^bind to \//;
|
||||
+ push @ignore_list_final, qr/^(will )?bind to \//;
|
||||
push @ignore_list_final, qr/^ZMQ enabled: /;
|
||||
|
||||
push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /;
|
||||
--
|
||||
2.19.2
|
||||
|
@ -1,6 +1,8 @@
|
||||
AUX all-server-ports-busy-lines.patch 2510 BLAKE2B 152a38abfc0caff5aaa8bce0a0b0c9adbf259a3317503506ad73a29c85745751960e594efca1d58cf7a39f401a443034ccca1bb8d80bc8bc25fa0b8e215d6602 SHA512 01edf0e1fb6db7799618e9e03f7201470e00a71ca4a43539e6a3555c81bab5846007f140ff868fd48a436c3a7a8f0fe6de70edd285887402fd97edfec636506d
|
||||
AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6d011ccf33d700cb45382b764342b42680621d1f1f376ecc66c1bbb7321fee1bf06f226a7e21cf7cceaad6048de526edc599 SHA512 6f732591637c5a076532b210a0b9378904609e7927ed5549c1b3e976e45a38e080ed0a754b230d04f4fd0b1904ddc75acd4c420032e23bd663276398cb35a5c7
|
||||
AUX redundant-argument-to-sprintf.patch 1744 BLAKE2B d251a7e894dd4ebe09d61984a55ad2e7a0771310a88042da952c6e7d13b98952648e2da995e32cac92818e26d2df2e0d83f08a16fed093cfb07fe81187f5aaf6 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04
|
||||
AUX unescaped-left-brace.patch 1277 BLAKE2B 3dc055f3321b958cbe35e0e51336c64e41b4e71e4221ea025c6b4c86eff8af710652ab2f97bde52944ec17ba047039319356b338b10af6594dc50167811535df SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033
|
||||
DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
|
||||
EBUILD postfix-logwatch-1.40.03-r2.ebuild 1069 BLAKE2B 5b0a9903c7622e0033217d2c97c551d8dbe8443e8bc7e60712b945ae364699c4599ca4d96d0ae81c9c1ffbcc1a2f5e33b2adff5b33b2276a433ef4de8c9a8ebb SHA512 c92f554614484baba18a9a3e178e4a6d419f2c41cac23f951a518fd63513b8e9df278391441ec8ae2cf9c68f2923e274e3e436bbbf3761430a6c5d797635c5e7
|
||||
EBUILD postfix-logwatch-1.40.03-r3.ebuild 1117 BLAKE2B 07f78be6fa6e9cfc3881ce9259dfbaeb8884114cb41b0989e29e1065789050e6542e5f0ec3e4512a968243ce214561ad8399c8ac2c24510e4d400eeefecb4101 SHA512 fd1ad247b55224b115c00557bc1e23db90db9383bc39b1b27430539c8101d209050b2f292f42aca3737b06275b8ddee6a0a746ed487acefa6307cf7902b1b2cb
|
||||
MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
|
||||
|
@ -0,0 +1,59 @@
|
||||
From 7b3930a9d44f91a63f0edbe765c75dc8f6128b7c Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Wed, 26 Dec 2018 12:54:15 -0500
|
||||
Subject: [PATCH 1/1] Match postscreen "all server ports busy" lines.
|
||||
|
||||
Lines that look like
|
||||
|
||||
NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
|
||||
|
||||
were not being matched. There were two similar matches, one for a
|
||||
specific "too many connections" error
|
||||
|
||||
NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
|
||||
|
||||
and another for a more general form intended to match "all screening
|
||||
ports busy" errors from postscreen:
|
||||
|
||||
reject: connect from [192.168.0.1]:21225: all screening ports busy
|
||||
|
||||
The general form is preferable in my opinion, but the "screening
|
||||
ports" message is a bit of a black sheep. As a result, even the more
|
||||
general regular expression didn't match the other two errors due to
|
||||
their beginning with "NOQUEUE" and using an uppercase "CONNECT".
|
||||
|
||||
To fix this, the general regular expression was made even more
|
||||
general. Now, a leading "NOQUEUE: " is optional, and the "CONNECT" can
|
||||
be capitalized. Thus, one regular expression now catches all three
|
||||
messages.
|
||||
---
|
||||
postfix-logwatch | 13 +++++--------
|
||||
1 file changed, 5 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/postfix-logwatch b/postfix-logwatch
|
||||
index 827dfe0..648ba7a 100644
|
||||
--- a/postfix-logwatch
|
||||
+++ b/postfix-logwatch
|
||||
@@ -4399,14 +4399,11 @@ sub postfix_postscreen {
|
||||
}
|
||||
}
|
||||
|
||||
- elsif ($line =~ /^NOQUEUE: reject: CONNECT from \[([^]]+)\](?::\d+)?: too many connections/) {
|
||||
- # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
|
||||
- $Counts{'postscreen'}{'reject'}{'Too many connections'}{$1}{$END_KEY}++ if $Collecting{'postscreen'};
|
||||
- }
|
||||
-
|
||||
- elsif ($line =~ /^reject: connect from \[([^]]+)\](?::\d+)?: (.+)$/) {
|
||||
- # reject: connect from [192.168.0.1]:21225: all screening ports busy
|
||||
- $Counts{'postscreen'}{'reject'}{"\u$2"}{$1}{$END_KEY}++ if $Collecting{'postscreen'};
|
||||
+ elsif ($line =~ /^(NOQUEUE: )?reject: (connect|CONNECT) from \[([^]]+)\](?::\d+)?: (.+)$/) {
|
||||
+ # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
|
||||
+ # NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
|
||||
+ # reject: connect from [192.168.0.1]:21225: all screening ports busy
|
||||
+ $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++ if $Collecting{'postscreen'};
|
||||
}
|
||||
|
||||
elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) {
|
||||
--
|
||||
2.19.2
|
||||
|
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="A log analyzer for postfix"
|
||||
HOMEPAGE="http://logreporters.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="dev-lang/perl"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/unescaped-left-brace.patch"
|
||||
"${FILESDIR}/redundant-argument-to-sprintf.patch"
|
||||
"${FILESDIR}/multi-digit-enhanced-status.patch"
|
||||
"${FILESDIR}/all-server-ports-busy-lines.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# Replace the default config file location with ours.
|
||||
local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
|
||||
local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
|
||||
sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
|
||||
|| die 'failed to update the default config location'
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The default make target just outputs instructions. We don't want
|
||||
# the user to see these, so we avoid the default emake.
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc Bugs Changes README ${PN}.conf-topn
|
||||
doman ${PN}.1
|
||||
dobin ${PN}
|
||||
insinto /etc
|
||||
doins ${PN}.conf
|
||||
}
|
Loading…
Reference in new issue