diff mbox series

[v2] package/htpdate: new package

Message ID 20200807205806.1580019-1-angelo@amarulasolutions.com
State Accepted
Headers show
Series [v2] package/htpdate: new package | expand

Commit Message

Angelo Compagnucci Aug. 7, 2020, 8:58 p.m. UTC 
Adding htpdate, a time syncronization software based on http.

Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
---
Changelo
v1->v2:
* Fixed service configuration file handling (Thomas P.)
* Move to use $call github ...) (Thomas P.)
* Fixed DEPENDECIES (Thomas P.)
* Move to use $(TARGET_MAKE_ENV)

 DEVELOPERS                      |  1 +
 package/Config.in               |  1 +
 package/htpdate/Config.in       |  8 ++++++
 package/htpdate/S43htpdate      | 51 +++++++++++++++++++++++++++++++++
 package/htpdate/htpdate.hash    |  3 ++
 package/htpdate/htpdate.mk      | 35 ++++++++++++++++++++++
 package/htpdate/htpdate.service | 13 +++++++++
 7 files changed, 112 insertions(+)
 create mode 100644 package/htpdate/Config.in
 create mode 100644 package/htpdate/S43htpdate
 create mode 100644 package/htpdate/htpdate.hash
 create mode 100644 package/htpdate/htpdate.mk
 create mode 100644 package/htpdate/htpdate.service

Comments

Thomas Petazzoni Sept. 7, 2020, 9:51 p.m. UTC | #1 
Hello Angelo,

On Fri,  7 Aug 2020 22:58:06 +0200
Angelo Compagnucci <angelo@amarulasolutions.com> wrote:

> Adding htpdate, a time syncronization software based on http.
> 
> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>

I've applied after fixing some minor issues. First, some check-package
warnings:

package/Config.in:2085: Packages in: menu "Networking applications",
                        are not alphabetically ordered;
                        correct order: '-', '_', digits, capitals, lowercase;
                        first incorrect package: hplip
package/htpdate/Config.in:5: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in)

> +HTPDATE_VERSION = 1.2.4
> +HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION))
> +HTPDATE_LICENSE = GPL-2.0-or-later

We use GPL-2.0+ in Buildroot, not GPL-2.0-or-later.

> +define HTPDATE_BUILD_CMDS
> +	$(TARGET_MAKE_ENV) CC=$(TARGET_CC) $(MAKE) -C $(@D) $(HTPDATE_BUILD_OPTS)

I've changed CC=$(TARGET_CC) to $(TARGET_CONFIGURE_OPTS) so that our
CFLAGS are passed.

Applied with those changes. Thanks!

Thomas
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index ee840dbb8b..d712df272a 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -208,6 +208,7 @@  F:	package/cups/
 F:	package/cups-filters/
 F:	package/fail2ban/
 F:	package/grep/
+F:	package/htpdate/
 F:	package/i2c-tools/
 F:	package/jq/
 F:	package/libapparmor/
diff --git a/package/Config.in b/package/Config.in
index d7e79f4795..b1c3d2db92 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2061,6 +2061,7 @@  menu "Networking applications"
 	source "package/haproxy/Config.in"
 	source "package/hiawatha/Config.in"
 	source "package/hostapd/Config.in"
+	source "package/htpdate/Config.in"
 	source "package/hplip/Config.in"
 	source "package/httping/Config.in"
 	source "package/i2pd/Config.in"
diff --git a/package/htpdate/Config.in b/package/htpdate/Config.in
new file mode 100644
index 0000000000..fb0b0f3bf7
--- /dev/null
+++ b/package/htpdate/Config.in
@@ -0,0 +1,8 @@ 
+config BR2_PACKAGE_HTPDATE
+	bool "htpdate"
+	depends on BR2_USE_MMU # fork()
+	help
+	  The HTTP Time Protocol (HTP) is used to synchronize a computer's time
+	  with web servers as reference time source.
+
+	  https://github.com/angeloc/htpdate
diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate
new file mode 100644
index 0000000000..75f9a995ff
--- /dev/null
+++ b/package/htpdate/S43htpdate
@@ -0,0 +1,51 @@ 
+#!/bin/sh
+
+DAEMON="htpdate"
+PIDFILE="/var/run/$DAEMON.pid"
+
+HTPDATE_ARGS="-a -s -t https://google.com"
+test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \
+		-- -D -i "$PIDFILE" $HTPDATE_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		rm -f "$PIDFILE"
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash
new file mode 100644
index 0000000000..282bcbe7ed
--- /dev/null
+++ b/package/htpdate/htpdate.hash
@@ -0,0 +1,3 @@ 
+# Locally calculated:
+sha256 08aee5132b0c73ba01485b907d037fd676d0ad89d2736bbf117ec5c5035b513a  htpdate-1.2.4.tar.gz
+sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20  LICENSE
diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk
new file mode 100644
index 0000000000..2c749f553a
--- /dev/null
+++ b/package/htpdate/htpdate.mk
@@ -0,0 +1,35 @@ 
+################################################################################
+#
+# htpdate
+#
+################################################################################
+
+HTPDATE_VERSION = 1.2.4
+HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION))
+HTPDATE_LICENSE = GPL-2.0-or-later
+HTPDATE_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1
+HTPDATE_DEPENDENCIES += openssl
+endif
+
+define HTPDATE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) CC=$(TARGET_CC) $(MAKE) -C $(@D) $(HTPDATE_BUILD_OPTS)
+endef
+
+define HTPDATE_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define HTPDATE_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/htpdate/S43htpdate \
+		$(TARGET_DIR)/etc/init.d/S43htpdate
+endef
+
+define HTPDATE_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 package/htpdate/htpdate.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/htpdate.service
+endef
+
+$(eval $(generic-package))
diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service
new file mode 100644
index 0000000000..0c77550813
--- /dev/null
+++ b/package/htpdate/htpdate.service
@@ -0,0 +1,13 @@ 
+[Unit]
+Description=htpdate daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/htpdate
+Environment=HTPDATE_ARGS="-a -s -t https://www.google.com"
+EnvironmentFile=-/etc/default/htpdate
+ExecStart=/usr/bin/htpdate -D -i /var/run/htpdate $HTPDATE_ARGS
+
+[Install]
+WantedBy=multi-user.target