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

(-)b/Mk/Scripts/qa.sh (+29 lines)
Lines 96-101 shebang() { Link Here
96
96
97
baselibs() {
97
baselibs() {
98
	local rc
98
	local rc
99
	local found_openssl
99
	[ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return
100
	[ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return
100
	while read f; do
101
	while read f; do
101
		case ${f} in
102
		case ${f} in
Lines 107-118 baselibs() { Link Here
107
			err "Bad linking on ${f##* } please add USES=libedit"
108
			err "Bad linking on ${f##* } please add USES=libedit"
108
			rc=1
109
			rc=1
109
			;;
110
			;;
111
		*NEEDED*\[libcrypto.so.[67]]|*NEEDED*\[libssl.so.[67]])
112
			err "Bad linking on ${f##* } please add USES=ssl"
113
			rc=1
114
			;;
115
		*NEEDED*\[libcrypto.so.*]|*NEEDED*\[libssl.so.*])
116
			found_openssl=1
117
			;;
118
		*NEEDED*\[libasn1.so.1[01]] |
119
		*NEEDED*\[libcom_err.so.5] |
120
		*NEEDED*\[libgssapi.so.10] |
121
		*NEEDED*\[libhdb.so.1[01]] |
122
		*NEEDED*\[libheimbase.so.11] |
123
		*NEEDED*\[libheimntlm.so.1[01]] |
124
		*NEEDED*\[libhx509.so.1[01]] |
125
		*NEEDED*\[libkadm5clnt.so.1[01]] |
126
		*NEEDED*\[libkadm5srv.so.10[1]] |
127
		*NEEDED*\[libkdc.so.11] |
128
		*NEEDED*\[libkrb5.so.1[01] |]
129
		*NEEDED*\[libroken.so.1[01]] |
130
		*NEEDED*\[libwind.so.11])
131
			err "Bad linking on ${f##* } please add USES=gssapi"
132
			rc=1
133
			;;
110
		esac
134
		esac
111
	done <<-EOF
135
	done <<-EOF
112
	$(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \
136
	$(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \
113
		${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/libexec \
137
		${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/libexec \
114
		-type f -exec readelf -d {} + 2>/dev/null)
138
		-type f -exec readelf -d {} + 2>/dev/null)
115
	EOF
139
	EOF
140
	if [ -z "${USESSSL}" -a -n "${found_openssl}" ]; then
141
		warn "you need USES=nssl"
142
	elif [ -n "${USESSSL}" -a -z "${found_openssl}" ]; then
143
		warn "you may not need USES=ssl"
144
	fi
116
	return ${rc}
145
	return ${rc}
117
}
146
}
118
147
(-)b/Mk/Uses/gssapi.mk (-21 / +5 lines)
Lines 4-14 Link Here
4
#
4
#
5
# Feature:	gssapi
5
# Feature:	gssapi
6
# Usage:	USES=gssapi or USES=gssapi:ARGS
6
# Usage:	USES=gssapi or USES=gssapi:ARGS
7
# Valid ARGS:	base (default, implicit), heimdal, mit.
7
# Valid ARGS:	heimdal, mit (default).
8
#		"bootstrap" is a special prefix only for krb5 or heimdal ports.
8
#		"bootstrap" is a special prefix only for krb5 or heimdal ports.
9
#		("bootstrap,mit")
9
#		("bootstrap,mit")
10
#		flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.
10
#		flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.
11
#		("base,flags")
11
#		("mit,flags")
12
#
12
#
13
# MAINTAINER:	hrs@FreeBSD.org
13
# MAINTAINER:	hrs@FreeBSD.org
14
#
14
#
Lines 41-51 Link Here
41
#  A typical example:
41
#  A typical example:
42
#
42
#
43
#   OPTIONS_SINGLE= GSSAPI
43
#   OPTIONS_SINGLE= GSSAPI
44
#   OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
44
#   OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
45
#
46
#   GSSAPI_BASE_USES=	gssapi
47
#   GSSAPI_BASE_CONFIGURE_ON= \
48
#	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
49
#
45
#
50
#   GSSAPI_HEIMDAL_USES=gssapi:heimdal
46
#   GSSAPI_HEIMDAL_USES=gssapi:heimdal
51
#   GSSAPI_HEIMDAL_CONFIGURE_ON= \
47
#   GSSAPI_HEIMDAL_CONFIGURE_ON= \
Lines 81-103 _HEADERS= sys/types.h sys/stat.h stdint.h Link Here
81
77
82
.undef _FIXUP_KRB5CONFIG
78
.undef _FIXUP_KRB5CONFIG
83
.if empty(gssapi_ARGS)
79
.if empty(gssapi_ARGS)
84
gssapi_ARGS=	base
80
gssapi_ARGS=	mit
85
.endif
81
.endif
86
.for _A in ${gssapi_ARGS}
82
.for _A in ${gssapi_ARGS}
87
_local:=	${_A}
83
_local:=	${_A}
88
.if ${_local} == "base"
84
.if ${_local} == "heimdal"
89
HEIMDAL_HOME=	/usr
90
GSSAPIBASEDIR=	${HEIMDAL_HOME}
91
GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
92
GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
93
_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
94
GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
95
GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
96
GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
97
.if empty(OSREL:N9.3)
98
_FIXUP_KRB5CONFIG=	yes
99
.endif
100
.elif ${_local} == "heimdal"
101
HEIMDAL_HOME?=	${LOCALBASE}
85
HEIMDAL_HOME?=	${LOCALBASE}
102
GSSAPIBASEDIR=	${HEIMDAL_HOME}
86
GSSAPIBASEDIR=	${HEIMDAL_HOME}
103
GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
87
GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
(-)b/Mk/Uses/localbase.mk (-1 / +1 lines)
Lines 14-20 _INCLUDE_USES_LOCALBASE_MK= yes Link Here
14
CPPFLAGS+=	-isystem ${LOCALBASE}/include
14
CPPFLAGS+=	-isystem ${LOCALBASE}/include
15
CFLAGS+=	-isystem ${LOCALBASE}/include
15
CFLAGS+=	-isystem ${LOCALBASE}/include
16
CXXFLAGS+=	-isystem ${LOCALBASE}/include
16
CXXFLAGS+=	-isystem ${LOCALBASE}/include
17
LDFLAGS+=	-L${LOCALBASE}/lib
17
LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib -Wl,--enable-new-dtags
18
18
19
# Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs
19
# Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs
20
# this, and CMAKE_ARGS is not used when bootstrapping CMake.
20
# this, and CMAKE_ARGS is not used when bootstrapping CMake.
(-)b/Mk/Uses/ssl.mk (+38 lines)
Added Link Here
1
# $FreeBSD$
2
#
3
.if !defined(_INCLUDE_USES_SSL_MK)
4
_INCLUDE_USES_SSL_MK=	yes
5
6
.include "${USESDIR}/localbase.mk"
7
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
8
9
# If you add another SSL flavor, remember to add it to bsd.default-versions.mk.
10
.if ${SSL_DEFAULT} == libressl-devel
11
OPENSSL_SHLIBVER=	37
12
OPENSSL_PORT=		security/libressl-devel
13
.elif ${SSL_DEFAULT} == libressl
14
OPENSSL_SHLIBVER=	35
15
OPENSSL_PORT=		security/libressl
16
.else
17
OPENSSL_SHLIBVER=	8
18
OPENSSL_PORT=		security/openssl
19
.if exists(${LOCALBASE}/lib/libcrypto.so) && !exists(${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER})
20
.error You seem not to be using OpenSSL for your crypto. You must set \
21
	DEFAULT_VERSIONS+=ssl=libressl or libressl-devel in your make.conf
22
.endif
23
.endif
24
25
LIB_DEPENDS+=	libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}
26
27
# Those are DEPRECATED but still here for compat reasons
28
OPENSSLBASE=		${LOCALBASE}
29
OPENSSLDIR?=		${OPENSSLBASE}/openssl
30
OPENSSLLIB=		${OPENSSLBASE}/lib
31
OPENSSLINC=		${OPENSSLBASE}/include
32
33
MAKE_ENV+=		OPENSSLBASE=${OPENSSLBASE}
34
MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
35
MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
36
MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
37
38
.endif
(-)b/Mk/bsd.default-versions.mk (+2 lines)
Lines 59-64 PYTHON2_DEFAULT?= 2.7 Link Here
59
PYTHON3_DEFAULT?=	3.4
59
PYTHON3_DEFAULT?=	3.4
60
# Possible values: 2.0, 2.1, 2.2, 2.3
60
# Possible values: 2.0, 2.1, 2.2, 2.3
61
RUBY_DEFAULT?=		2.2
61
RUBY_DEFAULT?=		2.2
62
# Possible values: openssl, libressl, libressl-devel
63
SSL_DEFAULT?=		openssl
62
# Possible values: 8.4, 8.5, 8.6
64
# Possible values: 8.4, 8.5, 8.6
63
TCLTK_DEFAULT?=		8.6
65
TCLTK_DEFAULT?=		8.6
64
66
(-)a/Mk/bsd.openssl.mk (-142 lines)
Removed Link Here
1
#
2
# $FreeBSD$
3
# bsd.openssl.mk - Support for OpenSSL based ports.
4
#
5
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
6
#
7
# The user/port can now set these options in the Makefiles.
8
#
9
# WITH_OPENSSL_BASE=yes	- Use the version in the base system.
10
# WITH_OPENSSL_PORT=yes	- Use the OpenSSL port, even if base is up to date.
11
#
12
# USE_OPENSSL_RPATH=yes	- Pass RFLAGS options in CFLAGS,
13
#			  needed for ports who don't use LDFLAGS.
14
#
15
# Overrideable defaults:
16
#
17
# OPENSSL_SHLIBVER=	8
18
# OPENSSL_PORT=		security/openssl
19
#
20
# The Makefile sets these variables:
21
# OPENSSLBASE		- "/usr" or ${LOCALBASE}
22
# OPENSSLDIR		- path to openssl
23
# OPENSSLLIB		- path to the libs
24
# OPENSSLINC		- path to the matching includes
25
# OPENSSLRPATH		- rpath for dynamic linker
26
#
27
# MAKE_ENV		- extended with the variables above
28
# CONFIGURE_ENV		- extended with LDFLAGS
29
# BUILD_DEPENDS		- are added if needed
30
# RUN_DEPENDS		- are added if needed
31
32
OpenSSL_Include_MAINTAINER=	dinoex@FreeBSD.org
33
34
#	If no preference was set, check for an installed base version
35
#	but give an installed port preference over it.
36
.if	!defined(WITH_OPENSSL_BASE) && \
37
	!defined(WITH_OPENSSL_PORT) && \
38
	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
39
	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
40
WITH_OPENSSL_BASE=yes
41
.endif
42
43
.if defined(WITH_OPENSSL_BASE)
44
OPENSSLBASE=		/usr
45
OPENSSLDIR?=		/etc/ssl
46
47
.if !exists(${DESTDIR}/usr/lib/libcrypto.so)
48
check-depends::
49
	@${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of"
50
	@${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your"
51
	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
52
	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
53
	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
54
	@${ECHO_CMD} "OpenSSL distribution."
55
	@${FALSE}
56
.endif
57
.if exists(${LOCALBASE}/lib/libcrypto.so)
58
check-depends::
59
	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
60
	@${ECHO_CMD} "base system. You can't build against it, while a newer"
61
	@${ECHO_CMD} "version is installed by a port."
62
	@${ECHO_CMD} "Please deinstall the port or undefine WITH_OPENSSL_BASE."
63
	@${FALSE}
64
.endif
65
66
# OpenSSL in the base system may not include IDEA for patent licensing reasons.
67
.if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
68
OPENSSL_IDEA=		${MAKE_IDEA}
69
.else
70
OPENSSL_IDEA?=		NO
71
.endif
72
73
.if ${OPENSSL_IDEA} == "NO"
74
# XXX This is a hack to work around the fact that /etc/make.conf clobbers
75
#     our CFLAGS. It might not be enough for all future ports.
76
.if defined(HAS_CONFIGURE)
77
CFLAGS+=		-DNO_IDEA
78
.else
79
OPENSSL_CFLAGS+=	-DNO_IDEA
80
.endif
81
MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
82
.endif
83
84
.else
85
86
OPENSSLBASE=		${LOCALBASE}
87
.if	!defined(OPENSSL_PORT) && \
88
	exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
89
# find installed port and use it for dependency
90
.if !defined(OPENSSL_INSTALLED)
91
.if defined(DESTDIR)
92
PKGARGS=	-c ${DESTDIR}
93
.else
94
PKGARGS=
95
.endif
96
OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
97
.endif
98
.if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
99
OPENSSL_PORT=		${OPENSSL_INSTALLED}
100
OPENSSL_SHLIBFILE!=	${PKG_INFO} -ql ${OPENSSL_INSTALLED} | ${GREP} "^`${PKG_QUERY} "%p" ${OPENSSL_INSTALLED}`/lib/libcrypto.so.[0-9]*$$"
101
OPENSSL_SHLIBVER?=	${OPENSSL_SHLIBFILE:E}
102
.endif
103
.endif
104
105
# LibreSSL specific SHLIBVER
106
.if   defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
107
OPENSSL_SHLIBVER?=	35
108
.elif defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl-devel
109
OPENSSL_SHLIBVER?=	37
110
.endif
111
112
# default
113
OPENSSL_PORT?=		security/openssl
114
OPENSSL_SHLIBVER?=	8
115
116
OPENSSLDIR?=		${OPENSSLBASE}/openssl
117
BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
118
RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
119
OPENSSLRPATH=		${LOCALBASE}/lib
120
121
.endif
122
123
OPENSSLLIB=		${OPENSSLBASE}/lib
124
OPENSSLINC=		${OPENSSLBASE}/include
125
126
MAKE_ENV+=		OPENSSLBASE=${OPENSSLBASE}
127
MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
128
MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
129
MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
130
131
.if defined(OPENSSLRPATH)
132
.if defined(USE_OPENSSL_RPATH)
133
CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
134
.endif
135
MAKE_ENV+=		OPENSSLRPATH=${OPENSSLRPATH}
136
OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
137
.endif
138
139
LDFLAGS+=		${OPENSSL_LDFLAGS}
140
141
### crypto
142
#RESTRICTED=		"Contains cryptography."
(-)b/Mk/bsd.port.mk (-1 / +4 lines)
Lines 1352-1358 PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg Link Here
1352
.endif
1352
.endif
1353
1353
1354
.if defined(USE_OPENSSL)
1354
.if defined(USE_OPENSSL)
1355
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
1355
USES+=	ssl
1356
.endif
1356
.endif
1357
1357
1358
.if defined(USE_EMACS)
1358
.if defined(USE_EMACS)
Lines 1505-1510 QA_ENV+= STAGEDIR=${STAGEDIR} \ Link Here
1505
				"STRIP=${STRIP}" \
1505
				"STRIP=${STRIP}" \
1506
				TMPPLIST=${TMPPLIST} \
1506
				TMPPLIST=${TMPPLIST} \
1507
				PKGBASE=${PKGBASE}
1507
				PKGBASE=${PKGBASE}
1508
.if !empty(USES:Mssl)
1509
QA_ENV+=		USESSSL=yes
1510
.endif
1508
.if !empty(USES:Mdesktop-file-utils)
1511
.if !empty(USES:Mdesktop-file-utils)
1509
QA_ENV+=		USESDESKTOPFILEUTILS=yes
1512
QA_ENV+=		USESDESKTOPFILEUTILS=yes
1510
.endif
1513
.endif
(-)b/Mk/bsd.sanity.mk (-1 / +2 lines)
Lines 170-176 SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ Link Here
170
		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
170
		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
171
		UNIQUENAME LATEST_LINK
171
		UNIQUENAME LATEST_LINK
172
SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_SQLITE \
172
SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_SQLITE \
173
			USE_FIREBIRD
173
			USE_FIREBIRD USE_OPENSSL
174
SANITY_NOTNEEDED=	WX_UNICODE
174
SANITY_NOTNEEDED=	WX_UNICODE
175
175
176
USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
176
USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
Lines 211-216 WX_UNICODE_REASON= Now no-op as only unicode is supported now Link Here
211
PLIST_DIRSTRY_ALT=	PLIST_DIRS
211
PLIST_DIRSTRY_ALT=	PLIST_DIRS
212
USE_SQLITE_ALT=		USES=sqlite
212
USE_SQLITE_ALT=		USES=sqlite
213
USE_FIREBIRD_ALT=	USES=firebird
213
USE_FIREBIRD_ALT=	USES=firebird
214
USE_OPENSSL_ALT=	USES=ssl
214
215
215
.for a in ${SANITY_DEPRECATED}
216
.for a in ${SANITY_DEPRECATED}
216
.if defined(${a})
217
.if defined(${a})
(-)b/benchmarks/polygraph/Makefile (-1 / +1 lines)
Lines 27-33 OPTIONS_DEFAULT= SSL ZLIB Link Here
27
27
28
GNUPLOT_DESC=		GNUPlot for full reporting functionality
28
GNUPLOT_DESC=		GNUPlot for full reporting functionality
29
GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
29
GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
30
GSSAPI_USES=		gssapi:mit
30
GSSAPI_USES=		gssapi
31
GSSAPI_CONFIGURE_ON=	--with-kerberos=${KRB5CONFIG} ${GSSAPI_CONFIGURE_ARGS}
31
GSSAPI_CONFIGURE_ON=	--with-kerberos=${KRB5CONFIG} ${GSSAPI_CONFIGURE_ARGS}
32
GSSAPI_CONFIGURE_OFF=	--without-kerberos
32
GSSAPI_CONFIGURE_OFF=	--without-kerberos
33
LDNS_DESC=		DNS zone file support via libldns
33
LDNS_DESC=		DNS zone file support via libldns
(-)b/databases/mariadb101-server/Makefile (-10 / +2 lines)
Lines 35-42 DOCSDIR= ${PREFIX}/share/doc/mysql Link Here
35
35
36
OPTIONS_DEFINE=		FASTMTX
36
OPTIONS_DEFINE=		FASTMTX
37
OPTIONS_SINGLE=		GSSAPI
37
OPTIONS_SINGLE=		GSSAPI
38
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
38
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
39
OPTIONS_DEFAULT=	GSSAPI_BASE
39
OPTIONS_DEFAULT=	GSSAPI_MIT
40
40
41
FASTMTX_DESC=		Replace mutexes with spinlocks
41
FASTMTX_DESC=		Replace mutexes with spinlocks
42
42
Lines 58-64 SPIDER_DESC= Partitioning and XA-transactions engine Link Here
58
TOKUDB_DESC=	Fractal tree index tree data structure engine
58
TOKUDB_DESC=	Fractal tree index tree data structure engine
59
.endif
59
.endif
60
60
61
GSSAPI_BASE_USES=	gssapi
62
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
61
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
63
GSSAPI_MIT_USES=	gssapi:mit
62
GSSAPI_MIT_USES=	gssapi:mit
64
63
Lines 146-155 post-install: Link Here
146
	${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql
145
	${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql
147
.endif # defined(CLIENT_ONLY)
146
.endif # defined(CLIENT_ONLY)
148
147
149
.if defined(WITH_OPENSSL_PORT)
150
GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
151
.endif
152
153
.include <bsd.port.pre.mk>
148
.include <bsd.port.pre.mk>
154
149
155
.if ${OPSYS} == DragonFly
150
.if ${OPSYS} == DragonFly
Lines 160-168 CMAKE_ARGS+= -DWITHOUT_TOKUDB Link Here
160
CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
155
CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
161
.else
156
.else
162
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
157
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
163
.if ${PORT_OPTIONS:MGSSAPI_BASE}
164
IGNORE=	requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option
165
.endif
166
.endif
158
.endif
167
159
168
post-patch:
160
post-patch:
(-)b/databases/postgresql91-server/Makefile (+1 lines)
Lines 181-186 CONFIGURE_ARGS+=--without-gssapi Link Here
181
.endif
181
.endif
182
182
183
.  if ${PORT_OPTIONS:MMIT_KRB5}
183
.  if ${PORT_OPTIONS:MMIT_KRB5}
184
# Not sure this is right.
184
.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
185
.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
185
IGNORE=	requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
186
IGNORE=	requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
186
.   else
187
.   else
(-)b/databases/postgresql92-server/Makefile (+1 lines)
Lines 182-187 CONFIGURE_ARGS+=--without-gssapi Link Here
182
.endif
182
.endif
183
183
184
.  if ${PORT_OPTIONS:MMIT_KRB5}
184
.  if ${PORT_OPTIONS:MMIT_KRB5}
185
# Not sure this is right.
185
.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
186
.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
186
IGNORE=	requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
187
IGNORE=	requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
187
.   else
188
.   else
(-)b/devel/gnome-vfs/Makefile (+2 lines)
Lines 49-54 MDNS_DESC= Enable Bonjour/Rendezvous support Link Here
49
USES+=		fam
49
USES+=		fam
50
.endif
50
.endif
51
51
52
# Does this mean it always has krb5 support but only uses it from ports if
53
# already there ?
52
.if exists(${LOCALBASE}/lib/libkrb5.so)
54
.if exists(${LOCALBASE}/lib/libkrb5.so)
53
LIB_DEPENDS+=	libkrb5.so:security/heimdal
55
LIB_DEPENDS+=	libkrb5.so:security/heimdal
54
.endif
56
.endif
(-)b/dns/bind9-devel/Makefile (-5 / +1 lines)
Lines 61-67 OPTIONS_GROUP= DLZ Link Here
61
OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
61
OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
62
			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
62
			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
63
OPTIONS_SINGLE=		GSSAPI
63
OPTIONS_SINGLE=		GSSAPI
64
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
64
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
65
65
66
OPTIONS_SUB=	yes
66
OPTIONS_SUB=	yes
67
67
Lines 95-101 DLZ_BDB_DESC= DLZ BDB driver Link Here
95
DLZ_LDAP_DESC=		DLZ LDAP driver
95
DLZ_LDAP_DESC=		DLZ LDAP driver
96
DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
96
DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
97
DLZ_STUB_DESC=		DLZ stub driver
97
DLZ_STUB_DESC=		DLZ stub driver
98
GSSAPI_BASE_DESC=	Using Heimdal in base
99
GSSAPI_HEIMDAL_DESC=	Using security/heimdal
98
GSSAPI_HEIMDAL_DESC=	Using security/heimdal
100
GSSAPI_MIT_DESC=	Using security/krb5
99
GSSAPI_MIT_DESC=	Using security/krb5
101
GSSAPI_NONE_DESC=	Disable
100
GSSAPI_NONE_DESC=	Disable
Lines 162-170 START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ Link Here
162
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
161
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
163
			NAMED_BEFORE="SERVERS"
162
			NAMED_BEFORE="SERVERS"
164
163
165
GSSAPI_BASE_USES=	gssapi
166
GSSAPI_BASE_CONFIGURE_ON= \
167
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
168
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
164
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
169
GSSAPI_HEIMDAL_CONFIGURE_ON= \
165
GSSAPI_HEIMDAL_CONFIGURE_ON= \
170
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
166
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
(-)b/dns/bind910/Makefile (-5 / +1 lines)
Lines 77-83 OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ Link Here
77
			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
77
			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
78
.endif	# BIND_TOOLS_SLAVE
78
.endif	# BIND_TOOLS_SLAVE
79
OPTIONS_SINGLE=		GSSAPI
79
OPTIONS_SINGLE=		GSSAPI
80
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
80
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
81
81
82
OPTIONS_SUB=	yes
82
OPTIONS_SUB=	yes
83
83
Lines 111-117 DLZ_BDB_DESC= DLZ BDB driver Link Here
111
DLZ_LDAP_DESC=		DLZ LDAP driver
111
DLZ_LDAP_DESC=		DLZ LDAP driver
112
DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
112
DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
113
DLZ_STUB_DESC=		DLZ stub driver
113
DLZ_STUB_DESC=		DLZ stub driver
114
GSSAPI_BASE_DESC=	Using Heimdal in base
115
GSSAPI_HEIMDAL_DESC=	Using security/heimdal
114
GSSAPI_HEIMDAL_DESC=	Using security/heimdal
116
GSSAPI_MIT_DESC=	Using security/krb5
115
GSSAPI_MIT_DESC=	Using security/krb5
117
GSSAPI_NONE_DESC=	Disable
116
GSSAPI_NONE_DESC=	Disable
Lines 184-192 START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ Link Here
184
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
183
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
185
			NAMED_BEFORE="SERVERS"
184
			NAMED_BEFORE="SERVERS"
186
185
187
GSSAPI_BASE_USES=	gssapi
188
GSSAPI_BASE_CONFIGURE_ON= \
189
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
190
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
186
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
191
GSSAPI_HEIMDAL_CONFIGURE_ON= \
187
GSSAPI_HEIMDAL_CONFIGURE_ON= \
192
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
188
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
(-)b/dns/bind99/Makefile (-5 / +1 lines)
Lines 51-57 OPTIONS_GROUP= DLZ Link Here
51
OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
51
OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
52
			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
52
			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
53
OPTIONS_SINGLE=		GSSAPI
53
OPTIONS_SINGLE=		GSSAPI
54
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
54
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
55
55
56
OPTIONS_SUB=	yes
56
OPTIONS_SUB=	yes
57
57
Lines 82-88 DLZ_BDB_DESC= DLZ BDB driver Link Here
82
DLZ_LDAP_DESC=		DLZ LDAP driver
82
DLZ_LDAP_DESC=		DLZ LDAP driver
83
DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
83
DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
84
DLZ_STUB_DESC=		DLZ stub driver
84
DLZ_STUB_DESC=		DLZ stub driver
85
GSSAPI_BASE_DESC=	${GSSAPI_DESC} (Heimdal in base)
86
GSSAPI_HEIMDAL_DESC=	${GSSAPI_DESC} (security/heimdal)
85
GSSAPI_HEIMDAL_DESC=	${GSSAPI_DESC} (security/heimdal)
87
GSSAPI_MIT_DESC=	${GSSAPI_DESC} (security/krb5)
86
GSSAPI_MIT_DESC=	${GSSAPI_DESC} (security/krb5)
88
GSSAPI_NONE_DESC=	No ${GSSAPI_DESC}
87
GSSAPI_NONE_DESC=	No ${GSSAPI_DESC}
Lines 146-154 START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ Link Here
146
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
145
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
147
			NAMED_BEFORE="SERVERS"
146
			NAMED_BEFORE="SERVERS"
148
147
149
GSSAPI_BASE_USES=	gssapi
150
GSSAPI_BASE_CONFIGURE_ON= \
151
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
152
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
148
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
153
GSSAPI_HEIMDAL_CONFIGURE_ON= \
149
GSSAPI_HEIMDAL_CONFIGURE_ON= \
154
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
150
	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
(-)b/dns/samba-nsupdate/Makefile (-2 lines)
Lines 57-64 CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} Link Here
57
CONFIGURE_ARGS+=	--with-gssapi="${KRB5_HOME}"
57
CONFIGURE_ARGS+=	--with-gssapi="${KRB5_HOME}"
58
.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
58
.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
59
CONFIGURE_ARGS+=	--with-gssapi="${HEIMDAL_HOME}"
59
CONFIGURE_ARGS+=	--with-gssapi="${HEIMDAL_HOME}"
60
.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
61
CONFIGURE_ARGS+=	--with-gssapi="/usr"
62
.else
60
.else
63
LIB_DEPENDS+=		libkrb5.so:security/heimdal
61
LIB_DEPENDS+=		libkrb5.so:security/heimdal
64
CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
62
CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
(-)b/ftp/curl/Makefile (-18 / +2 lines)
Lines 19-25 OPTIONS_RADIO= RESOLV SSL Link Here
19
OPTIONS_SINGLE=	GSSAPI
19
OPTIONS_SINGLE=	GSSAPI
20
OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
20
OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
21
OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
21
OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
22
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
22
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
23
OPTIONS_DEFAULT=	CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
23
OPTIONS_DEFAULT=	CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
24
CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
24
CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
25
CA_BUNDLE_IMPLIES=	OPENSSL
25
CA_BUNDLE_IMPLIES=	OPENSSL
Lines 33-43 THREADED_RESOLVER_DESC= Threaded DNS resolver Link Here
33
TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support
33
TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support
34
34
35
LOCALBASE?=	/usr/local
35
LOCALBASE?=	/usr/local
36
.if defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so))
37
OPTIONS_DEFAULT+=	GSSAPI_NONE
36
OPTIONS_DEFAULT+=	GSSAPI_NONE
38
.else
39
OPTIONS_DEFAULT+=	GSSAPI_BASE
40
.endif
41
37
42
CONFIGURE_ARGS+=--disable-werror \
38
CONFIGURE_ARGS+=--disable-werror \
43
		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
39
		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
Lines 81-91 CURL_DEBUG_CONFIGURE_ENABLE= curldebug Link Here
81
DEBUG_CONFIGURE_ENABLE=	debug
77
DEBUG_CONFIGURE_ENABLE=	debug
82
GNUTLS_CONFIGURE_WITH=	gnutls
78
GNUTLS_CONFIGURE_WITH=	gnutls
83
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
79
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
84
GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
85
GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
86
GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
87
GSSAPI_BASE_LIBS=	${GSSAPILIBS}
88
GSSAPI_BASE_USES=	gssapi
89
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
80
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
90
GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}
81
GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}
91
GSSAPI_HEIMDAL_LDFLAGS=	${GSSAPILDFLAGS}
82
GSSAPI_HEIMDAL_LDFLAGS=	${GSSAPILDFLAGS}
Lines 145-158 IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS Link Here
145
IGNORE=		only supports LDAPS with SSL
136
IGNORE=		only supports LDAPS with SSL
146
.endif
137
.endif
147
138
148
.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)))
139
.if ${SSL_DEFAULT:Mlibressl*}
149
IGNORE=		GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
150
.endif
151
152
.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
153
.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL}
154
IGNORE=		GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options
155
.endif
156
.if ${PORT_OPTIONS:MTLS_SRP}
140
.if ${PORT_OPTIONS:MTLS_SRP}
157
IGNORE=		unsupported TLS-SRP in LibreSSL
141
IGNORE=		unsupported TLS-SRP in LibreSSL
158
.endif
142
.endif
(-)b/mail/cyrus-imapd24/Makefile (-9 / +2 lines)
Lines 82-94 SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} Link Here
82
82
83
OPTIONS_RADIO=			GSSAPI
83
OPTIONS_RADIO=			GSSAPI
84
OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
84
OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
85
.if exists(/usr/lib/libkrb5.a)
85
OPTIONS_DEFAULT=		GSSAPI_MIT
86
OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
87
OPTIONS_DEFAULT+=		GSSAPI_BASE
88
.endif
89
GSSAPI_BASE_USES=		gssapi
90
GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
91
				--with-gss_impl=heimdal
