From ab263e5d7199dd306f13560ea4dd2e6dcb618754 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Oct 28 2011 23:30:26 +0000
Subject: Bug 740959 - 389-console put CA certificates into wrong database

(cherry picked from commit 0fd93fe7cfb384144e0ce70de0cec4ad2ef0d045)
(cherry picked from commit cf4b156ef440a381b195a96c2504cc9c0a06027e)
(cherry picked from commit 474d683b6eb074455ac18ebf77f9894d42944cc2)

---

diff --git a/.gitignore b/.gitignore
index 54e4fd4..d2e60e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
 /389-admin-1.1.21.tar.bz2
 /389-admin-1.1.22.tar.bz2
 /389-admin-1.1.23.tar.bz2
+/389-admin-1.1.24.tar.bz2
+/389-admin-1.1.25.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index d5bdce8..de511dd 100755
--- a/389-admin-git-local.sh
+++ b/389-admin-git-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.23
+VERSION=1.1.25
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index 82a549a..7ec4411 100755
--- a/389-admin-git.sh
+++ b/389-admin-git.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.23
+VERSION=1.1.25
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index 49b1603..6d9e40f 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -8,7 +8,7 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.23
+Version:          1.1.25
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
@@ -217,6 +217,12 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Fri Oct 28 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.25-1
+- Bug 740959 - 389-console put CA certificates into wrong database
+
+* Wed Sep 21 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.24-1
+- Bug 695741 - Providing native systemd file
+
 * Thu Aug 11 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.23-1
 - Bug 730079 - Update SELinux policy during upgrades
 
diff --git a/sources b/sources
index 5e0e19f..b9c0091 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34d7608a1b4b7c1b56d649a3dc407682  389-admin-1.1.23.tar.bz2
+468727aa2699427814fb0ba2b0a72dad  389-admin-1.1.25.tar.bz2