From 6fd2502b087ff83da61033018523bd6778fe2c8c Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 26 Oct 2010 09:16:22 -0600 Subject: [PATCH 01/17] 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 | 14 ++++++++------ sources | 2 +- 5 files changed, 15 insertions(+), 11 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 e997154..e5159d6 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/ @@ -20,8 +20,7 @@ Obsoletes: %{name}-selinux BuildRequires: nspr-devel BuildRequires: nss-devel -BuildRequires: svrcore-devel -BuildRequires: mozldap-devel +BuildRequires: openldap-devel BuildRequires: cyrus-sasl-devel BuildRequires: icu BuildRequires: libicu-devel @@ -72,7 +71,7 @@ and CGI utilities used by the console. %patch1 %build -%configure --disable-rpath --with-selinux +%configure --disable-rpath --with-selinux --with-openldap # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -217,6 +216,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 c7c7683152c8ffb13b4f6f9f79f340c095a9d765 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 26 Oct 2010 11:56:42 -0600 Subject: [PATCH 02/17] 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 e5159d6..2cfae56 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 @@ -216,6 +216,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 aa7a92331067866c532001b151a6fb71640eb5db Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Fri, 12 Nov 2010 14:35:17 -0800 Subject: [PATCH 03/17] 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 2cfae56..3320f23 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.9.8 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -29,12 +28,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 @@ -82,17 +75,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 @@ -109,15 +91,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 @@ -160,32 +133,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 @@ -207,7 +163,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}/* @@ -216,6 +171,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 8dca43e9bd41e2479ff6b166f7df7bcaa85065f7 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Mon, 15 Nov 2010 09:57:06 -0800 Subject: [PATCH 04/17] 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 2cfae56..e744683 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.9.7-13 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -29,12 +28,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 @@ -82,17 +75,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 @@ -109,15 +91,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 @@ -160,32 +133,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 @@ -207,7 +163,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}/* @@ -216,6 +171,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 8bcdb6156a0a6254b27de6129839a0dbf290b31f Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 16 Nov 2010 11:07:25 -0800 Subject: [PATCH 05/17] Update sources for 1.1.12 final release --- .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..b9b4db0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a471527e3b6920e9eb42f8b445c4c235 389-admin-1.1.12.a2.tar.bz2 +787f445f47221c6b251579206a1750f1 389-admin-1.1.12.tar.bz2 From d0367cbf1995472636b9d16434b4c03d2b8efd4b Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 16 Nov 2010 11:07:25 -0800 Subject: [PATCH 06/17] Update sources for 1.1.12 final release --- .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..b9b4db0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a471527e3b6920e9eb42f8b445c4c235 389-admin-1.1.12.a2.tar.bz2 +787f445f47221c6b251579206a1750f1 389-admin-1.1.12.tar.bz2 From fca9e47d20c6c5266b440324b87d0976e4b51c27 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 16 Nov 2010 11:26:55 -0800 Subject: [PATCH 07/17] Updated sources for 1.1.12 final build (again) --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index b9b4db0..f445f0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -787f445f47221c6b251579206a1750f1 389-admin-1.1.12.tar.bz2 +d397336af0857bdc014fb86b3eca67cd 389-admin-1.1.12.tar.bz2 From 8eda7528137235dfae7dc3fc3087c8f016e41c83 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 17 Nov 2010 08:31:49 -0800 Subject: [PATCH 08/17] Updated sources for 1.1.12 final build (again) The previous sources had an issue with the generated autoconf files. This updates the sources to have properly generated autoconf files. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index f445f0a..427015b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d397336af0857bdc014fb86b3eca67cd 389-admin-1.1.12.tar.bz2 +cc14c629bfd66d6a35862fcc1ad9973a 389-admin-1.1.12.tar.bz2 From ccd85a5d8a24f61217d50127fc195ae0069ff8dc Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 17 Nov 2010 08:31:49 -0800 Subject: [PATCH 09/17] Updated sources for 1.1.12 final build (again) The previous sources had an issue with the generated autoconf files. This updates the sources to have properly generated autoconf files. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index b9b4db0..427015b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -787f445f47221c6b251579206a1750f1 389-admin-1.1.12.tar.bz2 +cc14c629bfd66d6a35862fcc1ad9973a 389-admin-1.1.12.tar.bz2 From 51659b27b23299e45ee806b9dd7080beddc7d942 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 17 Nov 2010 11:00:48 -0800 Subject: [PATCH 10/17] Bump release number for respin --- 389-admin.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 3320f23..f719e6a 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -7,7 +7,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 @@ -171,9 +171,11 @@ end %{_mandir}/man8/* %changelog -* Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 +* Wed Nov 17 2010 Nathan Kinder - 1.1.1.12-2 - This is the final 1.1.12 release - git tag 389-admin-1.1.12 + +* Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 - Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy * Tue Oct 26 2010 Rich Megginson - 1.1.12-0.2.a2 From 6d63fa700e54325e02f04614859c507d2d1331a2 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Thu, 18 Nov 2010 10:50:51 -0800 Subject: [PATCH 11/17] Corrected selinux conflict version --- 389-admin.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index e744683..9addc4c 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -7,7 +7,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 @@ -15,7 +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.9.7-13 +Conflicts: selinux-policy-base < 3.9.7-11 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -171,9 +171,12 @@ end %{_mandir}/man8/* %changelog -* Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 +* Thu Nov 18 2010 Nathan Kinder - 1.1.12-2 - This is the final 1.1.12 release - git tag 389-admin-1.1.12 +- Corrected conflict version for selinux-policy + +* Fri Nov 12 2010 Nathan Kinder - 1.1.12-1 - Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy * Tue Oct 26 2010 Rich Megginson - 1.1.12-0.2.a2 From 8ff78e5b16bb355a6b2142acf90fc3c4aa604e05 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 23 Nov 2010 16:08:38 -0700 Subject: [PATCH 12/17] - 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 | 10 ++++++++-- sources | 2 +- 5 files changed, 12 insertions(+), 5 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 f719e6a..6bfb2be 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,8 +6,8 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.12 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.1.13 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -171,6 +171,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 + * Wed Nov 17 2010 Nathan Kinder - 1.1.1.12-2 - 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 dc571e9d3625e3fd6d493a7fdd19b20c2f108983 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 29 Nov 2010 17:01:46 -0700 Subject: [PATCH 13/17] fix Conflicts for selinux policy --- 389-admin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index c906e2b..4ec248c 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -7,7 +7,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.13 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -15,7 +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.9.8 +Conflicts: selinux-policy-base < 3.9.7-11 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -171,6 +171,9 @@ end %{_mandir}/man8/* %changelog +* Mon Nov 29 2010 Rich Megginson - 1.1.13-2 +- fix Conflicts for selinux policy + * 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 From 303f29d80050741817c631e806dfc4048fb20f80 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 5 Jan 2011 15:52:38 -0700 Subject: [PATCH 14/17] 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 | 12 +++++++++--- sources | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1a46d94..464bd95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ /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 4ec248c..bb62fdd 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,13 +1,13 @@ %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 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.1.14 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -171,6 +171,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 + * Mon Nov 29 2010 Rich Megginson - 1.1.13-2 - fix Conflicts for selinux policy 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 e520d3565af098e303d69b9c3eec8ce04416ba3e Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 23 Feb 2011 08:59:47 -0700 Subject: [PATCH 15/17] 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 --- .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 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 bb62fdd..ab3e0bf 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/ @@ -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 - 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 f2108ffba8b5b2e772696e1acc62df87b8ef058f Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 29 Mar 2011 19:14:32 -0600 Subject: [PATCH 16/17] 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) --- .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 a0e28d1..074f597 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,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 ab3e0bf..0b1b5a5 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/ @@ -169,6 +169,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 925cb6fc356638f676dbcc528b3ada40994f13cc Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 31 May 2011 17:00:25 -0600 Subject: [PATCH 17/17] 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 074f597..9179afa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,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 0b1b5a5..2a7fcb3 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.9.7-11 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -98,25 +94,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 @@ -141,20 +118,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 @@ -169,6 +132,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