mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

Don't polute isc-config.sh with gssapi flags.

Browse Source 
Submitted by:	hrs
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-03-04 17:32:45 +00:00
parent 74f7dfab80
commit 14bf5e9cb7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=347046
6 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dns/bind98/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.8.7
PORTREVISION= 1
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@ -99,7 +100,12 @@ 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
.include <bsd.port.options.mk>
@ -117,14 +123,6 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --disable-threads
.endif
.if ${PORT_OPTIONS:MGSSAPI}
.if defined(HEIMDAL_HOME)
LDFLAGS+= -L${LIBDIR} -lgssapi -lkrb5
.else
LDFLAGS+= -L${LIBDIR} -lgssapi_krb5
.endif
.endif
.if ${PORT_OPTIONS:MREPLACE_BASE}
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
IGNORE= REPLACE_BASE option is not supported on this release

19
dns/bind98/files/patch-configure Normal file
View File

@ -0,0 +1,19 @@
--- ./configure.orig 2014-01-27 19:59:48.000000000 +0100
+++ ./configure 2014-03-04 17:46:51.000000000 +0100
@@ -13936,6 +13936,7 @@
"-lgssapi" \
"-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -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" \
"-lgss -lkrb5"
do
@@ -13958,7 +13959,7 @@
int
main ()
{
-gss_acquire_cred();krb5_init_context()
+gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity();
;
return 0;
}

12
dns/bind98/files/patch-lib__isc__include__isc__file.h Normal file
View File

@ -0,0 +1,12 @@
--- ./lib/isc/include/isc/file.h.orig 2014-01-27 19:59:48.000000000 +0100
+++ ./lib/isc/include/isc/file.h 2014-03-04 17:46:51.000000000 +0100
@@ -25,7 +25,8 @@
#include <stdio.h>
#include <isc/lang.h>
-#include <isc/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS

14
dns/bind99/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.9.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@ -111,7 +111,11 @@ DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes
DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes
.if defined(HEIMDAL_HOME)
GSSAPI_CONFIGURE_WITH= gssapi=${HEIMDAL_HOME}
.else
GSSAPI_CONFIGURE_WITH= gssapi
.endif
.include <bsd.port.options.mk>
@ -129,14 +133,6 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --disable-threads
.endif
.if ${PORT_OPTIONS:MGSSAPI}
.if defined(HEIMDAL_HOME)
LDFLAGS+= -L${LIBDIR} -lgssapi -lkrb5
.else
LDFLAGS+= -L${LIBDIR} -lgssapi_krb5
.endif
.endif
.if ${PORT_OPTIONS:MREPLACE_BASE}
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
IGNORE= REPLACE_BASE option is not supported on this release

19
dns/bind99/files/patch-configure Normal file
View File

@ -0,0 +1,19 @@
--- ./configure.orig 2014-01-27 19:58:24.000000000 +0100
+++ ./configure 2014-03-04 17:51:41.000000000 +0100
@@ -14161,6 +14161,7 @@
"-lgssapi" \
"-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -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" \
"-lgss -lkrb5"
do
@@ -14183,7 +14184,7 @@
int
main ()
{
-gss_acquire_cred();krb5_init_context()
+gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity();
;
return 0;
}

12
dns/bind99/files/patch-lib__isc__include__isc__file.h Normal file
View File

@ -0,0 +1,12 @@
--- ./lib/isc/include/isc/file.h.orig 2014-01-27 19:58:24.000000000 +0100
+++ ./lib/isc/include/isc/file.h 2014-03-04 17:51:41.000000000 +0100
@@ -25,7 +25,8 @@
#include <stdio.h>
#include <isc/lang.h>
-#include <isc/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS