diff --git a/.gitignore b/.gitignore index 02477ef..6fcd30a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /freeipa-3.2.0.tar.gz /freeipa-3.2.2.tar.gz /freeipa-3.3.0.tar.gz +/freeipa-3.3.1.tar.gz diff --git a/freeipa.spec b/freeipa.spec index 4bd129c..4097107 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -2,13 +2,13 @@ %{!?ONLY_CLIENT:%global ONLY_CLIENT 0} %global plugin_dir %{_libdir}/dirsrv/plugins -%global POLICYCOREUTILSVER 2.1.14-37 +%global POLICYCOREUTILSVER 2.1.12-5 %global gettext_domain ipa -%global VERSION 3.3.0 +%global VERSION 3.3.1 Name: freeipa -Version: 3.3.0 -Release: 2%{?dist} +Version: 3.3.1 +Release: 0%{?dist} Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -32,16 +32,12 @@ BuildRequires: samba4-python %endif BuildRequires: libtalloc-devel BuildRequires: libtevent-devel -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: openssl-devel BuildRequires: openldap-devel -%if 0%{?fedora} >= 19 BuildRequires: krb5-devel >= 1.11 -%else -BuildRequires: krb5-devel >= 1.10 -%endif BuildRequires: krb5-workstation BuildRequires: libuuid-devel BuildRequires: libcurl-devel >= 7.21.7-2 @@ -98,8 +94,13 @@ Requires: %{name}-client = %{version}-%{release} Requires: %{name}-admintools = %{version}-%{release} Requires: 389-ds-base >= 1.3.1.3 Requires: openldap-clients > 2.4.35-4 +%if 0%{?fedora} == 18 +Requires: nss >= 3.14.3-2 +Requires: nss-tools >= 3.14.3-2 +%else Requires: nss >= 3.14.3-12.0 Requires: nss-tools >= 3.14.3-12.0 +%endif %if 0%{?krb5_dal_version} >= 4 Requires: krb5-server >= 1.11.2-1 %else @@ -156,7 +157,7 @@ Obsoletes: freeipa-server-selinux < 3.3.0 # IPA but if it is configured we need a way to require versions # that work for us. %if 0%{?fedora} >= 18 -Conflicts: bind-dyndb-ldap < 2.3-2 +Conflicts: bind-dyndb-ldap < 3.5 %else Conflicts: bind-dyndb-ldap < 1.1.0-0.12.rc1 %endif @@ -196,7 +197,9 @@ Requires: samba4 Requires: samba4-winbind %endif Requires: libsss_idmap +%if 0%{?fedora} >= 19 Requires: libsss_nss_idmap-python +%endif # We use alternatives to divert winbind_krb5_locator.so plugin to libkrb5 # 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 @@ -207,33 +210,11 @@ Requires(postun): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives %description server-trust-ad -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. +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. -%if 0%{?fedora} == 19 -# Fedora spec file only: START -%package server-strict -Summary: Strict package dependencies -Group: System Environment/Base -Requires(post): %{name}-server = %{version}-%{release} -Requires(postun): %{name}-server = %{version}-%{release} - -# Specific requires -Requires(pre): 389-ds-base = 1.3.1.3 -Requires: krb5-server = 1.11.3 -Requires: pki-ca = 10.0.4 - -%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 -%endif - -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %package client @@ -289,7 +270,7 @@ user, virtual machines, groups, authentication credentials), Policy (configuration settings, access control information) and Audit (events, logs, analysis thereof). This package provides command-line tools for IPA administrators. -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %package python Summary: Python libraries used by IPA @@ -324,7 +305,7 @@ Requires: python-nose Requires: python-paste Requires: python-coverage Requires: python-polib -Requires: python-paramiko >= 1.10.1 +Requires: python-paramiko >= 1.7.7 %description tests IPA is an integrated solution to provide centrally managed Identity (machine, @@ -333,33 +314,11 @@ user, virtual machines, groups, authentication credentials), Policy logs, analysis thereof). This package contains tests that verify IPA functionality. -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %prep -# Fedora spec file only: START -# 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" -# is the patch prefix option (e.g. -p1) -# Taken from specfile for sssd and python-simplejson -UpdateTimestamps() { - Level=$1 - PatchFile=$2 - - # Locate the affected files: - for f in $(diffstat $Level -l $PatchFile); do - # Set the files to have the same timestamp as that of the patch: - touch -r $PatchFile $f - done -} - -%setup -n freeipa-%{VERSION} -q - -for p in %patches ; do - %__patch -p1 -i $p - UpdateTimestamps -p1 $p -done -# Fedora spec file only: END +%setup -n freeipa-%{version} -q %build export CFLAGS="$CFLAGS %{optflags}" @@ -378,13 +337,13 @@ cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --loca %if ! %{ONLY_CLIENT} 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 .. -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %if ! %{ONLY_CLIENT} make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} all %else make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %install rm -rf %{buildroot} @@ -401,7 +360,7 @@ rm -f ipapython/services.py make install DESTDIR=%{buildroot} %else make client-install DESTDIR=%{buildroot} -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %find_lang %{gettext_domain} @@ -481,9 +440,8 @@ mkdir -p %{buildroot}%{_unitdir} 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 - mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -496,14 +454,14 @@ install -pm 644 contrib/completion/ipa.bash_completion %{buildroot}%{_sysconfdir mkdir -p %{buildroot}%{_sysconfdir}/cron.d (cd %{buildroot}/%{python_sitelib}/ipaserver && find . -type f | \ - grep -v dcerpc | grep -v adtrustinstance | \ - sed -e 's,\.py.*$,.*,g' | sort -u | \ - sed -e 's,\./,%%{python_sitelib}/ipaserver/,g' ) >server-python.list + grep -v dcerpc | grep -v adtrustinstance | \ + sed -e 's,\.py.*$,.*,g' | sort -u | \ + sed -e 's,\./,%%{python_sitelib}/ipaserver/,g' ) >server-python.list (cd %{buildroot}/%{python_sitelib}/ipatests && find . -type f | \ sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %clean rm -rf %{buildroot} @@ -551,14 +509,14 @@ fi %postun server-trust-ad if [ "$1" -ge "1" ]; then - if [ "`readlink %{_sysconfdir}/alternatives/winbind_krb5_locator.so`" == "/dev/null" ]; then - %{_sbindir}/alternatives --set winbind_krb5_locator.so /dev/null - fi + if [ "`readlink %{_sysconfdir}/alternatives/winbind_krb5_locator.so`" == "/dev/null" ]; then + %{_sbindir}/alternatives --set winbind_krb5_locator.so /dev/null + fi fi %post server-trust-ad %{_sbindir}/update-alternatives --install %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so \ - winbind_krb5_locator.so /dev/null 90 + winbind_krb5_locator.so /dev/null 90 %posttrans server-trust-ad python -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1 @@ -570,9 +528,9 @@ fi %preun server-trust-ad 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 -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %post client if [ $1 -gt 1 ] ; then @@ -581,7 +539,7 @@ if [ $1 -gt 1 ] ; then test -f '/var/lib/ipa-client/sysrestore/sysrestore.index' && restore=$(wc -l '/var/lib/ipa-client/sysrestore/sysrestore.index' | awk '{print $1}') if [ -f '/etc/sssd/sssd.conf' -a $restore -ge 2 ]; then - if ! egrep -q '/var/lib/sss/pubconf/krb5.include.d/' /etc/krb5.conf 2>/dev/null ; then + if ! grep -E -q '/var/lib/sss/pubconf/krb5.include.d/' /etc/krb5.conf 2>/dev/null ; then echo "includedir /var/lib/sss/pubconf/krb5.include.d/" > /etc/krb5.conf.ipanew cat /etc/krb5.conf >> /etc/krb5.conf.ipanew mv /etc/krb5.conf.ipanew /etc/krb5.conf @@ -596,7 +554,7 @@ restore=0 test -f '/var/lib/ipa-client/sysrestore/sysrestore.index' && restore=$(wc -l '/var/lib/ipa-client/sysrestore/sysrestore.index' | awk '{print $1}') if [ -f '/etc/ssh/sshd_config' -a $restore -ge 2 ]; then - if egrep -q '^(AuthorizedKeysCommand /usr/bin/sss_ssh_authorizedkeys|PubKeyAgent /usr/bin/sss_ssh_authorizedkeys %u)$' /etc/ssh/sshd_config 2>/dev/null; then + if grep -E -q '^(AuthorizedKeysCommand /usr/bin/sss_ssh_authorizedkeys|PubKeyAgent /usr/bin/sss_ssh_authorizedkeys %u)$' /etc/ssh/sshd_config 2>/dev/null; then sed -r ' /^(AuthorizedKeysCommand(User|RunAs)|PubKeyAgentRunAs)[ \t]/ d ' /etc/ssh/sshd_config >/etc/ssh/sshd_config.ipanew @@ -654,12 +612,12 @@ fi %dir %attr(0700,apache,apache) %{_localstatedir}/run/ipa_memcached/ %dir %attr(0700,root,root) %{_localstatedir}/run/ipa/ # NOTE: systemd specific section -%config %{_sysconfdir}/tmpfiles.d/ipa.conf +%config(noreplace) %{_sysconfdir}/tmpfiles.d/ipa.conf %attr(644,root,root) %{_unitdir}/ipa.service %attr(644,root,root) %{_unitdir}/ipa_memcached.service -# END %attr(644,root,root) %{_unitdir}/ipa-otpd.socket %attr(644,root,root) %{_unitdir}/ipa-otpd@.service +# END %dir %{python_sitelib}/ipaserver %dir %{python_sitelib}/ipaserver/install %dir %{python_sitelib}/ipaserver/install/plugins @@ -796,15 +754,7 @@ fi %{python_sitelib}/ipaserver/dcerpc* %{python_sitelib}/ipaserver/install/adtrustinstance* %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so - -%if 0%{?fedora} == 19 -# Fedora spec file only: START -%files server-strict -%defattr(-,root,root,-) -%doc COPYING README Contributors.txt -# Fedora spec file only: END -%endif -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %files client %defattr(-,root,root,-) @@ -836,7 +786,7 @@ fi %{_bindir}/ipa %config %{_sysconfdir}/bash_completion.d %{_mandir}/man1/ipa.1.gz -%endif # ! %{ONLY_CLIENT} +%endif # ONLY_CLIENT %files python -f %{gettext_domain}.lang %defattr(-,root,root,-) @@ -855,7 +805,7 @@ fi %{python_sitelib}/ipapython/platform/redhat/*.py* %dir %{python_sitelib}/ipalib %{python_sitelib}/ipalib/* -%{python_sitearch}/default_encoding_utf8.so +%attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so %{python_sitelib}/ipapython-*.egg-info %{python_sitelib}/freeipa-*.egg-info %{python_sitearch}/python_default_encoding-*.egg-info @@ -881,9 +831,15 @@ fi %{_bindir}/ipa-test-config %{_bindir}/ipa-test-task %{python_sitelib}/ipatests-*.egg-info -%endif # ! %{ONLY_CLIENT} +%{_mandir}/man1/ipa-run-tests.1.gz +%{_mandir}/man1/ipa-test-config.1.gz +%{_mandir}/man1/ipa-test-task.1.gz +%endif # ONLY_CLIENT %changelog +* Thu Aug 29 2013 Petr Viktorin - 3.3.1-0 +- Update to upstream 3.3.1 + * Wed Aug 14 2013 Alexander Bokovoy - 3.3.0-2 - Remove freeipa-systemd-upgrade as non-systemd installs are not supported anymore by Fedora project diff --git a/sources b/sources index 0171e78..f82ebaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fd1e39c5bf60329b5d70b560bab2073 freeipa-3.3.0.tar.gz +ed8e51c47adbbfcc7013396ceb55f99a freeipa-3.3.1.tar.gz