From 9fd072ebb2ddf9cb0aa6d08ae8a711005f6e8211 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Dec 19 2011 16:22:07 +0000
Subject: fix shutdown crash - fix systemd dirsrv.target - entryusn fix - csn improvements


Bug 755725 - 389 programs linked against openldap crash during shutdown
Bug 755754 - Unable to start dirsrv service using systemd
Bug 745259 - Incorrect entryUSN index under high load in replicated environment
d439e3a use slapi_hexchar2int and slapi_str_to_u8 everywhere
5910551 csn_init_as_string should not use sscanf
b53ba00 reduce calls to csn_as_string and slapi_log_error
c897267 fix member variable name error in slapi_uniqueIDFormat
66808e5 uniqueid formatting - use slapi_u8_to_hex instead of sprintf
580a875 csn_as_string - use slapi_uN_to_hex instead of sprintf
Bug 751645 - crash when simple paged fails to send entry to client
Bug 752155 - Use restorecon after creating init script lock file

---

diff --git a/.gitignore b/.gitignore
index 3107e7d..6f85d19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /389-ds-base-1.2.10.a3.tar.bz2
 /389-ds-base-1.2.10.a4.tar.bz2
 /389-ds-base-1.2.10.a5.tar.bz2
+/389-ds-base-1.2.10.a6.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index d1d0f8d..005fe27 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.10.a5
+VERSION=1.2.10.a6
 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 5478419..d8542f0 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.10.a5
+VERSION=1.2.10.a6
 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 b7211eb..e019fec 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,7 +3,7 @@
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
 # also remove the space between % and global - this space is needed because
 # fedpkg verrel stupidly ignores comment lines
-%global prerel .a5
+%global prerel .a6
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
@@ -19,7 +19,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.10
-Release:          %{?relprefix}5%{?prerel}%{?dist}
+Release:          %{?relprefix}6%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -281,6 +281,19 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Thu Dec 15 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.6.a6
+- Bug 755725 - 389 programs linked against openldap crash during shutdown
+- Bug 755754 - Unable to start dirsrv service using systemd
+- Bug 745259 - Incorrect entryUSN index under high load in replicated environment
+- d439e3a use slapi_hexchar2int and slapi_str_to_u8 everywhere
+- 5910551 csn_init_as_string should not use sscanf
+- b53ba00 reduce calls to csn_as_string and slapi_log_error
+- c897267 fix member variable name error in slapi_uniqueIDFormat
+- 66808e5 uniqueid formatting - use slapi_u8_to_hex instead of sprintf
+- 580a875 csn_as_string - use slapi_uN_to_hex instead of sprintf
+- Bug 751645 - crash when simple paged fails to send entry to client
+- Bug 752155 - Use restorecon after creating init script lock file
+
 * Fri Nov  4 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.5.a5
 - Bug 751495 - 'setup-ds.pl -u' fails with undefined routine 'updateSystemD'
 - Bug 750625 750624 750622 744946 Coverity issues
diff --git a/sources b/sources
index 654cbe3..845a6b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfad5b18d963fd484efbb8e5595610e4  389-ds-base-1.2.10.a5.tar.bz2
+71be00a2efd98d4fd138de0a128e9ed4  389-ds-base-1.2.10.a6.tar.bz2