[patch] portage diff for update

portage.diff (text/plain), 9.53 KB, created by Paul B. Henson on 2015-02-01 02:20:54 UTC

diff -Nu openntpd-orig/Manifest openntpd/Manifest
--- openntpd-orig/Manifest	2015-01-31 18:17:37.127798485 -0800
+++ openntpd/Manifest	2015-01-31 17:58:13.139209535 -0800
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX openntpd-20080406-dns-timeout.patch 1225 SHA256 c7f7b28db8028bd892a31958849e61227f342f9f16efa0a51e6cb9f91b307d0e SHA512 9e7a86029185ea427b4952352ccac2a2508432b047346fe6d7823f254f9f2b59f2b3e752a0bf2e0a673daf6e0506657acf3973c67588e77fc0ed76798093fd5f WHIRLPOOL 2e5c95378b0e70723413c3d6f99e66448b1a009efa18130e4905c6733de0f9c0348899003b1af5663894e10659ef5f2ff96fe5340ee913b0c7d0c588b5f6ff94
 AUX openntpd-20080406-pidfile.patch 3500 SHA256 6580ab9290ea19ec17f67b1b59a3790546b58a5c06ed82e660e79e393681ba89 SHA512 9647e53c17330a255ace93e1cc40547de57d6f7337d2cbc0bfb58d4a77f5ad79423421e1c6280db1c31fcafcd77903a8fa60d30d883ee0be671bebce10e557a0 WHIRLPOOL ac289e1a3f6ce41cf4721aa834bd88d993ff144d8b630c55f39e7b96f74de38a0ff609c30baab9e4f5f595cd8ccf7939fb4070432e8f8acca5827a04546e2797
 AUX openntpd-20080406-signal.patch 1587 SHA256 06febce7828dcd351c62544685ff084157716f3ce8c8858cde87a987ed4685b5 SHA512 09cc248490ef88ca0f911d799fd513d3ce577a58a2ccbd82a561580bb79e7b9cba6a62220c8ae5bf20f1ac91fe833e4f383dac73e3bd7593ef9ebfa49287f565 WHIRLPOOL 389c86b7b6338c270f93b4c93969030790b2594d09db911311dfab667d598a35ed1dcdfb8325a44f1e5a8091e85565b4ba8a16b4f3e505adc449ceff20dc7666
@@ -13,20 +10,11 @@
 AUX openntpd.init.d-20080406-r6 417 SHA256 fca7183a7676f0f471878925c8fbec20b7a0bff01551c0ad2b34d4d8a826c876 SHA512 e5ea7b26871e92a04713c93b0d60d435839f9321aeea7105330b9d9d4259d98581d6da6224274fae89cf7107329a28a9348c8c40a9372c5fc7bc7f5d47801a3b WHIRLPOOL 72626acd887bb997dae48fb717a94f046e2a3f4b01bad72cffc8da03bf388528149f37c6672362ed0661c9582851ebd77124749dcc9238bb013d6f2ccc2bf78f
 AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601fffb788840aaf9f9abb6f2b0d17016 SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e WHIRLPOOL 5f33f400d045352f5e7f5fad718920d71c6f70526988ef87e02cf73ee98c4fb70afd928a770657b1f8d41aff46664a43dc21f3fd7bbcc6c6b95f4ad1788a52cf
 DIST openntpd-5.7p2.tar.gz 408421 SHA256 1640ad4a6e6475f6065d5f999b17b5dc6ab40dc17309b782b9ae390fe54bd6a5 SHA512 f320c6262eccf428428e7a3578cb0e6cf6305c93faa0dd98e5fb9d55474accd5c5e73d636b8c1339a34c2f46071fb6fc31e6fc296453eaa1501b0e2c01cf6e13 WHIRLPOOL f544e920892e4b44864febbb790affa496aca1c998257b298072903722c41cce47fd9c8a2a0707b14b24d02779d5296fb1326e0ea7fb341fc2c1d7394a463a53
+DIST openntpd-5.7p3.tar.gz 409734 SHA256 4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a SHA512 289cdc60413f35a91468f914b44a97d782d700dac150fe2570f31b8eccb4e7060764b5867bd188df3b0fe7598f57685078571685f14e0cc3353ca108bb7d640f WHIRLPOOL 0d4ba1e5de33c6396534bad262d945aa767a97df2c4018a78d354ac8270ec76a53626182a5b4a0433a0eab10d41a66fcec8782ffc031e8dfc11abdc4e79821f3
 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-4.0_pre20080406.ebuild 3242 SHA256 c63281f7874ed6cfd767d5bf8f2feacd63f0d2e6e501dd7f8af4b63f91ee78d3 SHA512 04c3843c4cbaf27dd12e5880d6a1a6921db7f2481575f6d5f3fe6e821cc151d568dacd64adb0d239e38c2a7217e28a91f690d88a4d6be26970952dcb424f3464 WHIRLPOOL c0f7447735b237d5777aad88858f738f0395154ebcd3a10a679f8e6280e48ae14b986765071db124b130df735049ec70d61710c766dde05bd4019f7b7532b870
 EBUILD openntpd-5.7_p2.ebuild 2987 SHA256 57a10dde48b7f2992fca5690ba39fe0b518353924a877e73f3d4f133caf37071 SHA512 9139976066d70e2a66a8bf26d07a516fcc16263f741eec27ee7fe390c2f2980153962875b529b85be873dfbb2fe6b81f2909be5d77496de00041f57aff137e42 WHIRLPOOL 435ff52ae51df95850f69f90af8c10af6e3244fecf9645e12c13de226d7eade04c7aafb4f021749e6ad7cd8e4651b7eeba2d85224920071005008acd5c1326d2
+EBUILD openntpd-5.7_p3.ebuild 3229 SHA256 0a610c58679c84c31f4484d78875548401613b5a9d6b38d623096ccea1a276d2 SHA512 79a2f688d66af824c686311e57abed8344334799b682bd4cfa6079db72c1b66b0112df0dc1f3c7fdbe4643200cb1ee6092405a081d84d5c91ca3c9cfea3e7c07 WHIRLPOOL 86d8f7311ae66c0d764076791d926e3f1abee4b6121e8e0644e3164c95c818d1c2bf1a51625a1a1b609bd0f7d8bd75c95bc8a02e4ae2a435de817c2b3c77d779
 MISC ChangeLog 18811 SHA256 9282061221e0b9a2d0beee610072981cb1f1236ec4e70d510f9c050783cce847 SHA512 1ad640f5d8312c35354cd6469aef99b3087e4a6f50cc79e57e062791c8a834772b5e1be338a61e390397a3ada15e23c288b818010e782a03f1345ee6ee2bedde WHIRLPOOL b8e85ffec94c1b25b22a560020d9cf1cdeb708a2994b32e41aa487e3078fe12b8b18723af92ddd3a215eeb647cf1b3efb7c51e1ebc98620dfb63204b695b327e
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUxD7UAAoJEOeBhlrCAAWGO1gIAK7Oxsn/RkzCIV5/J7F3EKSW
-eeNbdwPxEAZrQw0Pxkp8a4G6PhDCgUuJtdPe96x3p9JK5SA8iMNI5soU5EkxOg4D
-9nTDkORbIKzK6LXrkpiJ727BBccyEjO4AtTcZPPalH/UayPw5raI4cwzrzVKfFIs
-lt2AD+/D1W3V5HndWKnwu/av4sREZ+D/Y7w0H/3ScDaFkDiWq1JBpnRAtGiTFcp6
-ZuwwCvHJaiBBjBVKd/Vf2Oso46TQFt+gLbKyhw7fCV2eZDFxNsYBgq/0mf9XvyW8
-xYdSJpb662q0T88GCEpvFWlEk8Vh6vr6CcgY7cEnPztnGVtLZDaqX5yZZbIi8os=
-=Rap9
------END PGP SIGNATURE-----
Common subdirectories: openntpd-orig/files and openntpd/files
diff -Nu openntpd-orig/openntpd-5.7_p3.ebuild openntpd/openntpd-5.7_p3.ebuild
--- openntpd-orig/openntpd-5.7_p3.ebuild	1969-12-31 16:00:00.000000000 -0800
+++ openntpd/openntpd-5.7_p3.ebuild	2015-01-31 17:57:56.602816159 -0800
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils systemd user
+
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+
+MY_P="${P/_p/p}"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+CDEPEND="!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+"
+
+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 flipping 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() {
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' ntpctl.8 ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' ntpd.h || die
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' ntpd.h || die
+	# fix default config to use gentoo pool
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+}
+
+src_configure() {
+	econf --with-privsep-user=ntp --with-privsep-path="${NTP_HOME}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/var
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
+
+pkg_config() {
+	einfo "Setting up chroot for ntp in ${NTP_HOME}"
+	# remove localtime file from previous installations
+	rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
+	mkdir -p "${EROOT%/}${NTP_HOME}"/etc
+	if ! ln "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime ; then
+		cp "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime || die
+		einfo "We could not create a hardlink from /etc/localtime to ${NTP_HOME}/etc/localtime,"
+		einfo "so please run 'emerge --config =${CATEGORY}/${PF}' whenever you change"
+		einfo "your timezone."
+	fi
+	chown -R root:root "${EROOT%/}${NTP_HOME}" || die
+}
+
+pkg_postinst() {
+	pkg_config
+
+	[[ -f ${EROOT}var/log/ntpd.log ]] && \
+		ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog."
+
+	if [[ -f ${EROOT}var/lib/ntpd.drift ]] ; then
+		einfo "Moving ntpd.drift file to new location."
+		mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift"
+	fi
+}
+
+pkg_postrm() {
+	# remove localtime file from previous installations
+	rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
+}