Attachment #229605 for bug #259945

View | Details | Raw Unified | Return to bug 259945
Collapse All | Expand All




# Created by: Ville Eerola <ve@sci.fi>

PORTNAME?=	fetchmail
DISTVERSION=	6.4.24
PORTREVISION?=	0
CATEGORIES=	mail
# The next line is inherited by the fetchmailconf dependent port,
# do NOT replace fetchmail by ${PORTNAME}

MAINTAINER=	chalpin@cs.wisc.edu
COMMENT?=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR

LICENSE=	GPLv2+
LICENSE_COMB=	dual

.if empty(MASTERDIR)
USES=		cpe gmake ssl tar:xz
IGNORE_SSL=	libressl libressl-devel
IGNORE_SSL_REASON=incompatible license/no GPLv2 clause 2b exception for LibreSSL

USERS=		${PORTNAME}
GROUPS=		${USERS}

USE_RC_SUBR=	fetchmail
SUB_FILES=	pkg-message

GNU_CONFIGURE=	yes

# the added PYTHON=: suppresses python builds,
# see ../../mail/fetchmailconf/ for the configuration tool
CONFIGURE_ARGS=	--enable-fallback=no \
		--enable-opie \
		--enable-RPA \
		--enable-SDPS \
		--with-ssl=${OPENSSLBASE} \
		--without-hesiod \
		PYTHON=:

# -Wl,--as-needed suppresses unneeded library references,
# for instance, libcom_err.so on GSSAPI_NONE builds:
LDFLAGS+=	-L${LOCALBASE}/lib -Wl,--as-needed

PATCH_STRIP=	-p1
SUB_FILES=	pkg-message
USERS=		${PORTNAME}
GROUPS=		${USERS}

OPTIONS_DEFINE=		CA_BUNDLE DOCS NLS
OPTIONS_DEFAULT=	CA_BUNDLE GSSAPI_BASE
OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_SUB=		yes

CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

GSSAPI_BASE_USES=		gssapi
GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
				--with-gssapi=${GSSAPIBASEDIR}
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
				--with-gssapi=${GSSAPIBASEDIR}
GSSAPI_MIT_USES=		gssapi:mit
GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
				--with-kerberos5=${GSSAPIBASEDIR}
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls

PORTDOCS=	FAQ FEATURES NEWS NOTES OLDNEWS README README.SSL \
		README.SSL-SERVER design-notes.html esrs-design-notes.html \
		fetchmail-FAQ.html fetchmail-features.html todo.html
		esrs-design-notes.html todo.html

post-patch:
.if !exists(/usr/lib/libcom_err.so)


.endif

PATCH_STRIP=	-p1

.if empty(MASTERDIR)
post-build:
	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }

Lines 1-3 Link Here

(-)b/mail/fetchmail/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1631567945	1	TIMESTAMP = 1637401885
2	SHA256 (fetchmail-6.4.22.tar.xz) = cc6818bd59435602169fa292d6d163d56b21c7f53112829470a3aceabe612c84	2	SHA256 (fetchmail-6.4.24.tar.xz) = 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf
3	SIZE (fetchmail-6.4.22.tar.xz) = 1330176	3	SIZE (fetchmail-6.4.24.tar.xz) = 1331764




$OpenBSD: patch-tls-aux_h,v 1.1 2021/07/29 10:44:07 sthen Exp $

Index: tls-aux.h
--- tls-aux.h.orig
+++ tls-aux.h
@@ -8,7 +8,7 @@
 #ifdef SSL_ENABLE
 #include <openssl/opensslv.h>
 
-# if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x1010000fL
+# if OPENSSL_VERSION_NUMBER < 0x1010000fL
 #  undef OSSL110_API
 # else
 #  define OSSL110_API 1




MAINTAINER=	chalpin@cs.wisc.edu
COMMENT=	Python-based GUI to configure fetchmail

LICENSE=	GPLv2+
LICENSE_COMB=	dual

# minimum required version 6.4.2 - not codified, on the assumption
# that fetchmail port updated at the same time
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
		fetchmail>=${PORTVERSION}:mail/fetchmail
BUILD_DEPENDS+=	${RUN_DEPENDS}

USES=		python shebangfix tar:xz
USE_PYTHON=	py3kplist

GNU_CONFIGURE=	yes
ALL_TARGET=	fetchmailconf
INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man

FILESDIR=	${.CURDIR}/files
PATCHDIR=	${FILESDIR}
NO_ARCH=	yes

SUB_FILES=	fetchmailconf
SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
PLIST=		${.CURDIR}/pkg-plist
NO_ARCH=	yes

GNU_CONFIGURE=	yes

ALL_TARGET=	fetchmailconf
INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man

post-install:
# first, run smoke tests - the version check makes sure we have all
- 

Return to bug 259945

Lines 1-8 Link Here

(-)b/mail/fetchmail/Makefile (-31 / +36 lines)
1	# Created by: Ville Eerola <ve@sci.fi>	1	# Created by: Ville Eerola <ve@sci.fi>
2		2
3	PORTNAME?= fetchmail	3	PORTNAME?= fetchmail
4	DISTVERSION= 6.4.22	4	DISTVERSION= 6.4.24
5	PORTREVISION= 1	5	PORTREVISION?= 0
6	CATEGORIES= mail	6	CATEGORIES= mail
7	# The next line is inherited by the fetchmailconf dependent port,	7	# The next line is inherited by the fetchmailconf dependent port,
8	# do NOT replace fetchmail by ${PORTNAME}	8	# do NOT replace fetchmail by ${PORTNAME}
Lines 11-65 MASTER_SITES= SF/fetchmail/branch_6.4/ Link Here
11	MAINTAINER= chalpin@cs.wisc.edu	11	MAINTAINER= chalpin@cs.wisc.edu
12	COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR	12	COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
13		13
14	LICENSE= GPLv2 LGPL21	14	LICENSE= GPLv2+
15	LICENSE_COMB= dual
16		15
17	.if empty(MASTERDIR)	16	.if empty(MASTERDIR)
18	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	17	USES= cpe gmake ssl tar:xz
19		18	IGNORE_SSL= libressl libressl-devel
20	USES= cpe gmake tar:xz ssl	19	IGNORE_SSL_REASON=incompatible license/no GPLv2 clause 2b exception for LibreSSL
21
22	USERS= ${PORTNAME}
23	GROUPS= ${USERS}
24		20
25	USE_RC_SUBR= fetchmail	21	USE_RC_SUBR= fetchmail
26	SUB_FILES= pkg-message
27		22
28	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
29		24
30	# the added PYTHON=: suppresses python builds,	25	# the added PYTHON=: suppresses python builds,
31	# see ../../mail/fetchmailconf/ for the configuration tool	26	# see ../../mail/fetchmailconf/ for the configuration tool
32	CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \	27	CONFIGURE_ARGS= --enable-fallback=no \
33	--without-hesiod --enable-fallback=no \	28	--enable-opie \
34	--with-ssl=${OPENSSLBASE} PYTHON=:	29	--enable-RPA \
		30	--enable-SDPS \
		31	--with-ssl=${OPENSSLBASE} \
		32	--without-hesiod \
		33	PYTHON=:
35		34
36	# -Wl,--as-needed suppresses unneeded library references,	35	# -Wl,--as-needed suppresses unneeded library references,
37	# for instance, libcom_err.so on GSSAPI_NONE builds:	36	# for instance, libcom_err.so on GSSAPI_NONE builds:
38	LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed	37	LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed
39		38
40	OPTIONS_DEFINE= CA_BUNDLE NLS DOCS	39	PATCH_STRIP= -p1
41	OPTIONS_SINGLE= GSSAPI	40	SUB_FILES= pkg-message
42	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE	41	USERS= ${PORTNAME}
		42	GROUPS= ${USERS}
		43
		44	OPTIONS_DEFINE= CA_BUNDLE DOCS NLS
43	OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE	45	OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE
44	OPTIONS_SUB= yes	46	OPTIONS_SINGLE= GSSAPI
		47	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		48	OPTIONS_SUB= yes
45		49
46	CA_BUNDLE_DESC= Install CA bundle for OpenSSL	50	CA_BUNDLE_DESC= Install CA bundle for OpenSSL
		51	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
47		52
48	GSSAPI_BASE_USES= gssapi	53	GSSAPI_BASE_USES= gssapi
49	GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	54	GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
50	GSSAPI_HEIMDAL_USES= gssapi:heimdal	55	--with-gssapi=${GSSAPIBASEDIR}
51	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	56	GSSAPI_HEIMDAL_USES= gssapi:heimdal
52	GSSAPI_MIT_USES= gssapi:mit	57	GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
53	GSSAPI_MIT_CONFIGURE_ON= --with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	58	--with-gssapi=${GSSAPIBASEDIR}
		59	GSSAPI_MIT_USES= gssapi:mit
		60	GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
		61	--with-kerberos5=${GSSAPIBASEDIR}
