Refresh d/patches and drop those applied upstream.

5 files changed, 5 insertions, 37 deletions

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..ecb036a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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