[Buildroot] [PATCH 0/5] package/inadyn: bump version, script refactor, etc.

[Buildroot] [PATCH 0/5] package/inadyn: bump version, script refactor, etc.

[Joachim Wiberg]

Hi,

this patch series updates In-a-dyn to the latest version, adds myself
as co-maintainer, drops the local systemd unit file, and adds a fully
rewritten sysv start script with a few more features.

Best regards
 /Joachim

Joachim Wiberg (5):
  package/inadyn: bump to version 2.9.0
  DEVELOPERS: add Joachim Wiberg as co-maintainer for inadyn
  package/inadyn: replace local systemd unit file with upstream
  package/inadyn: refactor start script
  package/inadyn: update inadyn.conf example

 DEVELOPERS                    |  1 +
 package/inadyn/S70inadyn      | 85 ++++++++++++++++++++---------------
 package/inadyn/inadyn.conf    | 25 ++++++++---
 package/inadyn/inadyn.hash    |  4 +-
 package/inadyn/inadyn.mk      |  5 +--
 package/inadyn/inadyn.service | 10 -----
 6 files changed, 74 insertions(+), 56 deletions(-)
 mode change 100644 => 100755 package/inadyn/S70inadyn
 delete mode 100644 package/inadyn/inadyn.service

-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/5] package/inadyn: bump to version 2.9.0

[Joachim Wiberg]

Upstream changing to .tar.gz, prepare by dropping INADYN_SOURCE,
as suggested by utils/check-package.

See the ChangeLog, or release notes at GitHub, for full details:
https://github.com/troglobit/inadyn/releases/tag/v2.9.0

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/inadyn/inadyn.hash | 4 ++--
 package/inadyn/inadyn.mk   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash
index 638f92d119..801400b2f5 100644
--- a/package/inadyn/inadyn.hash
+++ b/package/inadyn/inadyn.hash
@@ -1,5 +1,5 @@
-# From https://github.com/troglobit/inadyn/releases/download/v2.8.1/inadyn-2.8.1.tar.xz.sha256
-sha256  1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685  inadyn-2.8.1.tar.xz
+# Upstream .sha256 from GitHub
+sha256  b90c02a4f1964d8c1f3e178b6ef22eb29c689cd9e09669af17a8fd998c87dab5  inadyn-2.9.0.tar.gz
 
 # Locally computed
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index c115e8926d..fc04fd5f25 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-INADYN_VERSION = 2.8.1
+INADYN_VERSION = 2.9.0
 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
-INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
 INADYN_LICENSE = GPL-2.0+
 INADYN_LICENSE_FILES = COPYING
 INADYN_DEPENDENCIES = host-pkgconf libconfuse
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/5] DEVELOPERS: add Joachim Wiberg as maintainer for inadyn

[Joachim Wiberg]

Upstream maintainer, now also maintainer in Buildroot.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DEVELOPERS b/DEVELOPERS
index 6f812eb564..026ce8a9b4 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1343,6 +1343,7 @@ F:	package/rtty/
 N:	Joachim Wiberg <troglobit@gmail.com>
 F:	configs/globalscale_espressobin_defconfig
 F:	board/globalscale/espressobin/
+F:	package/inadyn/
 F:	package/libite/
 F:	package/libteam/
 F:	package/libuev/
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/5] package/inadyn: replace local systemd unit file with upstream

[Joachim Wiberg]

If systemd is available at configure time, the inadyn configure script
detects it and generates the unit file.

Also, the local unit file had the wrong absolute path to the binary.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/inadyn/inadyn.mk      |  2 +-
 package/inadyn/inadyn.service | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 package/inadyn/inadyn.service

diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index fc04fd5f25..9ccb16ddfe 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -31,7 +31,7 @@ define INADYN_INSTALL_INIT_SYSV
 endef
 
 define INADYN_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 644 package/inadyn/inadyn.service \
+	$(INSTALL) -D -m 644 $(@D)/inadyn.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/inadyn.service
 endef
 
