If htmladmin fails to connect to the server, the cgi could crash.

(cherry picked from commit 2076085457)
(cherry picked from commit 5d453d2dae)

.gitignore

@@ -3,3 +3,16 @@
 /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
+/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
+/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
+/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

389-admin-git-local.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.16
+VERSION=1.1.29
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}

389-admin-git.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.15
+VERSION=1.1.29
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION

389-admin.spec

@@ -6,16 +6,12 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.16
+Version:          1.1.29
 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
@@ -51,6 +47,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,9 +57,10 @@ and CGI utilities used by the console.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerel}
+%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
@@ -98,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 <lua>
 -- do the usual daemon post setup stuff
@@ -141,20 +120,6 @@ fi
 %postun
 /sbin/ldconfig
 
-%posttrans -p <lua>
--- if we saved the run level configuration in %pre, restore it now
--- we can get rid of this code once Fedora 11 becomes obsolete
-if %{pkgname}admin_savelinks then
-    for fullpath,link in pairs(%{pkgname}admin_savelinks) do
-        posix.symlink(link,fullpath)
---        print("posttrans - restored run level "..fullpath.." to "..link)
-    end
-end
-if %{pkgname}admin_exists then
-    os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1')
-end
-
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
@@ -169,6 +134,65 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Tue Mar 27 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.29-1
+- 4ec23c0 If htmladmin fails to connect to the server, the cgi could crash.
+
+* Thu Mar 22 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.28-1
+- Ticket #307 - htmladmin keeps segfaulting
+- Ticket #286 - compilation fixes for 'format-security'
+
+* Fri Feb  3 2012 Rich Megginson <rmeggins@redhat.com> - 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 <rmeggins@redhat.com> - 1.1.26-1
+- Bug 767823 - selinux: need to allow admin server to connect to ldap port
+
+* Fri Oct 28 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.25-1
+- Bug 740959 - 389-console put CA certificates into wrong database
+
+* Wed Sep 21 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.24-1
+- Bug 695741 - Providing native systemd file
+
+* Thu Aug 11 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.23-1
+- Bug 730079 - Update SELinux policy during upgrades
+
+* Thu Aug 11 2011 Rich Megginson <rmeggins@redhat.com> - 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 <rmeggins@redhat.com> - 1.1.21-1
+- Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user
+
+* Tue Jul  5 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.20-2
+- bump rel to rebuild with 389-adminutil-1.1.14
+
+* Tue Jul  5 2011 Rich Megginson <rmeggins@redhat.com> - 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 <rmeggins@redhat.com> - 1.1.19-2
+- bump rev to rebuild with 389-adminutil-1.1.14
+
+* Tue Jun 28 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.19-1
+- look for separate openldap ldif library
+
+* Tue Jun 21 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.18-1
+- skip rebranding current brand
+- support for skins
+
+* Fri May 13 2011 Rich Megginson <rmeggins@redhat.com> - 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 <rmeggins@redhat.com> - 1.1.16-1
 - 389-admin-1.1.16
 - Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user

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

sources

@@ -1 +1 @@
-6122af6b9d21829ab939ab286676aedf  389-admin-1.1.16.tar.bz2
+4bda83e9f5644e0bd25fdf7b6ce9e5ee  389-admin-1.1.29.tar.bz2