Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package adjtimex [ the reason for the unblock ] It fixes a series bug #944867 that cannot work with latest ntpdate command. The patch is just to add an additional argument in ntpdate command line, confirmed to work. So the risk is quite limited. [ the debdiff against the package in testing is attached ]
diff -Nru adjtimex-1.29/debian/changelog adjtimex-1.29/debian/changelog --- adjtimex-1.29/debian/changelog 2018-07-25 19:29:50.000000000 +0900 +++ adjtimex-1.29/debian/changelog 2021-04-28 00:11:49.000000000 +0900 @@ -1,3 +1,14 @@ +adjtimex (1.29-11) unstable; urgency=medium + + * debian/patches: + - Add patch to fix ntpdate command (Closes: #944867). + * debian/control: + - Use my debian email. + - Move Vcs-* to salsa. + - Add Rules-Requires-Root: no + + -- Roger Shimizu <r...@debian.org> Wed, 28 Apr 2021 00:11:49 +0900 + adjtimex (1.29-10) unstable; urgency=medium * debian/patches: diff -Nru adjtimex-1.29/debian/control adjtimex-1.29/debian/control --- adjtimex-1.29/debian/control 2018-07-24 18:50:56.000000000 +0900 +++ adjtimex-1.29/debian/control 2021-04-28 00:11:49.000000000 +0900 @@ -1,14 +1,15 @@ Source: adjtimex Section: admin Priority: optional -Maintainer: Roger Shimizu <rogershim...@gmail.com> +Maintainer: Roger Shimizu <r...@debian.org> Build-Depends: debhelper (>= 10), po-debconf Standards-Version: 3.9.8 +Rules-Requires-Root: no Homepage: http://metalab.unc.edu/pub/Linux/system/admin/time -Vcs-Git: https://github.com/rogers0/adjtimex.git -Vcs-Browser: https://github.com/rogers0/adjtimex +Vcs-Git: https://salsa.debian.org/debian/adjtimex.git +Vcs-Browser: https://salsa.debian.org/debian/adjtimex Package: adjtimex Architecture: linux-any diff -Nru adjtimex-1.29/debian/patches/11-Fix-ntpdate-command.patch adjtimex-1.29/debian/patches/11-Fix-ntpdate-command.patch --- adjtimex-1.29/debian/patches/11-Fix-ntpdate-command.patch 1970-01-01 09:00:00.000000000 +0900 +++ adjtimex-1.29/debian/patches/11-Fix-ntpdate-command.patch 2021-04-28 00:11:49.000000000 +0900 @@ -0,0 +1,25 @@ +From: Roger Shimizu <r...@debian.org> +Date: Mon, 26 Apr 2021 02:49:16 +0900 +Subject: Fix ntpdate command + +Add option "-p4" to ntpdate command due to: +* http://bugs.debian.org/987625 + +Closes: #944867 +--- + adjtimex.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/adjtimex.c b/adjtimex.c +index 692b722..7699fe5 100644 +--- a/adjtimex.c ++++ b/adjtimex.c +@@ -1424,7 +1424,7 @@ static void log_times() + failntpdate("cannot find ntpdate"); + + found_ntpdate: +- sprintf(command, "%s -q -d %.32s ", paths[i], timeserver); ++ sprintf(command, "%s -q -p4 -d %.32s ", paths[i], timeserver); + ifile = popen(command, "r"); + + if (ifile == NULL) diff -Nru adjtimex-1.29/debian/patches/series adjtimex-1.29/debian/patches/series --- adjtimex-1.29/debian/patches/series 2018-07-25 19:29:50.000000000 +0900 +++ adjtimex-1.29/debian/patches/series 2021-04-28 00:11:49.000000000 +0900 @@ -8,3 +8,4 @@ 08-FTCBFS-uses-the-build-architecture-compiler.patch 09-adjtimex.8-Some-fixes-to-the-manual.patch 10-STA_NANO-confuses-adjtimex-8.patch +11-Fix-ntpdate-command.patch
