diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index 95049cb1e2eb..f2091d34d0ff 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -1,117 +1,117 @@ PORTNAME= meta1 -PORTVERSION= 1.1.0a.18.0 -PORTREVISION= 1 +PORTVERSION= 1.1.0a.20.1 +PORTREVISION= 0 CATEGORIES= mail -MASTER_SITES= http://www.MeTA1.org/download/.alpha/baddns/ -DISTNAME= ${PORTNAME}-1.1.Alpha19.0 +MASTER_SITES= http://www.MeTA1.org/download/.alpha/evilinc/ +DISTNAME= ${PORTNAME}-1.1.Alpha20.1 MAINTAINER= dinoex@FreeBSD.org COMMENT= Secure and efficient mail gateway WWW= http://www.meta1.org/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE MAKE_JOBS_UNSAFE= yes CONFLICTS= smx MANUAL_PACKAGE_BUILD= needs hostname .if !defined(SENDMAIL_WITHOUT_SHMEM) && !defined(BUILDING_INDEX) IPCCHECK!= ipcrm -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} IGNORE= your system does not support sysvipc .endif .endif USES= libtool GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-dependency-tracking GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CPPFLAGS+= -DMTA_NETINET6 MAKE_ENV+= META1CONFDIR="${META1CONFDIR}" PORTDOCS= README.dvi README.html README.pdf README.ps README.txt \ img1.png img2.png img3.png img4.png img5.png img6.png \ nx_grp_g.png overview1.eps overview1.gif overview1.pdf \ prev_g.png up_g.png pmilter.api.tex PLIST_SUB+= NOLOGIN=${NOLOGIN_CMD} EXTRA_SBIN= libcheck/noroot libconf/tree libmta/statit \ libmta/t-hostname checks/t-getgroup GROUPS= meta1s meta1q meta1c meta1m meta1 USERS= meta1s meta1q meta1c meta1m meta1 # default config: META1CONFDIR?= ${PREFIX}/etc/meta1 NOLOGIN_CMD?= /usr/sbin/nologin OPTIONS_DEFINE= IPV6 PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS OPTIONS_DEFAULT= PMILTER DKIM SASL2 TLS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes PMILTER_DESC= Adds policy milter support DKIM_DESC= Enable DKIM signing support MSP_DESC= Enable mail submision program SASL2_DESC= Adds SASL2 support SASL2AUTHD_DESC= Enable plaintext authentication via SASL2 IPV6_ENV= MTA_NETINET6=1 PMILTER_USES= ssl PMILTER_CONFIGURE_ENABLE= pmilter DKIM_CONFIGURE_ENABLE= DKIM MSP_CONFLICTS= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-* MSP_CONFIGURE_ENABLE= msp SASL2_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL2_CONFIGURE_ENABLE= SASL SASL2_CONFIGURE_ON= --with-sasl-incdir=${LOCALBASE}/include \ --with-sasl-libdir=${LOCALBASE}/lib SASL2AUTHD_IMPLIES= SASL2 SASL2AUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd TLS_USES= ssl TLS_CONFIGURE_ENABLE= TLS TLS_CPPFLAGS= -I${LOCALBASE}/include TLS_LDFLAGS= -L${LOCALBASE}/lib .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=int-conversion .endif post-configure: @${CP} ${WRKSRC}/misc/sm.check.sh \ ${WRKSRC}/misc/sm.setup.sh \ ${WRKDIR}/ @${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \ -e 's|$${SD}/misc|${PREFIX}/bin|' \ -e 's|$${SD}/libcheck|${PREFIX}/sbin|' \ -e 's|$${SD}/libmta|${PREFIX}/sbin|' \ -e 's|$${SD}/checks|${PREFIX}/sbin|' \ ${WRKDIR}/sm.check.sh @${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \ -e 's|$${S}/misc|${PREFIX}/bin|' \ -e 's|$${S}/libconf|${PREFIX}/sbin|' \ -e 's|$${S}/libmta|${PREFIX}/sbin|' \ -e 's|$${S}/checks|${PREFIX}/sbin|' \ -e 's|=mcp.sh|=${PREFIX}/etc/rc.d/meta1-mcp.sh|' \ ${WRKDIR}/sm.setup.sh @${REINPLACE_CMD} -e "/install-data-hook/d" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|^TESTS =.*|TESTS = $$(TESTP)|' \ ${WRKSRC}/libdkim/Makefile.in ${CP} ${WRKSRC}/libdns/common.sh ${WRKSRC}/ test: build (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) post-install: ${INSTALL_SCRIPT} ${WRKDIR}/sm.check.sh ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_SCRIPT} ${WRKDIR}/sm.setup.sh ${STAGEDIR}${PREFIX}/sbin/ .for i in ${EXTRA_SBIN} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/ .endfor .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .endif .include diff --git a/mail/meta1/distinfo b/mail/meta1/distinfo index 5065ea9e6aab..24594926def9 100644 --- a/mail/meta1/distinfo +++ b/mail/meta1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664195636 -SHA256 (meta1-1.1.Alpha19.0.tar.gz) = df179fd27d21a303acdc003a55a78109de91cba743ce74947724a0fdba8e119c -SIZE (meta1-1.1.Alpha19.0.tar.gz) = 5391051 +TIMESTAMP = 1724902918 +SHA256 (meta1-1.1.Alpha20.1.tar.gz) = 3610ab24d61021d036d0f51ecc952e63139281119a1dc016ca407abd8b4486b0 +SIZE (meta1-1.1.Alpha20.1.tar.gz) = 5588546 diff --git a/mail/meta1/files/patch-include_sm_mapcnf.h b/mail/meta1/files/patch-include_sm_mapcnf.h deleted file mode 100644 index 9846ccf7b584..000000000000 --- a/mail/meta1/files/patch-include_sm_mapcnf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/sm/mapcnf.h.orig 2020-12-27 19:02:05 UTC -+++ include/sm/mapcnf.h -@@ -50,7 +50,7 @@ typedef enum mapspec_kind_E mapspec_kind_T; - sm_map_P mst_##what##_map; \ - char *mst_##what##_name; \ - char *mst_##what##_type; \ -- sm_ret_T *mst_##what##_ret -+ sm_ret_T mst_##what##_ret - - #define SM_MAPSPEC_FL_IMPLDET 0x00000001u - diff --git a/mail/meta1/files/patch-smtps_smtps.c b/mail/meta1/files/patch-smtps_smtps.c deleted file mode 100644 index 64ece87b7c16..000000000000 --- a/mail/meta1/files/patch-smtps_smtps.c +++ /dev/null @@ -1,15 +0,0 @@ ---- smtps/smtps.c.orig 2022-09-24 16:59:28 UTC -+++ smtps/smtps.c -@@ -2168,9 +2168,11 @@ ss_proxy_policy(sasl_conn_t *conn, void *context, cons - return SASL_OK; - } - -+typedef int (*sasl_callback_ft)(void); -+ - static sasl_callback_t sm_sasl_srvcbs[] = - { -- { SASL_CB_PROXY_POLICY, &ss_proxy_policy, NULL }, -+ { SASL_CB_PROXY_POLICY, (sasl_callback_ft)&ss_proxy_policy, NULL }, - { SASL_CB_LIST_END, NULL, NULL } - }; - #endif diff --git a/mail/meta1/pkg-plist b/mail/meta1/pkg-plist index a48632c916a8..0c813f3ed8b3 100644 --- a/mail/meta1/pkg-plist +++ b/mail/meta1/pkg-plist @@ -1,76 +1,80 @@ bin/db_archive bin/db_checkpoint bin/db_deadlock bin/db_dump bin/db_load bin/db_printlog bin/db_recover bin/db_stat bin/db_upgrade bin/db_verify include/db.h lib/libdb-4.3.a lib/libdb.a bin/createmap bin/log2time bin/mailq bin/mailq.sh bin/mapchk bin/metaconf bin/metaqueue bin/qmgrctl bin/qmgrctl.sh bin/rcvrenvfromlog.sh bin/runas bin/smconf +include/sm/cdefs.h include/sm/error.h +include/sm/generic.h include/sm/hdrmoddef.h include/sm/mfapi.h include/sm/pmfapi.h include/sm/pmfdef.h include/sm/pmilter.h include/sm/smreplycodes.h include/sm/smmts.h include/sm/ssmdef.h +include/sm/types.h +include/smconf.h lib/meta1/libcstrr.a lib/meta1/libevthr.a lib/meta1/libmtar.a lib/meta1/libpmilter.a lib/meta1/libpmutil.a lib/meta1/librcbcommr.a lib/meta1/librcbr.a lib/meta1/libreplr.a lib/meta1/librsctr.a lib/meta1/libthr.a libexec/qmgr libexec/smar libexec/smtpc libexec/smtpp libexec/smtps sbin/greyprint sbin/greyrm sbin/mcp sbin/noroot %%MSP%%sbin/sendmail sbin/sm.check.sh sbin/sm.setup.sh sbin/statit sbin/t-hostname sbin/t-getgroup sbin/tree share/man/man5/meta1.conf.5.gz share/man/man8/createmap.8.gz share/man/man8/fsperf1.8.gz share/man/man8/mailq.8.gz share/man/man8/mcp.8.gz share/man/man8/milter-spamd.8.gz share/man/man8/milter-regex.8.gz share/man/man8/qmgr.8.gz share/man/man8/qmgrctl.8.gz share/man/man8/runas.8.gz share/man/man8/meta1.8.gz %%MSP%%share/man/man8/sendmail.8.gz share/man/man8/smar.8.gz share/man/man8/smtpc.8.gz share/man/man8/smtpp.8.gz share/man/man8/smtps.8.gz