92
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
86
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
93
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
87
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
94
				--with-gss_impl=heimdal
88
				--with-gss_impl=heimdal
Lines 150-157 INVALID_BDB_VER=2 Link Here
150
BDB_LIB_NAME=	no
144
BDB_LIB_NAME=	no
151
.endif
145
.endif
152
146
153
.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
147
.if !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && !${PORT_OPTIONS:MGSSAPI_MIT}
154
    !${PORT_OPTIONS:MGSSAPI_MIT}
155
CONFIGURE_ARGS+=--disable-gssapi
148
CONFIGURE_ARGS+=--disable-gssapi
156
.endif
149
.endif
157
150
(-)b/mail/cyrus-imapd25/Makefile (-11 / +2 lines)
Lines 94-108 OSMAJOR= ${UNAMER:C/[.-].*//} Link Here
94
94
95
OPTIONS_RADIO=			GSSAPI
95
OPTIONS_RADIO=			GSSAPI
96
OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
96
OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
97
.if exists(/usr/lib/libkrb5.a)
97
OPTIONS_DEFAULT=		GSSAPI_MIT
98
OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
99
.if ${OSMAJOR} >= 9
100
OPTIONS_DEFAULT+=		GSSAPI_BASE
101
.endif
102
.endif
103
GSSAPI_BASE_USES=		gssapi
104
GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
105
				--with-gss_impl=heimdal
106
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
98
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
107
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
99
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
108
				--with-gss_impl=heimdal
100
				--with-gss_impl=heimdal
Lines 164-171 IGNORE= DRAC is not available Link Here
164
USES+=	sqlite
156
USES+=	sqlite
165
.endif
157
.endif
166
158
167
.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
159
.if !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && !${PORT_OPTIONS:MGSSAPI_MIT}
168
    !${PORT_OPTIONS:MGSSAPI_MIT}
169
CONFIGURE_ARGS+=--disable-gssapi
160
CONFIGURE_ARGS+=--disable-gssapi
170
.endif
161
.endif
171
162
(-)b/mail/dovecot2/Makefile (-4 / +1 lines)
Lines 51-57 OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE Link Here
51
OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
51
OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
52
52
53
OPTIONS_SINGLE=		GSSAPI
53
OPTIONS_SINGLE=		GSSAPI
54
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
54
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
55
55
56
KQUEUE_DESC=	kqueue(2) support
56
KQUEUE_DESC=	kqueue(2) support
57
LZ4_DESC=	LZ4 compression support
57
LZ4_DESC=	LZ4 compression support
Lines 67-73 SOLR_DESC= Solr FTS support Link Here
67
TEXTCAT_DESC=	Libtextcat FTS support
67
TEXTCAT_DESC=	Libtextcat FTS support
68
68
69
GSSAPI_NONE_DESC=	Build without GSSAPI support
69
GSSAPI_NONE_DESC=	Build without GSSAPI support
70
GSSAPI_BASE_DESC=	Use GSSAPI from base
71
GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
70
GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
72
GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
71
GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
73
72
Lines 75-82 CDB_CONFIGURE_WITH= cdb Link Here
75
CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
74
CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
76
75
77
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
76
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
78
GSSAPI_BASE_USES=		gssapi
79
GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
80
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
77
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
81
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
78
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
82
GSSAPI_MIT_USES=		gssapi:mit
79
GSSAPI_MIT_USES=		gssapi:mit
(-)b/mail/mutt/Makefile (-3 / +1 lines)
Lines 67-73 OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \ Link Here
67
OPTIONS_SINGLE=	GSSAPI SCREEN
67
OPTIONS_SINGLE=	GSSAPI SCREEN
68
OPTIONS_RADIO=	SPELL
68
OPTIONS_RADIO=	SPELL
69
OPTIONS_RADIO_SPELL=	ASPELL ISPELL
69
OPTIONS_RADIO_SPELL=	ASPELL ISPELL
70
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
70
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
71
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
71
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
72
72
73
COMPRESSED_FOLDERS_DESC=	Compressed folders
73
COMPRESSED_FOLDERS_DESC=	Compressed folders
Lines 145-152 NLS_CONFIGURE_OFF= --disable-nls Link Here
145
NLS_IMPLIES=	ICONV
145
NLS_IMPLIES=	ICONV
146
146
147
# Handle GSSAPI from various places
147
# Handle GSSAPI from various places
148
GSSAPI_BASE_USES=	gssapi
149
GSSAPI_BASE_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
150
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
148
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
151
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
149
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
152
GSSAPI_MIT_USES=	gssapi:mit
150
GSSAPI_MIT_USES=	gssapi:mit
(-)b/mail/mutt14/Makefile (-5 lines)
Lines 127-139 CONFIGURE_ARGS+= --with-curses=${NCURSESBASE} Link Here
127
CFLAGS+=	-I${NCURSESINC}
127
CFLAGS+=	-I${NCURSESINC}
128
.endif
128
.endif
129
.if ${PORT_OPTIONS:MGSSAPI}
129
.if ${PORT_OPTIONS:MGSSAPI}
130
.if exists(${LOCALBASE}/bin/gss-client)
131
LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
130
LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
132
CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
131
CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
133
.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
134
CONFIGURE_ARGS+=	--with-gss
135
WITH_MUTT_KRB5_SYS=YES
136
.endif
137
.endif
132
.endif
138
133
139
post-patch:
134
post-patch:
(-)b/mail/postfix-current/Makefile (+1 lines)
Lines 53-58 LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb Link Here
53
MYSQL_USE=		MYSQL=yes
53
MYSQL_USE=		MYSQL=yes
54
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
54
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
55
PGSQL_USES=		pgsql
55
PGSQL_USES=		pgsql
56
# pretty sure here is missing a SASLKRB5_LIB_DEPENDS line
56
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
57
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
57
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
58
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
58
SQLITE_USES=		sqlite
59
SQLITE_USES=		sqlite
(-)b/mail/postfix/Makefile (+1 lines)
Lines 54-59 LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb Link Here
54
MYSQL_USE=		MYSQL=yes
54
MYSQL_USE=		MYSQL=yes
55
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
55
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
56
PGSQL_USES=		pgsql
56
PGSQL_USES=		pgsql
57
# pretty sure here is missing a SASLKRB5_LIB_DEPENDS line
57
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
58
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
58
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
59
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
59
SQLITE_USES=		sqlite
60
SQLITE_USES=		sqlite
(-)b/mail/postfix211/Makefile (+1 lines)
Lines 55-60 LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb Link Here
55
MYSQL_USE=		MYSQL=yes
55
MYSQL_USE=		MYSQL=yes
56
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
56
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
57
PGSQL_USES=		pgsql
57
PGSQL_USES=		pgsql
58
# pretty sure here is missing a SASLKRB5_LIB_DEPENDS line
58
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
59
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
59
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
60
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
60
SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
61
SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
(-)b/net-im/zephyr/Makefile (+1 lines)
Lines 42-47 KRB5_DIR?= ${LOCALBASE} Link Here
42
.endif
42
.endif
43
.else
43
.else
44
LIB_DEPENDS+=	libss.so.2:devel/e2fsprogs-libss
44
LIB_DEPENDS+=	libss.so.2:devel/e2fsprogs-libss
45
# I think this is wrong.
45
KRB5_DIR?=	${DESTDIR}/usr
46
KRB5_DIR?=	${DESTDIR}/usr
46
.endif
47
.endif
47
48
(-)b/net-mgmt/net-snmp/Makefile (-7 / +1 lines)
Lines 52-58 CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ Link Here
52
		--with-logfile="${NET_SNMP_LOGFILE}" \
52
		--with-logfile="${NET_SNMP_LOGFILE}" \
53
		--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
53
		--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
54
		--with-gnu-ld --with-libwrap \
54
		--with-gnu-ld --with-libwrap \
55
		--with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib -L${LOCALBASE}/lib ${LCRYPTO}"
55
		--with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib -L${LOCALBASE}/lib -lcrypto"
56
SUB_FILES=	pkg-message
56
SUB_FILES=	pkg-message
57
57
58
.if !defined(WITHOUT_SSP)
58
.if !defined(WITHOUT_SSP)
Lines 210-221 CONFLICTS= ucd-snmp-4.* net-snmp-5.3.* Link Here
210
210
211
.include <bsd.port.pre.mk>
211
.include <bsd.port.pre.mk>
212
212
213
.if defined(WITH_OPENSSL_PORT) || defined(OPENSSL_PORT)
214
LCRYPTO=	-lcrypto
215
.else
216
LCRYPTO=
217
.endif
218
219
pre-everything::
213
pre-everything::
220
	@${ECHO_MSG}
214
	@${ECHO_MSG}
221
	@${ECHO_MSG} "You may use the following build options:"
215
	@${ECHO_MSG} "You may use the following build options:"
(-)b/net/freeradius2/Makefile (-18 / +2 lines)
Lines 80-94 GROUPS= ${RADIUS_GROUP} Link Here
80
# Default requirements for rc script
80
# Default requirements for rc script
81
_REQUIRE=	NETWORKING SERVERS
81
_REQUIRE=	NETWORKING SERVERS
82
82
83
OPTIONS_DEFINE=	USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \
83
OPTIONS_DEFINE=	USER KERBEROS HEIMDAL LDAP MYSQL \
84
		PGSQL UNIXODBC FIREBIRD PERL PYTHON OCI8 RUBY DHCP \
84
		PGSQL UNIXODBC FIREBIRD PERL PYTHON OCI8 RUBY DHCP \
85
		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR SSL_PORT DOCS
85
		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR SSL_PORT DOCS
86
OPTIONS_DEFAULT=USER PERL PYTHON
86
OPTIONS_DEFAULT=USER PERL PYTHON
87
87
88
DHCP_DESC=		With DHCP support (EXPERIMENTAL)
88
DHCP_DESC=		With DHCP support (EXPERIMENTAL)
89
USER_DESC=		Run as user freeradius, group freeradius
89
USER_DESC=		Run as user freeradius, group freeradius
90
HEIMDAL_DESC=		With Heimdal Kerberos support
90
HEIMDAL_DESC=		With Heimdal Kerberos from ports
91
HEIMDAL_PORT_DESC=	With Heimdal Kerberos from ports
92
UNIXODBC_DESC=		With unixODBC database support
91
UNIXODBC_DESC=		With unixODBC database support
93
FIREBIRD_DESC=		With Firebird database support (EXPERIMENTAL)
92
FIREBIRD_DESC=		With Firebird database support (EXPERIMENTAL)
94
OCI8_DESC=		With Oracle support (currently experimental)
93
OCI8_DESC=		With Oracle support (currently experimental)
Lines 108-129 SUB_LIST+= RUN_AS_USER="no" Link Here
108
107
109
.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
108
.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
110
.if ${PORT_OPTIONS:MHEIMDAL}
109
.if ${PORT_OPTIONS:MHEIMDAL}
111
.if ${PORT_OPTIONS:MHEIMDAL_PORT}
112
LIB_DEPENDS+=	libkrb5.so:security/heimdal
110
LIB_DEPENDS+=	libkrb5.so:security/heimdal
113
.endif
114
CONFIGURE_ARGS+=--enable-heimdal-krb5
111
CONFIGURE_ARGS+=--enable-heimdal-krb5
115
.else
112
.else
116
LIB_DEPENDS+=	libkrb5support.so:security/krb5
113
LIB_DEPENDS+=	libkrb5support.so:security/krb5
117
.endif
114
.endif
118
CONFIGURE_ARGS+=--with-rlm_krb5
115
CONFIGURE_ARGS+=--with-rlm_krb5
119
.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
120
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=/usr/lib
121
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=/usr/include
122
CONFIGURE_ENV+=	KRB5LIBS="$$(${KRB5_CONFIG})"
123
.else
124
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
116
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
125
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
117
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
126
.endif
127
PLIST_SUB+=	KRB5=""
118
PLIST_SUB+=	KRB5=""
128
.else
119
.else
129
CONFIGURE_ARGS+=--without-rlm_krb5
120
CONFIGURE_ARGS+=--without-rlm_krb5
Lines 315-327 post-patch: Link Here
315
	@${REINPLACE_CMD} -E \
306
	@${REINPLACE_CMD} -E \
316
		-e "s:^([[:space:]])+openssl:\1${OPENSSLBASE}/bin/openssl:g" \
307
		-e "s:^([[:space:]])+openssl:\1${OPENSSLBASE}/bin/openssl:g" \
317
		${WRKSRC}/raddb/certs/Makefile
308
		${WRKSRC}/raddb/certs/Makefile
318
# If we're using Heimdal from base, alter the LIBS variable
319
# XXX Should patch configure.in instead of configure because it is regenerated
320
.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
321
	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
322
	@${REINPLACE_CMD} -e 's|-lkrb5|$$(${KRB5_CONFIG})|g' \
323
		${WRKSRC}/src/modules/rlm_krb5/configure
324
.endif
325
# If DHCP is enabled, enable the DHCP dictionary
309
# If DHCP is enabled, enable the DHCP dictionary
326
.if ${PORT_OPTIONS:MDHCP}
310
.if ${PORT_OPTIONS:MDHCP}
327
	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
311
	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
(-)b/net/freeradius3/Makefile (-17 / +2 lines)
Lines 41-55 LDFLAGS+= -L${LOCALBASE}/lib Link Here
41
PLIST_SUB=	PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g}
41
PLIST_SUB=	PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g}
42
42
43
OPTIONS_SUB=	yes
43
OPTIONS_SUB=	yes
44
OPTIONS_DEFINE=	USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \
44
OPTIONS_DEFINE=	USER KERBEROS HEIMDAL LDAP MYSQL \
45
		PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \
45
		PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \
46
		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
46
		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
47
		FREETDS IDN SSL_PORT DOCS SQLITE3
47
		FREETDS IDN SSL_PORT DOCS SQLITE3
48
OPTIONS_DEFAULT=USER PERL
48
OPTIONS_DEFAULT=USER PERL
49
49
50
USER_DESC=		Run as user freeradius, group freeradius
50
USER_DESC=		Run as user freeradius, group freeradius
51
HEIMDAL_DESC=		With Heimdal Kerberos support
51
HEIMDAL_DESC=		With Heimdal Kerberos from ports
52
HEIMDAL_PORT_DESC=	With Heimdal Kerberos from ports
53
UNIXODBC_DESC=		With unixODBC database support
52
UNIXODBC_DESC=		With unixODBC database support
54
FIREBIRD_DESC=		With Firebird database support (EXPERIMENTAL)
53
FIREBIRD_DESC=		With Firebird database support (EXPERIMENTAL)
55
EXPERIMENTAL_DESC=	Build experimental modules
54
EXPERIMENTAL_DESC=	Build experimental modules
Lines 82-103 GROUPS= ${RADIUS_GROUP} Link Here
82
81
83
.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
82
.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
84
.if ${PORT_OPTIONS:MHEIMDAL}
83
.if ${PORT_OPTIONS:MHEIMDAL}
85
.if ${PORT_OPTIONS:MHEIMDAL_PORT}
86
LIB_DEPENDS+=	libkrb5.so:security/heimdal
84
LIB_DEPENDS+=	libkrb5.so:security/heimdal
87
.endif
88
CONFIGURE_ARGS+=--enable-heimdal-krb5 --enable-pthread-support
85
CONFIGURE_ARGS+=--enable-heimdal-krb5 --enable-pthread-support
89
.else
86
.else
90
LIB_DEPENDS+=	libkrb5support.so:security/krb5
87
LIB_DEPENDS+=	libkrb5support.so:security/krb5
91
.endif
88
.endif
92
CONFIGURE_ARGS+=--with-rlm_krb5
89
CONFIGURE_ARGS+=--with-rlm_krb5
93
.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
94
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=/usr/lib
95
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=/usr/include
96
CONFIGURE_ENV+=	KRB5LIBS="$$(${KRB5_CONFIG})"
97
.else
98
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
90
CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib
99
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
91
CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include
100
.endif
101
PLIST_SUB+=	KRB5=""
92
PLIST_SUB+=	KRB5=""
102
.else
93
.else
103
CONFIGURE_ARGS+=--without-rlm_krb5
94
CONFIGURE_ARGS+=--without-rlm_krb5
Lines 355-366 post-patch: Link Here
355
	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \
346
	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \
356
		${WRKSRC}/scripts/all.mk
347
		${WRKSRC}/scripts/all.mk
357
348
358
# If we're using Heimdal from base, alter the LIBS variable
359
.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
360
	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
361
	@${REINPLACE_CMD} -e 's|-lkrb5|$$(${KRB5_CONFIG})|g' \
362
		${WRKSRC}/src/modules/rlm_krb5/configure
363
.endif
364
.if empty(PORT_OPTIONS:MRUBY)
349
.if empty(PORT_OPTIONS:MRUBY)
365
	@${RM} -fr ${WRKSRC}/src/modules/rlm_ruby/
350
	@${RM} -fr ${WRKSRC}/src/modules/rlm_ruby/
366
.endif
351
.endif
(-)b/net/samba36/Makefile (-3 / +1 lines)
Lines 120-126 OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DNSUPDATE \ Link Here
120
			MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \
120
			MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \
121
			SMBTORTURE SWAT SYSLOG UTMP WINBIND
121
			SMBTORTURE SWAT SYSLOG UTMP WINBIND
122
OPTIONS_RADIO=		GSSAPI
122
OPTIONS_RADIO=		GSSAPI
123
OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
123
OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
124
124
125
OPTIONS_DEFAULT=	ACL_SUPPORT AIO_SUPPORT CUPS LDAP POPT PTHREADPOOL \
125
OPTIONS_DEFAULT=	ACL_SUPPORT AIO_SUPPORT CUPS LDAP POPT PTHREADPOOL \
126
			WINBIND GSSAPI_NONE
126
			WINBIND GSSAPI_NONE
Lines 135-142 AIO_SUPPORT_DESC= Asyncronous IO support Link Here
135
DNSUPDATE_DESC=		Dynamic DNS update(require ADS)
135
DNSUPDATE_DESC=		Dynamic DNS update(require ADS)
136
EXP_MODULES_DESC=	Experimental modules
136
EXP_MODULES_DESC=	Experimental modules
137
137
138
GSSAPI_BASE_DESC=	Use Heimdal in base
139
GSSAPI_BASE_USES=	gssapi
140
GSSAPI_HEIMDAL_DESC=	Use Heimdal from ports
138
GSSAPI_HEIMDAL_DESC=	Use Heimdal from ports
141
GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
139
GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
142
GSSAPI_MIT_DESC=	Use MIT Kerberos V5
140
GSSAPI_MIT_DESC=	Use MIT Kerberos V5
(-)b/net/wireshark/Makefile (-9 / +2 lines)
Lines 61-76 OPTIONS_SINGLE= KERBEROS Link Here
61
61
62
OPTIONS_RADIO_ASYNCDNS=	ADNS CARES
62
OPTIONS_RADIO_ASYNCDNS=	ADNS CARES
63
OPTIONS_RADIO_GUI=	GTK2 GTK3 QT5
63
OPTIONS_RADIO_GUI=	GTK2 GTK3 QT5
64
OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE
64
OPTIONS_SINGLE_KERBEROS=KRB_HEIMDAL KRB_MIT KRB_NONE
65
65
66
OPTIONS_DEFAULT?=	SNMP ADNS IPV6 GEOIP KRB_BASE GTK3
66
OPTIONS_DEFAULT?=	SNMP ADNS IPV6 GEOIP KRB_MIT GTK3
67
67
68
RTP_DESC=		Enable support for playing back RTP streams
68
RTP_DESC=		Enable support for playing back RTP streams
69
DECRYPT_DESC=		Decryption support for SSL and IPSec
69
DECRYPT_DESC=		Decryption support for SSL and IPSec
70
ASYNCDNS_DESC=		Asynchronous DNS lookup support
70
ASYNCDNS_DESC=		Asynchronous DNS lookup support
71
ADNS_DESC=		Asynchronous DNS resolution via GNU adns
71
ADNS_DESC=		Asynchronous DNS resolution via GNU adns
72
KERBEROS_DESC=		Kerberos dissection support
72
KERBEROS_DESC=		Kerberos dissection support
73
KRB_BASE_DESC=		Kerberos support via base system
74
KRB_HEIMDAL_DESC=	Kerberos support via security/heimdal
73
KRB_HEIMDAL_DESC=	Kerberos support via security/heimdal
75
KRB_MIT_DESC=		Kerberos support via security/krb5
74
KRB_MIT_DESC=		Kerberos support via security/krb5
76
KRB_NONE_DESC=		Disable Kerberos support
75
KRB_NONE_DESC=		Disable Kerberos support
Lines 80-86 GTK3_USE= GNOME=gtk30 Link Here
80
QT5_USE=	QT5=core,gui,widgets,printsupport,buildtools_build
79
QT5_USE=	QT5=core,gui,widgets,printsupport,buildtools_build
81
80
82
LUA_USES=		lua:5[1-2]
81
LUA_USES=		lua:5[1-2]
83
KRB_BASE_USES=		gssapi
84
KRB_HEIMDAL_USES=	gssapi:heimdal
82
KRB_HEIMDAL_USES=	gssapi:heimdal
85
KRB_MIT_USES=		gssapi:mit
83
KRB_MIT_USES=		gssapi:mit
86
84
Lines 132-142 INSTALLS_ICONS= yes Link Here
132
PLIST_SUB+=		GUI=""
130
PLIST_SUB+=		GUI=""
133
.endif
131
.endif
134
132
135
.if ${PORT_OPTIONS:MKRB_BASE} && exists(${LOCALBASE}/include/krb5.h)
136
IGNORE=			cannot build with base Kerberos if krb5 port is installed. \
137
			Use ``make config'' to choose a different option