diff --git a/package/inadyn/inadyn.service b/package/inadyn/inadyn.service
deleted file mode 100644
index abc0a1e401..0000000000
--- a/package/inadyn/inadyn.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DDNS client
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/inadyn
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/5] package/inadyn: refactor start script

[Joachim Wiberg]

This patch is a complete rewrite of the start script, reducing code
duplication by using a helper cmd() function and adding support for:

 - INADYN_ARGS that can be overridden from /etc/default/inadyn
 - reload command that sends SIGHUP

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/inadyn/S70inadyn | 85 +++++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 36 deletions(-)
 mode change 100644 => 100755 package/inadyn/S70inadyn

diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn
old mode 100644
new mode 100755
index ca7b414678..1eab33b5fc
--- a/package/inadyn/S70inadyn
+++ b/package/inadyn/S70inadyn
@@ -1,44 +1,57 @@
 #!/bin/sh
 #
-# Start & stop the inadyn client
-#
+# Note: must be explicitly enabled by adding ENABLED="yes"
+#       to /etc/default/inadyn, which also can be used to
+#       override the default INADYN_ARGS
 
-CONFIG=/etc/inadyn.conf
+NAME="inadyn"
+INADYN_ARGS="-s"
+PIDFILE="/var/run/$NAME.pid"
 
-# check if CONFIG exists, print message & exit if it doesn't
-[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 )
+# shellcheck source=/dev/null
+[ -r "/etc/default/$NAME" ] && . "/etc/default/$NAME"
 
-# Allow a few customizations from a config file. Especially inadyn
-# must be explicitly enabled by adding ENABLED="yes" in this file.
-test -r /etc/default/inadyn && . /etc/default/inadyn
+cmd()
+{
+    if [ "$ENABLED" != "yes" ]; then
+	echo "SKIPPED"
+	exit 0
+    fi
+    start-stop-daemon -q -p "$PIDFILE" -x "/usr/sbin/$NAME" "$@"
+    status=$?
+    if [ $status -eq 0 ]; then
+	echo "OK"
+    else
+	echo "FAIL"
+    fi
+    return $status
+}
 
 case "$1" in
-	start)
-		printf "Starting inadyn: "
-		if test "${ENABLED}" != "yes" ; then
-		    echo "SKIPPED"
-		    exit 0
-		fi
-		start-stop-daemon -b -q -S -p /var/run/inadyn.pid -x /usr/sbin/inadyn
-		[ $? = 0 ] && echo "OK" || echo "FAIL"
-		;;
-	stop)
-		printf "Stopping inadyn: "
-		if test "${ENABLED}" != "yes" ; then
-		    echo "SKIPPED"
-		    exit 0
-		fi
-		start-stop-daemon -q -K -p /var/run/inadyn.pid -x /usr/sbin/inadyn
-		[ $? = 0 ] && echo "OK" || echo "FAIL"
-		rm -f /var/run/inadyn.pid
-		;;
-	restart)
-		"$0" stop
-		"$0" start
-		;;
-		*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-esac
+    start)
+	printf 'Starting %s: ' "$NAME"
+	# shellcheck disable=SC2086 # we need the word splitting
+	cmd -S -- $INADYN_ARGS
+	;;
+
+    stop)
+	printf 'Stopping %s: ' "$NAME"
+	cmd -K
+	rm -f "$PIDFILE"
+	;;
 
-exit $?
+    restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+
+    reload)
+	printf 'Reloading %s: ' "$NAME"
+	cmd -K -s HUP
+	;;
+
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+esac
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 5/5] package/inadyn: update inadyn.conf example

[Joachim Wiberg]

 - Comment out iface setting, usually not what you want
 - Update DynDNS example, show use of multiple hostnames
 - Add FreeDNS sample config, free and stable service
 - Add link to syntax and examples

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/inadyn/inadyn.conf | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/package/inadyn/inadyn.conf b/package/inadyn/inadyn.conf
index 1b29027606..3328ee2218 100644
--- a/package/inadyn/inadyn.conf
+++ b/package/inadyn/inadyn.conf
@@ -1,11 +1,26 @@
-# Basic configuration file for inadyn
+# Example /etc/inadyn.conf
 #
