3 files changed, 0 insertions, 139 deletions
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 978070087327..fd848b42e86b 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,2 +1 @@
-DIST openntpd-5.7p4.tar.gz 427900 SHA256 a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 SHA512 2a185139c915482086069fa19dd3070884a415137d1688059559d2da892928afbbe2fa0a8ade70d474809710265dcc05906abaf261892d7894e70272e2e516ef WHIRLPOOL 9464941e0f055ecd1db19a03bb5264a1dce02c6c7c2be078d1e3a19b5bd0a3c4e19ee6768617c90ebed01dea32f3a63751f9ef0436f56e22b7e6bd673a065546
 DIST openntpd-6.0p1.tar.gz 432696 SHA256 b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d WHIRLPOOL 75b82a07920eb7c3825a37725a81615871b728e9543ec43cb20c9e61a64f523293aa7e1fbbb92ebb8d6417d13f377213ffbcba1c77c7b3c68b64e26e30222a0b
diff --git a/net-misc/openntpd/files/openntpd-5.7_p4-nolibtls.patch b/net-misc/openntpd/files/openntpd-5.7_p4-nolibtls.patch
deleted file mode 100644
index 85a7c72949f2..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p4-nolibtls.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -u -r openntpd-5.7p4-orig/src/config.c openntpd-5.7p4/src/config.c
---- openntpd-5.7p4-orig/src/config.c	2015-03-24 18:18:56.000000000 -0700
-+++ openntpd-5.7p4/src/config.c	2015-05-25 16:48:59.000000000 -0700
-@@ -218,6 +218,9 @@
- 		fatal("new_constraint calloc");
- 	p->id = ++constraint_maxid;
- 
-+#ifndef HAVE_LIBTLS
-+	fatal("constraint configured without libtls support");
-+#endif
- 	return (p);
- }
- 
-diff -u -r openntpd-5.7p4-orig/src/ntp.c openntpd-5.7p4/src/ntp.c
---- openntpd-5.7p4-orig/src/ntp.c	2015-03-11 19:15:36.000000000 -0700
-+++ openntpd-5.7p4/src/ntp.c	2015-05-25 16:48:59.000000000 -0700
-@@ -110,12 +110,14 @@
- 		return (pid);
- 	}
- 
-+#ifdef HAVE_LIBTLS
- 	tls_init();
- 
- 	/* Verification will be turned off if CA is not found */
- 	if ((conf->ca = tls_load_file(CONSTRAINT_CA,
- 	    &conf->ca_len, NULL)) == NULL)
- 		log_warnx("constraint certificate verification turned off");
-+#endif
- 
- 	/* in this case the parent didn't init logging and didn't daemonize */
- 	if (nconf->settime && !nconf->debug) {
-diff -u -r openntpd-5.7p4-orig/src/ntpd.conf.5 openntpd-5.7p4/src/ntpd.conf.5
---- openntpd-5.7p4-orig/src/ntpd.conf.5	2015-03-24 18:18:56.000000000 -0700
-+++ openntpd-5.7p4/src/ntpd.conf.5	2015-05-25 16:48:59.000000000 -0700
-@@ -192,8 +192,11 @@
- .Sq Man-In-The-Middle
- attacks.
- Received NTP packets with time information falling outside of a range
--near the constraint will be discarded and such NTP servers
--will be marked as invalid.
-+near the constraint will be discarded and such NTP servers will be marked as
-+invalid. Contraints are only available if
-+.Xr ntpd 8
-+has been compiled with libtls support. Configuring a constraint without libtls
-+support will result in a fatal error.
- .Bl -tag -width Ds
- .It Ic constraint from Ar url
- Specify the URL, IP address or the hostname of an HTTPS server to
-Only in openntpd-5.7p4/src: ntpd.conf.5.orig
diff --git a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
deleted file mode 100644
index 16284e30762d..000000000000
--- a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_p/p}"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-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"
-
-DEPEND="!<=net-misc/ntp-4.2.0-r2
-	!net-misc/ntp[-openntpd]"
-RDEPEND="${DEPEND}
-	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() {
-	# add fail constraints when no libtls patch (accepted upstream)
-	epatch "${FILESDIR}/${P}-nolibtls.patch"
-	# fix /run path
-	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
-	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
-	# fix ntpd.drift path
-	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
-	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/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
-}
-
-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_postinst() {
-	# Clean up chroot localtime copy from older versions
-	if [ -d "${EROOT%/}${NTP_HOME}"/etc ] ; then
-		if [ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ] ; then
-			rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
-		fi
-
-		rmdir "${EROOT%/}${NTP_HOME}"/etc ||
-			ewarn "Unable to remove legacy ${EROOT%/}${NTP_HOME}/etc directory"
-	fi
-
-	# Fix permissions on home directory
-	chown root:root "${EROOT%/}${NTP_HOME}" || die
-
-	[[ -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
-}