138
.endif
139
140
.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \
133
.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \
141
	${PORT_OPTIONS:MRTP}
134
	${PORT_OPTIONS:MRTP}
142
IGNORE=			the RTP support requires GTK+ frontend
135
IGNORE=			the RTP support requires GTK+ frontend
(-)b/news/inn/Makefile (-4 lines)
Lines 67-78 CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} \ Link Here
67
.endif
67
.endif
68
68
69
.if ${PORT_OPTIONS:MKERBEROS}
69
.if ${PORT_OPTIONS:MKERBEROS}
70
.    if exists(${LOCALBASE}/bin/krb5-config)
71
LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
70
LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
72
CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
71
CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
73
.    else
74
CONFIGURE_ARGS+=	--with-krb5=/usr
75
.    endif
76
CONFIGURE_ENV+=		ac_cv_search_krb5_parse_name="-lcrypt -lcrypto -lkrb5 -lasn1 -lroken -lhx509"
72
CONFIGURE_ENV+=		ac_cv_search_krb5_parse_name="-lcrypt -lcrypto -lkrb5 -lasn1 -lroken -lhx509"
77
CONFIGURE_ENV+=		ac_cv_func_krb5_init_ets=yes
73
CONFIGURE_ENV+=		ac_cv_func_krb5_init_ets=yes
78
.else
74
.else
(-)b/security/cyrus-sasl2-gssapi/Makefile (-5 / +2 lines)
Lines 6-16 PORTREVISION= 7 Link Here
6
COMMENT=	SASL GSSAPI authentication plugin
6
COMMENT=	SASL GSSAPI authentication plugin
7
7
8
OPTIONS_SINGLE=			GSSAPI
8
OPTIONS_SINGLE=			GSSAPI
9
OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
9
OPTIONS_SINGLE_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
10
OPTIONS_DEFAULT=		GSSAPI_BASE
10
OPTIONS_DEFAULT=		GSSAPI_MIT
11
GSSAPI_BASE_USES=		gssapi:base
12
GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
13
				--with-gss_impl=heimdal
14
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
11
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
15
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
12
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
16
				--with-gss_impl=heimdal
13
				--with-gss_impl=heimdal
(-)b/security/cyrus-sasl2-saslauthd/Makefile (-9 / +2 lines)
Lines 17-23 CONFIGURE_ENV+= andrew_cv_runpath_switch=none Link Here
17
OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP OPENLDAP_SASL
17
OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP OPENLDAP_SASL
18
OPTIONS_RADIO=		GSSAPI SASLDB
18
OPTIONS_RADIO=		GSSAPI SASLDB
19
OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM
19
OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM
20
OPTIONS_DEFAULT=	BDB1
20
OPTIONS_DEFAULT=	BDB1 GSSAPI_MIT
21
21
22
HTTPFORM_DESC=		Enable HTTP form authentication
22
HTTPFORM_DESC=		Enable HTTP form authentication
23
HTTPFORM_CONFIGURE_ENABLE=httpform
23
HTTPFORM_CONFIGURE_ENABLE=httpform
Lines 41-54 GDBM_CONFIGURE_ON= --enable-auth-sasldb \ Link Here
41
			--with-dblib=gdbm \
41
			--with-dblib=gdbm \
42
			--with-gdbm=${LOCALBASE}
42
			--with-gdbm=${LOCALBASE}
43
43
44
.if exists(/usr/lib/libkrb5.a)
44
OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
45
OPTIONS_RADIO_GSSAPI+=	GSSAPI_BASE
46
OPTIONS_DEFAULT+=	GSSAPI_BASE
47
.endif
48
OPTIONS_RADIO_GSSAPI+=	GSSAPI_HEIMDAL GSSAPI_MIT
49
GSSAPI_BASE_USES=		gssapi:base
50
GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
51
				--with-gss_impl=heimdal
