[ptxdist] [PATCH v3 1/7] chrony: version bump 3.3 -> 3.5

[ptxdist] [PATCH v3 1/7] chrony: version bump 3.3 -> 3.5

[Bruno Thomsen]

Added note about handwritten configure script.

Always enable ntp support as it does not require
extra dependencies.

Updated project URL in package help as sunsite.dk has
been renamed to dotsrc.org and have shutdown the general
project hosting part.

Replaced CROSS_AUTOCONF_USR as it adds 3 unrecognized
options and only add used options: localstatedir,
prefix and sysconfdir.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Add configure script note.
- Removed --enabled-ntp.
- Replaced CROSS_AUTOCONF_USR as it adds 3 unrecognized options and
  only add used options.

Changes since version 1:
- Fix typo in subject line.
- Updated URL in package help text.
- Explicit enable ntp option.
  This outputs unrecognized option, but we still get expected result.
  Unrecognized option :  --enable-ntp

 rules/chrony.in   |  2 +-
 rules/chrony.make | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rules/chrony.in b/rules/chrony.in
index ccdcb71d0..1f5e241c9 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -17,7 +17,7 @@ menuconfig CHRONY
 	  to chronyd for monitoring its performance and configuring
 	  various settings.
 
-	  See http://chrony.sunsite.dk/ for details
+	  See https://chrony.tuxfamily.org/ for details.
 
 if CHRONY
 
diff --git a/rules/chrony.make b/rules/chrony.make
index 61fe4a7fd..8c1034462 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony
 #
 # Paths and names
 #
-CHRONY_VERSION	:= 3.3
-CHRONY_MD5	:= 81ab62cf5d60b4b3fa8cd2c1b267ffd9
+CHRONY_VERSION	:= 3.5
+CHRONY_MD5	:= 5f66338bc940a9b51eede8f391e7bed3
 CHRONY		:= chrony-$(CHRONY_VERSION)
 CHRONY_SUFFIX	:= tar.gz
 CHRONY_URL	:= http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX)
@@ -32,11 +32,16 @@ CHRONY_LICENSE_FILES	:= \
 # ----------------------------------------------------------------------------
 
 #
-# autoconf
+# Chony is using a handcrafted configure script so normal ptx/endis
+# and ptx/wwo are broken and causes "Unrecognized option".
+# CROSS_AUTOCONF_USR is not used as that adds 3 unrecognized options:
+# --libdir=, --build=, --host=
 #
 CHRONY_CONF_TOOL	:= autoconf
 CHRONY_CONF_OPT		:= \
-	$(CROSS_AUTOCONF_USR) \
+	--localstatedir=/var \
+	--prefix=/usr \
+	--sysconfdir=/etc \
 	--disable-readline \
 	--without-editline \
 	--disable-sechash \
@@ -44,7 +49,6 @@ CHRONY_CONF_OPT		:= \
 	--without-nss \
 	--without-tomcrypt \
 	--disable-cmdmon \
-	--disable-ntp \
 	--disable-refclock \
 	--disable-phc \
 	--disable-pps \

base-commit: 6721ecdd3deb6e5839462086e9526d6f6c744cea
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 2/7] chrony: nettle authentication support

[Bruno Thomsen]

Use nettle crypto lib for stronger time packet
authentication support.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Go back to version 1 of patch.

Changes since version 1:
- Replace ptx/ifdef with ptx/endis and ptx/wwo for explicit options.
  This outputs unrecognized options, but we still get expected result.
  Unrecognized option :  --enable-sechash
  Unrecognized option :  --with-nettle

 rules/chrony.in   | 8 ++++++++
 rules/chrony.make | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rules/chrony.in b/rules/chrony.in
index 1f5e241c9..c81eba868 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -6,6 +6,7 @@ menuconfig CHRONY
 	prompt "chrony                        "
 	select LIBC_M
 	select LIBCAP
+	select NETTLE		if CHRONY_USE_NETTLE
 	help
 	  This will install the Chrony NTPD Daemon (chronyd)
 	  Chrony is a pair of programs which are used to maintain
@@ -21,6 +22,13 @@ menuconfig CHRONY
 
 if CHRONY
 
+config CHRONY_USE_NETTLE
+	bool
+	prompt "Use nettle crypto library"
+	help
+	  Use nettle crypto library for stronger keys than MD5 in
+	  NTP authentication.
+
 comment "install options   ---"
 
 config CHRONY_INSTALL_CHRONY_COMMAND
