diff --git a/bind.changes b/bind.changes index bd0770f..98f337a 100644 --- a/bind.changes +++ b/bind.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 24 18:30:08 UTC 2010 - jengelh@medozas.de - -- Enable DLZ-LDAP (supersedes sdb_ldap) and add a patch - ------------------------------------------------------------------- Wed Feb 17 12:27:56 CET 2010 - ug@suse.de diff --git a/bind.spec b/bind.spec index 42b676b..8154a28 100644 --- a/bind.spec +++ b/bind.spec @@ -21,7 +21,7 @@ Name: bind %define pkg_name bind %define pkg_vers 9.7.0 -BuildRequires: openldap2-devel +#BuildRequires: openldap2 openldap2-devel BuildRequires: libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel Summary: Domain Name System (DNS) Server (named) Version: 9.7.0 @@ -45,8 +45,6 @@ Patch2: pid-path.diff Patch4: perl-path.diff Patch51: pie_compile.diff Patch52: named-bootconf.diff -Patch60: dlz-dollarvar.patch -Source60: dlz-schema.txt %if %ul_version >= 1 %define VENDOR UL %else @@ -223,7 +221,6 @@ Authors: %endif %patch52 #%patch53 -%patch -P 60 -p1 # modify settings of some files regarding to OS version and vendor function replaceStrings() { @@ -281,10 +278,10 @@ CONFIGURE_OPTIONS="\ --with-libtool \ --enable-runidn \ --with-libxml2 \ - --with-dlz-mysql --with-dlz-ldap + --with-dlz-mysql " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{?_smp_mflags} +%{__make} %{?jobs:-j%jobs}; pushd contrib/idn/idnkit-1.0-src ./configure ${CONFIGURE_OPTIONS} %{__make} %{?jobs:-j%jobs}; @@ -344,7 +341,6 @@ install -m 0754 vendor-files/tools/createNamedConfInclude ${RPM_BUILD_ROOT}/%{_d install -m 0755 vendor-files/tools/bind.genDDNSkey ${RPM_BUILD_ROOT}/%{_bindir}/genDDNSkey cp -a vendor-files/docu/BIND.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System cp -p ${RPM_SOURCE_DIR}/dnszone-schema.txt ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/dnszone.schema -cp -p "%{S:60}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/dlz.schema" install -m 0754 vendor-files/tools/ldapdump ${RPM_BUILD_ROOT}/%{_datadir}/bind find ${RPM_BUILD_ROOT}/%{_libdir} -type f -name '*.so*' -print0 | xargs -0 chmod 0755 touch ${RPM_BUILD_ROOT}/var/lib/named/etc/{localtime,named.conf.include,named.d/rndc.access.conf} @@ -683,7 +679,6 @@ fi %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/dnszone.schema -%attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/dlz.schema %{_bindir}/dig %{_bindir}/host %{_bindir}/idnconv diff --git a/dlz-dollarvar.patch b/dlz-dollarvar.patch deleted file mode 100644 index d98fa6a..0000000 --- a/dlz-dollarvar.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.launchpad.net/ubuntu/+source/bind9/+bug/227344 - -LDAP API does not like %. - ---- bind-9.6.1P1/contrib/dlz/drivers/sdlz_helper.c.orig -+++ bind-9.6.1P1/contrib/dlz/drivers/sdlz_helper.c -@@ -166,12 +166,12 @@ build_querylist(isc_mem_t *mctx, const c - ISC_LIST_APPEND(*tql, tseg, link); - - /* -- * split string at the first "%". set query segment to -+ * split string at the first "$". set query segment to - * left portion - */ - tseg->sql = isc_mem_strdup(mctx, - isc_string_separate(&right_str, -- "%")); -+ "$")); - if (tseg->sql == NULL) { - /* no memory, clean everything up. */ - result = ISC_R_NOMEMORY; diff --git a/dlz-schema.txt b/dlz-schema.txt deleted file mode 100644 index af42e76..0000000 --- a/dlz-schema.txt +++ /dev/null @@ -1,187 +0,0 @@ -# -# -# 1.3.6.1.4.1.18420.1.1.X is reserved for attribute types declared by the DLZ project. -# 1.3.6.1.4.1.18420.1.2.X is reserved for object classes declared by the DLZ project. -# 1.3.6.1.4.1.18420.1.3.X is reserved for PRIVATE extensions to the DLZ attribute -# types and object classes that may be needed by end users -# to add security, etc. Attributes and object classes using -# this OID MUST NOT be published outside of an organization -# except to offer them for consideration to become part of the -# standard attributes and object classes published by the DLZ project. - -attributetype ( 1.3.6.1.4.1.18420.1.1.10 - NAME 'dlzZoneName' - DESC 'DNS zone name - domain name not including host name' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.20 - NAME 'dlzHostName' - DESC 'Host portion of a domain name' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.30 - NAME 'dlzData' - DESC 'Data for the resource record' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.40 - NAME 'dlzType' - DESC 'DNS record type - A, SOA, NS, MX, etc...' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.50 - NAME 'dlzSerial' - DESC 'SOA record serial number' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.60 - NAME 'dlzRefresh' - DESC 'SOA record refresh time in seconds' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.70 - NAME 'dlzRetry' - DESC 'SOA retry time in seconds' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.80 - NAME 'dlzExpire' - DESC 'SOA expire time in seconds' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.90 - NAME 'dlzMinimum' - DESC 'SOA minimum time in seconds' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.100 - NAME 'dlzAdminEmail' - DESC 'E-mail address of person responsible for this zone - @ should be replaced with . (period)' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.110 - NAME 'dlzPrimaryNS' - DESC 'Primary name server for this zone - should be host name not IP address' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.120 - NAME 'dlzIPAddr' - DESC 'IP address - IPV4 should be in dot notation xxx.xxx.xxx.xxx IPV6 should be in colon notation xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{40} - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.130 - NAME 'dlzCName' - DESC 'DNS cname' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.140 - NAME 'dlzPreference' - DESC 'DNS MX record preference. Lower numbers have higher preference' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.150 - NAME 'dlzTTL' - DESC 'DNS time to live - how long this record can be cached by caching DNS servers' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.18420.1.1.160 - NAME 'dlzRecordID' - DESC 'Unique ID for each DLZ resource record' - SUP name - SINGLE-VALUE ) - -#------------------------------------------------------------------------------ -# Object class definitions -#------------------------------------------------------------------------------ - -objectclass ( 1.3.6.1.4.1.18420.1.2.10 - NAME 'dlzZone' - DESC 'Zone name portion of a domain name' - SUP top STRUCTURAL - MUST ( objectclass $ dlzZoneName ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.20 - NAME 'dlzHost' - DESC 'Host name portion of a domain name' - SUP top STRUCTURAL - MUST ( objectclass $ dlzHostName ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.30 - NAME 'dlzAbstractRecord' - DESC 'Data common to all DNS record types' - SUP top ABSTRACT - MUST ( objectclass $ dlzRecordID $ dlzHostName $ dlzType $ dlzTTL ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.40 - NAME 'dlzGenericRecord' - DESC 'Generic DNS record - useful when a specific object class has not been defined for a DNS record' - SUP dlzAbstractRecord STRUCTURAL - MUST ( dlzData ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.50 - NAME 'dlzARecord' - DESC 'DNS A record' - SUP dlzAbstractrecord STRUCTURAL - MUST ( dlzIPAddr ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.60 - NAME 'dlzNSRecord' - DESC 'DNS NS record' - SUP dlzGenericRecord STRUCTURAL ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.70 - NAME 'dlzMXRecord' - DESC 'DNS MX record' - SUP dlzGenericRecord STRUCTURAL - MUST ( dlzPreference ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.80 - NAME 'dlzSOARecord' - DESC 'DNS SOA record' - SUP dlzAbstractRecord STRUCTURAL - MUST ( dlzSerial $ dlzRefresh $ dlzRetry - $ dlzExpire $ dlzMinimum $ dlzAdminEmail $ dlzPrimaryNS ) ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.90 - NAME 'dlzTextRecord' - DESC 'Text data with spaces should be wrapped in double quotes' - SUP dlzGenericRecord STRUCTURAL ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.100 - NAME 'dlzPTRRecord' - DESC 'DNS PTR record' - SUP dlzGenericRecord STRUCTURAL ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.110 - NAME 'dlzCNameRecord' - DESC 'DNS CName record' - SUP dlzGenericRecord STRUCTURAL ) - -objectclass ( 1.3.6.1.4.1.18420.1.2.120 - NAME 'dlzXFR' - DESC 'Host allowed to perform zone transfer' - SUP top STRUCTURAL - MUST ( objectclass $ dlzRecordID $ dlzIPAddr ) )