From a48c6c568570ceea33941f01b1788d6390e847a0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 00:21:22 +0100 Subject: [PATCH 01/16] changelog: finalise 1.3.0 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8043bac..02bdfdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -chiark-tcl (1.2.2~) unstable; urgency=medium +chiark-tcl (1.3.0) unstable; urgency=medium adns: * Fix IPv6 PTR (reverse) lookups, and compilation with GCC-8. @@ -16,7 +16,7 @@ chiark-tcl (1.2.2~) unstable; urgency=medium * Refer to $(BASE_DIR) rather than ../base/, making out-of-tree extentions a bit easier. - -- + -- Ian Jackson Sun, 19 Aug 2018 00:21:18 +0100 chiark-tcl (1.2.1) unstable; urgency=high -- 2.30.2 From e5a4c2b313a6da95627575e2935a00369e6bf7fb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 00:22:50 +0100 Subject: [PATCH 02/16] changelog: start 1.3.1 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 02bdfdc..4d4d3dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +chiark-tcl (1.3.1~) unstable; urgency=medium + + * + + -- + chiark-tcl (1.3.0) unstable; urgency=medium adns: -- 2.30.2 From 865177191a81628e0263aa03450cb1d9985961f2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 12:17:21 +0100 Subject: [PATCH 03/16] autopkgtests: Drop tcl8.7 which is only in experimental now. And finalise 1.3.1. Signed-off-by: Ian Jackson --- debian/changelog | 6 +++--- debian/rules | 2 +- debian/tests/adns--8.7 | 4 ---- debian/tests/cdb--8.7 | 4 ---- debian/tests/control | 18 ------------------ debian/tests/crypto--8.7 | 4 ---- debian/tests/dgram--8.7 | 4 ---- debian/tests/hbytes--8.7 | 4 ---- debian/tests/tuntap--8.7 | 4 ---- 9 files changed, 4 insertions(+), 46 deletions(-) delete mode 100755 debian/tests/adns--8.7 delete mode 100755 debian/tests/cdb--8.7 delete mode 100755 debian/tests/crypto--8.7 delete mode 100755 debian/tests/dgram--8.7 delete mode 100755 debian/tests/hbytes--8.7 delete mode 100755 debian/tests/tuntap--8.7 diff --git a/debian/changelog b/debian/changelog index 4d4d3dd..e955fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -chiark-tcl (1.3.1~) unstable; urgency=medium +chiark-tcl (1.3.1) unstable; urgency=medium - * + * autopkgtests: Drop tcl8.7 which is only in experimental now. - -- + -- Ian Jackson Sun, 19 Aug 2018 12:16:24 +0100 chiark-tcl (1.3.0) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index f065f68..566c7eb 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ docdir=usr/share/doc/$(docpackage) tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h)) tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh)) -tcl_versions= 8.5 8.6 8.7 +tcl_versions= 8.5 8.6 march := $(shell dpkg-architecture -q DEB_HOST_MULTIARCH) libsubdir = /$(march) diff --git a/debian/tests/adns--8.7 b/debian/tests/adns--8.7 deleted file mode 100755 index b830354..0000000 --- a/debian/tests/adns--8.7 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/tclsh8.7 -load chiark_tcl_adns-1.so -set t {adns/runtest.tcl} -if {[file exists $t]} { source $t } diff --git a/debian/tests/cdb--8.7 b/debian/tests/cdb--8.7 deleted file mode 100755 index 7ea7195..0000000 --- a/debian/tests/cdb--8.7 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/tclsh8.7 -load chiark_tcl_cdb-1.so -set t {cdb/runtest.tcl} -if {[file exists $t]} { source $t } diff --git a/debian/tests/control b/debian/tests/control index 6106485..92bc807 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -7,9 +7,6 @@ Depends: tcl8.5, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 Tests: adns--8.6 Depends: tcl8.6, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 -Tests: adns--8.7 -Depends: tcl8.7, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 - Tests: cdb--def Depends: tcl, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 @@ -19,9 +16,6 @@ Depends: tcl8.5, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 Tests: cdb--8.6 Depends: tcl8.6, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 -Tests: cdb--8.7 -Depends: tcl8.7, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 - Tests: crypto--def Depends: tcl, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 @@ -31,9 +25,6 @@ Depends: tcl8.5, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 Tests: crypto--8.6 Depends: tcl8.6, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 -Tests: crypto--8.7 -Depends: tcl8.7, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 - Tests: dgram--def Depends: tcl, libc6 (>= 2.14), libtcl-chiark-1 @@ -43,9 +34,6 @@ Depends: tcl8.5, libc6 (>= 2.14), libtcl-chiark-1 Tests: dgram--8.6 Depends: tcl8.6, libc6 (>= 2.14), libtcl-chiark-1 -Tests: dgram--8.7 -Depends: tcl8.7, libc6 (>= 2.14), libtcl-chiark-1 - Tests: hbytes--def Depends: tcl, libc6 (>= 2.14), libtcl-chiark-1 @@ -55,9 +43,6 @@ Depends: tcl8.5, libc6 (>= 2.14), libtcl-chiark-1 Tests: hbytes--8.6 Depends: tcl8.6, libc6 (>= 2.14), libtcl-chiark-1 -Tests: hbytes--8.7 -Depends: tcl8.7, libc6 (>= 2.14), libtcl-chiark-1 - Tests: tuntap--def Depends: tcl, libc6 (>= 2.2.5), libtcl-chiark-1 @@ -67,6 +52,3 @@ Depends: tcl8.5, libc6 (>= 2.2.5), libtcl-chiark-1 Tests: tuntap--8.6 Depends: tcl8.6, libc6 (>= 2.2.5), libtcl-chiark-1 -Tests: tuntap--8.7 -Depends: tcl8.7, libc6 (>= 2.2.5), libtcl-chiark-1 - diff --git a/debian/tests/crypto--8.7 b/debian/tests/crypto--8.7 deleted file mode 100755 index a9ed1f8..0000000 --- a/debian/tests/crypto--8.7 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/tclsh8.7 -load chiark_tcl_crypto-1.so -set t {crypto/runtest.tcl} -if {[file exists $t]} { source $t } diff --git a/debian/tests/dgram--8.7 b/debian/tests/dgram--8.7 deleted file mode 100755 index 4f1d375..0000000 --- a/debian/tests/dgram--8.7 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/tclsh8.7 -load chiark_tcl_dgram-1.so -set t {dgram/runtest.tcl} -if {[file exists $t]} { source $t } diff --git a/debian/tests/hbytes--8.7 b/debian/tests/hbytes--8.7 deleted file mode 100755 index 95e5d19..0000000 --- a/debian/tests/hbytes--8.7 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/tclsh8.7 -load chiark_tcl_hbytes-1.so -set t {hbytes/runtest.tcl} -if {[file exists $t]} { source $t } diff --git a/debian/tests/tuntap--8.7 b/debian/tests/tuntap--8.7 deleted file mode 100755 index 1f58f36..0000000 --- a/debian/tests/tuntap--8.7 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/tclsh8.7 -load chiark_tcl_tuntap-1.so -set t {tuntap/runtest.tcl} -if {[file exists $t]} { source $t } -- 2.30.2 From ebb65267f3b088609eefe4b786bb0ca71683b5a7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 12:18:32 +0100 Subject: [PATCH 04/16] changelog: start 1.3.2 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e955fa2..d1d8b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +chiark-tcl (1.3.2~) unstable; urgency=medium + + * + + -- + chiark-tcl (1.3.1) unstable; urgency=medium * autopkgtests: Drop tcl8.7 which is only in experimental now. -- 2.30.2 From ece622e57ef359d0e969b4dc326476b483fd484c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 14 Oct 2018 01:30:59 +0100 Subject: [PATCH 05/16] testing: Add skip-not-installable restriction to vsn-specific tests This way we can mention tcl versions which are not in the targeted suite. Signed-off-by: Ian Jackson --- debian/regenerate-autopkgtests | 4 ++++ debian/tests/control | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/regenerate-autopkgtests b/debian/regenerate-autopkgtests index 3213e22..dc465c3 100755 --- a/debian/regenerate-autopkgtests +++ b/debian/regenerate-autopkgtests @@ -25,6 +25,10 @@ for sv in */debian-substvars; do chmod +x $dt/$t echo >&4 "Tests: $t" sed "s/^shlibs:Depends=/Depends: tcl$v, /" >&4 $sv + case $v in + '') ;; + ?*) echo >&4 'Restrictions: skip-not-installable' ;; + esac echo >&4 done echo diff --git a/debian/tests/control b/debian/tests/control index 92bc807..c807ee9 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -3,52 +3,64 @@ Depends: tcl, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 Tests: adns--8.5 Depends: tcl8.5, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: adns--8.6 Depends: tcl8.6, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: cdb--def Depends: tcl, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 Tests: cdb--8.5 Depends: tcl8.5, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 +Restrictions: skip-not-installable Tests: cdb--8.6 Depends: tcl8.6, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 +Restrictions: skip-not-installable Tests: crypto--def Depends: tcl, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 Tests: crypto--8.5 Depends: tcl8.5, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Restrictions: skip-not-installable Tests: crypto--8.6 Depends: tcl8.6, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Restrictions: skip-not-installable Tests: dgram--def Depends: tcl, libc6 (>= 2.14), libtcl-chiark-1 Tests: dgram--8.5 Depends: tcl8.5, libc6 (>= 2.14), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: dgram--8.6 Depends: tcl8.6, libc6 (>= 2.14), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: hbytes--def Depends: tcl, libc6 (>= 2.14), libtcl-chiark-1 Tests: hbytes--8.5 Depends: tcl8.5, libc6 (>= 2.14), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: hbytes--8.6 Depends: tcl8.6, libc6 (>= 2.14), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: tuntap--def Depends: tcl, libc6 (>= 2.2.5), libtcl-chiark-1 Tests: tuntap--8.5 Depends: tcl8.5, libc6 (>= 2.2.5), libtcl-chiark-1 +Restrictions: skip-not-installable Tests: tuntap--8.6 Depends: tcl8.6, libc6 (>= 2.2.5), libtcl-chiark-1 +Restrictions: skip-not-installable -- 2.30.2 From 6eb360546024920e3f666e48bb0de3a035a028d6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 14 Oct 2018 01:32:22 +0100 Subject: [PATCH 06/16] testing: Add tcl 8.7 to list of versions for testing When tcl 8.7 appears, it will be tested. Signed-off-by: Ian Jackson --- debian/rules | 2 +- debian/tests/adns--8.7 | 4 ++++ debian/tests/cdb--8.7 | 4 ++++ debian/tests/control | 24 ++++++++++++++++++++++++ debian/tests/crypto--8.7 | 4 ++++ debian/tests/dgram--8.7 | 4 ++++ debian/tests/hbytes--8.7 | 4 ++++ debian/tests/tuntap--8.7 | 4 ++++ 8 files changed, 49 insertions(+), 1 deletion(-) create mode 100755 debian/tests/adns--8.7 create mode 100755 debian/tests/cdb--8.7 create mode 100755 debian/tests/crypto--8.7 create mode 100755 debian/tests/dgram--8.7 create mode 100755 debian/tests/hbytes--8.7 create mode 100755 debian/tests/tuntap--8.7 diff --git a/debian/rules b/debian/rules index 566c7eb..f065f68 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ docdir=usr/share/doc/$(docpackage) tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h)) tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh)) -tcl_versions= 8.5 8.6 +tcl_versions= 8.5 8.6 8.7 march := $(shell dpkg-architecture -q DEB_HOST_MULTIARCH) libsubdir = /$(march) diff --git a/debian/tests/adns--8.7 b/debian/tests/adns--8.7 new file mode 100755 index 0000000..b830354 --- /dev/null +++ b/debian/tests/adns--8.7 @@ -0,0 +1,4 @@ +#!/usr/bin/tclsh8.7 +load chiark_tcl_adns-1.so +set t {adns/runtest.tcl} +if {[file exists $t]} { source $t } diff --git a/debian/tests/cdb--8.7 b/debian/tests/cdb--8.7 new file mode 100755 index 0000000..7ea7195 --- /dev/null +++ b/debian/tests/cdb--8.7 @@ -0,0 +1,4 @@ +#!/usr/bin/tclsh8.7 +load chiark_tcl_cdb-1.so +set t {cdb/runtest.tcl} +if {[file exists $t]} { source $t } diff --git a/debian/tests/control b/debian/tests/control index c807ee9..785fa19 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -9,6 +9,10 @@ Tests: adns--8.6 Depends: tcl8.6, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 Restrictions: skip-not-installable +Tests: adns--8.7 +Depends: tcl8.7, libadns1 (>= 1.5.0~), libc6 (>= 2.2.5), libtcl-chiark-1 +Restrictions: skip-not-installable + Tests: cdb--def Depends: tcl, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 @@ -20,6 +24,10 @@ Tests: cdb--8.6 Depends: tcl8.6, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 Restrictions: skip-not-installable +Tests: cdb--8.7 +Depends: tcl8.7, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 +Restrictions: skip-not-installable + Tests: crypto--def Depends: tcl, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 @@ -31,6 +39,10 @@ Tests: crypto--8.6 Depends: tcl8.6, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 Restrictions: skip-not-installable +Tests: crypto--8.7 +Depends: tcl8.7, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Restrictions: skip-not-installable + Tests: dgram--def Depends: tcl, libc6 (>= 2.14), libtcl-chiark-1 @@ -42,6 +54,10 @@ Tests: dgram--8.6 Depends: tcl8.6, libc6 (>= 2.14), libtcl-chiark-1 Restrictions: skip-not-installable +Tests: dgram--8.7 +Depends: tcl8.7, libc6 (>= 2.14), libtcl-chiark-1 +Restrictions: skip-not-installable + Tests: hbytes--def Depends: tcl, libc6 (>= 2.14), libtcl-chiark-1 @@ -53,6 +69,10 @@ Tests: hbytes--8.6 Depends: tcl8.6, libc6 (>= 2.14), libtcl-chiark-1 Restrictions: skip-not-installable +Tests: hbytes--8.7 +Depends: tcl8.7, libc6 (>= 2.14), libtcl-chiark-1 +Restrictions: skip-not-installable + Tests: tuntap--def Depends: tcl, libc6 (>= 2.2.5), libtcl-chiark-1 @@ -64,3 +84,7 @@ Tests: tuntap--8.6 Depends: tcl8.6, libc6 (>= 2.2.5), libtcl-chiark-1 Restrictions: skip-not-installable +Tests: tuntap--8.7 +Depends: tcl8.7, libc6 (>= 2.2.5), libtcl-chiark-1 +Restrictions: skip-not-installable + diff --git a/debian/tests/crypto--8.7 b/debian/tests/crypto--8.7 new file mode 100755 index 0000000..a9ed1f8 --- /dev/null +++ b/debian/tests/crypto--8.7 @@ -0,0 +1,4 @@ +#!/usr/bin/tclsh8.7 +load chiark_tcl_crypto-1.so +set t {crypto/runtest.tcl} +if {[file exists $t]} { source $t } diff --git a/debian/tests/dgram--8.7 b/debian/tests/dgram--8.7 new file mode 100755 index 0000000..4f1d375 --- /dev/null +++ b/debian/tests/dgram--8.7 @@ -0,0 +1,4 @@ +#!/usr/bin/tclsh8.7 +load chiark_tcl_dgram-1.so +set t {dgram/runtest.tcl} +if {[file exists $t]} { source $t } diff --git a/debian/tests/hbytes--8.7 b/debian/tests/hbytes--8.7 new file mode 100755 index 0000000..95e5d19 --- /dev/null +++ b/debian/tests/hbytes--8.7 @@ -0,0 +1,4 @@ +#!/usr/bin/tclsh8.7 +load chiark_tcl_hbytes-1.so +set t {hbytes/runtest.tcl} +if {[file exists $t]} { source $t } diff --git a/debian/tests/tuntap--8.7 b/debian/tests/tuntap--8.7 new file mode 100755 index 0000000..1f58f36 --- /dev/null +++ b/debian/tests/tuntap--8.7 @@ -0,0 +1,4 @@ +#!/usr/bin/tclsh8.7 +load chiark_tcl_tuntap-1.so +set t {tuntap/runtest.tcl} +if {[file exists $t]} { source $t } -- 2.30.2 From 073d42ed287d96c105bd2e79333c5021bd43e210 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 14 Oct 2018 01:33:53 +0100 Subject: [PATCH 07/16] changelog: finalise 1.3.2 Signed-off-by: Ian Jackson --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1d8b6a..26d422a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -chiark-tcl (1.3.2~) unstable; urgency=medium +chiark-tcl (1.3.2) unstable; urgency=medium - * + * changelog: start 1.3.2 + * testing: Add skip-not-installable restriction to vsn-specific tests + * testing: Add tcl 8.7 to list of versions for testing - -- + -- Ian Jackson Sun, 14 Oct 2018 01:33:49 +0100 chiark-tcl (1.3.1) unstable; urgency=medium -- 2.30.2 From b450d5e4dfa83c0d0103a0cdf8b76aeb1aa827bf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 14 Oct 2018 01:36:11 +0100 Subject: [PATCH 08/16] changelog: start 1.3.3 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 26d422a..dee835b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +chiark-tcl (1.3.3~) unstable; urgency=medium + + * + + -- + chiark-tcl (1.3.2) unstable; urgency=medium * changelog: start 1.3.2 -- 2.30.2 From 071ce4c960a8ccdc1b8297e05cf6464c71f58494 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 17 Aug 2020 13:59:27 +0100 Subject: [PATCH 09/16] hbytes.h: Add a missing `extern' on a data declaration With GCC-10's changes to the default symbol resolution rules, the absence leads to this error: /usr/bin/ld: hbytes.o:/<>/hbytes/hbytes.h:251: multiple definition of `cht_ulong_type'; chop.o:/<>/hbytes/hbytes.h:251: first defined here (once per object file). Closes: 957087 Signed-off-by: Ian Jackson --- hbytes/hbytes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbytes/hbytes.h b/hbytes/hbytes.h index 0ed871c..2e5d658 100644 --- a/hbytes/hbytes.h +++ b/hbytes/hbytes.h @@ -248,7 +248,7 @@ extern Tcl_ObjType cht_addrmap_type; /* from ulong.c */ -Tcl_ObjType cht_ulong_type; +extern Tcl_ObjType cht_ulong_type; /* useful macros */ -- 2.30.2 From b082b4337321b27d80b4f7f81e2fdce5a97e982e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 17 Aug 2020 14:03:38 +0100 Subject: [PATCH 10/16] changelog: Docuemnt fix Signed-off-by: Ian Jackson --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dee835b..94a1df5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ chiark-tcl (1.3.3~) unstable; urgency=medium - * + * hbytes.h: Add a missing `extern' on a data declaration. + Fixes GCC-10 FTBFS. Closes:957087. -- -- 2.30.2 From 8fbe2f2feedefae19720b9af9dbd47d668bbe8c4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 17 Aug 2020 14:03:52 +0100 Subject: [PATCH 11/16] changelog: finalise 1.3.3 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94a1df5..5761d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -chiark-tcl (1.3.3~) unstable; urgency=medium +chiark-tcl (1.3.3) unstable; urgency=medium * hbytes.h: Add a missing `extern' on a data declaration. Fixes GCC-10 FTBFS. Closes:957087. - -- + -- Ian Jackson Mon, 17 Aug 2020 14:03:47 +0100 chiark-tcl (1.3.2) unstable; urgency=medium -- 2.30.2 From 96987c7c0f5d696cd9a56ae3f6835c82428ed57d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 17 Aug 2020 18:09:14 +0100 Subject: [PATCH 12/16] debian/tests/control: Update to libnettle8. Fixes DEP-8 failure. (Reran debian/rules debian/tests/control.) Signed-off-by: Ian Jackson --- debian/changelog | 7 +++++++ debian/tests/control | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5761d6b..4c69a64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +chiark-tcl (1.3.4) unstable; urgency=medium + + * debian/tests/control: Update to libnettle8. Fixes DEP-8 failure. + (Reran debian/rules debian/tests/control.) + + -- Ian Jackson Mon, 17 Aug 2020 18:09:07 +0100 + chiark-tcl (1.3.3) unstable; urgency=medium * hbytes.h: Add a missing `extern' on a data declaration. diff --git a/debian/tests/control b/debian/tests/control index 785fa19..a075529 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -29,18 +29,18 @@ Depends: tcl8.7, libc6 (>= 2.14), libcdb1, libtcl-chiark-1 Restrictions: skip-not-installable Tests: crypto--def -Depends: tcl, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Depends: tcl, libc6 (>= 2.14), libnettle8, libtcl-chiark-1 Tests: crypto--8.5 -Depends: tcl8.5, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Depends: tcl8.5, libc6 (>= 2.14), libnettle8, libtcl-chiark-1 Restrictions: skip-not-installable Tests: crypto--8.6 -Depends: tcl8.6, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Depends: tcl8.6, libc6 (>= 2.14), libnettle8, libtcl-chiark-1 Restrictions: skip-not-installable Tests: crypto--8.7 -Depends: tcl8.7, libc6 (>= 2.14), libnettle6, libtcl-chiark-1 +Depends: tcl8.7, libc6 (>= 2.14), libnettle8, libtcl-chiark-1 Restrictions: skip-not-installable Tests: dgram--def -- 2.30.2 From 020f536563e566c6a17eeb790d2a5e56141e2b74 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 20 Aug 2020 19:18:14 +0100 Subject: [PATCH 13/16] blockcipher_prep: Initialise out parameters to placate gcc These are all set on the success exit path but GCC is not clever enough to see this. Closes: #968734 Signed-off-by: Ian Jackson --- crypto/crypto.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/crypto/crypto.c b/crypto/crypto.c index aee2556..6efea24 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -252,6 +252,14 @@ static int blockcipher_prep(Tcl_Interp *ip, Tcl_Obj *key_obj, int rc; CiphKeyValue *key; + /* placate gcc, see Debian #968734 */ + *key_r= 0; + *sched_r= 0; + *iv_r= 0; + *iv_lenbytes_r= 0; + *buffers_r= 0; + *nblocks_r= 0; + if (data_len % alg->blocksize) return cht_staticerr(ip, "block cipher input not whole number of blocks", "HBYTES BLOCKCIPHER LENGTH"); -- 2.30.2 From 369536e1aaa22622ec15884c1db93af174278f6b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 23 Dec 2021 13:09:44 +0000 Subject: [PATCH 14/16] changelog: start 1.3.5 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4c69a64..07b1337 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +chiark-tcl (1.3.5~) unstable; urgency=medium + + * + + -- + chiark-tcl (1.3.4) unstable; urgency=medium * debian/tests/control: Update to libnettle8. Fixes DEP-8 failure. -- 2.30.2 From 5afd978079fb2f384b779de515f2d08aa2ece056 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 23 Dec 2021 13:14:32 +0000 Subject: [PATCH 15/16] debhelper: bump compat to 12 (latest in stretch-backports) I have checked with debdiff that nothing has changed, and skimread the upgrading checklist. Closes: #965452 Signed-off-by: Ian Jackson --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index 7ed6ff8..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +12 -- 2.30.2 From 07502bac772fcd0bd3bcb759567d65c934dfd3e6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 23 Dec 2021 13:27:05 +0000 Subject: [PATCH 16/16] changelog: finalise 1.3.5 Signed-off-by: Ian Jackson --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07b1337..70097b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -chiark-tcl (1.3.5~) unstable; urgency=medium +chiark-tcl (1.3.5) unstable; urgency=medium - * + * blockcipher_prep: Initialise parameters to placate gcc. Closes:#968734. + * debhelper: bump compat to 12. Closes:#965452. - -- + -- Ian Jackson Thu, 23 Dec 2021 13:26:53 +0000 chiark-tcl (1.3.4) unstable; urgency=medium -- 2.30.2