|
|
|
|
@ -1,22 +1,17 @@
|
|
|
|
|
%global pkgname dirsrv
|
|
|
|
|
# for a pre-release, define the prerel field - comment out for official release
|
|
|
|
|
# % global prerel .rc2
|
|
|
|
|
# % 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
|
|
|
|
|
|
|
|
|
|
Summary: 389 Administration Server (admin)
|
|
|
|
|
Name: 389-admin
|
|
|
|
|
Version: 1.1.11
|
|
|
|
|
Version: 1.1.19
|
|
|
|
|
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
|
|
|
|
|
@ -30,12 +25,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 +48,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,7 +57,6 @@ and CGI utilities used by the console.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -n %{name}-%{version}%{?prerel}
|
|
|
|
|
%patch1
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%configure --disable-rpath --with-selinux
|
|
|
|
|
@ -83,17 +70,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 +86,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 +95,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
|
|
|
|
|
@ -161,46 +109,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 <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,-)
|
|
|
|
|
@ -208,7 +125,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,30 +133,86 @@ end
|
|
|
|
|
%{_mandir}/man8/*
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* 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
|
|
|
|
|
- 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 <rmeggins@redhat.com> - 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 <rmeggins@redhat.com> - 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
|
|
|
|
|
|
|
|
|
|
* Tue Nov 23 2010 Rich Megginson <rmeggins@redhat.com> - 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
|
|
|
|
|
|
|
|
|
|
* Fri Nov 12 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.1.12-1
|
|
|
|
|
- This is the final 1.1.12 release
|
|
|
|
|
- git tag 389-admin-1.1.12
|
|
|
|
|
- Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy
|
|
|
|
|
|
|
|
|
|
* Tue Oct 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-0.2.a2
|
|
|
|
|
- fix mozldap build breakage
|
|
|
|
|
|
|
|
|
|
* Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-0.1.a1
|
|
|
|
|
- This is the 1.1.12 alpha 1 release - with openldap support
|
|
|
|
|
|
|
|
|
|
* Thu Aug 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
|
|
|
|
|
- This is the final 1.1.11 release
|
|
|
|
|
|
|
|
|
|
* Wed Aug 4 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.7.rc2
|
|
|
|
|
* Wed Aug 4 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.6.rc2
|
|
|
|
|
- 1.1.11.rc2 release
|
|
|
|
|
- git tag 389-admin-1.1.11.rc2
|
|
|
|
|
- Bug 594745 - Get rid of dirsrv_lib_t label
|
|
|
|
|
|
|
|
|
|
* Wed Jun 9 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.6.rc1
|
|
|
|
|
* Wed Jun 9 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.5.rc1
|
|
|
|
|
- 1.1.11.rc1 release
|
|
|
|
|
|
|
|
|
|
* Wed May 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.5.a4
|
|
|
|
|
* Wed May 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.4.a4
|
|
|
|
|
- 1.1.11.a4 release
|
|
|
|
|
|
|
|
|
|
* Tue Apr 7 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.11-0.4.a3
|
|
|
|
|
* Tue Apr 7 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.11-0.3.a3
|
|
|
|
|
- 1.1.11.a3 release
|
|
|
|
|
- Bug 570912 - dirsrv-admin SELinux module fails to install
|
|
|
|
|
- Change parsing of start-slapd for instance name
|
|
|
|
|
- Bug 574233 - Updated requirements for selinux policy
|
|
|
|
|
- Moved selinux subpackage into base package
|
|
|
|
|
|
|
|
|
|
* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> - 1.1.11.a2-0.3
|
|
|
|
|
- rebuild for icu 4.4
|
|
|
|
|
|
|
|
|
|
* Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11.a2-0.2
|
|
|
|
|
- the 1.1.11.a2 release
|
|
|
|
|
- Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location
|
|
|
|
|
|
