From 6243d8c40a330208e3aa2beab08d6b122740975b Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Apr 30 2012 19:06:38 +0000
Subject: two crash fixes


Ticket #348 - crash in ldap_initialize with multiple threads
Ticket #347 - IPA dirsvr seg-fault during system longevity test
(cherry picked from commit c24eb783169ca2298d94979e12c0acc74f3a3a24)

---

diff --git a/.gitignore b/.gitignore
index 33cdfbc..f94b6e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
 /389-ds-base-1.2.10.4.tar.bz2
 /389-ds-base-1.2.10.5.tar.bz2
 /389-ds-base-1.2.10.6.tar.bz2
+/389-ds-base-1.2.10.7.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index a755bfb..3de0c3d 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.6
+VERSION=1.2.10.7
 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 bd3416e..9f5db94 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.6
+VERSION=1.2.10.7
 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 b9b5ba1..16f5a5a 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.10.6
+Version:          1.2.10.7
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -275,6 +275,10 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Mon Apr 30 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10.7-1
+- Ticket #348 - crash in ldap_initialize with multiple threads
+- Ticket #347 - IPA dirsvr seg-fault during system longevity test
+
 * Tue Apr 10 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10.6-1
 - Bug 808770 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV)
 - typo in previous patch
diff --git a/sources b/sources
index fcd2acd..6bdafe3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4efe9aa9a32a16ff465b833c4517c0f  389-ds-base-1.2.10.6.tar.bz2
+7971e67278785a824cfb41f95a0dbab5  389-ds-base-1.2.10.7.tar.bz2