use /run instead of /var/run (bug #479714#c1)

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 51 insertions, 3 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index c1214a0f9a94..29a293638976 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.78 2013/06/22 14:46:38 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.79 2013/08/20 15:34:33 ottxor Exp $
+
+*openntpd-20080406-r2 (20 Aug 2013)
+
+  20 Aug 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/openntpd.init.d-20080406-r2, +openntpd-20080406-r2.ebuild,
+  -openntpd-20080406-r1.ebuild:
+  use /run instead of /var/run (bug #479714#c1)
 
 *openntpd-20080406-r1 (22 Jun 2013)
 
diff --git a/net-misc/openntpd/files/openntpd.init.d-20080406-r2 b/net-misc/openntpd/files/openntpd.init.d-20080406-r2
new file mode 100644
index 000000000000..5c92df1c83fb
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.init.d-20080406-r2
@@ -0,0 +1,41 @@
+#!/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-r2,v 1.1 2013/08/20 15:34:33 ottxor Exp $
+
+name="OpenNTPD"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS} -d"
+command_background="yes"
+pidfile="/run/ntpd.pid"
+logfile="/run/ntpd.log"
+start_stop_daemon_args="--stderr ${logfile}"
+
+depend() {
+	need net
+	after ntp-client
+	use dns logger
+}
+
+start_pre() {
+	if [ ! -f /etc/ntpd.conf ] ; then
+		eerror "Could not find /etc/ntpd.conf!"
+		return 1
+	fi
+
+	if [ -x /usr/bin/getent ] ; then
+		if [ "`getent passwd ntp | cut -d: -f 6`" != "${NTPD_HOME}" ] ; then
+			eerror "Home directory of ntp needs to be ${NTPD_HOME}"
+			eerror "Please run 'usermod -d ${NTPD_HOME} ntp'"
+			return 1
+		fi
+	fi
+
+	checkpath -d -o 0:0 "${NTPD_HOME}"
+
+	# prepare chroot
+	mkdir -p "${NTPD_HOME}/etc"
+	cp /etc/localtime "${NTPD_HOME}/etc"
+
+	return 0
+}
diff --git a/net-misc/openntpd/openntpd-20080406-r1.ebuild b/net-misc/openntpd/openntpd-20080406-r2.ebuild
index 6400a17c8aa9..94f9a6187c3f 100644
--- a/net-misc/openntpd/openntpd-20080406-r1.ebuild
+++ b/net-misc/openntpd/openntpd-20080406-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r1.ebuild,v 1.1 2013/06/22 14:46:38 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r2.ebuild,v 1.1 2013/08/20 15:34:33 ottxor Exp $
 
 EAPI=5
 
@@ -54,6 +54,6 @@ src_configure() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}/openntpd.init.d-20080406-r1" ntpd
+	newinitd "${FILESDIR}/openntpd.init.d-20080406-r2" ntpd
 	newconfd "${FILESDIR}/openntpd.conf.d-3.9_p1-r4" ntpd
 }