mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Code Issues Releases Activity

Update port to the latest version of bind

Browse Source
This commit is contained in:
Timur I. Bakeyev 2018-11-17 11:13:31 +00:00
parent 613349b579
commit e3436c0b00
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=485128
4 changed files with 149 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
dns/samba-nsupdate/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= nsupdate
PORTVERSION= 9.8.6
PORTREVISION= 2
PORTVERSION= 9.13.3
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMEPREFIX= samba-
@ -11,75 +10,90 @@ DISTNAME= bind-${ISCVERSION}
MAINTAINER= timur@FreeBSD.org
COMMENT= nsupdate utility with GSS-TSIG support
LICENSE= ISCL
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
USES= compiler:c11 cpe libedit autoreconf libtool pkgconfig ssl
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.8.6
ISCVERSION= 9.13.3
MAKE_JOBS_UNSAFE= yes
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
.if ${ISCVERSION:M*-*}
CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
.endif
USES= autoreconf libtool ssl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= \
--prefix=${PREFIX} \
--sysconfdir="/etc/namedb" \
--sysconfdir="${PREFIX}/etc/namedb" \
--localstatedir=/var \
--enable-largefile \
--enable-threads \
--disable-linux-caps \
--disable-symtable \
--with-dlopen=yes \
--with-readline="-L${LOCALBASE}/lib -ledit" \
--with-openssl=${OPENSSLBASE} \
--disable-shared \
--without-libxml2 \
--without-iconv \
--without-idn \
--with-randomdev=/dev/random
--without-idn
OPTIONS_DEFINE= IPV6
CONFIGURE_ENV+= STD_CDEFINES="-DDIG_SIGCHASE=1" ACLOCAL_AMFLAGS="-I m4"
SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1"
IPV6_CONFIGURE_ON= --enable-ipv6
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFAULT= GSSAPI_BASE
OPTIONS_DEFINE= IPV6
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
OPTIONS_SUB= yes
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_BASE_USES= gssapi
GSSAPI_HEIMDAL_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_HEIMDAL_USES= gssapi:heimdal
GSSAPI_MIT_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_MIT_USES= gssapi:mit
IPV6_CONFIGURE_ENABLE= ipv6
PLIST_FILES= bin/${PKGBASE} \
man/man1/${PKGBASE}.1.gz
.include <bsd.port.pre.mk>
.if (${ARCH} == "amd64")
ARCH= x86_64
.endif
# Enable OpenSSL API
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
# Try to find appropriate GSSAPI libs
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
CONFIGURE_ARGS+= --with-gssapi="${KRB5_HOME}"
.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
CONFIGURE_ARGS+= --with-gssapi="${HEIMDAL_HOME}"
.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
CONFIGURE_ARGS+= --with-gssapi="/usr"
.else
LIB_DEPENDS+= libkrb5.so:security/heimdal
CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"
.endif
post-patch:
@${REINPLACE_CMD} \
-e 's|^SUBDIRS.*|SUBDIRS = lib bin|' \
-e 's|isc-config.sh installdirs|installdirs|' \
-e 's|.*INSTALL.*isc-config.*||' \
-e 's|.*INSTALL.*bind.keys.*||' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} \
-e 's|^SUBDIRS.*|SUBDIRS = ${PORTNAME}|' \
-e 's|^.*check confgen ||' \
${WRKSRC}/bin/Makefile.in
@${REINPLACE_CMD} \
-e 's|${PORTNAME}|${PKGBASE}|g' \
${WRKSRC}/bin/nsupdate/${PORTNAME}.1
@${REINPLACE_CMD} \
-e 's|^SUBDIRS.*|SUBDIRS = lib bin|' \
-e 's|isc-config.sh installdirs|installdirs|' \
-e 's|.*INSTALL.*isc-config.*||' \
-e 's|.*INSTALL.*bind.keys.*||' \
${PATCH_WRKSRC}/Makefile.in
@${REINPLACE_CMD} \
-e 's|^SUBDIRS.*|SUBDIRS = ${PORTNAME} \\|' \
-e 's|^.*check confgen ||' \
-e '/tests$$/d' \
${PATCH_WRKSRC}/bin/Makefile.in
@${REINPLACE_CMD} \
-e 's|${PORTNAME}|${PKGBASE}|g' \
${PATCH_WRKSRC}/bin/nsupdate/${PORTNAME}.1
do-install:
${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1
${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE}
${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE}
.include <bsd.port.post.mk>

5
dns/samba-nsupdate/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (bind-9.8.6.tar.gz) = 01cc3a0105b47833b99e61b69acd824be4eeefd6557fffa26eced8e03f1249cd
SIZE (bind-9.8.6.tar.gz) = 7275769
TIMESTAMP = 1542404362
SHA256 (bind-9.13.3.tar.gz) = 76674cf2a3e61766aed5c7fd1ee6ed3da133a9e331b35b24f40efdf1bbac5b44
SIZE (bind-9.13.3.tar.gz) = 7805551

105
dns/samba-nsupdate/files/patch-configure.in
View File

@ -1,21 +1,90 @@
--- configure.in.orig 2013-09-05 05:19:53.000000000 +0000
+++ configure.in 2013-10-18 14:30:21.711727438 +0000
@@ -1013,7 +1013,8 @@
"-lgssapi" \
"-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
"-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
--- configure.in.orig 2018-09-06 04:15:26 UTC
+++ configure.in
@@ -1126,7 +1126,7 @@ case "$use_gssapi" in
saved_libs="$LIBS"
LIBS=$gssapi_libs
AC_MSG_CHECKING([krb5-config linking as $LIBS])
- AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
+ AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity("krb5");],
gssapi_linked=yes, gssapi_linked=no)
case $gssapi_linked in
yes) AC_MSG_RESULT([krb5-config: linked]);;
@@ -1255,27 +1255,9 @@ case "$use_gssapi" in
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
- "-lgssapi_krb5" \
- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
- "-lgssapi" \
- "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgss -lkrb5"
+ "-lgss -lkrb5" \
+ "-lgssapi_krb5 -lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lcrypto -lasn1 -lroken -lcrypt"
+ "$($KRB5CONFIG gssapi --libs)"; \
do
# Note that this does not include $saved_libs, because
# on FreeBSD machines this configure script has added
@@ -1027,7 +1028,7 @@
LIBS="-L$use_gssapi/lib $TRY_LIBS"
fi
- # Note that this does not include $saved_libs, because
- # on FreeBSD machines this configure script has added
- # -L/usr/local/lib to LIBS, which can make the
- # -lgssapi_krb5 test succeed with shared libraries even
- # when you are trying to build with KTH in /usr/lib.
- if test "/usr" = "$use_gssapi"
- then
- LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
- else
- LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
- fi
+ LIBS="$TRY_LIBS"
AC_MSG_CHECKING(linking as $TRY_LIBS)
- AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
+ AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity("krb5");],
gssapi_linked=yes, gssapi_linked=no)
case $gssapi_linked in
yes) AC_MSG_RESULT(yes); break ;;
AC_TRY_LINK([
#include <sys/types.h>
@@ -1299,47 +1281,7 @@ gsskrb5_register_acceptor_identity(NULL)
no) AC_MSG_ERROR(could not determine proper GSSAPI linkage) ;;
esac
- #
- # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib
- # but MIT in /usr/local/lib and trying to build with KTH.
- # /usr/local/lib can end up earlier on the link lines.
- # Like most kludges, this one is not only inelegant it
- # is also likely to be the wrong thing to do at least as
- # many times as it is the right thing. Something better
- # needs to be done.
- #
- if test "/usr" = "$use_gssapi" -a \
- -f /usr/local/lib/libkrb5.a; then
- FIX_KTH_VS_MIT=yes
- fi
-
- case "$FIX_KTH_VS_MIT" in
- yes)
- case "$enable_static_linking" in
- yes) gssapi_lib_suffix=".a" ;;
- *) gssapi_lib_suffix=".so" ;;
- esac
-
- for lib in $LIBS; do
- case $lib in
- -L*)
- ;;
- -l*)
- new_lib=`echo $lib |
- sed -e s%^-l%$use_gssapi/lib/lib% \
- -e s%$%$gssapi_lib_suffix%`
- NEW_LIBS="$NEW_LIBS $new_lib"
- ;;
- *)
- AC_MSG_ERROR([KTH vs MIT Kerberos confusion!])
- ;;
- esac
- done
- LIBS="$NEW_LIBS"
- ;;
- esac
-
- DST_GSSAPI_INC="-I$use_gssapi/include"
+ DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)"
DNS_GSSAPI_LIBS="$LIBS"
AC_MSG_RESULT(using GSSAPI from $use_gssapi/lib and $use_gssapi/include)

12
dns/samba-nsupdate/files/patch-lib_isc_random.c
View File

@ -1,12 +0,0 @@
--- lib/isc/random.c.orig 2013-09-05 05:19:53 UTC
+++ lib/isc/random.c
@@ -68,7 +68,9 @@ isc_random_seed(isc_uint32_t seed)
#ifndef HAVE_ARC4RANDOM
srand(seed);
#else
+#ifdef arc4random_addrandom
arc4random_addrandom((u_char *) &seed, sizeof(isc_uint32_t));
+#endif
#endif
}