[gentoo-commits] repo/gentoo:master commit in: net-misc/sntpd/files/, net-misc/sntpd/

[gentoo-commits] repo/gentoo:master commit in: net-misc/sntpd/files/, net-misc/sntpd/

[Conrad Kostecki]

commit:     a0afd56d1ce1f0d09006e62f182646657fb0f7b0
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 10:32:58 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 10:36:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0afd56d

net-misc/sntpd: fix creation of pidfile

Also added missing systemd inherit.

Closes: https://bugs.gentoo.org/738870
Closes: https://bugs.gentoo.org/738894
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-misc/sntpd/files/sntpd.initd-r1 | 14 ++++++++++++++
 net-misc/sntpd/sntpd-3.0-r1.ebuild  | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/net-misc/sntpd/files/sntpd.initd-r1 b/net-misc/sntpd/files/sntpd.initd-r1
new file mode 100644
index 00000000000..ebe857af4af
--- /dev/null
+++ b/net-misc/sntpd/files/sntpd.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="sntpd"
+pidfile="/run/sntpd.pid"
+
+command="/usr/sbin/sntpd"
+command_args="-n ${SNTPD_OPTS}"
+command_background="true"
+
+depend() {
+	use net dns logger
+}

diff --git a/net-misc/sntpd/sntpd-3.0-r1.ebuild b/net-misc/sntpd/sntpd-3.0-r1.ebuild
new file mode 100644
index 00000000000..5edf61d7f02
--- /dev/null
+++ b/net-misc/sntpd/sntpd-3.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client and server for unix-alike systems"
+HOMEPAGE="https://github.com/troglobit/sntpd"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="adjtimex systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with adjtimex)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
+		--with-ntpclient
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/sntpd.initd-r1 sntpd
+	newconfd "${FILESDIR}"/sntpd.confd sntpd
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/sntpd/files/, net-misc/sntpd/

[Conrad Kostecki]

commit:     fd85407aea3c469d7fcca3deabc98fd94fda0b73
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 13:20:35 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 13:20:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd85407a

net-misc/sntpd: drop old version

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-misc/sntpd/Manifest                            |  1 -
 .../ntpclient-2018.244-linux-headers-5.2.patch     | 10 ------
 net-misc/sntpd/metadata.xml                        |  4 ---
 net-misc/sntpd/sntpd-2.2018.244-r1.ebuild          | 36 ----------------------
 4 files changed, 51 deletions(-)

diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest
index f10c074aef3..299ceb8f52e 100644
--- a/net-misc/sntpd/Manifest
+++ b/net-misc/sntpd/Manifest
@@ -1,2 +1 @@
-DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
 DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea

diff --git a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
deleted file mode 100644
index df87cb6ceb2..00000000000
--- a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ntpclient.c	2018-08-27 20:38:12.000000000 +0200
-+++ b/src/ntpclient.c	2019-08-19 20:11:59.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <errno.h>
- #ifdef PRECISION_SIOCGSTAMP
-+#include <linux/sockios.h>
- #include <sys/ioctl.h>
- #endif
- #ifdef USE_OBSOLETE_GETTIMEOFDAY

diff --git a/net-misc/sntpd/metadata.xml b/net-misc/sntpd/metadata.xml
index 0d0a5d1ae34..9bb3f3c88e3 100644
--- a/net-misc/sntpd/metadata.xml
+++ b/net-misc/sntpd/metadata.xml
@@ -19,9 +19,5 @@
 	</upstream>
 	<use>
 		<flag name="adjtimex">Install adjtimex for the clock adjustment algorithm.</flag>
-		<flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag>
-		<flag name="embedded">Build a very small ntpclient, from OpenWRT project.</flag>
-		<flag name="obsolete">Enable obsolete features, to use with kernel versions older than 3.0</flag>
-		<flag name="syslog">Enable logging to syslog instead of logging to stderr.</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild b/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
deleted file mode 100644
index f6b938200cc..00000000000
--- a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ntpclient"
-MY_PV="${PV/2./}"
-MY_P="${MY_PN}-${MY_PV/./_}"
-
-DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
-HOMEPAGE="https://github.com/troglobit/sntpd"
-SRC_URI="https://github.com/troglobit/sntpd/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug embedded obsolete +syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_PN}-${MY_PV}-linux-headers-5.2.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug replay)
-		$(use_enable embedded mini)
-		$(use_enable obsolete)
-		$(use_enable !obsolete siocgstamp)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}