Index: head/dns/samba-nsupdate/Makefile =================================================================== --- head/dns/samba-nsupdate/Makefile (revision 506535) +++ head/dns/samba-nsupdate/Makefile (revision 506536) @@ -1,100 +1,101 @@ # $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- DISTNAME= bind-${ISCVERSION} MAINTAINER= timur@FreeBSD.org COMMENT= nsupdate utility with GSS-TSIG support 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.13.3 +ISCVERSION= 9.14.2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes CONFIGURE_ARGS+= \ --prefix=${PREFIX} \ --sysconfdir="${PREFIX}/etc/namedb" \ --localstatedir=/var \ --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" 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 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.*||' \ ${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} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE} .include Index: head/dns/samba-nsupdate/distinfo =================================================================== --- head/dns/samba-nsupdate/distinfo (revision 506535) +++ head/dns/samba-nsupdate/distinfo (revision 506536) @@ -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 Index: head/dns/samba-nsupdate/files/patch-configure.in =================================================================== --- head/dns/samba-nsupdate/files/patch-configure.in (revision 506535) +++ head/dns/samba-nsupdate/files/patch-configure.in (nonexistent) @@ -1,90 +0,0 @@ ---- 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" -+ "$($KRB5CONFIG gssapi --libs)"; \ - do -- # 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([ - #include -@@ -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) Property changes on: head/dns/samba-nsupdate/files/patch-configure.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/samba-nsupdate/files/patch-configure.ac =================================================================== --- head/dns/samba-nsupdate/files/patch-configure.ac (nonexistent) +++ head/dns/samba-nsupdate/files/patch-configure.ac (revision 506536) @@ -0,0 +1,90 @@ +--- 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]) +- 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]);; +@@ -1098,27 +1098,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" ++ "$($KRB5CONFIG gssapi --libs)"; \ + do +- # 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([ + #include +@@ -1142,47 +1124,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) Property changes on: head/dns/samba-nsupdate/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property