summaryrefslogtreecommitdiffstats
path: root/bind.spec
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2007-04-27 13:45:53 +0000
committerAdam Tkac <atkac@fedoraproject.org>2007-04-27 13:45:53 +0000
commitf3da66542da31fa3c509fd3e103eb9d9c63991b4 (patch)
tree786b35347a103aaacc758f92124befb6fd912664 /bind.spec
parent9287bb1d6ce7c3ba257b889a010baeadf9fd39d9 (diff)
- fixed race-condition in dbus code (#235809)
Diffstat (limited to 'bind.spec')
-rw-r--r--bind.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/bind.spec b/bind.spec
index 268117a..9b86bef 100644
--- a/bind.spec
+++ b/bind.spec
@@ -82,7 +82,7 @@ Patch64: bind-9.4.0-idnkit-autotools.patch
Patch65: bind-9.4.0-dig-idn.patch
%endif
Patch66: bind-9.4.0-zone-freeze.patch
-#Patch67: bind-9.4.0-dbus-race-condition.patch
+Patch67: bind-9.4.0-dbus-race-condition.patch
#
Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, mktemp
Requires(post): grep, chkconfig >= 1.3.26
@@ -288,7 +288,7 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
#
# this must follow all dbus patches:
#
-#%patch67 -p1 -b .race-condition
+%patch67 -p1 -b .race-condition
cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named
cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
%if %{SDB}
@@ -315,7 +315,7 @@ popd
%build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -O0"
%if %{IDN}
pushd contrib/idn/idnkit-1.0-src
@@ -480,7 +480,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
echo '@ in soa localhost. root 1 3H 15M 1W 1D
ns localhost.' > sample/var/named/$f;
done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.174 2007/04/24 11:12:38 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.175 2007/04/27 13:45:53 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
*\
* NOTE: you only need to create this file if it is to\
* differ from the following default contents:
@@ -808,10 +808,11 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
-* Tue Apr 24 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8.fc7
+* Fri Apr 27 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8.fc7
- improved "zone freeze patch" - if multiple zone with same name exists
no zone is freezed
- minor cleanup in caching-nameserver's config file
+- fixed race-condition in dbus code (#235809)
* Tue Apr 17 2007 Adam Tkac <atkac redhat com> 31:9.4.0-7.fc7
- removed DEBUGINFO option because with this option (default) was bind