[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#985114: unblock: sendmail/8.15.2-21



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: anbe@debian.org

Please unblock package sendmail

[ Reason ]

This version of sendmail fixes a reproducible builds issue with build
paths, updates the lintian overrides, minor packaging updates and
spelling fixes.

[ Impact ]

Removes only known reproducibility issues for sendmail.

[ Tests ]

None.

[ Risks ]

The changes are trivial, mostly affecting documentation, lintian
overrides, and spelling.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]

This is a QA package and I did not perform the upload, though was
asked to file the unblock request regarding the reproducible builds
issue.


unblock sendmail/8.15.2-21


live well,
  vagrant

diff -Nru sendmail-8.15.2/debian/cf/Makefile.am sendmail-8.15.2/debian/cf/Makefile.am
--- sendmail-8.15.2/debian/cf/Makefile.am	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/cf/Makefile.am	2021-03-03 03:03:42.000000000 -0800
@@ -35,6 +35,7 @@
 	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/Build;
 	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/Makefile;
 	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/*.cf;
+	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/README
 	for dir in ${CF_DIRS}; do \
 		$(INSTALL) -d ${DESTDIR}${pkgdatadir}/cf/$$dir; \
 		find $$dir -type f -name '*.mc' -o  -name '*.m4' \
diff -Nru sendmail-8.15.2/debian/changelog sendmail-8.15.2/debian/changelog
--- sendmail-8.15.2/debian/changelog	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/changelog	2021-03-03 03:03:42.000000000 -0800
@@ -1,3 +1,16 @@
+sendmail (8.15.2-21) unstable; urgency=medium
+
+  * QA upload.
+  * Make the build reproducible, thanks to Vagrant Cascadian.
+    (Closes: #983902)
+  * Move amavis documentation to /usr/share/doc/sendmail.
+  * Bump watch version to 4. No changes needed.
+  * Update to Standards-Version: 4.5.1.
+  * Fix more typos found by Lintian.
+  * Update Lintian overrides.
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 03 Mar 2021 12:03:42 +0100
+
 sendmail (8.15.2-20) unstable; urgency=medium
 
   * QA upload.
diff -Nru sendmail-8.15.2/debian/configure.ac sendmail-8.15.2/debian/configure.ac
--- sendmail-8.15.2/debian/configure.ac	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/configure.ac	2021-03-03 03:03:42.000000000 -0800
@@ -1482,7 +1482,6 @@
 		fi;
 		])
 AC_CONFIG_FILES([libmilter${sm_libmilter_version}.install:libmilter.install.in])
-AC_CONFIG_FILES([libmilter${sm_libmilter_version}.lintian-overrides:libmilter.lintian-overrides.in])
 AC_CONFIG_FILES([libmilter${sm_libmilter_version}.symbols:libmilter.symbols.in])
 AC_CONFIG_FILES([milter.pc])
 AC_CONFIG_FILES([sendmail-base.dirs])
diff -Nru sendmail-8.15.2/debian/control sendmail-8.15.2/debian/control
--- sendmail-8.15.2/debian/control	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/control	2021-03-03 03:03:42.000000000 -0800
@@ -16,7 +16,7 @@
  bind-dev,
  fakeroot (<< 0.4.5),
 Rules-Requires-Root: binary-targets
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: http://www.sendmail.org
 Vcs-Browser: https://salsa.debian.org/debian/sendmail
 Vcs-Git: https://salsa.debian.org/debian/sendmail.git
diff -Nru sendmail-8.15.2/debian/control.in sendmail-8.15.2/debian/control.in
--- sendmail-8.15.2/debian/control.in	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/control.in	2021-03-03 03:03:42.000000000 -0800
@@ -16,7 +16,7 @@
  bind-dev,
  fakeroot (<< 0.4.5),
 Rules-Requires-Root: binary-targets
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: http://www.sendmail.org
 Vcs-Browser: https://salsa.debian.org/debian/sendmail
 Vcs-Git: https://salsa.debian.org/debian/sendmail.git
diff -Nru sendmail-8.15.2/debian/copyright sendmail-8.15.2/debian/copyright
--- sendmail-8.15.2/debian/copyright	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/copyright	2021-03-03 03:03:42.000000000 -0800
@@ -12,7 +12,7 @@
 Copyright: Robert Leslie <rob@mars.org>
            1997-1998 Johnie Ingram <johnie@debian.org>
            1998-2010 Richard A Nelson <cowboy@debian.org>
-           © 2012-2020 Andreas Beckmann <anbe@debian.org>
+           © 2012-2021 Andreas Beckmann <anbe@debian.org>
 License: other-Sendmail
 
 License: other-Sendmail
diff -Nru sendmail-8.15.2/debian/examples/Makefile.am sendmail-8.15.2/debian/examples/Makefile.am
--- sendmail-8.15.2/debian/examples/Makefile.am	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/examples/Makefile.am	2021-03-03 03:03:42.000000000 -0800
@@ -30,9 +30,10 @@
 # Shipped data
 #
 # Installed example subdirectories
-EXAMPLES_DIRS = amavis db dhcp \
+EXAMPLES_DIRS = db dhcp \
 	ldap logcheck milter network \
 	pam.d ppp resolvconf sasl tls
+EXAMPLES_DOCS_DIRS = amavis
 #
 # Sigh... I wanted to use sysconf_SCRIPTS, but automake says NO!
 nobase_dist_sysconf_DATA = dhcp/dhclient-exit-hooks.d/sendmail \
@@ -53,7 +54,13 @@
 			! -name '*.in' -a ! -name '*.am' -a ! -name '*.old' \
 			| xargs -ri \
 			sh -c "$(INSTALL) -d ${DESTDIR}${pkgdatadir}/examples/\$$(dirname '{}') ; $(INSTALL_DATA) '{}' ${DESTDIR}${pkgdatadir}/examples/'{}'" ; \
-		done;
+		done; \
+	for dir in ${EXAMPLES_DOCS_DIRS}; do \
+		find $$dir -type f \
+			! -name '*.in' -a ! -name '*.am' -a ! -name '*.old' \
+			| xargs -ri \
+			sh -c "$(INSTALL) -d ${DESTDIR}${docdir}/sendmail/examples/\$$(dirname '{}') ; $(INSTALL_DATA) '{}' ${DESTDIR}${docdir}/sendmail/examples/'{}'" ; \
+		done
 	chmod a+rx ${DESTDIR}${pkgdatadir}/examples/milter/Makefile;
 	chmod a+rx ${DESTDIR}${pkgdatadir}/examples/dhcp/dhclient-exit-hooks.d/sendmail;
 	chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-down.d/sendmail;
diff -Nru sendmail-8.15.2/debian/libmilter-dev.lintian-overrides sendmail-8.15.2/debian/libmilter-dev.lintian-overrides
--- sendmail-8.15.2/debian/libmilter-dev.lintian-overrides	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/libmilter-dev.lintian-overrides	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-description-synopsis-starts-with-a-capital-letter
diff -Nru sendmail-8.15.2/debian/libmilter.lintian-overrides.in sendmail-8.15.2/debian/libmilter.lintian-overrides.in
--- sendmail-8.15.2/debian/libmilter.lintian-overrides.in	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/libmilter.lintian-overrides.in	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-description-synopsis-starts-with-a-capital-letter
diff -Nru sendmail-8.15.2/debian/patches/typos.patch sendmail-8.15.2/debian/patches/typos.patch
--- sendmail-8.15.2/debian/patches/typos.patch	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/patches/typos.patch	2021-03-03 03:03:42.000000000 -0800
@@ -14,6 +14,15 @@
  .RI ConnectionRateThrottle= N
 --- a/contrib/expn.pl
 +++ b/contrib/expn.pl
+@@ -774,7 +774,7 @@ sub domainify
+ 	}
+ 
+ 	# 
+-	# There are several weird situtations that need to be 
++	# There are several weird situations that need to be 
+ 	# accounted for.  They have to do with domain relay hosts.
+ 	#
+ 	# Examples: 
 @@ -945,7 +945,7 @@ sub mxredirect
  	return undef;
  }
diff -Nru sendmail-8.15.2/debian/rmail.lintian-overrides sendmail-8.15.2/debian/rmail.lintian-overrides
--- sendmail-8.15.2/debian/rmail.lintian-overrides	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/rmail.lintian-overrides	2021-03-03 03:03:42.000000000 -0800
@@ -1,2 +1 @@
-description-synopsis-starts-with-a-capital-letter
 mail-transport-agent-dependency-does-not-specify-default-mta
diff -Nru sendmail-8.15.2/debian/rules sendmail-8.15.2/debian/rules
--- sendmail-8.15.2/debian/rules	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/rules	2021-03-03 03:03:42.000000000 -0800
@@ -203,6 +203,8 @@
 	#--------------------------------------------------------------------
 
 override_dh_installdocs-indep:
+	# Avoid recording the build path in the documentation
+	sed -i -e "s,prefix-map=$(CURDIR),prefix-map=BUILDPATH,g" debian/build/site.config.m4
 	dh_installdocs -p${DEB_SOURCE_PACKAGE}-doc --doc-main-package=${DEB_SOURCE_PACKAGE}-doc -A $(DEB_SRCDIR)/README
 	dh_installdocs -N${DEB_SOURCE_PACKAGE}-doc -A $(DEB_SRCDIR)/README
 
diff -Nru sendmail-8.15.2/debian/sendmail-base.lintian-overrides sendmail-8.15.2/debian/sendmail-base.lintian-overrides
--- sendmail-8.15.2/debian/sendmail-base.lintian-overrides	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/sendmail-base.lintian-overrides	2021-03-03 03:03:42.000000000 -0800
@@ -9,7 +9,6 @@
 
 # this is a perl/troff bilingual script, false positives are in the perl part
 groff-message usr/share/man/man1/expn.1.gz *: warning: macro '\"';' not defined
-hyphen-used-as-minus-sign usr/share/man/man1/expn.1.gz*
 
 # part of the sendmail-mta alternative
 spare-manual-page usr/share/man/man8/runq.sendmail.8.gz
diff -Nru sendmail-8.15.2/debian/sendmail-bin.lintian-overrides sendmail-8.15.2/debian/sendmail-bin.lintian-overrides
--- sendmail-8.15.2/debian/sendmail-bin.lintian-overrides	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/sendmail-bin.lintian-overrides	2021-03-03 03:03:42.000000000 -0800
@@ -6,10 +6,6 @@
 spare-manual-page usr/share/man/man1/mailq.sendmail.1.gz
 spare-manual-page usr/share/man/man8/newaliases.sendmail.8.gz
 spare-manual-page usr/share/man/man8/sendmail.sendmail.8.gz
-package-contains-broken-symlink usr/sbin/hoststat sendmail-mta
-package-contains-broken-symlink usr/sbin/purgestat sendmail-mta
-package-contains-broken-symlink usr/share/man/man8/hoststat.8.gz sendmail-mta.8.gz
-package-contains-broken-symlink usr/share/man/man8/purgestat.8.gz sendmail-mta.8.gz
 
 # this refers to HP UX and Solaris
 FSSTND-dir-in-manual-page usr/share/man/man8/smrsh.8.gz:93 /var/adm/
diff -Nru sendmail-8.15.2/debian/sendmail.lintian-overrides sendmail-8.15.2/debian/sendmail.lintian-overrides
--- sendmail-8.15.2/debian/sendmail.lintian-overrides	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/sendmail.lintian-overrides	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-depends-on-mail-transport-agent-without-alternatives
diff -Nru sendmail-8.15.2/debian/sensible-mda.lintian-overrides sendmail-8.15.2/debian/sensible-mda.lintian-overrides
--- sendmail-8.15.2/debian/sensible-mda.lintian-overrides	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/sensible-mda.lintian-overrides	2021-03-03 03:03:42.000000000 -0800
@@ -1,3 +1,2 @@
 setuid-binary usr/sbin/sensible-mda 4755 root/root
-description-synopsis-starts-with-a-capital-letter
 mail-transport-agent-dependency-does-not-specify-default-mta
diff -Nru sendmail-8.15.2/debian/watch sendmail-8.15.2/debian/watch
--- sendmail-8.15.2/debian/watch	2020-07-06 16:44:51.000000000 -0700
+++ sendmail-8.15.2/debian/watch	2021-03-03 03:03:42.000000000 -0800
@@ -1,3 +1,3 @@
-version=3
+version=4
 
 opts="pasv,pgpsigurlmangle=s/$/.sig/" ftp://ftp.sendmail.org/pub/sendmail/sendmail\.(\S*)\.tar\.gz

Attachment: signature.asc
Description: PGP signature


Reply to: