From 68f55d1ba9e4854cfaf4da963bd41db03f94db6b Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Jun 02 2011 15:56:47 +0000 Subject: Merge branch 'f14' into el6 Conflicts: .gitignore 389-admin-git-local.sh 389-admin-git.sh 389-admin.spec sources --- diff --git a/.gitignore b/.gitignore index 70e26a2..9179afa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ *~ -389-admin-1.1.12.a2.tar.bz2 +/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 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 0d8a4cb..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.12.a2 +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 91fbfe5..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.12.a2 +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 0d8197a..2a37b7e 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,27 +1,21 @@ %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. - -%global selinux_variants mls targeted +# % global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.12 -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 BuildRequires: nspr-devel BuildRequires: nss-devel -BuildRequires: svrcore-devel -BuildRequires: mozldap-devel +BuildRequires: openldap-devel BuildRequires: cyrus-sasl-devel BuildRequires: icu BuildRequires: libicu-devel @@ -30,12 +24,6 @@ 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 @@ -59,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 @@ -69,10 +56,9 @@ and CGI utilities used by the console. %prep %setup -q -n %{name}-%{version}%{?prerel} -%patch1 %build -%configure --disable-rpath --with-selinux +%configure --disable-rpath --with-selinux --with-openldap # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -83,17 +69,6 @@ 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 @@ -110,15 +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 -# 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 @@ -128,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 @@ -161,46 +108,15 @@ 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 /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 --- 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,-) @@ -208,7 +124,6 @@ end %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}/* @@ -217,6 +132,62 @@ 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 +- 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 + +* 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 +- git tag 389-admin-1.1.12 + +* Fri Nov 12 2010 Nathan Kinder - 1.1.1.12-1 +- Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy + * Tue Oct 26 2010 Rich Megginson - 1.1.12-0.2.a2 - fix mozldap build breakage 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 f2480dd..921ca09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a471527e3b6920e9eb42f8b445c4c235 389-admin-1.1.12.a2.tar.bz2 +f4d8db9be619f4dbfcaafe46fe6e10fb 389-admin-1.1.17.tar.bz2