Version bump #542744 by Tobias Sager. Create cache dirs via existing cronjob #520570 by Agostino Sarubbo.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 94 insertions, 1 deletions

diff --git a/sys-apps/logwatch/ChangeLog b/sys-apps/logwatch/ChangeLog
index 56e9979ad052..6cac308d2456 100644
--- a/sys-apps/logwatch/ChangeLog
+++ b/sys-apps/logwatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/logwatch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.96 2015/04/03 06:15:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.97 2015/04/03 06:21:56 vapier Exp $
+
+*logwatch-7.4.1 (03 Apr 2015)
+
+  03 Apr 2015; Mike Frysinger <vapier@gentoo.org> +logwatch-7.4.1.ebuild,
+  files/logwatch:
+  Version bump #542744 by Tobias Sager.  Create cache dirs via existing cronjob
+  #520570 by Agostino Sarubbo.
 
   03 Apr 2015; Mike Frysinger <vapier@gentoo.org> logwatch-7.4.0-r1.ebuild,
   logwatch-7.4.0_p170-r1.ebuild:
diff --git a/sys-apps/logwatch/files/logwatch b/sys-apps/logwatch/files/logwatch
index 4d4a2227b315..50ba356d3984 100755
--- a/sys-apps/logwatch/files/logwatch
+++ b/sys-apps/logwatch/files/logwatch
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 if [ -x /usr/sbin/logwatch.pl ] ; then
+	mkdir -p /var/cache/logwatch
 	exec /usr/sbin/logwatch.pl --output mail
 fi
diff --git a/sys-apps/logwatch/logwatch-7.4.1.ebuild b/sys-apps/logwatch/logwatch-7.4.1.ebuild
new file mode 100644
index 000000000000..c95b7db90369
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.4.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.1.ebuild,v 1.1 2015/04/03 06:21:56 vapier Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/DateManip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-7.4.0-openssh-hpn.patch
+}
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+}