Date: Sun, 23 Aug 2020 22:24:42 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546025 - in head/dns/samba-nsupdate: . files Message-ID: <202008232224.07NMOgfx098932@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sun Aug 23 22:24:41 2020 New Revision: 546025 URL: https://svnweb.freebsd.org/changeset/ports/546025 Log: Update samba-nsupdate port to the version 9.16.5 PR: 244267 Added: head/dns/samba-nsupdate/files/extrapatch-bind-tools (contents, props changed) head/dns/samba-nsupdate/files/patch-bin_named_include_named_globals.h (contents, props changed) Modified: head/dns/samba-nsupdate/Makefile head/dns/samba-nsupdate/distinfo Modified: head/dns/samba-nsupdate/Makefile ============================================================================== --- head/dns/samba-nsupdate/Makefile Sun Aug 23 22:15:59 2020 (r546024) +++ head/dns/samba-nsupdate/Makefile Sun Aug 23 22:24:41 2020 (r546025) @@ -1,22 +1,25 @@ # $FreeBSD$ PORTNAME= nsupdate -PORTVERSION= 9.14.2 -PORTREVISION= 1 +PORTVERSION= 9.16.5 +PORTREVISION= 0 CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMEPREFIX= samba- DISTNAME= bind-${ISCVERSION} MAINTAINER= timur@FreeBSD.org -COMMENT= nsupdate utility with GSS-TSIG support +COMMENT= nsupdate utility with the GSS-TSIG support LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= compiler:c11 cpe libedit autoreconf libtool pkgconfig ssl +LIB_DEPENDS= libuv.so:devel/libuv + +USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz + # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.14.2 +ISCVERSION= 9.16.5 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -30,26 +33,35 @@ CONFIGURE_ARGS+= \ --prefix=${PREFIX} \ --sysconfdir="${PREFIX}/etc/namedb" \ --localstatedir=/var \ - --enable-largefile \ - --enable-threads \ + --disable-largefile \ --disable-linux-caps \ --disable-shared \ --disable-symtable \ + --disable-dnstap \ + --disable-fixed-rrset \ + --disable-geoip \ + --disable-native-pkcs11 \ + --disable-querytrace \ + --disable-tcp-fastopen \ + --with-tuning=default \ --with-dlopen=yes \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-openssl=${OPENSSLBASE} \ + --without-maxminddb \ --without-libxml2 \ - --without-iconv \ + --without-lmdb \ + --without-json-c \ --without-python \ - --without-idn + --without-libidn2 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools + 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 @@ -71,8 +83,6 @@ 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 @@ -80,22 +90,11 @@ PLIST_FILES= bin/${PKGBASE} \ 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 + ${PATCH_WRKSRC}/doc/man/${PORTNAME}.1in do-install: - ${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 + ${INSTALL_MAN} ${INSTALL_WRKSRC}/doc/man/${PORTNAME}.1in ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE} .include <bsd.port.post.mk> Modified: head/dns/samba-nsupdate/distinfo ============================================================================== --- head/dns/samba-nsupdate/distinfo Sun Aug 23 22:15:59 2020 (r546024) +++ head/dns/samba-nsupdate/distinfo Sun Aug 23 22:24:41 2020 (r546025) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562546615 -SHA256 (bind-9.14.2.tar.gz) = 0e4027573726502ec038db3973a086c02508671723a4845e21da1769a5c27f0c -SIZE (bind-9.14.2.tar.gz) = 6263879 +TIMESTAMP = 1597663237 +SHA256 (bind-9.16.5.tar.xz) = 6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075 +SIZE (bind-9.16.5.tar.xz) = 3474044 Added: head/dns/samba-nsupdate/files/extrapatch-bind-tools ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/samba-nsupdate/files/extrapatch-bind-tools Sun Aug 23 22:24:41 2020 (r546025) @@ -0,0 +1,33 @@ +Only select the "tools" part of bind for building. + +--- Makefile.in.orig 2020-06-10 21:01:43 UTC ++++ Makefile.in +@@ -14,7 +14,7 @@ top_builddir = @top_builddir@ + + VERSION=@BIND9_VERSION@ + +-SUBDIRS = make lib fuzz bin doc ++SUBDIRS = lib bin + TARGETS = + PREREQS = bind.keys.h + +@@ -50,7 +50,6 @@ installdirs: + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 + + install:: installdirs +- ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} + + uninstall:: + rm -f ${DESTDIR}${sysconfdir}/bind.keys +--- bin/Makefile.in.orig 2020-06-10 21:01:43 UTC ++++ bin/Makefile.in +@@ -11,8 +11,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ +- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests ++SUBDIRS = nsupdate + TARGETS = + + @BIND9_MAKE_RULES@ Added: head/dns/samba-nsupdate/files/patch-bin_named_include_named_globals.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/samba-nsupdate/files/patch-bin_named_include_named_globals.h Sun Aug 23 22:24:41 2020 (r546025) @@ -0,0 +1,13 @@ +We reference the pid file as being run/named/pid everywere else. + +--- bin/named/include/named/globals.h.orig 2020-02-12 20:03:44 UTC ++++ bin/named/include/named/globals.h +@@ -127,7 +127,7 @@ EXTERN bool named_g_forcelock INIT(false); + + #if NAMED_RUN_PID_DIR + EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" +- "named.pid"); ++ "pid"); + #else /* if NAMED_RUN_PID_DIR */ + EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/" + "named.pid");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008232224.07NMOgfx098932>