diff --git a/rules/chrony.make b/rules/chrony.make
index 8c1034462..9f20c413d 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -44,8 +44,8 @@ CHRONY_CONF_OPT		:= \
 	--sysconfdir=/etc \
 	--disable-readline \
 	--without-editline \
-	--disable-sechash \
-	--without-nettle \
+	$(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--disable-sechash) \
+	$(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--without-nettle) \
 	--without-nss \
 	--without-tomcrypt \
 	--disable-cmdmon \
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 3/7] chrony: systemd unit option

[Bruno Thomsen]

Install examples/chronyd.service from package as starting
point, it works great, otherwise use install_alternative.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Remove chronyd.service from projectroot
- Install chronyd.service in install stage.

Changes since version 1:
- Fix install_alternative statement for service file.
- Added chrony-3.5/examples/chronyd.service to projectroot.

 rules/chrony.in   |  7 +++++++
 rules/chrony.make | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/rules/chrony.in b/rules/chrony.in
index c81eba868..16b730199 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -95,6 +95,13 @@ endif
 config CHRONY_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/chrony"
 
+config CHRONY_SYSTEMD_UNIT
+	bool
+	default y
+	depends on INITMETHOD_SYSTEMD
+	prompt "install systemd unit files"
+
 endif
diff --git a/rules/chrony.make b/rules/chrony.make
index 9f20c413d..afdfe434a 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -55,6 +55,17 @@ CHRONY_CONF_OPT		:= \
 	$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6,,--disable-ipv6) \
 	--without-seccomp
 
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/chrony.install:
+	@$(call targetinfo)
+	@$(call world/install, CHRONY)
+	@install -D -m 644 $(CHRONY_DIR)/examples/chronyd.service \
+		$(CHRONY_PKGDIR)/usr/lib/systemd/system/chronyd.service
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -111,6 +122,13 @@ ifneq ($(call remove_quotes, $(PTXCONF_CHRONY_BBINIT_LINK)),)
 endif
 endif
 endif
+
+ifdef PTXCONF_CHRONY_SYSTEMD_UNIT
+	@$(call install_alternative, chrony, 0, 0, 0644, /usr/lib/systemd/system/chronyd.service)
+	@$(call install_link, chrony, ../chronyd.service, \
+		/usr/lib/systemd/system/multi-user.target.wants/chronyd.service)
+endif
+
 	@$(call install_finish, chrony)
 
 	@$(call touch)
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 4/7] passwd/group: added chrony UID/GID

[Bruno Thomsen]

Added chrony user id (UID) to /etc/passwd and
chrony group id (GID) to /etc/group using next
available numbers.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Changed UID/GID to (value on line above)++
- Updated User ID Info field from daemon name to package name.

No changes since version 1.

 projectroot/etc/group  | 1 +
 projectroot/etc/passwd | 1 +
 2 files changed, 2 insertions(+)

diff --git a/projectroot/etc/group b/projectroot/etc/group
index ad02970de..2de3bfd9f 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -31,4 +31,5 @@ systemd-journal-remote:x:203:
 systemd-journal-upload:x:208:
 render:x:209:
 pulse:x:210:
+chrony:x:211:
 nogroup:x:65534:
diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
index d15650b38..bd0cc6e7b 100644
--- a/projectroot/etc/passwd
+++ b/projectroot/etc/passwd
@@ -15,5 +15,6 @@ systemd-journal-gateway:x:206:206:systemd-journal-gateway:/dev/null:/bin/false
 systemd-journal-remote:x:207:203:systemd-journal-remote:/dev/null:/bin/false
 systemd-journal-upload:x:208:208:systemd-journal-upload:/dev/null:/bin/false
 pulse:x:209:210:pulse:/dev/null:/bin/false
+chrony:x:210:211:chrony:/dev/null:/bin/false
 rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
 nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 5/7] chrony: run chronyd as chrony user

[Bruno Thomsen]

Running service as non-root limits system exposure and it's
considered best practice when doing network communication.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Always run chrony daemon as chrony user.

No changes since version 1.

 rules/chrony.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/chrony.make b/rules/chrony.make
index afdfe434a..51141059c 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -53,6 +53,7 @@ CHRONY_CONF_OPT		:= \
 	--disable-phc \
 	--disable-pps \
 	$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6,,--disable-ipv6) \
+	--with-user=chrony \
 	--without-seccomp
 
 # ----------------------------------------------------------------------------
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 6/7] chrony: advanced monitoring command option

[Bruno Thomsen]

When you need to dig deep into NTP sync status.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
- Revert to ptx/ifdef from version 1 of patch.
- Minor help text update.

Changes since version 1:
- Fixed yoda style subject line.
- Replace ptx/ifdef with ptx/endis for explicit options.
  This outputs unrecognized options, but we still get expected result.
  Unrecognized option :  --disable-debug
  Unrecognized option :  --enable-cmdmon

 rules/chrony.in   | 7 +++++++
 rules/chrony.make | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/chrony.in b/rules/chrony.in
index 16b730199..e83013f68 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -29,6 +29,13 @@ config CHRONY_USE_NETTLE
 	  Use nettle crypto library for stronger keys than MD5 in
 	  NTP authentication.
 
+config CHRONY_ADVANCED_COMMAND
+	bool
+	prompt "Enable advanced monitoring command"
+	help
+	  This allows getting advanced NTP time synchronization
+	  status monitoring from the service.
+
 comment "install options   ---"
 
 config CHRONY_INSTALL_CHRONY_COMMAND
diff --git a/rules/chrony.make b/rules/chrony.make
index 51141059c..d28ff4d28 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -48,7 +48,8 @@ CHRONY_CONF_OPT		:= \
 	$(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--without-nettle) \
 	--without-nss \
 	--without-tomcrypt \
-	--disable-cmdmon \
+	$(call ptx/ifdef, PTXCONF_CHRONY_ADVANCED_COMMAND,,--disable-cmdmon) \
+	$(call ptx/ifdef, PTXCONF_CHRONY_ADVANCED_COMMAND,--enable-debug,) \
 	--disable-refclock \
 	--disable-phc \
 	--disable-pps \
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v3 7/7] chrony: make unrecognized configure options fatal

[Bruno Thomsen]

Add a little help for package maintainers to highlight
possible future issues.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
New in version 3:
- package patch: make the 'Unrecognized option' a fatal configure error.
- Michael feel free to drop this if I misunderstood how to do it :)

 ...ke-unrecognized-option-a-fatal-error.patch | 25 +++++++++++++++++++
 patches/chrony-3.5/series                     |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
 create mode 100644 patches/chrony-3.5/series

diff --git a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
new file mode 100644
index 000000000..01f213633
--- /dev/null
+++ b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
@@ -0,0 +1,25 @@
+From: Bruno Thomsen <bruno.thomsen@gmail.com>
+Date: Fri, 31 Jul 2020 09:07:49 +0000
+Subject: [PATCH] configure: make unrecognized option a fatal error
+
+This helps catch cases where options has been removed
+and are no longer valid. Including additional cross-build
+options that cannot be used.
+
+Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index 323f5743cd57..080f7bce746d 100755
+--- a/configure
++++ b/configure
+@@ -388,6 +388,7 @@ do
+     ;;
+     * )
+     echo "Unrecognized option : " $option
++    exit 1
+     esac
+ done
+ 
diff --git a/patches/chrony-3.5/series b/patches/chrony-3.5/series
new file mode 100644
index 000000000..501972558
--- /dev/null
+++ b/patches/chrony-3.5/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-configure-make-unrecognized-option-a-fatal-error.patch
+# c182e03aeda3f8c148ae51d52f839a6a  - git-ptx-patches magic
-- 
2.26.2

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v3 7/7] chrony: make unrecognized configure options fatal

[Michael Olbrich]

On Fri, Jul 31, 2020 at 06:11:41PM +0200, Bruno Thomsen wrote:
> Add a little help for package maintainers to highlight
> possible future issues.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
> New in version 3:
> - package patch: make the 'Unrecognized option' a fatal configure error.
> - Michael feel free to drop this if I misunderstood how to do it :)

This is exactly what I meant. Thank you.

Michael