-# /etc/inadyn.conf
-iface    = eth0
+# Remember to change this file to match your provider and credentials
+# Username and password can be included from another file.  For more
+# info, see https://man.troglobit.com/man5/inadyn.conf.5.html
+
+# Use IP address of interface instead of external checkip server.
+# Useful when you want to register internal IP addresses
+#iface    = eth0
+
+# IP address change check interval
 period   = 300
 
-provider default@dyndns.org {
+# Remove of change to match your Dyn account
+provider dyndns.org {
 	username    = test
 	password    = test
-	hostname    = test
+	hostname    = { "my.example.com", "other.example.org" }
+}
+
+# Remove or change to match your FreeDNS account
+provider freedns {
+     username   = lower-case-username
+     password   = case-sensitive-pwd
+     hostname   = some.example.com
 }
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/5] DEVELOPERS: add Joachim Wiberg as maintainer for inadyn

[Thomas Petazzoni]

On Mon, 22 Nov 2021 03:08:01 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

> Upstream maintainer, now also maintainer in Buildroot.
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> ---
>  DEVELOPERS | 1 +
>  1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/5] package/inadyn: bump to version 2.9.0

[Thomas Petazzoni]

On Mon, 22 Nov 2021 03:08:00 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

> Upstream changing to .tar.gz, prepare by dropping INADYN_SOURCE,
> as suggested by utils/check-package.
> 
> See the ChangeLog, or release notes at GitHub, for full details:
> https://github.com/troglobit/inadyn/releases/tag/v2.9.0
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> ---
>  package/inadyn/inadyn.hash | 4 ++--
>  package/inadyn/inadyn.mk   | 3 +--
>  2 files changed, 3 insertions(+), 4 deletions(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/5] package/inadyn: replace local systemd unit file with upstream

[Thomas Petazzoni]

On Mon, 22 Nov 2021 03:08:02 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

> If systemd is available at configure time, the inadyn configure script
> detects it and generates the unit file.
> 
> Also, the local unit file had the wrong absolute path to the binary.
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> ---
>  package/inadyn/inadyn.mk      |  2 +-
>  package/inadyn/inadyn.service | 10 ----------
>  2 files changed, 1 insertion(+), 11 deletions(-)
>  delete mode 100644 package/inadyn/inadyn.service

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/5] package/inadyn: refactor start script

[Thomas Petazzoni]

Hello Joachim,

On Mon, 22 Nov 2021 03:08:03 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

> This patch is a complete rewrite of the start script, reducing code
> duplication by using a helper cmd() function and adding support for:
> 
>  - INADYN_ARGS that can be overridden from /etc/default/inadyn
>  - reload command that sends SIGHUP
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Actually, for init script, we are now trying to use a common style and
construction for all, based on package/busybox/S01syslogd.

We don't want each init script of each package to be its own creative
work of art, but instead we prefer consistency.

It would actually be good to document this in the Buildroot manual.

Could you try to rework your init script according to
package/busybox/S01syslogd ?

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/5] package/inadyn: refactor start script

[Joachim Wiberg]

[-- Attachment #1.1.1: Type: text/plain, Size: 952 bytes --]

Hi Thomas!

On 12/4/21 11:15 PM, Thomas Petazzoni wrote:
> On Mon, 22 Nov 2021 03:08:03 +0100
> Joachim Wiberg <troglobit@gmail.com> wrote:
>> This patch is a complete rewrite of the start script, reducing code
>> duplication by using a helper cmd() function and adding support for:
>> [snip]
> Actually, for init script, we are now trying to use a common style and
> construction for all, based on package/busybox/S01syslogd.

Ah, I was actually wondering about that, couldn't find any info on it
though.

> We don't want each init script of each package to be its own creative
> work of art, but instead we prefer consistency.
Understandable.  That's good policy actually.

> It would actually be good to document this in the Buildroot manual.

I'll see if I can whip something up :)

> Could you try to rework your init script according to
> package/busybox/S01syslogd ?

Sure, no problem!


Best regards
 /Joachim



[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot