Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/qmail Update to notqmail 1.08 (as qmail-1.03nb49)...
details: https://anonhg.NetBSD.org/pkgsrc/rev/05eaa31dbe92
branches: trunk
changeset: 432634:05eaa31dbe92
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sat May 23 20:50:02 2020 +0000
description:
Update to notqmail 1.08 (as qmail-1.03nb49). From the changelog:
## Fix bugs
- Vulnerabilities we've inherited from qmail 1.03, reported by Qualys.
- CVE-2005-1515: fix signedness wraparound in `substdio_{put,bput}()`.
- CVE-2005-1514: fix possible signed integer overflow in `commands()`.
- CVE-2005-1513: fix integer overflow in `stralloc_readyplus()`.
- Fix several other places where variables could overflow.
- `qmail-pop3d`: instead of running as root if root authenticates (and
being a vector for a dictionary attack on the root password), exit 1
to look just like a failed `checkpassword` login.
- `qmail-inject`: do not parse header recipients if `-a` is given.
- Correctly detect multiple IP addresses on the same interface.
- Remove workaround for ancient DNS servers that do not properly
support CNAME.
- Fix possible integer overflow in `alloc()`.
## Reduce bug likelihood
- Remove `dnscname` and `dnsmxip` programs that were being built but not
installed.
- Remove `systype` and related platform detection.
- Remove unused variable in `maildir.c`.
- Reduce variable scope in `tcpto.c`.
- Avoid local variables shadowing same-named globals.
- Avoid needing `exit.h` in named-pipe bug check.
- Add a `test` target and some unit tests, using Check.
- Add missing function declarations in `cdbmss.h`, `scan.h`.
- Add missing return types to `main()`.
- Add `hier.h` for inclusion in `instcheck.c`, `instchown.c`, `instpackage.c`.
- Use system headers and types instead of the `HASSHORTSETGROUPS` check.
- Use system headers instead of redeclaring `exit()`, `read()`,
`write()`, `malloc()`, `free()`, `fork()`, `uint32_t`.
- Use C89 function signatures for code we've touched so far.
- Automated builds:
- TravisCI: move setting `MAKEFLAGS` out of the script and into
the matrix.
- Add FreeBSD builds with CirrusCI.
- Add a GitHub Actions build.
## Other changes
- Remove DJB's TODO.
- Replace many `pobox.com` URLs.
- Acknowledge Erik Sjölund's `qmail-local.c` bugfix that we've
inherited from netqmail.
- Avoid generating catted manpages by building with `NROFF=true`.
- Optionally create a `systemd` service file.
- Run an alternate `qmail-remote` by setting `QMAILREMOTE` in
`qmail-send`'s environment.
## Intent to remove
In the course of developing this release, we found programs that we
intend to remove in the next release. We believe none of these remains
necessary or useful enough to be worth the cost of maintaining. If you
disagree, please let us know!
- Remove `qsmhook`, long since replaced by `preline`.
- Remove inefficient `maildirwatch`.
- Remove obsolete mail client wrappers.
- Remove `qmail-pop3d`, since Maildir is well supported by actively
maintained POP3 servers.
diffstat:
mail/qmail/Makefile | 29 ++++++++++++++++-------------
mail/qmail/distinfo | 15 +++++----------
mail/qmail/options.mk | 6 +++++-
mail/qmail/patches/patch-Makefile | 26 --------------------------
4 files changed, 26 insertions(+), 50 deletions(-)
diffs (168 lines):
diff -r c0fa0361b8a1 -r 05eaa31dbe92 mail/qmail/Makefile
--- a/mail/qmail/Makefile Sat May 23 20:33:51 2020 +0000
+++ b/mail/qmail/Makefile Sat May 23 20:50:02 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.119 2020/05/02 10:47:38 rillig Exp $
+# $NetBSD: Makefile,v 1.120 2020/05/23 20:50:02 schmonz Exp $
#
-DISTNAME= notqmail-1.07
+DISTNAME= notqmail-1.08
PKGNAME= qmail-1.03
-PKGREVISION= 48
+PKGREVISION= 49
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GITHUB:=notqmail/}
GITHUB_PROJECT= notqmail
@@ -38,6 +38,9 @@
DJB_RESTRICTED= no
DJB_ERRNO_HACK= no
+TEST_TARGET= test
+#.include "../../devel/check/buildlink3.mk"
+
PKG_SYSCONFSUBDIR= qmail
OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias
OWN_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users
@@ -82,6 +85,7 @@
.endif
USE_TOOLS+= tar
+MAKE_ENV+= NROFF=${TRUE:Q}
.if !empty(QMAIL_QUEUE_EXTRA)
USE_TOOLS+= expr
@@ -95,11 +99,10 @@
SUBST_MESSAGE.logging= Setting QUEUE_EXTRA.
.endif
-SUBST_CLASSES+= catpages
-SUBST_STAGE.catpages= do-configure
-SUBST_FILES.catpages= hier.c
-SUBST_SED.catpages= -e 's|.*"man/cat[0-9]".*||g'
-SUBST_SED.catpages+= -e 's|.*"tcp-environ\.5".*||g' # also in ucspi-tcp
+SUBST_CLASSES+= manpages
+SUBST_STAGE.manpages= do-configure
+SUBST_FILES.manpages= hier.c
+SUBST_SED.manpages+= -e 's|.*"tcp-environ\.5".*||g' # also in ucspi-tcp
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
@@ -154,6 +157,11 @@
PATCH_DIST_CAT.${MAILDIRUNIQ_PATCH}= \
${SED} -e 's|"057"|"\\\\057"|' \
-e 's|"072"|"\\\\072"|' \
+ -e 's|hostname|temporaryothername|g' \
+ -e 's|host|myhost|g' \
+ -e 's|temporaryothername|hostname|g' \
+ -e 's|"readwrite\.h"|<stdlib.h>|' \
+ -e 's|"sig\.h"|"readwrite.h"|' \
< ${MAILDIRUNIQ_PATCH}
QMAILPATCHES+= outgoingip:${OUTGOINGIP_PATCH}
@@ -161,11 +169,6 @@
PATCHFILES+= ${OUTGOINGIP_PATCH}
SITES.${OUTGOINGIP_PATCH}= http://qmailorg.schmonz.com/
-QMAILPATCHES+= remote:${REMOTE_PATCH}
-REMOTE_PATCH= notqmail-1.07-tls-20190517-qmailremote-20190819.patch
-PATCHFILES+= ${REMOTE_PATCH}
-SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/
-
QMAILPATCHES+= spp:${SPP_PATCH}:${SPP_PATCHFILE_cmd:sh}
SPP_PATCH= qmail-spp-0.42.tar.gz
PATCHFILES+= ${SPP_PATCH}
diff -r c0fa0361b8a1 -r 05eaa31dbe92 mail/qmail/distinfo
--- a/mail/qmail/distinfo Sat May 23 20:33:51 2020 +0000
+++ b/mail/qmail/distinfo Sat May 23 20:50:02 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2020/02/03 04:51:27 schmonz Exp $
+$NetBSD: distinfo,v 1.47 2020/05/23 20:50:02 schmonz Exp $
SHA1 (netqmail-1.05-TAI-leapsecs.patch) = 2c21cd7e20b241c1a82b79379f2c7ee3da5519f7
RMD160 (netqmail-1.05-TAI-leapsecs.patch) = 9fd59001be5a07d914c66127236ebe8c33f64675
@@ -12,18 +12,14 @@
RMD160 (notqmail-1.07-tls-20190517-qmailremote-20190819-srs-20190819.patch) = a3682ab33bb0e746ae214dbac91e0c8f92c780e2
SHA512 (notqmail-1.07-tls-20190517-qmailremote-20190819-srs-20190819.patch) =
8b9894d743f6ea7ceb72d34fedaa8afeb61afdfb5b6d929b5c76eb31da27232cb6f952a26b3733c244bfd430750d250bdc0fa92464c6a64f017abd97c84e8c77
Size (notqmail-1.07-tls-20190517-qmailremote-20190819-srs-20190819.patch) = 24175 bytes
-SHA1 (notqmail-1.07-tls-20190517-qmailremote-20190819.patch) = 2aa984625c439069a9c252186f989a51f48449ad
-RMD160 (notqmail-1.07-tls-20190517-qmailremote-20190819.patch) = 95622f1895c2909bc3a3c5f609bd1f116437f65a
-SHA512 (notqmail-1.07-tls-20190517-qmailremote-20190819.patch) = cf4f7dda23f90ffff26b3cb0ff4c5d7037ca70a43370e4bd9edd703a67ae0aa125bd5fe54aa97aea6b82054ac6819cc469a091e4cc7b39a48f61409420cfd516
-Size (notqmail-1.07-tls-20190517-qmailremote-20190819.patch) = 1643 bytes
SHA1 (notqmail-1.07-tls-20200107-onlyremote-20200202.patch) = f08685e0b9784d5ac0e795f1bc806fde8de326e7
RMD160 (notqmail-1.07-tls-20200107-onlyremote-20200202.patch) = a6aa94fe9eb306a2ee0a99011110eedce695c75b
SHA512 (notqmail-1.07-tls-20200107-onlyremote-20200202.patch) = 786698a79c7e81349f1ecd12fd14fef03b0c873a0d98482dc506bb0c130214eda3a2f4f3a2c45f03c4ecc4721c6e7de3cf66f7e75f1b40a2f66ea22f53e30b28
Size (notqmail-1.07-tls-20200107-onlyremote-20200202.patch) = 26972 bytes
-SHA1 (notqmail-1.07.tar.gz) = 7aebb1e4cebcdb248bd907f1a7949c5f0030665b
-RMD160 (notqmail-1.07.tar.gz) = 2f8b610a8ffb0829af071a91515626c83f58126c
-SHA512 (notqmail-1.07.tar.gz) = 586d1ebeba881ebbd5234c957e1bf599d0854eea9dea13f387790b3de3188d49ec1654590862c613894c588b7b0a140345e0d9849da2f4cd974963a485124f49
-Size (notqmail-1.07.tar.gz) = 227458 bytes
+SHA1 (notqmail-1.08.tar.gz) = 7647b9920134cd433b31c5e27563f0728fbd0056
+RMD160 (notqmail-1.08.tar.gz) = ea1417fe5aebc24cb1d06e9992d941e91045e3b0
+SHA512 (notqmail-1.08.tar.gz) = eca97f74a20522e85435fa76015a72adcc040e1acc401cbdbd7f55f41a720fabc6f251e606ff1d236e44de295f066538ec42aca415b4344c1cd15964f38c7085
+Size (notqmail-1.08.tar.gz) = 225713 bytes
SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2
RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f
SHA512 (outgoingip.patch) = 876eba3e65eba02f62838e5324cf64985254805ac5ec9417b168caa8c8d150a5185885d49a92d968690438289963bd6569e3de3330daf71a248206cd94227cd2
@@ -44,4 +40,3 @@
RMD160 (qmail-spp-0.42.tar.gz) = 5511722c52346692488a63bca53106d580a004c7
SHA512 (qmail-spp-0.42.tar.gz) = 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
Size (qmail-spp-0.42.tar.gz) = 18689 bytes
-SHA1 (patch-Makefile) = ee82c0d6e64aaf617e3b2e69c577b6c4c23f62ca
diff -r c0fa0361b8a1 -r 05eaa31dbe92 mail/qmail/options.mk
--- a/mail/qmail/options.mk Sat May 23 20:33:51 2020 +0000
+++ b/mail/qmail/options.mk Sat May 23 20:50:02 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.68 2020/02/03 04:51:27 schmonz Exp $
+# $NetBSD: options.mk,v 1.69 2020/05/23 20:50:02 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tai-system-clock tls
@@ -40,6 +40,7 @@
SRS_PATCH= notqmail-1.07-tls-20190517-qmailremote-20190819-srs-20190819.patch
PATCHFILES+= ${SRS_PATCH}
SITES.${SRS_PATCH}= https://schmonz.com/qmail/srs/
+PATCH_DIST_CAT.${SRS_PATCH}= ${SED} -e 's|compile forward.c sig.h readwrite.h exit.h env.h qmail.h substdio.h|compile forward.c sig.h readwrite.h env.h qmail.h substdio.h|g' < ${SRS_PATCH}
SUBST_CLASSES+= srsinclude
SUBST_STAGE.srsinclude= do-configure
SUBST_FILES.srsinclude= srs.c
@@ -73,6 +74,9 @@
PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}= -p1
PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \
${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \
+ -e 's|.*\./tryulong32.*| uid.o: \\\\|' \
+ -e 's|.*cat uint32.*| compile uid.c uidgid.h subfd.h substdio.h exit.h|' \
+ -e 's|.*rm -f tryulong32.*| ./compile uid.c|' \
< ${TAILEAPSECS_PATCH}
SUBST_CLASSES+= libtai
SUBST_STAGE.libtai= do-configure
diff -r c0fa0361b8a1 -r 05eaa31dbe92 mail/qmail/patches/patch-Makefile
--- a/mail/qmail/patches/patch-Makefile Sat May 23 20:33:51 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-Makefile,v 1.5 2017/07/21 04:07:01 schmonz Exp $
-
-Don't build catpages we won't install.
-
---- Makefile.orig 2017-07-19 02:44:58.000000000 +0000
-+++ Makefile
-@@ -987,17 +987,8 @@ make-makelib warn-auto.sh systype
- chmod 755 makelib
-
- man: \
--qmail-local.0 qmail-lspawn.0 qmail-getpw.0 qmail-remote.0 \
--qmail-rspawn.0 qmail-clean.0 qmail-send.0 qmail-start.0 splogger.0 \
--qmail-queue.0 qmail-inject.0 mailsubj.0 qmail-showctl.0 qmail-newu.0 \
--qmail-pw2u.0 qmail-qread.0 qmail-qstat.0 qmail-tcpto.0 qmail-tcpok.0 \
--qmail-pop3d.0 qmail-popup.0 qmail-qmqpc.0 qmail-qmqpd.0 qmail-qmtpd.0 \
--qmail-smtpd.0 tcp-env.0 qmail-newmrh.0 qreceipt.0 qbiff.0 forward.0 \
--preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
--maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
--qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
--qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
--envelopes.0 forgeries.0
-+dot-qmail.5 qmail-control.5 qmail-getpw.8 qmail-limits.7 qmail-newmrh.8 \
-+qmail-newu.8 qmail-pw2u.8 qmail-send.8 qmail-start.8 qmail-users.5
-
- mbox.0: \
- mbox.5
Home |
Main Index |
Thread Index |
Old Index