diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2014-06-17 23:01:24 +0800 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-06-17 23:01:24 +0800 |
| commit | 249978131e6322e3c0641ef323b824ff281f5dfb (patch) | |
| tree | fe1eeedeb43837aba443681b0eb8f285fbda9469 /dns/bind99 | |
| parent | 427e48f5debfab5d5b17c82fac38980c441dbb9f (diff) | |
| download | freebsd-ports-gnome-249978131e6322e3c0641ef323b824ff281f5dfb.tar.gz freebsd-ports-gnome-249978131e6322e3c0641ef323b824ff281f5dfb.tar.zst freebsd-ports-gnome-249978131e6322e3c0641ef323b824ff281f5dfb.zip | |
Convert dns/bind9* to USES=gssapi.
Sponsored by: Absolight
Diffstat (limited to 'dns/bind99')
| -rw-r--r-- | dns/bind99/Makefile | 30 | ||||
| -rw-r--r-- | dns/bind99/files/patch-configure | 25 |
2 files changed, 39 insertions, 16 deletions
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index aef98f40add5..ab080241c4bf 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX?= 99 @@ -29,14 +30,19 @@ ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.* -OPTIONS_DEFAULT= IPV6 SSL THREADS +WITH=GSSAPI_HEIMDAL +WITHOUT=GSSAPI_NONE + +OPTIONS_DEFAULT= IPV6 SSL THREADS GSSAPI_NONE OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \ - IPV6 THREADS GSSAPI FILTER_AAAA GOST + IPV6 THREADS FILTER_AAAA GOST .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS 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 .endif # BIND_TOOLS_SLAVE SSL_DESC= Build with OpenSSL (Required for DNSSEC) @@ -60,6 +66,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} .if !defined(BIND_TOOLS_SLAVE) CONFLICTS+= bind-tools-9.* @@ -113,12 +123,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/bind99/files/patch-configure b/dns/bind99/files/patch-configure index 2c3a2550c507..9c32b1500cef 100644 --- a/dns/bind99/files/patch-configure +++ b/dns/bind99/files/patch-configure @@ -1,19 +1,28 @@ ---- ./configure.orig 2014-01-27 19:58:24.000000000 +0100 -+++ ./configure 2014-03-04 17:51:41.000000000 +0100 -@@ -14161,6 +14161,7 @@ +--- configure.orig 2014-03-27 06:00:33.000000000 +0900 ++++ configure 2014-03-27 06:02:11.000000000 +0900 +@@ -14160,6 +14160,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 -@@ -14183,7 +14184,7 @@ +@@ -14179,12 +14181,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 |