From e18a3e258d673f42f065c20ed1a928af54d64761 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 31 2011 16:22:33 +0000
Subject: Bug 732153 - subtree and user account lockout policies implemented?

Bug 722292 - Entries in DS are not updated properly when using WinSync API
(cherry picked from commit 71134761203f5929067f4e87dbfda701eff29ade)
(cherry picked from commit 32a8b3e533a175808f3099f3edbc455d02d873e3)
(cherry picked from commit 2e85b430f71c1b3b8da8e3ec81707b8287cd8721)
(cherry picked from commit b9fe679ac40c0d778caeb02ba39580190b6753a6)

---

diff --git a/.gitignore b/.gitignore
index 96f4b53..934e258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /389-ds-base-1.2.9.5.tar.bz2
 /389-ds-base-1.2.9.6.tar.bz2
 /389-ds-base-1.2.9.7.tar.bz2
+/389-ds-base-1.2.9.8.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index aa9779b..c0747a5 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.7
+VERSION=1.2.9.8
 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 6d0e129..0dd80a0 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.7
+VERSION=1.2.9.8
 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 dc1f637..8f014fa 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -17,7 +17,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.9.7
+Version:          1.2.9.8
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -347,6 +347,10 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Aug 31 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.9.8-1
+- Bug 732153 - subtree and user account lockout policies implemented?
+- Bug 722292 - Entries in DS are not updated properly when using WinSync API
+
 * Wed Aug 24 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.9.7-1
 - Bug 733103 - large targetattr list with syntax errors cause server to crash or hang
 - Bug 633803 - passwordisglobalpolicy attribute brakes TLS chaining
diff --git a/sources b/sources
index ad4cc4b..11dc565 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6eae4e23eb57b78adecbe87ed474d39f  389-ds-base-1.2.9.7.tar.bz2
+c3cc79b90a3a8c5bdd6768438461dc80  389-ds-base-1.2.9.8.tar.bz2