Fri Nov 14 16:43:26 UTC 2008

Author: simo

Update of /cvs/pkgs/rpms/ipa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20213

Modified Files:
	ipa.spec sources 
Removed Files:
	0001-Fix-typo-in-inet-type.patch 
	0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch 
	0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch 
	freeipa-change-mkey.patch freeipa-cve-2008-3274-fixes.patch 
	freeipa-cve-2008-3274-utility.patch 
	freeipa-default-keytype.patch freeipa-dnsquery.patch 
	freeipa-encrypt-files.patch freeipa-fix-expire.patch 
	freeipa-fix-key-encryption.patch freeipa-index.patch 
	freeipa-memberofindex.patch freeipa-noinit.patch 
	freeipa-nssperms.patch freeipa-refresh-mkey.patch 
	freeipa-replica-default.patch freeipa-user-input.patch 
Log Message:
Upgrade to 1.2.0



Index: ipa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipa/F-9/ipa.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21

--- ipa.spec	10 Sep 2008 19:08:14 -0000	1.20
+++ ipa.spec	14 Nov 2008 16:42:56 -0000	1.21
@@ -5,8 +5,8 @@
 %define POLICYCOREUTILSVER 1.33.12-1
 
 Name:           ipa
-Version:        1.1.0
-Release:        7%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -15,27 +15,13 @@
 Source0:        freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:         freeipa-replica-default.patch
-Patch2:         freeipa-noinit.patch
-Patch3:         freeipa-memberofindex.patch
-Patch4:         freeipa-index.patch
-Patch5:         0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch
-Patch6:         0001-Fix-typo-in-inet-type.patch
-Patch7:         0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch
-
-Patch101:	freeipa-refresh-mkey.patch
-Patch102:	freeipa-fix-expire.patch
-Patch103:	freeipa-fix-key-encryption.patch
-Patch104:	freeipa-user-input.patch
-Patch105:	freeipa-encrypt-files.patch
-Patch106:	freeipa-change-mkey.patch
-Patch107:	freeipa-cve-2008-3274-fixes.patch
-Patch108:	freeipa-cve-2008-3274-utility.patch
-
-BuildRequires:  fedora-ds-base-devel >= 1.1
+BuildRequires:  fedora-ds-base-devel >= 1.1.3
 BuildRequires:  mozldap-devel
+BuildRequires:  svrcore-devel
+BuildRequires:  nspr-devel
 BuildRequires:  openssl-devel
 BuildRequires:  openldap-devel
+BuildRequires:  e2fsprogs-devel
 BuildRequires:  krb5-devel
 BuildRequires:  nss-devel
 BuildRequires:  libcap-devel
@@ -43,11 +29,7 @@
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
-%if "%{?fedora}" == "7"
-BuildRequires:  popt
-%else
 BuildRequires:  popt-devel
-%endif
 BuildRequires:  selinux-policy-devel
 BuildRequires:  m4
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
@@ -66,11 +48,10 @@
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
 Requires(post): %{name}-server-selinux = %{version}-%{release}
-Requires: fedora-ds-base >= 1.1.0.1-4
+Requires: fedora-ds-base >= 1.1.3
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
-%{?fc7:Requires: krb5-server >= 1.6.1-7}
 %{?fc8:Requires: krb5-server >= 1.6.2-11}
 %if 0%{?fedora} >= 9
 Requires: krb5-server
@@ -81,7 +62,9 @@
 Requires: httpd
 Requires: mod_python
 Requires: mod_auth_kerb
-Requires: mod_nss >= 1.0.7-5
+%{?fc8:Requires: mod_nss >= 1.0.7-2}
+%{?fc9:Requires: mod_nss >= 1.0.7-5}
+%{?fc10:Requires: mod_nss >= 1.0.7-4}
 Requires: python-ldap
 Requires: python-krbV
 Requires: TurboGears
@@ -89,8 +72,11 @@
 Requires: acl
 Requires: python-pyasn1
 Requires: libcap