>  ...ke-unrecognized-option-a-fatal-error.patch | 25 +++++++++++++++++++
>  patches/chrony-3.5/series                     |  4 +++
>  2 files changed, 29 insertions(+)
>  create mode 100644 patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
>  create mode 100644 patches/chrony-3.5/series
> 
> diff --git a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
> new file mode 100644
> index 000000000..01f213633
> --- /dev/null
> +++ b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
> @@ -0,0 +1,25 @@
> +From: Bruno Thomsen <bruno.thomsen@gmail.com>
> +Date: Fri, 31 Jul 2020 09:07:49 +0000
> +Subject: [PATCH] configure: make unrecognized option a fatal error
> +
> +This helps catch cases where options has been removed
> +and are no longer valid. Including additional cross-build
> +options that cannot be used.
> +
> +Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> +---
> + configure | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/configure b/configure
> +index 323f5743cd57..080f7bce746d 100755
> +--- a/configure
> ++++ b/configure
> +@@ -388,6 +388,7 @@ do
> +     ;;
> +     * )
> +     echo "Unrecognized option : " $option
> ++    exit 1
> +     esac
> + done
> + 
> diff --git a/patches/chrony-3.5/series b/patches/chrony-3.5/series
> new file mode 100644
> index 000000000..501972558
> --- /dev/null
> +++ b/patches/chrony-3.5/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-configure-make-unrecognized-option-a-fatal-error.patch
> +# c182e03aeda3f8c148ae51d52f839a6a  - git-ptx-patches magic
> -- 
> 2.26.2
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] chrony: version bump 3.3 -> 3.5

[Michael Olbrich]

Thanks, applied as 5fd26801a2a57313971f10f351149cf9ec421050.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:17 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Added note about handwritten configure script.
> 
> Always enable ntp support as it does not require
> extra dependencies.
> 
> Updated project URL in package help as sunsite.dk has
> been renamed to dotsrc.org and have shutdown the general
> project hosting part.
> 
> Replaced CROSS_AUTOCONF_USR as it adds 3 unrecognized
> options and only add used options: localstatedir,
> prefix and sysconfdir.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/chrony.in b/rules/chrony.in
> index ccdcb71d0087..1f5e241c9433 100644
> --- a/rules/chrony.in
> +++ b/rules/chrony.in
> @@ -17,7 +17,7 @@ menuconfig CHRONY
>  	  to chronyd for monitoring its performance and configuring
>  	  various settings.
>  
> -	  See http://chrony.sunsite.dk/ for details
> +	  See https://chrony.tuxfamily.org/ for details.
>  
>  if CHRONY
>  
> diff --git a/rules/chrony.make b/rules/chrony.make
> index 61fe4a7fde1e..8c1034462a0f 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony
>  #
>  # Paths and names
>  #
> -CHRONY_VERSION	:= 3.3
> -CHRONY_MD5	:= 81ab62cf5d60b4b3fa8cd2c1b267ffd9
> +CHRONY_VERSION	:= 3.5
> +CHRONY_MD5	:= 5f66338bc940a9b51eede8f391e7bed3
>  CHRONY		:= chrony-$(CHRONY_VERSION)
>  CHRONY_SUFFIX	:= tar.gz
>  CHRONY_URL	:= http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX)
> @@ -32,11 +32,16 @@ CHRONY_LICENSE_FILES	:= \
>  # ----------------------------------------------------------------------------
>  
>  #
> -# autoconf
> +# Chony is using a handcrafted configure script so normal ptx/endis
> +# and ptx/wwo are broken and causes "Unrecognized option".
> +# CROSS_AUTOCONF_USR is not used as that adds 3 unrecognized options:
> +# --libdir=, --build=, --host=
>  #
>  CHRONY_CONF_TOOL	:= autoconf
>  CHRONY_CONF_OPT		:= \
> -	$(CROSS_AUTOCONF_USR) \
> +	--localstatedir=/var \
> +	--prefix=/usr \
> +	--sysconfdir=/etc \
>  	--disable-readline \
>  	--without-editline \
>  	--disable-sechash \
> @@ -44,7 +49,6 @@ CHRONY_CONF_OPT		:= \
>  	--without-nss \
>  	--without-tomcrypt \
>  	--disable-cmdmon \
> -	--disable-ntp \
>  	--disable-refclock \
>  	--disable-phc \
>  	--disable-pps \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] chrony: systemd unit option

[Michael Olbrich]

