rpms/ipa
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream 3.2.0 Prerelease 1

Browse Source 
Spec file was also merged with up-to-date upstream reference spec
file to keep them consistent.
This commit is contained in:
Martin Kosek 2013-04-02 18:47:49 +02:00
parent c7811c4ad8
commit 45d13fba45
3 changed files with 174 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/freeipa-3.0.0.tar.gz /freeipa-3.0.0.tar.gz
/freeipa-3.1.0.tar.gz /freeipa-3.1.0.tar.gz
/freeipa-3.1.2.tar.gz /freeipa-3.1.2.tar.gz
/freeipa-3.2.0.pre1.tar.gz

253
freeipa.spec
View File

@ -1,21 +1,14 @@
# Define ONLY_CLIENT to only make the ipa-client and ipa-python subpackages # Define ONLY_CLIENT to only make the ipa-client and ipa-python subpackages
%{!?ONLY_CLIENT:%global ONLY_CLIENT 0} %{!?ONLY_CLIENT:%global ONLY_CLIENT 0}
%global httpd_conf /etc/httpd/conf.d
%global plugin_dir %{_libdir}/dirsrv/plugins %global plugin_dir %{_libdir}/dirsrv/plugins
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
%global POLICYCOREUTILSVER 2.1.12-5 %global POLICYCOREUTILSVER 2.1.12-5
%global gettext_domain ipa %global gettext_domain ipa
%global VERSION 3.1.2 %global VERSION 3.2.0.pre1
Name: freeipa Name: freeipa
Version: 3.1.2 Version: 3.2.0
Release: 4%{?dist} Release: 0.1.pre1%{?dist}
Summary: The Identity, Policy and Audit system Summary: The Identity, Policy and Audit system
Group: System Environment/Base Group: System Environment/Base
@ -30,21 +23,30 @@ BuildRequires: svrcore-devel
BuildRequires: /usr/share/selinux/devel/Makefile BuildRequires: /usr/share/selinux/devel/Makefile
BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER} BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
BuildRequires: systemd-units BuildRequires: systemd-units
BuildRequires: samba-devel >= 4.0.0-153 %if 0%{?fedora} >= 18
BuildRequires: samba-devel >= 4.0.0-150
BuildRequires: samba-python BuildRequires: samba-python
BuildRequires: libwbclient-devel BuildRequires: libwbclient-devel
%else
BuildRequires: samba4-devel >= 4.0.0-139
BuildRequires: samba4-python
%endif
BuildRequires: libtalloc-devel BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel BuildRequires: libtevent-devel
%endif %endif # ! %{ONLY_CLIENT}
BuildRequires: nspr-devel BuildRequires: nspr-devel
BuildRequires: nss-devel BuildRequires: nss-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
%if 0%{?fedora} >= 19
BuildRequires: krb5-devel >= 1.11
%else
BuildRequires: krb5-devel >= 1.10 BuildRequires: krb5-devel >= 1.10
%endif
BuildRequires: krb5-workstation BuildRequires: krb5-workstation
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel >= 7.21.7-2
BuildRequires: xmlrpc-c-devel BuildRequires: xmlrpc-c-devel >= 1.27.4
BuildRequires: popt-devel BuildRequires: popt-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -69,8 +71,9 @@ BuildRequires: python-lxml
BuildRequires: python-pyasn1 >= 0.0.9a BuildRequires: python-pyasn1 >= 0.0.9a
BuildRequires: python-dns BuildRequires: python-dns
BuildRequires: m2crypto BuildRequires: m2crypto
BuildRequires: check >= 0.9.5 BuildRequires: check
BuildRequires: libsss_idmap-devel BuildRequires: libsss_idmap-devel
BuildRequires: java-1.7.0-openjdk
%description %description
IPA is an integrated solution to provide centrally managed Identity (machine, IPA is an integrated solution to provide centrally managed Identity (machine,
@ -86,18 +89,31 @@ Requires: %{name}-python = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release} Requires: %{name}-client = %{version}-%{release}
Requires: %{name}-admintools = %{version}-%{release} Requires: %{name}-admintools = %{version}-%{release}
Requires: %{name}-server-selinux = %{version}-%{release} Requires: %{name}-server-selinux = %{version}-%{release}
Requires: 389-ds-base >= 1.3.0 Requires: 389-ds-base >= 1.3.0.5
Requires: openldap-clients Requires: openldap-clients
Requires: nss Requires: nss
Requires: nss-tools Requires: nss-tools
%if 0%{?fedora} >= 19
Requires: krb5-server >= 1.11 Requires: krb5-server >= 1.11
Requires: krb5-server < 1.12 %else
%if 0%{?fedora} == 18
# krb5 1.11 bumped DAL interface major version, a rebuild is needed
Requires: krb5-server < 1.11
Requires: krb5-server >= 1.10
%else
Requires: krb5-server >= 1.10
%endif
%endif
Requires: krb5-pkinit-openssl Requires: krb5-pkinit-openssl
Requires: cyrus-sasl-gssapi%{?_isa} Requires: cyrus-sasl-gssapi%{?_isa}
Requires: ntp Requires: ntp
Requires: httpd Requires: httpd
Requires: mod_wsgi Requires: mod_wsgi
%if 0%{?fedora} >= 18
Requires: mod_auth_kerb >= 5.4-16 Requires: mod_auth_kerb >= 5.4-16
%else
Requires: mod_auth_kerb >= 5.4-8
%endif
Requires: mod_nss Requires: mod_nss
Requires: python-ldap Requires: python-ldap
Requires: python-krbV Requires: python-krbV
@ -105,13 +121,13 @@ Requires: acl
Requires: python-pyasn1 Requires: python-pyasn1
Requires: memcached Requires: memcached
Requires: python-memcached Requires: python-memcached
Requires: systemd-units >= 36-3 Requires: systemd-units >= 38
Requires(pre): systemd-units Requires(pre): systemd-units
Requires(post): systemd-units Requires(post): systemd-units
Requires: selinux-policy >= 3.11.1-61 Requires: selinux-policy >= 3.11.1-86
Requires(post): selinux-policy-base Requires(post): selinux-policy-base
Requires: slapi-nis >= 0.44 Requires: slapi-nis >= 0.44
Requires: pki-ca >= 10.0.0-1 Requires: pki-ca >= 10.0.0-0.54.b3
Requires: dogtag-pki-server-theme Requires: dogtag-pki-server-theme
%if 0%{?rhel} %if 0%{?rhel}
Requires: subscription-manager Requires: subscription-manager
@ -123,12 +139,18 @@ Requires: keyutils
Requires: zip Requires: zip
Requires: policycoreutils >= %{POLICYCOREUTILSVER} Requires: policycoreutils >= %{POLICYCOREUTILSVER}
Requires: tar Requires: tar
Requires(pre): certmonger >= 0.65
Requires(pre): 389-ds-base >= 1.3.0.5
# We have a soft-requires on bind. It is an optional part of # We have a soft-requires on bind. It is an optional part of
# IPA but if it is configured we need a way to require versions # IPA but if it is configured we need a way to require versions
# that work for us. # that work for us.
%if 0%{?fedora} >= 18
Conflicts: bind-dyndb-ldap < 2.3-2 Conflicts: bind-dyndb-ldap < 2.3-2
Conflicts: bind < 9.9.1-10.P3 %else
Conflicts: bind-dyndb-ldap < 1.1.0-0.12.rc1
%endif
Conflicts: bind < 9.8.2-0.4.rc2
# mod_proxy provides a single API to communicate over SSL. If mod_ssl # mod_proxy provides a single API to communicate over SSL. If mod_ssl
# is even loaded into Apache then it grabs this interface. # is even loaded into Apache then it grabs this interface.
@ -166,12 +188,18 @@ Summary: Virtual package to install packages required for Active Directory trust
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}-server = %version-%release Requires: %{name}-server = %version-%release
Requires: m2crypto Requires: m2crypto
%if 0%{?fedora} >= 18
Requires: samba-python Requires: samba-python
Requires: samba >= 4.0.0-153 Requires: samba
Requires: samba-winbind Requires: samba-winbind
%else
Requires: samba4-python
Requires: samba4
Requires: samba4-winbind
%endif
Requires: libsss_idmap Requires: libsss_idmap
# We use alternatives to divert winbind_krb5_locator.so plugin to libkrb5 # We use alternatives to divert winbind_krb5_locator.so plugin to libkrb5
# on the installs where server-trust-ad subpackage is installed because # on the installes where server-trust-ad subpackage is installed because
# IPA AD trusts cannot be used at the same time with the locator plugin # IPA AD trusts cannot be used at the same time with the locator plugin
# since Winbindd will be configured in a different mode # since Winbindd will be configured in a different mode
Requires(post): %{_sbindir}/update-alternatives Requires(post): %{_sbindir}/update-alternatives
@ -183,26 +211,28 @@ Requires(preun): %{_sbindir}/update-alternatives
Cross-realm trusts with Active Directory in IPA require working Samba 4 installation. Cross-realm trusts with Active Directory in IPA require working Samba 4 installation.
This package is provided for convenience to install all required dependencies at once. This package is provided for convenience to install all required dependencies at once.
%package server-strict # Fedora spec file only: START. Uncomment when Fedora 20 branches
Summary: Strict package dependencies # %package server-strict
Group: System Environment/Base # Summary: Strict package dependencies
Requires(post): %{name}-server = %{version}-%{release} # Group: System Environment/Base
Requires(postun): %{name}-server = %{version}-%{release} # Requires(post): %{name}-server = %{version}-%{release}
# Requires(postun): %{name}-server = %{version}-%{release}
#
# # Specific requires
# Requires(pre): 389-ds-base = 1.3.0.5
# Requires: krb5-server = 1.11.1
# Requires: pki-ca = 10.0.1
#
# %description server-strict
# IPA is an integrated solution to provide centrally managed Identity (machine,
# user, virtual machines, groups, authentication credentials), Policy
# (configuration settings, access control information) and Audit (events,
# logs, analysis thereof). This meta package adds strict version dependencies
# to known working versions. To upgrade to a non-approved version uninstall
# this package.
# Fedora spec file only: END
# Specific requires %endif # ! %{ONLY_CLIENT}
Requires(pre): 389-ds-base = 1.3.0.5
Requires: krb5-server = 1.11.1
Requires: pki-ca = 10.0.1
%description server-strict
IPA is an integrated solution to provide centrally managed Identity (machine,
user, virtual machines, groups, authentication credentials), Policy
(configuration settings, access control information) and Audit (events,
logs, analysis thereof). This meta package adds strict version dependencies
to known working versions. To upgrade to a non-approved version uninstall
this package.
%endif
%package client %package client
@ -216,10 +246,10 @@ Requires: krb5-workstation
Requires: authconfig Requires: authconfig
Requires: pam_krb5 Requires: pam_krb5
Requires: wget Requires: wget
Requires: libcurl Requires: libcurl >= 7.21.7-2
Requires: xmlrpc-c Requires: xmlrpc-c >= 1.27.4
Requires: sssd >= 1.9.2 Requires: sssd >= 1.8.0
Requires: certmonger >= 0.60 Requires: certmonger >= 0.65
Requires: nss-tools Requires: nss-tools
Requires: bind-utils Requires: bind-utils
Requires: oddjob-mkhomedir Requires: oddjob-mkhomedir
@ -258,7 +288,7 @@ user, virtual machines, groups, authentication credentials), Policy
(configuration settings, access control information) and Audit (events, (configuration settings, access control information) and Audit (events,
logs, analysis thereof). This package provides command-line tools for logs, analysis thereof). This package provides command-line tools for
IPA administrators. IPA administrators.
%endif %endif # ! %{ONLY_CLIENT}
%package python %package python
Summary: Python libraries used by IPA Summary: Python libraries used by IPA
@ -281,8 +311,8 @@ user, virtual machines, groups, authentication credentials), Policy
logs, analysis thereof). If you are using IPA you need to install this logs, analysis thereof). If you are using IPA you need to install this
package. package.
%prep %prep
# Fedora spec file only: START
# Update timestamps on the files touched by a patch, to avoid non-equal # Update timestamps on the files touched by a patch, to avoid non-equal
# .pyc/.pyo files across the multilib peers within a build, where "Level" # .pyc/.pyo files across the multilib peers within a build, where "Level"
# is the patch prefix option (e.g. -p1) # is the patch prefix option (e.g. -p1)
@ -304,11 +334,18 @@ for p in %patches ; do
%__patch -p1 -i $p %__patch -p1 -i $p
UpdateTimestamps -p1 $p UpdateTimestamps -p1 $p
done done
# Fedora spec file only: END
%build %build
export CFLAGS="$CFLAGS %{optflags}" export CFLAGS="$CFLAGS %{optflags}"
export CPPFLAGS="$CPPFLAGS %{optflags}" export CPPFLAGS="$CPPFLAGS %{optflags}"
%if 0%{?fedora} >= 18
# use fedora18 platform which is based on fedora16 platform with systemd
# support + fedora18 changes
export SUPPORTED_PLATFORM=fedora18 export SUPPORTED_PLATFORM=fedora18
%else
export SUPPORTED_PLATFORM=fedora16
%endif
# Force re-generate of platform support # Force re-generate of platform support
rm -f ipapython/services.py rm -f ipapython/services.py
make version-update make version-update
@ -316,7 +353,7 @@ cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --loca
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap; cd .. cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap; cd ..
cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%endif %endif # ! %{ONLY_CLIENT}
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} all make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} all
@ -325,21 +362,27 @@ cd selinux
make all make all
%else %else
make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client
%endif %endif # ! %{ONLY_CLIENT}
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
%if ! %{ONLY_CLIENT} %if 0%{?fedora} >= 18
# use fedora18 platform which is based on fedora16 platform with systemd
# support + fedora18 changes
export SUPPORTED_PLATFORM=fedora18 export SUPPORTED_PLATFORM=fedora18
%else
export SUPPORTED_PLATFORM=fedora16
%endif
# Force re-generate of platform support # Force re-generate of platform support
rm -f ipapython/services.py rm -f ipapython/services.py
%if ! %{ONLY_CLIENT}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
cd selinux cd selinux
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
cd .. cd ..
%else %else
make client-install DESTDIR=%{buildroot} make client-install DESTDIR=%{buildroot}
%endif %endif # ! %{ONLY_CLIENT}
%find_lang %{gettext_domain} %find_lang %{gettext_domain}
@ -354,6 +397,7 @@ rm %{buildroot}/%{plugin_dir}/libipa_uuid.la
rm %{buildroot}/%{plugin_dir}/libipa_modrdn.la rm %{buildroot}/%{plugin_dir}/libipa_modrdn.la
rm %{buildroot}/%{plugin_dir}/libipa_lockout.la rm %{buildroot}/%{plugin_dir}/libipa_lockout.la
rm %{buildroot}/%{plugin_dir}/libipa_cldap.la rm %{buildroot}/%{plugin_dir}/libipa_cldap.la
rm %{buildroot}/%{plugin_dir}/libipa_dns.la
rm %{buildroot}/%{plugin_dir}/libipa_sidgen.la rm %{buildroot}/%{plugin_dir}/libipa_sidgen.la
rm %{buildroot}/%{plugin_dir}/libipa_sidgen_task.la rm %{buildroot}/%{plugin_dir}/libipa_sidgen_task.la
rm %{buildroot}/%{plugin_dir}/libipa_extdom_extop.la rm %{buildroot}/%{plugin_dir}/libipa_extdom_extop.la
@ -395,17 +439,15 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
/bin/touch %{buildroot}%{_usr}/share/ipa/html/preferences.html /bin/touch %{buildroot}%{_usr}/share/ipa/html/preferences.html
mkdir -p %{buildroot}%{_initrddir}
# Default to systemd initscripts for F16 and above
mkdir -p %{buildroot}%{_unitdir}
install -m 644 init/systemd/ipa.service %{buildroot}%{_unitdir}/ipa.service
mkdir -p %{buildroot}%{_libexecdir}
install -m 644 init/systemd/ipa_memcached.service %{buildroot}%{_unitdir}/ipa_memcached.service
install -m 755 init/systemd/freeipa-systemd-upgrade %{buildroot}%{_libexecdir}/freeipa-systemd-upgrade
mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_initrddir}
mkdir %{buildroot}%{_sysconfdir}/sysconfig/ mkdir %{buildroot}%{_sysconfdir}/sysconfig/
install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached
# NOTE: systemd specific section
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/
install -m 0644 init/systemd/ipa.conf.tmpfiles %{buildroot}%{_sysconfdir}/tmpfiles.d/ipa.conf
# END
mkdir -p %{buildroot}%{_localstatedir}/run/ mkdir -p %{buildroot}%{_localstatedir}/run/
install -d -m 0700 %{buildroot}%{_localstatedir}/run/ipa_memcached/ install -d -m 0700 %{buildroot}%{_localstatedir}/run/ipa_memcached/
install -d -m 0700 %{buildroot}%{_localstatedir}/run/ipa/ install -d -m 0700 %{buildroot}%{_localstatedir}/run/ipa/
@ -413,9 +455,17 @@ install -d -m 0700 %{buildroot}%{_localstatedir}/run/ipa/
mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/ # NOTE: systemd specific section
install -m 0644 init/systemd/ipa.conf.tmpfiles %{buildroot}%{_sysconfdir}/tmpfiles.d/ipa.conf mkdir -p %{buildroot}%{_unitdir}
%endif install -m 644 init/systemd/ipa.service %{buildroot}%{_unitdir}/ipa.service
install -m 644 init/systemd/ipa_memcached.service %{buildroot}%{_unitdir}/ipa_memcached.service
# END
# Fedora spec file only: START
mkdir -p %{buildroot}%{_libexecdir}
install -m 755 init/systemd/freeipa-systemd-upgrade %{buildroot}%{_libexecdir}/freeipa-systemd-upgrade
# Fedora spec file only: END
%endif # ! %{ONLY_CLIENT}
mkdir -p %{buildroot}%{_sysconfdir}/ipa/ mkdir -p %{buildroot}%{_sysconfdir}/ipa/
/bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
@ -427,47 +477,62 @@ mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
install -pm 644 contrib/completion/ipa.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/ipa install -pm 644 contrib/completion/ipa.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/ipa
mkdir -p %{buildroot}%{_sysconfdir}/cron.d mkdir -p %{buildroot}%{_sysconfdir}/cron.d
install -pm 644 ipa-compliance.cron %{buildroot}%{_sysconfdir}/cron.d/ipa-compliance install -pm 644 ipa-compliance.cron %{buildroot}%{_sysconfdir}/cron.d/ipa-compliance
%endif
(cd %{buildroot}/%{python_sitelib}/ipaserver && find . -type f | \ (cd %{buildroot}/%{python_sitelib}/ipaserver && find . -type f | \
grep -v dcerpc | grep -v adtrustinstance | \ grep -v dcerpc | grep -v adtrustinstance | \
sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\.py.*$,.*,g' | sort -u | \
sed -e 's,\./,%%{python_sitelib}/ipaserver/,g' ) >server-python.list sed -e 's,\./,%%{python_sitelib}/ipaserver/,g' ) >server-python.list
%endif # ! %{ONLY_CLIENT}
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
%post server %post server
# Use systemd scheme, update systemd as service units have changed # NOTE: systemd specific section
/bin/systemctl --system daemon-reload 2>&1 || : /bin/systemctl --system daemon-reload 2>&1 || :
# END
if [ $1 -gt 1 ] ; then if [ $1 -gt 1 ] ; then
# Fedora spec file only: START
# When upgrade is performed from SysV to systemd, ipa.service will be inactive # When upgrade is performed from SysV to systemd, ipa.service will be inactive
# due to https://bugzilla.redhat.com/show_bug.cgi?id=752846 # due to https://bugzilla.redhat.com/show_bug.cgi?id=752846
# FreeIPA existing setup cannot be used without upgrade script # FreeIPA existing setup cannot be used without upgrade script
# Note also it is now safe to run this script against working FreeIPA install # Note also it is now safe to run this script against working FreeIPA install
# after it has been migrated to systemd setup # after it has been migrated to systemd setup
/usr/libexec/freeipa-systemd-upgrade || : /usr/libexec/freeipa-systemd-upgrade || :
# Fedora spec file only: END
/bin/systemctl condrestart certmonger.service 2>&1 || :
/usr/sbin/ipa-upgradeconfig --quiet >/dev/null || : /usr/sbin/ipa-upgradeconfig --quiet >/dev/null || :
fi fi
%posttrans server %posttrans server
# This must be run in posttrans so that updates from previous # This must be run in posttrans so that updates from previous
# execution that may no longer be shipped are not applied. # execution that may no longer be shipped are not applied.
/usr/sbin/ipa-ldap-updater --upgrade >/dev/null || : /usr/sbin/ipa-ldap-updater --upgrade --quiet >/dev/null || :
%preun server %preun server
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
# Use systemd scheme # NOTE: systemd specific section
/bin/systemctl --quiet stop ipa.service || : /bin/systemctl --quiet stop ipa.service || :
/bin/systemctl --quiet disable ipa.service || : /bin/systemctl --quiet disable ipa.service || :
# END
fi fi
%postun server %postun server
if [ "$1" -ge "1" ]; then if [ "$1" -ge "1" ]; then
# Use systemd scheme # NOTE: systemd specific section
/bin/systemctl --quiet is-active ipa.service >/dev/null && \ /bin/systemctl --quiet is-active ipa.service >/dev/null && \
/bin/systemctl try-restart ipa.service >/dev/null 2>&1 || : /bin/systemctl try-restart ipa.service >/dev/null 2>&1 || :
# END
fi
%pre server
# Stop ipa_kpasswd if it exists before upgrading so we don't have a
# zombie process when we're done.
if [ -e /usr/sbin/ipa_kpasswd ]; then
# NOTE: systemd specific section
/bin/systemctl stop ipa_kpasswd.service >/dev/null 2>&1 || :
# END
fi fi
%pre server-selinux %pre server-selinux
@ -524,14 +589,16 @@ fi
winbind_krb5_locator.so /dev/null 90 winbind_krb5_locator.so /dev/null 90
python -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1 python -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
# NOTE: systemd specific section
/bin/systemctl try-restart httpd.service >/dev/null 2>&1 || : /bin/systemctl try-restart httpd.service >/dev/null 2>&1 || :
# END
fi fi
%preun server-trust-ad %preun server-trust-ad
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%{_sbindir}/update-alternatives --remove winbind_krb5_locator.so /dev/null %{_sbindir}/update-alternatives --remove winbind_krb5_locator.so /dev/null
fi fi
%endif %endif # ! %{ONLY_CLIENT}
%post client %post client
if [ $1 -gt 1 ] ; then if [ $1 -gt 1 ] ; then
@ -574,11 +641,14 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/ipa_memcached %config(noreplace) %{_sysconfdir}/sysconfig/ipa_memcached
%dir %attr(0700,apache,apache) %{_localstatedir}/run/ipa_memcached/ %dir %attr(0700,apache,apache) %{_localstatedir}/run/ipa_memcached/
%dir %attr(0700,root,root) %{_localstatedir}/run/ipa/ %dir %attr(0700,root,root) %{_localstatedir}/run/ipa/
# NOTE: systemd specific section
%config %{_sysconfdir}/tmpfiles.d/ipa.conf %config %{_sysconfdir}/tmpfiles.d/ipa.conf
# Use systemd scheme
%attr(644,root,root) %{_unitdir}/ipa.service %attr(644,root,root) %{_unitdir}/ipa.service
%attr(644,root,root) %{_unitdir}/ipa_memcached.service %attr(644,root,root) %{_unitdir}/ipa_memcached.service
# Fedora spec file only: START
%{_libexecdir}/freeipa-systemd-upgrade %{_libexecdir}/freeipa-systemd-upgrade
# Fedora spec file only: END
# END
%dir %{python_sitelib}/ipaserver %dir %{python_sitelib}/ipaserver
%dir %{python_sitelib}/ipaserver/install %dir %{python_sitelib}/ipaserver/install
%dir %{python_sitelib}/ipaserver/install/plugins %dir %{python_sitelib}/ipaserver/install/plugins
@ -628,6 +698,12 @@ fi
%{_usr}/share/ipa/ui/*.woff %{_usr}/share/ipa/ui/*.woff
%dir %{_usr}/share/ipa/ui/ext %dir %{_usr}/share/ipa/ui/ext
%config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js %config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js
%dir %{_usr}/share/ipa/ui/js/dojo
%{_usr}/share/ipa/ui/js/dojo/dojo.js
%dir %{_usr}/share/ipa/ui/js/libs
%{_usr}/share/ipa/ui/js/libs/*.js
%dir %{_usr}/share/ipa/ui/js/freeipa
%{_usr}/share/ipa/ui/js/freeipa/app.js
%dir %{_usr}/share/ipa/ui/images %dir %{_usr}/share/ipa/ui/images
%{_usr}/share/ipa/ui/images/*.png %{_usr}/share/ipa/ui/images/*.png
%{_usr}/share/ipa/ui/images/*.gif %{_usr}/share/ipa/ui/images/*.gif
@ -664,6 +740,7 @@ fi
%attr(755,root,root) %{plugin_dir}/libipa_modrdn.so %attr(755,root,root) %{plugin_dir}/libipa_modrdn.so
%attr(755,root,root) %{plugin_dir}/libipa_lockout.so %attr(755,root,root) %{plugin_dir}/libipa_lockout.so
%attr(755,root,root) %{plugin_dir}/libipa_cldap.so %attr(755,root,root) %{plugin_dir}/libipa_cldap.so
%attr(755,root,root) %{plugin_dir}/libipa_dns.so
%attr(755,root,root) %{plugin_dir}/libipa_range_check.so %attr(755,root,root) %{plugin_dir}/libipa_range_check.so
%dir %{_localstatedir}/lib/ipa %dir %{_localstatedir}/lib/ipa
%attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
@ -708,10 +785,12 @@ fi
%{python_sitelib}/ipaserver/install/adtrustinstance* %{python_sitelib}/ipaserver/install/adtrustinstance*
%ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
%files server-strict # Fedora spec file only: START. Uncomment when Fedora 20 branches
%defattr(-,root,root,-) # %files server-strict
%doc COPYING README Contributors.txt # %defattr(-,root,root,-)
%endif # %doc COPYING README Contributors.txt
# Fedora spec file only: END
%endif # ! %{ONLY_CLIENT}
%files client %files client
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -743,15 +822,23 @@ fi
%{_bindir}/ipa %{_bindir}/ipa
%config %{_sysconfdir}/bash_completion.d %config %{_sysconfdir}/bash_completion.d
%{_mandir}/man1/ipa.1.gz %{_mandir}/man1/ipa.1.gz
%endif %endif # ! %{ONLY_CLIENT}
%files python -f %{gettext_domain}.lang %files python -f %{gettext_domain}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING README Contributors.txt %doc COPYING README Contributors.txt
%dir %{python_sitelib}/ipapython %dir %{python_sitelib}/ipapython
%dir %{python_sitelib}/ipapython/platform %dir %{python_sitelib}/ipapython/platform
%dir %{python_sitelib}/ipapython/platform/base
%dir %{python_sitelib}/ipapython/platform/fedora16
%dir %{python_sitelib}/ipapython/platform/fedora18
%dir %{python_sitelib}/ipapython/platform/redhat
%{python_sitelib}/ipapython/*.py* %{python_sitelib}/ipapython/*.py*
%{python_sitelib}/ipapython/platform/*.py* %{python_sitelib}/ipapython/platform/*.py*
%{python_sitelib}/ipapython/platform/base/*.py*
%{python_sitelib}/ipapython/platform/fedora16/*.py*
%{python_sitelib}/ipapython/platform/fedora18/*.py*
%{python_sitelib}/ipapython/platform/redhat/*.py*
%dir %{python_sitelib}/ipalib %dir %{python_sitelib}/ipalib
%{python_sitelib}/ipalib/* %{python_sitelib}/ipalib/*
%{python_sitearch}/default_encoding_utf8.so %{python_sitearch}/default_encoding_utf8.so
@ -762,6 +849,10 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog %changelog
* Tue Apr 2 2013 Martin Kosek <mkosek@redhat.com> - 3.2.0-0.1.pre1
- Update to upstream 3.2.0 Prerelease 1
- Use upstream reference spec file as a base for Fedora spec file
* Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> 3.1.2-4 * Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> 3.1.2-4
- Rebuild for broken deps - Rebuild for broken deps
- Fix 389-ds-base strict dep to be 1.3.0.5 and krb5-server 1.11.1 - Fix 389-ds-base strict dep to be 1.3.0.5 and krb5-server 1.11.1
@ -796,7 +887,7 @@ fi
- Set minimum for selinux-policy to 3.11.1-60 - Set minimum for selinux-policy to 3.11.1-60
- Remove unneeded dogtag package requires - Remove unneeded dogtag package requires
* Fri Oct 23 2012 Martin Kosek <mkosek@redhat.com> - 3.0.0-3 * Tue Oct 23 2012 Martin Kosek <mkosek@redhat.com> - 3.0.0-3
- Update Requires on krb5-server to 1.11 - Update Requires on krb5-server to 1.11
* Fri Oct 12 2012 Rob Crittenden <rcritten@redhat.com> - 3.0.0-2 * Fri Oct 12 2012 Rob Crittenden <rcritten@redhat.com> - 3.0.0-2
@ -944,7 +1035,7 @@ fi
* Mon Oct 17 2011 Alexander Bokovoy <abokovoy@redhat.com> - 2.1.2-1 * Mon Oct 17 2011 Alexander Bokovoy <abokovoy@redhat.com> - 2.1.2-1
- Default to systemd for Fedora 16 and onwards - Default to systemd for Fedora 16 and onwards
* Thu Aug 16 2011 Rob Crittenden <rcritten@redhat.com> - 2.1.0-1 * Tue Aug 16 2011 Rob Crittenden <rcritten@redhat.com> - 2.1.0-1
- Update to upstream 2.1.0 - Update to upstream 2.1.0
* Fri May 6 2011 Simo Sorce <ssorce@redhat.com> - 2.0.1-2 * Fri May 6 2011 Simo Sorce <ssorce@redhat.com> - 2.0.1-2
@ -1001,7 +1092,7 @@ fi
- Remove some explicit Requires in client that aren't needed - Remove some explicit Requires in client that aren't needed
- Consistent use of buildroot vs RPM_BUILD_ROOT - Consistent use of buildroot vs RPM_BUILD_ROOT
* Thu Jan 19 2011 Adam Young <ayoung@redhat.com> - 1.99-40 * Wed Jan 19 2011 Adam Young <ayoung@redhat.com> - 1.99-40
- Moved directory install/static to install/ui - Moved directory install/static to install/ui
* Thu Jan 13 2011 Simo Sorce <ssorce@redhat.com> - 1.99-39 * Thu Jan 13 2011 Simo Sorce <ssorce@redhat.com> - 1.99-39
@ -1123,7 +1214,7 @@ fi
- Move ipalib to ipa-python subpackage - Move ipalib to ipa-python subpackage
- Bump minimum version of slapi-nis to 0.15 - Bump minimum version of slapi-nis to 0.15
* Thu May 6 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-5 * Wed May 6 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-5
- Set 0.14 as minimum version for slapi-nis - Set 0.14 as minimum version for slapi-nis
* Wed Apr 22 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-4 * Wed Apr 22 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-4
@ -1211,7 +1302,7 @@ fi
- Pull upstream changelog 722 - Pull upstream changelog 722
- Add Conflicts mod_ssl (435360) - Add Conflicts mod_ssl (435360)
* Thu Feb 29 2008 Rob Crittenden <rcritten@redhat.com> 0.99-11 * Fri Feb 29 2008 Rob Crittenden <rcritten@redhat.com> 0.99-11
- Pull upstream changelog 698 - Pull upstream changelog 698
- Fix ownership of /var/log/ipa_error.log during install (435119) - Fix ownership of /var/log/ipa_error.log during install (435119)
- Add pwpolicy command and man page - Add pwpolicy command and man page
@ -1301,7 +1392,7 @@ fi
* Fri Aug 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.2.0-1 * Fri Aug 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.2.0-1
- Added support for ipa_kpasswd and ipa_pwd_extop - Added support for ipa_kpasswd and ipa_pwd_extop
* Mon Aug 5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3 * Sun Aug 5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3
- Abstracted client class to work directly or over RPC - Abstracted client class to work directly or over RPC
* Wed Aug 1 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-2 * Wed Aug 1 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-2

2
sources
View File

@ -1 +1 @@
f265c67b12686d1e8e3a42ca0ac017f6 freeipa-3.1.2.tar.gz eb93b180518f4450118183d1c579459b freeipa-3.2.0.pre1.tar.gz