[freeipa] Update to upstream 3.0.0 beta 1

rcritten rcritten at fedoraproject.org
Mon Jul 2 19:55:42 UTC 2012 

commit a0ca5be79804f3f8fdd7c1a4c0f9bfc481d0d84b
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Mon Jul 2 15:55:25 2012 -0400

    Update to upstream 3.0.0 beta 1

 .gitignore   |    1 +
 freeipa.spec |  109 +++++++++++++++++++++++++++++++++++++++++++++------------
 sources      |    2 +-
 3 files changed, 88 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c4f326e..cb66dbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /freeipa-2.1.90.pre1.tar.gz
 /freeipa-2.1.90.rc1.tar.gz
 /freeipa-2.2.0.tar.gz
+/freeipa-3.0.0.pre1.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index 741d2f8..120e87c 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -11,16 +11,17 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 %global POLICYCOREUTILSVER 1.33.12-1
 %global gettext_domain ipa
+%global VERSION 3.0.0.pre1
 
 Name:           freeipa
-Version:        2.2.0
-Release:        1%{?dist}
+Version:        3.0.0
+Release:        0.1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
 License:        GPLv3+
 URL:            http://www.freeipa.org/
-Source0:        http://www.freeipa.org/downloads/src/freeipa-%{version}.tar.gz
+Source0:        http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
@@ -29,6 +30,8 @@ BuildRequires:  svrcore-devel
 BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  systemd-units
+BuildRequires:  samba4-devel
+BuildRequires:  samba4-python
 %endif
 BuildRequires:  nspr-devel
 BuildRequires:  nss-devel
@@ -37,8 +40,8 @@ BuildRequires:  openldap-devel
 BuildRequires:  krb5-devel
 BuildRequires:  krb5-workstation
 BuildRequires:  libuuid-devel
-BuildRequires:  libcurl-devel >= 7.21.7-2
-BuildRequires:  xmlrpc-c-devel >= 1.27.4
+BuildRequires:  libcurl-devel
+BuildRequires:  xmlrpc-c-devel
 BuildRequires:  popt-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -46,12 +49,11 @@ BuildRequires:  m4
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  python-devel
-BuildRequires:  authconfig
 BuildRequires:  python-ldap
 BuildRequires:  python-setuptools
 BuildRequires:  python-krbV
 BuildRequires:  python-nss
-BuildRequires:  python-netaddr >= 0.7.5-3
+BuildRequires:  python-netaddr
 BuildRequires:  python-kerberos
 BuildRequires:  python-rhsm
 BuildRequires:  pyOpenSSL
@@ -59,6 +61,12 @@ BuildRequires:  pylint
 BuildRequires:  libipa_hbac-python
 BuildRequires:  python-memcached
 BuildRequires:  sssd >= 1.8.0
+BuildRequires:  python-lxml
+BuildRequires:  python-pyasn1 >= 0.0.9a
+BuildRequires:  python-dns
+BuildRequires:  python-crypto
+BuildRequires:  check >= 0.9.5
+BuildRequires:  libsss_idmap-devel
 
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -74,7 +82,7 @@ Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
 Requires: %{name}-server-selinux = %{version}-%{release}
-Requires(pre): 389-ds-base >= 1.2.10.4-2
+Requires(pre): 389-ds-base >= 1.2.11.7-2
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
@@ -84,7 +92,7 @@ Requires: cyrus-sasl-gssapi%{?_isa}
 Requires: ntp
 Requires: httpd
 Requires: mod_wsgi
-Requires: mod_auth_kerb >= 5.4-9
+Requires: mod_auth_kerb >= 5.4-16
 Requires: mod_nss >= 1.0.8-10
 Requires: python-ldap
 Requires: python-krbV
@@ -95,14 +103,14 @@ Requires: python-memcached
 Requires: systemd-units >= 36-3
 Requires(pre): systemd-units
 Requires(post): systemd-units
-Requires: selinux-policy >= 3.10.0-110
+Requires: selinux-policy >= 3.11.0-4
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.40
-Requires: pki-ca >= 9.0.18
-Requires: pki-silent >= 9.0.18
-Requires: pki-setup  >= 9.0.18
+Requires: pki-ca
+Requires: pki-silent
+Requires: pki-setup
 # Only tomcat6 greater than this version provides proper systemd support
-Requires: tomcat6 >= 6.0.32-17
+Requires: tomcat6 >= 6.0.35-4
 Requires: dogtag-pki-common-theme
 Requires: dogtag-pki-ca-theme
 %if 0%{?rhel}
@@ -110,12 +118,14 @@ Requires: subscription-manager
 %endif
 Requires(preun): python systemd-units
 Requires(postun): python systemd-units
+Requires: python-dns
+Requires: keyutils
 
 # 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
 # that work for us.
-Conflicts: bind-dyndb-ldap < 1.1.0-0.9.b1
-Conflicts: bind < 9.9.0-1
+Conflicts: bind-dyndb-ldap < 1.1.0-0.12.rc1
+Conflicts: bind < 9.9.1-2.P1
 
 # mod_proxy provides a single API to communicate over SSL. If mod_ssl
 # is even loaded into Apache then it grabs this interface.
@@ -147,6 +157,20 @@ user, virtual machines, groups, authentication credentials), Policy
 (configuration settings, access control information) and Audit (events,
 logs, analysis thereof). This package provides SELinux rules for the
 daemons included in freeipa-server
+
+%package server-trust-ad
+Summary: Virtual package to install packages required for Active Directory trusts
+Group: System Environment/Base
+Requires: %{name}-server = %version-%release
+Requires: python-crypto
+Requires: samba4-python
+Requires: samba4
+Requires: libsss_idmap
+
+%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.
+
 %endif
 
 
@@ -161,14 +185,19 @@ Requires: krb5-workstation
 Requires: authconfig
 Requires: pam_krb5
 Requires: wget
-Requires: libcurl >= 7.21.7-2
-Requires: xmlrpc-c >= 1.27.4
+Requires: libcurl
+Requires: xmlrpc-c
 Requires: sssd >= 1.8.0
 Requires: certmonger >= 0.53
 Requires: nss-tools
 Requires: bind-utils
 Requires: oddjob-mkhomedir
 Requires: python-krbV
+Requires: python-dns
+Requires: libsss_autofs
+Requires: autofs
+Requires: libnfsidmap
+Requires: nfs-utils
 
 Obsoletes: ipa-client >= 1.0
 
@@ -209,7 +238,7 @@ Requires: iproute
 Requires: pyOpenSSL
 Requires: python-nss >= 0.11
 Requires: python-lxml
-Requires: python-netaddr >= 0.7.5-3
+Requires: python-netaddr
 Requires: libipa_hbac-python
 
 Obsoletes: ipa-python >= 1.0
@@ -223,7 +252,7 @@ package.
 
 
 %prep
-%setup -n freeipa-%{version} -q
+%setup -n freeipa-%{VERSION} -q
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -273,12 +302,19 @@ rm %{buildroot}/%{plugin_dir}/libipa_repl_version.la
 rm %{buildroot}/%{plugin_dir}/libipa_uuid.la
 rm %{buildroot}/%{plugin_dir}/libipa_modrdn.la
 rm %{buildroot}/%{plugin_dir}/libipa_lockout.la
+rm %{buildroot}/%{plugin_dir}/libipa_cldap.la
+rm %{buildroot}/%{plugin_dir}/libipa_sidgen.la
+rm %{buildroot}/%{plugin_dir}/libipa_sidgen_task.la
+rm %{buildroot}/%{plugin_dir}/libipa_extdom_extop.la
+rm %{buildroot}/%{plugin_dir}/libipa_range_check.la
 rm %{buildroot}/%{_libdir}/krb5/plugins/kdb/ipadb.la
+rm %{buildroot}/%{_libdir}/samba/pdb/ipasam.la
 
 # Some user-modifiable HTML files are provided. Move these to /etc
 # and link back.
 mkdir -p %{buildroot}/%{_sysconfdir}/ipa/html
 mkdir -p %{buildroot}/%{_localstatedir}/cache/ipa/sysrestore
+mkdir -p %{buildroot}/%{_localstatedir}/cache/ipa/sysupgrade
 mkdir %{buildroot}%{_usr}/share/ipa/html/
 ln -s ../../../..%{_sysconfdir}/ipa/html/ssbrowser.html \
     %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html
@@ -331,6 +367,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d
 install -pm 644 ipa-compliance.cron %{buildroot}%{_sysconfdir}/cron.d/ipa-compliance
 %endif
 