-Requires: selinux-policy
+%{?fc8:Requires: selinux-policy >= 3.0.8-117}
+%{?fc9:Requires: selinux-policy >= 3.3.1-99}
+%{?fc10:Requires: selinux-policy >= 3.5.13-11}
 Requires(post): selinux-policy-base
+Requires: slapi-nis
 Conflicts: mod_ssl
 
 %description server
@@ -158,6 +144,7 @@
 Group: System Environment/Libraries
 Requires: python-kerberos
 Requires: authconfig
+Requires: gnupg
 
 %description python
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -170,6 +157,7 @@
 Summary: IPA authentication server - radius plugin
 Group: System Environment/Base
 Requires: freeradius
+Requires: freeradius-ldap
 Requires: %{name}-python = %{version}-%{release}
 
 %description radius-server
@@ -195,28 +183,13 @@
 
 %prep
 %setup -n freeipa-%{version} -q
-%patch1 -p1 -b replica-default
-%patch2 -p1 -b noinit
-%patch3 -p1 -b memberofindex
-%patch4 -p1 -b index
-%patch5 -p1 -b changepw
-%patch6 -p1 -b af-inet-fix
-%patch7 -p1 -b kpasswd-segfault
-
-#START CVE-2008-3274 block
-%patch101 -p1 -b refresh-mkey
-%patch102 -p1 -b fix-expire
-%patch103 -p1 -b fix-key-encryption
-%patch104 -p1 -b user-input
-%patch105 -p1 -b encrypt-files
-%patch106 -p1 -b change-mkey
-%patch107 -p1 -b cve-2008-3274-fixes
-%patch108 -p1 -b cve-2008-3274-utility
-#END CVE-2008-3274 block
 
 %build
-cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
-cd ipa-client; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
+export CFLAGS="$CFLAGS %{optflags}"
+export CPPFLAGS="$CPPFLAGS %{optflags}"
+make version-update
+cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
+cd ipa-client; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
 
 make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update all
 cd ipa-server/selinux
@@ -234,6 +207,7 @@
 rm %{buildroot}/%{plugin_dir}/libipa_pwd_extop.la
 rm %{buildroot}/%{plugin_dir}/libipa-memberof-plugin.la
 rm %{buildroot}/%{plugin_dir}/libipa-dna-plugin.la
+rm %{buildroot}/%{plugin_dir}/libipa_winsync.la
 
 # Some user-modifiable HTML files are provided. Move these to /etc
 # and link back.
@@ -255,11 +229,19 @@
     /sbin/chkconfig --add ipa_kpasswd
     /sbin/chkconfig --add ipa_webgui
 fi
+if [ -e /usr/share/ipa/serial ]; then
+    mv /usr/share/ipa/serial /var/lib/ipa/ca_serialno
+fi
 /bin/touch /var/log/ipa_error.log
 /bin/chown apache /var/log/ipa_error.log
 /bin/chmod 600 /var/log/ipa_error.log
 restorecon /var/log/ipa_error.log
 /usr/sbin/ipa-upgradeconfig || :
+if [ -e /etc/httpd/conf.d/ipa.conf ]; then
+    echo ""
+    echo "Run /usr/sbin/ipa-ldap-updater to complete the upgrade process."
+    echo ""
+fi
 
 %preun server
 if [ $1 = 0 ]; then
@@ -273,6 +255,8 @@
 if [ "$1" -ge "1" ]; then
     /sbin/service ipa_kpasswd condrestart >/dev/null 2>&1 || :
     /sbin/service ipa_webgui condrestart >/dev/null 2>&1 || :
+    /sbin/service httpd condrestart >/dev/null 2>&1 || :
+    /sbin/service dirsrv condrestart >/dev/null 2>&1 || :
 fi
 
 %pre server-selinux
