Update to EAPI=4. Add support for USE=logrotate. #324401 by Hank Leininger.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 81 insertions, 1 deletions

diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index 49ce19e60a0f..c4ac5a6166d3 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sysklogd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.86 2013/04/14 11:40:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.87 2013/04/27 08:55:34 vapier Exp $
+
+*sysklogd-1.5-r3 (27 Apr 2013)
+
+  27 Apr 2013; Mike Frysinger <vapier@gentoo.org> +files/sysklogd.logrotate,
+  +sysklogd-1.5-r3.ebuild, metadata.xml:
+  Update to EAPI=4.  Add support for USE=logrotate. #324401 by Hank Leininger.
 
   14 Apr 2013; Agostino Sarubbo <ago@gentoo.org> sysklogd-1.5-r2.ebuild:
   Stable for sh, wrt bug #464160
diff --git a/app-admin/sysklogd/files/sysklogd.logrotate b/app-admin/sysklogd/files/sysklogd.logrotate
new file mode 100644
index 000000000000..8148a2ab2948
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.logrotate
@@ -0,0 +1,8 @@
+/var/log/auth.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice /var/log/syslog /var/log/user.log {
+  create 640 root root
+  sharedscripts
+  missingok
+  postrotate
+    /etc/init.d/sysklogd -q reload
+  endscript
+}
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 659da0ca93c2..b3d8b65eba31 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<use>
+		<flag name='logrotate'>use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/sysklogd/sysklogd-1.5-r3.ebuild b/app-admin/sysklogd/sysklogd-1.5-r3.ebuild
new file mode 100644
index 000000000000..64e5cb10d40a
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.5-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5-r3.ebuild,v 1.1 2013/04/27 08:55:34 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DEB_VER="6"
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
+	mirror://debian/pool/main/s/sysklogd/${PN}_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="logrotate"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/debianutils"
+
+src_prepare() {
+	pushd "${WORKDIR}" >/dev/null
+	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+	popd >/dev/null
+
+	epatch "${FILESDIR}"/${P}-debian-cron.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	# CAEN/OWL security patches
+	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
+	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
+	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+
+	epatch "${FILESDIR}"/${P}-syslog-func-collision.patch #342601
+}
+
+src_configure() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_install() {
+	dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles
+	doman *.[1-9] debian/syslogd-listfiles.8
+	insinto /etc
+	doins debian/syslog.conf
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+	else
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily syslog
+		exeinto /etc/cron.weekly
+		newexe debian/cron.weekly syslog
+	fi
+	dodoc ANNOUNCE CHANGES NEWS README.1st README.linux
+	newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}