+(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
+
 %clean
 rm -rf %{buildroot}
 
@@ -345,7 +386,7 @@ if [ $1 -gt 1 ] ; then
     # Note also it is now safe to run this script against working FreeIPA install
     # after it has been migrated to systemd setup
     /usr/libexec/freeipa-systemd-upgrade || :
-    /usr/sbin/ipa-upgradeconfig || :
+    /usr/sbin/ipa-upgradeconfig >/dev/null 2>&1|| :
 fi
 
 %posttrans server
@@ -412,7 +453,7 @@ fi
 
 
 %if ! %{ONLY_CLIENT}
-%files server
+%files server -f server-python.list
 %defattr(-,root,root,-)
 %doc COPYING README Contributors.txt
 %{_sbindir}/ipa-ca-install
@@ -440,7 +481,9 @@ fi
 %attr(644,root,root) %{_unitdir}/ipa_memcached.service
 %{_libexecdir}/freeipa-systemd-upgrade
 %dir %{python_sitelib}/ipaserver
-%{python_sitelib}/ipaserver/*
+%dir %{python_sitelib}/ipaserver/install
+%dir %{python_sitelib}/ipaserver/install/plugins
+%dir %{python_sitelib}/ipaserver/plugins
 %dir %{_libdir}/ipa/certmonger
 %attr(755,root,root) %{_libdir}/ipa/certmonger/*
 %dir %{_usr}/share/ipa
@@ -462,6 +505,7 @@ fi
 %{_usr}/share/ipa/ui/index.html
 %{_usr}/share/ipa/ui/login.html
 %{_usr}/share/ipa/ui/logout.html
+%{_usr}/share/ipa/ui/reset_password.html
 %{_usr}/share/ipa/ui/*.ico
 %{_usr}/share/ipa/ui/*.css
 %{_usr}/share/ipa/ui/*.js
@@ -501,8 +545,11 @@ fi
 %attr(755,root,root) %{plugin_dir}/libipa_uuid.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_cldap.so
+%attr(755,root,root) %{plugin_dir}/libipa_range_check.so
 %dir %{_localstatedir}/lib/ipa
 %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
+%attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysupgrade
 %dir %{_localstatedir}/cache/ipa
 %attr(700,apache,apache) %dir %{_localstatedir}/cache/ipa/sessions
 %attr(755,root,root) %{_libdir}/krb5/plugins/kdb/ipadb.so
@@ -528,12 +575,24 @@ fi
 %doc COPYING README Contributors.txt
 %{_usr}/share/selinux/targeted/ipa_httpd.pp
 %{_usr}/share/selinux/targeted/ipa_dogtag.pp
+
+%files server-trust-ad
+%{_sbindir}/ipa-adtrust-install
+%attr(755,root,root) %{plugin_dir}/libipa_extdom_extop.so
+%{_usr}/share/ipa/smb.conf.empty
+%attr(755,root,root) %{_libdir}/samba/pdb/ipasam.so
+%attr(755,root,root) %{plugin_dir}/libipa_sidgen.so
+%attr(755,root,root) %{plugin_dir}/libipa_sidgen_task.so
+%{_mandir}/man1/ipa-adtrust-install.1.gz
+%{python_sitelib}/ipaserver/dcerpc*
+%{python_sitelib}/ipaserver/install/adtrustinstance*
 %endif
 
 %files client
 %defattr(-,root,root,-)
 %doc COPYING README Contributors.txt
 %{_sbindir}/ipa-client-install
+%{_sbindir}/ipa-client-automount
 %{_sbindir}/ipa-getkeytab
 %{_sbindir}/ipa-rmkeytab
 %{_sbindir}/ipa-join
@@ -548,6 +607,7 @@ fi
 %{_mandir}/man1/ipa-getkeytab.1.gz
 %{_mandir}/man1/ipa-rmkeytab.1.gz
 %{_mandir}/man1/ipa-client-install.1.gz
+%{_mandir}/man1/ipa-client-automount.1.gz
 %{_mandir}/man1/ipa-join.1.gz
 %{_mandir}/man5/default.conf.5.gz
 
@@ -577,6 +637,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Mon Jul  2 2012 Rob Crittenden <rcritten at redhat.com> - 3.0.0-0.1
+- Updated to upstream 3.0.0 beta 1
+
 * Thu May  3 2012 Rob Crittenden <rcritten at redhat.com> - 2.2.0-1
 - Updated to upstream 2.2.0 GA
 - Update minimum n-v-r of certmonger to 0.53
diff --git a/sources b/sources
index c9aae2f..10f5e7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4195a6af15ade58e6d3add054dd8004  freeipa-2.2.0.tar.gz
+4aff2fa32665a26d7826e06b55bc2e3c  freeipa-3.0.0.pre1.tar.gz

More information about the scm-commits mailing list