to 5.2.2026 klo 15.29 Samuel Thibault ([email protected]) kirjoitti:
>
> Martin-Éric Racine, le jeu. 05 févr. 2026 14:46:36 +0200, a ecrit:
> > to 5.2.2026 klo 14.22 Samuel Thibault ([email protected]) kirjoitti:
> > > Martin-Éric Racine, le jeu. 05 févr. 2026 11:54:33 +0200, a ecrit:
> > > > Thiago gave me the go-ahead to upload an NMU for rdate. See attached
> > > > debdiff. Would that work for us? Any obvious gotcha I missed?
> > > >
> > > > +override_dh_install:
> > > > +     install -D -m 0644 debian/rdate-ntpdate.dhcp \
> > > > +                
> > > > debian/rdate-ntpdate/etc/dhcp/dhclient-exit-hooks.d/rdate-ntpdate
> > >
> > > That will work for dhcp-configured systems. For manually-configured
> > > system we'd also need an if-up.d script:
> >
> > In that case, we might as well replace the DHCP exit script with this
> > if-up.d script:
>
> That'd be simpler, yes, we'll just miss getting the dhcp-provided ntp
> server address, but better than nothing :)

The attached diff is what I would ship. No integration with
DHCP-provided NTP servers yet at this stage, but it would at least
allow us to discard the old ntpdate.

Martin-Éric
diff -Nru rdate-1.11/debian/changelog rdate-1.11/debian/changelog
--- rdate-1.11/debian/changelog 2023-01-31 14:40:46.000000000 +0200
+++ rdate-1.11/debian/changelog 2026-02-05 15:10:34.000000000 +0200
@@ -1,3 +1,14 @@
+rdate (1:1.11-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload, as per e-mail with Thiago on 2026-01-28.
+  * debian/control:
+    Add rdate-ntpdate package for if-up.d script (Closes: #1072978).
+  * debian/rules:
+    Add support for LFS flags.
+  * Run wrap-and-sort.
+
+ -- Martin-Éric Racine <[email protected]>  Thu, 05 Feb 2026 15:10:34 
+0200
+
 rdate (1:1.11-3) unstable; urgency=medium
 
   [ Thiago Andrade Marques ]
diff -Nru rdate-1.11/debian/control rdate-1.11/debian/control
--- rdate-1.11/debian/control   2023-01-31 14:35:50.000000000 +0200
+++ rdate-1.11/debian/control   2026-02-05 15:10:34.000000000 +0200
@@ -11,9 +11,9 @@
 
 Package: rdate
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: netstd
-Description: sets the system's date from a remote host with network time 
protocol
+Description: sets the system's date from a remote host with Network Time 
Protocol
  OpenRdate or openrdate or rdate displays and sets the local date and time from
  the host name or address given as the argument. The time source may be an RFC
  868 TCP protocol server, which is usually implemented as a built-in service of
@@ -25,6 +25,15 @@
 Package: rdate-udeb
 Section: debian-installer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Package-Type: udeb
 Description: sets the system's date from a remote host
+
+Package: rdate-ntpdate
+Architecture: all
+Depends: rdate, ${misc:Depends}, ${shlibs:Depends}
+Breaks: ntpdate (<< 1:4.2.8p15+dfsg-2~)
+Replaces: ntpdate (<< 1:4.2.8p15+dfsg-2~)
+Description: if-up.d script for rdate
+ This script calls rdate with the -n option to synchronize the local clock
+ with a remote NTP server upon successful interface configuration.
diff -Nru rdate-1.11/debian/copyright rdate-1.11/debian/copyright
--- rdate-1.11/debian/copyright 2023-01-31 14:37:47.000000000 +0200
+++ rdate-1.11/debian/copyright 2026-02-05 11:35:24.000000000 +0200
@@ -45,6 +45,7 @@
            2009      Cyril Brulebois
            2019      Joao Eriberto Mota Filho <[email protected]>
            2019-2023 Thiago Andrade Marques <[email protected]>
+           2026      Martin-Éric Racine <[email protected]>
 License: BSD-3-Clause
 
 License: BSD-4-Clause
diff -Nru rdate-1.11/debian/rdate-ntpdate.default 
rdate-1.11/debian/rdate-ntpdate.default
--- rdate-1.11/debian/rdate-ntpdate.default     1970-01-01 02:00:00.000000000 
+0200
+++ rdate-1.11/debian/rdate-ntpdate.default     2026-02-05 15:10:34.000000000 
+0200
@@ -0,0 +1,7 @@
+# These settings are used by the package rdate-ntpdate.
+
+# List the NTP server to use (rdate only accepts one).
+NTPSERVER=0.debian.pool.ntp.org
+
+# Options to pass to rdate. See rdate(8) for details.
+RDATEOPTIONS=""
diff -Nru rdate-1.11/debian/rdate-ntpdate.if-up 
rdate-1.11/debian/rdate-ntpdate.if-up
--- rdate-1.11/debian/rdate-ntpdate.if-up       1970-01-01 02:00:00.000000000 
+0200
+++ rdate-1.11/debian/rdate-ntpdate.if-up       2026-02-05 14:39:30.000000000 
+0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+. /etc/default/rdate-ntpdate
+case "$METHOD" in
+dhcp | static)
+       rdate -n $RDATEOPTIONS $NTPSERVER
+       ;;
+*)
+       exit 0
+       ;;
+esac
+#EOF
diff -Nru rdate-1.11/debian/rdate-ntpdate.README.Debian 
rdate-1.11/debian/rdate-ntpdate.README.Debian
--- rdate-1.11/debian/rdate-ntpdate.README.Debian       1970-01-01 
02:00:00.000000000 +0200
+++ rdate-1.11/debian/rdate-ntpdate.README.Debian       2026-02-05 
15:10:34.000000000 +0200
@@ -0,0 +1 @@
+The NTP server and rdate options are configured via /etc/default/rdate-ntpdate.
diff -Nru rdate-1.11/debian/rules rdate-1.11/debian/rules
--- rdate-1.11/debian/rules     2023-01-31 14:15:38.000000000 +0200
+++ rdate-1.11/debian/rules     2026-02-05 15:09:31.000000000 +0200
@@ -5,6 +5,10 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# Append flags for Long File Support (LFS)
+# LFS_CPPFLAGS does not exist
+export DEB_CFLAGS_MAINT_APPEND  +=$(shell getconf LFS_CFLAGS) 
$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND +=$(shell getconf LFS_LDFLAGS) 
$(HARDENING_LDFLAGS)
 
 %:
        dh $@

Reply via email to