52
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
45
GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
53
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
46
GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
54
				--with-gss_impl=heimdal
47
				--with-gss_impl=heimdal
(-)b/security/openssh-portable/Makefile (-21 / +3 lines)
Lines 31-37 OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \ Link Here
31
			OVERWRITE_BASE SCTP LDNS NONECIPHER
31
			OVERWRITE_BASE SCTP LDNS NONECIPHER
32
OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS HPN LDNS
32
OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS HPN LDNS
33
OPTIONS_RADIO=		KERBEROS
33
OPTIONS_RADIO=		KERBEROS
34
OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL HEIMDAL_BASE
34
OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL
35
TCP_WRAPPERS_DESC=	tcp_wrappers support
35
TCP_WRAPPERS_DESC=	tcp_wrappers support
36
BSM_DESC=		OpenBSM Auditing
36
BSM_DESC=		OpenBSM Auditing
37
KERB_GSSAPI_DESC=	Kerberos/GSSAPI patch (req: GSSAPI)
37
KERB_GSSAPI_DESC=	Kerberos/GSSAPI patch (req: GSSAPI)
Lines 41-47 X509_DESC= x509 certificate patch Link Here
41
SCTP_DESC=		SCTP support
41
SCTP_DESC=		SCTP support
42
OVERWRITE_BASE_DESC=	EOL, No longer supported.
42
OVERWRITE_BASE_DESC=	EOL, No longer supported.
43
HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
43
HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
44
HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
45
MIT_DESC=		MIT Kerberos (security/krb5)
44
MIT_DESC=		MIT Kerberos (security/krb5)
46
NONECIPHER_DESC=	NONE Cipher support
45
NONECIPHER_DESC=	NONE Cipher support
47
46
Lines 138-165 BROKEN= X509 patch incompatible with KERB_GSSAPI patch Link Here
138
137
139
.endif
138
.endif
140
139
141
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && ${PORT_OPTIONS:MKERB_GSSAPI}
140
.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
142
BROKEN=		KERB_GSSAPI Requires either MIT or HEMIDAL, does not build with base Heimdal currently
143
.endif
144
145
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
146
IGNORE=		you have selected HEIMDAL_BASE but do not have heimdal installed in base
147
.endif
148
149
.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL} || ${PORT_OPTIONS:MHEIMDAL_BASE}
150
.	if ${PORT_OPTIONS:MHEIMDAL_BASE}
151
CONFIGURE_LIBS+=	-lgssapi_krb5
152
CONFIGURE_ARGS+=	--with-kerberos5=/usr
153
.	else
154
CONFIGURE_ARGS+=	--with-kerberos5=${LOCALBASE}
141
CONFIGURE_ARGS+=	--with-kerberos5=${LOCALBASE}
155
.	endif
156
.	if ${OPENSSLBASE} == "/usr"
157
CONFIGURE_ARGS+=	--without-rpath
158
LDFLAGS=		# empty
159
.	endif
160
.else
142
.else
161
.	if ${PORT_OPTIONS:MKERB_GSSAPI}
143
.	if ${PORT_OPTIONS:MKERB_GSSAPI}
162
IGNORE=	KERB_GSSAPI requires one of MIT HEIMDAL or HEIMDAL_BASE
144
IGNORE=	KERB_GSSAPI requires one of MIT or HEIMDAL
163
.	endif
145
.	endif
164
.endif
146
.endif
165
147
(-)b/security/p5-Authen-Krb5-Simple/Makefile (-4 / +2 lines)
Lines 14-24 USE_PERL5= configure Link Here
14
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
14
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
15
15
16
OPTIONS_SINGLE=		GSSAPI
16
OPTIONS_SINGLE=		GSSAPI
17
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
17
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
18
OPTIONS_DEFAULT=	GSSAPI_BASE
18
OPTIONS_DEFAULT=	GSSAPI_MIT
19
19
20
GSSAPI_BASE_USES=	gssapi
21
GSSAPI_BASE_CONFIGURE_ENV=	HAVE_HEIMDAL=1
22
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
20
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
23
GSSAPI_HEIMDAL_CONFIGURE_ENV=	HAVE_HEIMDAL=1
21
GSSAPI_HEIMDAL_CONFIGURE_ENV=	HAVE_HEIMDAL=1
24
GSSAPI_MIT_USES=	gssapi:mit
22
GSSAPI_MIT_USES=	gssapi:mit
(-)b/security/p5-Authen-Krb5/Makefile (-4 / +2 lines)
Lines 17-27 USE_PERL5= configure Link Here
17
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
17
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
18
18
19
OPTIONS_SINGLE=		GSSAPI
19
OPTIONS_SINGLE=		GSSAPI
20
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
20
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
21
OPTIONS_DEFAULT=	GSSAPI_BASE
21
OPTIONS_DEFAULT=	GSSAPI_MIT
22
22
23
GSSAPI_BASE_USES=	gssapi
24
GSSAPI_BASE_CONFIGURE_ENV=	HAVE_HEIMDAL=1
25
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
23
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
26
GSSAPI_HEIMDAL_CONFIGURE_ENV=	HAVE_HEIMDAL=1
24
GSSAPI_HEIMDAL_CONFIGURE_ENV=	HAVE_HEIMDAL=1
27
GSSAPI_MIT_USES=	gssapi:mit
25
GSSAPI_MIT_USES=	gssapi:mit
(-)b/security/p5-GSSAPI/Makefile (-3 / +2 lines)
Lines 14-24 COMMENT= Perl extension providing access to the GSSAPIv2 library Link Here
14
USES=		perl5
14
USES=		perl5
15
USE_PERL5=	configure
15
USE_PERL5=	configure
16
16
17
OPTIONS_DEFAULT=	GSSAPI_BASE
17
OPTIONS_DEFAULT=	GSSAPI_MIT
18
OPTIONS_SINGLE=		GSSAPI
18
OPTIONS_SINGLE=		GSSAPI
19
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
19
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
20
20
21
GSSAPI_BASE_USES=	gssapi
22
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
21
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
23
GSSAPI_MIT_USES=	gssapi:mit
22
GSSAPI_MIT_USES=	gssapi:mit
24
23
(-)b/security/p5-Heimdal-Kadm5/Makefile (-8 / +1 lines)
Lines 10-26 PKGNAMEPREFIX= p5- Link Here
10
MAINTAINER=	hrs@FreeBSD.org
10
MAINTAINER=	hrs@FreeBSD.org
11
COMMENT=	Perl extension for Heimdal administrative client library
11
COMMENT=	Perl extension for Heimdal administrative client library
12
12
13
USES=		perl5
13
USES=		perl5 gssapi:heimdal
14
USE_PERL5=	configure
14
USE_PERL5=	configure
15
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
15
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
16
16
17
OPTIONS_SINGLE=		GSSAPI
18
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL
19
OPTIONS_DEFAULT=	GSSAPI_BASE
20
21
GSSAPI_BASE_USES=	gssapi
22
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
23
24
post-build:
17
post-build:
25
	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so
18
	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so
26
19
(-)b/security/p5-openxpki/Makefile (-1 / +1 lines)
Lines 114-120 post-stage: Link Here
114
114
115
.include <bsd.port.pre.mk>
115
.include <bsd.port.pre.mk>
116
116
117
.if defined(WITH_OPENSSL_PORT) && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
117
.if ${SSL_DEFAULT:Mlibressl*}
118
IGNORE=	this version of OpenXPKI is not fully functional with LibreSSL library, use OpenSSL instead
118
IGNORE=	this version of OpenXPKI is not fully functional with LibreSSL library, use OpenSSL instead
119
.endif
119
.endif
120
120
(-)b/security/pam_krb5/Makefile (-3 / +1 lines)
Lines 20-33 USES= gmake libtool perl5 Link Here
20
USE_PERL5=		build
20
USE_PERL5=		build
21
21
22
OPTIONS_SINGLE=		LINK
22
OPTIONS_SINGLE=		LINK
23
OPTIONS_SINGLE_LINK=	MIT HEIMDAL_BASE HEIMDAL_PORT
23
OPTIONS_SINGLE_LINK=	MIT HEIMDAL_PORT
24
OPTIONS_DEFAULT=	MIT
24
OPTIONS_DEFAULT=	MIT
25
MIT_DESC=		Link against MIT Kerberos
25
MIT_DESC=		Link against MIT Kerberos
26
MIT_USES=		gssapi:mit
26
MIT_USES=		gssapi:mit
27
HEIMDAL_PORT_DESC=	Link against Heimdal in ports Kerberos
27
HEIMDAL_PORT_DESC=	Link against Heimdal in ports Kerberos
28
HEIMDAL_PORT_USES=	gssapi:heimdal
28
HEIMDAL_PORT_USES=	gssapi:heimdal
29
HEIMDAL_BASE_DESC=	Link against Heimdal in base Kerberos
30
HEIMDAL_BASE_USES=	gssapi:base
31
29
32
CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
30
CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
33
			--with-krb5-include="${GSSAPIINCDIR}" \
31
			--with-krb5-include="${GSSAPIINCDIR}" \