@@ -353,9 +337,12 @@
 %{_usr}/share/ipa/ipaserver/*
 %dir %{_usr}/share/ipa/locales/
 %{_usr}/share/ipa/locales/*
+%dir %{_usr}/share/ipa/updates/
+%{_usr}/share/ipa/updates/*
 %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
 %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so
 %attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so
+%attr(755,root,root) %{plugin_dir}/libipa_winsync.so
 %dir %{_localstatedir}/lib/ipa
 %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
 %dir %{_localstatedir}/cache/ipa
@@ -364,6 +351,7 @@
 %dir %{python_sitelib}/ipaserver
 %{python_sitelib}/ipaserver/*.py*
 %{_mandir}/man1/ipa-replica-install.1.gz
+%{_mandir}/man1/ipa-ldap-updater.1.gz
 %{_mandir}/man1/ipa-replica-manage.1.gz
 %{_mandir}/man1/ipa-replica-prepare.1.gz
 %{_mandir}/man1/ipa-server-certinstall.1.gz
@@ -398,6 +386,7 @@
 %{_sbindir}/ipa-addgroup
 %{_sbindir}/ipa-addservice
 %{_sbindir}/ipa-adduser
+%{_sbindir}/ipa-defaultoptions
 %{_sbindir}/ipa-deldelegation
 %{_sbindir}/ipa-delgroup
 %{_sbindir}/ipa-delservice
@@ -405,9 +394,10 @@
 %{_sbindir}/ipa-findgroup
 %{_sbindir}/ipa-findservice
 %{_sbindir}/ipa-finduser
-%{_sbindir}/ipa-modgroup
+%{_sbindir}/ipa-ldap-updater
 %{_sbindir}/ipa-listdelegation
 %{_sbindir}/ipa-lockuser
+%{_sbindir}/ipa-modgroup
 %{_sbindir}/ipa-moddelegation
 %{_sbindir}/ipa-passwd
 %{_sbindir}/ipa-moduser
@@ -418,6 +408,7 @@
 %{_mandir}/man1/ipa-addgroup.1.gz
 %{_mandir}/man1/ipa-addservice.1.gz
 %{_mandir}/man1/ipa-adduser.1.gz
+%{_mandir}/man1/ipa-defaultoptions.1.gz
 %{_mandir}/man1/ipa-deldelegation.1.gz
 %{_mandir}/man1/ipa-delgroup.1.gz
 %{_mandir}/man1/ipa-delservice.1.gz
@@ -463,6 +454,13 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Fri Nov 14 2008 Simo Sorce <ssorce at redhat.com> - 1.2.0-1
+- Conditionally restart also dirsrv and httpd when upgrading
+- Update to upstream version 1.2.0
+- Set fedora-ds-base minimum version to 1.1.3 for winsync header
+- Set the minimum version for SELinux policy
+- Remove references to Fedora 7
+
 * Wed Sep 10 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-7
 - Fix for CVE-2008-3274
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jun 2008 18:36:08 -0000	1.8
+++ sources	14 Nov 2008 16:42:56 -0000	1.9
@@ -1 +1 @@
-3ac7a3f696427819152d209a68fe8f6c  freeipa-1.1.0.tar.gz
+506c9c92dcaf9f227cba5030e999f177  freeipa-1.2.0.tar.gz


--- 0001-Fix-typo-in-inet-type.patch DELETED ---


--- 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch DELETED ---


--- 0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch DELETED ---


--- freeipa-change-mkey.patch DELETED ---


--- freeipa-cve-2008-3274-fixes.patch DELETED ---


--- freeipa-cve-2008-3274-utility.patch DELETED ---


--- freeipa-default-keytype.patch DELETED ---


--- freeipa-dnsquery.patch DELETED ---


--- freeipa-encrypt-files.patch DELETED ---


--- freeipa-fix-expire.patch DELETED ---


--- freeipa-fix-key-encryption.patch DELETED ---


--- freeipa-index.patch DELETED ---


--- freeipa-memberofindex.patch DELETED ---


--- freeipa-noinit.patch DELETED ---


--- freeipa-nssperms.patch DELETED ---


--- freeipa-refresh-mkey.patch DELETED ---


--- freeipa-replica-default.patch DELETED ---


--- freeipa-user-input.patch DELETED ---


