diff -Nru canl-c-3.0.0/debian/changelog canl-c-3.0.0/debian/changelog --- canl-c-3.0.0/debian/changelog 2022-12-17 15:20:41.000000000 +0000 +++ canl-c-3.0.0/debian/changelog 2024-03-01 16:16:40.000000000 +0000 @@ -1,3 +1,19 @@ +canl-c (3.0.0-5) unstable; urgency=medium + + * Set FORCE_SOURCE_DATE=1 during build + - pdflatex ignores SOURCE_DATE_EPOCH otherwise + * Enable bind-now hardening + * Correct spelling error reported by lintian (enought → enough) + + -- Mattias Ellert Fri, 01 Mar 2024 17:16:40 +0100 + +canl-c (3.0.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1062038 + + -- Steve Langasek Wed, 28 Feb 2024 05:42:18 +0000 + canl-c (3.0.0-4) unstable; urgency=medium * Convert debian/rules to dh tool diff -Nru canl-c-3.0.0/debian/compat canl-c-3.0.0/debian/compat --- canl-c-3.0.0/debian/compat 2021-08-21 18:09:55.000000000 +0000 +++ canl-c-3.0.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -13 diff -Nru canl-c-3.0.0/debian/control canl-c-3.0.0/debian/control --- canl-c-3.0.0/debian/control 2022-12-17 15:20:41.000000000 +0000 +++ canl-c-3.0.0/debian/control 2024-03-01 14:03:19.000000000 +0000 @@ -3,7 +3,8 @@ Priority: optional Maintainer: Mattias Ellert Build-Depends: - debhelper (>= 13), + debhelper-compat (= 13), + dpkg-dev (>= 1.22.5), bison, flex, libc-ares-dev, @@ -11,16 +12,19 @@ libssl-dev (>= 1.1), libtool, libtool-bin, - pkg-config, + pkgconf, texlive-fonts-recommended, texlive-latex-extra, texlive-latex-recommended -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/ellert/canl-c Vcs-Git: https://salsa.debian.org/ellert/canl-c.git Homepage: https://github.com/CESNET/canl-c -Package: libcanl-c4 +Package: libcanl-c4t64 +Provides: ${t64:Provides} +Replaces: libcanl-c4 +Breaks: libcanl-c4 (<< ${source:Version}) Section: libs Architecture: any Multi-Arch: same @@ -35,7 +39,7 @@ Architecture: any Multi-Arch: same Depends: - libcanl-c4 (= ${binary:Version}), + libcanl-c4t64 (= ${binary:Version}), libkrb5-dev, ${misc:Depends} Description: Development files for EMI caNl @@ -46,7 +50,7 @@ Architecture: any Multi-Arch: foreign Depends: - libcanl-c4 (= ${binary:Version}), + libcanl-c4t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Example programs of EMI caNl diff -Nru canl-c-3.0.0/debian/copyright canl-c-3.0.0/debian/copyright --- canl-c-3.0.0/debian/copyright 2022-12-17 15:20:41.000000000 +0000 +++ canl-c-3.0.0/debian/copyright 2024-03-01 14:01:42.000000000 +0000 @@ -26,7 +26,7 @@ PURPOSE. Files: debian/* -Copyright: 2013-2022 Mattias Ellert +Copyright: 2013-2024 Mattias Ellert License: Apache-2.0 License: Apache-2.0 diff -Nru canl-c-3.0.0/debian/libcanl-c4.install canl-c-3.0.0/debian/libcanl-c4.install --- canl-c-3.0.0/debian/libcanl-c4.install 2021-08-21 17:50:53.000000000 +0000 +++ canl-c-3.0.0/debian/libcanl-c4.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/lib/*/lib*.so.* diff -Nru canl-c-3.0.0/debian/libcanl-c4t64.install canl-c-3.0.0/debian/libcanl-c4t64.install --- canl-c-3.0.0/debian/libcanl-c4t64.install 1970-01-01 00:00:00.000000000 +0000 +++ canl-c-3.0.0/debian/libcanl-c4t64.install 2021-08-21 17:50:53.000000000 +0000 @@ -0,0 +1 @@ +/usr/lib/*/lib*.so.* diff -Nru canl-c-3.0.0/debian/libcanl-c4t64.lintian-overrides canl-c-3.0.0/debian/libcanl-c4t64.lintian-overrides --- canl-c-3.0.0/debian/libcanl-c4t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ canl-c-3.0.0/debian/libcanl-c4t64.lintian-overrides 2024-02-28 05:40:36.000000000 +0000 @@ -0,0 +1 @@ +libcanl-c4t64: package-name-doesnt-match-sonames libcanl-c4 diff -Nru canl-c-3.0.0/debian/patches/0001-Fix-spelling-of-enough.patch canl-c-3.0.0/debian/patches/0001-Fix-spelling-of-enough.patch --- canl-c-3.0.0/debian/patches/0001-Fix-spelling-of-enough.patch 1970-01-01 00:00:00.000000000 +0000 +++ canl-c-3.0.0/debian/patches/0001-Fix-spelling-of-enough.patch 2024-03-01 14:25:31.000000000 +0000 @@ -0,0 +1,39 @@ +From 7f0b149c1fed9a973a71521bc2f618e1e02b884f Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Fri, 1 Mar 2024 15:17:51 +0100 +Subject: [PATCH] Fix spelling of enough + +--- + src/canl_cert.c | 2 +- + src/canl_cred.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/canl_cert.c b/src/canl_cert.c +index dbdd2c3..fd4288e 100644 +--- a/src/canl_cert.c ++++ b/src/canl_cert.c +@@ -66,7 +66,7 @@ int do_set_ctx_own_cert_file(glb_ctx *cc, mech_glb_ctx *m_ctx, + m_ctx->cert_key = (cert_key_store *) calloc(1, + sizeof(*(m_ctx->cert_key))); + if (!m_ctx->cert_key) { +- return set_error(cc, ENOMEM, POSIX_ERROR, "not enought memory" ++ return set_error(cc, ENOMEM, POSIX_ERROR, "not enough memory" + " for the certificate storage"); + } + } +diff --git a/src/canl_cred.c b/src/canl_cred.c +index 4c30de4..eaa4fc5 100644 +--- a/src/canl_cred.c ++++ b/src/canl_cred.c +@@ -128,7 +128,7 @@ canl_ctx_set_cred(canl_ctx ctx, canl_cred cred) + m_ctx->cert_key = (cert_key_store *) calloc(1, + sizeof(*(m_ctx->cert_key))); + if (!m_ctx->cert_key) { +- return set_error(cc, ENOMEM, POSIX_ERROR, "not enought memory" ++ return set_error(cc, ENOMEM, POSIX_ERROR, "not enough memory" + " for the certificate storage"); + } + } +-- +2.43.2 + diff -Nru canl-c-3.0.0/debian/patches/0001-LaTeX-Warning-Label-s-cs-auth-conn-multiply-defined.patch canl-c-3.0.0/debian/patches/0001-LaTeX-Warning-Label-s-cs-auth-conn-multiply-defined.patch --- canl-c-3.0.0/debian/patches/0001-LaTeX-Warning-Label-s-cs-auth-conn-multiply-defined.patch 1970-01-01 00:00:00.000000000 +0000 +++ canl-c-3.0.0/debian/patches/0001-LaTeX-Warning-Label-s-cs-auth-conn-multiply-defined.patch 2024-03-01 16:13:19.000000000 +0000 @@ -0,0 +1,25 @@ +From f60401ed2e4dd131a35132949223e6833c3c4dfb Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Fri, 1 Mar 2024 17:08:47 +0100 +Subject: [PATCH] LaTeX Warning: Label `s:cs-auth-conn' multiply defined. + +--- + doc/src/canl-proxy-cert.tex | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/src/canl-proxy-cert.tex b/doc/src/canl-proxy-cert.tex +index 29d0dc1..b27d5e9 100644 +--- a/doc/src/canl-proxy-cert.tex ++++ b/doc/src/canl-proxy-cert.tex +@@ -17,7 +17,7 @@ + % -*- mode: latex -*- + + \section{Credentials Handling} +-\label{s:cs-auth-conn} ++\label{s:cred-handling} + + If we want to create new proxy certificate or \eg delegate + credentials, we can use \CANL \textit{Certificate API}. +-- +2.43.2 + diff -Nru canl-c-3.0.0/debian/patches/series canl-c-3.0.0/debian/patches/series --- canl-c-3.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ canl-c-3.0.0/debian/patches/series 2024-03-01 16:16:01.000000000 +0000 @@ -0,0 +1,5 @@ +# https://github.com/CESNET/canl-c/pull/11 +0001-Fix-spelling-of-enough.patch + +# https://github.com/CESNET/canl-c/pull/12 +0001-LaTeX-Warning-Label-s-cs-auth-conn-multiply-defined.patch diff -Nru canl-c-3.0.0/debian/rules canl-c-3.0.0/debian/rules --- canl-c-3.0.0/debian/rules 2022-12-17 15:20:41.000000000 +0000 +++ canl-c-3.0.0/debian/rules 2024-03-01 14:29:03.000000000 +0000 @@ -1,6 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow + %: dh $@ @@ -8,7 +10,7 @@ ./configure --root= --libdir=lib/$(DEB_HOST_MULTIARCH) override_dh_auto_build: - CFLAGS="$(CFLAGS) $(CPPFLAGS)" dh_auto_build + CFLAGS="$(CFLAGS) $(CPPFLAGS)" FORCE_SOURCE_DATE=1 dh_auto_build override_dh_auto_clean: $(MAKE) clean diff -Nru canl-c-3.0.0/debian/upstream/metadata canl-c-3.0.0/debian/upstream/metadata --- canl-c-3.0.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ canl-c-3.0.0/debian/upstream/metadata 2024-03-01 14:23:42.000000000 +0000 @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/CESNET/canl-c/issues +Bug-Submit: https://github.com/CESNET/canl-c/issues/new +Repository: https://github.com/CESNET/canl-c.git +Repository-Browse: https://github.com/CESNET/canl-c