From e8882f0eccd217bcf5da451ef71218d049653b7c Mon Sep 17 00:00:00 2001 From: Erwin Lansing Date: Tue, 27 Nov 2012 10:05:32 +0000 Subject: [PATCH] - Update CONFLICTS - Fix a typo in the OPTIONSNG conversion - Add FIXED_RRSET option - Add RPZ options (9.8 and 9.8 only) PR: 172586 Submitted by: Craig Leres Feature safe: yes --- dns/bind96/Makefile | 14 +++++++++----- dns/bind97/Makefile | 17 ++++++++++------- dns/bind98/Makefile | 27 +++++++++++++++++++++------ dns/bind99/Makefile | 23 +++++++++++++++++++---- 4 files changed, 59 insertions(+), 22 deletions(-) diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index 1962225a4745..e165d7a29b1a 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -21,20 +21,22 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random -CONFLICTS= bind9*-9.[45789].* bind9-sdb-* host-* bind-tools-9.* +CONFLICTS= bind9*-9.[45789].* bind9*-sdb-9.[45789].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ - SIGCHASE IPV6 THREADS DLZ + SIGCHASE IPV6 THREADS DLZ FIXED_RRSET OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +FIXED_RRSET= Enable fixed rrset ordering DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) @@ -43,9 +45,6 @@ DLZ_LDAP_DESC= DLZ LDAP driver DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver -# Just in case -USE_OPENSSL= yes - .include .if (${ARCH} == "amd64") @@ -54,6 +53,7 @@ ARCH= x86_64 .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -91,6 +91,10 @@ CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1" CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes diff --git a/dns/bind97/Makefile b/dns/bind97/Makefile index e6cdb002ad9a..01a770b684ec 100644 --- a/dns/bind97/Makefile +++ b/dns/bind97/Makefile @@ -23,17 +23,18 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random -CONFLICTS= bind9*-9.[45689].* bind9-sdb-* host-* +CONFLICTS= bind9*-9.[45689].* bind9*-sdb-9.[45689].* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE SIGCHASE \ - IPV6 THREADS + IPV6 THREADS FIXED_RRSET .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFINE+= LINKS XML DLZ OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version @@ -50,9 +51,6 @@ DLZ_STUB_DESC= DLZ stub driver CONFLICTS+= bind-tools-9.* .endif -# Just in case -USE_OPENSSL= yes - .include .if (${ARCH} == "amd64") @@ -61,6 +59,7 @@ ARCH= x86_64 .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -80,7 +79,7 @@ LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit CONFIGURE_ARGS+= --without-idn .endif -.if ${PORT_OPTIONS:MLINKS} && empty($PORT_OPTIONS:M_REPLACE_BASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -98,6 +97,10 @@ CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1" CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes @@ -223,7 +226,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ* \ ${WRKSRC}/README ${DOCSDIR}/ .endif -.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile index f956eb5c337b..5091d630435b 100644 --- a/dns/bind98/Makefile +++ b/dns/bind98/Makefile @@ -22,20 +22,25 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random -CONFLICTS= bind9*-9.[45679].* bind9-sdb-* host-* bind-tools-9.* +CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ + FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \ SIGCHASE IPV6 THREADS DLZ OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +FIXED_RRSET_DESC= Enable fixed rrset ordering +RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules +RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) @@ -50,11 +55,9 @@ DLZ_STUB_DESC= DLZ stub driver ARCH= x86_64 .endif -# Just in case -USE_OPENSSL= yes - .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -74,7 +77,7 @@ LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit CONFIGURE_ARGS+= --without-idn .endif -.if ${PORT_OPTIONS:MLINKS} && empty($PORT_OPTIONS:MBASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -92,6 +95,18 @@ CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1" CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + +.if ${PORT_OPTIONS:MRPZ_NSIP} +CONFIGURE_ARGS+= --enable-rpz-nsip +.endif + +.if ${PORT_OPTIONS:MRPZ_NSDNAME} +CONFIGURE_ARGS+= --enable-rpz-nsdname +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes @@ -216,7 +231,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${PORT_OPTIONS:MLINKS} && empty($PORTOPTIONS:MREPLACE_BASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 0dd9ad172841..1bf787714071 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -23,20 +23,25 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random \ --without-python -CONFLICTS= bind9*-9.[45678].* bind9-sdb-* host-* bind-tools-9.* +CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ + FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \ SIGCHASE IPV6 THREADS DLZ OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +FIXED_RRSET_DESC= Enable fixed rrset ordering +RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules +RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) @@ -45,9 +50,6 @@ DLZ_LDAP_DESC= DLZ LDAP driver DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver -# Just in case -USE_OPENSSL= yes - .include .if (${ARCH} == "amd64") @@ -56,6 +58,7 @@ ARCH= x86_64 .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -98,6 +101,18 @@ CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes .endif +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + +.if ${PORT_OPTIONS:MRPZ_NSIP} +CONFIGURE_ARGS+= --enable-rpz-nsip +.endif + +.if ${PORT_OPTIONS:MRPZ_NSDNAME} +CONFIGURE_ARGS+= --enable-rpz-nsdname +.endif + .if ${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --with-dlz-mysql=yes USE_MYSQL= yes