(-)b/security/py-kerberos/Makefile (-6 / +3 lines)
Lines 13-36 COMMENT= Kerberos bindings for python Link Here
13
13
14
LICENSE=	APACHE20
14
LICENSE=	APACHE20
15
15
16
OPTIONS_DEFAULT=	GSSAPI_BASE
16
OPTIONS_DEFAULT=	GSSAPI_MIT
17
OPTIONS_SINGLE=		GSSAPI
17
OPTIONS_SINGLE=		GSSAPI
18
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
18
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
19
19
20
GSSAPI_BASE_USES=		gssapi
21
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
20
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
22
GSSAPI_MIT_USES=		gssapi:mit
21
GSSAPI_MIT_USES=		gssapi:mit
23
22
24
USES=		python
23
USES=		python
25
USE_PYTHON=	distutils autoplist
24
USE_PYTHON=	distutils autoplist
26
25
27
GSSAPI_BASE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_kerberosbasic.h \
26
GSSAPI_HEIMDAL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_kerberosbasic.h \
28
				${PATCHDIR}/extra-patch-src_kerberosgss.c \
27
				${PATCHDIR}/extra-patch-src_kerberosgss.c \
29
				${PATCHDIR}/extra-patch-src_kerberosgss.h \
28
				${PATCHDIR}/extra-patch-src_kerberosgss.h \
30
				${PATCHDIR}/extra-patch-src_kerberospw.h
29
				${PATCHDIR}/extra-patch-src_kerberospw.h
31
30
32
GSSAPI_HEIMDAL_EXTRA_PATCHES=	${GSSAPI_BASE_EXTRA_PATCHES}
33
34
post-patch:
31
post-patch:
35
	@${REINPLACE_CMD} -e 's|commands.getoutput("krb5-config|commands.getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py
32
	@${REINPLACE_CMD} -e 's|commands.getoutput("krb5-config|commands.getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py
36
33
(-)b/security/softhsm2/Makefile (-1 / +1 lines)
Lines 38-44 CRYP_OPEN_USE= openssl=yes Link Here
38
CRYP_OPEN_VARS=		WITH_OPENSSL_PORT=yes
38
CRYP_OPEN_VARS=		WITH_OPENSSL_PORT=yes
39
CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
39
CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
40
40
41
.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
41
.if ${SSL_DEFAULT:Mlibressl*}
42
CONFIGURE_ARGS+=	--disable-gost
42
CONFIGURE_ARGS+=	--disable-gost
43
.endif
43
.endif
44
44
(-)b/security/stunnel/Makefile (-2 / +2 lines)
Lines 74-84 CONFIGURE_ARGS+=--with-threads=pthread Link Here
74
LDFLAGS+=	-lpthread
74
LDFLAGS+=	-lpthread
75
.endif
75
.endif
76
76
77
.if ${PORT_OPTIONS:MFIPS} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
77
.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT:Mlibressl*}
78
IGNORE=		LibreSSL does not support FIPS standard
78
IGNORE=		LibreSSL does not support FIPS standard
79
.endif
79
.endif
80
80
81
.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
81
.if ${SSL_DEFAULT:Mlibressl*}
82
NO_PACKAGE=	The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries
82
NO_PACKAGE=	The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries
83
.endif
83
.endif
84
84
(-)b/www/mod_auth_kerb2/Makefile (-12 / +2 lines)
Lines 24-45 GNU_CONFIGURE= yes Link Here
24
CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
24
CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
25
25
26
OPTIONS_SINGLE=		GSSAPI
26
OPTIONS_SINGLE=		GSSAPI
27
OPTIONS_DEFAULT=	GSSAPI_BASE
27
OPTIONS_DEFAULT=	GSSAPI_MIT
28
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
28
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
29
GSSAPI_BASE_DESC=	Use Base version of GSS API
30
GSSAPI_HEIMDAL_DESC=	Use Heimdal implementation of GSS API
29
GSSAPI_HEIMDAL_DESC=	Use Heimdal implementation of GSS API
31
GSSAPI_MIT_DESC=	Use MIT implementation of GSS API
30
GSSAPI_MIT_DESC=	Use MIT implementation of GSS API
32
GSSAPI_DESC=		Use Base version of GSS API
31
GSSAPI_DESC=		Use Base version of GSS API
33
GSSAPI_BASE_USES=	gssapi
34
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
32
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
35
GSSAPI_MIT_USES=	gssapi:mit
33
GSSAPI_MIT_USES=	gssapi:mit
36
34
37
.include <bsd.port.options.mk>
38
39
.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${OSVERSION} < 903504
40
post-patch:
41
	${REINPLACE_CMD} -e 's|@KRB5_LDFLAGS@|@KRB5_LDFLAGS@ -lgssapi_krb5|' \
42
		${WRKSRC}/Makefile.in
43
.endif
44
45
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)b/www/serf/Makefile (-5 / +1 lines)
Lines 21-30 USE_LDCONFIG= yes Link Here
21
21
22
OPTIONS_DEFINE=	DOCS
22
OPTIONS_DEFINE=	DOCS
23
OPTIONS_RADIO=	KERBEROS
23
OPTIONS_RADIO=	KERBEROS
24
OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
24
OPTIONS_RADIO_KERBEROS= MIT HEIMDAL
25
25
26
HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
26
HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
27
HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
28
MIT_DESC=		MIT Kerberos (security/krb5)
27
MIT_DESC=		MIT Kerberos (security/krb5)
29
MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
28
MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
30
HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
29
HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
Lines 39-47 INSTALL_TARGET= install --install-sandbox=${STAGEDIR} Link Here
39
38
40
.include <bsd.port.options.mk>
39
.include <bsd.port.options.mk>
41
40
42
.if ${PORT_OPTIONS:MHEIMDAL_BASE}
43
SCONS_ARGS+=	GSSAPI="/usr"
44
.endif
45
.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
41
.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
46
SCONS_ARGS+=    GSSAPI="${LOCALBASE}"
42
SCONS_ARGS+=    GSSAPI="${LOCALBASE}"
47
.endif
43
.endif
(-)b/www/squid/Makefile (-11 / +2 lines)
Lines 53-64 OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \ Link Here
53
		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
53
		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
54
54
55
OPTIONS_SINGLE=	GSSAPI
55
OPTIONS_SINGLE=	GSSAPI
56
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
56
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
57
57
58
OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS DOCS EXAMPLES FOLLOW_XFF \
58
OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS DOCS EXAMPLES FOLLOW_XFF \
59
		FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE \
59
		FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE \
60
		LAX_HTTP SNMP SSL SSL_CRTD TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 \
60
		LAX_HTTP SNMP SSL SSL_CRTD TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 \
61
		GSSAPI_BASE
61
		GSSAPI_MIT
62
62
63
ARP_ACL_CONFIGURE_ENABLE=	eui
63
ARP_ACL_CONFIGURE_ENABLE=	eui
64
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
64
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
Lines 112-120 GSSAPI_NONE_CONFIGURE_ON= --without-heimdal-krb5 \ Link Here
112
				--without-mit-krb5 \
112
				--without-mit-krb5 \
113
				--without-gss
113
				--without-gss
114
114
115
GSSAPI_BASE_USES=		gssapi
116
GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
117
118
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
115
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
119
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
116
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
120
117
Lines 128-134 ARP_ACL_DESC= ARP/MAC/EUI based authentification Link Here
128
AUTH_DESC=		Authentication helpers
125
AUTH_DESC=		Authentication helpers
129
GSSAPI_DESC=		Install Kerberos authentication helpers
126
GSSAPI_DESC=		Install Kerberos authentication helpers
130
GSSAPI_NONE_DESC=	Build without Kerberos support
127
GSSAPI_NONE_DESC=	Build without Kerberos support
131
GSSAPI_BASE_DESC=	Build with Kerberos support from base
132
GSSAPI_HEIMDAL_DESC=	Build with Kerberos support from security/heimdal
128
GSSAPI_HEIMDAL_DESC=	Build with Kerberos support from security/heimdal
133
GSSAPI_MIT_DESC=	Build with Kerberos support from security/krb5
129
GSSAPI_MIT_DESC=	Build with Kerberos support from security/krb5
134
AUTH_LDAP_DESC=		Install LDAP authentication helpers
130
AUTH_LDAP_DESC=		Install LDAP authentication helpers
Lines 256-266 negotiate_auth= kerberos wrapper Link Here
256
PLIST_SUB+=	AUTH_KERB=""
252
PLIST_SUB+=	AUTH_KERB=""
257
.endif
253
.endif
258
254
259
# Make it build on FreeBSD < 10
260
.if ${PORT_OPTIONS:MGSSAPI_BASE}
261
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-build-8-9
262
.endif
263
264
CONFIGURE_ARGS+=	--enable-auth-basic="${basic_auth}" \
255
CONFIGURE_ARGS+=	--enable-auth-basic="${basic_auth}" \
265
			--enable-auth-digest="${digest_auth}" \
256
			--enable-auth-digest="${digest_auth}" \
266
			--enable-external-acl-helpers="${external_acl}" \
257
			--enable-external-acl-helpers="${external_acl}" \
(-)a/www/squid/files/extra-patch-build-8-9 (-11 lines)
Removed Link Here
1
--- helpers/negotiate_auth/kerberos/negotiate_kerberos.h.orig	2015-08-01 06:08:17 UTC
2
+++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h
3
@@ -140,7 +140,7 @@ int check_gss_err(OM_uint32 major_status
4
 
5
 char *gethost_name(void);
6
 
7
-#if (HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT || HAVE_GSS_MAP_NAME_TO_ANY) && HAVE_KRB5_PAC
8
+#if (HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT || HAVE_GSS_MAP_NAME_TO_ANY) && HAVE_KRB5_PAC && __FreeBSD__ >= 10
9
 #define HAVE_PAC_SUPPORT 1
10
 #define MAX_PAC_GROUP_SIZE 200*60
11
 typedef struct {

Return to bug 208976