From 1a24529c1173dea8086729105e42f107cf4466aa Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 27 Apr 2011 18:58:44 -0600 Subject: [PATCH 01/16] Disable the use of systemd for the initscripts For now, in f15, just disable the use of the systemd wrapper. --- 389-admin.spec | 7 ++++++- f15-disable-systemd.patch | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 f15-disable-systemd.patch diff --git a/389-admin.spec b/389-admin.spec index a322c6a..0922557 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -7,7 +7,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.16 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -51,6 +51,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 +Patch0: f15-disable-systemd.patch %description 389 Administration Server is an HTTP agent that provides management features @@ -60,6 +61,7 @@ and CGI utilities used by the console. %prep %setup -q -n %{name}-%{version}%{?prerel} +%patch1 -p1 %build %configure --disable-rpath --with-selinux --with-openldap @@ -169,6 +171,9 @@ end %{_mandir}/man8/* %changelog +* Thu Apr 28 2011 Rich Megginson - 1.1.16-2 +- disable the use of systemd for initscripts + * 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/f15-disable-systemd.patch b/f15-disable-systemd.patch new file mode 100644 index 0000000..1a5d854 --- /dev/null +++ b/f15-disable-systemd.patch @@ -0,0 +1,14 @@ +diff --git a/wrappers/initscript.in b/wrappers/initscript.in +index 82dd20e..ec3e5e1 100644 +--- a/wrappers/initscript.in ++++ b/wrappers/initscript.in +@@ -8,6 +8,9 @@ + # piddir: @localstatedir@/run/@PACKAGE_BASE_NAME@ + # + ++# Avoid using systemd for now ++SYSTEMCTL_SKIP_REDIRECT=1 ; export SYSTEMCTL_SKIP_REDIRECT ++ + # Source function library. + if [ -f /etc/rc.d/init.d/functions ] ; then + . /etc/rc.d/init.d/functions From 7a7ffcd97656e624c98550c420a0c8508824a28d Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 28 Apr 2011 08:44:21 -0600 Subject: [PATCH 02/16] wrong patch number --- 389-admin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 0922557..b93e74e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -61,7 +61,7 @@ and CGI utilities used by the console. %prep %setup -q -n %{name}-%{version}%{?prerel} -%patch1 -p1 +%patch0 -p1 %build %configure --disable-rpath --with-selinux --with-openldap From 54dc00afb57fbaf85fc7b3748078e5df3fafec84 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 31 May 2011 17:00:25 -0600 Subject: [PATCH 03/16] 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 | 47 ++++++------------------------------------ sources | 2 +- 5 files changed, 10 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 074f597..9179afa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /389-admin-1.1.14.tar.bz2 /389-admin-1.1.15.tar.bz2 /389-admin-1.1.16.tar.bz2 +/389-admin-1.1.17.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 571011c..06317f9 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.16 +VERSION=1.1.17 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index dd71536..31f2541 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.15 +VERSION=1.1.17 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index b93e74e..6031d8e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,16 +6,12 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.16 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.1.17 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: fedora-ds-admin = %{version}-%{release} -Obsoletes: fedora-ds-admin < 1.1.8-1 -Obsoletes: %{name}-selinux -Conflicts: selinux-policy-base < 3.9.8 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -100,25 +96,6 @@ rm -rf $RPM_BUILD_ROOT -- if these don't exist, the vars will be nil %{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv') %{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf') --- save the run level configuration, if any -rc = os.execute('rpm --quiet -q fedora-ds-admin') -if rc == 0 then - %{pkgname}admin_exists = true - %{pkgname}admin_savelinks = {} - for dir in posix.files("%{_sysconfdir}/rc.d") do - if string.find(dir, "rc%d.d") then --- print("looking in %{_sysconfdir}/rc.d/"..dir) - for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do - if string.find(link, "[SK]%d%d%{pkgname}-admin") then - fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link - linked = posix.readlink(fullname) --- print(fullname.." is linked to "..linked) - %{pkgname}_savelinks[fullname] = linked - end - end - end - end -end %post -p -- do the usual daemon post setup stuff @@ -143,20 +120,6 @@ fi %postun /sbin/ldconfig -%posttrans -p --- if we saved the run level configuration in %pre, restore it now --- we can get rid of this code once Fedora 11 becomes obsolete -if %{pkgname}admin_savelinks then - for fullpath,link in pairs(%{pkgname}admin_savelinks) do - posix.symlink(link,fullpath) --- print("posttrans - restored run level "..fullpath.." to "..link) - end -end -if %{pkgname}admin_exists then - os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1') -end - - %files %defattr(-,root,root,-) %doc LICENSE @@ -171,8 +134,10 @@ end %{_mandir}/man8/* %changelog -* Thu Apr 28 2011 Rich Megginson - 1.1.16-2 -- disable the use of systemd for initscripts +* 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 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 5fe2312f29763c869b9fd1c38a36632636b60016 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 21 Jun 2011 15:39:33 -0600 Subject: [PATCH 04/16] skip rebranding current brand - support for skins skip rebranding current brand - support for skins (cherry picked from commit 4687d68e49201f81094deedd99792fd4dda5725d) --- .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 9179afa..ed494cd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,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 6031d8e..c00f699 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.17 +Version: 1.1.18 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -134,6 +134,10 @@ fi %{_mandir}/man8/* %changelog +* Tue Jun 21 2011 Rich Megginson - 1.1.18-1 +- skip rebranding current brand +- support for skins + * Fri May 13 2011 Rich Megginson - 1.1.17-1 - 1.1.17 - support "in-place" upgrade and rebranding from Red Hat to 389 diff --git a/sources b/sources index 921ca09..f69b53c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4d8db9be619f4dbfcaafe46fe6e10fb 389-admin-1.1.17.tar.bz2 +82ae2ada4f6c03d70f21e3254aad5cf3 389-admin-1.1.18.tar.bz2 From 1508a1a5b5d21b06c7d14b5360f3c3e754aa872b Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 28 Jun 2011 09:39:13 -0600 Subject: [PATCH 05/16] look for separate openldap ldif library look for separate openldap ldif library (cherry picked from commit 982560d4f80f15eeb87e87f5e82337d555e4d924) --- .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 ed494cd..24bf32f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,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 c00f699..134a39e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.18 +Version: 1.1.19 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -134,6 +134,9 @@ fi %{_mandir}/man8/* %changelog +* Tue Jun 28 2011 Rich Megginson - 1.1.19-1 +- look for separate openldap ldif library + * Tue Jun 21 2011 Rich Megginson - 1.1.18-1 - skip rebranding current brand - support for skins diff --git a/sources b/sources index f69b53c..56f967e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82ae2ada4f6c03d70f21e3254aad5cf3 389-admin-1.1.18.tar.bz2 +30a3add5cd160c7ce5ee25fdd8b02a15 389-admin-1.1.19.tar.bz2 From 4db85db041d2c4822fe51b06a02627577a10853f Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 30 Jun 2011 18:55:05 -0600 Subject: [PATCH 06/16] bump rev to rebuild with 389-adminutil-1.1.14 --- 389-admin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 134a39e..0b879f0 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -7,7 +7,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.19 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -134,6 +134,9 @@ fi %{_mandir}/man8/* %changelog +* Thu Jun 30 2011 Rich Megginson - 1.1.19-2 +- bump rev to rebuild with 389-adminutil-1.1.14 + * Tue Jun 28 2011 Rich Megginson - 1.1.19-1 - look for separate openldap ldif library From e3bb13b8beb0e409e299f32df5df85b79e6e1be7 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 5 Jul 2011 11:21:53 -0600 Subject: [PATCH 07/16] 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 --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 16 +++++++++++++--- sources | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 24bf32f..ba9abde 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,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 0b879f0..288c118 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,8 +6,8 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.19 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.1.20 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -60,7 +60,7 @@ and CGI utilities used by the console. %patch0 -p1 %build -%configure --disable-rpath --with-selinux --with-openldap +%configure --disable-rpath --with-selinux --with-openldap --enable-service # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -134,6 +134,16 @@ fi %{_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 + * Thu Jun 30 2011 Rich Megginson - 1.1.19-2 - bump rev to rebuild with 389-adminutil-1.1.14 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 a6f02793231edd575ebad1033050f6760352a347 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 5 Jul 2011 14:09:45 -0600 Subject: [PATCH 08/16] bump rel to rebuild with 389-adminutil-1.1.14 --- 389-admin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 288c118..bce357a 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -7,7 +7,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.20 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -134,6 +134,9 @@ fi %{_mandir}/man8/* %changelog +* Tue Jul 5 2011 Rich Megginson - 1.1.20-2 +- bump rel to rebuild with 389-adminutil-1.1.14 + * 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 From 1a45fa75ac0974d950d375e171fa3c0a5cb70c63 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 2 Aug 2011 14:58:10 -0600 Subject: [PATCH 09/16] 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 --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ba9abde..b6fc91b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,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 bce357a..e2ad5b5 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,8 +6,8 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.20 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.1.21 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -134,6 +134,9 @@ fi %{_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-2 - bump rel to rebuild with 389-adminutil-1.1.14 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 f90d6431d009a19f92d171ead4563592c7dca48f Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 11 Aug 2011 08:59:26 -0600 Subject: [PATCH 10/16] 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) --- .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 b6fc91b..aae0e45 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,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 e2ad5b5..ae2ce2c 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,11 @@ fi %{_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 7c57f8eb773858dfe2e44459b5fb34acb43c2eff Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 11 Aug 2011 14:43:24 -0600 Subject: [PATCH 11/16] Bug 730079 - Update SELinux policy during upgrades (cherry picked from commit a8b99a4fba9ea49b37bd6093176b1d8b2693ab9b) --- .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 aae0e45..b3d3fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,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 ae2ce2c..8d1d999 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,9 @@ fi %{_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 0fd93fe7cfb384144e0ce70de0cec4ad2ef0d045 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 28 Oct 2011 16:56:37 -0600 Subject: [PATCH 12/16] Bug 740959 - 389-console put CA certificates into wrong database --- .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 b3d3fd2..00c3ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,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 8d1d999..8ae340f 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,12 @@ fi %{_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 5ce766f85eafbf707ffab829a1640613d2b0e292 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 25 Jan 2012 08:40:41 -0700 Subject: [PATCH 13/16] Bug 767823 - selinux: need to allow admin server to connect to ldap port (cherry picked from commit f3dbe17140392f3dc0e902dbeca960e70986e114) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 00c3ea5..f7caa53 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /389-admin-1.1.23.tar.bz2 /389-admin-1.1.24.tar.bz2 /389-admin-1.1.25.tar.bz2 +/389-admin-1.1.26.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index de511dd..5079b6a 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.25 +VERSION=1.1.26 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 7ec4411..b8cbbab 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.25 +VERSION=1.1.26 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 8ae340f..e237539 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,9 @@ fi %{_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 5e943714e0f8c8fc0bdd34cea45f70b365e7f4f4 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 3 Feb 2012 19:38:20 -0700 Subject: [PATCH 14/16] 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) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 6 +++++- sources | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f7caa53..24c1444 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /389-admin-1.1.24.tar.bz2 /389-admin-1.1.25.tar.bz2 /389-admin-1.1.26.tar.bz2 +/389-admin-1.1.27.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 5079b6a..1254a5c 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.26 +VERSION=1.1.27 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index b8cbbab..77dacd0 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.26 +VERSION=1.1.27 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index e237539..2b48a9d 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,10 @@ fi %{_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 213f2e1add28c954ec3f304c67ec28971adb67b8 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 22 Mar 2012 09:51:22 -0600 Subject: [PATCH 15/16] htmladmin segfault - compilation warnings Ticket #307 - htmladmin keeps segfaulting Ticket #286 - compilation fixes for 'format-security' --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 6 +++++- sources | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24c1444..05ad112 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /389-admin-1.1.25.tar.bz2 /389-admin-1.1.26.tar.bz2 /389-admin-1.1.27.tar.bz2 +/389-admin-1.1.28.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 1254a5c..b7a8500 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.27 +VERSION=1.1.28 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 77dacd0..2c4c86a 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.27 +VERSION=1.1.28 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 2b48a9d..7e7783a 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,10 @@ fi %{_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 fcc6e05c619861e7db83f919a329adf344379f91 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 27 Mar 2012 08:22:59 -0600 Subject: [PATCH 16/16] If htmladmin fails to connect to the server, the cgi could crash. (cherry picked from commit 2076085457e0487f115fdbc2a2c7f100b5bab1af) (cherry picked from commit 5d453d2dae36c2929be0d94c6d72e8ec1f0598aa) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 05ad112..0304d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /389-admin-1.1.26.tar.bz2 /389-admin-1.1.27.tar.bz2 /389-admin-1.1.28.tar.bz2 +/389-admin-1.1.29.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index b7a8500..b474d73 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.28 +VERSION=1.1.29 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 2c4c86a..4b53603 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.28 +VERSION=1.1.29 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 7e7783a..87f9bd9 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -6,7 +6,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/ @@ -134,6 +134,9 @@ fi %{_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