Date: Wed, 21 Nov 2018 09:39:52 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: "Timur I. Bakeyev" <timur@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r485128 - in head/dns/samba-nsupdate: . files Message-ID: <20181121083952.hycfclgouh5wuvyx@atuin.in.mat.cc> In-Reply-To: <201811171113.wAHBDVZv072795@repo.freebsd.org> References: <201811171113.wAHBDVZv072795@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--u6chscudcyaghqev Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 17, 2018 at 11:13:31AM +0000, Timur I. Bakeyev wrote: > Author: timur > Date: Sat Nov 17 11:13:31 2018 > New Revision: 485128 > URL: https://svnweb.freebsd.org/changeset/ports/485128 >=20 > Log: > Update port to the latest version of bind The latest version of BIND9 is 9.12.3. The 9.13 branch is a development branch. > Deleted: > head/dns/samba-nsupdate/files/patch-lib_isc_random.c > Modified: > head/dns/samba-nsupdate/Makefile > head/dns/samba-nsupdate/distinfo > head/dns/samba-nsupdate/files/patch-configure.in >=20 > Modified: head/dns/samba-nsupdate/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/samba-nsupdate/Makefile Sat Nov 17 10:58:04 2018 (r485127) > +++ head/dns/samba-nsupdate/Makefile Sat Nov 17 11:13:31 2018 (r485128) > @@ -1,8 +1,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D nsupdate > -PORTVERSION=3D 9.8.6 > -PORTREVISION=3D 2 > +PORTVERSION=3D 9.13.3 > CATEGORIES=3D dns net ipv6 > MASTER_SITES=3D ISC/bind9/${ISCVERSION} > PKGNAMEPREFIX=3D samba- > @@ -11,75 +10,90 @@ DISTNAME=3D bind-${ISCVERSION} > MAINTAINER=3D timur@FreeBSD.org > COMMENT=3D nsupdate utility with GSS-TSIG support > =20 > -LICENSE=3D ISCL > +LICENSE=3D MPL20 > +LICENSE_FILE=3D ${WRKSRC}/COPYRIGHT > =20 > +USES=3D compiler:c11 cpe libedit autoreconf libtool pkgconfig ssl > # ISC releases things like 9.8.0-P1, which our versioning doesn't like > -ISCVERSION=3D 9.8.6 > +ISCVERSION=3D 9.13.3 > =20 > -MAKE_JOBS_UNSAFE=3D yes > +CPE_VENDOR=3D isc > +CPE_VERSION=3D ${ISCVERSION:C/-.*//} > +.if ${ISCVERSION:M*-*} > +CPE_UPDATE=3D ${ISCVERSION:C/.*-//:tl} > +.endif > =20 > -USES=3D autoreconf libtool ssl > GNU_CONFIGURE=3D yes > =20 > CONFIGURE_ARGS+=3D \ > --prefix=3D${PREFIX} \ > - --sysconfdir=3D"/etc/namedb" \ > + --sysconfdir=3D"${PREFIX}/etc/namedb" \ > --localstatedir=3D/var \ > --enable-largefile \ > --enable-threads \ > --disable-linux-caps \ > --disable-symtable \ > + --with-dlopen=3Dyes \ > + --with-readline=3D"-L${LOCALBASE}/lib -ledit" \ > + --with-openssl=3D${OPENSSLBASE} \ > --disable-shared \ > --without-libxml2 \ > --without-iconv \ > - --without-idn \ > - --with-randomdev=3D/dev/random > + --without-idn > =20 > -OPTIONS_DEFINE=3D IPV6 > +CONFIGURE_ENV+=3D STD_CDEFINES=3D"-DDIG_SIGCHASE=3D1" ACLOCAL_AMFLAGS= =3D"-I m4" > =20 > -SIGCHASE_CONFIGURE_ARGS+=3D STD_CDEFINES=3D"-DDIG_SIGCHASE=3D1" > -IPV6_CONFIGURE_ON=3D --enable-ipv6 > +MAKE_JOBS_UNSAFE=3D yes > =20 > +OPTIONS_DEFAULT=3D GSSAPI_BASE > + > +OPTIONS_DEFINE=3D IPV6 > +OPTIONS_SINGLE=3D GSSAPI > +OPTIONS_SINGLE_GSSAPI=3D GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT > + > +OPTIONS_SUB=3D yes > + > +GSSAPI_BASE_DESC=3D Using Heimdal in base > +GSSAPI_HEIMDAL_DESC=3D Using security/heimdal > +GSSAPI_MIT_DESC=3D Using security/krb5 > + > +GSSAPI_BASE_CONFIGURE_ON=3D\ > + --with-gssapi=3D${GSSAPIBASEDIR} KRB5CONFIG=3D"${KRB5CONFIG}" > +GSSAPI_BASE_USES=3D gssapi > + > +GSSAPI_HEIMDAL_CONFIGURE_ON=3D\ > + --with-gssapi=3D${GSSAPIBASEDIR} KRB5CONFIG=3D"${KRB5CONFIG}" > +GSSAPI_HEIMDAL_USES=3D gssapi:heimdal > + > +GSSAPI_MIT_CONFIGURE_ON=3D\ > + --with-gssapi=3D${GSSAPIBASEDIR} KRB5CONFIG=3D"${KRB5CONFIG}" > +GSSAPI_MIT_USES=3D gssapi:mit > + > +IPV6_CONFIGURE_ENABLE=3D ipv6 > + > PLIST_FILES=3D bin/${PKGBASE} \ > man/man1/${PKGBASE}.1.gz > =20 > .include <bsd.port.pre.mk> > =20 > -.if (${ARCH} =3D=3D "amd64") > -ARCH=3D x86_64 > -.endif > - > -# Enable OpenSSL API > -CONFIGURE_ARGS+=3D --with-openssl=3D${OPENSSLBASE} > -# Try to find appropriate GSSAPI libs > -.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) > -CONFIGURE_ARGS+=3D --with-gssapi=3D"${KRB5_HOME}" > -.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so) > -CONFIGURE_ARGS+=3D --with-gssapi=3D"${HEIMDAL_HOME}" > -.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config) > -CONFIGURE_ARGS+=3D --with-gssapi=3D"/usr" > -.else > -LIB_DEPENDS+=3D libkrb5.so:security/heimdal > -CONFIGURE_ARGS+=3D --with-gssapi=3D"${LOCALBASE}" > -.endif > - > post-patch: > - @${REINPLACE_CMD} \ > - -e 's|^SUBDIRS.*|SUBDIRS =3D 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 =3D ${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 =3D 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 =3D ${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 > =20 > do-install: > - ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPRE= FIX}/man/man1/${PKGBASE}.1 > - ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREF= IX}/bin/${PKGBASE} > + ${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR= }${MANPREFIX}/man/man1/${PKGBASE}.1 > + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGED= IR}${PREFIX}/bin/${PKGBASE} > =20 > .include <bsd.port.post.mk> >=20 > Modified: head/dns/samba-nsupdate/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/samba-nsupdate/distinfo Sat Nov 17 10:58:04 2018 (r485127) > +++ head/dns/samba-nsupdate/distinfo Sat Nov 17 11:13:31 2018 (r485128) > @@ -1,2 +1,3 @@ > -SHA256 (bind-9.8.6.tar.gz) =3D 01cc3a0105b47833b99e61b69acd824be4eeefd65= 57fffa26eced8e03f1249cd > -SIZE (bind-9.8.6.tar.gz) =3D 7275769 > +TIMESTAMP =3D 1542404362 > +SHA256 (bind-9.13.3.tar.gz) =3D 76674cf2a3e61766aed5c7fd1ee6ed3da133a9e3= 31b35b24f40efdf1bbac5b44 > +SIZE (bind-9.13.3.tar.gz) =3D 7805551 >=20 > Modified: head/dns/samba-nsupdate/files/patch-configure.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/samba-nsupdate/files/patch-configure.in Sat Nov 17 10:58:04 = 2018 (r485127) > +++ head/dns/samba-nsupdate/files/patch-configure.in Sat Nov 17 11:13:31 = 2018 (r485128) > @@ -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=3D"$LIBS" > + LIBS=3D$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_reg= ister_acceptor_identity("krb5");], > + gssapi_linked=3Dyes, gssapi_linked=3Dno) > + 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=3D"$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 -lcry= pto -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=3D"-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" =3D "$use_gssapi" > +- then > +- LIBS=3D"$TRY_LIBS $ISC_OPENSSL_LIBS" > +- else > +- LIBS=3D"-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS" > +- fi > ++ LIBS=3D"$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_re= gister_acceptor_identity("krb5");], > - gssapi_linked=3Dyes, gssapi_linked=3Dno) > - 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 > +=20 > +- # > +- # 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" =3D "$use_gssapi" -a \ > +- -f /usr/local/lib/libkrb5.a; then > +- FIX_KTH_VS_MIT=3Dyes > +- fi > +- > +- case "$FIX_KTH_VS_MIT" in > +- yes) > +- case "$enable_static_linking" in > +- yes) gssapi_lib_suffix=3D".a" ;; > +- *) gssapi_lib_suffix=3D".so" ;; > +- esac > +- > +- for lib in $LIBS; do > +- case $lib in > +- -L*) > +- ;; > +- -l*) > +- new_lib=3D`echo $lib | > +- sed -e s%^-l%$use_gssapi/lib/lib% \ > +- -e s%$%$gssapi_lib_suffix%` > +- NEW_LIBS=3D"$NEW_LIBS $new_lib" > +- ;; > +- *) > +- AC_MSG_ERROR([KTH vs MIT Kerberos confusion!]) > +- ;; > +- esac > +- done > +- LIBS=3D"$NEW_LIBS" > +- ;; > +- esac > +- > +- DST_GSSAPI_INC=3D"-I$use_gssapi/include" > ++ DST_GSSAPI_INC=3D"$($KRB5CONFIG gssapi --cflags)" > + DNS_GSSAPI_LIBS=3D"$LIBS" > +=20 > + AC_MSG_RESULT(using GSSAPI from $use_gssapi/lib and $use_gssapi/inclu= de) >=20 >=20 --=20 Mathieu Arnold --u6chscudcyaghqev Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAlv1GddfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkh1VQ/8C95GRI6jZ344P7rYmz6mQd0MEEVcJHo6ofuy/YtsXjs1YNj98Kx3l/Jd Q+cJ6atTxkpM87x3QIVRQr+9GuXH2pf1l6L50u1COB6WYQ1QcMWf03HF5fi3TYcY zuc+DwQ/VfP9iD21WXTRInn7TBd6hl0CPCSzneRu5hU5JtcssW7fK0nCbUGjQOWw T0MmX4iNuplxe2dNMfEh41G41tbRtL7j3sr2IWgSwi0GRi4Ab5a0jVZE68HyqP5u Wyo33A1QPRvzGZOPmUYVW7IccettxjaCGdTr8M8CXpj5S7QvEw3E8uPdebHMY2jj GnfyvyTO7xP/8eLWtxd7wbFhe15fcU+03/3vpda3YQ1ZLHbIr/qtyE1F4E3Ugi5b lk0xm7LH/Pd663iF9nWTqJlEth/nd+xgTMOm6Kbt3ju6hX7BzvSykEjABb1YRg6t XYqwa+QzMRPes4wTAk0/y2HuXqMABA8CF5yRZOXiQCqS8nNWU3egfjTng9zRI4Z/ gMO3qd9gYgnVPVtuPBydtZIp6WpSDAFLzD7/uqCzLuIMWDY9hQzP6iHpnuyaSy2O ovk2lNkSVrF8fcWCcGcXu6U/DzLQsqbSSPhU78DzY8li8I9HLWkroO4UB1NaKcH5 mX2rQqYmROMCs8/U25Hm53LWa+3VuJrjrIO5HLgoxBMUrpCcqRY= =h0wN -----END PGP SIGNATURE----- --u6chscudcyaghqev--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20181121083952.hycfclgouh5wuvyx>