diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 34 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/interimap.install | 6 | ||||
| -rw-r--r-- | debian/libinterimap.install | 2 | ||||
| -rw-r--r-- | debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch | 61 | ||||
| -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 | 1 | ||||
| -rw-r--r-- | debian/pullimap.install | 4 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/tests/control | 8 |
11 files changed, 113 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 5e67404..1630a01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,40 @@ -interimap (0.5.7-2) UNRELEASED; urgency=medium +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: + + Add upstream patch to generate X.509 version 3 CA prior to running the + test suite. (Closes: #1065529) + + Add patch from Simon Chopin to fix struct flock & timeval packing on + armhf. (Closes: #1067763, LP: #2059120) + * Update Standards-Version to 4.7.0 (no changes necessary). + + -- Guilhem Moulin <guilhem@debian.org> Sat, 04 May 2024 14:41:54 +0200 + +interimap (0.5.7-2) unstable; urgency=medium * DEP-8: Name inline tests. * Bump Standards-Version to 4.6.2 (no changes needed). * Salsa CI: Include recipes/debian.yml. - -- Guilhem Moulin <guilhem@debian.org> Fri, 21 Oct 2022 00:48:04 +0200 + -- Guilhem Moulin <guilhem@debian.org> Wed, 25 Jan 2023 02:35:21 +0100 interimap (0.5.7-1.1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ec36e36..7ad8af6 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ 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>, @@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13), sqlite3 <!nocheck>, xxd <!nocheck> Rules-Requires-Root: no -Standards-Version: 4.6.2 +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/interimap.install b/debian/interimap.install index 7a8281a..d6f2463 100644 --- a/debian/interimap.install +++ b/debian/interimap.install @@ -1,3 +1,3 @@ -usr/bin/interimap /usr/bin -usr/lib/systemd/user/interimap.service usr/lib/systemd/user -usr/lib/systemd/user/interimap@.service usr/lib/systemd/user +${env:prefix}/bin/interimap /usr/bin +${env:prefix}/lib/systemd/user/interimap.service usr/lib/systemd/user +${env:prefix}/lib/systemd/user/interimap@.service usr/lib/systemd/user diff --git a/debian/libinterimap.install b/debian/libinterimap.install index 514d1f8..1c83905 100644 --- a/debian/libinterimap.install +++ b/debian/libinterimap.install @@ -1 +1 @@ -usr/share/perl5/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP +${env:sitelib}/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP 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 new file mode 100644 index 0000000..886e871 --- /dev/null +++ b/debian/patches/Fix-struct-flock-and-timeval-packing-on-armhf.patch @@ -0,0 +1,61 @@ +From: Simon Chopin <simon.chopin@canonical.com> +Date: Tue, 26 Mar 2024 13:19:53 +0100 +Subject: Fix struct flock and timeval packing on armhf + +armhf uses a 64-bit off_t, and t64-enabled armhf 64-bit time_t. + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/interimap/+bug/2059120 +Bug-Debian: https://bugs.debian.org/1067763 +--- + lib/Net/IMAP/InterIMAP.pm | 6 +++++- + pullimap | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm +index 10162c7..699f58d 100644 +--- a/lib/Net/IMAP/InterIMAP.pm ++++ b/lib/Net/IMAP/InterIMAP.pm +@@ -23,6 +23,7 @@ use strict; + + use Compress::Raw::Zlib qw/Z_OK Z_STREAM_END Z_FULL_FLUSH Z_SYNC_FLUSH MAX_WBITS/; + use Config::Tiny (); ++use Config; + use Errno qw/EEXIST EINTR/; + use Net::SSLeay 1.86_06 (); + use List::Util qw/all first/; +@@ -1492,7 +1493,10 @@ sub _tcp_connect($$$) { + # timeout connect/read/write/... after 30s + # XXX we need to pack the struct timeval manually: not portable! + # https://stackoverflow.com/questions/8284243/how-do-i-set-so-rcvtimeo-on-a-socket-in-perl +- my $timeout = pack('l!l!', 30, 0); ++ # On Ubuntu, armhf is the only arch where time_t != long ++ my $is_arm = $Config{archname} =~ /^arm-/; ++ my $tpl = $is_arm ? 'qq' : 'l!l!'; ++ my $timeout = pack($tpl, 30, 0); + setsockopt($s, Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, $timeout) + or $self->fail("setsockopt SO_RCVTIMEO: $!"); + setsockopt($s, Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, $timeout) +diff --git a/pullimap b/pullimap +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 + use List::Util 'first'; + use Socket qw/PF_INET PF_INET6 SOCK_STREAM IPPROTO_TCP/; + ++use Config; ++ + use lib "./lib"; + use Net::IMAP::InterIMAP 0.5.8 qw/xdg_basedir read_config compact_set/; + +@@ -88,7 +90,9 @@ do { + + sysopen($STATE, $statefile, $mode, 0600) or die "Can't open $statefile: $!"; + # XXX we need to pack the struct flock manually: not portable! +- my $struct_flock = pack('s!s!l!l!i!', F_WRLCK, SEEK_SET, 0, 0, 0); ++ my $is_arm = $Config{archname} =~ /^arm-/; ++ my $tpl = $is_arm ? 's!s!qqi!' : 's!s!l!l!i!'; ++ my $struct_flock = pack($tpl, F_WRLCK, SEEK_SET, 0, 0, 0); + fcntl($STATE, F_SETLK, $struct_flock) or die "Can't lock $statefile: $!"; + my $flags = fcntl($STATE, F_GETFD, 0) or die "fcntl F_GETFD: $!"; + fcntl($STATE, F_SETFD, $flags | FD_CLOEXEC) or die "fcntl F_SETFD: $!"; 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 e237c35..ecb036a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ Mention-the-Debian-BTS-in-the-manpages.patch Skip-randomized-tests.patch +Fix-struct-flock-and-timeval-packing-on-armhf.patch diff --git a/debian/pullimap.install b/debian/pullimap.install index aad8978..985f88a 100644 --- a/debian/pullimap.install +++ b/debian/pullimap.install @@ -1,2 +1,2 @@ -usr/bin/pullimap /usr/bin -usr/lib/systemd/user/pullimap@.service usr/lib/systemd/user +${env:prefix}/bin/pullimap /usr/bin +${env:prefix}/lib/systemd/user/pullimap@.service usr/lib/systemd/user diff --git a/debian/rules b/debian/rules index 0234c6a..36a24cd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f -MAKEFLAGS = prefix=/usr sitelib=/usr/share/perl5 +export prefix=/usr +export sitelib=$(prefix)/share/perl5 %: dh $@ 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 |