summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail/postfix-logwatch')
-rw-r--r--net-mail/postfix-logwatch/ChangeLog8
-rw-r--r--net-mail/postfix-logwatch/Manifest28
-rw-r--r--net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild (renamed from net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild)24
3 files changed, 52 insertions, 8 deletions
diff --git a/net-mail/postfix-logwatch/ChangeLog b/net-mail/postfix-logwatch/ChangeLog
index ab6a4afad301..ef7602aacd56 100644
--- a/net-mail/postfix-logwatch/ChangeLog
+++ b/net-mail/postfix-logwatch/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-mail/postfix-logwatch
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/ChangeLog,v 1.2 2013/12/03 13:43:14 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/ChangeLog,v 1.3 2013/12/20 00:02:07 mjo Exp $
+
+*postfix-logwatch-1.40.00 (20 Dec 2013)
+
+ 20 Dec 2013; Michael Orlitzky <mjo@gentoo.org>
+ +postfix-logwatch-1.40.00.ebuild, -postfix-logwatch-1.39.07.ebuild:
+ Version bump and license change.
*postfix-logwatch-1.39.07 (03 Dec 2013)
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index 9e482a37e074..deeffe16b338 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,4 +1,26 @@
-DIST postfix-logwatch-1.39.07.tgz 114032 SHA256 85d53a8748e0210e1890cf1558c03b1fb27935f2b3a1fc056718d5a3abbe6b12 SHA512 9fd4451e35af5b73c9a26eed6263490a70b31cf4ec65e5f1e7c5070166388e4ef91cb418bee3454a1efef9313a918d491a1a923112c215119cfe2d95d6b81a68 WHIRLPOOL 968e3a57e1dab9575d200424f99a008dd1768098ab6aac88bd26f976b4afb24419311d3a0ebd7d0601a44e0c65b33fa98f41e620914be81397957df21d3b46f3
-EBUILD postfix-logwatch-1.39.07.ebuild 1381 SHA256 87fdc9987946b7a24bd254bb2e966013c39d709a668ac6918c5d8b6a84e65968 SHA512 5c1779801a99a91f393b45c1a467c88bda1f0fe498023d5f565a2eb383a95da704b49447e701c0b73b3372be83e5e3434ed16a1909a0a4f423b733b2bd86f643 WHIRLPOOL 558121e81b959e564208eb16c937dc4c96babb7a9870cbcb56f264123dfd62aff64dd4cf6ac3dbfbacfc74a9d4936863b0bd492ee6812b2419d63c787ec43c9a
-MISC ChangeLog 452 SHA256 a20aea5ee84fbe4aedfeddc47640709efe9cf86cb3832d963db3347be2aeb718 SHA512 0bb2283494e19166db0d8d3d7c050753a3340630c6dd10031e307f3d5d754fbb834e2997566ddad1515d5bfdbfde2de5ac1469f5d5e6216c0d28b72780bbd66c WHIRLPOOL dc0f7550a379e934a75996cbb45c9e7694d64eb2ef219f0ec10319b86051316071d8e9ec4fef384f0dc4d3713b48520aea5776aa603150cf6ca17c06f1d65b94
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST postfix-logwatch-1.40.00.tgz 107441 SHA256 d72a9a91a6871606810485b342ca684a2e8724897b9c906cc27d3df7a15b2616 SHA512 c388cfefceeefcc19bc987865dbe0312ef0f470524ebd8af33abe639137cce699ad79f33b2b64168d2d572981372a9af58e60f6cdfbc661fc56ab64f1c19be03 WHIRLPOOL 027af839c2118eb4abb00c9417ecd4c612a8f6ed81d26461c6025df4effe644b9a809c57d90474f8d515326b3528f6b0311c7b9626fa655e158cfa4712d1abd8
+EBUILD postfix-logwatch-1.40.00.ebuild 1938 SHA256 c857ee459d412abaa382650e2f91ed46a31cb72d8b1f1c51b1cdfd13e63e6c52 SHA512 031ed694007d64c16367542f060061ef706a7c660e04b2e8c873e5ddcec7f37050b6e5f4dfd34c1bde4264fa61fb6eaaeea078beb35886219d179a8d89807d64 WHIRLPOOL f53d9d16ed88959fef203da54eee551df54298dd603c5f9e8e52a64eb4e19bd0fe5550e3b149835d036bd414fdc818189d12ecbe6f2abe3f1be36ad856d67d22
+MISC ChangeLog 648 SHA256 a857f4580c069917e798f29a8bb7b621c0e5408cc8551e0cbcb8bded216f560b SHA512 e585c47c567b0324657148e6612a054e23446a186c7d0926038555c4c94b101728ef4f91369705aa5c6e9d14d0925e5804c18448a70ba905e82a2b53a68c5cd0 WHIRLPOOL e90b3789cb0723cdfe4610f3f0659d207a28d5b10c28297d359bda6087bd7d94725bb5eabf04190743040f19b2364f90db6decc995dc6bfc7b9a32c01a039038
MISC metadata.xml 305 SHA256 d26b2b1ced185340a913e1e12a211c68edc8f5e563e7db2724637955147a791f SHA512 5dfdc3bc4e8be9ffb3695b59ea6ef330ef185185a9737d79fd2c067a2cf861dfc10b24a4b712774bdb240ac28ac4ef591d683d8c1e30a887b3476d5947105b97 WHIRLPOOL 4c6896d05e15a6f64d53d3cd8353c3df88ce9c8dd294fee0510fea71743783ec7958df2519eb4a209d31a50bb3b63e95ec91d509419fe05c69239b65335ef7f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJSs4kDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbKLEP/2lP5HLNoGTz7nizHx2dD6pA
+3p+tVYnVqRCvy4L9EixtZAE4MsAASpCBrMB2R9IBJEEA17EdFmwhInMrQygfj0fF
+UXrshyRDUOU3JlIGQzjYb1hXWK5i6Jwi1XhLEKUSVjeZV9Qq5I96k9+lg+u/mKFG
+NsH9FxvNmxgdF2jo1Rn1vnWgf5luaxo0Xo1ZAh3VQqpTXDwSFRfotxh1WpVzTKYz
+Jy66+6E3/cNXImRCqReRdFtF2+dY1ml5Moj/pZxMC6ztunVazTa+i1UoK4vT6aIg
+PkKF3LoR8dppta4gN2KiLoaAZKIsC1WeXXGVPV8bHX2HUY1mxGnYVb8boUeSSMOn
+cw/35FsV+P11zmbvJq7aimriskIyTsAN8e2ujAybNAmPVTwQ4rU+HuzLloYen+ha
+QUiMc6ZYURG4OhVQeLFfJmd0WychztCExPaqSud+2p6dvuEqizMsj5MtbFa3rQ3F
+hchdlvavs6H9czgZ0LuNY+9HJoDjpM9AjZ8kTlZwMSD1RgTmXz7EWvO2wnfA1foA
+PJIQlDGvNbMLXzvn+B700UwlRpjuGhLX30IbJpqvAAXuZeisRSDskG3MM+k3UQRD
+42Ia2wZFzfC8br6NlBjwWruZFFJji7pqRqPX/pngFo25lJ89yoEtFl2RaAfxE4o3
+wALty9fxuzHemilHt/ip
+=sSnz
+-----END PGP SIGNATURE-----
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
index ab85c5b2bb9b..9f883056f6d0 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild,v 1.1 2013/12/03 13:28:25 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild,v 1.1 2013/12/20 00:02:07 mjo Exp $
EAPI=5
@@ -8,12 +8,24 @@ DESCRIPTION="A log analyzer for postfix"
HOMEPAGE="http://logreporters.sourceforge.net/"
SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-LICENSE="GPL-2"
+LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
+
+# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
+# thus obsolete this use flag.
IUSE="logwatch"
-RDEPEND="dev-lang/perl"
+RDEPEND="dev-lang/perl
+ logwatch? ( !>sys-apps/logwatch-7.4.0 )"
+
+src_prepare() {
+ # 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
@@ -36,8 +48,12 @@ src_install() {
# Remove the taint mode (-T) switch from the header of the
# standalone executable, and save the result as our logwatch
# filter.
+ #
+ # We don't do this for the standalone script because it's nice
+ # to have the taint flag when it works.
+ #
sed 's~^#!/usr/bin/perl -T$~#!/usr/bin/perl~' ${PN} > postfix \
- || die "failed to remove the perl taint switch"
+ || die 'failed to remove the perl taint switch'
insinto /etc/logwatch/scripts/services
doins postfix