diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/openntpd/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/openntpd/files')
7 files changed, 326 insertions, 0 deletions
diff --git a/net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch b/net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch new file mode 100644 index 000000000000..6026037331a7 --- /dev/null +++ b/net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch @@ -0,0 +1,46 @@ +fix dns lookups timeout +https://bugs.gentoo.org/show_bug.cgi?id=493358 + +diff -u openntpd-20080406p-orig/ntpd.c openntpd-20080406p/ntpd.c +--- openntpd-20080406p-orig/ntpd.c 2013-12-04 20:12:02.562857933 -0800 ++++ openntpd-20080406p/ntpd.c 2013-12-04 20:22:55.617577783 -0800 +@@ -34,6 +34,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <time.h> + #include <unistd.h> + + #include "ntpd.h" +@@ -95,6 +96,7 @@ + int ch, nfds, timeout = INFTIM; + int pipe_chld[2]; + extern char *__progname; ++ time_t start_time; + + __progname = _compat_get_progname(argv[0]); + +@@ -197,6 +199,8 @@ + fatal(NULL); + imsg_init(ibuf, pipe_chld[0]); + ++ start_time = getmonotime(); ++ + while (quit == 0) { + pfd[PFD_PIPE].fd = ibuf->fd; + pfd[PFD_PIPE].events = POLLIN; +@@ -209,11 +213,12 @@ + quit = 1; + } + +- if (nfds == 0 && lconf.settime) { ++ if (lconf.settime && ++ (nfds == 0 || getmonotime() > start_time+SETTIME_TIMEOUT)) { + lconf.settime = 0; + timeout = INFTIM; + log_init(lconf.debug); +- log_debug("no reply received in time, skipping initial " ++ log_warnx("no reply received in time, skipping initial " + "time setting"); + if (!lconf.debug) { + if (daemon(1, 0)) diff --git a/net-misc/openntpd/files/openntpd-20080406-pidfile.patch b/net-misc/openntpd/files/openntpd-20080406-pidfile.patch new file mode 100644 index 000000000000..d2ee38504c3e --- /dev/null +++ b/net-misc/openntpd/files/openntpd-20080406-pidfile.patch @@ -0,0 +1,141 @@ +adding a -p option to openntpd to create a pidfile + +https://bugs.gentoo.org/show_bug.cgi?id=493082 + +diff -u -r openntpd-20080406p.orig/ntpd.8 openntpd-20080406p/ntpd.8 +--- openntpd-20080406p.orig/ntpd.8 2013-12-01 12:49:49.773116316 -0800 ++++ openntpd-20080406p/ntpd.8 2013-12-01 13:27:39.417324497 -0800 +@@ -25,6 +25,7 @@ + .Bk -words + .Op Fl dnSsv + .Op Fl f Ar file ++.Op Fl p Ar file + .Ek + .Sh DESCRIPTION + The +@@ -63,13 +64,16 @@ + .Xr ntpd.conf 5 . + .Pp + The options are as follows: +-.Bl -tag -width "-f fileXXX" ++.Bl -tag -width "-p fileXXX" + .It Fl d + Do not daemonize. + If this option is specified, + .Nm + will run in the foreground and log to + .Em stderr . ++.It Fl p Ar file ++Write pid to ++.Ar file + .It Fl f Ar file + Use + .Ar file +diff -u -r openntpd-20080406p.orig/ntpd.c openntpd-20080406p/ntpd.c +--- openntpd-20080406p.orig/ntpd.c 2013-12-01 12:49:49.774116176 -0800 ++++ openntpd-20080406p/ntpd.c 2013-12-01 13:31:43.964616270 -0800 +@@ -78,7 +78,7 @@ + { + extern char *__progname; + +- fprintf(stderr, "usage: %s [-dnSsv] [-f file]\n", __progname); ++ fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n", __progname); + exit(1); + } + +@@ -105,7 +105,7 @@ + log_init(1); /* log to stderr until daemonized */ + res_init(); /* XXX */ + +- while ((ch = getopt(argc, argv, "df:nsSv")) != -1) { ++ while ((ch = getopt(argc, argv, "df:np:sSv")) != -1) { + switch (ch) { + case 'd': + lconf.debug = 1; +@@ -116,6 +116,9 @@ + case 'n': + lconf.noaction = 1; + break; ++ case 'p': ++ lconf.pid_file = optarg; ++ break; + case 's': + lconf.settime = 1; + break; +@@ -157,9 +160,17 @@ + reset_adjtime(); + if (!lconf.settime) { + log_init(lconf.debug); +- if (!lconf.debug) ++ if (!lconf.debug) { + if (daemon(1, 0)) + fatal("daemon"); ++ else if (lconf.pid_file != NULL) { ++ FILE *f = fopen(lconf.pid_file, "w"); ++ if (f == NULL) ++ fatal("couldn't open pid file"); ++ fprintf(f, "%ld\n", (long) getpid()); ++ fclose(f); ++ } ++ } + } else + timeout = SETTIME_TIMEOUT * 1000; + +@@ -201,9 +212,17 @@ + log_init(lconf.debug); + log_debug("no reply received in time, skipping initial " + "time setting"); +- if (!lconf.debug) ++ if (!lconf.debug) { + if (daemon(1, 0)) + fatal("daemon"); ++ else if (lconf.pid_file != NULL) { ++ FILE *f = fopen(lconf.pid_file, "w"); ++ if (f == NULL) ++ fatal("couldn't open pid file"); ++ fprintf(f, "%ld\n", (long) getpid()); ++ fclose(f); ++ } ++ } + } + + if (nfds > 0 && (pfd[PFD_PIPE].revents & POLLOUT)) +@@ -242,6 +261,8 @@ + msgbuf_clear(&ibuf->w); + free(ibuf); + log_info("Terminating"); ++ if (lconf.pid_file != NULL) ++ unlink(lconf.pid_file); + return (0); + } + +@@ -316,9 +337,17 @@ + memcpy(&d, imsg.data, sizeof(d)); + ntpd_settime(d); + /* daemonize now */ +- if (!lconf->debug) ++ if (!lconf->debug) { + if (daemon(1, 0)) + fatal("daemon"); ++ else if (lconf->pid_file != NULL) { ++ FILE *f = fopen(lconf->pid_file, "w"); ++ if (f == NULL) ++ fatal("couldn't open pid file"); ++ fprintf(f, "%ld\n", (long) getpid()); ++ fclose(f); ++ } ++ } + lconf->settime = 0; + break; + case IMSG_HOST_DNS: +diff -u -r openntpd-20080406p.orig/ntpd.h openntpd-20080406p/ntpd.h +--- openntpd-20080406p.orig/ntpd.h 2013-12-01 12:49:49.773116316 -0800 ++++ openntpd-20080406p/ntpd.h 2013-12-01 12:54:02.023313872 -0800 +@@ -178,6 +178,7 @@ + u_int8_t debug; + u_int32_t scale; + u_int8_t noaction; ++ char *pid_file; + }; + + struct buf { diff --git a/net-misc/openntpd/files/openntpd-20080406-signal.patch b/net-misc/openntpd/files/openntpd-20080406-signal.patch new file mode 100644 index 000000000000..695beecb36c9 --- /dev/null +++ b/net-misc/openntpd/files/openntpd-20080406-signal.patch @@ -0,0 +1,57 @@ +allow SIGUSR1 as stand-in for SIGINFO (on e.g linux) +https://bugs.gentoo.org/show_bug.cgi?id=493084 + +diff -u openntpd-20080406p-orig/ntp.c openntpd-20080406p/ntp.c +--- openntpd-20080406p-orig/ntp.c 2013-12-04 15:11:04.417274938 -0800 ++++ openntpd-20080406p/ntp.c 2013-12-04 15:12:21.066006404 -0800 +@@ -67,9 +67,11 @@ + break; + #ifdef HAVE_SIGINFO + case SIGINFO: +- ntp_report = 1; +- break; ++#else ++ case SIGUSR1: + #endif ++ ntp_report = 1; ++ break; + } + } + +@@ -158,6 +160,8 @@ + signal(SIGINT, ntp_sighdlr); + #ifdef USE_SIGINFO + signal(SIGINFO, ntp_sighdlr); ++#else ++ signal(SIGUSR1, ntp_sighdlr); + #endif + signal(SIGPIPE, SIG_IGN); + signal(SIGHUP, SIG_IGN); +diff -u openntpd-20080406p-orig/ntpd.8 openntpd-20080406p/ntpd.8 +--- openntpd-20080406p-orig/ntpd.8 2013-12-04 15:11:04.416274915 -0800 ++++ openntpd-20080406p/ntpd.8 2013-12-04 15:12:21.066006404 -0800 +@@ -104,7 +104,11 @@ + .Nm + receives a + .Dv SIGINFO +-signal, it will write its peer and sensor status to syslog. ++signal (or a ++.Dv SIGUSR1 ++signal on systems without ++.Dv SIGINFO ++), it will write its peer and sensor status to syslog. + .Sh FILES + .Bl -tag -width "/var/lib/openntpd/ntpd.driftXXX" -compact + .It Pa /etc/ntpd.conf +diff -u openntpd-20080406p-orig/ntpd.c openntpd-20080406p/ntpd.c +--- openntpd-20080406p-orig/ntpd.c 2013-12-04 15:11:04.416274915 -0800 ++++ openntpd-20080406p/ntpd.c 2013-12-04 15:14:21.586728922 -0800 +@@ -187,6 +187,9 @@ + signal(SIGTERM, sighdlr); + signal(SIGINT, sighdlr); + signal(SIGHUP, sighdlr); ++ #ifndef HAVE_SIGINFO ++ signal(SIGUSR1, SIG_IGN); ++ #endif + + close(pipe_chld[1]); diff --git a/net-misc/openntpd/files/openntpd-5.7_p4-nolibtls.patch b/net-misc/openntpd/files/openntpd-5.7_p4-nolibtls.patch new file mode 100644 index 000000000000..85a7c72949f2 --- /dev/null +++ b/net-misc/openntpd/files/openntpd-5.7_p4-nolibtls.patch @@ -0,0 +1,49 @@ +diff -u -r openntpd-5.7p4-orig/src/config.c openntpd-5.7p4/src/config.c +--- openntpd-5.7p4-orig/src/config.c 2015-03-24 18:18:56.000000000 -0700 ++++ openntpd-5.7p4/src/config.c 2015-05-25 16:48:59.000000000 -0700 +@@ -218,6 +218,9 @@ + fatal("new_constraint calloc"); + p->id = ++constraint_maxid; + ++#ifndef HAVE_LIBTLS ++ fatal("constraint configured without libtls support"); ++#endif + return (p); + } + +diff -u -r openntpd-5.7p4-orig/src/ntp.c openntpd-5.7p4/src/ntp.c +--- openntpd-5.7p4-orig/src/ntp.c 2015-03-11 19:15:36.000000000 -0700 ++++ openntpd-5.7p4/src/ntp.c 2015-05-25 16:48:59.000000000 -0700 +@@ -110,12 +110,14 @@ + return (pid); + } + ++#ifdef HAVE_LIBTLS + tls_init(); + + /* Verification will be turned off if CA is not found */ + if ((conf->ca = tls_load_file(CONSTRAINT_CA, + &conf->ca_len, NULL)) == NULL) + log_warnx("constraint certificate verification turned off"); ++#endif + + /* in this case the parent didn't init logging and didn't daemonize */ + if (nconf->settime && !nconf->debug) { +diff -u -r openntpd-5.7p4-orig/src/ntpd.conf.5 openntpd-5.7p4/src/ntpd.conf.5 +--- openntpd-5.7p4-orig/src/ntpd.conf.5 2015-03-24 18:18:56.000000000 -0700 ++++ openntpd-5.7p4/src/ntpd.conf.5 2015-05-25 16:48:59.000000000 -0700 +@@ -192,8 +192,11 @@ + .Sq Man-In-The-Middle + attacks. + Received NTP packets with time information falling outside of a range +-near the constraint will be discarded and such NTP servers +-will be marked as invalid. ++near the constraint will be discarded and such NTP servers will be marked as ++invalid. Contraints are only available if ++.Xr ntpd 8 ++has been compiled with libtls support. Configuring a constraint without libtls ++support will result in a fatal error. + .Bl -tag -width Ds + .It Ic constraint from Ar url + Specify the URL, IP address or the hostname of an HTTPS server to +Only in openntpd-5.7p4/src: ntpd.conf.5.orig diff --git a/net-misc/openntpd/files/openntpd.conf.d-20080406-r6 b/net-misc/openntpd/files/openntpd.conf.d-20080406-r6 new file mode 100644 index 000000000000..ccd45459664c --- /dev/null +++ b/net-misc/openntpd/files/openntpd.conf.d-20080406-r6 @@ -0,0 +1,7 @@ +# /etc/conf.d/ntpd: config file for openntpd's ntpd + +# See ntpd(8) man page ... some popular options: +# -s Set the time immediately at startup +# (Note: may cause up to a 15 second startup delay +# if ntp servers not reachable) +NTPD_OPTS="" diff --git a/net-misc/openntpd/files/openntpd.init.d-20080406-r6 b/net-misc/openntpd/files/openntpd.init.d-20080406-r6 new file mode 100644 index 000000000000..ca7e3c5f7cf9 --- /dev/null +++ b/net-misc/openntpd/files/openntpd.init.d-20080406-r6 @@ -0,0 +1,15 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +name="OpenNTPD" +command="/usr/sbin/ntpd" +pidfile="/run/ntpd.pid" +command_args="-p ${pidfile} ${NTPD_OPTS}" + +depend() { + need net + after ntp-client + use dns logger +} diff --git a/net-misc/openntpd/files/openntpd.service-20080406-r4 b/net-misc/openntpd/files/openntpd.service-20080406-r4 new file mode 100644 index 000000000000..2e1bbff8ff7f --- /dev/null +++ b/net-misc/openntpd/files/openntpd.service-20080406-r4 @@ -0,0 +1,11 @@ +[Unit] +Description=OpenNTP Daemon +After=network.target +Conflicts=systemd-timesyncd.service + +[Service] +Type=simple +ExecStart=/usr/sbin/ntpd -s -d + +[Install] +WantedBy=multi-user.target |