summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2016-02-01 11:04:48 -0700
committerChristoph Junghans <ottxor@gentoo.org>2016-02-01 11:04:48 -0700
commitf55c32a55520092034056e81c583585c9601acd2 (patch)
tree6f699aeea8b5c922f47545555d9cf7f01e396307
parentapp-text/tesseract: Remove old (diff)
downloadgentoo-f55c32a55520092034056e81c583585c9601acd2.tar.gz
gentoo-f55c32a55520092034056e81c583585c9601acd2.tar.bz2
gentoo-f55c32a55520092034056e81c583585c9601acd2.zip
net-misc/openntpd: remove old
Package-Manager: portage-2.2.26
-rw-r--r--net-misc/openntpd/Manifest2
-rw-r--r--net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch46
-rw-r--r--net-misc/openntpd/files/openntpd-20080406-pidfile.patch141
-rw-r--r--net-misc/openntpd/files/openntpd-20080406-signal.patch57
-rw-r--r--net-misc/openntpd/openntpd-4.0_pre20080406.ebuild105
5 files changed, 0 insertions, 351 deletions
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index b610e7332681..bea2d4746de2 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,3 +1 @@
DIST openntpd-5.7p4.tar.gz 427900 SHA256 a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 SHA512 2a185139c915482086069fa19dd3070884a415137d1688059559d2da892928afbbe2fa0a8ade70d474809710265dcc05906abaf261892d7894e70272e2e516ef WHIRLPOOL 9464941e0f055ecd1db19a03bb5264a1dce02c6c7c2be078d1e3a19b5bd0a3c4e19ee6768617c90ebed01dea32f3a63751f9ef0436f56e22b7e6bd673a065546
-DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
-DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
diff --git a/net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch b/net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch
deleted file mode 100644
index 6026037331a7..000000000000
--- a/net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index d2ee38504c3e..000000000000
--- a/net-misc/openntpd/files/openntpd-20080406-pidfile.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-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
deleted file mode 100644
index 695beecb36c9..000000000000
--- a/net-misc/openntpd/files/openntpd-20080406-signal.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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/openntpd-4.0_pre20080406.ebuild b/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
deleted file mode 100644
index e790857150b2..000000000000
--- a/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
+++ /dev/null
@@ -1,105 +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 systemd user
-
-MY_PV=${PV##*pre}
-MY_P="${PN}_${MY_PV}p"
-DEB_VER="6"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-${DEB_VER}.debian.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ssl selinux"
-
-CDEPEND="ssl? ( dev-libs/openssl )
- !<=net-misc/ntp-4.2.0-r2
- !net-misc/ntp[-openntpd]"
-DEPEND="${CDEPEND}
- virtual/yacc"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-ntp )
-"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-pkg_setup() {
- export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
- enewgroup ntp
- enewuser ntp -1 -1 "${NTP_HOME}" ntp
-
- # make sure user has correct HOME as flipng between
- # the standard ntp pkg and this one was possible in
- # the past
- if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
- ewarn "From this version on, the homedir of the ntp user cannot be changed"
- ewarn "dynamically after the installation. For homedir different from"
- ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
- esethome ntp "${NTP_HOME}"
- fi
-}
-
-src_prepare() {
- sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die
-
- epatch "${WORKDIR}"/debian/patches/*.patch
- epatch "${FILESDIR}/${PN}-${MY_PV}-pidfile.patch"
- epatch "${FILESDIR}/${PN}-${MY_PV}-signal.patch"
- epatch "${FILESDIR}/${PN}-${MY_PV}-dns-timeout.patch"
- sed -i 's:debian:gentoo:g' ntpd.conf || die
- eautoreconf # deb patchset touches .ac files and such
-}
-
-src_configure() {
- econf \
- --disable-strip \
- $(use_with !ssl builtin-arc4random) \
- AR="$(type -p $(tc-getAR))"
-}
-
-src_install() {
- default
- rmdir "${ED}"/{var/empty,var}
-
- newinitd "${FILESDIR}/${PN}.init.d-${MY_PV}-r6" ntpd
- newconfd "${FILESDIR}/${PN}.conf.d-${MY_PV}-r6" ntpd
-
- systemd_newunit "${FILESDIR}/${PN}.service-${MY_PV}-r4" ntpd.service
-}
-
-pkg_config() {
- einfo "Setting up chroot for ntp in ${NTP_HOME}"
- # remove localtime file from previous installations
- rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
- mkdir -p "${EROOT%/}${NTP_HOME}"/etc
- if ! ln "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime ; then
- cp "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime || die
- einfo "We could not create a hardlink from /etc/localtime to ${NTP_HOME}/etc/localtime,"
- einfo "so please run 'emerge --config =${CATEGORY}/${PF}' whenever you changed"
- einfo "your timezone."
- fi
- chown -R root:root "${EROOT%/}${NTP_HOME}" || die
-}
-
-pkg_postinst() {
- pkg_config
-
- [[ -f ${EROOT}var/log/ntpd.log ]] && \
- ewarn "There is an orphaned logfile '${EROOT}var/log/ntpd.log', please remove it!"
-
- # bug #226491, remove <=openntpd-20080406-r7 trash
- rm -f "${EROOT%/}${NTP_HOME}"etc/localtime
- [-d "${EROOT%/}${NTP_HOME}"etc ] && rmdir "${EROOT%/}${NTP_HOME}"etc
-}
-
-pkg_postrm() {
- # remove localtime file from previous installations
- rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
-}