Package: isync Version: 1.3.0-2 Followup-For: Bug #963834 X-Debbugs-Cc: deb...@microjoe.org
Dear Maintainer, Upstream has released version 1.3.3. Importing it seems straightforward. I have done it locally. The 01_sni.patch can be dropped as the fix seems to be integrated in upstream now. Please find attached the list of patches that I used to import upstream version, as well as fix a lot of lintian warnings. You can pick the ones you like, ideally all of them to improve the quality of the package. Best regards, Romain.
From e6a27464e7f46d00e6a3a2edffe7b831730c4ece Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Sun, 20 Dec 2020 17:01:04 +0100 Subject: [PATCH 01/12] New upstream release --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b34b1e6..0adec65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -isync (1.3.0-3) UNRELEASED; urgency=medium +isync (1.3.3-0.1) UNRELEASED; urgency=medium + * New upstream release * d/watch: Use https protocol -- Ondřej Nový <on...@debian.org> Mon, 01 Oct 2018 09:35:31 +0200 -- 2.29.2
From dffc30593c9cc05a1a2a66d9b06318a19d417469 Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Sun, 20 Dec 2020 17:04:45 +0100 Subject: [PATCH 02/12] remove now unused sni patch --- debian/patches/01_sni.patch | 38 ------------------------------------- debian/patches/series | 1 - 2 files changed, 39 deletions(-) delete mode 100644 debian/patches/01_sni.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/01_sni.patch b/debian/patches/01_sni.patch deleted file mode 100644 index 41af47f..0000000 --- a/debian/patches/01_sni.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1086cdb8fd77a224d56033bde0825a286ba30ee2 Mon Sep 17 00:00:00 2001 -From: Vincent Bernat <vinc...@bernat.ch> -Date: Wed, 22 Aug 2018 19:20:35 +0200 -Subject: [PATCH] use SNI when connecting with SSL - -imap.gmail.com doesn't accept connections without SNI anymore. Without -this extension, it returns a self-signed certificate and mbsync is -unable to complete: - - $ openssl s_client -connect imap.gmail.com:993 -noservername - CONNECTED(00000005) - depth=0 OU = "No SNI provided; please fix your client.", CN = invalid2.invalid - verify error:num=18:self signed certificate - verify return:1 - depth=0 OU = "No SNI provided; please fix your client.", CN = invalid2.invalid - verify return:1 - --- - Certificate chain - 0 s:OU = "No SNI provided; please fix your client.", CN = invalid2.invalid - i:OU = "No SNI provided; please fix your client.", CN = invalid2.invalid - -This commit configure the SSL connection to transmit the hostname -through SNI. This has been tested with both GMail (which requires SNI) -and Fastmail (which doesn't require SNI). ---- - src/socket.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/src/socket.c -+++ b/src/socket.c -@@ -270,6 +270,7 @@ - - init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn ); - conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext ); -+ SSL_set_tlsext_host_name( conn->ssl, conn->conf->host ); - SSL_set_fd( conn->ssl, conn->fd ); - SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER ); - socket_expect_read( conn, 1 ); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 21181ba..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_sni.patch -- 2.29.2
From f2347f04f30ea343dafe0338876093ab61c88763 Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Sun, 20 Dec 2020 17:08:51 +0100 Subject: [PATCH 03/12] d/changelog: close outdated version bug --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0adec65..132c4e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ isync (1.3.3-0.1) UNRELEASED; urgency=medium - * New upstream release + * New upstream release (Closes: #963834) * d/watch: Use https protocol -- Ondřej Nový <on...@debian.org> Mon, 01 Oct 2018 09:35:31 +0200 -- 2.29.2
From 5a8447157ba02dab2a446ac3b08350967f87ab34 Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 03:41:06 +0100 Subject: [PATCH 04/12] d/watch: upgrade from v3 to v4 --- debian/watch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/watch b/debian/watch index f6309d1..4d63417 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,5 @@ -version=3 -https://sf.net/isync/ isync-(.*)\.tar\.gz +version=4 +# qa.debian.org runs a redirector which allows a simpler form of URL +# for SourceForge based projects. The format below will automatically +# be rewritten to use the redirector. +http://sf.net/isync/isync-(\d\S+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- 2.29.2
From eccf9abc4bfa5d12f00f664571afe94943412538 Mon Sep 17 00:00:00 2001
From: Romain Porte <micro...@microjoe.org>
Date: Mon, 14 Dec 2020 03:20:03 +0100
Subject: [PATCH 05/12] Wrap and sort debian/* files
Used command:
wrap-and-sort --short-indent --wrap-always --sort-binary-packages \
--trailing-comma
Gbp-Dch: short
---
debian/control | 15 ++++++++++-----
debian/isync.examples | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index b2788ce..b71d54b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,27 @@ Source: isync
Section: mail
Priority: optional
Maintainer: Nicolas Boullis <nboul...@debian.org>
-Uploaders: Theodore Y. Ts'o <ty...@mit.edu>
+Uploaders:
+ Theodore Y. Ts'o <ty...@mit.edu>,
Standards-Version: 4.2.1
-Build-Depends: debhelper (>= 11),
+Build-Depends:
+ debhelper (>= 11),
libdb-dev,
libsasl2-dev,
libssl-dev,
pkg-config,
- zlib1g-dev
+ zlib1g-dev,
Vcs-Git: https://salsa.debian.org/debian/isync.git
Vcs-Browser: https://salsa.debian.org/debian/isync
Homepage: http://isync.sourceforge.net/
Package: isync
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: mutt
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ mutt,
Description: IMAP and MailDir mailbox synchronizer
mbsync/isync is a command line application which synchronizes mailboxes;
currently Maildir and IMAP4 mailboxes are supported. New messages, message
diff --git a/debian/isync.examples b/debian/isync.examples
index f91eadd..9dcfaff 100644
--- a/debian/isync.examples
+++ b/debian/isync.examples
@@ -1,2 +1,2 @@
-src/mbsyncrc.sample
src/compat/isyncrc.sample
+src/mbsyncrc.sample
--
2.29.2
From da36f6842b8b4a5a95927654aee3c1c577f1b065 Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 03:24:02 +0100 Subject: [PATCH 06/12] Upgrade from dh compat 11 to compat 13 (fixes package-uses-old-debhelper-compat-version and uses-debhelper-compat-file lintian warnings) --- debian/compat | 1 - debian/control | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index b71d54b..c4790ef 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Theodore Y. Ts'o <ty...@mit.edu>, Standards-Version: 4.2.1 Build-Depends: - debhelper (>= 11), + debhelper-compat (= 13), libdb-dev, libsasl2-dev, libssl-dev, -- 2.29.2
From 7e129430c724eac061678ad756a855b8fae18fdd Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 15:29:03 +0100 Subject: [PATCH 07/12] Update standards version from 4.2.1 to 4.5.1 (no changes needed) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c4790ef..ef18194 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nicolas Boullis <nboul...@debian.org> Uploaders: Theodore Y. Ts'o <ty...@mit.edu>, -Standards-Version: 4.2.1 +Standards-Version: 4.5.1 Build-Depends: debhelper-compat (= 13), libdb-dev, -- 2.29.2
From caabd6d01328be1e9c4e9201cdfd28c5dc3299ed Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 03:27:50 +0100 Subject: [PATCH 08/12] Add "Rules-Requires-Root: no" to d/control (fixes silent-on-rules-requiring-root lintian warning) --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index ef18194..16b023a 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: Vcs-Git: https://salsa.debian.org/debian/isync.git Vcs-Browser: https://salsa.debian.org/debian/isync Homepage: http://isync.sourceforge.net/ +Rules-Requires-Root: no Package: isync Architecture: any -- 2.29.2
From ead8cc43e5fc54306ef8c2c33c09d7c9af1f4876 Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 03:25:42 +0100 Subject: [PATCH 09/12] Add hardening options (fixes hardening-no-bindnow lintian warning) --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index fbe9376..a222d37 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ --with=autoreconf -- 2.29.2
From a7a3e80e9a992168b1353b66d5e0b801b4a3e32c Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 03:57:02 +0100 Subject: [PATCH 10/12] Introduce d/upstream/metadata --- debian/upstream/metadata | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..20999b1 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,3 @@ +Bug-Database: https://sourceforge.net/p/isync/bugs/ +Repository: https://git.code.sf.net/p/isync/isync isync-isync +Repository-Browse: https://sourceforge.net/p/isync/isync/ci/master/tree/ -- 2.29.2
From 9f976abdb743f9af86ffd4d5ebc2b8c3eb838cc3 Mon Sep 17 00:00:00 2001 From: Romain Porte <micro...@microjoe.org> Date: Mon, 14 Dec 2020 16:09:22 +0100 Subject: [PATCH 11/12] Introduce d/gbp.conf for gbp --- debian/gbp.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian/gbp.conf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..b89e487 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +upstream-branch=upstream +debian-branch=master -- 2.29.2
signature.asc
Description: PGP signature