54	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi	62	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
55		63
56	NLS_USES= gettext	64	NLS_USES= gettext
57	NLS_CONFIGURE_ENABLE= nls	65	NLS_CONFIGURE_ENABLE= nls
58		66
59	PORTDOCS= FAQ FEATURES NEWS NOTES OLDNEWS \	67	PORTDOCS= FAQ FEATURES NEWS NOTES OLDNEWS README README.SSL \
60	README README.SSL README.SSL-SERVER \	68	README.SSL-SERVER design-notes.html esrs-design-notes.html \
61	design-notes.html fetchmail-FAQ.html fetchmail-features.html \	69	fetchmail-FAQ.html fetchmail-features.html todo.html
62	esrs-design-notes.html todo.html
63		70
64	post-patch:	71	post-patch:
65	.if !exists(/usr/lib/libcom_err.so)	72	.if !exists(/usr/lib/libcom_err.so)
Lines 68-75 post-patch: Link Here
68		75
69	.endif	76	.endif
70		77
71	PATCH_STRIP= -p1
72
73	.if empty(MASTERDIR)	78	.if empty(MASTERDIR)
74	post-build:	79	post-build:
75	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }	80	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }

Removed Link Here

(-)a/mail/fetchmail/files/patch-LibreSSL (-14 lines)
1	$OpenBSD: patch-tls-aux_h,v 1.1 2021/07/29 10:44:07 sthen Exp $
2
3	Index: tls-aux.h
4	--- tls-aux.h.orig
5	+++ tls-aux.h
6	@@ -8,7 +8,7 @@
7	#ifdef SSL_ENABLE
8	#include <openssl/opensslv.h>
9
10	-# if defined(LIBRESSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER < 0x1010000fL
11	+# if OPENSSL_VERSION_NUMBER < 0x1010000fL
12	# undef OSSL110_API
13	# else
14	# define OSSL110_API 1

Lines 7-37 DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} Link Here

(-)b/mail/fetchmailconf/Makefile (-12 / +10 lines)
7	MAINTAINER= chalpin@cs.wisc.edu	7	MAINTAINER= chalpin@cs.wisc.edu
8	COMMENT= Python-based GUI to configure fetchmail	8	COMMENT= Python-based GUI to configure fetchmail
9		9
10	LICENSE= GPLv2 LGPL21	10	LICENSE= GPLv2+
11	LICENSE_COMB= dual
12		11
13	# minimum required version 6.4.2 - not codified, on the assumption	12	# minimum required version 6.4.2 - not codified, on the assumption
14	# that fetchmail port updated at the same time	13	# that fetchmail port updated at the same time
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \	14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \	15	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
17	fetchmail>=${PORTVERSION}:mail/fetchmail	16	fetchmail>=${PORTVERSION}:mail/fetchmail
18	BUILD_DEPENDS+= ${RUN_DEPENDS}	17	BUILD_DEPENDS+= ${RUN_DEPENDS}
19		18
20	USES= python shebangfix tar:xz	19	USES= python shebangfix tar:xz
21	USE_PYTHON= py3kplist	20	USE_PYTHON= py3kplist
22		21
		22	GNU_CONFIGURE= yes
		23	ALL_TARGET= fetchmailconf
		24	INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man
		25
23	FILESDIR= ${.CURDIR}/files	26	FILESDIR= ${.CURDIR}/files
24	PATCHDIR= ${FILESDIR}	27	PATCHDIR= ${FILESDIR}
		28	NO_ARCH= yes
25		29
26	SUB_FILES= fetchmailconf	30	SUB_FILES= fetchmailconf
27	SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}	31	SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \
		32	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
28	PLIST= ${.CURDIR}/pkg-plist	33	PLIST= ${.CURDIR}/pkg-plist
29	NO_ARCH= yes
30
31	GNU_CONFIGURE= yes
32
33	ALL_TARGET= fetchmailconf
34	INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man
35		34
36	post-install:	35	post-install:
37	# first, run smoke tests - the version check makes sure we have all	36	# first, run smoke tests - the version check makes sure we have all
38	-