Page MenuHomeFreeBSD
Files F109006269

D16878.diff
No OneTemporary
Actions

D16878.diff
View Options

Index: bind-tools/Makefile
===================================================================
--- bind-tools/Makefile
+++ bind-tools/Makefile
@@ -2,12 +2,16 @@
# Define PORTREVISION in ${MASTERDIR}
MASTERDIR= ${.CURDIR}/../../dns/bind912
-
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-BIND_TOOLS_SLAVE= YES
+BIND_SLAVE= yes
INSTALL_WRKSRC= ${WRKSRC}/bin
+post-patch: post-patch-slave
+ @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \
+ -e 's#^ .*check confgen ##' \
+ ${WRKSRC}/bin/Makefile.in
+
.include "${MASTERDIR}/Makefile"
Index: bind912/Makefile
===================================================================
--- bind912/Makefile
+++ bind912/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
# pkg-help formatted with fmt 59 63
-PORTNAME= bind
+PORTNAME?= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-.if defined(BIND_TOOLS_SLAVE)
+.if defined(BIND_SLAVE)
# dns/bind-tools here
-PORTREVISION= 0
+PORTREVISION?= 0
.else
# dns/bind912 here
PORTREVISION= 0
@@ -12,16 +12,16 @@
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
-.if defined(BIND_TOOLS_SLAVE)
-PKGNAMESUFFIX= -tools
+.if defined(BIND_SLAVE)
+PKGNAMESUFFIX?= -tools
.else
PKGNAMESUFFIX= 912
.endif
-DISTNAME= ${PORTNAME}-${ISCVERSION}
+DISTNAME= bind-${ISCVERSION}
MAINTAINER= mat@FreeBSD.org
-.if defined(BIND_TOOLS_SLAVE)
-COMMENT= Command line tools from BIND: delv, dig, host, nslookup...
+.if defined(BIND_SLAVE)
+COMMENT?= Command line tools from BIND: delv, dig, host, nslookup...
.else
COMMENT= BIND DNS suite with updated DNSSEC and DNS64
.endif
@@ -55,7 +55,7 @@
CONFLICTS= bind99 bind910 bind911 bind913 bind9-devel
-.if defined(BIND_TOOLS_SLAVE)
+.if defined(BIND_SLAVE)
CONFIGURE_ARGS+= --disable-shared
CONFLICTS+= bind912
.else
@@ -62,7 +62,7 @@
USE_RC_SUBR= named
SUB_FILES= pkg-message named.conf
CONFLICTS+= bind-tools
-.endif # BIND_TOOLS_SLAVE
+.endif # BIND_SLAVE
MAKE_JOBS_UNSAFE= yes
@@ -76,7 +76,7 @@
OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11
OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1
-.if !defined(BIND_TOOLS_SLAVE)
+.if !defined(BIND_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
@@ -84,7 +84,7 @@
OPTIONS_GROUP= DLZ
OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
-.endif # BIND_TOOLS_SLAVE
+.endif # BIND_SLAVE
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
@@ -230,17 +230,8 @@
that needs SSL.
.endif
+.if !defined(BIND_SLAVE)
post-patch:
-.if defined(BIND_TOOLS_SLAVE)
- @${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 = delv dig dnssec tools nsupdate \\#' \
- -e 's#^ .*check confgen ##' \
- ${WRKSRC}/bin/Makefile.in
-.else
. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
rndc/rndc.8
@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
@@ -248,9 +239,7 @@
-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
${WRKSRC}/bin/${FILE}
. endfor
-.endif
-.if !defined(BIND_TOOLS_SLAVE)
. if ${PORTREVISION:N0}
post-patch-PORTREVISION-on:
@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
@@ -279,7 +268,14 @@
${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif # BIND_TOOLS_SLAVE
+.else
+post-patch-slave:
+ @${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
+.endif # BIND_SLAVE
# Can't use USE_PYTHON=autoplist
post-install-PYTHON-on:
Index: samba-nsupdate/Makefile
===================================================================
--- samba-nsupdate/Makefile
+++ samba-nsupdate/Makefile
@@ -1,85 +1,39 @@
# $FreeBSD$
-PORTNAME= nsupdate
-PORTVERSION= 9.8.6
-PORTREVISION= 1
-CATEGORIES= dns net ipv6
-MASTER_SITES= ISC/bind9/${ISCVERSION}
-PKGNAMEPREFIX= samba-
-DISTNAME= bind-${ISCVERSION}
+PORTNAME= nsupdate
+PORTREVISION= 0
+PORTEPOCH= 0
+PKGNAMEPREFIX= samba-
+PKGNAMESUFFIX=
-MAINTAINER= timur@FreeBSD.org
-COMMENT= nsupdate utility with GSS-TSIG support
+COMMENT= Nsupdate utility with GSS-TSIG support
-LICENSE= ISCL
+LICENSE= MPL20
-# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.8.6
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+MASTERDIR= ${.CURDIR}/../../dns/bind912
-MAKE_JOBS_UNSAFE= yes
+BIND_SLAVE= yes
-USES= autoreconf libtool ssl
-GNU_CONFIGURE= yes
+OPTIONS_DEFAULT+= GSSAPI_BASE
+OPTIONS_SLAVE= SSL
+OPTIONS_EXCLUDE= GSSAPI_NONE GOST GOST_ASN1 FIXED_RRSET IDN JSON \
+ LARGE_FILE PYTHON SIGCHASE THREADS NATIVE_PKCS11
-CONFIGURE_ARGS+= \
- --prefix=${PREFIX} \
- --sysconfdir="/etc/namedb" \
- --localstatedir=/var \
- --enable-largefile \
- --enable-threads \
- --disable-linux-caps \
- --disable-symtable \
- --disable-shared \
- --without-libxml2 \
- --without-iconv \
- --without-idn \
- --with-randomdev=/dev/random
+INSTALL_WRKSRC= ${WRKSRC}/bin
-OPTIONS_DEFINE= IPV6
+post-patch: post-patch-slave
+ @${REINPLACE_CMD} \
+ -e 's|^SUBDIRS.*|SUBDIRS = nsupdate \\|' \
+ -e 's|^.*check confgen ||' \
+ ${PATCH_WRKSRC}/bin/Makefile.in
+ @${REINPLACE_CMD} \
+ -e 's|${PORTNAME}|${PKGBASE}|g' \
+ ${PATCH_WRKSRC}/bin/nsupdate/${PORTNAME}.1
-SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1"
-IPV6_CONFIGURE_ON= --enable-ipv6
-
-PLIST_FILES= bin/${PKGBASE} \
- man/man1/${PKGBASE}.1.gz
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH= x86_64
-.endif
-
-# 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+= libkrb5.so:security/heimdal
-CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"
-.endif
-
-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}|${PKGBASE}|g' \
- ${WRKSRC}/bin/nsupdate/${PORTNAME}.1
-
do-install:
- ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE}
+ ${INSTALL_MAN} ${INSTALL_WRKSRC}/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1
+ ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE}
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
Index: samba-nsupdate/distinfo
===================================================================
--- samba-nsupdate/distinfo
+++ samba-nsupdate/distinfo
@@ -1,2 +0,0 @@
-SHA256 (bind-9.8.6.tar.gz) = 01cc3a0105b47833b99e61b69acd824be4eeefd6557fffa26eced8e03f1249cd
-SIZE (bind-9.8.6.tar.gz) = 7275769
Index: samba-nsupdate/files/patch-configure.in
===================================================================
--- samba-nsupdate/files/patch-configure.in
+++ samba-nsupdate/files/patch-configure.in
@@ -1,21 +0,0 @@
---- 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" \
-- "-lgss -lkrb5"
-+ "-lgss -lkrb5" \
-+ "-lgssapi_krb5 -lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lcrypto -lasn1 -lroken -lcrypt"
- do
- # Note that this does not include $saved_libs, because
- # on FreeBSD machines this configure script has added
-@@ -1027,7 +1028,7 @@
- LIBS="-L$use_gssapi/lib $TRY_LIBS"
- fi
- 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_register_acceptor_identity("krb5");],
- gssapi_linked=yes, gssapi_linked=no)
- case $gssapi_linked in
- yes) AC_MSG_RESULT(yes); break ;;

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 31, 1:35 PM (16 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16364175
Default Alt Text
D16878.diff (8 KB)

Event Timeline