diff -Nru ssmtp-2.64/debian/changelog ssmtp-2.64/debian/changelog --- ssmtp-2.64/debian/changelog 2020-02-24 15:12:04.000000000 +0000 +++ ssmtp-2.64/debian/changelog 2020-04-29 14:59:35.000000000 +0000 @@ -1,11 +1,19 @@ -ssmtp (2.64-8.1ubuntu1) focal; urgency=medium +ssmtp (2.64-9) unstable; urgency=medium - * Merge from Debian unstable - - Remaining changes: - * Remove world read access to /etc/ssmtp/* and chgrp to "mail". - Install the ssmtp binary as setgid and owned by "root:mail". + * QA upload. + * Make the build reproducible. + Thanks to Chris Lamb (Closes: #777398) + * Fix permissions and ownership of config file. + Thanks to Simon Deziel (Closes: #661954) + * Update Vcs-* URLs to current location + * Use a page which follows policy ยง5.6.23 better + * Add patch to keep From: header if FromLineOverride=NO. + Thanks to Herbert Xu (Closes: #939298) + * Fix cross building. + Thanks to Helmut Grohne for the original patch (Closes: #861420) + * Orphaned package: set QA Group as maintainer - -- Balint Reczey Mon, 24 Feb 2020 16:12:04 +0100 + -- Ricardo Mones Wed, 29 Apr 2020 16:59:35 +0200 ssmtp (2.64-8.1) unstable; urgency=medium @@ -14,20 +22,6 @@ -- Ricardo Mones Tue, 13 Aug 2019 09:34:45 +0200 -ssmtp (2.64-8ubuntu2) bionic; urgency=high - - * No change rebuild to pick up -fPIE compiler default - - -- Balint Reczey Tue, 03 Apr 2018 12:44:53 +0000 - -ssmtp (2.64-8ubuntu1) xenial; urgency=medium - - * Remove world read access to /etc/ssmtp/* and chgrp to "mail". - Install the ssmtp binary as setgid and owned by "root:mail". - LP: #654065, Closes: #661954 - - -- Simon Deziel Wed, 13 Apr 2016 15:44:14 +0000 - ssmtp (2.64-8) unstable; urgency=medium * Fix "Partial loss of message body, sending message to wrong recipicients". diff -Nru ssmtp-2.64/debian/control ssmtp-2.64/debian/control --- ssmtp-2.64/debian/control 2020-02-24 15:12:04.000000000 +0000 +++ ssmtp-2.64/debian/control 2020-04-29 14:59:35.000000000 +0000 @@ -1,13 +1,12 @@ Source: ssmtp Section: mail Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Anibal Monsalve Salazar +Maintainer: Debian QA Group Build-Depends: dpkg-dev (>= 1.16.1~), po-debconf, libgnutls-openssl-dev Standards-Version: 3.9.5 -Vcs-Git: git://git.debian.org/ssmtp/ssmtp.git -Vcs-Browser: http://git.debian.org/?p=ssmtp/ssmtp.git -Homepage: http://packages.qa.debian.org/s/ssmtp.html +Vcs-Git: https://salsa.debian.org/debian/ssmtp.git +Vcs-Browser: https://salsa.debian.org/debian/ssmtp +Homepage: https://packages.debian.org/source/unstable/ssmtp Package: ssmtp Architecture: any diff -Nru ssmtp-2.64/debian/patches/keep-from-header-intact.patch ssmtp-2.64/debian/patches/keep-from-header-intact.patch --- ssmtp-2.64/debian/patches/keep-from-header-intact.patch 1970-01-01 00:00:00.000000000 +0000 +++ ssmtp-2.64/debian/patches/keep-from-header-intact.patch 2020-04-29 14:59:35.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Keep From: header intact + This patch changes the behaviour of ssmtp when FromLineOverride=NO + to not modify the "From:" header. This allows forwarded emails to + have the correct envelope sender as well as retaining the original + "From:" header. +Author: +Bug-Debian: https://bugs.debian.org/939298 + +diff --git a/ssmtp.c b/ssmtp.c +index 6b2b9d0..dbb1437 100644 +--- a/ssmtp.c ++++ b/ssmtp.c +@@ -701,9 +701,6 @@ void header_save(char *str) + if(override_from == True) { + uad = from_strip(ht->string); + } +- else { +- return; +- } + #endif + have_from = True; + } diff -Nru ssmtp-2.64/debian/patches/series ssmtp-2.64/debian/patches/series --- ssmtp-2.64/debian/patches/series 2020-02-24 15:12:04.000000000 +0000 +++ ssmtp-2.64/debian/patches/series 2020-04-29 14:59:35.000000000 +0000 @@ -6,3 +6,4 @@ 05-LDFLAGS.patch ssmtp-bug584162-fix.patch fix-tls1.3-handshake.patch +keep-from-header-intact.patch diff -Nru ssmtp-2.64/debian/rules ssmtp-2.64/debian/rules --- ssmtp-2.64/debian/rules 2020-02-24 15:12:04.000000000 +0000 +++ ssmtp-2.64/debian/rules 2020-04-29 14:59:35.000000000 +0000 @@ -6,10 +6,12 @@ #export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/buildflags.mk SHELL=/bin/bash -CC=gcc +export CC=$(DEB_HOST_GNU_TYPE)-gcc +INSTALL=install '--strip-program=$(DEB_HOST_GNU_TYPE)-strip' CFLAGS+=-O2 -g -Wall do_cfg: @@ -27,54 +29,54 @@ dpkg-shlibdeps ssmtp - install -d -m 755 -o root -g root debian/tmp/DEBIAN + $(INSTALL) -d -m 755 -o root -g root debian/tmp/DEBIAN dpkg-gencontrol -isp po2debconf --podir=debian/po debian/templates > debian/tmp/DEBIAN/templates chmod 644 debian/tmp/DEBIAN/templates - install -m 644 debian/conffiles debian/tmp/DEBIAN - install -m 755 debian/preinst debian/tmp/DEBIAN - install -m 755 debian/postinst debian/tmp/DEBIAN - install -m 755 debian/postrm debian/tmp/DEBIAN - install -m 755 debian/config debian/tmp/DEBIAN - - install -d -m 755 debian/tmp/usr/sbin - install -s -g mail -m 2755 ssmtp debian/tmp/usr/sbin/ssmtp - install -d -m 755 debian/tmp/usr/share/man/man8 - install -m 644 ssmtp.8 debian/tmp/usr/share/man/man8/ssmtp.8 - install -d -m 755 debian/tmp/usr/share/man/man5 - install -m 644 ssmtp.conf.5 debian/tmp/usr/share/man/man5/ssmtp.conf.5 - install -d -g mail -m 750 debian/tmp/etc/ssmtp - install -g mail -m 640 revaliases debian/tmp/etc/ssmtp/revaliases + $(INSTALL) -m 644 debian/conffiles debian/tmp/DEBIAN + $(INSTALL) -m 755 debian/preinst debian/tmp/DEBIAN + $(INSTALL) -m 755 debian/postinst debian/tmp/DEBIAN + $(INSTALL) -m 755 debian/postrm debian/tmp/DEBIAN + $(INSTALL) -m 755 debian/config debian/tmp/DEBIAN + + $(INSTALL) -d -m 755 debian/tmp/usr/sbin + $(INSTALL) -s -g mail -m 2755 ssmtp debian/tmp/usr/sbin/ssmtp + $(INSTALL) -d -m 755 debian/tmp/usr/share/man/man8 + $(INSTALL) -m 644 ssmtp.8 debian/tmp/usr/share/man/man8/ssmtp.8 + $(INSTALL) -d -m 755 debian/tmp/usr/share/man/man5 + $(INSTALL) -m 644 ssmtp.conf.5 debian/tmp/usr/share/man/man5/ssmtp.conf.5 + $(INSTALL) -d -g mail -m 750 debian/tmp/etc/ssmtp + $(INSTALL) -g mail -m 640 revaliases debian/tmp/etc/ssmtp/revaliases -cd debian/tmp/usr/sbin && ln -sf ssmtp sendmail - install -d -m 755 -o root -g root debian/tmp/usr/lib + $(INSTALL) -d -m 755 -o root -g root debian/tmp/usr/lib -cd debian/tmp/usr/lib && ln -sf ../sbin/sendmail . -cd debian/tmp/usr/sbin && ln -sf ssmtp newaliases - install -m 644 debian/newaliases.8 debian/tmp/usr/share/man/man8 + $(INSTALL) -m 644 debian/newaliases.8 debian/tmp/usr/share/man/man8 -cd debian/tmp/usr/sbin && ln -sf ssmtp mailq - install -m 644 debian/mailq.8 debian/tmp/usr/share/man/man8 + $(INSTALL) -m 644 debian/mailq.8 debian/tmp/usr/share/man/man8 - gzip -9v debian/tmp/usr/share/man/man5/* - gzip -9v debian/tmp/usr/share/man/man8/* + gzip -9nv debian/tmp/usr/share/man/man5/* + gzip -9nv debian/tmp/usr/share/man/man8/* -cd debian/tmp/usr/share/man/man8 && ln -sf ssmtp.8.gz sendmail.8.gz - install -d -m 755 -o root -g root debian/tmp/usr/share/doc/ssmtp - install -m 644 TLS debian/tmp/usr/share/doc/ssmtp - install -m 644 README debian/tmp/usr/share/doc/ssmtp - install -m 644 debian/README.debian debian/tmp/usr/share/doc/ssmtp/README.Debian - install -m 644 debian/copyright debian/tmp/usr/share/doc/ssmtp - install -m 644 debian/changelog debian/tmp/usr/share/doc/ssmtp/changelog.Debian - install -m 644 CHANGELOG_OLD debian/tmp/usr/share/doc/ssmtp/changelog - install -m 644 debian/AddHeader debian/tmp/usr/share/doc/ssmtp/AddHeader - gzip -9 debian/tmp/usr/share/doc/ssmtp/{changelog.Debian,changelog} + $(INSTALL) -d -m 755 -o root -g root debian/tmp/usr/share/doc/ssmtp + $(INSTALL) -m 644 TLS debian/tmp/usr/share/doc/ssmtp + $(INSTALL) -m 644 README debian/tmp/usr/share/doc/ssmtp + $(INSTALL) -m 644 debian/README.debian debian/tmp/usr/share/doc/ssmtp/README.Debian + $(INSTALL) -m 644 debian/copyright debian/tmp/usr/share/doc/ssmtp + $(INSTALL) -m 644 debian/changelog debian/tmp/usr/share/doc/ssmtp/changelog.Debian + $(INSTALL) -m 644 CHANGELOG_OLD debian/tmp/usr/share/doc/ssmtp/changelog + $(INSTALL) -m 644 debian/AddHeader debian/tmp/usr/share/doc/ssmtp/AddHeader + gzip -9n debian/tmp/usr/share/doc/ssmtp/{changelog.Debian,changelog} - install -d -m 755 debian/tmp/etc/logcheck/ignore.d.server - install -m 640 debian/logcheck.server \ + $(INSTALL) -d -m 755 debian/tmp/etc/logcheck/ignore.d.server + $(INSTALL) -m 640 debian/logcheck.server \ debian/tmp/etc/logcheck/ignore.d.server/ssmtp - install -d -m 755 debian/tmp/usr/share/lintian/overrides/ - install -m 644 debian/ssmtp.lintian debian/tmp/usr/share/lintian/overrides/ssmtp + $(INSTALL) -d -m 755 debian/tmp/usr/share/lintian/overrides/ + $(INSTALL) -m 644 debian/ssmtp.lintian debian/tmp/usr/share/lintian/overrides/ssmtp dpkg --build debian/tmp ..