diff options
| -rw-r--r-- | bind-chroot-numcpus.patch | 49 | ||||
| -rw-r--r-- | bind.spec | 28 |
2 files changed, 16 insertions, 61 deletions
diff --git a/bind-chroot-numcpus.patch b/bind-chroot-numcpus.patch deleted file mode 100644 index 97c3026..0000000 --- a/bind-chroot-numcpus.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -urN bind-9.4.1.org/bin/named/main.c bind-9.4.1/bin/named/main.c ---- bind-9.4.1.org/bin/named/main.c 2007-06-01 19:44:51.223203000 +0200 -+++ bind-9.4.1/bin/named/main.c 2007-06-01 20:08:19.703753086 +0200 -@@ -464,9 +464,7 @@ - } - } - --static isc_result_t --create_managers(void) { -- isc_result_t result; -+static void fill_ns_g_cpus() { - #ifdef ISC_PLATFORM_USETHREADS - unsigned int cpus_detected; - #endif -@@ -475,13 +473,20 @@ - cpus_detected = isc_os_ncpus(); - if (ns_g_cpus == 0) - ns_g_cpus = cpus_detected; -- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, -- ISC_LOG_INFO, "found %u CPU%s, using %u worker thread%s", -- cpus_detected, cpus_detected == 1 ? "" : "s", -- ns_g_cpus, ns_g_cpus == 1 ? "" : "s"); - #else - ns_g_cpus = 1; - #endif -+} -+ -+static isc_result_t -+create_managers(void) { -+ isc_result_t result; -+ -+#ifdef ISC_PLATFORM_USETHREADS -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, -+ ISC_LOG_INFO, "using %u worker thread%s", -+ ns_g_cpus, ns_g_cpus == 1 ? "" : "s"); -+#endif - result = isc_taskmgr_create(ns_g_mctx, ns_g_cpus, 0, &ns_g_taskmgr); - if (result != ISC_R_SUCCESS) { - UNEXPECTED_ERROR(__FILE__, __LINE__, -@@ -581,6 +586,9 @@ - isc_mem_free(ns_g_mctx, instance); - #endif /* HAVE_LIBSCF */ - -+ /* Fill in ns_g_cpus date before chroot happens */ -+ fill_ns_g_cpus(); -+ - #ifdef PATH_RANDOMDEV - /* - * Initialize system's random device as fallback entropy source @@ -20,14 +20,16 @@ Summary(ru.UTF-8): BIND - cервер системы доменных имен ( Summary(tr.UTF-8): DNS alan adı sunucusu Summary(uk.UTF-8): BIND - cервер системи доменних імен (DNS) Summary(zh_CN.UTF-8): Internet 域名服务器 +%define ver 9.4.3 +%define plevel P2 Name: bind -Version: 9.4.2 -Release: 1 +Version: %{ver}.%{plevel} +Release: 2 Epoch: 7 License: BSD-like Group: Networking/Daemons -Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 57953d7264139b9506b9d66174125179 +Source0: ftp://ftp.isc.org/isc/bind9/%{ver}-%{plevel}/%{name}-%{ver}-%{plevel}.tar.gz +# Source0-md5: 91dff2af18475e14863051c93255a59a Source1: %{name}-conf.tar.gz # Source1-md5: 14d2c6befe25e68c713a1deb552668cc Source2: named.init @@ -40,7 +42,7 @@ Source6: http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt Source7: %{name}-hip.tar.gz # Source7-md5: 62a8a67f51ff8db9fe815205416a1f62 Source8: ftp://rs.internic.net/domain/named.root -# Source8-md5: 8c212c0260d708f15f75d3adc71f0149 +# Source8-md5: 4f3ccd43094cdaa684deaf186d2c028d Patch0: %{name}-time.patch Patch1: %{name}-autoconf.patch Patch2: %{name}-includedir-libbind.patch @@ -48,8 +50,7 @@ Patch3: %{name}-link.patch Patch4: %{name}-pmake.patch Patch5: %{name}-sdb-ldap.patch Patch6: %{name}-noinet6.patch -Patch7: %{name}-chroot-numcpus.patch -URL: http://www.isc.org/products/BIND/bind9.html +URL: http://www.isc.org/sw/bind/ BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -57,7 +58,7 @@ BuildRequires: flex BuildRequires: idnkit-devel %{?with_hip:BuildRequires: libxml2-devel} BuildRequires: libtool -%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6} +%{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} %{?with_sql:BuildRequires: mysql-devel} %{?with_sql:BuildRequires: postgresql-devel} @@ -331,7 +332,7 @@ BIND schema for openldap. Schemat BIND dla openldap. %prep -%setup -q -a1 %{?with_hip:-a7} +%setup -q -a1 %{?with_hip:-a7} -n %{name}-%{ver}-%{plevel} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -339,7 +340,6 @@ Schemat BIND dla openldap. %patch4 -p1 %{?with_ldap:%patch5 -p1} %patch6 -p1 -%patch7 -p1 %{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic} install %{SOURCE8} conf-pld/root.hint @@ -367,6 +367,8 @@ cd ../.. --with-dlz-odbc=no \ --with-dlz-stub=yes \ --enable-largefile \ + --disable-epoll \ + --disable-devpoll \ %{!?with_static_libs:--enable-static=no} \ --enable-threads \ --enable-getifaddrs=glibc @@ -448,7 +450,9 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%triggerpostun -- %{name} < 6:9.4.1 +%triggerpostun -- %{name} < 7:9.4.2-2 +/sbin/chkconfig named reset +#triggerpostun -- %{name} < 6:9.4.1 sed -i -e 's#^\([ \t]*category[ \t]\+cname[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf sed -i -e 's#^\([ \t]*category[ \t]\+response-checks[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf sed -i -e 's#^\([ \t]*category[ \t]\+load[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf @@ -495,7 +499,7 @@ sed -i -e 's#^\([ \t]*category[ \t]\+load[ \t]\+.*\)$#// \1#g' /var/lib/named/et %{_mandir}/man1/dig.1* %{_mandir}/man1/host.1* %{_mandir}/man1/nslookup.1* -%{_mandir}/man8/nsupdate.8* +%{_mandir}/man1/nsupdate.1* %lang(fi) %{_mandir}/fi/man1/host.1* |