kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to nb12 (is this a record?). From the respective patch changelogs:

Browse source 
* Update qregex patch (PR pkg/34760) to 20060423:

  - qregex adds the matched regex pattern to its log entries if the
    LOGREGEX environment variable is set.

* Update realrcptto patch to 20061210:

  - Logging uses substdio_puts() and substdio_flush() instead of
    substdio_putsflush(). This makes log entries less likely to be
    interleaved. Thanks to Matthew Dempsky for finding this.

  - For QMAILRRTENYALL, use error code 554 after DATA, not 550.
    Thanks to ... sorry, I lost track of who found this.

  - Log stat() errors for .qmail files. Thanks to Chris Bensend for
    suggesting this.

* Update tls-smtpauth combined patch to 20060105. TLS changes:

  - bug: qmail-remote loops on malformed server response (B. Shupp,
    A. Meltzer)

  - no STARTTLS advertised when control/servercert.pem absent (Jason
    Haar)

  - control/notlshosts (Albert Weichselbraun)

  - control/tlshosts/exhaustivelist

  - scripts honor conf-users (Sven Verdoolaege)

  - strerror declaration in tls.c compile problem (Renato Botelho,
    Bill Shupp)

  - chown uid.gid deprecated, should be uid:gid (Bill Shupp)

  SMTP AUTH changes:

  - includes the evaluation of the 'Auth' and the 'Size' parameter
    in the 'Mail From:' command.

  - uses DJB functions to copy FDs.

  - corrects some minor mistakes displaying the 'Auth' userid.

  - uses keyword "ESMTPA" in Received header in case of authentication
    to comply with RFC 3848.

pkgsrc changes:

* Note SPECIAL_PERMS on qmail-queue binary (from dsainty@).
This commit is contained in:
schmonz 2006-12-29 10:32:05 +00:00
parent 743a187736
commit 502faaf2a0
3 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mail/qmail/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.50 2006/05/01 02:57:03 jlam Exp $
# $NetBSD: Makefile,v 1.51 2006/12/29 10:32:05 schmonz Exp $
#
DISTNAME= netqmail-1.05
PKGNAME= qmail-1.03
PKGREVISION= 11
PKGREVISION= 12
CATEGORIES= mail
MASTER_SITES= http://qmail.org/
@ -80,8 +80,6 @@ SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g'
SUBST_MESSAGE.logging= Setting QUEUE_EXTRA.
.endif
SUBST_FILES.djbware+= cdb_seek.c dns.c
SUBST_CLASSES+= paths
SUBST_FILES.paths= ${WRKDIR}/README.pkgsrc
SUBST_SED.paths+= -e 's,@PKGNAME@,${PKGNAME},g'
@ -89,6 +87,8 @@ SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO},g'
SUBST_SED.paths+= -e 's,@GREP@,${GREP},g'
SUBST_STAGE.paths= post-patch
SUBST_FILES.djbware+= cdb_seek.c dns.c
USERGROUP_PHASE= configure
PKG_GROUPS= qmail nofiles
PKG_USERS+= alias:nofiles
@ -99,6 +99,8 @@ PKG_HOME.${user}= ${QMAILDIR}
.endfor
PKG_HOME.alias= ${QMAILDIR}/alias
SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4711
# extract the qmail tarball that was inside the netqmail distfile
post-extract:
${_PKG_SILENT}${_PKG_DEBUG} \
@ -107,7 +109,7 @@ post-extract:
${CP} ${FILESDIR}/README.pkgsrc ${WRKDIR}/README.pkgsrc
post-install:
# qmail's installer sets strange permissions; set them back
# qmail's installer sets strange permissions, set them back
. if (${PKG_INSTALLATION_TYPE} == "overwrite")
. for i in bin boot
${CHGRP} ${BINGRP} ${QMAILDIR}/${i}

20
mail/qmail/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.15 2006/05/11 20:10:10 schmonz Exp $
$NetBSD: distinfo,v 1.16 2006/12/29 10:32:05 schmonz Exp $
SHA1 (netqmail-1.05.tar.gz) = fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829
RMD160 (netqmail-1.05.tar.gz) = e5bd8557c58a2686233449254b146e74389a7652
@ -15,15 +15,15 @@ Size (panther.patch) = 2563 bytes
SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2
RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f
Size (outgoingip.patch) = 6839 bytes
SHA1 (qregex-20040725.patch) = e8eb108720b8eae0e50afc4f735923057001103d
RMD160 (qregex-20040725.patch) = d1f85e7b2019e5d2f79bd4b8bfa5c3a13887c34f
Size (qregex-20040725.patch) = 25360 bytes
SHA1 (qmail-1.03-realrcptto-2004.08.20.patch) = 1406bddae6eb59c50324c15907ef31780bf77021
RMD160 (qmail-1.03-realrcptto-2004.08.20.patch) = 5becb036956bdcebf9644e5e56e1e68c8cd9f9c9
Size (qmail-1.03-realrcptto-2004.08.20.patch) = 16663 bytes
SHA1 (netqmail-1.05-tls-smtpauth-20040705.patch) = 3d26efd3601bc6a88be2685dcaed51fc553a59d3
RMD160 (netqmail-1.05-tls-smtpauth-20040705.patch) = b1c65e04067b42cdfb0ed4a99df08937b939a650
Size (netqmail-1.05-tls-smtpauth-20040705.patch) = 57631 bytes
SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83
RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c
Size (qregex-20060423.patch) = 26745 bytes
SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2
RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56
Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
SHA1 (netqmail-1.05-tls-smtpauth-20060105.patch) = 1a0fb2367504a4c0f2196e13f753437f47d4b621
RMD160 (netqmail-1.05-tls-smtpauth-20060105.patch) = 18a3edd3ea7e7a8e4d6cadbd3c0bd5e8cb041caa
Size (netqmail-1.05-tls-smtpauth-20060105.patch) = 147837 bytes
SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes

10
mail/qmail/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.21 2006/03/12 14:15:43 rillig Exp $
# $NetBSD: options.mk,v 1.22 2006/12/29 10:32:05 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@ -51,7 +51,7 @@ SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/
.endif
.if !empty(PKG_OPTIONS:Mqmail-qregex)
QREGEX_PATCH= qregex-20040725.patch
QREGEX_PATCH= qregex-20060423.patch
PATCHFILES+= ${QREGEX_PATCH}
SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/
PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3
@ -59,7 +59,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.qregex
.endif
.if !empty(PKG_OPTIONS:Mqmail-realrcptto)
REALRCPTTO_PATCH= qmail-1.03-realrcptto-2004.08.20.patch
REALRCPTTO_PATCH= qmail-1.03-realrcptto-2006.12.10.patch
PATCHFILES+= ${REALRCPTTO_PATCH}
SITES.${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/
PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1
@ -70,11 +70,11 @@ PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1
PKG_OPTIONS+= sasl
. endif
. include "../../security/openssl/buildlink3.mk"
TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20040705.patch
TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20060105.patch
PATCHFILES+= ${TLSSASL_PATCH}
SITES.${TLSSASL_PATCH}= http://shupp.org/patches/
. if !empty(PKG_OPTIONS:Mtls)
CFLAGS+= -DTLS=20040419 # from the patch
CFLAGS+= -DTLS=20060104 # NOTE: update according to the patch
DJB_INSTALL_TARGETS= cert tmprsadh
USE_TOOLS+= gmake
PLIST_SRC+= ${PKGDIR}/PLIST.tls