From 783a787702971389c43c0a615ab91d8cf6730f85 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 10 2011 22:30:18 +0000
Subject: winsync, upgrade, and ruv/counter bug fixes


winsync, upgrade, and ruv/counter bug fixes
Bug 728510 - Run dirsync after sending updates to AD
Bug 729717 - Fatal error messages when syncing deletes from AD
Bug 729369 - upgrade DB to upgrade from entrydn to entryrdn format is not working.
Bug 729378 - delete user subtree container in AD + modify password in DS == DS crash
Bug 723937 - Slapi_Counter API broken on  32-bit F15
fixed again - separate tests for atomic ops and atomic bool cas

---

diff --git a/.gitignore b/.gitignore
index d50fe7c..d895463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /389-ds-base-1.2.9.3.tar.bz2
 /389-ds-base-1.2.9.4.tar.bz2
 /389-ds-base-1.2.9.5.tar.bz2
+/389-ds-base-1.2.9.6.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 61c625f..78c1e7c 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.9.5
+VERSION=1.2.9.6
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 95cb893..66a58e7 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.9.5
+VERSION=1.2.9.6
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 50de256..a687506 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -15,7 +15,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.9.5
+Version:          1.2.9.6
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -271,6 +271,14 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Aug 10 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.9.6-1
+- Bug 728510 - Run dirsync after sending updates to AD
+- Bug 729717 - Fatal error messages when syncing deletes from AD
+- Bug 729369 - upgrade DB to upgrade from entrydn to entryrdn format is not working.
+- Bug 729378 - delete user subtree container in AD + modify password in DS == DS crash
+- Bug 723937 - Slapi_Counter API broken on  32-bit F15
+-   fixed again - separate tests for atomic ops and atomic bool cas
+
 * Mon Aug  8 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.9.5-1
 - Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error
 -  Fix another coverity NULL deref in previous patch
diff --git a/sources b/sources
index 8966e23..941d967 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a72fd6f4851a40b4ad2e835c436e774  389-ds-base-1.2.9.5.tar.bz2
+fdd47b00d6f2261bb87ac1c8a60e51f1  389-ds-base-1.2.9.6.tar.bz2