From ce8a8cffe4395f6561212a0f9fe8e165053c2615 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 3 Nov 2009 04:41:39 +0000 Subject: [PATCH 01/38] Initialize branch EL-5 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..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 275c8d9d58e32225b83fc9b458ed47ee8408cd1d Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 18 Dec 2009 18:38:19 +0000 Subject: [PATCH 02/38] this is the 1.1.10.a2 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 11 ++++------- 389-admin-git.sh | 20 +++++++------------- 389-admin.spec | 21 ++++++++++++++++----- sources | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.cvsignore b/.cvsignore index 072960f..345ada8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.9.tar.bz2 +389-admin-1.1.10.a2.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 2916ee8..ca2be77 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,18 +1,15 @@ #!/bin/bash DATE=`date +%Y%m%d` -TAG=389-admin-1.1.9 -CVSTAG=three89Admin_1_1_9 -VERSION=1.1.9 +VERSION=1.1.10.a2 PKGNAME=389-admin +TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} -CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec echo you must be in the admin server git repo to use this -git status > /dev/null || echo bye +test -d .git || {echo bye ; exit 1 } if [ -z "$1" ] ; then dir=. else dir="$1" fi -git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME ) -rm -rf $dir/$SRCNAME +git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2 diff --git a/389-admin-git.sh b/389-admin-git.sh index d827a65..2c95e9d 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,22 +1,16 @@ #!/bin/bash DATE=`date +%Y%m%d` -TAG=HEAD -VERSION=1.1.7 +VERSION=1.1.10.a2 PKGNAME=389-admin -export URL=git://git.fedorahosted.org/git/389/admin.git #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION +TAG=${PKGNAME}-${VERSION} +URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz" -git clone $URL -cd admin.git -git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2 -#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver -#cd $SRCNAME -#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd -#cd .. +wget -O $SRCNAME.tar.gz "$URL" -#tar -cjf $SRCNAME.tar.bz2 $SRCNAME +echo convert tgz format to tar.bz2 format -cd .. -rm -rf admin.git +gunzip $PKGNAME-$VERSION.tar.gz +bzip2 $PKGNAME-$VERSION.tar diff --git a/389-admin.spec b/389-admin.spec index 1a03994..5dea3b1 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,9 +1,13 @@ -%define pkgname dirsrv +%global pkgname dirsrv +# for a pre-release, define the prerel field - comment out for official release +%global prerel .a2 +# also need the relprefix 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.9 -Release: 1%{?dist} +Version: 1.1.10 +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Source0: http://port389.org/sources/%{name}-%{version}.tar.bz2 +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 @@ -46,7 +50,7 @@ be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?prerel} %patch1 %build @@ -153,6 +157,13 @@ end %{_mandir}/man8/* %changelog +* Fri Dec 18 2009 Rich Megginson - 1.1.10.a2-0.2 +- the 1.1.10.a2 release +- fix problem with genrb path on F-12 and later + +* Thu Oct 8 2009 Rich Megginson - 1.1.10.a1-1 +- the 1.1.10.a1 release + * Mon Sep 14 2009 Rich Megginson - 1.1.9-1 - the 1.1.9 release diff --git a/sources b/sources index 63cc2ec..1d0b680 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f84413babbcd29035b8707f2ee9cea1 389-admin-1.1.9.tar.bz2 +092b48ed6503f37d58b19acda13c5cb9 389-admin-1.1.10.a2.tar.bz2 From bbbf3ad4997650472877db3b5de66a475b9c580b Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 14 Jan 2010 22:39:03 +0000 Subject: [PATCH 03/38] this is the 1.1.10.a3 release - address some ICU genrb related build issues on rawhide and other platforms --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 8 ++++++-- sources | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 345ada8..813d9fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.a2.tar.bz2 +389-admin-1.1.10.a3.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index ca2be77..1bfac57 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.10.a2 +VERSION=1.1.10.a3 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 2c95e9d..a40a437 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.10.a2 +VERSION=1.1.10.a3 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 5dea3b1..9021e5d 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 .a3 # also need the relprefix 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.10 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -157,6 +157,10 @@ end %{_mandir}/man8/* %changelog +* Thu Jan 14 2010 Rich Megginson - 1.1.10.a3-0.3 +- the 1.1.10.a3 release +- make sure we can find ICU genrb on all platforms + * Fri Dec 18 2009 Rich Megginson - 1.1.10.a2-0.2 - the 1.1.10.a2 release - fix problem with genrb path on F-12 and later diff --git a/sources b/sources index 1d0b680..1eae96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -092b48ed6503f37d58b19acda13c5cb9 389-admin-1.1.10.a2.tar.bz2 +9379a20ef8ea32d779eb9b034048036a 389-admin-1.1.10.a3.tar.bz2 From 518e0de22829eed8fccbecc715c6139568bc8808 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 21 Jan 2010 00:04:27 +0000 Subject: [PATCH 04/38] this is the 1.1.10 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 10 +++++++--- sources | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 813d9fb..8f9b5c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.a3.tar.bz2 +389-admin-1.1.10.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 1bfac57..fc60ec7 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.10.a3 +VERSION=1.1.10 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index a40a437..1786739 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.10.a3 +VERSION=1.1.10 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 9021e5d..7fb6226 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 .a3 +###%global prerel # also need the relprefix field for a pre-release - also comment out for official release -%global relprefix 0. +###%global relprefix Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.10 -Release: %{?relprefix}3%{?prerel}%{?dist} +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -157,6 +157,10 @@ end %{_mandir}/man8/* %changelog +* Wed Jan 20 2010 Rich Megginson - 1.1.10-1 +- the 1.1.10 release +- allow server to run unconfined if not built with selinux support + * Thu Jan 14 2010 Rich Megginson - 1.1.10.a3-0.3 - the 1.1.10.a3 release - make sure we can find ICU genrb on all platforms diff --git a/sources b/sources index 1eae96b..3bff33f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9379a20ef8ea32d779eb9b034048036a 389-admin-1.1.10.a3.tar.bz2 +55f4b856e31916a7fa05afe5b15be9c4 389-admin-1.1.10.tar.bz2 From 9abe38c9ec160b00ad8f37e12981574f254cd7c3 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 26 Jan 2010 02:19:01 +0000 Subject: [PATCH 05/38] this is the 1.1.11.a1 release - this is the first release that supports SELinux enforcement --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 88 +++++++++++++++++++++++++++++++++++++++--- selinux-policy.patch | 31 +++++++++++++++ sources | 2 +- 6 files changed, 118 insertions(+), 9 deletions(-) create mode 100644 selinux-policy.patch diff --git a/.cvsignore b/.cvsignore index 8f9b5c4..bf52f93 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.tar.bz2 +389-admin-1.1.11.a1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index fc60ec7..a96a3e6 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.10 +VERSION=1.1.11.a1 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 1786739..cd4c85f 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.10 +VERSION=1.1.11.a1 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 7fb6226..ee4329e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,12 +1,14 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -###%global prerel -# also need the relprefix field for a pre-release - also comment out for official release -###%global relprefix +%global prerel .a1 +# also need the relprefix 0. field for a pre-release - also comment out for official release +%global relprefix 0. + +%global selinux_variants strict targeted Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.10 +Version: 1.1.11 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -27,6 +29,12 @@ 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 # the following are needed for some of our scripts @@ -42,6 +50,7 @@ Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz # 389-admin-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh Patch1: f11-httpd.patch +Patch2: selinux-policy.patch %description 389 Administration Server is an HTTP agent that provides management features @@ -49,12 +58,23 @@ 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 >= 2.4.6-203 +Requires: %{name} = %{version}-%{release} +Requires: 389-ds-base-selinux + +%description selinux +SELinux policy for the 389 Adminstration Server package. + %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 +%patch2 %build -%configure --disable-rpath +%configure --disable-rpath --with-selinux # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -65,6 +85,18 @@ 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 @@ -80,6 +112,16 @@ 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 @@ -143,6 +185,34 @@ 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,-) %doc LICENSE @@ -156,7 +226,15 @@ end %{_libdir}/%{pkgname} %{_mandir}/man8/* +%files selinux +%defattr(-,root,root,-) +%{_datadir}/selinux/*/%{pkgname}-admin.pp + %changelog +* Thu Jan 21 2010 Nathan Kinder - 1.1.11.a1-0.1 +- the 1.1.11.a1 release +- added SELinux subpackage + * Wed Jan 20 2010 Rich Megginson - 1.1.10-1 - the 1.1.10 release - allow server to run unconfined if not built with selinux support diff --git a/selinux-policy.patch b/selinux-policy.patch new file mode 100644 index 0000000..0203012 --- /dev/null +++ b/selinux-policy.patch @@ -0,0 +1,31 @@ +--- selinux/dirsrv-admin.if 2010-01-20 10:39:35.765329723 -0800 ++++ selinux/dirsrv-admin.if 2010-01-20 11:15:09.351304364 -0800 +@@ -25,7 +25,6 @@ + + files_exec_usr_files(httpd_t) + files_manage_generic_tmp_files(httpd_t) +- userdom_rw_user_tmp_files(httpd_t) + corenet_tcp_connect_generic_port(httpd_t) + + # Strict policy +@@ -81,7 +80,7 @@ + + # Allow dirsrv to interact with CGIs + allow dirsrv_t httpd_dirsrvadmin_script_t:unix_stream_socket { read write }; +- allow dirsrv_t dirsrvadmin_tmp_t:file write; ++ allow dirsrv_t httpd_dirsrvadmin_script_rw_t:file write; + + # Allow dirsrv domain to interact with httpd + allow dirsrv_t httpd_t:fifo_file { write read }; +--- selinux/dirsrv-admin.te 2009-10-22 14:27:21.228545844 -0700 ++++ selinux/dirsrv-admin.te 2009-10-22 14:27:36.348546152 -0700 +@@ -113,9 +113,6 @@ + # The CGI scripts must be able to manage dirsrv-admin + dirsrvadmin_run_exec(httpd_dirsrvadmin_script_t) + dirsrvadmin_manage_config(httpd_dirsrvadmin_script_t) +-manage_files_pattern(httpd_dirsrvadmin_script_t, dirsrvadmin_tmp_t, dirsrvadmin_tmp_t) +-manage_dirs_pattern(httpd_dirsrvadmin_script_t, dirsrvadmin_tmp_t, dirsrvadmin_tmp_t) +-files_tmp_filetrans(httpd_dirsrvadmin_script_t, dirsrvadmin_tmp_t, { file dir }) + + # The CGI scripts must be able to manage the dirsrv + dirsrv_domtrans(httpd_dirsrvadmin_script_t) diff --git a/sources b/sources index 3bff33f..7dfa470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55f4b856e31916a7fa05afe5b15be9c4 389-admin-1.1.10.tar.bz2 +2d5c5e2058429086bbced744590aba7f 389-admin-1.1.11.a1.tar.bz2 From 3390e66684ba4e75a4dc29d8348c23500e8727ae Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:45:25 +0000 Subject: [PATCH 06/38] 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 2aed25ab8dcadbee74ffd46357212e37e5a05f53 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Sat, 27 Feb 2010 02:08:54 +0000 Subject: [PATCH 07/38] 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 ee4329e..9e89974 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 @@ -231,6 +231,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 e7c15754efc9d7e7d67462e5ada32760d7c6cddf Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Sat, 27 Feb 2010 02:08:56 +0000 Subject: [PATCH 08/38] 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 09/38] 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 10/38] 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 88af4667c6fdf01a2413bbf06b077da7a656b59d Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 7 Apr 2010 23:38:41 +0000 Subject: [PATCH 11/38] for the 1.2.6.a3 release --- 389-admin.spec | 83 ++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 44 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 9e89974..c5f2285 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,13 +9,14 @@ 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 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 @@ -37,6 +38,15 @@ BuildRequires: 389-ds-base-selinux-devel Requires: 389-ds-base Requires: mod_nss + +# this is needed for using semanage from our setup scripts +Requires: policycoreutils + +# 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 @@ -58,16 +68,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 >= 2.4.6-203 -Requires: %{name} = %{version}-%{release} -Requires: 389-ds-base-selinux - -%description selinux -SELinux policy for the 389 Adminstration Server package. - %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 @@ -163,14 +163,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 @@ -185,33 +203,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,-) @@ -219,6 +210,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}/* @@ -226,11 +218,14 @@ fi %{_libdir}/%{pkgname} %{_mandir}/man8/* -%files selinux -%defattr(-,root,root,-) -%{_datadir}/selinux/*/%{pkgname}-admin.pp - %changelog +* 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 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 - Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location From cd4b6e9d781976d3e4aa027365315d1b9ee0e79e Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 18:15:16 +0000 Subject: [PATCH 12/38] 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 fab8eb9d1c243db543576c80f35c49f3f30a94af Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 18:15:18 +0000 Subject: [PATCH 13/38] 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 7f75c09d3773a819950f44e1d9c638d106699308 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 26 May 2010 21:48:14 +0000 Subject: [PATCH 14/38] 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 c5f2285..937f701 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 @@ -219,6 +219,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 257b40a5bdb8af8b2f04016c9f095794d8046e2c Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 26 May 2010 21:48:15 +0000 Subject: [PATCH 15/38] 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 470859aad1c2fda812d669106f751335d6de325d Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 9 Jun 2010 15:03:22 +0000 Subject: [PATCH 16/38] 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 937f701..1d99b7a 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 @@ -219,6 +219,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 f1fc4bd4720b5f13f39f550afc815d580ebdc38f Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 9 Jun 2010 15:03:25 +0000 Subject: [PATCH 17/38] 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 18/38] 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 ed00f2184287d18afd338a552a7e929bc42fdc05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:36 +0000 Subject: [PATCH 19/38] 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 1ae5393..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-admin -# $Id$ -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 $$/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 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 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 20/38] 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 21/38] 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 05a4a084319585fc329a45b5de81ab73abdddf0a Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Fri, 19 Nov 2010 11:08:56 -0800 Subject: [PATCH 22/38] Updated sources for 1.1.12 final build --- .gitignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 10 +++++++--- sources | 2 +- 5 files changed, 11 insertions(+), 7 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/389-admin.spec b/389-admin.spec index 9e9e880..1ef50a3 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,15 +1,15 @@ %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 relprefix 0. %global selinux_variants strict targeted 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 @@ -219,6 +219,10 @@ end %{_mandir}/man8/* %changelog +* Fri Nov 19 2010 Nathan Kinder - 1.1.12-1 +- This is the final 1.1.12 release +- git tag 389-admin-1.1.12 + * Tue Oct 26 2010 Rich Megginson - 1.1.12-0.2.a2 - fix mozldap build breakage 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 7525daf1926ff4c450ecb5411e1e7793e6c3713c Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 23 Nov 2010 16:08:38 -0700 Subject: [PATCH 23/38] 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 (cherry picked from commit 11e3805d9cd64e9063c5f55cc1955f169d3d02e6) --- .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 1ef50a3..8c507f8 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,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/ @@ -219,6 +219,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 19 2010 Nathan Kinder - 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 f4a9c1febb1bb98c1af98563d8ec9e895523f562 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 5 Jan 2011 15:52:38 -0700 Subject: [PATCH 24/38] 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 8c507f8..a7e08b8 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 .a1 # also need the relprefix 0. field for a pre-release - also comment out for official release # % global relprefix 0. @@ -8,7 +8,7 @@ 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/ @@ -219,6 +219,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 80a1759536b670465a43c3d6ed4cb3e3fab5ebd6 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 23 Feb 2011 08:59:47 -0700 Subject: [PATCH 25/38] 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 | 22 ++++++++++++++++++---- f11-httpd.patch | 15 --------------- sources | 2 +- 6 files changed, 22 insertions(+), 22 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 a7e08b8..d71e0c8 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,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/ @@ -59,8 +59,7 @@ 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 -Patch2: selinux-policy.patch +Patch1: selinux-policy.patch %description 389 Administration Server is an HTTP agent that provides management features @@ -71,7 +70,6 @@ and CGI utilities used by the console. %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 -%patch2 %build %configure --disable-rpath --with-selinux @@ -219,6 +217,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 bb544851e3cf724a10c7ba3fefc1248b681ab1f8 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 29 Mar 2011 19:14:32 -0600 Subject: [PATCH 26/38] 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) (cherry picked from commit 06f0e007097f3c5c67ef73955e224a610cd7c821) --- .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 d71e0c8..b595c2b 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,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/ @@ -217,6 +217,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 e2ad30845ceb94b1241fd1bba7560713b6fb6bab Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 2 Jun 2011 09:48:05 -0600 Subject: [PATCH 27/38] 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 | 7 ++++++- sources | 2 +- 5 files changed, 10 insertions(+), 4 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 b595c2b..6f6808b 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ 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/ @@ -217,6 +217,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 67446e0c97ae917bc2c5e81ad235e54ec4a45be9 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 21 Jun 2011 15:39:33 -0600 Subject: [PATCH 28/38] 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) (cherry picked from commit 11ac61dc9fe37419747bb082df37f1c9d788a9a7) --- .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 6f6808b..9ffbff1 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,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/ @@ -217,6 +217,10 @@ end %{_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 d9d9c781137c40da633256221a18282701f6369d Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 28 Jun 2011 09:39:13 -0600 Subject: [PATCH 29/38] 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) (cherry picked from commit d85010ffbeae25d0cb00599ae8844ca4b4d80cca) --- .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 9ffbff1..0246124 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,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/ @@ -217,6 +217,9 @@ end %{_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 From 2e446e705c842068418ebf344b48d5a4c63df9d6 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 5 Jul 2011 11:21:53 -0600 Subject: [PATCH 30/38] 389-admin-1.1.20 - many migration + tls/ssl fixes 389-admin-1.1.20 - many migration + tls/ssl fixes Bug 719056 - migrate-ds-admin.pl needs to update SELinux policy Bug 718285 - AdminServer should use "service" command instead of start/stop/restart scripts Bug 718079 - Perl errors when running migrate-ds-admin.pl Bug 713000 - Migration stops if old admin server cannot be stopped added tests for the security cgi fix typo in NSS_Shutdown warning message better NSS error handling - reduce memory leaks Bug 710372 - Not able to open the Manage Certificate from DS-console (cherry picked from commit e3bb13b8beb0e409e299f32df5df85b79e6e1be7) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 14 ++++++++++++-- sources | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4b22ec3..c10de18 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /389-admin-1.1.17.tar.bz2 /389-admin-1.1.18.tar.bz2 /389-admin-1.1.19.tar.bz2 +/389-admin-1.1.20.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 3b23a53..8db8e50 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.19 +VERSION=1.1.20 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 3596a5b..9382e7c 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.19 +VERSION=1.1.20 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 0246124..a7611c0 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.19 +Version: 1.1.20 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -72,7 +72,7 @@ and CGI utilities used by the console. %patch1 %build -%configure --disable-rpath --with-selinux +%configure --disable-rpath --with-selinux --enable-service # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -217,6 +217,16 @@ end %{_mandir}/man8/* %changelog +* Tue Jul 5 2011 Rich Megginson - 1.1.20-1 +- Bug 719056 - migrate-ds-admin.pl needs to update SELinux policy +- Bug 718285 - AdminServer should use "service" command instead of start/stop/restart scripts +- Bug 718079 - Perl errors when running migrate-ds-admin.pl +- Bug 713000 - Migration stops if old admin server cannot be stopped +- added tests for the security cgi +- fix typo in NSS_Shutdown warning message +- better NSS error handling - reduce memory leaks +- Bug 710372 - Not able to open the Manage Certificate from DS-console + * Tue Jun 28 2011 Rich Megginson - 1.1.19-1 - look for separate openldap ldif library diff --git a/sources b/sources index 56f967e..0116028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30a3add5cd160c7ce5ee25fdd8b02a15 389-admin-1.1.19.tar.bz2 +4dbed7a295b6db527babbb66bc3e86c0 389-admin-1.1.20.tar.bz2 From a90afeeee963063123ef01e855553c6d3e53b96f Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 2 Aug 2011 14:58:10 -0600 Subject: [PATCH 31/38] Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user (cherry picked from commit 0f90c2f170b88473347478493f0fee5c75de888f) --- .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 c10de18..9812cd8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /389-admin-1.1.18.tar.bz2 /389-admin-1.1.19.tar.bz2 /389-admin-1.1.20.tar.bz2 +/389-admin-1.1.21.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 8db8e50..16ecc31 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.20 +VERSION=1.1.21 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 9382e7c..46329c6 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.20 +VERSION=1.1.21 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index a7611c0..a38b7f5 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.20 +Version: 1.1.21 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Tue Aug 2 2011 Rich Megginson - 1.1.21-1 +- Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user + * Tue Jul 5 2011 Rich Megginson - 1.1.20-1 - Bug 719056 - migrate-ds-admin.pl needs to update SELinux policy - Bug 718285 - AdminServer should use "service" command instead of start/stop/restart scripts diff --git a/sources b/sources index 0116028..56a962f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dbed7a295b6db527babbb66bc3e86c0 389-admin-1.1.20.tar.bz2 +aac6b69f9db31689202dbce5b5349e7e 389-admin-1.1.21.tar.bz2 From 3a334db318b8839aaaef3f6ef32b52d7425f9863 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 11 Aug 2011 08:59:26 -0600 Subject: [PATCH 32/38] Bug 724808 - startup CGIs write temp file to / add man pages for ds_removal and ds_unregister fixes for the makeUpgradeTar.sh script (cherry picked from commit fd82026527d643fcf5837091d124fac34ee996e3) (cherry picked from commit f90d6431d009a19f92d171ead4563592c7dca48f) (cherry picked from commit 5f3d76acf729365d6322ece4eb1ffd57352f2495) (cherry picked from commit 384c2b593ed5f54e851c146ab266e15d5a32fc4f) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 ++++++- sources | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9812cd8..f5b7607 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /389-admin-1.1.19.tar.bz2 /389-admin-1.1.20.tar.bz2 /389-admin-1.1.21.tar.bz2 +/389-admin-1.1.22.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 16ecc31..42f3a52 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.21 +VERSION=1.1.22 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 46329c6..c53b33b 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.21 +VERSION=1.1.22 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index a38b7f5..0cae162 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.21 +Version: 1.1.22 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,11 @@ end %{_mandir}/man8/* %changelog +* Thu Aug 11 2011 Rich Megginson - 1.1.22-1 +- Bug 724808 - startup CGIs write temp file to / +- add man pages for ds_removal and ds_unregister +- fixes for the makeUpgradeTar.sh script + * Tue Aug 2 2011 Rich Megginson - 1.1.21-1 - Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user diff --git a/sources b/sources index 56a962f..bf9a149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aac6b69f9db31689202dbce5b5349e7e 389-admin-1.1.21.tar.bz2 +c497084aa4e349d844138ecc6c4969dd 389-admin-1.1.22.tar.bz2 From 57fabb52ffdafab91e1f0ef9fa6778c35399e06e Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 11 Aug 2011 14:43:24 -0600 Subject: [PATCH 33/38] Bug 730079 - Update SELinux policy during upgrades (cherry picked from commit a8b99a4fba9ea49b37bd6093176b1d8b2693ab9b) (cherry picked from commit 7c57f8eb773858dfe2e44459b5fb34acb43c2eff) (cherry picked from commit c3d53e96974c96632e9f40f216ef67fa693ba068) (cherry picked from commit d247e6c50a4971d255c7b8d4f396d3f286c5e19d) --- .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 f5b7607..54e4fd4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /389-admin-1.1.20.tar.bz2 /389-admin-1.1.21.tar.bz2 /389-admin-1.1.22.tar.bz2 +/389-admin-1.1.23.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 42f3a52..d5bdce8 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.22 +VERSION=1.1.23 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index c53b33b..82a549a 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.22 +VERSION=1.1.23 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 0cae162..49b1603 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.22 +Version: 1.1.23 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Thu Aug 11 2011 Rich Megginson - 1.1.23-1 +- Bug 730079 - Update SELinux policy during upgrades + * Thu Aug 11 2011 Rich Megginson - 1.1.22-1 - Bug 724808 - startup CGIs write temp file to / - add man pages for ds_removal and ds_unregister diff --git a/sources b/sources index bf9a149..5e0e19f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c497084aa4e349d844138ecc6c4969dd 389-admin-1.1.22.tar.bz2 +34d7608a1b4b7c1b56d649a3dc407682 389-admin-1.1.23.tar.bz2 From ab263e5d7199dd306f13560ea4dd2e6dcb618754 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 28 Oct 2011 16:56:37 -0600 Subject: [PATCH 34/38] Bug 740959 - 389-console put CA certificates into wrong database (cherry picked from commit 0fd93fe7cfb384144e0ce70de0cec4ad2ef0d045) (cherry picked from commit cf4b156ef440a381b195a96c2504cc9c0a06027e) (cherry picked from commit 474d683b6eb074455ac18ebf77f9894d42944cc2) --- .gitignore | 2 ++ 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 8 +++++++- sources | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 54e4fd4..d2e60e1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /389-admin-1.1.21.tar.bz2 /389-admin-1.1.22.tar.bz2 /389-admin-1.1.23.tar.bz2 +/389-admin-1.1.24.tar.bz2 +/389-admin-1.1.25.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index d5bdce8..de511dd 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.23 +VERSION=1.1.25 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 82a549a..7ec4411 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.23 +VERSION=1.1.25 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 49b1603..6d9e40f 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.23 +Version: 1.1.25 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,12 @@ end %{_mandir}/man8/* %changelog +* Fri Oct 28 2011 Rich Megginson - 1.1.25-1 +- Bug 740959 - 389-console put CA certificates into wrong database + +* Wed Sep 21 2011 Rich Megginson - 1.1.24-1 +- Bug 695741 - Providing native systemd file + * Thu Aug 11 2011 Rich Megginson - 1.1.23-1 - Bug 730079 - Update SELinux policy during upgrades diff --git a/sources b/sources index 5e0e19f..b9c0091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d7608a1b4b7c1b56d649a3dc407682 389-admin-1.1.23.tar.bz2 +468727aa2699427814fb0ba2b0a72dad 389-admin-1.1.25.tar.bz2 From 330bbd7429d48b130e82a8ee67848221a44eeacd Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 25 Jan 2012 08:40:41 -0700 Subject: [PATCH 35/38] Bug 767823 - selinux: need to allow admin server to connect to ldap port (cherry picked from commit f3dbe17140392f3dc0e902dbeca960e70986e114) (cherry picked from commit 5ce766f85eafbf707ffab829a1640613d2b0e292) (cherry picked from commit 28df75ad30843eeea7b13416f472e85fa4219634) --- .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 d2e60e1..079c239 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /389-admin-1.1.23.tar.bz2 /389-admin-1.1.24.tar.bz2 /389-admin-1.1.25.tar.bz2 +/389-admin-1.1.26.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index de511dd..5079b6a 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.25 +VERSION=1.1.26 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 7ec4411..b8cbbab 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.25 +VERSION=1.1.26 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 6d9e40f..475b569 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.25 +Version: 1.1.26 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Wed Jan 25 2012 Rich Megginson - 1.1.26-1 +- Bug 767823 - selinux: need to allow admin server to connect to ldap port + * Fri Oct 28 2011 Rich Megginson - 1.1.25-1 - Bug 740959 - 389-console put CA certificates into wrong database diff --git a/sources b/sources index b9c0091..de43c87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -468727aa2699427814fb0ba2b0a72dad 389-admin-1.1.25.tar.bz2 +913a4b58a204e5db0cbd2b41ca1fe0f4 389-admin-1.1.26.tar.bz2 From 37d3885cd6adeaf0782fe4a015a415fd79c12176 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 3 Feb 2012 19:38:20 -0700 Subject: [PATCH 36/38] TLS not working with latest openldap - Review and address latest Coverity issues Ticket #281 - TLS not working with latest openldap Ticket #161 - Review and address latest Coverity issues (cherry picked from commit 28a0c1c5a7d00690e744f1a682a6792f2bab76bd) (cherry picked from commit cedd5bf3d6f2058af6550e70cae1594bc17555a2) (cherry picked from commit 5e943714e0f8c8fc0bdd34cea45f70b365e7f4f4) (cherry picked from commit fe42e9460763a817b943689d1e4264a799cd5e5d) --- .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 079c239..25d027f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /389-admin-1.1.24.tar.bz2 /389-admin-1.1.25.tar.bz2 /389-admin-1.1.26.tar.bz2 +/389-admin-1.1.27.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 5079b6a..1254a5c 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.26 +VERSION=1.1.27 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index b8cbbab..77dacd0 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.26 +VERSION=1.1.27 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 475b569..d24c8b0 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.26 +Version: 1.1.27 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,10 @@ end %{_mandir}/man8/* %changelog +* Fri Feb 3 2012 Rich Megginson - 1.1.27-1 +- Ticket #281 - TLS not working with latest openldap +- Ticket #161 - Review and address latest Coverity issues + * Wed Jan 25 2012 Rich Megginson - 1.1.26-1 - Bug 767823 - selinux: need to allow admin server to connect to ldap port diff --git a/sources b/sources index de43c87..91f8a47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -913a4b58a204e5db0cbd2b41ca1fe0f4 389-admin-1.1.26.tar.bz2 +3891cdd71e00b5040a8e84c66b490fc1 389-admin-1.1.27.tar.bz2 From 3c0bb74a1917adcb047e853808bef5a02f443d84 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 22 Mar 2012 09:51:22 -0600 Subject: [PATCH 37/38] htmladmin segfault - compilation warnings Ticket #307 - htmladmin keeps segfaulting Ticket #286 - compilation fixes for 'format-security' (cherry picked from commit 213f2e1add28c954ec3f304c67ec28971adb67b8) (cherry picked from commit 48d2d78f35743a2747e4e1c949007903125204c0) --- .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 25d027f..9c13934 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /389-admin-1.1.25.tar.bz2 /389-admin-1.1.26.tar.bz2 /389-admin-1.1.27.tar.bz2 +/389-admin-1.1.28.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 1254a5c..b7a8500 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.27 +VERSION=1.1.28 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 77dacd0..2c4c86a 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.27 +VERSION=1.1.28 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index d24c8b0..6a70808 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.27 +Version: 1.1.28 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,10 @@ end %{_mandir}/man8/* %changelog +* Thu Mar 22 2012 Rich Megginson - 1.1.28-1 +- Ticket #307 - htmladmin keeps segfaulting +- Ticket #286 - compilation fixes for 'format-security' + * Fri Feb 3 2012 Rich Megginson - 1.1.27-1 - Ticket #281 - TLS not working with latest openldap - Ticket #161 - Review and address latest Coverity issues diff --git a/sources b/sources index 91f8a47..f617880 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3891cdd71e00b5040a8e84c66b490fc1 389-admin-1.1.27.tar.bz2 +d6904cd02b9c5e6729d6fc2af6bdd16e 389-admin-1.1.28.tar.bz2 From 8a9948f3e448df0ece90be643eb26ef407b1e6c2 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 27 Mar 2012 08:22:59 -0600 Subject: [PATCH 38/38] If htmladmin fails to connect to the server, the cgi could crash. (cherry picked from commit 2076085457e0487f115fdbc2a2c7f100b5bab1af) (cherry picked from commit 5d453d2dae36c2929be0d94c6d72e8ec1f0598aa) (cherry picked from commit fcc6e05c619861e7db83f919a329adf344379f91) (cherry picked from commit d9a6d8035013b98f9e7134f74af589c01f9d90b9) --- .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 9c13934..fb37de3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /389-admin-1.1.26.tar.bz2 /389-admin-1.1.27.tar.bz2 /389-admin-1.1.28.tar.bz2 +/389-admin-1.1.29.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index b7a8500..b474d73 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.28 +VERSION=1.1.29 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 2c4c86a..4b53603 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.28 +VERSION=1.1.29 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 6a70808..944214b 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -8,7 +8,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.28 +Version: 1.1.29 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Tue Mar 27 2012 Rich Megginson - 1.1.29-1 +- 4ec23c0 If htmladmin fails to connect to the server, the cgi could crash. + * Thu Mar 22 2012 Rich Megginson - 1.1.28-1 - Ticket #307 - htmladmin keeps segfaulting - Ticket #286 - compilation fixes for 'format-security' diff --git a/sources b/sources index f617880..f2ab5b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6904cd02b9c5e6729d6fc2af6bdd16e 389-admin-1.1.28.tar.bz2 +4bda83e9f5644e0bd25fdf7b6ce9e5ee 389-admin-1.1.29.tar.bz2