From 4bb2b824c3dce0a1864b061bf4720469eef9f31b Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Sat, 13 Jul 2019 10:38:20 +0000 Subject: [PATCH] Update port to the recent bind14 codebase. --- dns/samba-nsupdate/Makefile | 9 +++++---- dns/samba-nsupdate/distinfo | 6 +++--- .../files/{patch-configure.in => patch-configure.ac} | 10 +++++----- 3 files changed, 13 insertions(+), 12 deletions(-) rename dns/samba-nsupdate/files/{patch-configure.in => patch-configure.ac} (92%) diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile index 0e955f891f16..902965fff51f 100644 --- a/dns/samba-nsupdate/Makefile +++ b/dns/samba-nsupdate/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= nsupdate -PORTVERSION= 9.13.3 -PORTREVISION= 1 +PORTVERSION= 9.14.2 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMEPREFIX= samba- @@ -16,7 +16,7 @@ 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.13.3 +ISCVERSION= 9.14.2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -33,13 +33,14 @@ CONFIGURE_ARGS+= \ --enable-largefile \ --enable-threads \ --disable-linux-caps \ + --disable-shared \ --disable-symtable \ --with-dlopen=yes \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-openssl=${OPENSSLBASE} \ - --disable-shared \ --without-libxml2 \ --without-iconv \ + --without-python \ --without-idn CONFIGURE_ENV+= STD_CDEFINES="-DDIG_SIGCHASE=1" ACLOCAL_AMFLAGS="-I m4" diff --git a/dns/samba-nsupdate/distinfo b/dns/samba-nsupdate/distinfo index d68ee1ad3f1d..e153220665d9 100644 --- a/dns/samba-nsupdate/distinfo +++ b/dns/samba-nsupdate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542404362 -SHA256 (bind-9.13.3.tar.gz) = 76674cf2a3e61766aed5c7fd1ee6ed3da133a9e331b35b24f40efdf1bbac5b44 -SIZE (bind-9.13.3.tar.gz) = 7805551 +TIMESTAMP = 1562546615 +SHA256 (bind-9.14.2.tar.gz) = 0e4027573726502ec038db3973a086c02508671723a4845e21da1769a5c27f0c +SIZE (bind-9.14.2.tar.gz) = 6263879 diff --git a/dns/samba-nsupdate/files/patch-configure.in b/dns/samba-nsupdate/files/patch-configure.ac similarity index 92% rename from dns/samba-nsupdate/files/patch-configure.in rename to dns/samba-nsupdate/files/patch-configure.ac index 5fe07f354e8d..094f460325b2 100644 --- a/dns/samba-nsupdate/files/patch-configure.in +++ b/dns/samba-nsupdate/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.in.orig 2018-09-06 04:15:26 UTC -+++ configure.in -@@ -1126,7 +1126,7 @@ case "$use_gssapi" in +--- configure.ac.orig 2019-05-10 06:51:34 UTC ++++ configure.ac +@@ -966,7 +966,7 @@ case "$use_gssapi" in saved_libs="$LIBS" LIBS=$gssapi_libs AC_MSG_CHECKING([krb5-config linking as $LIBS]) @@ -9,7 +9,7 @@ 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 +@@ -1098,27 +1098,9 @@ case "$use_gssapi" in # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -39,7 +39,7 @@ AC_MSG_CHECKING(linking as $TRY_LIBS) AC_TRY_LINK([ #include -@@ -1299,47 +1281,7 @@ gsskrb5_register_acceptor_identity(NULL) +@@ -1142,47 +1124,7 @@ gsskrb5_register_acceptor_identity(NULL) no) AC_MSG_ERROR(could not determine proper GSSAPI linkage) ;; esac