Thanks, applied as 40fc445e7e967afec547138aed990904fbd793ef.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:18 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Install examples/chronyd.service from package as starting
> point, it works great, otherwise use install_alternative.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-3-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/chrony.in b/rules/chrony.in
> index e150448a84e9..44c12b423f06 100644
> --- a/rules/chrony.in
> +++ b/rules/chrony.in
> @@ -95,6 +95,13 @@ endif
>  config CHRONY_STARTSCRIPT
>  	bool
>  	default y
> +	depends on INITMETHOD_BBINIT
>  	prompt "install /etc/init.d/chrony"
>  
> +config CHRONY_SYSTEMD_UNIT
> +	bool
> +	default y
> +	depends on INITMETHOD_SYSTEMD
> +	prompt "install systemd unit files"
> +
>  endif
> diff --git a/rules/chrony.make b/rules/chrony.make
> index 9f20c413dff4..afdfe434ad0a 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -55,6 +55,17 @@ CHRONY_CONF_OPT		:= \
>  	$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6,,--disable-ipv6) \
>  	--without-seccomp
>  
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/chrony.install:
> +	@$(call targetinfo)
> +	@$(call world/install, CHRONY)
> +	@install -D -m 644 $(CHRONY_DIR)/examples/chronyd.service \
> +		$(CHRONY_PKGDIR)/usr/lib/systemd/system/chronyd.service
> +	@$(call touch)
> +
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> @@ -111,6 +122,13 @@ ifneq ($(call remove_quotes, $(PTXCONF_CHRONY_BBINIT_LINK)),)
>  endif
>  endif
>  endif
> +
> +ifdef PTXCONF_CHRONY_SYSTEMD_UNIT
> +	@$(call install_alternative, chrony, 0, 0, 0644, /usr/lib/systemd/system/chronyd.service)
> +	@$(call install_link, chrony, ../chronyd.service, \
> +		/usr/lib/systemd/system/multi-user.target.wants/chronyd.service)
> +endif
> +
>  	@$(call install_finish, chrony)
>  
>  	@$(call touch)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] chrony: nettle authentication support

[Michael Olbrich]

Thanks, applied as 0f6af4e9c20116629fa321e836cfa376619c433b.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:18 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Use nettle crypto lib for stronger time packet
> authentication support.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/chrony.in b/rules/chrony.in
> index 1f5e241c9433..e150448a84e9 100644
> --- a/rules/chrony.in
> +++ b/rules/chrony.in
> @@ -6,6 +6,7 @@ menuconfig CHRONY
>  	prompt "chrony                        "
>  	select LIBC_M
>  	select LIBCAP
> +	select NETTLE		if CHRONY_USE_NETTLE
>  	help
>  	  This will install the Chrony NTPD Daemon (chronyd)
>  	  Chrony is a pair of programs which are used to maintain
> @@ -21,6 +22,13 @@ menuconfig CHRONY
>  
>  if CHRONY
>  
> +config CHRONY_USE_NETTLE
> +	bool
> +	prompt "Use nettle crypto library"
> +	help
> +	  Use nettle crypto library for stronger keys than MD5 in
> +	  NTP authentication.
> +
>  comment "install options   ---"
>  
>  config CHRONY_INSTALL_CHRONY_COMMAND
> diff --git a/rules/chrony.make b/rules/chrony.make
> index 8c1034462a0f..9f20c413dff4 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -44,8 +44,8 @@ CHRONY_CONF_OPT		:= \
>  	--sysconfdir=/etc \
>  	--disable-readline \
>  	--without-editline \
> -	--disable-sechash \
> -	--without-nettle \
> +	$(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--disable-sechash) \
> +	$(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--without-nettle) \
>  	--without-nss \
>  	--without-tomcrypt \
>  	--disable-cmdmon \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] passwd/group: added chrony UID/GID

[Michael Olbrich]

Thanks, applied as 33a77b259dde94d87390c01f5a1dbb83053daf4c.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:19 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Added chrony user id (UID) to /etc/passwd and
> chrony group id (GID) to /etc/group using next
> available numbers.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-4-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/group b/projectroot/etc/group
> index ad02970de349..2de3bfd9f208 100644
> --- a/projectroot/etc/group
> +++ b/projectroot/etc/group
> @@ -31,4 +31,5 @@ systemd-journal-remote:x:203:
>  systemd-journal-upload:x:208:
>  render:x:209:
>  pulse:x:210:
> +chrony:x:211:
>  nogroup:x:65534:
> diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
> index d15650b38c52..bd0cc6e7ba61 100644
> --- a/projectroot/etc/passwd
> +++ b/projectroot/etc/passwd
> @@ -15,5 +15,6 @@ systemd-journal-gateway:x:206:206:systemd-journal-gateway:/dev/null:/bin/false
>  systemd-journal-remote:x:207:203:systemd-journal-remote:/dev/null:/bin/false
>  systemd-journal-upload:x:208:208:systemd-journal-upload:/dev/null:/bin/false
>  pulse:x:209:210:pulse:/dev/null:/bin/false
> +chrony:x:210:211:chrony:/dev/null:/bin/false
>  rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
>  nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] chrony: run chronyd as chrony user

[Michael Olbrich]

Thanks, applied as a1045bff1045a99c17f00ae017d58f6a0b7588fd.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:20 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Running service as non-root limits system exposure and it's
> considered best practice when doing network communication.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-5-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/chrony.make b/rules/chrony.make
> index afdfe434ad0a..51141059ccfd 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -53,6 +53,7 @@ CHRONY_CONF_OPT		:= \
>  	--disable-phc \
>  	--disable-pps \
>  	$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6,,--disable-ipv6) \
> +	--with-user=chrony \
>  	--without-seccomp
>  
>  # ----------------------------------------------------------------------------

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] chrony: advanced monitoring command option

[Michael Olbrich]

Thanks, applied as 25bfd9d1eeb0021e507095722dadac91a8b55c10.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:20 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> When you need to dig deep into NTP sync status.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-6-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/chrony.in b/rules/chrony.in
> index 44c12b423f06..2f906d2cec4a 100644
> --- a/rules/chrony.in
> +++ b/rules/chrony.in
> @@ -29,6 +29,13 @@ config CHRONY_USE_NETTLE
>  	  Use nettle crypto library for stronger keys than MD5 in
>  	  NTP authentication.
>  
> +config CHRONY_ADVANCED_COMMAND
> +	bool
> +	prompt "Enable advanced monitoring command"
> +	help
> +	  This allows getting advanced NTP time synchronization
> +	  status monitoring from the service.
> +
>  comment "install options   ---"
>  
>  config CHRONY_INSTALL_CHRONY_COMMAND
> diff --git a/rules/chrony.make b/rules/chrony.make
> index 51141059ccfd..4d6f58f3ba1e 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -48,7 +48,8 @@ CHRONY_CONF_OPT		:= \
>  	$(call ptx/ifdef, PTXCONF_CHRONY_USE_NETTLE,,--without-nettle) \
>  	--without-nss \
>  	--without-tomcrypt \
> -	--disable-cmdmon \
> +	$(call ptx/ifdef, PTXCONF_CHRONY_ADVANCED_COMMAND,,--disable-cmdmon) \
> +	$(call ptx/ifdef, PTXCONF_CHRONY_ADVANCED_COMMAND,--enable-debug,) \
>  	--disable-refclock \
>  	--disable-phc \
>  	--disable-pps \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] chrony: make unrecognized configure options fatal

[Michael Olbrich]

Thanks, applied as 65cf88b8d62d632c658336836ed091a6e22fc272.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:21 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Add a little help for package maintainers to highlight
> possible future issues.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200731161141.6155-7-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
> new file mode 100644
> index 000000000000..01f2136338b9
> --- /dev/null
> +++ b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch
> @@ -0,0 +1,25 @@
> +From: Bruno Thomsen <bruno.thomsen@gmail.com>
> +Date: Fri, 31 Jul 2020 09:07:49 +0000
> +Subject: [PATCH] configure: make unrecognized option a fatal error
> +
> +This helps catch cases where options has been removed
> +and are no longer valid. Including additional cross-build
> +options that cannot be used.
> +
> +Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> +---
> + configure | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/configure b/configure
> +index 323f5743cd57..080f7bce746d 100755
> +--- a/configure
> ++++ b/configure
> +@@ -388,6 +388,7 @@ do
> +     ;;
> +     * )
> +     echo "Unrecognized option : " $option
> ++    exit 1
> +     esac
> + done
> + 
> diff --git a/patches/chrony-3.5/series b/patches/chrony-3.5/series
> new file mode 100644
> index 000000000000..5019725586fd
> --- /dev/null
> +++ b/patches/chrony-3.5/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-configure-make-unrecognized-option-a-fatal-error.patch
> +# c182e03aeda3f8c148ae51d52f839a6a  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de