From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B6807138247 for ; Mon, 2 Dec 2013 13:32:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77F95E094F; Mon, 2 Dec 2013 13:32:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47FF6E094F for ; Mon, 2 Dec 2013 13:32:16 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C079533F14F for ; Mon, 2 Dec 2013 13:32:14 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2288) id 0C6972004B; Mon, 2 Dec 2013 13:32:12 +0000 (UTC) From: "Christoph Junghans (ottxor)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ottxor@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openntpd/files: openntpd.init.d-20080406-r6 openntpd-20080406-pidfile.patch openntpd.conf.d-20080406-r6 X-VCS-Repository: gentoo-x86 X-VCS-Files: openntpd.init.d-20080406-r6 openntpd-20080406-pidfile.patch openntpd.conf.d-20080406-r6 X-VCS-Directories: net-misc/openntpd/files X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131202133213.0C6972004B@flycatcher.gentoo.org> Date: Mon, 2 Dec 2013 13:32:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e416eb20-d7b9-48fe-8af0-eed201884462 X-Archives-Hash: e3bae46917d3dc17f6f644272b96e201 ottxor 13/12/02 13:32:12 Added: openntpd.init.d-20080406-r6 openntpd-20080406-pidfile.patch openntpd.conf.d-20080406-r6 Log: added pidfile support (bug #493082), fixed ignored NTPD_OPTS for USE=syslog (bug #493032) (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2000586) Revision Changes Path 1.1 net-misc/openntpd/files/openntpd.init.d-20080406-r6 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/files/openntpd.init.d-20080406-r6?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/files/openntpd.init.d-20080406-r6?rev=1.1&content-type=text/plain Index: openntpd.init.d-20080406-r6 =================================================================== #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/files/openntpd.init.d-20080406-r6,v 1.1 2013/12/02 13:32:12 ottxor Exp $ 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 } 1.1 net-misc/openntpd/files/openntpd-20080406-pidfile.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/files/openntpd-20080406-pidfile.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/files/openntpd-20080406-pidfile.patch?rev=1.1&content-type=text/plain Index: openntpd-20080406-pidfile.patch =================================================================== 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 { 1.1 net-misc/openntpd/files/openntpd.conf.d-20080406-r6 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/files/openntpd.conf.d-20080406-r6?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/files/openntpd.conf.d-20080406-r6?rev=1.1&content-type=text/plain Index: openntpd.conf.d-20080406-r6 =================================================================== # /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=""