diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2016-01-13 11:19:30 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-01-13 11:19:30 +0100 |
commit | 1e5928de346454e2feb26cceb593a0448969e77b (patch) | |
tree | a243f48042559610117587eb2826ff0fe9c57bda /net-misc/ntp/files | |
parent | net-misc/ntp: Bump to version 4.2.8_p5 (diff) | |
download | gentoo-1e5928de346454e2feb26cceb593a0448969e77b.tar.gz gentoo-1e5928de346454e2feb26cceb593a0448969e77b.tar.bz2 gentoo-1e5928de346454e2feb26cceb593a0448969e77b.zip |
net-misc/ntp: Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/ntp/files')
-rw-r--r-- | net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch | 33 | ||||
-rw-r--r-- | net-misc/ntp/files/ntp-4.2.4_p7-nano.patch | 20 | ||||
-rw-r--r-- | net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch | 164 | ||||
-rw-r--r-- | net-misc/ntp/files/ntpd.rc | 36 | ||||
-rw-r--r-- | net-misc/ntp/files/ntpd.service-r1 | 10 | ||||
-rw-r--r-- | net-misc/ntp/files/ntpdate.service | 13 | ||||
-rw-r--r-- | net-misc/ntp/files/sntp.service-r1 | 13 |
7 files changed, 0 insertions, 289 deletions
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 40625fa18fb3..000000000000 --- 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 b31ea0adcb93..000000000000 --- 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 bfed86c3cb4d..000000000000 --- 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 b1f5de6ab5d3..000000000000 --- 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 0b6109037c42..000000000000 --- 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 a6c75c9c14c0..000000000000 --- 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 2686951f641d..000000000000 --- 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 |