From 0ab4a92078e4d46e238ff360ee2038d34c6d7708 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Feb 23 2011 15:59:47 +0000
Subject: 389-admin-1.1.15 release - git tag 389-admin-1.1.15


- 1.1.15 release - git tag 389-admin-1.1.15
- Bug 493424 - remove unneeded modules for admin server apache config
- Bug 618897 - Wrong permissions when creating instance from Console
- Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH
- Bug 245278 - Changing to a password with a single quote does not work
- Bug 604881 - admin server log files have incorrect permissions/ownerships
- Bug 387981 - plain files can be chosen on the Restore Directory dialog
- Bug 668950 - Add posix group support to Console
- Bug 618858 - move start-ds-admin env file into main admin server config path
- Bug 616260 - libds-admin-serv linking fails due to unresolved link-time depe
ndencies
- start-ds-admin.in -- replaced "return 1" with "exit 1"
- Bug 151705 - Need to update Console Cipher Preferences with new ciphers
- Bug 470576 - Migration could do addition checks before commiting actions

---

diff --git a/.gitignore b/.gitignore
index 464bd95..a0e28d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 /389-admin-1.1.13.tar.bz2
 /389-admin-1.1.14.tar.bz2
+/389-admin-1.1.15.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 8b22299..a277276 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.14
+VERSION=1.1.15
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index 168121e..dd71536 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.14
+VERSION=1.1.15
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index 744970e..480ff0e 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -6,8 +6,8 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.14
-Release:          %{?relprefix}1%{?prerel}%{?dist}.1
+Version:          1.1.15
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -51,7 +51,6 @@ Requires(preun): /sbin/service
 Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-admin-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
-Patch1:           f11-httpd.patch
 
 %description
 389 Administration Server is an HTTP agent that provides management features
@@ -61,7 +60,6 @@ and CGI utilities used by the console.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerel}
-%patch1
 
 %build
 %configure --disable-rpath --with-selinux --with-openldap
@@ -171,6 +169,22 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Wed Feb 23 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.15-1
+- 1.1.15 release - git tag 389-admin-1.1.15
+- Bug 493424 - remove unneeded modules for admin server apache config
+- Bug 618897 - Wrong permissions when creating instance from Console
+- Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH
+- Bug 245278 - Changing to a password with a single quote does not work
+- Bug 604881 - admin server log files have incorrect permissions/ownerships
+- Bug 387981 - plain files can be chosen on the Restore Directory dialog
+- Bug 668950 - Add posix group support to Console
+- Bug 618858 - move start-ds-admin env file into main admin server config path
+- Bug 616260 - libds-admin-serv linking fails due to unresolved link-time depe
+ndencies
+- start-ds-admin.in -- replaced "return 1" with "exit 1"
+- Bug 151705 - Need to update Console Cipher Preferences with new ciphers
+- Bug 470576 - Migration could do addition checks before commiting actions
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.14-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/f11-httpd.patch b/f11-httpd.patch
deleted file mode 100644
index 630ecb8..0000000
--- a/f11-httpd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- admserv/cfgstuff/httpd-2.2.conf.in	1 Aug 2007 18:14:53 -0000	1.6
-+++ admserv/cfgstuff/httpd-2.2.conf.in	9 Apr 2009 16:07:53 -0000
-@@ -137,12 +137,10 @@
- LoadModule actions_module @moddir@/mod_actions.so
- LoadModule alias_module @moddir@/mod_alias.so
- LoadModule rewrite_module @moddir@/mod_rewrite.so
- LoadModule cache_module @moddir@/mod_cache.so
- LoadModule disk_cache_module @moddir@/mod_disk_cache.so
--LoadModule file_cache_module @moddir@/mod_file_cache.so
--LoadModule mem_cache_module @moddir@/mod_mem_cache.so
- LoadModule cgi_module @moddir@/mod_cgi.so
- LoadModule restartd_module     @admmoddir@/mod_restartd.so
- LoadModule nss_module         @nssmoddir@/libmodnss.so
- LoadModule admserv_module     @admmoddir@/mod_admserv.so
- 
diff --git a/sources b/sources
index 866d826..f5d4c96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc2633e068dfaf57ff0014f80ed1f443  389-admin-1.1.14.tar.bz2
+05514a1ee0ba8b60a328c4abed03144c  389-admin-1.1.15.tar.bz2