Don't hardcode paths, #185180.

Package-Manager: portage-2.1.3_rc8

5 files changed, 100 insertions, 16 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/Manifest b/app-admin/sysklogd/Manifest
index 000c013f3f44..cb162bae2ae1 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -46,10 +46,10 @@ AUX sysklogd.rc6 1575 RMD160 963226c78967f912735d9fc32945d71a9fcae04e SHA1 e37b4
 MD5 da768a0350dc51b947ee50d292736428 files/sysklogd.rc6 1575
 RMD160 963226c78967f912735d9fc32945d71a9fcae04e files/sysklogd.rc6 1575
 SHA256 d62ddc4d2750dca70c577f497bde69e30d9d258f709326aa4ecb8d75995f78a9 files/sysklogd.rc6 1575
-AUX syslog-cron 701 RMD160 d05e3345a59b96ab1446be171c0300fba7b2ca00 SHA1 550b238d5925bfe18221b49417c3e3fa2848e480 SHA256 97f22ed6ef785d396dcf0f67df43af30457f9155fc21a973f48b50b4981f4c74
-MD5 ed1fec7ebbb4eb91447909e972f1a224 files/syslog-cron 701
-RMD160 d05e3345a59b96ab1446be171c0300fba7b2ca00 files/syslog-cron 701
-SHA256 97f22ed6ef785d396dcf0f67df43af30457f9155fc21a973f48b50b4981f4c74 files/syslog-cron 701
+AUX syslog-cron 658 RMD160 e157e9ca0592bca51c626c11d86ab889cdf4f684 SHA1 89b6f7bc2d8e1870eb6ef55e1138080cae7b55d6 SHA256 cdf96a7283b8fcf51797ff3483393b25f658979015b46aa570c22da719b7bf8c
+MD5 40500aa7863a883936c764d4605ff299 files/syslog-cron 658
+RMD160 e157e9ca0592bca51c626c11d86ab889cdf4f684 files/syslog-cron 658
+SHA256 cdf96a7283b8fcf51797ff3483393b25f658979015b46aa570c22da719b7bf8c files/syslog-cron 658
 AUX syslog.conf 2332 RMD160 1b3ee0e7bee6098849379fe7cbb31101f401c9bb SHA1 48713c205b4b6032c49bb55e607c3051d380d24d SHA256 1b5f4782d958760de5842a34471676892624df8e972c07148d598bb7128b79e8
 MD5 a4ca2a78eecd855928cc313d7c243819 files/syslog.conf 2332
 RMD160 1b3ee0e7bee6098849379fe7cbb31101f401c9bb files/syslog.conf 2332
@@ -77,14 +77,18 @@ EBUILD sysklogd-1.4.2_pre20061230-r1.ebuild 1819 RMD160 18bbc6859a62dfde7044e46d
 MD5 75840fa52269713dfdc9036bd201901b sysklogd-1.4.2_pre20061230-r1.ebuild 1819
 RMD160 18bbc6859a62dfde7044e46ddb86ad7fe6cf1163 sysklogd-1.4.2_pre20061230-r1.ebuild 1819
 SHA256 36ec97a6728e09f474f3b28997734a6bcf1afcafd1d84dd3247b9264c840b5ec sysklogd-1.4.2_pre20061230-r1.ebuild 1819
+EBUILD sysklogd-1.4.2_pre20061230-r2.ebuild 1819 RMD160 e575d55e1259914e27a1632790fbc22ac9c54eda SHA1 a16082da6110cf7e18ce81c543a70cac8d2ca91d SHA256 d6d308fbde2239810835fa863e88677ddd2a3cf527ce5a46def4d19625dbab77
+MD5 963f218c422c0e246820087a95bd63f0 sysklogd-1.4.2_pre20061230-r2.ebuild 1819
+RMD160 e575d55e1259914e27a1632790fbc22ac9c54eda sysklogd-1.4.2_pre20061230-r2.ebuild 1819
+SHA256 d6d308fbde2239810835fa863e88677ddd2a3cf527ce5a46def4d19625dbab77 sysklogd-1.4.2_pre20061230-r2.ebuild 1819
 EBUILD sysklogd-1.4.2_pre20061230.ebuild 1814 RMD160 e3a83276db1e5f1945148ee3a896615cbd75f0d6 SHA1 1db0ee1cce7198290a0915ac2f452f3b03651ee2 SHA256 fe9cf8c3c94a56e882ec4b7438cb59c04a2a32b66b379e6bfda96aa2aa9db77e
 MD5 3a09e5bea0238bec56ddd522f94b9041 sysklogd-1.4.2_pre20061230.ebuild 1814
 RMD160 e3a83276db1e5f1945148ee3a896615cbd75f0d6 sysklogd-1.4.2_pre20061230.ebuild 1814
 SHA256 fe9cf8c3c94a56e882ec4b7438cb59c04a2a32b66b379e6bfda96aa2aa9db77e sysklogd-1.4.2_pre20061230.ebuild 1814
-MISC ChangeLog 9599 RMD160 85495ab5dc85c2048b77dfe8c0e35d91160bf576 SHA1 f6c54a8a9019862afa31ddf76a29b1f26d37effe SHA256 90b3a804b3e6111a4eb0e70a165c9b9601694a94f24c710f4448f1a485722470
-MD5 e281e9b82025b841fbe564850d3faa7d ChangeLog 9599
-RMD160 85495ab5dc85c2048b77dfe8c0e35d91160bf576 ChangeLog 9599
-SHA256 90b3a804b3e6111a4eb0e70a165c9b9601694a94f24c710f4448f1a485722470 ChangeLog 9599
+MISC ChangeLog 9789 RMD160 62f4ff6cf9b13742324b3f027bb9c2620e2db30b SHA1 8ff5bddfb2cd10f4c2f4bed8d9ce4bb617d5b8e7 SHA256 4e1e55e30be6cbc6a878b800d48121221f34f389a0979233ef1936a491ff75c8
+MD5 7451e8c05875822844129e4dafd8cddb ChangeLog 9789
+RMD160 62f4ff6cf9b13742324b3f027bb9c2620e2db30b ChangeLog 9789
+SHA256 4e1e55e30be6cbc6a878b800d48121221f34f389a0979233ef1936a491ff75c8 ChangeLog 9789
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -101,3 +105,6 @@ SHA256 65b541b12c517c56b5377ad827e2162c786179e6d195de832f3da4737aa7615a files/di
 MD5 2212b78743454390818dd85c9c162a15 files/digest-sysklogd-1.4.2_pre20061230-r1 530
 RMD160 1bbbbc7ff6ebb34c30041a2b3544f39048ffdf04 files/digest-sysklogd-1.4.2_pre20061230-r1 530
 SHA256 65b541b12c517c56b5377ad827e2162c786179e6d195de832f3da4737aa7615a files/digest-sysklogd-1.4.2_pre20061230-r1 530
+MD5 2212b78743454390818dd85c9c162a15 files/digest-sysklogd-1.4.2_pre20061230-r2 530
+RMD160 1bbbbc7ff6ebb34c30041a2b3544f39048ffdf04 files/digest-sysklogd-1.4.2_pre20061230-r2 530
+SHA256 65b541b12c517c56b5377ad827e2162c786179e6d195de832f3da4737aa7615a files/digest-sysklogd-1.4.2_pre20061230-r2 530
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
+}