bring back syslog support (bug #491134)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 114 insertions, 9 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index df91dcd8edc9..de624eee5798 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.92 2013/11/05 20:14:27 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.93 2013/11/19 04:50:55 ottxor Exp $
+
+*openntpd-20080406-r5 (19 Nov 2013)
+
+  19 Nov 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/openntpd.logrotate-20080406-r5, +openntpd-20080406-r5.ebuild:
+  bring back syslog support (bug #491134)
 
   05 Nov 2013; Chema Alonso <nimiux@gentoo.org> openntpd-20080406-r4.ebuild:
   Stable for amd64 wrt bug #488946
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index feebcff01718..5809a050c854 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -6,22 +6,25 @@ AUX openntpd.conf.d-3.9_p1-r4 195 SHA256 1980b5dadcd9478e653ef05c099ef45caacfdf1
 AUX openntpd.init.d-20080406-r3 500 SHA256 508585d345194726770d9f7471244312c263016a02ffd5769b1722652d798426 SHA512 0d28f2c62f653ef56774c55a10ee87addf96f471acea09c632b5b1fce61fa68646e11ad4e8170f6109ed29c03c32b38f4e1f1163f583cb6ecac7f3b6799f7fc4 WHIRLPOOL 03e95e28d6dc1a5b81c4e3aa41873e4cd0de6d6afc5a169293c5a148f105ea5f73a8b180c13cf751f38a15e097db9e1847e4a1bb5cfd295e4332dfed7a08d427
 AUX openntpd.init.d-20080406-r4 504 SHA256 59b5eed7edb1ad53d2312a6208905e6ba53ff5eb7c4e2adf0e77652c5e6cf26d SHA512 287ad4db94c45b807a07798d59e94efbae5cd79f8a9fefafcafd2660f189f66954ebca7f247ca5431855781f8660cb405afa442748fe7019c1d9c6dedfe7325f WHIRLPOOL b8260eaa567d4cf4ee468598f959ef755986ca38fd55e01eefcaee55b3eaf9a79a7f1fa8f79c6f2606b862c9c471878e68b42a093e3b45dc85246792f83d2f2d
 AUX openntpd.init.d-3.9_p1-r4 861 SHA256 9ac5287d9c9397e69d62eac8ffc3fb1945ba09f03dce247cd1a2dbca495bf2c8 SHA512 deb4cc60aceda644848696333a776ecc814528ced150da1a062cced615f93cd89888dd825e293b38ea9586bc082782ca236e6e8762b446c317a16a224564fe8c WHIRLPOOL 9842439b95ed36ab61730239811b139654bae01d2e186f93a5029c023a0f1931873658d9331bce7620c572f6f64d64b81cbb5d4a28effa4a15d8ae28d2cfa0aa
+AUX openntpd.logrotate-20080406-r5 147 SHA256 5eec235068280a4c1cf7da645e1a52d1d0cd8c171e27d766166c8e1c3c41e6e6 SHA512 5dbd8a3ac70d85b3a5d57e12a7d6f1d6d39c4f0cbe5d238eedf371b731600e9f085c166b7cb5baf5a92f107a4295a84bd0fb7386c18d6e1eda7f48bb62f24835 WHIRLPOOL e8be54f53515f49c1a461dde9c0fb5b071ed0e58d30ef816475bc3786f7e884a1406a7ba7d61c1a1fe45e5f3d8681b92018c847600a28562822311d460a7f2ec
 AUX openntpd.service-20080406-r3 147 SHA256 7134fb86571582ec1e4b5c05f5b00ff03c37c7c139c27f86482323d423f7eb87 SHA512 fe296581b497d76e7519d734a9209c468ea25705907e4ac9123eaff2dca72a05d5c308ce4973a29abe404aef7074ba30a75c564e46f29902a8f989ec56cde14f WHIRLPOOL 1a4275693a5c2cd0d4d2d25a6d025a9e5c2902758e40c1039ffe2c7f4eb0078c68ced9e676de3db2ec2311fc02bb7c9e2f76c51bee991f234ed36ce7ebc6e0c8
 DIST openntpd_20080406p-4.debian.tar.gz 11480 SHA256 cec5f49a253288384499017bbd5894ec08480de2e4b3b9ce7cad21c056ad2c07 SHA512 bb09991e64d25e098f3d5efc97d422f767c6b4d11e647a00acc2464ad1251613b2da446d5cc0496719bbd5bd2440476326360ffa7dbafdf9e11acfca5165730b WHIRLPOOL bbd6b880197f7a61c423ac996aefdb64ae78a1ed56c10c2065df7c2b3a1a6befe86f986487408802679d6636c847c39d93c418a162510f59725b463d14f34972
+DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
 EBUILD openntpd-20080406-r3.ebuild 2331 SHA256 8996ee3c13072a00d6e31903c43b172ead665a35137c921bc5d14102399cc3a3 SHA512 060a8dce4f974410ba526aee6e1b1c5b3c8294425eb5c1c42b4a9f0923188ca094ecee69a6a883e2d09971171be60c6b6d59e9563d4924f1020dc3cf3aa21d61 WHIRLPOOL 2fbec384a8c6d942ef441d3e38f948f944b1dbb8193b3168d4a7c0f8b0d2e2c93efdd1c08783f3947aa2b6a2b9df7b032931a09e034211b61385aa45a7006d1b
 EBUILD openntpd-20080406-r4.ebuild 2337 SHA256 64adfd3e2ba23a6de22a433b3f6aebceb27c8a1a8ffdba14df37befba25113f9 SHA512 3c52493d9e793a619dbf9e25e4e08f24a35f804f968fd042f5a8932c78853bd7a0678924834eb7ae408666c6e5a9a0893b4f0f9d69f665fd5c7801c75e4b474d WHIRLPOOL 63f9228d9964797c8da97451edd2f08386e45dd7a76905f90964f07faca52719c87e7e6423b86ec2ee2fcd4168956e488b5e01cd5ff3a2a7007ab9b37bafdd0a
+EBUILD openntpd-20080406-r5.ebuild 2511 SHA256 5eeebeef377d8de68013730d9901b5cc92449769059c9cd57b39e5a757bd9028 SHA512 e61c96fae7780089c67d34b12d30f62904c72c087b7f7733e52e71c674fe76bba8559b07f2de07c8a4e751ddac5207ad13eaaeee2420d63c3b722303fd910015 WHIRLPOOL 971e65b377f03867b7cdf6088e51b870d8071e52123bf0e69343396183266fa714ce93b55f0daad7d28bfcad7ecfcbe5a12f0be400fd27aa2f4554c624ea6db7
 EBUILD openntpd-20080406.ebuild 1563 SHA256 e69cc07d70292d0c0d51f864ea39beebc9227013e8d8a0e08c404cab2d2a3ce4 SHA512 34757599e21fe30b5f71ca81bbb736e838b9967c2e91cd426e5c1ee15fb20629bc066a3b6b1761a2676d9a9b9a8957ecc1efbdee0705f59a0a4cfecb763a1d6c WHIRLPOOL 6477bb5c761aa1d0cb67805d8eadbb081abd3d0f9f44df1cf8275ced5d369994b2711eb03c93cad38472a8cca5f7510dbde8845cfd2235a229afc4c3e38c98f6
-MISC ChangeLog 12743 SHA256 735707f6af75fa99c5b66e5ac37f57092d7837a4bede96dd84cc79362b023ba4 SHA512 acfa74b255028f0a6b4b21719868fb43c0b75406ebe5a4323a99328851ac6fda95396b5b116d893cb9e0409190d4b5c2b6ce5568ec1362a5ed85aca0ae8b5e28 WHIRLPOOL 15ba1ff64c53cc410ac75d927c887ba3c30ca4520af8e118729e5d8b5c52554d07cfefa2f76a2b91bc2ebb38befba4cf482791dbb082b24ec6e2b5b6d4d2864d
+MISC ChangeLog 12948 SHA256 00d7b97a934ba347daf7e5099db6488c056b19f36efe9076edffe43419114800 SHA512 d8e009b1080b92d3f9e8e088b64fe17ea5c05b5cce5bb761ce68903d3b6aa32f45175c53bbd6a062da737f6d9c65178a2a21cfc8eceb8bd52c5756be90bdc556 WHIRLPOOL 60347a76e6f303a6705875625d59085d5a6f9f298b1583d078eddb47dcde9f8bf86018dc0ca25896165f1900220ae9b39c5f83aa3ebcfa98228a35bcd7c8108f
 MISC metadata.xml 507 SHA256 0b48739b9e971d26b7ddd260a7419009be85f1774855660f40e07e4b6c88a1a6 SHA512 b570088b143a26e7ecf28d6cb6a9cc0963899b9462d94bb5c63cd306fe4956f1c69841f12ba6afa67c520968c8a4bdf1d231356502e25564f84f3b5260d109ad WHIRLPOOL 3fa46846b3f005bac272608ce5e32678f8c6129ef968f9f248917558bcc0bf489c83f42850f06d8e7f3e8cf42b470659932867e0f36ca38741728bd1f3bbf773
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSeVHhAAoJEA2sAkrWKOU2QzsIALb6aehRlJ24p+nMGjKXsWOm
-80m2FI9txFx7FIsOXNoQbzlQ7nsSTb5YIfu0ZO8m7F/IYg8zQFahuBt+f8fQZQyR
-ZGMiz86iMvgJRhLLmM/0ZFPulaDtVrSr9jUvjOYD9jzAmh0ZuJuZSUjtMLGdpgbY
-J3b1AzmgjVI//+Zmn4QTkHJPbuNEzu0m1ZLJ1FYcyAPjIuRmSaAbo5pOdEB4jco8
-LnI8lArCjhQyY46gICzy0qhCeXFjyetD3VySv0ttBeZEa7MNiD5d2EyrxaJLlMG4
-VFHqMiwIWaj4ujRFUCwxo342Hc4AFhY5+ci45ZSFxF77uXHdEOI2dKL1s0m/His=
-=v2fq
+iQEcBAEBCAAGBQJSiu4xAAoJEOeBhlrCAAWGWHAH/39gtsbIRoK22Wn5EULcBgNV
+bMp8OI8i0BgoztzJacWnIEJm0wGU3hdDmAYUV5mcs6Dw9dM0dIBZst7uZHCxNJ1h
+TLwNoMtmj0S16O7aMGHhtnj7KS5+0CI9aAceh5JlkAxqNmxWYxmZgn3KeeIm0cnx
+h4TezvEG4y/VIRDsPQyK59eSNOu46ThCbsfPXeuzvRMwiUb9MKE72S4c8s8kzkzz
+D/ycIINiahA4PEq2M0K1I0oU2deq5iTyTFof+FjeMYyNo9AYFol+lX7cPhaOn/k4
+0uPtOn7nX2M8dBmtZtaBRCNq4dJm/57MSOPQrLNRSVhQ49Qv/WxwSa9Po+SJf8c=
+=4ivj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/files/openntpd.logrotate-20080406-r5 b/net-misc/openntpd/files/openntpd.logrotate-20080406-r5
new file mode 100644
index 000000000000..6c0b0d9beb7c
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.logrotate-20080406-r5
@@ -0,0 +1,10 @@
+/var/log/ntpd.log {
+	compress
+	rotate 4
+	daily
+	missingok
+	notifempty
+	postrotate
+		/etc/init.d/ntpd restart > /dev/null 2>&1 || true
+	endscript
+}
diff --git a/net-misc/openntpd/openntpd-20080406-r5.ebuild b/net-misc/openntpd/openntpd-20080406-r5.ebuild
new file mode 100644
index 000000000000..18273fdad245
--- /dev/null
+++ b/net-misc/openntpd/openntpd-20080406-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r5.ebuild,v 1.1 2013/11/19 04:50:55 ottxor Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs systemd user
+
+MY_P="${P/-/_}p"
+DEB_VER="6"
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl selinux syslog"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )
+	!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+pkg_setup() {
+	export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
+	enewgroup ntp
+	enewuser ntp -1 -1 "${NTP_HOME}" ntp
+
+	# make sure user has correct HOME as flipng between
+	# the standard ntp pkg and this one was possible in
+	# the past
+	if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
+		ewarn "From this version on, the homedir of the ntp user cannot be changed"
+		ewarn "dynamically after the installation. For homedir different from"
+		ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
+		esethome ntp "${NTP_HOME}"
+	fi
+}
+
+src_prepare() {
+	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die
+
+	epatch "${WORKDIR}"/debian/patches/*.patch
+	sed -i 's:debian:gentoo:g' ntpd.conf || die
+	eautoreconf # deb patchset touches .ac files and such
+}
+
+src_configure() {
+	econf \
+		--disable-strip \
+		$(use_with !ssl builtin-arc4random) \
+		AR="$(type -p $(tc-getAR))"
+}
+
+src_install() {
+	default
+
+	cp "${FILESDIR}/${PN}.init.d-${PV}-r4" "${T}/ntpd" || die
+	use !syslog || sed -e '8,12d' -i "${T}/ntpd" || die
+	doinitd "${T}/ntpd"
+	newconfd "${FILESDIR}/${PN}.conf.d-${PV}-r3" ntpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate-${PVR}" "${PN}"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-${PV}-r3" ntpd.service
+}
+
+pkg_postinst() {
+	# remove localtime file from previous installations
+	rm -f "${EROOT}${NTP_HOME}"/etc/localtime
+	mkdir -p "${NTP_HOME}"/etc
+	ln -s /etc/localtime "${NTP_HOME}"/etc/localtime || die
+	chown -R root:root "${EROOT}${NTP_HOME}" || die
+}
+
+pkg_postrm() {
+	# remove localtime file from previous installations
+	rm -f "${EROOT}${NTP_HOME}"/etc/localtime
+}