summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dns/bind910/Makefile30
-rw-r--r--dns/bind910/files/patch-configure10
-rw-r--r--dns/bind98/Makefile30
-rw-r--r--dns/bind98/files/patch-configure25
-rw-r--r--dns/bind99/Makefile30
-rw-r--r--dns/bind99/files/patch-configure25
6 files changed, 110 insertions, 40 deletions
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index daf323d625d8..2828979a40a7 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
+PORTREVISION= 1
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 910
@@ -31,10 +32,13 @@ CONFLICTS= bind9*-9.[456789].* bind9*-sdb-9.[456789].* bind-tools-9.*
SUB_FILES= pkg-message
+WITH=GSSAPI_HEIMDAL
+WITHOUT=GSSAPI_NONE
+
OPTIONS_SUB= yes
-OPTIONS_DEFAULT= IPV6 SSL THREADS SIGCHASE IDN
+OPTIONS_DEFAULT= IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE
OPTIONS_DEFINE= IDN LARGE_FILE GOST \
- FIXED_RRSET SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
+ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
OPTIONS_RADIO= CRYPTO
OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11
@@ -44,6 +48,8 @@ OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS GEOIP
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)
@@ -68,6 +74,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.*
@@ -123,12 +133,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/bind910/files/patch-configure b/dns/bind910/files/patch-configure
new file mode 100644
index 000000000000..e4a1689912cf
--- /dev/null
+++ b/dns/bind910/files/patch-configure
@@ -0,0 +1,10 @@
+--- ./configure.orig 2014-05-27 06:45:53.000000000 +0200
++++ ./configure 2014-06-16 13:05:38.000000000 +0200
+@@ -13899,6 +13899,7 @@
+ "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
+ "-lgssapi" \
+ "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
++ "-lkrb5 -lgssapi_krb5 -lkrb5support -lk5crypto -lcom_err" \
+ "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+ "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+ "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
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
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-19 00:52:34 +0000