diff --git a/bind-sdb-ldap.patch b/bind-sdb-ldap.patch new file mode 100644 index 0000000..82adb28 --- /dev/null +++ b/bind-sdb-ldap.patch @@ -0,0 +1,45 @@ +Index: bin/named/Makefile.in +=================================================================== +--- bin/named/Makefile.in.orig 2014-01-23 18:42:24.479609343 +0100 ++++ bin/named/Makefile.in 2014-01-24 10:11:54.234471728 +0100 +@@ -34,9 +34,9 @@ + # + # Add database drivers here. + # +-DBDRIVER_OBJS = +-DBDRIVER_SRCS = +-DBDRIVER_INCLUDES = ++DBDRIVER_OBJS = ldapdb.@O@ ++DBDRIVER_SRCS = ldapdb.c ++DBDRIVER_INCLUDES = -DLDAP_DEPRECATED + DBDRIVER_LIBS = + + DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers +Index: bin/named/main.c +=================================================================== +--- bin/named/main.c.orig 2013-12-20 01:28:28.000000000 +0100 ++++ bin/named/main.c 2014-01-23 18:45:19.059680008 +0100 +@@ -82,6 +82,7 @@ + * Include header files for database drivers here. + */ + /* #include "xxdb.h" */ ++#include + + #ifdef CONTRIB_DLZ + /* +@@ -904,6 +905,7 @@ + * Add calls to register sdb drivers here. + */ + /* xxdb_init(); */ ++ ldapdb_init(); + + #ifdef ISC_DLZ_DLOPEN + /* +@@ -940,6 +942,7 @@ + * Add calls to unregister sdb drivers here. + */ + /* xxdb_clear(); */ ++ ldapdb_clear(); + + #ifdef CONTRIB_DLZ + /* diff --git a/bind.changes b/bind.changes index 80acb49..8e9bdba 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 24 10:12:56 UTC 2014 - max@suse.com + +- Add the sdb-ldap backend module (fate#313216). +- Details can be found here: + * http://bind9-ldap.bayour.com/ + * http://bind9-ldap.bayour.com/dnszonehowto.html + ------------------------------------------------------------------- Tue Jan 21 17:02:30 UTC 2014 - max@suse.com diff --git a/bind.spec b/bind.spec index df286a3..46cca22 100644 --- a/bind.spec +++ b/bind.spec @@ -58,6 +58,7 @@ Patch2: pid-path.diff Patch4: perl-path.diff Patch51: pie_compile.diff Patch52: named-bootconf.diff +Patch53: bind-sdb-ldap.patch Patch100: configure.in.diff2 %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -206,6 +207,7 @@ Name Domain (BIND) DNS server is found in the package named bind. %patch51 %endif %patch52 +%patch53 %if 0%{?suse_version} <= 1010 %patch100 -p1 %endif @@ -225,8 +227,8 @@ for file in docu/README tools/createNamedConfInclude config/{README,named.conf} replaceStrings ${file} done popd -#cp bind-sdb-ldap-%{SDB_LDAP_VERSION}/ldapdb.c bin/named/ -#cp bind-sdb-ldap-%{SDB_LDAP_VERSION}/ldapdb.h bin/named/include/ +cp contrib/sdb/ldap/ldapdb.c bin/named/ +cp contrib/sdb/ldap/ldapdb.h bin/named/include/ # --------------------------------------------------------------------------- %build @@ -268,7 +270,8 @@ CONFIGURE_OPTIONS="\ --with-libtool \ --enable-runidn \ --with-libxml2 \ - --with-dlz-mysql --with-dlz-ldap \ + --with-dlz-mysql \ + --with-dlz-ldap \ --enable-rrl " cp -f -p config.guess config.sub contrib/idn/idnkit-1.0-src/ @@ -363,7 +366,7 @@ cp -a vendor-files/docu/README ${RPM_BUILD_ROOT}/%{_defaultdocdir}/bind/README.% cp -a vendor-files/docu/dnszonehowto.html contrib/sdb/ldap/ mkdir -p vendor-files/config/ISC-examples cp -a bin/tests/*.conf* vendor-files/config/ISC-examples -for file in CHANGES COPYRIGHT README FAQ version contrib doc/{arm,misc} vendor-files/config; do +for file in CHANGES COPYRIGHT README FAQ version contrib doc/{arm,misc} vendor-files/config contrib/sdb/ldap/INSTALL.ldap; do basename=$( basename ${file}) cp -a ${file} ${RPM_BUILD_ROOT}/%{_defaultdocdir}/bind/${basename} echo "%doc %{_defaultdocdir}/bind/${basename}" >>filelist-bind-doc