[Midnightbsd-cvs] mports [24768] trunk/dns/samba-nsupdate: update to 9.13.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jan 6 14:47:17 EST 2019
Revision: 24768
http://svnweb.midnightbsd.org/mports/?rev=24768
Author: laffer1
Date: 2019-01-06 14:47:16 -0500 (Sun, 06 Jan 2019)
Log Message:
-----------
update to 9.13.3
Modified Paths:
--------------
trunk/dns/samba-nsupdate/Makefile
trunk/dns/samba-nsupdate/distinfo
Added Paths:
-----------
trunk/dns/samba-nsupdate/files/
trunk/dns/samba-nsupdate/files/patch-configure.in
Modified: trunk/dns/samba-nsupdate/Makefile
===================================================================
--- trunk/dns/samba-nsupdate/Makefile 2019-01-06 19:39:42 UTC (rev 24767)
+++ trunk/dns/samba-nsupdate/Makefile 2019-01-06 19:47:16 UTC (rev 24768)
@@ -1,11 +1,9 @@
# $MidnightBSD$
PORTNAME= nsupdate
-PORTVERSION= 9.8.6
-PORTREVISION= 1
+PORTVERSION= 9.13.3
CATEGORIES= dns net ipv6
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
+MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMEPREFIX= samba-
DISTNAME= bind-${ISCVERSION}
@@ -12,81 +10,90 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= An nsupdate utility with GSS-TSIG support
-LICENSE= iscl
+LICENSE= mpl
+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= 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
-.include <bsd.mport.options.mk>
+CONFIGURE_ENV+= STD_CDEFINES="-DDIG_SIGCHASE=1" ACLOCAL_AMFLAGS="-I m4"
-.include <bsd.port.pre.mk>
+MAKE_JOBS_UNSAFE= yes
-.if (${ARCH} == "amd64")
-ARCH= x86_64
-.endif
+OPTIONS_DEFAULT= GSSAPI_BASE
-.if ${PORT_OPTIONS:MSIGCHASE}
-CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1"
-.endif
+OPTIONS_DEFINE= IPV6
+OPTIONS_SINGLE= GSSAPI
+OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
+OPTIONS_SUB= yes
-# 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+= krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"
-.endif
+GSSAPI_BASE_DESC= Using Heimdal in base
+GSSAPI_HEIMDAL_DESC= Using security/heimdal
+GSSAPI_MIT_DESC= Using security/krb5
-MAN1= ${UNIQUENAME}.1
+GSSAPI_BASE_CONFIGURE_ON=\
+ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
+GSSAPI_BASE_USES= gssapi
-PLIST_FILES= bin/${UNIQUENAME}
+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>
+
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}|${UNIQUENAME}|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 ${MANPREFIX}/man/man1/${UNIQUENAME}.1
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${PREFIX}/bin/${UNIQUENAME}
+ ${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>
Modified: trunk/dns/samba-nsupdate/distinfo
===================================================================
--- trunk/dns/samba-nsupdate/distinfo 2019-01-06 19:39:42 UTC (rev 24767)
+++ trunk/dns/samba-nsupdate/distinfo 2019-01-06 19:47:16 UTC (rev 24768)
@@ -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
Added: trunk/dns/samba-nsupdate/files/patch-configure.in
===================================================================
--- trunk/dns/samba-nsupdate/files/patch-configure.in (rev 0)
+++ trunk/dns/samba-nsupdate/files/patch-configure.in 2019-01-06 19:47:16 UTC (rev 24768)
@@ -0,0 +1,90 @@
+--- 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 <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)
Property changes on: trunk/dns/samba-nsupdate/files/patch-configure.in
___________________________________________________________________
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
More information about the Midnightbsd-cvs
mailing list