From 3390e66684ba4e75a4dc29d8348c23500e8727ae Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:45:25 +0000 Subject: [PATCH 01/19] Initialize branch F-13 for 389-admin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From e7c15754efc9d7e7d67462e5ada32760d7c6cddf Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Sat, 27 Feb 2010 02:08:56 +0000 Subject: [PATCH 02/19] the 1.1.11.a2 release Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location Bug 460209 - Correct configure help message Bug 560827 - Admin Server: DistinguishName validation fails Make check for threaded httpd work with Apache 2.0 --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 11 +++++++++-- sources | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index bf52f93..23e0e29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a1.tar.bz2 +389-admin-1.1.11.a2.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index a96a3e6..92663c5 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.11.a1 +VERSION=1.1.11.a2 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index cd4c85f..d247d5f 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.11.a1 +VERSION=1.1.11.a2 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 6be5317..ff6c03f 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a1 +%global prerel .a2 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -229,6 +229,13 @@ fi %{_datadir}/selinux/*/%{pkgname}-admin.pp %changelog +* Fri Feb 26 2010 Rich Megginson - 1.1.11.a2-0.2 +- the 1.1.11.a2 release +- Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location +- Bug 460209 - Correct configure help message +- Bug 560827 - Admin Server: DistinguishName validation fails +- Make check for threaded httpd work with Apache 2.0 + * Thu Jan 21 2010 Nathan Kinder - 1.1.11.a1-0.1 - the 1.1.11.a1 release - added SELinux subpackage diff --git a/sources b/sources index 7dfa470..ad5c992 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d5c5e2058429086bbced744590aba7f 389-admin-1.1.11.a1.tar.bz2 +0148b864e82a79d4cc9e5340befce8b9 389-admin-1.1.11.a2.tar.bz2 From 7d4a4686d25326de3b894da665d1422bc3951351 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 6 Apr 2010 19:12:46 +0000 Subject: [PATCH 03/19] Updated spec files for 1.1.11.a3 release. --- 389-admin.spec | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index ff6c03f..954c1e1 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a2 +%global prerel .a3 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -37,6 +37,13 @@ BuildRequires: 389-ds-base-selinux-devel Requires: 389-ds-base Requires: mod_nss + +# require our selinux subpackage +Requires: %{name}-selinux = %{version}-%{release} + +# this is needed for using semanage from our setup scripts +Requires: policycoreutils-python + # the following are needed for some of our scripts Requires: perl-Mozilla-LDAP Requires: nss-tools @@ -61,9 +68,15 @@ and CGI utilities used by the console. Summary: SELinux policy for 389 Administration Server Group: System Environment/Daemons Requires: selinux-policy -Requires: %{name} = %{version}-%{release} Requires: 389-ds-base-selinux +# this is needed to load and unload the policy module +Requires(post): policycoreutils +Requires(post): /sbin/service +Requires(preun): policycoreutils +Requires(preun): /sbin/service +Requires(postun): policycoreutils + %description selinux SELinux policy for the 389 Adminstration Server package. @@ -229,6 +242,12 @@ fi %{_datadir}/selinux/*/%{pkgname}-admin.pp %changelog +* Tue Apr 6 2010 Nathan Kinder - 1.1.11-0.3.a3 +- 1.1.11.a3 release +- Bug 570912 - dirsrv-admin SELinux module fails to install +- Change parsing of start-slapd for instance name +- Bug 574233 - Updated requirements for selinux subpackage + * Fri Feb 26 2010 Rich Megginson - 1.1.11.a2-0.2 - the 1.1.11.a2 release - Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location From 353946930affce2ac833fbf8ef2e87f42c7ddf3c Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 7 Apr 2010 22:44:40 +0000 Subject: [PATCH 04/19] Moved selinux subpackage into base package. --- 389-admin.spec | 82 ++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 53 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 954c1e1..2126ee8 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -16,6 +16,7 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: fedora-ds-admin = %{version}-%{release} Obsoletes: fedora-ds-admin < 1.1.8-1 +Obsoletes: %{name}-selinux BuildRequires: nspr-devel BuildRequires: nss-devel @@ -38,12 +39,14 @@ BuildRequires: 389-ds-base-selinux-devel Requires: 389-ds-base Requires: mod_nss -# require our selinux subpackage -Requires: %{name}-selinux = %{version}-%{release} - # this is needed for using semanage from our setup scripts Requires: policycoreutils-python +# this is needed to load and unload the policy module +Requires(post): policycoreutils +Requires(preun): policycoreutils +Requires(postun): policycoreutils + # the following are needed for some of our scripts Requires: perl-Mozilla-LDAP Requires: nss-tools @@ -64,22 +67,6 @@ for 389 Directory Server. It provides some management web apps that can be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. -%package selinux -Summary: SELinux policy for 389 Administration Server -Group: System Environment/Daemons -Requires: selinux-policy -Requires: 389-ds-base-selinux - -# this is needed to load and unload the policy module -Requires(post): policycoreutils -Requires(post): /sbin/service -Requires(preun): policycoreutils -Requires(preun): /sbin/service -Requires(postun): policycoreutils - -%description selinux -SELinux policy for the 389 Adminstration Server package. - %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 @@ -174,14 +161,32 @@ if %{pkgname}admin_consoleconf then posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode) posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid) end +-- load the selinux policy module +variants = "%{selinux_variants}" +for selinuxvariant in string.gfind(variants, "%a+") do + os.execute('semodule -s '..selinuxvariant..' -i %{_datadir}/selinux/'..selinuxvariant..'/%{pkgname}-admin.pp > /dev/null 2>&1') +end +-- label the files installed by this package +os.execute('fixfiles -R %{name} restore > /dev/null 2>&1') %preun if [ $1 = 0 ]; then /sbin/service %{pkgname}-admin stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{pkgname}-admin + for selinuxvariant in %{selinux_variants} + do + semodule -s ${selinuxvariant} -r %{pkgname}-admin 2>/dev/null || : + done fi -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +if [ "$1" -ge "1" ]; then # Upgrade +for selinuxvariant in %{selinux_variants} +do + semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp 2>/dev/null || : +done +fi %posttrans -p -- if we saved the run level configuration in %pre, restore it now @@ -196,33 +201,6 @@ if %{pkgname}admin_exists then os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1') end -%post selinux -if [ "$1" -le "1" ] ; then # First install -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname}-admin condrestart > /dev/null 2>&1 || : -fi - -%preun selinux -if [ "$1" -lt "1" ]; then # Final removal -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -r %{pkgname}-admin 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname}-admin condrestart > /dev/null 2>&1 || : -fi - -%postun selinux -if [ "$1" -ge "1" ]; then # Upgrade -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp 2>/dev/null || : -done -fi %files %defattr(-,root,root,-) @@ -230,6 +208,7 @@ fi %dir %{_sysconfdir}/%{pkgname}/admin-serv %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf %{_datadir}/%{pkgname} +%{_datadir}/selinux/*/%{pkgname}-admin.pp %{_sysconfdir}/rc.d/init.d/%{pkgname}-admin %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin %{_sbindir}/* @@ -237,16 +216,13 @@ fi %{_libdir}/%{pkgname} %{_mandir}/man8/* -%files selinux -%defattr(-,root,root,-) -%{_datadir}/selinux/*/%{pkgname}-admin.pp - %changelog -* Tue Apr 6 2010 Nathan Kinder - 1.1.11-0.3.a3 +* Tue Apr 7 2010 Nathan Kinder - 1.1.11-0.3.a3 - 1.1.11.a3 release - Bug 570912 - dirsrv-admin SELinux module fails to install - Change parsing of start-slapd for instance name -- Bug 574233 - Updated requirements for selinux subpackage +- Bug 574233 - Updated requirements for selinux policy +- Moved selinux subpackage into base package * Fri Feb 26 2010 Rich Megginson - 1.1.11.a2-0.2 - the 1.1.11.a2 release From fab8eb9d1c243db543576c80f35c49f3f30a94af Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 18:15:18 +0000 Subject: [PATCH 05/19] sources for the 1.1.11.a3 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 23e0e29..4d9fb8f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a2.tar.bz2 +389-admin-1.1.11.a3.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 92663c5..4e29007 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.11.a2 +VERSION=1.1.11.a3 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index d247d5f..c2e7c20 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.11.a2 +VERSION=1.1.11.a3 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/sources b/sources index ad5c992..06f3f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0148b864e82a79d4cc9e5340befce8b9 389-admin-1.1.11.a2.tar.bz2 +24ccd2beb11d7e120b24af38149e4b70 389-admin-1.1.11.a3.tar.bz2 From 257b40a5bdb8af8b2f04016c9f095794d8046e2c Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 26 May 2010 21:48:15 +0000 Subject: [PATCH 06/19] this is the 1.1.11.a4 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4d9fb8f..f68ed43 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a3.tar.bz2 +389-admin-1.1.11.a4.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 4e29007..e39a982 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.11.a3 +VERSION=1.1.11.a4 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index c2e7c20..005adc3 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.11.a3 +VERSION=1.1.11.a4 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 2126ee8..4b3aec1 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a3 +%global prerel .a4 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}3%{?prerel}%{?dist} +Release: %{?relprefix}4%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Wed May 26 2010 Rich Megginson - 1.1.11-0.4.a4 +- 1.1.11.a4 release + * Tue Apr 7 2010 Nathan Kinder - 1.1.11-0.3.a3 - 1.1.11.a3 release - Bug 570912 - dirsrv-admin SELinux module fails to install diff --git a/sources b/sources index 06f3f2c..4f3877c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24ccd2beb11d7e120b24af38149e4b70 389-admin-1.1.11.a3.tar.bz2 +e7404ffd7245d7a88e09ca5f627ec339 389-admin-1.1.11.a4.tar.bz2 From f1fc4bd4720b5f13f39f550afc815d580ebdc38f Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 9 Jun 2010 15:03:25 +0000 Subject: [PATCH 07/19] this is the 1.1.11.rc1 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f68ed43..bc5278c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a4.tar.bz2 +389-admin-1.1.11.rc1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index e39a982..0e3bcb5 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.11.a4 +VERSION=1.1.11.rc1 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 005adc3..e06144b 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.11.a4 +VERSION=1.1.11.rc1 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 4b3aec1..d02813e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a4 +%global prerel .rc1 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}5%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Wed Jun 9 2010 Rich Megginson - 1.1.11-0.5.rc1 +- 1.1.11.rc1 release + * Wed May 26 2010 Rich Megginson - 1.1.11-0.4.a4 - 1.1.11.a4 release diff --git a/sources b/sources index 4f3877c..dbbfb93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7404ffd7245d7a88e09ca5f627ec339 389-admin-1.1.11.a4.tar.bz2 +fc80b47ce1e5bd39d8e5632dd359d1df 389-admin-1.1.11.rc1.tar.bz2 From 7b3679c797a404478dedcf87bde63be083f2aa39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:30 +0000 Subject: [PATCH 08/19] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b2e6eea..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-admin -# $Id: Makefile,v 1.1 2009/06/23 02:28:49 kevin Exp $ -NAME := 389-admin -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index fb8878b..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -89-admin-1_1_8-1:HEAD:389-admin-1.1.8-1.src.rpm:1245724533 From 78005abd06ce43bbec9d9c8d4e42dde8746a5c1c Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 26 Oct 2010 09:16:22 -0600 Subject: [PATCH 09/19] version 1.1.12.a1 - openldap support version 1.1.12.a1 - uses openldap instead of mozldap on those platforms that use moznss for openldap crypto (F-14 and later) --- .gitignore | 2 +- 389-admin-git-local.sh | 6 ++++-- 389-admin-git.sh | 2 +- 389-admin.spec | 9 ++++++--- sources | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7da61c2..09550b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *~ -/389-admin-1.1.11.tar.bz2 +389-admin-1.1.12.a1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 96fd6f6..2a6f449 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,12 +1,14 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11 +VERSION=1.1.12.a1 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} echo you must be in the admin server git repo to use this -test -d .git || {echo bye ; exit 1 } +test -d .git || { +echo bye ; exit 1 +} if [ -z "$1" ] ; then dir=. else diff --git a/389-admin-git.sh b/389-admin-git.sh index a0337b9..7eafcd7 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.11 +VERSION=1.1.12.a1 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 7bc46c1..c7d3eba 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,14 +1,14 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -# % global prerel .rc2 +%global prerel .a1 # also need the relprefix 0. field for a pre-release - also comment out for official release -# % global relprefix 0. +%global relprefix 0. %global selinux_variants mls targeted Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.11 +Version: 1.1.12 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Tue Sep 28 2010 Rich Megginson - 1.1.12-0.1.a1 +- This is the 1.1.12 alpha 1 release - with openldap support + * Thu Aug 26 2010 Rich Megginson - 1.1.11-1 - This is the final 1.1.11 release diff --git a/sources b/sources index fdd0757..8d3bc36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3301554c3cd9cb26216a43c037695559 389-admin-1.1.11.tar.bz2 +63b67d24c236994e90777a90599ddb67 389-admin-1.1.12.a1.tar.bz2 From 9a50eb29de9eb680305d30dc501add3224696f40 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 26 Oct 2010 11:56:42 -0600 Subject: [PATCH 10/19] version 1.1.12.a2 to fix mozldap build breakage --- .gitignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 09550b3..70e26a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *~ -389-admin-1.1.12.a1.tar.bz2 +389-admin-1.1.12.a2.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 2a6f449..0d8a4cb 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.12.a1 +VERSION=1.1.12.a2 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 7eafcd7..91fbfe5 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.12.a1 +VERSION=1.1.12.a2 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index c7d3eba..0d8197a 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a1 +%global prerel .a2 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.12 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Tue Oct 26 2010 Rich Megginson - 1.1.12-0.2.a2 +- fix mozldap build breakage + * Tue Sep 28 2010 Rich Megginson - 1.1.12-0.1.a1 - This is the 1.1.12 alpha 1 release - with openldap support diff --git a/sources b/sources index 8d3bc36..f2480dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63b67d24c236994e90777a90599ddb67 389-admin-1.1.12.a1.tar.bz2 +a471527e3b6920e9eb42f8b445c4c235 389-admin-1.1.12.a2.tar.bz2 From 221bfa9e3d85fdcb83d56429f8697c4e3952972f Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Mon, 15 Nov 2010 10:46:21 -0800 Subject: [PATCH 11/19] Remove selinux policy This removes the dirsrv selinux policy from 389-admin. The same policy is being implemented in the selinux-policy-base package now, so we no longer need to build and carry it here. --- 389-admin.spec | 58 ++++++++------------------------------------------ 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 0d8197a..a11b38f 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,15 +1,13 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a2 +# % global prerel .a2 # also need the relprefix 0. field for a pre-release - also comment out for official release -%global relprefix 0. - -%global selinux_variants mls targeted +# % global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.12 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -17,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: fedora-ds-admin = %{version}-%{release} Obsoletes: fedora-ds-admin < 1.1.8-1 Obsoletes: %{name}-selinux +Conflicts: selinux-policy-base < 3.7.19-72 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -30,12 +29,6 @@ BuildRequires: apr-devel BuildRequires: mod_nss BuildRequires: 389-adminutil-devel -# The following are needed to build the SELinux policy -BuildRequires: checkpolicy -BuildRequires: selinux-policy-devel -BuildRequires: /usr/share/selinux/devel/Makefile -BuildRequires: 389-ds-base-selinux-devel - Requires: 389-ds-base Requires: mod_nss @@ -83,17 +76,6 @@ export USE_64=1 make %{?_smp_mflags} -# Build the SELinux policy module for each variant -cd selinux-built -cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.if . -cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.te . -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - mv %{pkgname}-admin.pp %{pkgname}-admin.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean -done -cd - %install rm -rf $RPM_BUILD_ROOT @@ -110,15 +92,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la -# Install the SELinux policy -cd selinux-built -for selinuxvariant in %{selinux_variants} -do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{pkgname}-admin.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp -done -cd - %clean rm -rf $RPM_BUILD_ROOT @@ -161,32 +134,15 @@ if %{pkgname}admin_consoleconf then posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode) posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid) end --- load the selinux policy module -variants = "%{selinux_variants}" -for selinuxvariant in string.gfind(variants, "%a+") do - os.execute('semodule -s '..selinuxvariant..' -i %{_datadir}/selinux/'..selinuxvariant..'/%{pkgname}-admin.pp > /dev/null 2>&1') -end --- label the files installed by this package -os.execute('fixfiles -R %{name} restore > /dev/null 2>&1') %preun if [ $1 = 0 ]; then /sbin/service %{pkgname}-admin stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{pkgname}-admin - for selinuxvariant in %{selinux_variants} - do - semodule -s ${selinuxvariant} -r %{pkgname}-admin 2>/dev/null || : - done fi %postun /sbin/ldconfig -if [ "$1" -ge "1" ]; then # Upgrade -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp 2>/dev/null || : -done -fi %posttrans -p -- if we saved the run level configuration in %pre, restore it now @@ -208,7 +164,6 @@ end %dir %{_sysconfdir}/%{pkgname}/admin-serv %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf %{_datadir}/%{pkgname} -%{_datadir}/selinux/*/%{pkgname}-admin.pp %{_sysconfdir}/rc.d/init.d/%{pkgname}-admin %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin %{_sbindir}/* @@ -217,6 +172,11 @@ end %{_mandir}/man8/* %changelog +* Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 +- This is the final 1.1.12 release +- git tag 389-admin-1.1.12 +- Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy + * Tue Oct 26 2010 Rich Megginson - 1.1.12-0.2.a2 - fix mozldap build breakage From 17bd2e0b3bc10a30eecf188d0d490875f730442d Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 17 Nov 2010 08:31:49 -0800 Subject: [PATCH 12/19] Updated sources for 1.1.12 final build --- .gitignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 70e26a2..6a573b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *~ -389-admin-1.1.12.a2.tar.bz2 +389-admin-1.1.12.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 0d8a4cb..5da84b0 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.12.a2 +VERSION=1.1.12 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 91fbfe5..5ef7f30 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.12.a2 +VERSION=1.1.12 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/sources b/sources index f2480dd..427015b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a471527e3b6920e9eb42f8b445c4c235 389-admin-1.1.12.a2.tar.bz2 +cc14c629bfd66d6a35862fcc1ad9973a 389-admin-1.1.12.tar.bz2 From 11e3805d9cd64e9063c5f55cc1955f169d3d02e6 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 23 Nov 2010 16:08:38 -0700 Subject: [PATCH 13/19] This is the final 1.1.13 release - This is the final 1.1.13 release - git tag 389-admin-1.1.13 - Bug 656441 - Missing library path entry causes LD_PRELOAD error - setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 8 +++++++- sources | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6a573b9..311e3bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ 389-admin-1.1.12.tar.bz2 +/389-admin-1.1.13.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 5da84b0..f6f6b45 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.12 +VERSION=1.1.13 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 5ef7f30..f6866f5 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.12 +VERSION=1.1.13 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index a11b38f..834656f 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.12 +Version: 1.1.13 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -172,6 +172,12 @@ end %{_mandir}/man8/* %changelog +* Tue Nov 23 2010 Rich Megginson - 1.1.13-1 +- This is the final 1.1.13 release +- git tag 389-admin-1.1.13 +- Bug 656441 - Missing library path entry causes LD_PRELOAD error +- setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error + * Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 - This is the final 1.1.12 release - git tag 389-admin-1.1.12 diff --git a/sources b/sources index 427015b..6f775fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc14c629bfd66d6a35862fcc1ad9973a 389-admin-1.1.12.tar.bz2 +0dd329ee4a20a86425e14e3f894e46ae 389-admin-1.1.13.tar.bz2 From b60adcb636f00b94ef7bdd15972264e7a9d03955 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 5 Jan 2011 15:52:38 -0700 Subject: [PATCH 14/19] 1.1.14 release 1.1.14 release - Bug 664671 - Admin server segfault when full SSL access (http+ldap+console) required - Bug 638511 - dirsrv-admin crashes at startup with SELinux enabled (cherry picked from commit 4dd0d94d70897a48ad79e75f031b0e2ceb91403e) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 10 ++++++++-- sources | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 311e3bd..04942ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *~ 389-admin-1.1.12.tar.bz2 /389-admin-1.1.13.tar.bz2 +/389-admin-1.1.14.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index f6f6b45..8b22299 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.13 +VERSION=1.1.14 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index f6866f5..168121e 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.13 +VERSION=1.1.14 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 834656f..a9a5c8c 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,12 +1,12 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -# % global prerel .a2 +# % global prerel .a1 # also need the relprefix 0. field for a pre-release - also comment out for official release # % global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.13 +Version: 1.1.14 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -172,6 +172,12 @@ end %{_mandir}/man8/* %changelog +* Wed Jan 5 2011 Rich Megginson - 1.1.14-1 +- 1.1.14 release +- Bug 664671 - Admin server segfault when full SSL access (http+ldap+console) +required +- Bug 638511 - dirsrv-admin crashes at startup with SELinux enabled + * Tue Nov 23 2010 Rich Megginson - 1.1.13-1 - This is the final 1.1.13 release - git tag 389-admin-1.1.13 diff --git a/sources b/sources index 6f775fd..866d826 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0dd329ee4a20a86425e14e3f894e46ae 389-admin-1.1.13.tar.bz2 +cc2633e068dfaf57ff0014f80ed1f443 389-admin-1.1.14.tar.bz2 From b208e848ff59f74c117025a5a0a7fd889dc683bf Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 23 Feb 2011 08:59:47 -0700 Subject: [PATCH 15/19] 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 (cherry picked from commit e520d3565af098e303d69b9c3eec8ce04416ba3e) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 20 +++++++++++++++++--- f11-httpd.patch | 15 --------------- sources | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 f11-httpd.patch diff --git a/.gitignore b/.gitignore index 04942ec..c8bfcd5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 389-admin-1.1.12.tar.bz2 /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 a9a5c8c..c0a335b 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.14 +Version: 1.1.15 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -52,7 +52,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 @@ -62,7 +61,6 @@ and CGI utilities used by the console. %prep %setup -q -n %{name}-%{version}%{?prerel} -%patch1 %build %configure --disable-rpath --with-selinux @@ -172,6 +170,22 @@ end %{_mandir}/man8/* %changelog +* Wed Feb 23 2011 Rich Megginson - 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 + * Wed Jan 5 2011 Rich Megginson - 1.1.14-1 - 1.1.14 release - Bug 664671 - Admin server segfault when full SSL access (http+ldap+console) 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 From 06f0e007097f3c5c67ef73955e224a610cd7c821 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 29 Mar 2011 19:14:32 -0600 Subject: [PATCH 16/19] release 389-admin-1.1.16 389-admin-1.1.16 Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user Bug 614690 - Don't use exec to call genrb Bug 158926 - Unable to install CA certificate when using hardware token ( LunaSA ) Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc) (cherry picked from commit f2108ffba8b5b2e772696e1acc62df87b8ef058f) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin.spec | 10 +++++++++- sources | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8bfcd5..d022d6f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /389-admin-1.1.13.tar.bz2 /389-admin-1.1.14.tar.bz2 /389-admin-1.1.15.tar.bz2 +/389-admin-1.1.16.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index a277276..571011c 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.15 +VERSION=1.1.16 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin.spec b/389-admin.spec index c0a335b..fd77738 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.15 +Version: 1.1.16 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -170,6 +170,14 @@ end %{_mandir}/man8/* %changelog +* Tue Mar 29 2011 Rich Megginson - 1.1.16-1 +- 389-admin-1.1.16 +- Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user +- Bug 614690 - Don't use exec to call genrb +- Bug 158926 - Unable to install CA certificate when using +- hardware token ( LunaSA ) +- Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc) + * Wed Feb 23 2011 Rich Megginson - 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 diff --git a/sources b/sources index f5d4c96..4c9fd67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05514a1ee0ba8b60a328c4abed03144c 389-admin-1.1.15.tar.bz2 +6122af6b9d21829ab939ab286676aedf 389-admin-1.1.16.tar.bz2 From 69d6812fbbec61bfcfb6264ccb906eca3b2eb021 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 31 May 2011 17:00:25 -0600 Subject: [PATCH 17/19] 389-admin-1.1.17 389-admin-1.1.17 support "in-place" upgrade and rebranding from Red Hat to 389 many fixes for coverity issues --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 44 ++++++------------------------------------ sources | 2 +- 5 files changed, 10 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index d022d6f..d474e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /389-admin-1.1.14.tar.bz2 /389-admin-1.1.15.tar.bz2 /389-admin-1.1.16.tar.bz2 +/389-admin-1.1.17.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 571011c..06317f9 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.16 +VERSION=1.1.17 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index dd71536..31f2541 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.15 +VERSION=1.1.17 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index fd77738..ea16c7e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,16 +6,12 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.16 +Version: 1.1.17 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: fedora-ds-admin = %{version}-%{release} -Obsoletes: fedora-ds-admin < 1.1.8-1 -Obsoletes: %{name}-selinux -Conflicts: selinux-policy-base < 3.7.19-72 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -99,25 +95,6 @@ rm -rf $RPM_BUILD_ROOT -- if these don't exist, the vars will be nil %{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv') %{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf') --- save the run level configuration, if any -rc = os.execute('rpm --quiet -q fedora-ds-admin') -if rc == 0 then - %{pkgname}admin_exists = true - %{pkgname}admin_savelinks = {} - for dir in posix.files("%{_sysconfdir}/rc.d") do - if string.find(dir, "rc%d.d") then --- print("looking in %{_sysconfdir}/rc.d/"..dir) - for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do - if string.find(link, "[SK]%d%d%{pkgname}-admin") then - fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link - linked = posix.readlink(fullname) --- print(fullname.." is linked to "..linked) - %{pkgname}_savelinks[fullname] = linked - end - end - end - end -end %post -p -- do the usual daemon post setup stuff @@ -142,20 +119,6 @@ fi %postun /sbin/ldconfig -%posttrans -p --- if we saved the run level configuration in %pre, restore it now --- we can get rid of this code once Fedora 11 becomes obsolete -if %{pkgname}admin_savelinks then - for fullpath,link in pairs(%{pkgname}admin_savelinks) do - posix.symlink(link,fullpath) --- print("posttrans - restored run level "..fullpath.." to "..link) - end -end -if %{pkgname}admin_exists then - os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1') -end - - %files %defattr(-,root,root,-) %doc LICENSE @@ -170,6 +133,11 @@ end %{_mandir}/man8/* %changelog +* Fri May 13 2011 Rich Megginson - 1.1.17-1 +- 1.1.17 +- support "in-place" upgrade and rebranding from Red Hat to 389 +- many fixes for coverity issues + * Tue Mar 29 2011 Rich Megginson - 1.1.16-1 - 389-admin-1.1.16 - Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user diff --git a/sources b/sources index 4c9fd67..921ca09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6122af6b9d21829ab939ab286676aedf 389-admin-1.1.16.tar.bz2 +f4d8db9be619f4dbfcaafe46fe6e10fb 389-admin-1.1.17.tar.bz2 From 11ac61dc9fe37419747bb082df37f1c9d788a9a7 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 21 Jun 2011 15:39:33 -0600 Subject: [PATCH 18/19] skip rebranding current brand - support for skins skip rebranding current brand - support for skins (cherry picked from commit 4687d68e49201f81094deedd99792fd4dda5725d) (cherry picked from commit 5fe2312f29763c869b9fd1c38a36632636b60016) (cherry picked from commit 55fa49d238f8d49d9f2b41cdc98a6e85156969eb) --- .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 d474e3b..789171f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /389-admin-1.1.15.tar.bz2 /389-admin-1.1.16.tar.bz2 /389-admin-1.1.17.tar.bz2 +/389-admin-1.1.18.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 06317f9..7a472de 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.17 +VERSION=1.1.18 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 31f2541..e5bec9b 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.17 +VERSION=1.1.18 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index ea16c7e..4d6d711 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.17 +Version: 1.1.18 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -133,6 +133,10 @@ fi %{_mandir}/man8/* %changelog +* Tue Jun 21 2011 Rich Megginson - 1.1.18-1 +- skip rebranding current brand +- support for skins + * Fri May 13 2011 Rich Megginson - 1.1.17-1 - 1.1.17 - support "in-place" upgrade and rebranding from Red Hat to 389 diff --git a/sources b/sources index 921ca09..f69b53c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4d8db9be619f4dbfcaafe46fe6e10fb 389-admin-1.1.17.tar.bz2 +82ae2ada4f6c03d70f21e3254aad5cf3 389-admin-1.1.18.tar.bz2 From d85010ffbeae25d0cb00599ae8844ca4b4d80cca Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 28 Jun 2011 09:39:13 -0600 Subject: [PATCH 19/19] look for separate openldap ldif library look for separate openldap ldif library (cherry picked from commit 982560d4f80f15eeb87e87f5e82337d555e4d924) (cherry picked from commit 1508a1a5b5d21b06c7d14b5360f3c3e754aa872b) (cherry picked from commit 6da9f2919d4eec25d5a59be962306636f4b9a6ee) --- .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 789171f..4b22ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /389-admin-1.1.16.tar.bz2 /389-admin-1.1.17.tar.bz2 /389-admin-1.1.18.tar.bz2 +/389-admin-1.1.19.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 7a472de..3b23a53 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.18 +VERSION=1.1.19 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index e5bec9b..3596a5b 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.18 +VERSION=1.1.19 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 4d6d711..35f6d52 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.18 +Version: 1.1.19 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -133,6 +133,9 @@ fi %{_mandir}/man8/* %changelog +* Tue Jun 28 2011 Rich Megginson - 1.1.19-1 +- look for separate openldap ldif library + * Tue Jun 21 2011 Rich Megginson - 1.1.18-1 - skip rebranding current brand - support for skins diff --git a/sources b/sources index f69b53c..56f967e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82ae2ada4f6c03d70f21e3254aad5cf3 389-admin-1.1.18.tar.bz2 +30a3add5cd160c7ce5ee25fdd8b02a15 389-admin-1.1.19.tar.bz2