diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 27 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch | 6 | ||||
| -rw-r--r-- | debian/patches/Generate-X.509-version-3-CA-in-testsuite.patch | 31 | ||||
| -rw-r--r-- | debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch | 2 | ||||
| -rw-r--r-- | debian/patches/Skip-randomized-tests.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/tests-Use-openssl-rehash-instead-of-c_rehash.patch | 28 | ||||
| -rw-r--r-- | debian/tests/control | 8 |
9 files changed, 71 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index de9b536..4f25bb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +interimap (0.5.8-2) unstable; urgency=medium + + [ Sebastian Andrzej Siewior ] + * d/patches: Add patch to use "openssl rehash" instead of c_rehash in tests. + (Closes: #1117508) + + -- Guilhem Moulin <guilhem@debian.org> Tue, 07 Oct 2025 19:25:28 +0200 + +interimap (0.5.8-1) unstable; urgency=medium + + * New upstream release. + * Refresh d/patches and drop those applied upstream. + * d/control, d/tests: Bump minimum dovecot-* version to 1:2.4~. Dovecot 2.4 + uses different configuration settings and that's what is targeted in the + testsuite of interimap ≥5.0.8. + * Update Standards-Version to 4.7.2. + + -- Guilhem Moulin <guilhem@debian.org> Sat, 26 Apr 2025 18:34:23 +0200 + +interimap (0.5.7-4) unstable; urgency=medium + + * d/rules: Export variables instead of setting them through $MAKEFLAGS as + the latter doesn't work anymore as of GNU Make 4.4.1. (Closes: #1089264) + * d/*.install: Replace hardcoded prefix and sitelib with ${env:…}. + + -- Guilhem Moulin <guilhem@debian.org> Fri, 20 Dec 2024 15:34:50 +0100 + interimap (0.5.7-3) unstable; urgency=medium * d/patches: diff --git a/debian/control b/debian/control index f77699e..816afba 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,19 @@ Section: mail Priority: optional Maintainer: Guilhem Moulin <guilhem@debian.org> Build-Depends: debhelper-compat (= 13), - dovecot-imapd (>= 1:2.3~) <!nocheck>, - dovecot-lmtpd (>= 1:2~) <!nocheck>, + dovecot-imapd (>= 1:2.4~) <!nocheck>, + dovecot-lmtpd (>= 1:2.4~) <!nocheck>, jq <!nodoc>, libconfig-tiny-perl <!nocheck>, libdbd-sqlite3-perl <!nocheck>, libnet-ssleay-perl (>= 1.88~) <!nocheck>, - openssl (>= 1.1.1~) <!nocheck>, + openssl (>= 3.0~) <!nocheck>, pandoc (>= 2.1~) <!nodoc>, procps <!nocheck>, sqlite3 <!nocheck>, xxd <!nocheck> Rules-Requires-Root: no -Standards-Version: 4.7.0 +Standards-Version: 4.7.2 Homepage: https://guilhem.org/interimap Vcs-Git: https://salsa.debian.org/debian/interimap.git -b debian/latest Vcs-Browser: https://salsa.debian.org/debian/interimap diff --git a/debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch b/debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch index 460672f..886e871 100644 --- a/debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch +++ b/debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch @@ -12,7 +12,7 @@ Bug-Debian: https://bugs.debian.org/1067763 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm -index 55a18a0..7824988 100644 +index 10162c7..699f58d 100644 --- a/lib/Net/IMAP/InterIMAP.pm +++ b/lib/Net/IMAP/InterIMAP.pm @@ -23,6 +23,7 @@ use strict; @@ -36,7 +36,7 @@ index 55a18a0..7824988 100644 or $self->fail("setsockopt SO_RCVTIMEO: $!"); setsockopt($s, Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, $timeout) diff --git a/pullimap b/pullimap -index 8be78da..1964c63 100755 +index d4aebf9..68dfd96 100755 --- a/pullimap +++ b/pullimap @@ -31,6 +31,8 @@ use Getopt::Long qw/:config posix_default no_ignore_case gnu_getopt auto_version @@ -46,7 +46,7 @@ index 8be78da..1964c63 100755 +use Config; + use lib "./lib"; - use Net::IMAP::InterIMAP 0.5.7 qw/xdg_basedir read_config compact_set/; + use Net::IMAP::InterIMAP 0.5.8 qw/xdg_basedir read_config compact_set/; @@ -88,7 +90,9 @@ do { diff --git a/debian/patches/Generate-X.509-version-3-CA-in-testsuite.patch b/debian/patches/Generate-X.509-version-3-CA-in-testsuite.patch deleted file mode 100644 index 74b2890..0000000 --- a/debian/patches/Generate-X.509-version-3-CA-in-testsuite.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Guilhem Moulin <guilhem@fripost.org> -Date: Wed, 6 Mar 2024 14:37:29 +0100 -Subject: tests/certs/generate: Generate X.509 version 3 CA. - -And pass CA:TRUE as basic constraint. This fixes the test suite with -OpenSSL 3.2 with defaults to X.509v3 and CA:FALSE. - -Origin: https://git.guilhem.org/interimap/commit/?id=eb254348085047702ee37e405d171d894dc5ffff -Bug-Debian: https://bugs.debian.org/1065529 ---- - tests/certs/generate | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tests/certs/generate b/tests/certs/generate -index 8e9c451..f449764 100755 ---- a/tests/certs/generate -+++ b/tests/certs/generate -@@ -22,7 +22,12 @@ genpkey() { - # generate CA (we intentionally throw away the private key and serial - # file to avoid reuse) - genpkey "$cadir/ca.key" -algorithm RSA --openssl req -new -x509 -rand /dev/urandom -subj "/OU=$OU/CN=Fake Root CA" -key "$cadir/ca.key" -out ./ca.crt -+openssl req -new -x509 -rand /dev/urandom \ -+ -subj "/OU=$OU/CN=Fake Root CA" \ -+ -addext subjectKeyIdentifier="hash" \ -+ -addext authorityKeyIdentifier="keyid:always,issuer" \ -+ -addext basicConstraints="critical,CA:TRUE" \ -+ -key "$cadir/ca.key" -out ./ca.crt - - SERIAL=1 - new() { diff --git a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch index fefcf37..628672c 100644 --- a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch +++ b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch @@ -9,7 +9,7 @@ Forwarded: not-needed 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/interimap.1.md b/doc/interimap.1.md -index 2d588ae..03adbf5 100644 +index 18b3581..7770e1e 100644 --- a/doc/interimap.1.md +++ b/doc/interimap.1.md @@ -574,10 +574,18 @@ Standards diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch index d8c5e88..e097e98 100644 --- a/debian/patches/Skip-randomized-tests.patch +++ b/debian/patches/Skip-randomized-tests.patch @@ -46,7 +46,7 @@ index 559daed..61cb37f 100644 - sync-live-tls local/remote simulation (TLS remote) - sync-live-multi local/remote1+remote2+remote3 simulation (3 local namespaces) diff --git a/tests/pullimap/t b/tests/pullimap/t -index 58a19ca..88010c3 100644 +index 1c57f8d..4afbd4b 100644 --- a/tests/pullimap/t +++ b/tests/pullimap/t @@ -1,6 +1,6 @@ diff --git a/debian/patches/series b/debian/patches/series index 0df587c..dcaacf5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ Mention-the-Debian-BTS-in-the-manpages.patch Skip-randomized-tests.patch -Generate-X.509-version-3-CA-in-testsuite.patch Fix-struct-flock-and-timeval-packing-on-armhf.patch +tests-Use-openssl-rehash-instead-of-c_rehash.patch diff --git a/debian/patches/tests-Use-openssl-rehash-instead-of-c_rehash.patch b/debian/patches/tests-Use-openssl-rehash-instead-of-c_rehash.patch new file mode 100644 index 0000000..5a0edff --- /dev/null +++ b/debian/patches/tests-Use-openssl-rehash-instead-of-c_rehash.patch @@ -0,0 +1,28 @@ +From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> +Date: Mon, 6 Oct 2025 21:27:06 +0200 +Subject: tests: Use "openssl rehash" instead of c_rehash + +The built-in version of c_rehash is "openssl rehash" and is available since the +3.0 series. The c_rehash is a perl script which is considered legacy. + +Switch to "openssl rehash" + +Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> +Bug-Debian: https://bugs.debian.org/1117508 +--- + tests/tls-verify-peer/t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tls-verify-peer/t b/tests/tls-verify-peer/t +index 50c7445..60bd042 100644 +--- a/tests/tls-verify-peer/t ++++ b/tests/tls-verify-peer/t +@@ -116,7 +116,7 @@ if [ -d "/etc/ssl/certs" ]; then + unverified_peer + fi + +-c_rehash "$capath" ++openssl rehash "$capath" + + # default host (localhost) is the CN (and also subjectAltName) + with_remote_config <<<"SSL_CApath = $capath" diff --git a/debian/tests/control b/debian/tests/control index 6b74499..439e0e0 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,9 +1,13 @@ Features: test-name=installcheck-interimap Test-Command: make installcheck-interimap bindir="/usr/bin" Restrictions: rw-build-tree -Depends: dovecot-imapd, interimap, openssl, procps, sqlite3, xxd +Depends: dovecot-imapd (>= 1:2.4~), interimap, openssl, procps, sqlite3, xxd Features: test-name=installcheck-pullimap Test-Command: make installcheck-pullimap bindir="/usr/bin" Restrictions: rw-build-tree -Depends: dovecot-imapd, dovecot-lmtpd, openssl, pullimap, xxd +Depends: dovecot-imapd (>= 1:2.4~), + dovecot-lmtpd (>= 1:2.4~), + openssl, + pullimap, + xxd |