From cf5968df61dc1002c844e0696d4f73442750d47c Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Aug 26 2014 21:03:02 +0000 Subject: import euca2ools-2.1.4-1.el7 --- diff --git a/.euca2ools.metadata b/.euca2ools.metadata new file mode 100644 index 0000000..d7c6340 --- /dev/null +++ b/.euca2ools.metadata @@ -0,0 +1 @@ +c8f8daa61b58c6de9431baef63e46f750e069d224306e8e263bbad567d82772f SOURCES/euca2ools-2.1.4.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 5231011..0000000 --- a/README.md +++ /dev/null @@ -1,8 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch -for CentOS-4, 5 or 6. If you find this file in a distro specific branch, it -means that no content has been checked in yet - -More information on how these git repositories are setup, is available at -http://wiki.centos.org/Sources diff --git a/SOURCES/euca2ools-2.1.3-boto-ssl.patch b/SOURCES/euca2ools-2.1.3-boto-ssl.patch new file mode 100644 index 0000000..bee37d4 --- /dev/null +++ b/SOURCES/euca2ools-2.1.3-boto-ssl.patch @@ -0,0 +1,45 @@ +Index: euca2ools-2.1.3/euca2ools/commands/euare/__init__.py +=================================================================== +--- euca2ools-2.1.3.orig/euca2ools/commands/euare/__init__.py ++++ euca2ools-2.1.3/euca2ools/commands/euare/__init__.py +@@ -46,3 +46,6 @@ class Euare(AWSQueryService): + Regions = [{"endpoint": "iam.amazonaws.com", + "name": "us-east-1", + "description": "US-East (Northern Virginia)"}] ++ ++ def __init__(self, **args): ++ return AWSQueryService.__init__(self, validate_certs=False, **args) +Index: euca2ools-2.1.3/euca2ools/commands/eucacommand.py +=================================================================== +--- euca2ools-2.1.3.orig/euca2ools/commands/eucacommand.py ++++ euca2ools-2.1.3/euca2ools/commands/eucacommand.py +@@ -504,7 +504,8 @@ class EucaCommand(object): + is_secure=self.is_secure, debug=self.debug, + host=self.host, + port=self.port, +- path=self.service_path) ++ path=self.service_path, ++ validate_certs=False) + else: + return boto.connect_s3( + aws_access_key_id=self.ec2_user_access_key, +@@ -513,7 +514,8 @@ class EucaCommand(object): + host=self.host, + port=self.port, + calling_format=OrdinaryCallingFormat(), +- path=self.service_path) ++ path=self.service_path, ++ validate_certs=False) + + def make_ec2_connection(self): + if self.region_name: +@@ -543,7 +545,8 @@ class EucaCommand(object): + region=self.region, + port=self.port, + path=self.service_path, +- api_version=self.APIVersion) ++ api_version=self.APIVersion, ++ validate_certs=False) + + def make_connection(self, conn_type='ec2'): + self.get_credentials() diff --git a/SOURCES/euca2ools-2.1.4-virttype.patch b/SOURCES/euca2ools-2.1.4-virttype.patch new file mode 100644 index 0000000..e4c2d01 --- /dev/null +++ b/SOURCES/euca2ools-2.1.4-virttype.patch @@ -0,0 +1,49 @@ +Index: euca2ools-2.1.4/euca2ools/commands/euca/register.py +=================================================================== +--- euca2ools-2.1.4.orig/euca2ools/commands/euca/register.py ++++ euca2ools-2.1.4/euca2ools/commands/euca/register.py +@@ -37,7 +37,7 @@ import sys + from boto.roboto.param import Param + + class Register(euca2ools.commands.eucacommand.EucaCommand): +- ++ APIVersion = '2010-06-15' + Description = 'Registers a manifest for use with the cloud.' + Options = [Param(name='block_device_mapping', + short_name='b', long_name='block-device-mapping', +@@ -67,7 +67,12 @@ class Register(euca2ools.commands.eucaco + doc='The root device name (e.g., /dev/sda1, or xvda).'), + Param(name='snapshot', short_name='s', long_name='snapshot', + optional=True, ptype='string', +- doc='The snapshot ID to use as the root device.')] ++ doc='The snapshot ID to use as the root device.'), ++ Param(name='virtualization_type', ++ long_name='virtualization-type', optional=True, ++ ptype='string', ++ doc=('[Privileged only] type of virtualization to ' ++ 'register the image with'))] + Args = [Param(name='image_location', + optional=True, ptype='string', + doc="""Path to the uploaded image (bucket/manifest). +@@ -104,7 +109,8 @@ class Register(euca2ools.commands.eucaco + kernel_id=self.kernel, + ramdisk_id=self.ramdisk, + root_device_name=self.root_device_name, +- block_device_map=self.block_device_mapping) ++ block_device_map=self.block_device_mapping, ++ virtualization_type=self.virtualization_type) + + def main_cli(self): + image_id = self.main() +Index: euca2ools-2.1.4/euca2ools/commands/eustore/installimage.py +=================================================================== +--- euca2ools-2.1.4.orig/euca2ools/commands/eustore/installimage.py ++++ euca2ools-2.1.4/euca2ools/commands/eustore/installimage.py +@@ -240,6 +240,7 @@ class InstallImage(AWSQueryRequest): + obj.root_device_name=None + obj.kernel=kernel_id + obj.ramdisk=ramdisk_id ++ obj.virtualization_type=None + return obj.main() + + def bundleAll(self, file, prefix, description, arch): diff --git a/SPECS/euca2ools.spec b/SPECS/euca2ools.spec new file mode 100644 index 0000000..3068024 --- /dev/null +++ b/SPECS/euca2ools.spec @@ -0,0 +1,235 @@ +# Spec file license: MIT + +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} + +Name: euca2ools +Version: 2.1.4 +Release: 1%{?dist} +Summary: Eucalyptus/AWS-compatible command line tools + +Group: Applications/Internet +License: BSD +URL: http://www.eucalyptus.com/ +Source0: http://downloads.eucalyptus.com/software/euca2ools/2.0/source/euca2ools-%{version}.tar.gz + +Requires: m2crypto +# This requires EC2Connection.register_image to have a virtualization_type arg. +# The 2.13.3-1 package includes it as a backport. +Requires: python-boto >= 2.13.3-1 +Requires: rsync +Requires: util-linux + +Obsoletes: euca2ools-eustore < 2.1.1-2 +Provides: euca2ools-eustore = %{version}-%{release} + +BuildRequires: help2man +BuildRequires: python-devel +BuildRequires: python-setuptools-devel + +# For building man pages +BuildRequires: python-boto >= 2.0 +BuildRequires: m2crypto + +BuildArch: noarch + +# Disable SSL cert validation by default for boto 2.6+ compatibility +# (Eucalyptus uses self-signed certs by default, which breaks connections) +Patch1: euca2ools-2.1.3-boto-ssl.patch +# Add euca-register --virtualization-type per Fedora rel-eng's request +# Requires fixes from boto 2.14, backported in python-boto-2.13.3-1 +Patch2: euca2ools-2.1.4-virttype.patch + + +%description +Euca2ools are command line tools used to interact with Eucalyptus, +a service overlay designed to be interface-compatible with Amazon Web +Services (AWS), as well as AWS itself. + + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 + + +%build +%{__python} setup.py build +export PYTHON=%{__python} +sh -xe generate-manpages.sh + + +%install +%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} + +export DESTDIR=%{buildroot} +export PREFIX=%{_prefix} +sh -xe install-manpages.sh + + +%clean +rm -rf %{buildroot} + + +%files +%{_bindir}/euare-* +%{_bindir}/euca-* +%{_bindir}/eustore-* +%{_mandir}/man1/euare* +%{_mandir}/man1/euca* +%{_mandir}/man1/eustore* +%{python_sitelib}/%{name}-*.egg-info +%{python_sitelib}/%{name}/ +%doc CHANGELOG +%doc COPYING +%doc INSTALL +%doc README + + +%changelog +* Thu Sep 26 2013 Garrett Holmstrom - 2.1.4-1 +- Upstream update (2.1.4) +- Fixed eustore-install-image breakage from 2.1.3-2 [RH:1001433] + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 21 2013 Garrett Holmstrom - 2.1.3-2 +- Disabled SSL cert validation to make things work with boto 2.6+ +- Fixed eustore account name checking [TOOLS-282] +- Fixed eustore registering images with the wrong type [TOOLS-184] +- Fixed euare-userlistpolicies -v --delegate [TOOLS-281] +- Fixed euca-get-console-output crash on no output +- Added euca-register --virtualization type (note that it requires special privs) + +* Mon Mar 4 2013 Garrett Holmstrom - 2.1.3-1 +- Upstream update (2.1.3) [RH:916716] +- Fix euare-useraddpolicy --delegate + +* Wed Feb 13 2013 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Oct 10 2012 Garrett Holmstrom - 2.1.1-2 +- Combined the -eustore package into the main package [RH:865108] + +* Wed Sep 13 2012 Garrett Holmstrom - 2.1.1-1 +- Upstream update (2.1.1) +- The new EuStore tools introduced in this version are in the -eustore package. + +* Thu Jul 19 2012 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Apr 17 2012 Garrett Holmstrom - 2.0.2-1 +- Upstream update (2.0.2) + +* Tue Apr 17 2012 Garrett Holmstrom - 1.3.2-1 +- Upstream update (1.3.2) + +* Wed Apr 4 2012 Garrett Holmstrom - 2.0.1-1 +- Upstream update (2.0.1) + +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jul 22 2011 Garrett Holmstrom - 1.3.1-12 +- Fixed registration of EBS-backed images + +* Fri Jul 1 2011 Garrett Holmstrom - 1.3.1-11 +- Backported support for bundle upload location constraints [LP:704658] + +* Fri Jun 10 2011 Garrett Holmstrom - 1.3.1-11 +- Fixed handling of empty block device sizes +- Fixed euca-describe-image-attribute -B output [LP:795395] + +* Tue Apr 26 2011 Garrett Holmstrom - 1.3.1-10 +- Added unlisted dependencies for euca-bundle-vol +- Fixed typos introduced by the FSID patch +- Fixed bundling failure on small images [LP:760157] +- Fixed use of bad mkfs options on older systems [LP:771498] + +* Tue Mar 22 2011 Garrett Holmstrom - 1.3.1-9 +- Work around Boto 2.0 + Eucalyptus 2.0 incompatibility [RH:684976] + +* Mon Mar 7 2011 Garrett Holmstrom - 1.3.1-8 +- Fix Boto 2.0 compatibility + +* Fri Mar 4 2011 Garrett Holmstrom - 1.3.1-7 +- Fix backtrace when --user-data-file does not exist [LP:726901] +- Don't require source subnet when (de)authorizing [LP:725170] + +* Thu Feb 17 2011 Garrett Holmstrom - 1.3.1-6 +- Stop stripping leading '0's from user IDs [LP:479823] +- Fix bad behavior with user IDs that contain '-' +- Preserve filesystem labels and UUIDs when bundling [LP:667793 LP:672986] + +* Tue Feb 08 2011 Fedora Release Engineering - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 15 2010 Garrett Holmstrom - 1.3.1-4 +- Fix EC2-incompatible bundle checksumming [LP:665667] + +* Wed Dec 8 2010 Garrett Holmstrom - 1.3.1-3 +- Fix URI parsing in main euca2ools module [RH:658560 LP:405628] +- Fix euca-confirm-product-instance crash [LP:548483] + +* Wed Dec 8 2010 Garrett Holmstrom - 1.3.1-2.1 +- Remove extraneous copies of executables from %%{_bindir} + +* Thu Nov 18 2010 Garrett Holmstrom - 1.3.1-2 +- Fix euca-bundle-image returning Odd-length string errors [LP:509562] +- Fix euca-bundle-image failure to use symbolic links [LP:522292] +- Fix euca-bundle-image --help yielding 'Invalid user' messages [LP:546526] +- Fix rebundled instance boot failure [LP:551847] +- Check a default location for Eucalyptus certificate [LP:479836] +- Fix euca-describe-image-attribute --kernel or --ramdisk [LP:546551] +- Fix euca-describe-images listing too many images on EC2 [LP:541468] +- Fix euca-download-bundle usage message [LP:546567] +- Fix failures related to a spurious space in euca-describe-images [LP:531453] +- Fix euca-run-instances parameter validation [LP:546420] +- Fix euca-run-instances usage message [LP:530816] + +* Sat Sep 4 2010 Garrett Holmstrom - 1.3.1-1 +- Upstream bugfix release [LP:629118] + +* Wed Aug 25 2010 Garrett Holmstrom - 1.3-1 +- Update to 1.3 final +- This release no longer requires python-boto 2.0 + +* Fri Jul 30 2010 Garrett Holmstrom - 1.2-5.20100701bzr293 +- Rebuild prerelease against Python 2.7 + +* Thu Jul 22 2010 Garrett Holmstrom - 1.2-4.20100701bzr293 +- Update to a snapshot that includes support for block device mapping [575258] + +* Wed Jul 21 2010 David Malcolm - 1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Mar 22 2010 Garrett Holmstrom - 1.2-2 +- Fix bad version reporting [LP:522396] +- Fix broken rc file searching [LP:516738 LP:524652] +- Fix reversed kernel+ramdisk display order in euca-describe-images [LP:256697] +- Fix broken file patch processing [LP:522060] +- Make euca-create-volume documentation consistent [LP:542097] +- Correct help files for euca-{modify,reset}-image-attribute [LP:543559] +- Fix euca-bundle-image --block-device-mapping [575166] + +* Thu Feb 18 2010 Garrett Holmstrom - 1.2-1 +- Upstream update + +* Thu Feb 4 2010 Garrett Holmstrom - 1.1-5 +- Fix changelog + +* Wed Jan 20 2010 Garrett Holmstrom - 1.1-4 +- Stop requiring swig +- Take ownership of %%{python_sitelib}/%%{name} directory +- Clarify description +- Drop now-superfluous buildroot tag and cleaning step + +* Fri Jan 15 2010 Garrett Holmstrom - 1.1-3 +- Update download URI + +* Fri Jan 8 2010 Garrett Holmstrom - 1.1-2 +- Add COPYING and INSTALL docfiles + +* Fri Jan 8 2010 Garrett Holmstrom - 1.1-1 +- Initial packaging attempt