mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

mail/qmail-tls: Update to 20110119 and use netqmail base

Browse Source 
Changes:
  2011-01-19
    * flush_io after starttls, bug described in http://www.kb.cert.org/vuls/id/555316 (Wietse Venema)

  2007-04-08
    * type correction of time argument in ssl_timeoutio functions
    * bug in tlsserversciphers processing (Michael Hanselmann)
    * RFC1891 (James Couzens)

  2006-01-04
    * strerror declaration in tls.c compile problem (Renato Botelho, Bill Shupp)
    * chown uid.gid deprecated, should be uid:gid (Bill Shupp)

  2005-03-29
    * no STARTTLS advertised when control/servercert.pem absent (Jason Haar) [already fixed in qmail-tls]
    * control/notlshosts (Albert Weichselbraun)
    * control/tlshosts/exhaustivelist
    * scripts honor conf-users (Sven Verdoolaege)

  2004-04-17
    * bug: qmail-remote loops on malformed server response (B. Shupp, A. Meltzer) [already fixed in qmail-tls]

  2004-01-20
    * bug: DH caused exit if dh512.pem and dh1024.pem absent (Samuli Karkkainen)

  2003-12-27
    * script for update temporary RSA/DH temp keys
    * CRL checking of clients
    * Diffie-Hellman parameters added
    * RFC 2821 compliance of headers (Matthias Wimmer)
    * bug: sk_GENERAL_NAME_pop_free call (Joe Orton)
This commit is contained in:
Bryan Drewery 2014-06-25 02:12:34 +00:00
parent 82d6345452
commit c52e4206bb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=359176
4 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/qmail-tls/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= qmail
PORTVERSION= ${QMAIL_VERSION}.${TLS_PATCH_DATE}
PORTREVISION= 8
PORTREVISION= 0
CATEGORIES= mail
PKGNAMESUFFIX= -tls
@ -13,7 +13,7 @@ CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol
SLAVE_TLS= yes
TLS_PATCH_DATE= 20021228
TLS_PATCH_DATE= 20110119
USE_OPENSSL= yes
@ -22,6 +22,4 @@ MASTERDIR= ${.CURDIR}/../qmail
DESCR= ${.CURDIR}/pkg-descr
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-qmail-local.c
.include "${MASTERDIR}/Makefile"

50
mail/qmail/Makefile
View File

