Merge ~bryce/ubuntu/+source/fetchmail:fetchmail-merge-v6.4.0Trc3-1 into ubuntu/+source/fetchmail:debian/sid

[Bryce Harrington]

This updates fetchmail from a beta version to an rc version, allowing us to drop three patches from the Ubuntu delta.

A full list of changes since beta4 is available here:

    git log SNAPSHOT-6_4_0_beta4..SNAPSHOT-6_4_0_rc3
    http://paste.ubuntu.com/p/svMf9hfgYS/

Summary of changes between beta4 and rc3:

  - Documentation updates (FAQ, README, etc.)
  - Translation updates
  - Improved wording of warnings and help option docs
  - fetchmailconf: Permit editing the first item from a list, and more updates.
    + Remove a bogus check that would prevent editing the first items from list boxes.
    + Require Python 2.3.
    + Convert apply() call to function(*(tuple,)) syntax
    + string.atoi() -> int() on select[0], to continue where it's not a string
  - Flip the switch on sslcertck in fetchmailconf, too.
  - fetchmail no longer reports System error during SSL_connect(): Success.
  - Fix format overflow warnings by printing IMAP tag as unsigned.
  - Remove register qualifier. Let the compiler sort out register allocation.
  - Fix Solaris build with non-c99 compiler (gcc), fixup fileno().
  - Comment on EXISTS in response to EXPUNGE.
  - Add git-check target from bogofilter. This is meant to see if the
    git export contains all files required for bootstrapping, in order
    to find files that were not added before a commit.
  - Add --nonet to xmllint throughout.
  - FreeBSD cleanups to header shuffling.
  - In-depth robustness. Reported by: clang static analyzer (clang-8)
  - Be a bit more verbose about SSL probing.
  - configure.ac: use pkg-config to find openssl
  - Update to GNU gettext 0.19.8.
  - Waive AC_TYPE_SIGNAL and assume signal handlers return void.
  - Replace most strncpy() by strlcpy() calls.
  - Drop socket when receiving unexpected untagged * BYE.
  - Add line termination when reporting unexpected untagged * BYE contents.
  - Enable OpenSSL >= 1.0.2 native name verification.
  - Added mapping to to PS_TRANSIENT or PS_REFUSED of LMTP response.
  - Fix potential SIGSEGV in pop3_delete.
  - Set umask properly before writing the .fetchids file,
    to avoid failing the security check on the next run.
    Reported by Fabian Raab, Debian Bug#831611.
  - imap_delete(): clean up delflags[_seen] variables.
  - Do not continue autoprobing other protocols after socket error

This list includes no features, just bug fixes, docs/translations, and refactoring.

A PPA with the package for testing is available at:

    https://launchpad.net/~bryce/+archive/ubuntu/fetchmail-merge-v6.4.0--rc3-1

    sudo add-apt-repository ppa:bryce/fetchmail-merge-v6.4.0--rc3-1
    sudo apt-get update
    sudo apt-get install fetchmail

Usual tags pushed

[Christian Ehrhardt  (paelzer)]

FYI: you committed the PPA changelog change
For sponsoring I'd expect that is dropped, but since you can upload on your own you can remove that before you tag.

[Christian Ehrhardt  (paelzer)]

Ack to the patches that can be dropped because they are now upstream

[Christian Ehrhardt  (paelzer)]

Debian changes seem ok in regard to FF.
With the one being close the removal of fetchmailconf, but being py2 only that is on the dark side and shall go anyway.

[Christian Ehrhardt  (paelzer)]

The PPA build has not enabled non-x86 but it seems unlikely to just now break there.
But in general if you can enable all arch it will eventually build.

[Christian Ehrhardt  (paelzer)]

Yeah, overall +1 except the minor issue of the ~ppa1 changelog commit to be removed before upload.

review: Approve

[Bryce Harrington (bryce)]

Thanks for the review!

Good tip on the arch's for PPAs, I must have missed that they slimmed them down.

Sorry about the ~ppa1 changelog, yes I've fixed that locally during upload.

[Bryce Harrington (bryce)]

$ git push pkg upload/6.4.0_rc4-1ubuntu1
Counting objects: 23, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (23/23), done.
Writing objects: 100% (23/23), 3.74 KiB | 273.00 KiB/s, done.
Total 23 (delta 11), reused 4 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/fetchmail
 * [new tag] upload/6.4.0_rc4-1ubuntu1 -> upload/6.4.0_rc4-1ubuntu1
$ dput ../fetchmail_6.4.0~rc4-1ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: ../fetchmail_6.4.0~rc4-1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../fetchmail_6.4.0~rc4-1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading fetchmail_6.4.0~rc4-1ubuntu1.dsc: done.
  Uploading fetchmail_6.4.0~rc4.orig.tar.xz: done.
  Uploading fetchmail_6.4.0~rc4-1ubuntu1.debian.tar.xz: done.
  Uploading fetchmail_6.4.0~rc4-1ubuntu1_source.buildinfo: done.
  Uploading fetchmail_6.4.0~rc4-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated to eoan already.

