aboutsummaryrefslogtreecommitdiffstats
path: root/dns/bind98
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2014-06-17 23:01:24 +0800
committermat <mat@FreeBSD.org>2014-06-17 23:01:24 +0800
commite32ccd597573a05524dd06c9516fb790dc56dabe (patch)
treefe1eeedeb43837aba443681b0eb8f285fbda9469 /dns/bind98
parent6fe7948462078f575b5c514b23e4f42d4e3f2c26 (diff)
downloadfreebsd-ports-gnome-e32ccd597573a05524dd06c9516fb790dc56dabe.tar.gz
freebsd-ports-gnome-e32ccd597573a05524dd06c9516fb790dc56dabe.tar.zst
freebsd-ports-gnome-e32ccd597573a05524dd06c9516fb790dc56dabe.zip
Convert dns/bind9* to USES=gssapi.
Sponsored by: Absolight
Diffstat (limited to 'dns/bind98')
-rw-r--r--dns/bind98/Makefile30
-rw-r--r--dns/bind98/files/patch-configure25
2 files changed, 39 insertions, 16 deletions
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index e4116305278b..51774ebe1f86 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
+PORTREVISION= 1
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 98
@@ -30,13 +31,18 @@ ETCDIR= ${PREFIX}/etc/namedb
CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.*
-OPTIONS_DEFAULT= IPV6 SSL THREADS
+WITH=GSSAPI_HEIMDAL
+WITHOUT=GSSAPI_NONE
+
+OPTIONS_DEFAULT= IPV6 SSL THREADS GSSAPI_NONE
OPTIONS_DEFINE= SSL LINKS IDN REPLACE_BASE LARGE_FILE \
FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH \
- SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA DOCS GOST
+ SIGCHASE IPV6 THREADS FILTER_AAAA DOCS GOST
OPTIONS_GROUP= DLZ
OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
+OPTIONS_SINGLE= GSSAPI
+OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
SSL_DESC= Build with OpenSSL (Required for DNSSEC)
LINKS_DESC= Create conf file symlinks in ${PREFIX}
@@ -56,6 +62,10 @@ DLZ_BDB_DESC= DLZ BDB driver
DLZ_LDAP_DESC= DLZ LDAP driver
DLZ_FILESYSTEM_DESC= DLZ filesystem driver
DLZ_STUB_DESC= DLZ stub driver
+GSSAPI_BASE_DESC= ${GSSAPI_DESC} (Heimdal in base)
+GSSAPI_HEIMDAL_DESC= ${GSSAPI_DESC} (security/heimdal)
+GSSAPI_MIT_DESC= ${GSSAPI_DESC} (security/krb5)
+GSSAPI_NONE_DESC= No ${GSSAPI_DESC}
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
SSL_USE= openssl=yes
@@ -101,12 +111,16 @@ DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes
DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes
-.if defined(HEIMDAL_HOME)
-GSSAPI_CONFIGURE_ON= --with-gssapi=${HEIMDAL_HOME}
-GSSAPI_CONFIGURE_OFF= --without-gssapi
-.else
-GSSAPI_CONFIGURE_WITH= gssapi
-.endif
+GSSAPI_BASE_USES= gssapi
+GSSAPI_BASE_CONFIGURE_ON= \
+ --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_HEIMDAL_USES= gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON= \
+ --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_USES= gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON= \
+ --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
.include <bsd.port.options.mk>
diff --git a/dns/bind98/files/patch-configure b/dns/bind98/files/patch-configure
index 961550b47887..ce8542fd7a79 100644
--- a/dns/bind98/files/patch-configure
+++ b/dns/bind98/files/patch-configure
@@ -1,19 +1,28 @@
---- ./configure.orig 2014-01-27 19:59:48.000000000 +0100
-+++ ./configure 2014-03-04 17:46:51.000000000 +0100
-@@ -13936,6 +13936,7 @@
+--- ./configure.orig 2014-05-24 02:06:09.000000000 +0200
++++ ./configure 2014-06-16 13:02:09.000000000 +0200
+@@ -13935,6 +13935,8 @@
+ "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
"-lgssapi" \
"-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
++ "-lkrb5 -lgssapi_krb5 -lkrb5support -lk5crypto -lcom_err" \
+ "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+ "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
"-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
"-lgss -lkrb5"
- do
-@@ -13958,7 +13959,7 @@
+@@ -13954,12 +13956,14 @@
+ $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#include <gssapi/gssapi.h>
++#include <gssapi/gssapi_krb5.h>
++#include <krb5.h>
+
int
main ()
{
-gss_acquire_cred();krb5_init_context()
-+gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity();
- ;
+- ;
++gss_acquire_cred(0,0,0,0,0,0,0,0);krb5_init_context(0);gsskrb5_register_acceptor_identity(0);
return 0;
}
+ _ACEOF