Skip to contentSkip to conversation

package/htpdate: bump to version 1.3.3

PATCH Superseded Angelo Compagnucci 2 participants 3 messages Jan 20, 2022 – Jan 21, 2022

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/htpdate: bump to version 1.3.3

Update project to its new location and move to use the package provided init scripts.

---
 package/htpdate/S43htpdate      | 51 ---------------------------------
 package/htpdate/htpdate.hash    |  2 +-
 package/htpdate/htpdate.mk      |  6 ++--
 package/htpdate/htpdate.service | 13 ---------
 4 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 package/htpdate/S43htpdate
 delete mode 100644 package/htpdate/htpdate.service
package/htpdate/S43htpdate deleted +0 -51
deleted file mode 100644
index 75f9a995ff..0000000000
@@ -1,51 +0,0 @@
-#!/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
package/htpdate/htpdate.hash +1 -1
index c38e8784e1..ef27f8f94c 100644
@@ -1,3 +1,3 @@
 # Locally calculated:
-sha256 f6fb63b18a0d836fda721ae5655ae0b87055db1b582e98c4700f64e1ba5e2d5a  htpdate-1.3.1.tar.gz
+sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7  htpdate-1.3.3.tar.gz
 sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20  LICENSE
package/htpdate/htpdate.mk +3 -3
index e9323f9106..3c4412b283 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HTPDATE_VERSION = 1.3.1
+HTPDATE_VERSION = 1.3.3
 HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION))
 HTPDATE_LICENSE = GPL-2.0+
 HTPDATE_LICENSE_FILES = LICENSE
@@ -23,12 +23,12 @@ define HTPDATE_INSTALL_TARGET_CMDS
 endef
 
 define HTPDATE_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 package/htpdate/S43htpdate \
+	$(INSTALL) -D -m 0755 $(@D)/scripts/htpdate.init \
 		$(TARGET_DIR)/etc/init.d/S43htpdate
 endef
 
 define HTPDATE_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 0644 package/htpdate/htpdate.service \
+	$(INSTALL) -D -m 0644 $(@D)/scripts/htpdate.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/htpdate.service
 endef
 
package/htpdate/htpdate.service deleted +0 -13
deleted file mode 100644
index b7f1371b08..0000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=htpdate daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/htpdate.pid
-Environment=HTPDATE_ARGS="-a -s -t https://www.google.com"
-EnvironmentFile=-/etc/default/htpdate
-ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS
-
-[Install]
-WantedBy=multi-user.target
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Angelo, All,

On 2022-01-20 22:19 +0100, Angelo Compagnucci spake thusly:

Quoted 2 lines

Update project to its new location and move to use the package provided init scripts.

The service file we provide is functional (it uses Google's server) when the upstream service file is not (it uses a dymmy server), same goes for the init script: we are trying to provide works-out-of-the-box experience with sensible defaults. [0]

However, the upstream files are very similar to ours, and I see you were the one to push them upstream.

[0] And of course, I had to test: https://example.com/ does exist, and does return a date tag.

Meh, scratch all the above...

Still, I am not too fond of that, because then it means we are departing from our customs to provide our own scripts in all packages...

Oh damn, I am not sure... But that is not the biggest issue, see below...

Quoted 2 lines

---

[--SNIP--]

package/htpdate/htpdate.mk line 7

Quoted 10 lines
package/htpdate/htpdate.mk +1 -1
index e9323f9106..3c4412b283 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HTPDATE_VERSION = 1.3.1
+HTPDATE_VERSION = 1.3.3

Er... We have 1.2.6 in the tree, and I could not find the 1.2.6 -> 1.3.1 bump in Patchwork... Are you sure you prepared your patch against master?

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Angelo, All,

On 2022-01-21 21:39 +0100, Yann E. MORIN spake thusly:

Quoted 3 lines

On 2022-01-20 22:19 +0100, Angelo Compagnucci spake thusly:

Quoted 2 lines

Update project to its new location and move to use the package provided init scripts.

Oh, and this is just stating what the patch does, but is missing an explanations why this is a better idea than using our owns, the latter being the really interesting thing that we want to record in a commit log... ;-)

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot