Don't hardcode paths, #185180.

(Portage version: 2.1.3_rc8)

4 files changed, 85 insertions, 8 deletions

diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index 8169608b7eb8..70e16b041b5f 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sysklogd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.65 2007/06/27 17:21:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.66 2007/07/13 10:31:25 uberlord Exp $
+
+*sysklogd-1.4.2_pre20061230-r2 (13 Jul 2007)
+
+  13 Jul 2007; Roy Marples <uberlord@gentoo.org> files/syslog-cron,
+  +sysklogd-1.4.2_pre20061230-r2.ebuild:
+  Don't hardcode paths, #185180.
 
   27 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   sysklogd-1.4.2_pre20061230.ebuild:
diff --git a/app-admin/sysklogd/files/digest-sysklogd-1.4.2_pre20061230-r2 b/app-admin/sysklogd/files/digest-sysklogd-1.4.2_pre20061230-r2
new file mode 100644
index 000000000000..c4359b3d0a05
--- /dev/null
+++ b/app-admin/sysklogd/files/digest-sysklogd-1.4.2_pre20061230-r2
@@ -0,0 +1,6 @@
+MD5 c3f301297d5b9d40f87e4157653650a4 sysklogd-1.4.1-cvs-20061230.patch.bz2 12584
+RMD160 50dd59916af80b84618b98229cfafc21b547d2c0 sysklogd-1.4.1-cvs-20061230.patch.bz2 12584
+SHA256 4ca2fd34dacd1c10018b6a786c24faa392d6fef57607e240e3bcaf925231e2b2 sysklogd-1.4.1-cvs-20061230.patch.bz2 12584
+MD5 d214aa40beabf7bdb0c9b3c64432c774 sysklogd-1.4.1.tar.gz 81784
+RMD160 5e60f1294c45932915a3dcd1018cdc02d005a3e0 sysklogd-1.4.1.tar.gz 81784
+SHA256 44357e0fae8c8f0e315bf130b4e86a4f96b91d66eeb4e473def4ce8336fff102 sysklogd-1.4.1.tar.gz 81784
diff --git a/app-admin/sysklogd/files/syslog-cron b/app-admin/sysklogd/files/syslog-cron
index 8ee555a55af3..86d6cce9714b 100644
--- a/app-admin/sysklogd/files/syslog-cron
+++ b/app-admin/sysklogd/files/syslog-cron
@@ -8,24 +8,24 @@
 #		stuff
 #
 #		Written by Martin Schulze <joey@debian.org>.
-#		$Id: syslog-cron,v 1.5 2004/10/03 08:43:14 vapier Exp $
+#		$Id: syslog-cron,v 1.6 2007/07/13 10:31:25 uberlord Exp $
 
 cd /var/log
-for LOG in `/usr/sbin/syslogd-listfiles`
+for LOG in `syslogd-listfiles`
 do
    if [ -f $LOG ]; then
-      /usr/sbin/savelog -g adm -m 640 -u root -c 7 $LOG >/dev/null
+      savelog -g adm -m 640 -u root -c 7 $LOG >/dev/null
    fi
 done
 
-for LOG in `/usr/sbin/syslogd-listfiles --auth`
+for LOG in `syslogd-listfiles --auth`
 do
    if [ -f $LOG ]; then
-      /bin/chown root:adm $LOG
-      /bin/chmod o-rwx $LOG
+      chown root:adm $LOG
+      chmod o-rwx $LOG
    fi
 done
 
 # Restart syslogd
 #
-/bin/killall -HUP syslogd
+killall -HUP syslogd
diff --git a/app-admin/sysklogd/sysklogd-1.4.2_pre20061230-r2.ebuild b/app-admin/sysklogd/sysklogd-1.4.2_pre20061230-r2.ebuild
new file mode 100644
index 000000000000..da6a621438f6
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.4.2_pre20061230-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.2_pre20061230-r2.ebuild,v 1.1 2007/07/13 10:31:25 uberlord Exp $
+
+inherit eutils flag-o-matic
+
+CVS_DATE=${PV#*_pre}
+MY_P=${PN}-1.4.1
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-cvs-${CVS_DATE}.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/debianutils"
+PROVIDE="virtual/logger"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}"/${MY_P}-cvs-${CVS_DATE}.patch
+
+	epatch "${FILESDIR}"/${MY_P}-accept.patch
+	epatch "${FILESDIR}"/${MY_P}-querymod.patch
+	epatch "${FILESDIR}"/${MY_P}-punt-SO_BSDCOMPAT.patch
+	epatch "${FILESDIR}"/${MY_P}-ksym-headers.patch
+
+	# CAEN/OWL security patches
+	epatch "${FILESDIR}"/${MY_P}-caen-owl-syslogd-bind.diff
+	epatch "${FILESDIR}"/${MY_P}-caen-owl-syslogd-drop-root.diff
+	epatch "${FILESDIR}"/${MY_P}-caen-owl-klogd-drop-root.diff
+
+	append-lfs-flags
+	sed -i \
+		-e "s:-O3:${CFLAGS}:" \
+		Makefile || die "sed CFLAGS"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dosbin syslogd klogd "${FILESDIR}"/syslogd-listfiles || die "dosbin"
+	doman *.[1-9] "${FILESDIR}"/syslogd-listfiles.8
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/syslog-cron syslog.cron
+	dodoc ANNOUNCE CHANGES MANIFEST NEWS README.1st README.linux
+	dodoc "${FILESDIR}"/syslog.conf
+	insinto /etc
+	doins "${FILESDIR}"/syslog.conf
+	newinitd "${FILESDIR}"/sysklogd.rc6 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}