[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2015-10-25  1:07 Mike Frysinger
  0 siblings, 0 replies; 12+ messages in thread
From: Mike Frysinger @ 2015-10-25  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ce8b45e26a3e4cea48f6e7ff7faa2125ba32a96c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 01:06:40 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 01:07:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8b45e2

net-misc/ntp: fix ntpd test link errors

 net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch | 21 +++++++++++++++++++++
 net-misc/ntp/ntp-4.2.8_p4.ebuild                   |  1 +
 2 files changed, 22 insertions(+)

diff --git a/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch
new file mode 100644
index 0000000..403b2d5
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch
@@ -0,0 +1,21 @@
+http://bugs.ntp.org/show_bug.cgi?id=2951
+
+--- a/tests/ntpd/Makefile.in
++++ b/tests/ntpd/Makefile.in
+@@ -205,7 +205,7 @@ test_ntp_scanner_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	-o $@
+ am_test_ntp_signd_OBJECTS = t-ntp_signd.$(OBJEXT) \
+ 	run-t-ntp_signd.$(OBJEXT) test-libntp.$(OBJEXT) \
+-	ntp_signd.$(OBJEXT) $(am__objects_1)
++	$(am__objects_1)
+ test_ntp_signd_OBJECTS = $(am_test_ntp_signd_OBJECTS)
+ test_ntp_signd_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+ 	$(top_builddir)/ntpd/ntp_config.o \
+@@ -871,7 +871,6 @@ test_ntp_signd_SOURCES = \
+ 	t-ntp_signd.c				\
+ 	run-t-ntp_signd.c			\
+ 	$(srcdir)/../libntp/test-libntp.c	\
+-	$(srcdir)/../../ntpd/ntp_signd.c	\
+ 	$(NULL)
+ 
+ 

diff --git a/net-misc/ntp/ntp-4.2.8_p4.ebuild b/net-misc/ntp/ntp-4.2.8_p4.ebuild
index ae4fc76..4bfcda0 100644
--- a/net-misc/ntp/ntp-4.2.8_p4.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p4.ebuild
@@ -42,6 +42,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
 	epatch "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	epatch "${FILESDIR}"/${PN}-4.2.8-ntpd-test-signd.patch
 	append-cppflags -D_GNU_SOURCE #264109
 	# Make sure every build uses the same install layout. #539092
 	find sntp/loc/ -type f '!' -name legacy -delete || die


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2016-01-13 10:28 Lars Wendler
  0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2016-01-13 10:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1e5928de346454e2feb26cceb593a0448969e77b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 10:19:30 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 10:19:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5928de

net-misc/ntp: Removed old.

Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/ntp/Manifest                              |   6 -
 net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch     |  33 -----
 net-misc/ntp/files/ntp-4.2.4_p7-nano.patch         |  20 ---
 .../files/ntp-4.2.8-ntp-keygen-no-openssl.patch    | 164 ---------------------
 net-misc/ntp/files/ntpd.rc                         |  36 -----
 net-misc/ntp/files/ntpd.service-r1                 |  10 --
 net-misc/ntp/files/ntpdate.service                 |  13 --
 net-misc/ntp/files/sntp.service-r1                 |  13 --
 net-misc/ntp/ntp-4.2.6_p5-r10.ebuild               | 136 -----------------
 net-misc/ntp/ntp-4.2.6_p5-r11.ebuild               | 136 -----------------
 net-misc/ntp/ntp-4.2.8-r1.ebuild                   | 129 ----------------
 net-misc/ntp/ntp-4.2.8-r2.ebuild                   | 140 ------------------
 net-misc/ntp/ntp-4.2.8-r3.ebuild                   | 136 -----------------
 net-misc/ntp/ntp-4.2.8_p2.ebuild                   | 128 ----------------
 net-misc/ntp/ntp-4.2.8_p4.ebuild                   | 130 ----------------
 15 files changed, 1230 deletions(-)

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 5eb4405..1ee0b85 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,9 +1,3 @@
-DIST ntp-4.2.6p5-manpages.tar.bz2 47874 SHA256 f49203cba2301ce27a53113a6e22d844b258114604f2c9ee1371833babc70f9c SHA512 57d4b8fc4482a41c6595418ebff1a861d4bd7ee175b13cf5580a5915749a096b3a906ca8ddf9fc9c57ead783df22b7b9326b51bbab9cd8340576413bee3e7f84 WHIRLPOOL 83c2d95fe953ab2cd7729bc03d89e44a2de85cb68b4ec72c123a034846866aebf7b83eeb4e45add6aa1443f2de83bfbb1ecdbb437534d827d1e1a4a08f91cfd4
-DIST ntp-4.2.6p5.tar.gz 4202539 SHA256 d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c SHA512 8d76fc7e92b2ea6dd5031e6030a7aba4ff6fb3e19d3bc0153852509861be5d0960e70604814163caedb81f8315a451d78371f99634a50b55cfe1cbd2c69e3046 WHIRLPOOL 9943706ad02e377cb38d65caed6f675d37db7aa53dd86319b17405791494bf11244ac933867516cca9438947202b595b6606088a8aaa436655f9eeb8d078b77e
-DIST ntp-4.2.8-manpages.tar.bz2 46542 SHA256 9c68840456c7002796baea70231e6cf7f6bc06583bbab370a09f837a66f2c409 SHA512 a87db65da978fcaf123763a6de59a399a3c799d59374acd1c397d7a7816e6ee2ff6091f24ff41223cf719effd2e595dfa7699006a724d2908d380c6098603d28 WHIRLPOOL cb0e53cc0132573d6b2910301c1d7743874598b1487968ec9e49f467a8aa62340609379c8cffb42da2694703955581629aa78897a9319f71b3589600e882b9b0
-DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee SHA512 d69ed02e57c66d5c57616bb5e4be0d58e7410dd27ea96acaed6e8b63726a37cd22ae73e8bdff089abbe8e19bcd8bee05733ab362249018fc495fcedc71aa3a44 WHIRLPOOL 4bfe1222c250425e3fc229649d1d4ae11fa6a32eb03f9d15b95575ee31171761321730c83d6e283551fc89647370a86791ec1c262c49826b31106d4317fb64e1
-DIST ntp-4.2.8p2-manpages.tar.bz2 46421 SHA256 c22f74e0361e5eb921e495ff0f1b8987c26d90db72393dfb307f68498d6501e8 SHA512 8b211e891e96006ba4fa054fe5f111ae5b52cc4b990d4bbe691fd0724f6373ec54428fc39ea0cffc8fe66f757d6f99355ac69f3dc76ad43f8f95c145f3adee9c WHIRLPOOL f1b85c4e39934d308dbaaca1b22779e33c18489abfd9e17ad26368462032445d164a2dbb96fa9865128bc138ce8f8f8790d9eeffc0c37339ed5eafa0ee687a72
-DIST ntp-4.2.8p2.tar.gz 6820869 SHA256 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 SHA512 7b39e4d8a362afd37dc57a742841fadcd4634bb1d21d59d72d484b759a867d82b90d8c77e6e104c73ec8690489b80b0f9e2e86e4dfcfa34a49621cee3dee16d0 WHIRLPOOL 70d63c895a62bcd790760e6205d6b666ab47dfc9fc8737f10d1cd7d4a2c3cafb4efe6b8141570921c5024e71b00ebca73574562694678f448ee7680a982a0084
 DIST ntp-4.2.8p3-manpages.tar.bz2 46419 SHA256 83f9641e52fd79ac8bd76f7d62214591389f97fed5200e8b5d85aa31070f9112 SHA512 1d15c63f5c88e0b45f5de3a35042fde9a3a01413ab460f553124ad996832b46c72212070ccbefc0e70aef8ffe4c634b7424e06ac31f62cd921a3df13b3746d6b WHIRLPOOL 92aa9cebe97454e1d7d1533546bee131795ab6f28538b0326423afbca10b83fadc8693c8148de08d7d7bed0773d462d204632ba38e16a4c442b1bae10094a501
 DIST ntp-4.2.8p3.tar.gz 7099575 SHA256 818ca4f2ed6ca845b1c5ec43f5e6ad905eaa0fc0aab2d509ed6b962a37fbf38f SHA512 5a628f72e900ac8c8a4754bc9620e6511f68035b3a1e1108d619b1beab307d3f6c9f5dad4f3ca3f4e252d0e7e3bf48900044df2934aa87df1f699316db5e9598 WHIRLPOOL 4d66c9403b0bf8b4a9b297bd13974f88bcdc3f524bede0e633f7ee17b688bdd60dcc4e8a23fa7a4efd82540fab515df0b40c140edbefd1bb51352edd06b08d2d
 DIST ntp-4.2.8p4-manpages.tar.bz2 24655 SHA256 fe368d6c30c8c9c3f6e7959b00fc82695e122b29d597090f3725a9a00de92da6 SHA512 80a56b5b736810e4c04e128ce5565fc3834dc0b899b2fdd4173c8dd7f53d353209b648186d0183b9aecd9debec60f2d0b179d229032971876269810bd72096a7 WHIRLPOOL b97331e8e565377bac8fe6cc53cbab0e20a36357f3c142d68505b31104187b117e823ddabbe767e841efbd28b8c0476c460e00cd777619e8f190c7fa2aac0e9e

diff --git a/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch b/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch
deleted file mode 100644
index 40625fa..0000000
--- a/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://support.ntp.org/bugs/show_bug.cgi?id=769
-http://bugs.gentoo.org/254030
-
---- ntp/util/tickadj.c
-+++ ntp/util/tickadj.c
-@@ -21,7 +21,8 @@
- # include <unistd.h>
- #endif /* HAVE_UNISTD_H */
- 
--#ifdef HAVE___ADJTIMEX		/* Linux */
-+/* proper handling here has been moved to upstream ntp bugzilla */
-+#ifdef linux
- 
- #include <sys/timex.h>
- struct timex txc;
-@@ -91,7 +92,7 @@
- 	}
- 
- 	if (!errflg) {
--		if (__adjtimex(&txc) < 0)
-+		if (adjtimex(&txc) < 0)
- 			perror("adjtimex");
- 		else if (!quiet)
- 			printf("tick     = %ld\ntick_adj = %d\n",
-@@ -146,7 +147,7 @@
- #endif
- 	}
-     
--	if (__adjtimex(&txc) < 0)
-+	if (adjtimex(&txc) < 0)
- 	{
- 		perror("adjtimex");
- 	}

diff --git a/net-misc/ntp/files/ntp-4.2.4_p7-nano.patch b/net-misc/ntp/files/ntp-4.2.4_p7-nano.patch
deleted file mode 100644
index b31ea0a..0000000
--- a/net-misc/ntp/files/ntp-4.2.4_p7-nano.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/270483
-
-ripped from fedora
-
---- ntp-4.2.4p7/include/ntp_syscall.h
-+++ ntp-4.2.4p7/include/ntp_syscall.h
-@@ -14,5 +14,13 @@
- # include <sys/timex.h>
- #endif
- 
-+#if defined(ADJ_NANO) && !defined(MOD_NANO)
-+#define MOD_NANO ADJ_NANO
-+#endif
-+
-+#if defined(ADJ_TAI) && !defined(MOD_TAI)
-+#define MOD_TAI ADJ_TAI
-+#endif
-+
- #ifndef NTP_SYSCALLS_LIBC
- #ifdef NTP_SYSCALLS_STD

diff --git a/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch b/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch
deleted file mode 100644
index bfed86c..0000000
--- a/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-Fix ntp-keygen build without OpenSSL
-
-Upstream commit:
-http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg
-Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=533238
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-Index: ntp-4.2.8/Makefile.am
-===================================================================
---- ntp-4.2.8.orig/Makefile.am
-+++ ntp-4.2.8/Makefile.am
-@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib
- 
- NULL =
- 
-+# moved sntp first to get libtool and libevent built.
-+
- SUBDIRS =		\
-+	sntp		\
- 	scripts		\
- 	include		\
- 	libntp		\
-@@ -17,7 +20,6 @@ SUBDIRS =		\
- 	clockstuff	\
- 	kernel		\
- 	util		\
--	sntp		\
- 	tests		\
- 	$(NULL)
- 
-@@ -64,7 +66,6 @@ BUILT_SOURCES =				\
- 	.gcc-warning			\
- 	libtool				\
- 	html/.datecheck			\
--	sntp/built-sources-only		\
- 	$(srcdir)/COPYRIGHT		\
- 	$(srcdir)/.checkChangeLog	\
- 	$(NULL)
-Index: ntp-4.2.8/configure.ac
-===================================================================
---- ntp-4.2.8.orig/configure.ac
-+++ ntp-4.2.8/configure.ac
-@@ -102,7 +102,7 @@ esac
- enable_nls=no
- LIBOPTS_CHECK_NOBUILD([sntp/libopts])
- 
--NTP_ENABLE_LOCAL_LIBEVENT
-+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent])
- 
- NTP_LIBNTP
- 
-@@ -771,6 +771,10 @@ esac
- 
- #### 
- 
-+AC_CHECK_FUNCS([arc4random_buf])
-+
-+#### 
-+
- saved_LIBS="$LIBS"
- LIBS="$LIBS $LDADD_LIBNTP"
- AC_CHECK_FUNCS([daemon])
-Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c
-===================================================================
---- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c
-+++ ntp-4.2.8/libntp/ntp_crypto_rnd.c
-@@ -24,6 +24,21 @@
- int crypto_rand_init = 0;
- #endif
- 
-+#ifndef HAVE_ARC4RANDOM_BUF
-+static void
-+arc4random_buf(void *buf, size_t nbytes);
-+
-+void
-+evutil_secure_rng_get_bytes(void *buf, size_t nbytes);
-+
-+static void
-+arc4random_buf(void *buf, size_t nbytes)
-+{
-+	evutil_secure_rng_get_bytes(buf, nbytes);
-+	return;
-+}
-+#endif
-+
- /*
-  * As of late 2014, here's how we plan to provide cryptographic-quality
-  * random numbers:
-Index: ntp-4.2.8/sntp/configure.ac
-===================================================================
---- ntp-4.2.8.orig/sntp/configure.ac
-+++ ntp-4.2.8/sntp/configure.ac
-@@ -97,11 +97,14 @@ esac
- enable_nls=no
- LIBOPTS_CHECK
- 
--AM_COND_IF(
--    [BUILD_SNTP],
--    [NTP_LIBEVENT_CHECK],
--    [NTP_LIBEVENT_CHECK_NOBUILD]
--)
-+# From when we only used libevent for sntp:
-+#AM_COND_IF(
-+#    [BUILD_SNTP],
-+#    [NTP_LIBEVENT_CHECK],
-+#    [NTP_LIBEVENT_CHECK_NOBUILD]
-+#)
-+
-+NTP_LIBEVENT_CHECK([2])
- 
- # Checks for libraries.
- 
-Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4
-===================================================================
---- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4
-+++ ntp-4.2.8/sntp/m4/ntp_libevent.m4
-@@ -1,4 +1,25 @@
--dnl NTP_ENABLE_LOCAL_LIBEVENT				     -*- Autoconf -*-
-+# SYNOPSIS						-*- Autoconf -*-
-+#
-+#  NTP_ENABLE_LOCAL_LIBEVENT
-+#  NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
-+#  NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
-+#
-+# DESCRIPTION
-+#
-+# AUTHOR
-+#
-+#  Harlan Stenn
-+#
-+# LICENSE
-+#
-+#  This file is Copyright (c) 2014 Network Time Foundation
-+# 
-+#  Copying and distribution of this file, with or without modification, are
-+#  permitted in any medium without royalty provided the copyright notice,
-+#  author attribution and this notice are preserved.  This file is offered
-+#  as-is, without any warranty.
-+
-+dnl NTP_ENABLE_LOCAL_LIBEVENT
- dnl
- dnl Provide only the --enable-local-libevent command-line option.
- dnl
-@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar
- dnl but DO NOT invoke DIR/configure if we are going to use our bundled
- dnl version.  This may be the case for nested packages.
- dnl
--dnl provide --enable-local-libevent .
-+dnl provides --enable-local-libevent .
- dnl
- dnl Examples:
- dnl
-Index: ntp-4.2.8/util/Makefile.am
-===================================================================
---- ntp-4.2.8.orig/util/Makefile.am
-+++ ntp-4.2.8/util/Makefile.am
-@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP)
- LDADD=		../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
- tg2_LDADD=	../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
- ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
-+ntp_keygen_LDADD += $(LDADD_LIBEVENT)
- ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM)
- ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
- 

diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc
deleted file mode 100644
index b1f5de6..0000000
--- a/net-misc/ntp/files/ntpd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	use net dns logger
-	after ntp-client
-}
-
-checkconfig() {
-	if [ ! -f /etc/ntp.conf ] ; then
-		eerror "Please create /etc/ntp.conf"
-		eerror "Sample conf: /usr/share/ntp/ntp.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting ntpd"
-	start-stop-daemon --start --exec /usr/sbin/ntpd \
-	    --pidfile /var/run/ntpd.pid \
-	    -- -p /var/run/ntpd.pid ${NTPD_OPTS}
-	eend $? "Failed to start ntpd"
-}
-
-stop() {
-	ebegin "Stopping ntpd"
-	start-stop-daemon --stop \
-		--pidfile /var/run/ntpd.pid \
-		--exec /usr/sbin/ntpd
-	eend $? "Failed to stop ntpd"
-}

diff --git a/net-misc/ntp/files/ntpd.service-r1 b/net-misc/ntp/files/ntpd.service-r1
deleted file mode 100644
index 0b61090..0000000
--- a/net-misc/ntp/files/ntpd.service-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=ntpdate.service sntp.service
-
-[Service]
-ExecStart=/usr/sbin/ntpd -g -n
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/ntp/files/ntpdate.service b/net-misc/ntp/files/ntpdate.service
deleted file mode 100644
index a6c75c9..0000000
--- a/net-misc/ntp/files/ntpdate.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Set time via NTP using ntpdate
-After=network-online.target nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ntpdate -b -u $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/ntp/files/sntp.service-r1 b/net-misc/ntp/files/sntp.service-r1
deleted file mode 100644
index 2686951..0000000
--- a/net-misc/ntp/files/sntp.service-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Set time via SNTP
-After=network.target NetworkManager-wait-online.service nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sntp -s $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild
deleted file mode 100644
index 3aac893..0000000
--- a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-	dohtml -r html/*
-
-	insinto /usr/share/ntp
-	doins "${FILESDIR}"/ntp.conf
-	cp -r scripts/* "${ED}"/usr/share/ntp/ || die
-	use prefix || fperms -R go-w /usr/share/ntp
-	find "${ED}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -o \
-		-name support \
-		')' \
-		-exec rm -r {} \;
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	newinitd "${FILESDIR}"/ntpd.rc ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r1 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_dounit "${FILESDIR}"/ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r1 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/"
-	ewarn "Review /etc/ntp.conf to setup server info."
-	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
-	echo
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		echo
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild
deleted file mode 100644
index ac0362b..0000000
--- a/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-	dohtml -r html/*
-
-	insinto /usr/share/ntp
-	doins "${FILESDIR}"/ntp.conf
-	cp -r scripts/* "${ED}"/usr/share/ntp/ || die
-	use prefix || fperms -R go-w /usr/share/ntp
-	find "${ED}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -o \
-		-name support \
-		')' \
-		-exec rm -r {} \;
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	newinitd "${FILESDIR}"/ntpd.rc ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/"
-	ewarn "Review /etc/ntp.conf to setup server info."
-	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
-	echo
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		echo
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.8-r1.ebuild b/net-misc/ntp/ntp-4.2.8-r1.ebuild
deleted file mode 100644
index d437ee5..0000000
--- a/net-misc/ntp/ntp-4.2.8-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-CDEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	>=dev-libs/libevent-2.0.9
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238
-	append-cppflags -D_GNU_SOURCE #264109
-	eautoreconf
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		--with-yielding-select \
-		--disable-local-libevent \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-	dohtml -r html/*
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	ewarn "Review /etc/ntp.conf to setup server info."
-	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
-	echo
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		echo
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.8-r2.ebuild b/net-misc/ntp/ntp-4.2.8-r2.ebuild
deleted file mode 100644
index 6f17855..0000000
--- a/net-misc/ntp/ntp-4.2.8-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	>=dev-libs/libevent-2.0.9[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-	eautoreconf
-
-	# The autoreconf call above recursively ran in all subdirs, and then
-	# ran in the top level.  But the libtool call there updated files in
-	# the subdir which broke timestamps causing autotools to re-run.  #538270
-	find -type f -exec touch -r . {} +
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		--with-yielding-select \
-		--disable-local-libevent \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto) \
-		$(use_enable threads thread-support)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	ewarn "Review /etc/ntp.conf to setup server info."
-	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
-	echo
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		echo
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.8-r3.ebuild b/net-misc/ntp/ntp-4.2.8-r3.ebuild
deleted file mode 100644
index 247172b..0000000
--- a/net-misc/ntp/ntp-4.2.8-r3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1 )
-	>=dev-libs/libevent-2.0.9[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-	eautoreconf
-
-	# The autoreconf call above recursively ran in all subdirs, and then
-	# ran in the top level.  But the libtool call there updated files in
-	# the subdir which broke timestamps causing autotools to re-run.  #538270
-	find -type f -exec touch -r . {} +
-
-	# We want to force a rebuild of this source file though as the shipped one
-	# is broken.  #545546
-	rm libparse/info_trimble.c || die
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		--with-yielding-select \
-		--disable-local-libevent \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with readline lineeditlibs readline) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto) \
-		$(use_enable threads thread-support)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.8_p2.ebuild b/net-misc/ntp/ntp-4.2.8_p2.ebuild
deleted file mode 100644
index a9b6a9f..0000000
--- a/net-misc/ntp/ntp-4.2.8_p2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1 )
-	>=dev-libs/libevent-2.0.9[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		--with-yielding-select \
-		--disable-local-libevent \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-memlock=256 \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with readline lineeditlibs readline) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto) \
-		$(use_enable threads thread-support)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.8_p4.ebuild b/net-misc/ntp/ntp-4.2.8_p4.ebuild
deleted file mode 100644
index 4bfcda0..0000000
--- a/net-misc/ntp/ntp-4.2.8_p4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-manpages.tar.bz2"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl:0= )
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	epatch "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	epatch "${FILESDIR}"/${PN}-4.2.8-ntpd-test-signd.patch
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		--with-yielding-select \
-		--disable-local-libevent \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-memlock=256 \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with readline lineeditlibs readline) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto) \
-		$(use_enable threads thread-support)
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2018-12-08  1:49 Patrick McLean
  0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2018-12-08  1:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a5d46eb9f6f5d33ab892827f4321626574629528
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Sat Dec  8 01:49:25 2018 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 01:49:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d46eb9

net-misc/ntp: add patch to 4.2.8_p12 for libressl-2.8 compat

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 ++++++++++++++++
 net-misc/ntp/ntp-4.2.8_p12.ebuild                   |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
new file mode 100644
index 00000000000..7ec2ee678b0
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
@@ -0,0 +1,16 @@
+--- ntp-4.2.8p12.orig/include/libssl_compat.h	2018-12-08 01:14:58.434733497 +0000
++++ ntp-4.2.8p12/include/libssl_compat.h	2018-12-08 01:42:04.479474757 +0000
+@@ -107,10 +107,13 @@
+ 
+ #define OpenSSL_version_num	SSLeay
+ #define OpenSSL_version		SSLeay_version
++
++# if LIBRESSL_VERSION_NUMBER < 0x20800000L
+ #define X509_get0_notBefore	X509_get_notBefore
+ #define X509_getm_notBefore	X509_get_notBefore
+ #define X509_get0_notAfter	X509_get_notAfter
+ #define X509_getm_notAfter	X509_get_notAfter
++#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */
+ 
+ /* ----------------------------------------------------------------- */
+ #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */

diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
index 179de05fc60..39fa971f10b 100644
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
 	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2020-03-05 18:51 Lars Wendler
  0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2020-03-05 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     37dea0c5a7c3b80ed51400bd89b44268c959bbe2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 18:50:28 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 18:51:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dea0c5

net-misc/ntp: Revbump to fix ntpd startup with USE="caps"

Closes: https://bugs.gentoo.org/711530
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch     | 13 +++++++++++++
 .../{ntp-4.2.8_p14-r1.ebuild => ntp-4.2.8_p14-r2.ebuild}    |  1 +
 2 files changed, 14 insertions(+)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch
new file mode 100644
index 00000000000..183b6d8d475
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/711530
+
+--- ntp-4.2.8p14/ntpd/ntpd.c
++++ ntp-4.2.8p14/ntpd/ntpd.c
+@@ -1189,7 +1189,7 @@
+ 		 *  drop privileges in this case.
+ 		 */
+ 		cap_t caps;
+-		caps = cap_from_text("cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
++		caps = cap_from_text("cap_ipc_lock,cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
+ 		if ( ! caps) {
+ 			msyslog( LOG_ERR, "cap_from_text() failed: %m" );
+ 			exit(-1);

diff --git a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
similarity index 98%
rename from net-misc/ntp/ntp-4.2.8_p14-r1.ebuild
rename to net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
index a442cbc860d..61130e1b1da 100644
--- a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2020-05-02 18:59 Thomas Deutschmann
  0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2020-05-02 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     acf6a6498bfbb0294a07072c6acb8cfadcb56695
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May  2 18:59:34 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May  2 18:59:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf6a649

net-misc/ntp: fix building against GCC 10

Closes: https://bugs.gentoo.org/707688
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../ntp/files/ntp-4.2.8-gcc10-fno-common.patch     | 22 ++++++++++++++++++++++
 net-misc/ntp/ntp-4.2.8_p14-r2.ebuild               |  1 +
 2 files changed, 23 insertions(+)

diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
new file mode 100644
index 00000000000..d2ed719d8ff
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
@@ -0,0 +1,22 @@
+--- ntp-4.2.8p14/include/ntp_config.h.psl
++++ ntp-4.2.8p14/include/ntp_config.h
+@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag {
+  * Poll Skew List
+  */
+ 
+-psl_item psl[17-3+1];		/* values for polls 3-17 */
++extern psl_item psl[17-3+1];	/* values for polls 3-17 */
+ 				/* To simplify the runtime code we */
+ 				/* don't want to have to special-case */
+ 				/* dealing with a default */
+--- ntp-4.2.8p14/ntpd/ntp_config.c.psl
++++ ntp-4.2.8p14/ntpd/ntp_config.c
+@@ -202,6 +202,8 @@ int	cryptosw;		/* crypto command called
+ 
+ extern char *stats_drift_file;	/* name of the driftfile */
+ 
++psl_item psl[17-3+1];        /* values for polls 3-17 */
++
+ #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED
+ /*
+  * backwards compatibility flags

diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
index b2cbb8b926a..79a6d513fa4 100644
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+	"${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2020-06-23 16:16 Lars Wendler
  0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2020-06-23 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     fbdf99fc6dd829214056d1333d7ec34bf8da89e7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 16:16:22 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 16:16:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdf99fc

net-misc/ntp: Removed old

Bug: https://bugs.gentoo.org/717798
Package-Manager: Portage-2.3.102, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/ntp/Manifest                       |   2 -
 net-misc/ntp/files/ntp-4.2.8-gc-tests.patch |  41 --------
 net-misc/ntp/ntp-4.2.8_p13-r2.ebuild        | 144 ----------------------------
 net-misc/ntp/ntp-4.2.8_p13.ebuild           | 144 ----------------------------
 4 files changed, 331 deletions(-)

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 298239a1bec..745c406ddbe 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,5 +1,3 @@
-DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
-DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
 DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1
 DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028

diff --git a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch b/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
deleted file mode 100644
index 19f0c0f8bfe..00000000000
--- a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Avoid building problematic tests on platforms
-whose linker does not support --gc-sections.
-
-https://bugs.ntp.org/show_bug.cgi?id=3601
-https://bugs.gentoo.org/564018
-
---- a/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
-+++ b/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
-@@ -33,6 +33,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_restrict="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_restrict="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_restrict])
- AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes])
- 
-@@ -43,6 +47,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_scanner="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_scanner="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_scanner])
- AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes])
- 
-@@ -53,6 +61,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_signd="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_signd="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_signd])
- AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes])
- 

diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
deleted file mode 100644
index a50710aa1a3..00000000000
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs flag-o-matic systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-BDEPEND="virtual/pkgconfig
-	acct-group/ntp
-	acct-user/ntp"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/ntp
-	acct-user/ntp
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-	"${FILESDIR}"/${PN}-4.2.8-gc-tests.patch #564018
-)
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		if use caps ; then
-			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}

diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
deleted file mode 100644
index 6656edb7690..00000000000
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-)
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		if use caps ; then
-			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2020-07-27 19:02 Lars Wendler
  0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2020-07-27 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     2c65d47e903eb2c2b3792563530b12b2321bdc38
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 18:56:04 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 19:02:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c65d47e

net-misc/ntp: Security cleanup

Bug: https://bugs.gentoo.org/729458
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/ntp/Manifest                              |   2 -
 .../ntp/files/ntp-4.2.8-gcc10-fno-common.patch     |  22 ----
 net-misc/ntp/ntp-4.2.8_p14-r2.ebuild               | 145 ---------------------
 3 files changed, 169 deletions(-)

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 745c406ddbe..c61825354c7 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,4 +1,2 @@
-DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1
-DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794

diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
deleted file mode 100644
index d2ed719d8ff..00000000000
--- a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ntp-4.2.8p14/include/ntp_config.h.psl
-+++ ntp-4.2.8p14/include/ntp_config.h
-@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag {
-  * Poll Skew List
-  */
- 
--psl_item psl[17-3+1];		/* values for polls 3-17 */
-+extern psl_item psl[17-3+1];	/* values for polls 3-17 */
- 				/* To simplify the runtime code we */
- 				/* don't want to have to special-case */
- 				/* dealing with a default */
---- ntp-4.2.8p14/ntpd/ntp_config.c.psl
-+++ ntp-4.2.8p14/ntpd/ntp_config.c
-@@ -202,6 +202,8 @@ int	cryptosw;		/* crypto command called
- 
- extern char *stats_drift_file;	/* name of the driftfile */
- 
-+psl_item psl[17-3+1];        /* values for polls 3-17 */
-+
- #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED
- /*
-  * backwards compatibility flags

diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
deleted file mode 100644
index 2b72249e997..00000000000
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs flag-o-matic systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-BDEPEND="virtual/pkgconfig
-	acct-group/ntp
-	acct-user/ntp"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/ntp
-	acct-user/ntp
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
-	"${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch
-)
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		if use caps ; then
-			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2021-10-17  6:21 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-10-17  6:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7094bf58386e8970a0b96b92938f42e61c6bb656
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 06:21:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 06:21:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7094bf58

net-misc/ntp: fix build with glibc-2.34

Closes: https://bugs.gentoo.org/806358
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch | 28 +++++++++++++++++++++++
 net-misc/ntp/ntp-4.2.8_p15.ebuild                 |  1 +
 2 files changed, 29 insertions(+)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch b/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch
new file mode 100644
index 00000000000..a32f3adabd8
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/806358
+https://patchwork.openembedded.org/patch/180019/
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE	(64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
+--
+2.32.0
+

diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index 0809ce703a5..7e9d8bc04c2 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
 	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
+	"${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2022-06-03  5:32 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2022-06-03  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d8c9b791ed0c3c23ef26ded620334d55f2587758
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 05:15:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 05:29:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c9b791

net-misc/ntp: improve OpenRC init script for ntpd

The attached script updates a couple things which effectively is the same
as the current model however it follows the modular nature of the declarative
syntax.

Changes:
* Removes the duplicating start_stop_daemon_args since --pidfile is
  automatic with pidfile=
* Only have ntpd create the pidfile when forking via command_args_background
* Add command_args_foreground for the option not to fork

Closes: https://bugs.gentoo.org/828077
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/ntp/files/ntpd.rc-r2        |  23 ++++++
 net-misc/ntp/ntp-4.2.8_p15-r1.ebuild | 143 +++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)

diff --git a/net-misc/ntp/files/ntpd.rc-r2 b/net-misc/ntp/files/ntpd.rc-r2
new file mode 100644
index 000000000000..f4608f784615
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.rc-r2
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS}"
+command_args_background="-p ${pidfile}"
+command_args_foreground="-n"
+
+depend() {
+	use net dns logger
+	after ntp-client
+}
+
+start_pre() {
+	if [ ! -f /etc/ntp.conf ] ; then
+		eerror "Please create /etc/ntp.conf"
+		return 1
+	fi
+	return 0
+}

diff --git a/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild
new file mode 100644
index 000000000000..7e0c42fe3689
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+BDEPEND="virtual/pkgconfig
+	acct-group/ntp
+	acct-user/ntp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
+	"${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch
+)
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		# Increase the default memlimit from 32MiB to 128MiB.  #533232
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2022-12-01  5:17 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2022-12-01  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     56ef5ce33891feec34cd0c39a0a774a81a587dc7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 05:12:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 05:12:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ef5ce3

net-misc/ntp: another pthread configure fix

Closes: https://bugs.gentoo.org/871372
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ntp/files/ntp-4.2.8_p15-configure-clang16.patch    | 18 ++++++++++++++++++
 ...ntp-4.2.8_p15-r3.ebuild => ntp-4.2.8_p15-r4.ebuild} |  0
 2 files changed, 18 insertions(+)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch
index d0dc2ad014b4..4b52248bde8f 100644
--- a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch
+++ b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch
@@ -1,6 +1,21 @@
 Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288.
 
 https://bugs.gentoo.org/871372
+--- a/sntp/m4/openldap-thread-check.m4
++++ b/sntp/m4/openldap-thread-check.m4
+@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock;
+ 				dnl save the flags
+ 				AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
++pthread_t thread;
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
+ 			])
+ 
+ 			if test $ol_cv_func_pthread_detach = no ; then
 --- a/sntp/m4/openldap.m4
 +++ b/sntp/m4/openldap.m4
 @@ -1,16 +1,16 @@
@@ -590,3 +605,6 @@ https://bugs.gentoo.org/871372
 -#endif
 -	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
 -])
+-- 
+2.38.1
+

diff --git a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
similarity index 100%
rename from net-misc/ntp/ntp-4.2.8_p15-r3.ebuild
rename to net-misc/ntp/ntp-4.2.8_p15-r4.ebuild


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2023-02-14  0:40 Mike Gilbert
  0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2023-02-14  0:40 UTC (permalink / raw
  To: gentoo-commits

commit:     10cb0d6efa431b8ec909a3379d523ae8fbd9852a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 00:34:30 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 00:35:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cb0d6e

net-misc/ntp: use tmpfiles to create /var/lib/ntp

Closes: https://github.com/gentoo/gentoo/pull/29521
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/ntp/files/ntp.tmpfiles                                   | 1 +
 net-misc/ntp/{ntp-4.2.8_p15-r5.ebuild => ntp-4.2.8_p15-r6.ebuild} | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-misc/ntp/files/ntp.tmpfiles b/net-misc/ntp/files/ntp.tmpfiles
new file mode 100644
index 000000000000..49b0b066e30f
--- /dev/null
+++ b/net-misc/ntp/files/ntp.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/ntp 0755 ntp ntp

diff --git a/net-misc/ntp/ntp-4.2.8_p15-r5.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild
similarity index 97%
rename from net-misc/ntp/ntp-4.2.8_p15-r5.ebuild
rename to net-misc/ntp/ntp-4.2.8_p15-r6.ebuild
index 0fc7ccc4e110..64ff48c345f8 100644
--- a/net-misc/ntp/ntp-4.2.8_p15-r5.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic systemd
+inherit autotools flag-o-matic systemd tmpfiles
 
 MY_P=${P/_p/p}
 DESCRIPTION="Network Time Protocol suite/programs"
@@ -112,8 +112,7 @@ src_install() {
 	fi
 	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
 
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
+	newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
 
 	if use openntpd ; then
 		cd "${ED}" || die
@@ -138,6 +137,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ntp.conf
 	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
 		eerror "The notrust option was found in your /etc/ntp.conf!"
 		ewarn "If your ntpd starts sending out weird responses,"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
@ 2024-07-04  1:15 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2024-07-04  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     19e2125eebef45222fdcba5dd61d501b4e71fa6f
Author:     Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Sat Jun 29 20:13:03 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 01:14:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e2125e

net-misc/ntp: add 4.2.8_p18

Release Announcement:
  - https://www.ntp.org/support/securitynotice/4_2_8p18-release-announcement/

Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37365
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/ntp/Manifest                           |   1 +
 net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch |  19 +++
 net-misc/ntp/ntp-4.2.8_p18.ebuild               | 162 ++++++++++++++++++++++++
 3 files changed, 182 insertions(+)

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 8fb940e466de..5da6e016e1cb 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,3 +1,4 @@
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 DIST ntp-4.2.8p17.tar.gz 7120469 BLAKE2B 5c0e90a234cdeab76e7443b42dfd5a0c3c78693a11bdb0fa21c8def91adbdf9b9871498df9d211509632812a9107501da3470104122e9621577541ffd6cd1ab6 SHA512 e003bfe6f46065890663bc6791b02277f64318b692e49d8d678b76c23b245f357834eb483b0a44f1f47783166e5504686b36494af77f6eebe6f844cd3f2b6a8c
+DIST ntp-4.2.8p18.tar.gz 7210799 BLAKE2B 9a7bb767d2d8ae3a7224542df7978f8289cbdf28488c5e4dce4c549cdd1063259f69548898a352c0463ce83c4725bfd7c7dbf673ee3b74e490d7b1275760497c SHA512 c314f645d7d85e1028327657f30557cdfd86d417565b6c9fcbb40fca8a4c22a97b70908e8b73c6b31e14915b5b910ae0055fd42e819dd3cb48583b2a826c3fc4

diff --git a/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch b/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch
new file mode 100644
index 000000000000..8676603a6cee
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch
@@ -0,0 +1,19 @@
+https://bugs.ntp.org/show_bug.cgi?id=2646
+https://bugs.gentoo.org/533966
+
+--- a/ntpd/ntpd.c
++++ b/ntpd/ntpd.c
+@@ -1299,10 +1299,10 @@
+ 			 */
+ 			cap_t caps;
+ 			char *captext;
+-			
++
+ 			captext = (scan_addrs_once)
+-				    ? "cap_sys_time=pe"
+-				    : "cap_sys_time,cap_net_bind_service=pe";
++				    ? "cap_ipc_lock,cap_sys_time=pe"
++				    : "cap_ipc_lock,cap_sys_time,cap_net_bind_service=pe";
+ 			caps = cap_from_text(captext);
+ 			if (!caps) {
+ 				msyslog(LOG_ERR,

diff --git a/net-misc/ntp/ntp-4.2.8_p18.ebuild b/net-misc/ntp/ntp-4.2.8_p18.ebuild
new file mode 100644
index 000000000000..1da7db158516
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p18.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd tmpfiles
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="https://www.ntp.org/"
+SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+DEPEND="
+	>=dev-libs/libevent-2.0.9:=[threads(+)?]
+	readline? ( >=sys-libs/readline-4.1:= )
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( dev-libs/openssl:= )
+	parse-clocks? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+BDEPEND="
+	acct-group/ntp
+	acct-user/ntp
+	virtual/pkgconfig
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8_p18-ipc-caps.patch # bug #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530
+	"${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	# Make sure every build uses the same install layout, bug #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+
+	# bug #622754
+	eautoreconf
+
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die
+}
+
+src_configure() {
+	# bug #264109
+	append-cppflags -D_GNU_SOURCE
+
+	# https://bugs.gentoo.org/922508
+	append-lfs-flags
+
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Unity builds, we don't really need support for it, bug #804109
+	export PATH_RUBY=/bin/false
+
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+
+		# Increase the default memlimit from 32MiB to 128MiB, bug #533232
+		--with-memlock=256
+
+		# Avoid overriding the user's toolchain settings, bug #895802
+		--with-hardenfile=/dev/null
+
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Move ntpd/ntpdate to sbin, bug #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/man1/ntpd.1 || die
+	else
+		newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if ! use openntpd; then
+		tmpfiles_process ntp.conf
+	fi
+
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-07-04  1:15 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-17  6:21 [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-07-04  1:15 Sam James
2023-02-14  0:40 Mike Gilbert
2022-12-01  5:17 Sam James
2022-06-03  5:32 Sam James
2020-07-27 19:02 Lars Wendler
2020-06-23 16:16 Lars Wendler
2020-05-02 18:59 Thomas Deutschmann
2020-03-05 18:51 Lars Wendler
2018-12-08  1:49 Patrick McLean
2016-01-13 10:28 Lars Wendler
2015-10-25  1:07 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox