Attachment #246118 for bug #274909




BDB_USES=	bdb
DMARC_LIB_DEPENDS=	libopendmarc.so:mail/opendmarc
EMBEDDED_PERL_USE=	perl5=run,build
EMBEDDED_PERL_RUN_DEPENDS=	p5-File-FcntlLock>0:devel/p5-File-FcntlLock
EXIMON_USES=	xorg
EXIMON_USE=	xorg=x11,xaw,xext,xmu,xt
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls

SQLITE_LIB_DEPENDS=	libicudata.so:devel/icu
SQLITE_USES=	pkgconfig sqlite

#DEBIAN_PATCHES_PREFIX=	${FILESDIR}/debian/75
#EXTRA_PATCHES= \
#		${DEBIAN_PATCHES_PREFIX}_01-Fix-exit-on-attempt-to-rewrite-a-malformed-address.-.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_05-SPF-fix-memory-accounting-for-error-case.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_08-Fix-regex-n-use-after-free.-Bug-2915.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_09-Fix-non-WITH_CONTENT_SCAN-build.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_16-GnuTLS-fix-for-clients-offering-no-TLS-extensions.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_18-Fix-Build-with-libopendmarc-1.4.x-fixes-2728.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_19-DMARC-fix-use-after-free-in-dmarc_dns_lookup.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_22-Fix-daemon-startup.-Bug-2930.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_23-Fix-reccipients-after-run.-.-Bug-2929.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_31-Fix-regext-substring-capture-variables-for-null-matc.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_32-Fix-regex-substring-capture-variables-for-null-match.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_34-Fix-regex-substring-capture-commentary.-Bug-2933.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_37-OpenSSL-when-preloading-creds-do-the-server-certs-be.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_38-OpenSSL-fix-double-expansion-of-tls_verify_certifica.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_50-Fix-logging-of-max-size-log-line.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_55-Fix-recursion-on-dns_again_means_nonexist.-Bug-2911.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_58-Close-server-smtp-socket-explicitly-on-connect-ACL-d.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_60-OpenSSL-fix-tls_eccurve-setting-explicit-curve-group.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_62-OpenSSL-Fix-tls_eccurve-on-earlier-versions-than-3.0.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_63-OpenSSL-log-conns-rejected-for-bad-ALPN-with-the-off.patch:-p1 \
#		${DEBIAN_PATCHES_PREFIX}_64-DANE-do-not-check-dns_again_means_nonexist-for-TLSA-.patch:-p1 \
i#		${DEBIAN_PATCHES_PREFIX}_66-Fix-crash-in-expansions.patch:-p1

.include <bsd.port.options.mk>


EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Local-sa-exim.conf
.endif

EXIM_VERSION=	4.97
SA_EXIM_VERSION=4.2.1
EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
EXTRA_PATCHES+=	`${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h`

Lines 1-5 Link Here

(-)b/mail/exim/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1697388290	1	TIMESTAMP = 1699107695
2	SHA256 (exim/exim-4.96.2.tar.bz2) = a7b9c247a8dcdf72b37ef4a6db0a744f6d34f65b40ef376265ddeb35610bb432	2	SHA256 (exim/exim-4.97.tar.bz2) = f0f6141b126a929e431d6ac8af3d6a1e310621ffe1f628b7b0de1e9b05488bfd
3	SIZE (exim/exim-4.96.2.tar.bz2) = 2047572	3	SIZE (exim/exim-4.97.tar.bz2) = 2077471
4	SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1	4	SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1
5	SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933	5	SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933

Lines 5-11 Link Here

(-)b/mail/exim/pkg-plist (+2 lines)
5	%%EXIM%%sbin/exim_dbmbuild	5	%%EXIM%%sbin/exim_dbmbuild
6	%%EXIM%%sbin/exim_dumpdb	6	%%EXIM%%sbin/exim_dumpdb
7	%%EXIM%%sbin/exim_fixdb	7	%%EXIM%%sbin/exim_fixdb
		8	%%EXIM%%sbin/exim_id_update
8	%%EXIM%%sbin/exim_lock	9	%%EXIM%%sbin/exim_lock
		10	%%EXIM%%sbin/exim_msgdate
9	%%EXIM%%sbin/exim_tidydb	11	%%EXIM%%sbin/exim_tidydb
10	%%EXIM%%sbin/exicyclog	12	%%EXIM%%sbin/exicyclog
11	%%EXIM%%sbin/exigrep	13	%%EXIM%%sbin/exigrep

Return to bug 274909

Lines 47-52 AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 Link Here

(-)b/mail/exim/Makefile (-27 / +28 lines)
47	BDB_USES= bdb	47	BDB_USES= bdb
48	DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc	48	DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc
49	EMBEDDED_PERL_USE= perl5=run,build	49	EMBEDDED_PERL_USE= perl5=run,build
		50	EMBEDDED_PERL_RUN_DEPENDS= p5-File-FcntlLock>0:devel/p5-File-FcntlLock
50	EXIMON_USES= xorg	51	EXIMON_USES= xorg
51	EXIMON_USE= xorg=x11,xaw,xext,xmu,xt	52	EXIMON_USE= xorg=x11,xaw,xext,xmu,xt
52	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	53	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
Lines 64-95 SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 Link Here
64	SQLITE_LIB_DEPENDS= libicudata.so:devel/icu	65	SQLITE_LIB_DEPENDS= libicudata.so:devel/icu
65	SQLITE_USES= pkgconfig sqlite	66	SQLITE_USES= pkgconfig sqlite
66		67
67	DEBIAN_PATCHES_PREFIX= ${FILESDIR}/debian/75	68	#DEBIAN_PATCHES_PREFIX= ${FILESDIR}/debian/75
68	EXTRA_PATCHES= \	69	#EXTRA_PATCHES= \
69	${DEBIAN_PATCHES_PREFIX}_01-Fix-exit-on-attempt-to-rewrite-a-malformed-address.-.patch:-p1 \	70	# ${DEBIAN_PATCHES_PREFIX}_01-Fix-exit-on-attempt-to-rewrite-a-malformed-address.-.patch:-p1 \
70	${DEBIAN_PATCHES_PREFIX}_05-SPF-fix-memory-accounting-for-error-case.patch:-p1 \	71	# ${DEBIAN_PATCHES_PREFIX}_05-SPF-fix-memory-accounting-for-error-case.patch:-p1 \
71	${DEBIAN_PATCHES_PREFIX}_08-Fix-regex-n-use-after-free.-Bug-2915.patch:-p1 \	72	# ${DEBIAN_PATCHES_PREFIX}_08-Fix-regex-n-use-after-free.-Bug-2915.patch:-p1 \
72	${DEBIAN_PATCHES_PREFIX}_09-Fix-non-WITH_CONTENT_SCAN-build.patch:-p1 \	73	# ${DEBIAN_PATCHES_PREFIX}_09-Fix-non-WITH_CONTENT_SCAN-build.patch:-p1 \
73	${DEBIAN_PATCHES_PREFIX}_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch:-p1 \	74	# ${DEBIAN_PATCHES_PREFIX}_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch:-p1 \
74	${DEBIAN_PATCHES_PREFIX}_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch:-p1 \	75	# ${DEBIAN_PATCHES_PREFIX}_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch:-p1 \
75	${DEBIAN_PATCHES_PREFIX}_16-GnuTLS-fix-for-clients-offering-no-TLS-extensions.patch:-p1 \	76	# ${DEBIAN_PATCHES_PREFIX}_16-GnuTLS-fix-for-clients-offering-no-TLS-extensions.patch:-p1 \
76	${DEBIAN_PATCHES_PREFIX}_18-Fix-Build-with-libopendmarc-1.4.x-fixes-2728.patch:-p1 \	77	# ${DEBIAN_PATCHES_PREFIX}_18-Fix-Build-with-libopendmarc-1.4.x-fixes-2728.patch:-p1 \
77	${DEBIAN_PATCHES_PREFIX}_19-DMARC-fix-use-after-free-in-dmarc_dns_lookup.patch:-p1 \	78	# ${DEBIAN_PATCHES_PREFIX}_19-DMARC-fix-use-after-free-in-dmarc_dns_lookup.patch:-p1 \
78	${DEBIAN_PATCHES_PREFIX}_22-Fix-daemon-startup.-Bug-2930.patch:-p1 \	79	# ${DEBIAN_PATCHES_PREFIX}_22-Fix-daemon-startup.-Bug-2930.patch:-p1 \
79	${DEBIAN_PATCHES_PREFIX}_23-Fix-reccipients-after-run.-.-Bug-2929.patch:-p1 \	80	# ${DEBIAN_PATCHES_PREFIX}_23-Fix-reccipients-after-run.-.-Bug-2929.patch:-p1 \
80	${DEBIAN_PATCHES_PREFIX}_31-Fix-regext-substring-capture-variables-for-null-matc.patch:-p1 \	81	# ${DEBIAN_PATCHES_PREFIX}_31-Fix-regext-substring-capture-variables-for-null-matc.patch:-p1 \
81	${DEBIAN_PATCHES_PREFIX}_32-Fix-regex-substring-capture-variables-for-null-match.patch:-p1 \	82	# ${DEBIAN_PATCHES_PREFIX}_32-Fix-regex-substring-capture-variables-for-null-match.patch:-p1 \
82	${DEBIAN_PATCHES_PREFIX}_34-Fix-regex-substring-capture-commentary.-Bug-2933.patch:-p1 \	83	# ${DEBIAN_PATCHES_PREFIX}_34-Fix-regex-substring-capture-commentary.-Bug-2933.patch:-p1 \
83	${DEBIAN_PATCHES_PREFIX}_37-OpenSSL-when-preloading-creds-do-the-server-certs-be.patch:-p1 \	84	# ${DEBIAN_PATCHES_PREFIX}_37-OpenSSL-when-preloading-creds-do-the-server-certs-be.patch:-p1 \
84	${DEBIAN_PATCHES_PREFIX}_38-OpenSSL-fix-double-expansion-of-tls_verify_certifica.patch:-p1 \	85	# ${DEBIAN_PATCHES_PREFIX}_38-OpenSSL-fix-double-expansion-of-tls_verify_certifica.patch:-p1 \
85	${DEBIAN_PATCHES_PREFIX}_50-Fix-logging-of-max-size-log-line.patch:-p1 \	86	# ${DEBIAN_PATCHES_PREFIX}_50-Fix-logging-of-max-size-log-line.patch:-p1 \
86	${DEBIAN_PATCHES_PREFIX}_55-Fix-recursion-on-dns_again_means_nonexist.-Bug-2911.patch:-p1 \	87	# ${DEBIAN_PATCHES_PREFIX}_55-Fix-recursion-on-dns_again_means_nonexist.-Bug-2911.patch:-p1 \
87	${DEBIAN_PATCHES_PREFIX}_58-Close-server-smtp-socket-explicitly-on-connect-ACL-d.patch:-p1 \	88	# ${DEBIAN_PATCHES_PREFIX}_58-Close-server-smtp-socket-explicitly-on-connect-ACL-d.patch:-p1 \
88	${DEBIAN_PATCHES_PREFIX}_60-OpenSSL-fix-tls_eccurve-setting-explicit-curve-group.patch:-p1 \	89	# ${DEBIAN_PATCHES_PREFIX}_60-OpenSSL-fix-tls_eccurve-setting-explicit-curve-group.patch:-p1 \
89	${DEBIAN_PATCHES_PREFIX}_62-OpenSSL-Fix-tls_eccurve-on-earlier-versions-than-3.0.patch:-p1 \	90	# ${DEBIAN_PATCHES_PREFIX}_62-OpenSSL-Fix-tls_eccurve-on-earlier-versions-than-3.0.patch:-p1 \
90	${DEBIAN_PATCHES_PREFIX}_63-OpenSSL-log-conns-rejected-for-bad-ALPN-with-the-off.patch:-p1 \	91	# ${DEBIAN_PATCHES_PREFIX}_63-OpenSSL-log-conns-rejected-for-bad-ALPN-with-the-off.patch:-p1 \
91	${DEBIAN_PATCHES_PREFIX}_64-DANE-do-not-check-dns_again_means_nonexist-for-TLSA-.patch:-p1 \	92	# ${DEBIAN_PATCHES_PREFIX}_64-DANE-do-not-check-dns_again_means_nonexist-for-TLSA-.patch:-p1 \
92	${DEBIAN_PATCHES_PREFIX}_66-Fix-crash-in-expansions.patch:-p1	93	i# ${DEBIAN_PATCHES_PREFIX}_66-Fix-crash-in-expansions.patch:-p1
93		94
94	.include <bsd.port.options.mk>	95	.include <bsd.port.options.mk>
95		96
Lines 130-136 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.c Link Here
130	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf	131	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf
131	.endif	132	.endif
132		133
133	EXIM_VERSION= 4.96.2	134	EXIM_VERSION= 4.97
134	SA_EXIM_VERSION=4.2.1	135	SA_EXIM_VERSION=4.2.1
135	EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"	136	EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"
136	EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'\|${SORT} -h`	137	EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'\|${SORT} -h`