From 1b94313ee90a030910908f83aa94a2e72407974d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:21:06 +0100 Subject: [PATCH 01/16] Debian: Set source format to 3.0 (native) Signed-off-by: Ian Jackson --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- 2.30.2 From 00f1224eca27b9818abcfc087a2baf9e36042f66 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:26:25 +0100 Subject: [PATCH 02/16] Debian: Add Vcs-* fields. Signed-off-by: Ian Jackson --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index d2c3b70..6135473 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Ian Jackson Build-Depends: libx11-dev, libxmu-dev, nettle-dev, debhelper (>= 13), libxdmcp-dev, libxau-dev, libice-dev, libsm-dev, libuv1-dev Standards-Version: 3.9.1 +Vcs-Browser: https://www.chiark.greenend.org.uk/ucgi/~ian/git/chiark-utils.git/ +Vcs-Git: https://www.chiark.greenend.org.uk/ucgi/~ian/githttp/chiark-utils.git Package: chiark-backup Section: utils -- 2.30.2 From 2d93f9b183d7681cfd14e03b9b75d9bbbd0dc4d7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:37:45 +0100 Subject: [PATCH 03/16] Debian: Update Standards-Version I have reviewed the checklist. No further changes needed. Signed-off-by: Ian Jackson --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6135473..a9b7ac0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ian Jackson Build-Depends: libx11-dev, libxmu-dev, nettle-dev, debhelper (>= 13), libxdmcp-dev, libxau-dev, libice-dev, libsm-dev, libuv1-dev -Standards-Version: 3.9.1 +Standards-Version: 4.6.1.1 Vcs-Browser: https://www.chiark.greenend.org.uk/ucgi/~ian/git/chiark-utils.git/ Vcs-Git: https://www.chiark.greenend.org.uk/ucgi/~ian/githttp/chiark-utils.git -- 2.30.2 From d2c6a8f7572670fc7c05c86c2b820386af854d11 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:39:33 +0100 Subject: [PATCH 04/16] timespeccmp.h: Move use to just cgi-fcgi-interp Signed-off-by: Ian Jackson --- cprogs/cgi-fcgi-interp.c | 1 + cprogs/prefork.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cprogs/cgi-fcgi-interp.c b/cprogs/cgi-fcgi-interp.c index 2de4661..6ea886e 100644 --- a/cprogs/cgi-fcgi-interp.c +++ b/cprogs/cgi-fcgi-interp.c @@ -128,6 +128,7 @@ */ #include "prefork.h" +#include "timespeccmp.h" #define STAGE2_VAR "CHIARKUTILS_CGIFCGIINTERP_STAGE2" diff --git a/cprogs/prefork.h b/cprogs/prefork.h index eaaf172..49b4d90 100644 --- a/cprogs/prefork.h +++ b/cprogs/prefork.h @@ -35,7 +35,6 @@ #include #include "myopt.h" -#include "timespeccmp.h" #define MINHEXHASH 33 -- 2.30.2 From 02f99ce5167512d9bf163f4577d56cfc76a7c817 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:41:38 +0100 Subject: [PATCH 05/16] Debian: run dh_lintian Signed-off-by: Ian Jackson --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index a4c3f6c..695bb68 100755 --- a/debian/rules +++ b/debian/rules @@ -109,6 +109,7 @@ binary-one: cp debian/$p/$$f $t/$p/DEBIAN/$$f; \ chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \ done + dh_lintian -p$p -Pdebian/tmp/$p dh_link -p$p -Pdebian/tmp/$p dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p chown -R root.root debian/tmp -- 2.30.2 From bf6077c027c2f91cf72552887eb485831a469338 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:42:56 +0100 Subject: [PATCH 06/16] acctdump: Fix manual page section Signed-off-by: Ian Jackson --- cprogs/acctdump.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cprogs/acctdump.8 b/cprogs/acctdump.8 index 9a93f4b..d76ad6f 100644 --- a/cprogs/acctdump.8 +++ b/cprogs/acctdump.8 @@ -1,4 +1,4 @@ -.TH acctdump 1 2014-10-06 chiark-utils-bin +.TH acctdump 8 2014-10-06 chiark-utils-bin .SH NAME acctdump \- accounting data dump utility .SH SYNOPSIS -- 2.30.2 From 19722ba42f13ae644483c9fb26b01897e05e825c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:48:38 +0100 Subject: [PATCH 07/16] Debian: fix lintian overrides syntax Signed-off-by: Ian Jackson --- debian/chiark-really.lintian-overrides | 2 +- debian/chiark-scripts.lintian-overrides | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/chiark-really.lintian-overrides b/debian/chiark-really.lintian-overrides index 4a4f0ca..bce6ebb 100644 --- a/debian/chiark-really.lintian-overrides +++ b/debian/chiark-really.lintian-overrides @@ -1,2 +1,2 @@ # This is the point of this binary package. -chiark-really binary: setuid-binary usr/sbin/really 4754 root/root +setuid-binary usr/sbin/really 4754 root/root diff --git a/debian/chiark-scripts.lintian-overrides b/debian/chiark-scripts.lintian-overrides index 1d951fe..766c2d0 100644 --- a/debian/chiark-scripts.lintian-overrides +++ b/debian/chiark-scripts.lintian-overrides @@ -1,3 +1,3 @@ # Python 3 is needed for fishdescriptor; this is documented in # the Description and in the Suggests. -chiark-scripts binary: python-package-missing-depends-on-python +python-package-missing-depends-on-python -- 2.30.2 From 5e02da177a2fd4b896a15e566ade12446ddca05b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2022 23:58:05 +0100 Subject: [PATCH 08/16] changelog: Document packaging fixes Signed-off-by: Ian Jackson --- debian/changelog | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 90860dd..f9aff17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,19 @@ chiark-utils (6.1.3~iwj2) unstable; urgency=medium * prefork-interp, Proc::Prefork::Interp: new facility - + * acctdump: Fix manual page section + + Packaging improvements: + * copyright: Be clear that SPDX indications are licence grants + * Add lintian override for python dependency + * Add lintian override for chiark-really + * fix priority "extra" to "optional" + * Fix build-dependency on debhelper. + * Set source format to 3.0 (native) + * Add Vcs-* fields. + * Update Standards-Version + * timespeccmp.h: Move use to just cgi-fcgi-interp + -- Ian Jackson Sun, 21 Aug 2022 16:23:59 +0100 chiark-utils (6.1.3~iwj1) unstable; urgency=medium -- 2.30.2 From 40e630651ffb449cfa3ca01c10312481d42c48f1 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 21 Aug 2022 23:59:59 +0100 Subject: [PATCH 09/16] cprogs: Cross-build (by building with dh_auto_build) Signed-off-by: Ian Jackson --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 695bb68..403c728 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ makebuildargs := OPTIMISE= DEBUG= \ build: $(checkdir) set -e; for s in $(subdirs_build_arch); do \ - $(MAKE) -C $$s all $(makebuildargs); \ + dh_auto_build --sourcedirectory=$$s -- all $(makebuildargs); \ done touch build -- 2.30.2 From ba128ad2fb3e4502b6dc4f17b913f2b27c5bbd4a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Aug 2022 00:00:48 +0100 Subject: [PATCH 10/16] changelog: bump version Closes: #951242 Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f9aff17..a91d25e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -chiark-utils (6.1.3~iwj2) unstable; urgency=medium +chiark-utils (6.1.3~iwj3) unstable; urgency=medium * prefork-interp, Proc::Prefork::Interp: new facility * acctdump: Fix manual page section -- 2.30.2 From c076560e3cd3b539584ece2e9258a581e5eb0dae Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Aug 2022 00:07:33 +0100 Subject: [PATCH 11/16] Update hexterm to #! and Suggest tcl8.6. Closes: #905474 Signed-off-by: Ian Jackson --- debian/changelog | 5 +++-- debian/control | 4 ++-- scripts/hexterm | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a91d25e..64ccaba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ chiark-utils (6.1.3~iwj3) unstable; urgency=medium * Add Vcs-* fields. * Update Standards-Version * timespeccmp.h: Move use to just cgi-fcgi-interp - - -- Ian Jackson Sun, 21 Aug 2022 16:23:59 +0100 + * Update hexterm to #! and Suggest tcl8.6. Closes: #905474. + + -- Ian Jackson Mon, 22 Aug 2022 00:06:57 +0100 chiark-utils (6.1.3~iwj1) unstable; urgency=medium diff --git a/debian/control b/debian/control index a9b7ac0..38c178f 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Conflicts: chiark-named-conf, sync-accounts Replaces: chiark-named-conf, sync-accounts Depends: ${misc:Depends}, libgit-wrapper-perl, libtry-tiny-perl Recommends: libdatetime-format-strptime-perl, libio-fdpass-perl -Suggests: tcl8.4, python3, gdb +Suggests: tcl8.6, python3, gdb Architecture: all Description: chiark system administration scripts This package contains a number of small administration scripts used @@ -70,7 +70,7 @@ Description: chiark system administration scripts . hexterm: connects to serial port and allows the user interact in ASCII and hex. Ie, a hex "terminal" program which lets you speak a - serial port protocol directly. (Needs tcl8.4 to be installed.) + serial port protocol directly. (Needs tcl8.6 to be installed.) . git-branchmove, random-word, remountresizereiserfs, summarise-mailbox-preserving-privacy diff --git a/scripts/hexterm b/scripts/hexterm index 9a1b047..a4458f6 100755 --- a/scripts/hexterm +++ b/scripts/hexterm @@ -1,4 +1,4 @@ -#!/usr/bin/tclsh8.4 +#!/usr/bin/tclsh8.6 set comment { # Use of the screen: -- 2.30.2 From b31961768898177b811dfb464db6be686a458e13 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Aug 2022 00:13:51 +0100 Subject: [PATCH 12/16] install git-branchmove manpage Closes: #946364 Reported-by: Sean Whitton Signed-off-by: Ian Jackson --- .gitignore | 2 ++ scripts/Makefile | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e58e078..6eeaa10 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,8 @@ cprogs/cgi-fcgi-interp.txt cprogs/prefork-interp cprogs/prefork-interp.txt +scripts/git-branchmove.1 + debian/tmp debian/sv-* debian/files diff --git a/scripts/Makefile b/scripts/Makefile index a521265..68c89b4 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -26,7 +26,8 @@ SCRIPTS= palm-datebook-reminders random-word expire-iso8601 \ cvs-repomove cvs-adjustroot remountresizereiserfs \ hexterm summarise-mailbox-preserving-privacy \ git-cache-proxy git-branchmove nntpid -MANPAGES1= palm-datebook-reminders + +MANPAGES1= palm-datebook-reminders git-branchmove CSCRIPTS= named-conf CMANPAGES8= named-conf @@ -46,16 +47,20 @@ install: $(INSTALL_SHARE) $$f.pm $(perl5dir)/$$f.pm; done -install-docs: +install-docs: $(addsuffix .1,$(MANPAGES1)) $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) set -e; for f in $(MANPAGES1); do \ $(INSTALL_SHARE) $$f.1 $(man1dir)/$$f.1; done set -e; for f in $(CMANPAGES8); do \ $(INSTALL_SHARE) $$f.8 $(man8dir)/chiark-$$f.8; done +git-branchmove.1: git-branchmove + pod2man git-branchmove >git-branchmove.1 + install-examples: clean: rm -f *~ ./#*# + rm -f git-branchmove.1 distclean realclean: clean -- 2.30.2 From 8d61d6b90b92985194b129def7458ac5a0e8e58f Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Mon, 22 Aug 2022 00:16:46 +0100 Subject: [PATCH 13/16] git-cache-proxy: fix compat bug with recent git Closes: #1006695 Signed-off-by: Ian Jackson --- scripts/git-cache-proxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy index 62fb95f..2d80cb1 100755 --- a/scripts/git-cache-proxy +++ b/scripts/git-cache-proxy @@ -260,7 +260,7 @@ sub readcommand () { fail "Bad hex in packet length" unless $hex_len =~ m|^[0-9a-fA-F]{4}$|; my $line = xread -4 + hex $hex_len; unless (($service,$specpath,$spechost) = $line =~ - m|^(git-[a-z-]+) /*([!-~ ]+)\0host=([!-~]+)\0$|) { + m|^(git-[a-z-]+) /*([!-~ ]+)\0host=([!-~]+)\0|) { $line =~ s|[^ -~]+| |g; gitfail "unknown/unsupported instruction `$line'" } -- 2.30.2 From 66e132064980847f85b34316572137f398843914 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Aug 2022 00:25:32 +0100 Subject: [PATCH 14/16] changelog: tidy for recent changes Signed-off-by: Ian Jackson --- debian/changelog | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64ccaba..0ebb376 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,19 @@ chiark-utils (6.1.3~iwj3) unstable; urgency=medium + New facility: * prefork-interp, Proc::Prefork::Interp: new facility - * acctdump: Fix manual page section - Packaging improvements: + Improvements: + * expire-iso8601: Replace with new implementation. Closes:#862897. + + Bugfixes: + * acctdump: Fix manual page section. + * git-cache-proxy: fix for new git. Closes: #1006695. [Anthony Perard] + * git-branchmove: install manpage.. Closes: #946364. [Sean Whitton] + * hexterm: Update #! and Suggest tcl8.6. Closes: #905474. + + Build and packaging improvements: + * Fix cross build. Closes: #951242. [Helmut Grohne] * copyright: Be clear that SPDX indications are licence grants * Add lintian override for python dependency * Add lintian override for chiark-really @@ -13,13 +23,11 @@ chiark-utils (6.1.3~iwj3) unstable; urgency=medium * Add Vcs-* fields. * Update Standards-Version * timespeccmp.h: Move use to just cgi-fcgi-interp - * Update hexterm to #! and Suggest tcl8.6. Closes: #905474. -- Ian Jackson Mon, 22 Aug 2022 00:06:57 +0100 chiark-utils (6.1.3~iwj1) unstable; urgency=medium - * expire-iso8601: Replace with new implementation. Closes:#862897. -- Ian Jackson Wed, 19 Aug 2020 22:36:09 +0100 -- 2.30.2 From 310750eda00f8825bcde2f4f7cbd786a9f81fe01 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Aug 2022 00:26:12 +0100 Subject: [PATCH 15/16] changelog: finalise 7.0.0 Signed-off-by: Ian Jackson --- debian/changelog | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ebb376..e9c88f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -chiark-utils (6.1.3~iwj3) unstable; urgency=medium +chiark-utils (7.0.0) unstable; urgency=medium New facility: * prefork-interp, Proc::Prefork::Interp: new facility @@ -26,11 +26,6 @@ chiark-utils (6.1.3~iwj3) unstable; urgency=medium -- Ian Jackson Mon, 22 Aug 2022 00:06:57 +0100 -chiark-utils (6.1.3~iwj1) unstable; urgency=medium - - - -- Ian Jackson Wed, 19 Aug 2020 22:36:09 +0100 - chiark-utils (6.1.2+nmu1) unstable; urgency=medium * Non-maintainer upload. -- 2.30.2 From 73d2c9bdddd480c5782448596bb7c21f09bf80b7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Aug 2022 19:08:42 +0100 Subject: [PATCH 16/16] Bump version to 7.0.1~iwj0 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e9c88f7..5213fa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +chiark-utils (7.0.1~iwj0) unstable; urgency=medium + + * + + -- + chiark-utils (7.0.0) unstable; urgency=medium New facility: -- 2.30.2