--- ec2-ami-tools-1.3.49953.orig/debian/changelog +++ ec2-ami-tools-1.3.49953/debian/changelog @@ -0,0 +1,80 @@ +ec2-ami-tools (1.3.49953-0ubuntu1~lucid1) lucid-backports; urgency=low + + * Automated backport upload; no source changes. + + -- Scott Moser Tue, 22 Jun 2010 18:23:13 +0100 + +ec2-ami-tools (1.3.49953-0ubuntu1) maverick; urgency=low + + * New upstream release. Adds support for ap-southeast-1. LP: #582387 + + -- Scott Moser Tue, 18 May 2010 13:48:53 -0400 + +ec2-ami-tools (1.3-45758-0ubuntu1) lucid; urgency=low + + * New upstream version. Supports us-west-1. + + -- Scott Moser Mon, 07 Dec 2009 13:51:18 -0500 + +ec2-ami-tools (1.3-34544-0ubuntu3) karmic; urgency=low + + * Fix FTBFS. + + -- Chuck Short Mon, 05 Oct 2009 11:55:28 -0400 + +ec2-ami-tools (1.3-34544-0ubuntu2) karmic; urgency=low + + * use randomly generated filenames when calling mkfifo + + -- Scott Moser Thu, 01 Oct 2009 00:00:36 -0400 + +ec2-ami-tools (1.3-34544-0ubuntu1) karmic; urgency=low + + * New upstream version. + + -- Chuck Short Tue, 02 Jun 2009 10:07:14 -0400 + +ec2-ami-tools (1.3-31057-0ubuntu1) jaunty; urgency=low + + * New upstream version. (LP: #310547) + * debian/patches/exclude-udev-rules.patch: Exclude the copying of + /etc/udev/rules.d/70-persistent-net.rules and + /etc/udev/rules.d/z25_persistent-net.rules when rebundling an image. + (LP: #308548) + * debian/patches/point-to-right-place: Updated patch to take in account + ec2-migrate-manifest and ec2-migrate-bundle. + + -- Chuck Short Tue, 13 Jan 2009 11:46:59 -0500 + +ec2-ami-tools (1.3-26357-0ubuntu5) intrepid; urgency=low + + * debian/control: depend on curl. + + -- Mathias Gug Thu, 23 Oct 2008 11:22:38 -0400 + +ec2-ami-tools (1.3-26357-0ubuntu4) intrepid; urgency=low + + * Fix typo in debian/patches/point-to-right-place.patch. + + -- Chuck Short Tue, 21 Oct 2008 11:09:00 -0400 + +ec2-ami-tools (1.3-26357-0ubuntu3) intrepid; urgency=low + + * debian/control: depend on libopenssl-ruby (LP: #284744). + + -- Mathias Gug Fri, 17 Oct 2008 12:44:45 -0400 + +ec2-ami-tools (1.3-26357-0ubuntu2) intrepid; urgency=low + + * New upstream version. + * Update the debian copyright file. + * Added quilt patch system to make it easier to maintain. + + -- Chuck Short Tue, 14 Oct 2008 08:35:25 -0400 + +ec2-ami-tools (1.3-21885-0ubuntu1) unstable; urgency=low + + * Initial release. + + -- Soren Hansen Wed, 10 Sep 2008 13:22:10 +0200 + --- ec2-ami-tools-1.3.49953.orig/debian/copyright +++ ec2-ami-tools-1.3.49953/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Soren Hansen on +Wed, 10 Sep 2008 13:22:10 +0200. + +It was downloaded from + +Upstream Author(s): + + Amazon.com + +Copyright: + + Copyright 2008 Amazon.com, Inc or its affiliates. + +License: + + Licensed under the Amazon Software License (the + "License"). You may not use this file except in compliance with the + License. A copy of the License is located at + http://aws.amazon.com/asl or in the "license" file accompanying this + file. This file is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See + the License for the specific language governing permissions and + limitations under the License + +The Debian packaging is (C) 2008, Soren Hansen and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- ec2-ami-tools-1.3.49953.orig/debian/compat +++ ec2-ami-tools-1.3.49953/debian/compat @@ -0,0 +1 @@ +7 --- ec2-ami-tools-1.3.49953.orig/debian/docs +++ ec2-ami-tools-1.3.49953/debian/docs @@ -0,0 +1,2 @@ +readme-install.txt +readme-install.txt --- ec2-ami-tools-1.3.49953.orig/debian/rules +++ ec2-ami-tools-1.3.49953/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +install/ec2-ami-tools:: + mkdir -p debian/ec2-ami-tools/etc + mkdir -p debian/ec2-ami-tools/usr/bin/ + mkdir -p debian/ec2-ami-tools/usr/lib/ec2-ami-tools/lib + cp -r etc/* debian/ec2-ami-tools/etc/ + cp -r bin/* debian/ec2-ami-tools/usr/bin/ + cp -r lib/* debian/ec2-ami-tools/usr/lib/ec2-ami-tools/lib/ --- ec2-ami-tools-1.3.49953.orig/debian/dirs +++ ec2-ami-tools-1.3.49953/debian/dirs @@ -0,0 +1 @@ +usr/bin --- ec2-ami-tools-1.3.49953.orig/debian/control +++ ec2-ami-tools-1.3.49953/debian/control @@ -0,0 +1,14 @@ +Source: ec2-ami-tools +Section: admin +Priority: extra +Maintainer: Soren Hansen +Build-Depends: cdbs, debhelper (>= 7), quilt +Standards-Version: 3.7.3 + +Package: ec2-ami-tools +Architecture: all +Depends: ${misc:Depends}, ruby, libopenssl-ruby, curl +Description: Amazon EC2 AMI tools + The Amazon EC2 AMI Tools are command-line utilities to help bundle an + Amazon Machine Image (AMI), create an AMI from an existing machine or + installed volume, and upload a bundled AMI to Amazon S3. --- ec2-ami-tools-1.3.49953.orig/debian/patches/use-mktemp-like-mkfifo-name.patch +++ ec2-ami-tools-1.3.49953/debian/patches/use-mktemp-like-mkfifo-name.patch @@ -0,0 +1,59 @@ +--- ec2-ami-tools/lib/ec2/amitools/fileutil.rb.dist 2009-10-01 02:42:43.000000000 +0000 ++++ ec2-ami-tools/lib/ec2/amitools/fileutil.rb 2009-10-01 02:54:24.000000000 +0000 +@@ -11,6 +11,7 @@ + # Utility class and methods. + + require 'ec2/amitools/exception' ++require 'ec2/amitools/util' + require 'tmpdir' + require 'fileutils' + require 'pathname' +@@ -219,4 +220,16 @@ + end + sf.eof + end ++ ++ def FileUtil.tempfifo(basename="ec2ami", tmpdir=Dir::tmpdir, tries=10) ++ dir = Dir.tmpdir() ++ for i in (1..tries) ++ file = File::join(dir, basename + "." + gen_ident() ) ++ if system( "mkfifo --mode 600 #{file}" ) ++ return file ++ end ++ end ++ return false ++ end ++ + end +--- ec2-ami-tools/lib/ec2/amitools/unbundle.rb.dist 2009-10-01 02:59:09.000000000 +0000 ++++ ec2-ami-tools/lib/ec2/amitools/unbundle.rb 2009-10-01 03:50:36.000000000 +0000 +@@ -33,10 +33,9 @@ + src_dir = p.source + dst_dir = p.destination + +- digest_pipe = File::join( '/tmp', "ec2-unbundle-image-digest-pipe" ) +- File::delete( digest_pipe ) if File::exist?( digest_pipe ) +- unless system( "mkfifo #{digest_pipe}" ) +- raise "error creating named pipe #{digest_pipe}" ++ digest_pipe = FileUtil::tempfifo("ec2-unbundle-image-digest") ++ if digest_pipe == false ++ raise "Error creating named pipe" + end + + # Load manifest and the user's private key. +--- ec2-ami-tools/lib/ec2/amitools/bundle.rb.dist 2009-10-01 02:42:22.000000000 +0000 ++++ ec2-ami-tools/lib/ec2/amitools/bundle.rb 2009-10-01 03:50:51.000000000 +0000 +@@ -45,10 +45,9 @@ + begin + raise "invalid image-type #{image_type}" unless image_type.is_a? Bundle::ImageType + # Create named pipes. +- digest_pipe = File::join('/tmp', 'ec2-bundle-image-digest-pipe') +- File::delete(digest_pipe) if File::exist?(digest_pipe) +- unless system( "mkfifo #{digest_pipe}" ) +- raise "Error creating named pipe #{digest_pipe}" ++ digest_pipe = FileUtil::tempfifo("ec2-bundle-image-digest") ++ if digest_pipe == false ++ raise "Error creating named pipe" + end + + # If the prefix differs from the file name create a symlink --- ec2-ami-tools-1.3.49953.orig/debian/patches/exclude-udev-rules.patch +++ ec2-ami-tools-1.3.49953/debian/patches/exclude-udev-rules.patch @@ -0,0 +1,15 @@ +diff -Naur ec2-ami-tools-1.3-30354.orig/lib/ec2/platform/linux/image.rb ec2-ami-tools-1.3-30354/lib/ec2/platform/linux/image.rb +--- ec2-ami-tools-1.3-30354.orig/lib/ec2/platform/linux/image.rb 2008-12-09 10:16:44.000000000 -0500 ++++ ec2-ami-tools-1.3-30354/lib/ec2/platform/linux/image.rb 2009-01-13 13:00:55.000000000 -0500 +@@ -25,7 +25,10 @@ + # Symbolic links are preserved. + class Image + IMG_MNT = '/mnt/img-mnt' +- EXCLUDES= ['/dev', '/media', '/mnt', '/proc', '/sys'] ++ EXCLUDES= ['/dev', '/media', '/mnt', '/proc', '/sys', ++ '/etc/udev/rules.d/70-persistent-net.rules', ++ '/etc/udev/rules.d/z25_persistent-net.rules' ++ ] + DEFAULT_FSTAB = EC2::Platform::Linux::Fstab::DEFAULT + LEGACY_FSTAB = EC2::Platform::Linux::Fstab::LEGACY + --- ec2-ami-tools-1.3.49953.orig/debian/patches/point-to-right-place.patch +++ ec2-ami-tools-1.3.49953/debian/patches/point-to-right-place.patch @@ -0,0 +1,81 @@ +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-ami-tools-version ec2-ami-tools-1.3-31057/bin/ec2-ami-tools-version +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-ami-tools-version 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-ami-tools-version 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/showversion.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-image ec2-ami-tools-1.3-31057/bin/ec2-bundle-image +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-image 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-bundle-image 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/bundleimage.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-vol ec2-ami-tools-1.3-31057/bin/ec2-bundle-vol +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-vol 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-bundle-vol 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/bundlevol.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-delete-bundle ec2-ami-tools-1.3-31057/bin/ec2-delete-bundle +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-delete-bundle 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-delete-bundle 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/deletebundle.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-download-bundle ec2-ami-tools-1.3-31057/bin/ec2-download-bundle +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-download-bundle 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-download-bundle 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/downloadbundle.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-bundle ec2-ami-tools-1.3-31057/bin/ec2-migrate-bundle +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-bundle 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-migrate-bundle 2009-01-15 09:58:49.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/migratebundle.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-manifest ec2-ami-tools-1.3-31057/bin/ec2-migrate-manifest +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-manifest 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-migrate-manifest 2009-01-15 09:58:38.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/migratemanifest.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-unbundle ec2-ami-tools-1.3-31057/bin/ec2-unbundle +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-unbundle 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-unbundle 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/unbundle.rb $* +diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-upload-bundle ec2-ami-tools-1.3-31057/bin/ec2-upload-bundle +--- ec2-ami-tools-1.3-31057.orig/bin/ec2-upload-bundle 2008-12-29 12:49:39.000000000 -0500 ++++ ec2-ami-tools-1.3-31057/bin/ec2-upload-bundle 2009-01-15 09:58:08.000000000 -0500 +@@ -1,4 +1,4 @@ + #!/bin/bash + +-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}} ++home=/usr/lib/ec2-ami-tools + ruby -I $home/lib ${home}/lib/ec2/amitools/uploadbundle.rb $* --- ec2-ami-tools-1.3.49953.orig/debian/patches/series +++ ec2-ami-tools-1.3.49953/debian/patches/series @@ -0,0 +1,3 @@ +point-to-right-place.patch +exclude-udev-rules.patch +use-mktemp-like-mkfifo-name.patch