@ -84,8 +84,7 @@ TLS_DEBUG_DESC= Enable additional debug information
XF_QUITASAP_DESC= Close SMTP session ASAP (SMTPEXTFORK)
.if defined(SLAVE_LDAP) || \
defined(SLAVE_SPAMCONTROL) || \
defined(SLAVE_TLS)
defined(SLAVE_SPAMCONTROL)
_USE_NETQMAIL= no
.else
_USE_NETQMAIL= yes
@ -176,11 +175,12 @@ PATCH_SITES+= http://iain.cx/unix/qmail/download/:mysql
PATCHFILES+= netqmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
.elif defined(SLAVE_TLS)
PATCH_SITES+= http://inoa.net/qmail-tls/:tls
PATCHFILES+= qmail-1.03-tls-${TLS_PATCH_DATE}-renato_v2.patch:tls
TLS_PATCH_NAME= ${QMAIL_PORTNAME}-${QMAIL_VERSION}-tls-${TLS_PATCH_DATE}.patch
PATCHFILES+= ${TLS_PATCH_NAME}:tls
.endif
PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/}
PATCH_SITE_SUBDIR+= bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip
PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip/}
PATCH_SITE_SUBDIR+= bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
PATCH_SITE_SUBDIR+= bdrewery/qmail/:tls
.if !defined(BARRIER_SMTP_AUTH_PATCH)
@ -310,6 +310,9 @@ PLIST_SUB+= SPAMCONTROL="@comment "
.if defined(SLAVE_TLS)
PKGMESSAGE_SUFFIX= tls
PLIST_SUB+= TLS="" NO_TLS="@comment "
.else
PLIST_SUB+= TLS="@comment " NO_TLS=""
.endif
.if defined(PKGMESSAGE_SUFFIX)
@ -410,7 +413,7 @@ SUB_LIST+= MANPATH=""
.endif
.if defined(SLAVE_TLS)
CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS=${TLS_PATCH_DATE}
. if ${PORT_OPTIONS:MTLS_DEBUG}
CFLAGS+= -DDEBUG
. endif
@ -442,7 +445,7 @@ EXTRACT_ONLY+= qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz
MASTER_SITES+= http://tomclegg.net/qmail/:close3
DISTFILES+= qmail-smtpd-auth-close3.patch:close3
. if defined(SLAVE_TLS)
AUTH_PATCH= auth.patch.diff-tls
AUTH_PATCH= auth.patch.diff-tls-20110119
. elif ${PORT_OPTIONS:MSPF_PATCH}
AUTH_PATCH= auth.patch.diff
. endif
@ -475,13 +478,16 @@ SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-26
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
MASTER_SITE_SUBDIR+= garga/qmail/:spf_spamcontrol
DISTFILES+= ${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
. elif ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
SPF_TLS_PATCH= qmail-spf-rc5.patch-auth-tls
MASTER_SITES+= http://manuel.mausz.at/programming/patches/qmail/:spf_tls
DISTFILES+= ${SPF_TLS_PATCH}:spf_tls
. else
SPF_TLS_PATCH= qmail-spf-rc5.patch-tls
MASTER_SITES+= http://manuel.mausz.at/programming/patches/qmail/:spf_tls
# XXX - Move change out of conflicting Makefile hunk
. if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
SPF_TLS_PATCH= qmail-spf-rc5.patch-auth-tls-20110119
. else
SPF_TLS_PATCH= qmail-spf-rc5.patch-tls-20110119
. endif
#MASTER_SITES+= http://manuel.mausz.at/programming/patches/qmail/:spf_tls
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_tls/}
MASTER_SITE_SUBDIR+= bdrewery/qmail/:spf_tls
DISTFILES+= ${SPF_TLS_PATCH}:spf_tls
. endif
. else
@ -503,19 +509,28 @@ DISTFILES+= ${EXT_BIG_TODO_PATCH}:ext_big_todo
. if ${PORT_OPTIONS:MSPF_PATCH}
. if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
. if defined(SLAVE_SPAMCONTROL)
EXTTODO_PATCH= ext_todo-20030105_spf.patch
. else
# XXX - Move qmail-todo out of conflicting Makefile hunk
EXTTODO_PATCH= ext_todo-20030105_spf_tls.patch
. endif
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
MASTER_SITE_SUBDIR+= garga/qmail/:exttodo
EXTTODO_PATCH= ext_todo-20030105_spf.patch
DISTFILES+= ${EXTTODO_PATCH}:exttodo
. else
PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
PATCHFILES+= ext_todo-20030105_spf.patch:exttodo
PATCH_SITE_SUBDIR+= garga/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_spf.patch:exttodo
. endif
. elif defined(SLAVE_MYSQL)
PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
PATCHFILES+= ext_todo-20030105_mysql.patch:exttodo
PATCH_SITE_SUBDIR+= garga/qmail/:exttodo
. elif defined(SLAVE_TLS)
PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
PATCHFILES+= ext_todo-20030105_tls.patch:exttodo
PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
. else
PATCH_SITES+= http://www.nrg4u.com/qmail/:exttodo
PATCHFILES+= ext_todo-20030105.patch:exttodo
@ -706,6 +721,7 @@ post-extract:
@cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/ucspi-ssl-0.70.tar.gz
.endif
# XXX - Move all the major patch applications to post-extract
post-patch:
.if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
@ -769,12 +785,10 @@ post-patch:
@${REINPLACE_CMD} -E "/qhpsi *= *\"unknown\"/d; s/(\*qqx *== *'D')/qhpsi \&\& \1/g" \
${WRKSRC}/qmail-smtpd.c
.elif defined(SLAVE_TLS)
@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/qmail-1.03-tls-${TLS_PATCH_DATE}-renato_v2.patch > \
@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/${TLS_PATCH_NAME} > \
${WRKDIR}/TLS.readme
@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" \
${WRKSRC}/Makefile
@${REINPLACE_CMD} -E 's!("control/tlsserverciphers")!\1, 0!' \
${WRKSRC}/qmail-smtpd.c
.elif defined(SLAVE_LDAP)
@${REINPLACE_CMD} "s|^LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|; \
s|^LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" \

20
mail/qmail/distinfo
View File

@ -34,18 +34,18 @@ SHA256 (qmail/qmail-discard-double-bounces.patch) = 14489eefd9908f60af13fadd574d
SIZE (qmail/qmail-discard-double-bounces.patch) = 1305
SHA256 (qmail/qmail-spf-rc5.patch) = 8ad251d779125e11422ae9bcbf619b0ba002c0893dd8c8fe55a34a8b5fc42640
SIZE (qmail/qmail-spf-rc5.patch) = 63582
SHA256 (qmail/qmail-spf-rc5.patch-tls) = c884665ff0bc5a5272efe3e09aed71e648a79d0279bc708d5a9df25c5758804f
SIZE (qmail/qmail-spf-rc5.patch-tls) = 63617
SHA256 (qmail/qmail-spf-rc5.patch-auth-tls) = 16fe99894938c30ed1928a61dabf0a598ef7e08a766a76cf084fe658d6d50092
SIZE (qmail/qmail-spf-rc5.patch-auth-tls) = 63752
SHA256 (qmail/qmail-spf-rc5.patch-tls-20110119) = 1b70f1e15dab39e36512dd3c8e00e68be5ff8ba6f53a625065bbb7b2ed1e91b8
SIZE (qmail/qmail-spf-rc5.patch-tls-20110119) = 63649
SHA256 (qmail/qmail-spf-rc5.patch-auth-tls-20110119) = 1ae19dbdba202de3e6edc08080718ade79839e0dfb1353053e347a615ae44771
SIZE (qmail/qmail-spf-rc5.patch-auth-tls-20110119) = 63784
SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a
SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
SHA256 (qmail/netqmail-mysql-1.1.15.patch) = 656d2366c1b4749f0ffdaf68b30f10d469c67d7c2c5710190e12b2c6ca85b18a
SIZE (qmail/netqmail-mysql-1.1.15.patch) = 61635
SHA256 (qmail/spamcontrol-2624_tgz.bin) = ab9454c777218b0958ca005d4bf44ae922a2f6d20a52a71da6ebec74b2de2d01
SIZE (qmail/spamcontrol-2624_tgz.bin) = 167802
SHA256 (qmail/qmail-1.03-tls-20021228-renato_v2.patch) = 7ec34f3d6feeb85f603accfbca22d6cb7471d4ee03bd9a6686c35737ba13ccf7
SIZE (qmail/qmail-1.03-tls-20021228-renato_v2.patch) = 42151
SHA256 (qmail/netqmail-1.06-tls-20110119.patch) = 0c9ad8b5f045b6c9198a2d07a3937c197b19a29254469535a03d4ac339f29cc7
SIZE (qmail/netqmail-1.06-tls-20110119.patch) = 50088
SHA256 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 1b439fa7e128de13fa80b86883f61a39d17b87b7e8916b6a0eab065bbe49b938
SIZE (qmail/qmail-smtpd-auth-0.31.tar.gz) = 8798
SHA256 (qmail/qmail-smtpd-auth-close3.patch) = d933e871261d6740cebe5c21cad81146525cfe06a464e277979f61c1242b5ad4
@ -56,14 +56,18 @@ SHA256 (qmail/ext_todo-20030105.patch) = d46d0225360c0477f93e2990637ebf912b2a86e
SIZE (qmail/ext_todo-20030105.patch) = 33763
SHA256 (qmail/ext_todo-20030105_spf.patch) = 544629c0003d01d27a5a45508e84332f247ed54ece57ff22c0c7c3a56ba086d6
SIZE (qmail/ext_todo-20030105_spf.patch) = 33781
SHA256 (qmail/ext_todo-20030105_spf_tls.patch) = 0b241b15df1d994e4ccbd5fb87ca715d9c16c7868a8e70c5c194ca1af4ab21b7
SIZE (qmail/ext_todo-20030105_spf_tls.patch) = 33813
SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f9381664819ef2f236532764309d174f29919ff1
SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
SHA256 (qmail/ext_todo-20030105_tls.patch) = 0924d3d1287200cb4efc1c3ebfa139f715d3a9d75a6d8af17520c5262a192da2
SIZE (qmail/ext_todo-20030105_tls.patch) = 33795
SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-26) = cc3530c984a1866c8ee9a015cfa1074173e38623522461becd50e5c2ee7188e3
SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-26) = 64004
SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
SIZE (qmail/auth.patch.diff) = 4412
SHA256 (qmail/auth.patch.diff-tls) = 467c5f68d5d332d2400f937c76311e5358b613923d64e68ae98d51d178c7de5e
SIZE (qmail/auth.patch.diff-tls) = 2993
SHA256 (qmail/auth.patch.diff-tls-20110119) = 838a35ea92990775fa96567366249f70e7edbfdf127bebbc23b3df58eb086921
SIZE (qmail/auth.patch.diff-tls-20110119) = 3170
SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7
SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523
SHA256 (qmail/smtpextfork-ldap-20060201_4.patch) = ff587d7169f404b4a0d0957f81a6849fd867defee5ac91a52ee958e58034b49f

1
mail/qmail/pkg-plist
View File

@ -74,6 +74,7 @@ bin/qsmhook
bin/sendmail
bin/splogger
%%SRS%%bin/srsfilter
%%TLS%%bin/update_tmprsadh
bin/tcp-env
%%NO_LDAP%%boot/binm1
%%NO_LDAP%%boot/binm1+df