From e1592f5cf7b623fe1980d84559c533a5890d899f Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Fri, 19 Oct 2012 16:23:23 -0400 Subject: [PATCH 1/4] Ticket 432 - Introduce new systemd-rpm macros in 389-admin spec file Description: Added the new systemd macros where possible, but had to manually add the preset command in %post https://fedorahosted.org/389/ticket/432 Reviewed by: richm(Thanks!) --- 389-admin.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index e27d85e..18152d9 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -85,7 +85,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la - %clean rm -rf $RPM_BUILD_ROOT @@ -97,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT %post -p -- do the usual daemon post setup stuff -os.execute('/bin/systemctl enable %{pkgname}-admin.service >/dev/null 2>&1 || :') +os.execute('/bin/systemctl preset %{pkgname}-admin.service >/dev/null 2>&1 || :') os.execute('/sbin/ldconfig') -- restore permissions if upgrading if %{pkgname}admin_adminserv then @@ -110,11 +109,7 @@ if %{pkgname}admin_consoleconf then end %preun -if [ $1 -eq 0 ]; then - # Package removal, not upgrade - /bin/systemctl stop %{pkgname}-admin.service > /dev/null 2>&1 || : - /bin/systemctl --no-reload disable %{pkgname}-admin.service >/dev/null 2>&1 || : -fi +%systemd_preun %{pkgname}-admin.service %postun /sbin/ldconfig From b134a61203f5bcd67564260ccd1767b2a6bb5c7a Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Wed, 16 Jan 2013 15:44:21 -0800 Subject: [PATCH 2/4] bump version to 1.1.30 - Ticket #476 - 389 ds do not start on F18 due to missing modules - Ticket #293 - remove-ds-admin.pl does not remove everything - Ticket 400 - BIND operation result not checked properly in admin server - Ticket 401 - Console login fails with anonymous access disabled (cherry picked from commit 3840499fece8ab58b854867d4c6742b47c0e1d5c) --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 9 ++++++++- sources | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 971354c..84ff418 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /389-admin-1.1.28.tar.bz2 /389-admin-1.1.29.tar.bz2 /389-admin-1.1.30.tar.bz2 +/389-admin-1.1.31.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 36ab481..547d900 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.30 +VERSION=1.1.31 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index a75fa99..a2ddfd3 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.30 +VERSION=1.1.31 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 18152d9..48bb893 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.30 +Version: 1.1.31 Release: %{?relprefix}1%{?prerel}%{?dist}.1 License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -128,6 +128,13 @@ end %{_mandir}/man8/* %changelog +* Wed Jan 16 2013 Noriko Hosoi - 1.1.31-1 +- bump version to 1.1.30 +- Ticket #476 - 389 ds do not start on F18 due to missing modules +- Ticket #293 - remove-ds-admin.pl does not remove everything +- Ticket 400 - BIND operation result not checked properly in admin server +- Ticket 401 - Console login fails with anonymous access disabled + * Wed Jul 18 2012 Fedora Release Engineering - 1.1.30-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 71a0885..b277014 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a163a73d9eb96062b27e5d94e36e80f 389-admin-1.1.30.tar.bz2 +3abcdb7d588f6a22b613602c21d1d973 389-admin-1.1.31.tar.bz2 From 064570070a519d343f103b202febb348531099b0 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Wed, 16 Jan 2013 16:04:30 -0800 Subject: [PATCH 3/4] Fixed the version number in changelog: wrong: 1.1.30 --> correct: 1.1.31 (cherry picked from commit 371ba7d35f9e4747ed1f1ae4159daa8ff466d1ff) --- 389-admin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 48bb893..2eb822e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -129,7 +129,7 @@ end %changelog * Wed Jan 16 2013 Noriko Hosoi - 1.1.31-1 -- bump version to 1.1.30 +- bump version to 1.1.31 - Ticket #476 - 389 ds do not start on F18 due to missing modules - Ticket #293 - remove-ds-admin.pl does not remove everything - Ticket 400 - BIND operation result not checked properly in admin server From 08cc1363b7e3408cb9e1568e3bee50dd23b74926 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 20 Aug 2013 13:24:47 -0600 Subject: [PATCH 4/4] 0417dc7 add Eclipse and patch files - f2004ea compiler warning - ldif_read_record lineno type depends on openldap version - Ticket #47413 389-admin fails to build with latest httpd - 2a67826 add more debugging for SSL connection problems - Ticket #47465 problem with 389-adminutil detection in m4/adminutil.m4 in 389-admin and 389-dsgw - Ticket #47486 compiler warnings in adminutil, admin, dsgw - 14b1bf9 ignore files generated by Eclipse - Ticket 47467 - Improve CRL import error messages - Ticket 362 - Directory Console generates insufficient key strength - Ticket 47466 - Importing CA cert with existing name crashes security CGI - Ticket 47468 - Change security password validation error is out of order - Ticket #47334 - Avoid quoting all settings in console.conf - Ticket #47333 - Relabel lockfile when starting Admin Server - Ticket #47298 - remove-ds-admin.pl does not stop the admin server - Ticket #567 - Restart of Admin server from console fails on segfault --- .gitignore | 1 + 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 21 +++++++++++++++++++-- sources | 2 +- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 84ff418..a82741d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /389-admin-1.1.29.tar.bz2 /389-admin-1.1.30.tar.bz2 /389-admin-1.1.31.tar.bz2 +/389-admin-1.1.35.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 547d900..0c67d30 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.31 +VERSION=1.1.35 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index a2ddfd3..0b5093e 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.31 +VERSION=1.1.35 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 2eb822e..3f3349d 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -9,8 +9,8 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.31 -Release: %{?relprefix}1%{?prerel}%{?dist}.1 +Version: 1.1.35 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -128,6 +128,23 @@ end %{_mandir}/man8/* %changelog +* Tue Aug 20 2013 Rich Megginson - 1.1.35-1 +- 0417dc7 add Eclipse and patch files +- f2004ea compiler warning - ldif_read_record lineno type depends on openldap version +- Ticket #47413 389-admin fails to build with latest httpd +- 2a67826 add more debugging for SSL connection problems +- Ticket #47465 problem with 389-adminutil detection in m4/adminutil.m4 in 389-admin and 389-dsgw +- Ticket #47486 compiler warnings in adminutil, admin, dsgw +- 14b1bf9 ignore files generated by Eclipse +- Ticket 47467 - Improve CRL import error messages +- Ticket 362 - Directory Console generates insufficient key strength +- Ticket 47466 - Importing CA cert with existing name crashes security CGI +- Ticket 47468 - Change security password validation error is out of order +- Ticket #47334 - Avoid quoting all settings in console.conf +- Ticket #47333 - Relabel lockfile when starting Admin Server +- Ticket #47298 - remove-ds-admin.pl does not stop the admin server +- Ticket #567 - Restart of Admin server from console fails on segfault + * Wed Jan 16 2013 Noriko Hosoi - 1.1.31-1 - bump version to 1.1.31 - Ticket #476 - 389 ds do not start on F18 due to missing modules diff --git a/sources b/sources index b277014..8d5af0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3abcdb7d588f6a22b613602c21d1d973 389-admin-1.1.31.tar.bz2 +e35a453e92648b1ca980bb0abe1904e4 389-admin-1.1.35.tar.bz2