diff --git a/debian/changelog b/debian/changelog
index dc5cecf..c1c6035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+fetchmail (6.4.0~rc4-1ubuntu1~eoan1) eoan; urgency=medium
+
+  * ppa build for eoan
+
+ -- Bryce Harrington <[e-mail]>  Wed, 04 Sep 2019 19:44:13 -0700
+
+fetchmail (6.4.0~rc4-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/tests: Add basic dep8 test cases.  This adds a trivial test to
+      verify installation of the main bits, and that the service is up
+      and running.  Partially addresses LP #1677818 "Missing dep8
+      tests", however a true fix will also test email fetching from a
+      (local) mail service.
+  * Dropped:
+    - d/p/sni-support.patch: TLS: set hostname for SNI.
+      [Now in upstream]
+    - d/p/clang-robustness.patch: Backport clang null pointer checks from upstream
+      to prevent potential segfaults.
+      [Now in upstream]
+    - d/p/set-umask-for-fetchids.patch: Backport upstream fix to set umask
+      properly before writing the .fetchids file.
+      [Now in upstream]
+
+ -- Bryce Harrington <[e-mail]>  Wed, 04 Sep 2019 19:37:24 -0700
+
 fetchmail (6.4.0~rc4-1) unstable; urgency=medium
 
   * New major upstream RC release.
@@ -45,6 +71,22 @@ fetchmail (6.4.0~rc1-1) unstable; urgency=medium
 
  -- Laszlo Boszormenyi (GCS) <[e-mail]>  Mon, 05 Aug 2019 22:35:46 +0000
 
+fetchmail (6.4.0~beta4-3ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/sni-support.patch: TLS: set hostname for SNI. Thanks to Matthias
+      Andree <[e-mail]> (LP #1798786)
+  * Added Changes:
+    - d/p/clang-robustness.patch: Backport clang null pointer checks from upstream
+      to prevent potential segfaults.
+    - d/p/set-umask-for-fetchids.patch: Backport upstream fix to set umask
+      properly before writing the .fetchids file.
+    - d/p/tests: Add preliminary/basic dep8 tests to check installation and
+      service operation.
+      (Partial fix for LP: #1677818)
+
+ -- Bryce Harrington <[e-mail]>  Sun, 16 Jun 2019 18:45:16 -0700
+
 fetchmail (6.4.0~beta4-3) unstable; urgency=medium
 
   * Backport fix potential SIGSEGV in pop3_delete (closes: #921450).
@@ -99,6 +141,19 @@ fetchmail (6.4.0~beta4-1) experimental; urgency=medium
 
  -- Laszlo Boszormenyi (GCS) <[e-mail]>  Sat, 23 Jun 2018 15:52:22 +0000
 
+fetchmail (6.3.26-3ubuntu1) disco; urgency=medium
+
+  * d/p/sni-support.patch: TLS: set hostname for SNI. Thanks to Matthias
+    Andree <[e-mail]> (LP: #1798786)
+
+ -- Karl Stenerud <[e-mail]>  Wed, 24 Oct 2018 05:12:24 -0700
+
+fetchmail (6.3.26-3build1) bionic; urgency=high
+
+  * No change rebuild against openssl1.1.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 05 Feb 2018 23:21:22 +0000
+
 fetchmail (6.3.26-3) unstable; urgency=low
 
   * Use short debhelper rules format.
diff --git a/debian/control b/debian/control
index 94f9052..d0dc378 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: fetchmail
 Section: mail
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
 Build-Depends: debhelper (>= 11), pkg-config, flex, libssl-dev (>= 1.0.2), bison, libkrb5-dev, libgssglue-dev
 Standards-Version: 4.4.0
 Homepage: http://www.fetchmail.info
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..1ca0335
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,8 @@
+Tests: installation
+Depends: @
+Restrictions:
+
+Tests: service
+Depends: @, systemd-sysv
+Restrictions: needs-root
+
diff --git a/debian/tests/installation b/debian/tests/installation
new file mode 100755
index 0000000..271fc6c
--- /dev/null
+++ b/debian/tests/installation
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+############################################
+### Check main installation requirements ###
+############################################
+
+set -e
+
+# Config file
+echo "Checking config file present"
+test -e /etc/default/fetchmail
+
+# Service
+echo "Checking service scripts are installed"
+test -e /etc/init.d/fetchmail
+test -e /etc/ppp/ip-down.d/fetchmail
+
+# Script
+echo "Checking fetchmail is present"
+test -e /usr/bin/fetchmail
+fetchmail --version > /dev/null 2>&1
+c=$(fetchmail --help 2>&1 | wc -l)
+test $c -gt 5
diff --git a/debian/tests/service b/debian/tests/service
new file mode 100755
index 0000000..95f9abc
--- /dev/null
+++ b/debian/tests/service
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+###############################
+### Check fetchmail service ###
+###############################
+
+set -e
+
+echo "Checking fetchmail service is enabled"
+systemctl is-enabled fetchmail.service
+
+echo "Checking fetchmail service is active"
+systemctl is-active fetchmail.service