X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=338a47a18397b4a44aacdce83d935c38625efc73;hb=refs%2Fheads%2Ftrunk%4014639;hp=130671dc5e25d58d4830dacacc621a204a7f0ed0;hpb=59526c47a3a65cb040c2f77ba8ad85c7bc33157e;p=sfa.git diff --git a/sfa.spec b/sfa.spec index 130671dc..338a47a1 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,4 +1,3 @@ - # # $Id$ # @@ -7,7 +6,7 @@ %define name sfa %define version 0.9 -%define taglevel 6 +%define taglevel 15 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -29,29 +28,48 @@ Summary: the SFA python libraries Group: Applications/System BuildRequires: make -Requires: python -Requires: pyOpenSSL >= 0.7 +Requires: python >= 2.5 Requires: m2crypto +Requires: xmlsec1-openssl-devel Requires: libxslt-python Requires: python-ZSI -Requires: python-psycopg2 - -# python 2.5 has uuid module added, for python 2.4 we still need it -%define has_uuid %(`python -c "import uuid" 2> /dev/null; echo $?`) -%if has_uuid -%else +# xmlbuilder depends on lxml +Requires: python-lxml +Requires: python-setuptools +Requires: python-dateutil + +# python 2.5 has uuid module added, for python 2.4 we still need it. +# we can't really check for if we can load uuid as a python module, +# it'll be installed by "devel.pkgs". we have the epel repository so +# python-uuid will be provided. but we can test for the python +# version. +# %define has_py24 %( python -c "import sys;sys.exit(sys.version_info[0:2] == (2,4))" 2> /dev/null; echo $? ) +# %if %has_py24 +# +# this also didn't work very well. I'll just check for distroname - baris +%if %{distroname} == "centos5" Requires: python-uuid %endif +%package cm +Summary: the SFA wrapper around MyPLC's NodeManager +Group: Applications/System +Requires: sfa +Requires: pyOpenSSL >= 0.6 + %package plc Summary: the SFA wrapper arounf MyPLC Group: Applications/System Requires: sfa +Requires: python-psycopg2 +Requires: myplc-config +Requires: pyOpenSSL >= 0.7 %package client Summary: the SFA experimenter-side CLI Group: Applications/System Requires: sfa +Requires: pyOpenSSL >= 0.7 %package sfatables Summary: sfatables policy tool for SFA @@ -61,8 +79,12 @@ Requires: sfa %description This package provides the python libraries that the SFA implementation requires +%description cm +This package implements the SFA interface which serves as a layer +between the existing PlanetLab NodeManager interfaces and the SFA API. + %description plc -Geniwrapper implements the SFA interface which serves as a layer +This package implements the SFA interface which serves as a layer between the existing PlanetLab interfaces and the SFA API. %description client @@ -89,31 +111,38 @@ rm -rf $RPM_BUILD_ROOT %files # sfa and sfatables depend each other. +%{_bindir}/sfa-server.py* /etc/sfatables/* %{python_sitelib}/* -/usr/bin/keyconvert +%{_bindir}/keyconvert.py* /var/www/html/wsdl/*.wsdl +%files cm +/etc/init.d/sfa-cm +%{_bindir}/sfa_component_setup.py* +# cron jobs here %files plc %defattr(-,root,root) -%config (noreplace) /etc/sfa/sfa_config +%config /etc/sfa/default_config.xml %config (noreplace) /etc/sfa/aggregates.xml %config (noreplace) /etc/sfa/registries.xml /etc/init.d/sfa +/etc/sfa/pl.rng %{_bindir}/sfa-config-tty %{_bindir}/sfa-import-plc.py* %{_bindir}/sfa-clean-peer-records.py* %{_bindir}/sfa-nuke-plc.py* -%{_bindir}/sfa-server.py* +%{_bindir}/gen-sfa-cm-config.py* +%{_bindir}/sfa-ca.py* %files client %config (noreplace) /etc/sfa/sfi_config -%{_bindir}/sfi.py* +%{_bindir}/sfi* %{_bindir}/getNodes.py* %{_bindir}/getRecord.py* %{_bindir}/setRecord.py* -%{_bindir}/genidump.py* +%{_bindir}/sfadump.py* %files sfatables %{_bindir}/sfatables @@ -121,10 +150,51 @@ rm -rf $RPM_BUILD_ROOT %pre plc [ -f %{_sysconfdir}/init.d/sfa ] && service sfa stop ||: +%pre cm +[ -f %{_sysconfdir}/init.d/sfa-cm ] && service sfa-cm stop ||: + %post plc chkconfig --add sfa +%post cm +chkconfig --add sfa-cm %changelog +* Thu May 11 2010 Tony Mack - sfa-0.9-11 +- SfaServer now uses a pool of threads to handle requests concurrently +- sfa.util.rspec no longer used to process/manage rspecs (deprecated). This is now handled by sfa.plc.network and is not backwards compatible +- PIs can now get a slice credential for any slice at their site without having to be a member of the slice +- Registry records for federated peers (defined in registries.xml, aggregates.xml) updated when sfa service is started +- Interfaces will try to fetch and install gids from peers listed in registries.xml/aggregates.xml if gid is not found in /etc/sfa/trusted_roots dir +- Component manager does not install gid files if slice already has them +- Server automatically fetches and installs peer certificats (defined in registries/aggregates.xml) when service is restarted. +- fix credential verification exploit (verify that the trusted signer is a parent of the object it it signed) +- made it easier for root authorities to sign their sub's certifiacate using the sfa-ca.py (sfa/server/sfa-ca.py) tool + +* Thu Jan 21 2010 anil vengalil - sfa-0.9-10 +- This tag is quite same as the previous one (sfa-0.9-9) except that the vini and max aggregate managers are also updated for urn support. Other features are: +- - sfa-config-tty now has the same features like plc-config-tty +- - Contains code to support both urn and hrn +- - Cleaned up request_hash related stuff +- - SM, AM and Registry code is organized under respective managers +- - Site and Slice synchronization across federated aggregates +- - Script to generate sfa_component_config + +* Fri Jan 15 2010 anil vengalil - sfa-0.9-9 +- sfa-config-tty now has the same features like plc-config-tty +- Contains code to support both urn and hrn +- Cleaned up request_hash related stuff +- SM, AM and Registry code is organized under respective managers +- Slice synchronization across federated aggregates +- some bugs are fixed + +* Wed Jan 06 2010 Thierry Parmentelat - sfa-0.9-8 +- checkpoint with fewer mentions of geni + +* Tue Jan 05 2010 Thierry Parmentelat - sfa-0.9-7 +- checkpointing +- this is believed to pass the tests; among other things: +- reworked configuration based on the myplc config with xml skeleton (no more sfa_config) + * Mon Nov 16 2009 anil vengalil - sfa-0.9-6 - This tag includes: - - Sfatables