diff --git a/.gitignore b/.gitignore index 1a46d94..00c3ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,14 @@ *~ /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 +/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 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index f6f6b45..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.13 +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 f6866f5..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.13 +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 32b5d0e..0d9abce 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,21 +1,17 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -# % global prerel .a2 +# % global prerel .a1 # also need the relprefix 0. field for a pre-release - also comment out for official release # % global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.13 +Version: 1.1.25 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,7 +47,6 @@ Requires(preun): /sbin/service Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 # 389-admin-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh -Patch1: f11-httpd.patch %description 389 Administration Server is an HTTP agent that provides management features @@ -61,10 +56,9 @@ and CGI utilities used by the console. %prep %setup -q -n %{name}-%{version}%{?prerel} -%patch1 %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 @@ -100,25 +94,6 @@ rm -rf $RPM_BUILD_ROOT -- if these don't exist, the vars will be nil %{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv') %{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf') --- save the run level configuration, if any -rc = os.execute('rpm --quiet -q fedora-ds-admin') -if rc == 0 then - %{pkgname}admin_exists = true - %{pkgname}admin_savelinks = {} - for dir in posix.files("%{_sysconfdir}/rc.d") do - if string.find(dir, "rc%d.d") then --- print("looking in %{_sysconfdir}/rc.d/"..dir) - for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do - if string.find(link, "[SK]%d%d%{pkgname}-admin") then - fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link - linked = posix.readlink(fullname) --- print(fullname.." is linked to "..linked) - %{pkgname}_savelinks[fullname] = linked - end - end - end - end -end %post -p -- do the usual daemon post setup stuff @@ -143,20 +118,6 @@ fi %postun /sbin/ldconfig -%posttrans -p --- if we saved the run level configuration in %pre, restore it now --- we can get rid of this code once Fedora 11 becomes obsolete -if %{pkgname}admin_savelinks then - for fullpath,link in pairs(%{pkgname}admin_savelinks) do - posix.symlink(link,fullpath) --- print("posttrans - restored run level "..fullpath.." to "..link) - end -end -if %{pkgname}admin_exists then - os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1') -end - - %files %defattr(-,root,root,-) %doc LICENSE @@ -171,15 +132,97 @@ 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 + +* 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 + +* Tue Jul 5 2011 Rich Megginson - 1.1.20-3 +- bump rel to rebuild with 389-adminutil-1.1.14 + +* 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 +- 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 + +* 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 + +* 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 +- 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 +- 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) +required +- Bug 638511 - dirsrv-admin crashes at startup with SELinux enabled + +* Mon Nov 29 2010 Rich Megginson - 1.1.13-2 +- fix Conflicts for selinux policy + * Tue Nov 23 2010 Rich Megginson - 1.1.13-1 - This is the final 1.1.13 release - git tag 389-admin-1.1.13 - Bug 656441 - Missing library path entry causes LD_PRELOAD error - setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error -* Wed Nov 17 2010 Nathan Kinder - 1.1.1.12-2 +* Thu Nov 18 2010 Nathan Kinder - 1.1.12-2 - This is the final 1.1.12 release - git tag 389-admin-1.1.12 +- Corrected conflict version for selinux-policy * Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 - This is the final 1.1.12 release 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 6f775fd..b9c0091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0dd329ee4a20a86425e14e3f894e46ae 389-admin-1.1.13.tar.bz2 +468727aa2699427814fb0ba2b0a72dad 389-admin-1.1.25.tar.bz2