From f3dbe17140392f3dc0e902dbeca960e70986e114 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Wed, 25 Jan 2012 08:40:41 -0700
Subject: [PATCH 1/4] Bug 767823 - selinux: need to allow admin server to
 connect to ldap port

---
 .gitignore             | 1 +
 389-admin-git-local.sh | 2 +-
 389-admin-git.sh       | 2 +-
 389-admin.spec         | 5 ++++-
 sources                | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00c3ea5..f7caa53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /389-admin-1.1.23.tar.bz2
 /389-admin-1.1.24.tar.bz2
 /389-admin-1.1.25.tar.bz2
+/389-admin-1.1.26.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index de511dd..5079b6a 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.25
+VERSION=1.1.26
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index 7ec4411..b8cbbab 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.25
+VERSION=1.1.26
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index fb88d29..eea82ae 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -9,7 +9,7 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.25
+Version:          1.1.26
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
@@ -133,6 +133,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jan 25 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.26-1
+- Bug 767823 - selinux: need to allow admin server to connect to ldap port
+
 * Fri Oct 28 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.25-1
 - Bug 740959 - 389-console put CA certificates into wrong database
 
diff --git a/sources b/sources
index b9c0091..de43c87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-468727aa2699427814fb0ba2b0a72dad  389-admin-1.1.25.tar.bz2
+913a4b58a204e5db0cbd2b41ca1fe0f4  389-admin-1.1.26.tar.bz2

From cedd5bf3d6f2058af6550e70cae1594bc17555a2 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Fri, 3 Feb 2012 19:38:20 -0700
Subject: [PATCH 2/4] TLS not working with latest openldap - Review and address
 latest Coverity issues

Ticket #281 - TLS not working with latest openldap
Ticket #161 - Review and address latest Coverity issues
(cherry picked from commit 28a0c1c5a7d00690e744f1a682a6792f2bab76bd)
---
 .gitignore             | 1 +
 389-admin-git-local.sh | 2 +-
 389-admin-git.sh       | 2 +-
 389-admin.spec         | 6 +++++-
 sources                | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7caa53..24c1444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /389-admin-1.1.24.tar.bz2
 /389-admin-1.1.25.tar.bz2
 /389-admin-1.1.26.tar.bz2
+/389-admin-1.1.27.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 5079b6a..1254a5c 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.26
+VERSION=1.1.27
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index b8cbbab..77dacd0 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.26
+VERSION=1.1.27
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index eea82ae..a5e38b6 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -9,7 +9,7 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.26
+Version:          1.1.27
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
@@ -133,6 +133,10 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb  3 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.27-1
+- Ticket #281 - TLS not working with latest openldap
+- Ticket #161 - Review and address latest Coverity issues
+
 * Wed Jan 25 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.26-1
 - Bug 767823 - selinux: need to allow admin server to connect to ldap port
 
diff --git a/sources b/sources
index de43c87..91f8a47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-913a4b58a204e5db0cbd2b41ca1fe0f4  389-admin-1.1.26.tar.bz2
+3891cdd71e00b5040a8e84c66b490fc1  389-admin-1.1.27.tar.bz2

From 6fd92cec47d33157a2e3eeccd9d36e7e7fea15ff Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Thu, 22 Mar 2012 09:51:22 -0600
Subject: [PATCH 3/4] htmladmin segfault - compilation warnings

Ticket #307 - htmladmin keeps segfaulting
Ticket #286 - compilation fixes for 'format-security'
(cherry picked from commit 7f4aa58fb93864df008160d99464c1e7277983b1)
---
 .gitignore             | 1 +
 389-admin-git-local.sh | 2 +-
 389-admin-git.sh       | 2 +-
 389-admin.spec         | 6 +++++-
 sources                | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 24c1444..05ad112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /389-admin-1.1.25.tar.bz2
 /389-admin-1.1.26.tar.bz2
 /389-admin-1.1.27.tar.bz2
+/389-admin-1.1.28.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 1254a5c..b7a8500 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.27
+VERSION=1.1.28
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index 77dacd0..2c4c86a 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.27
+VERSION=1.1.28
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index a5e38b6..f1ac337 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -9,7 +9,7 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.27
+Version:          1.1.28
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
@@ -133,6 +133,10 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Thu Mar 22 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.28-1
+- Ticket #307 - htmladmin keeps segfaulting
+- Ticket #286 - compilation fixes for 'format-security'
+
 * Fri Feb  3 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.27-1
 - Ticket #281 - TLS not working with latest openldap
 - Ticket #161 - Review and address latest Coverity issues
diff --git a/sources b/sources
index 91f8a47..f617880 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3891cdd71e00b5040a8e84c66b490fc1  389-admin-1.1.27.tar.bz2
+d6904cd02b9c5e6729d6fc2af6bdd16e  389-admin-1.1.28.tar.bz2

From 5d453d2dae36c2929be0d94c6d72e8ec1f0598aa Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 27 Mar 2012 08:22:59 -0600
Subject: [PATCH 4/4] If htmladmin fails to connect to the server, the cgi
 could crash. (cherry picked from commit
 2076085457e0487f115fdbc2a2c7f100b5bab1af)

---
 .gitignore             | 1 +
 389-admin-git-local.sh | 2 +-
 389-admin-git.sh       | 2 +-
 389-admin.spec         | 5 ++++-
 sources                | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05ad112..0304d3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /389-admin-1.1.26.tar.bz2
 /389-admin-1.1.27.tar.bz2
 /389-admin-1.1.28.tar.bz2
+/389-admin-1.1.29.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index b7a8500..b474d73 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.28
+VERSION=1.1.29
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index 2c4c86a..4b53603 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.28
+VERSION=1.1.29
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index f1ac337..c140d40 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -9,7 +9,7 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.28
+Version:          1.1.29
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
@@ -133,6 +133,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Tue Mar 27 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.29-1
+- 4ec23c0 If htmladmin fails to connect to the server, the cgi could crash.
+
 * Thu Mar 22 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.28-1
 - Ticket #307 - htmladmin keeps segfaulting
 - Ticket #286 - compilation fixes for 'format-security'
diff --git a/sources b/sources
index f617880..f2ab5b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6904cd02b9c5e6729d6fc2af6bdd16e  389-admin-1.1.28.tar.bz2
+4bda83e9f5644e0bd25fdf7b6ce9e5ee  389-admin-1.1.29.tar.bz2