poolparty 1.6.6 → 1.6.7

data/VERSION.yml

@@ -1,5 +1,4 @@
 --- 
-:minor: 6
-:patch: 6
+:patch: 7
 :major: 1
-:build: 
+:minor: 6

data/lib/poolparty/chef_solo.rb

@@ -17,7 +17,6 @@ module PoolParty
       puts "Copying the chef-repo into the base directory from #{repo}"
       
       FileUtils.mkdir_p base_directory
-      FileUtils.mkdir_p roles_dir # Why do we need this??!?
       if File.directory?(repo)
         if File.exist?(base_directory)
           # First remove the directory

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.6.6
+  prerelease: false
+  segments: 
+  - 1
+  - 6
+  - 7
+  version: 1.6.7
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -313,70 +318,6 @@ files:
 - test/lib/poolparty/rds_test.rb
 - test/test_helper.rb
 - test/test_methods.rb
-- vendor/gems/amazon-ec2/ChangeLog
-- vendor/gems/amazon-ec2/LICENSE
-- vendor/gems/amazon-ec2/README.rdoc
-- vendor/gems/amazon-ec2/README_dev.rdoc
-- vendor/gems/amazon-ec2/Rakefile
-- vendor/gems/amazon-ec2/VERSION
-- vendor/gems/amazon-ec2/amazon-ec2.gemspec
-- vendor/gems/amazon-ec2/bin/ec2-gem-example.rb
-- vendor/gems/amazon-ec2/bin/ec2-gem-profile.rb
-- vendor/gems/amazon-ec2/bin/ec2sh
-- vendor/gems/amazon-ec2/bin/setup.rb
-- vendor/gems/amazon-ec2/deps.rip
-- vendor/gems/amazon-ec2/lib/AWS.rb
-- vendor/gems/amazon-ec2/lib/AWS/Autoscaling.rb
-- vendor/gems/amazon-ec2/lib/AWS/Autoscaling/autoscaling.rb
-- vendor/gems/amazon-ec2/lib/AWS/Cloudwatch.rb
-- vendor/gems/amazon-ec2/lib/AWS/Cloudwatch/monitoring.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/availability_zones.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/console.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/devpay.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/elastic_ips.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/image_attributes.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/images.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/instances.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/keypairs.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/products.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/security_groups.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/snapshots.rb
-- vendor/gems/amazon-ec2/lib/AWS/EC2/volumes.rb
-- vendor/gems/amazon-ec2/lib/AWS/ELB.rb
-- vendor/gems/amazon-ec2/lib/AWS/ELB/load_balancers.rb
-- vendor/gems/amazon-ec2/lib/AWS/RDS.rb
-- vendor/gems/amazon-ec2/lib/AWS/RDS/rds.rb
-- vendor/gems/amazon-ec2/lib/AWS/exceptions.rb
-- vendor/gems/amazon-ec2/lib/AWS/responses.rb
-- vendor/gems/amazon-ec2/perftools/ec2prof
-- vendor/gems/amazon-ec2/perftools/ec2prof-results.dot
-- vendor/gems/amazon-ec2/perftools/ec2prof-results.txt
-- vendor/gems/amazon-ec2/perftools/ec2prof.symbols
-- vendor/gems/amazon-ec2/test/test_Autoscaling_groups.rb
-- vendor/gems/amazon-ec2/test/test_EC2.rb
-- vendor/gems/amazon-ec2/test/test_EC2_availability_zones.rb
-- vendor/gems/amazon-ec2/test/test_EC2_console.rb
-- vendor/gems/amazon-ec2/test/test_EC2_elastic_ips.rb
-- vendor/gems/amazon-ec2/test/test_EC2_image_attributes.rb
-- vendor/gems/amazon-ec2/test/test_EC2_images.rb
-- vendor/gems/amazon-ec2/test/test_EC2_instances.rb
-- vendor/gems/amazon-ec2/test/test_EC2_keypairs.rb
-- vendor/gems/amazon-ec2/test/test_EC2_products.rb
-- vendor/gems/amazon-ec2/test/test_EC2_responses.rb
-- vendor/gems/amazon-ec2/test/test_EC2_s3_xmlsimple.rb
-- vendor/gems/amazon-ec2/test/test_EC2_security_groups.rb
-- vendor/gems/amazon-ec2/test/test_EC2_snapshots.rb
-- vendor/gems/amazon-ec2/test/test_EC2_volumes.rb
-- vendor/gems/amazon-ec2/test/test_ELB_load_balancers.rb
-- vendor/gems/amazon-ec2/test/test_RDS.rb
-- vendor/gems/amazon-ec2/test/test_helper.rb
-- vendor/gems/amazon-ec2/wsdl/2007-08-29.ec2.wsdl
-- vendor/gems/amazon-ec2/wsdl/2008-02-01.ec2.wsdl
-- vendor/gems/amazon-ec2/wsdl/2008-05-05.ec2.wsdl
-- vendor/gems/amazon-ec2/wsdl/2008-12-01.ec2.wsdl
-- vendor/gems/amazon-ec2/wsdl/2009-10-31.ec2.wsdl
-- vendor/gems/amazon-ec2/wsdl/2009-11-30.ec2.wsdl
 - vendor/gems/dslify/LICENSE
 - vendor/gems/dslify/README.rdoc
 - vendor/gems/dslify/Rakefile
@@ -534,18 +475,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing easier.

data/vendor/gems/amazon-ec2/ChangeLog

@@ -1,304 +0,0 @@
-=== 0.7.4 2009-12-05
- * Initial support for new EBS AMI's
- * Updated EC2 API version
- * Added US West 1 Data Center to list of valid endpoints. (us-west-1.ec2.amazonaws.com)
- * Updated exceptions.rb to be in sync with latest documented exceptions.
- * Updated #run_instances to support EBS AMI's and sync with latest options.
- * Added new #stop_instances and #start_instances methods.
- * Added new #create_image to allow bundling of a running instance to an EBS backed AMI.
- * Added stub methods for all known missing EC2 methods. (Please help with patches + tests!)
- * Added and updated tests for new/modified methods.
-
-=== 0.6.1 2009-10-13
- * Additional commits for AutoScaling.  Thanks to Ari (auser)!
- * Updated README.rdoc installation instructions.  Reflects removal of deprecated GitHub gem building.
-
-=== 0.6.0 2009-09-30
- * Added support for AWS AutoScaling for EC2.  Thanks to Ari Lerner (auser)!
-
-=== 0.5.2 2009-08-20
- * Converted to YardDoc documentation format. See : http://yard.soen.ca/getting_started
-
-=== 0.5.0 2009-08-11
- * Major re-factor by Kris Rasmussen (krisr) to add support for the AWS Elastic Load Balancer API. Kudos Kris!
-
-=== 0.4.0 2009-06-06
- * Using technicalpickles/jeweler to manage gem now.  See : http://github.com/technicalpickles/jeweler/tree/master
-
-=== 0.3.8 2009-04-16
- * Applied patch, with updated tests to fix issue with base64 encoded user data (rsanheim).
- * Applied patch, fixing an issue with EU Signature version 2 creation (delano).
-
-=== 0.3.6 2009-03-02
- * You can now specify any arbitrary SSL tcp port to connect to (kerryb)
- * Added rake target to quickly install the gem without docs
-
-=== 0.3.5 2009-02-26
- * Honor the EC2_URL env var if provided in the main lib
- * Some minor modifications to the exceptions raised when unknown
-
-=== 0.3.4 2009-01-31
- * Added support in the helper binaries for EC2_URL server url for Euro servers
- * AWS Signature v2 support
-
-=== 0.3.3 2009-01-24
-  * Removed docs related to the ability to get Response#xml which is deprecated
-  * Fixed conflict when aws/s3 gem was included in user code
-
-=== 0.3.2 2008-12-11
- * Updated API version to 2008-12-01
- * Note : The new European EC2 zone should just work if you specify ':server => "eu-west-1.ec2.amazonaws.com"' when initializing AWS::EC2::Base.new().  Please report any issues you have with using this new service.
-
-=== 0.3.1 2008-09-18
- * Added basic custom kernel id support to run_instances.  Thanks to Keith Hudgins for the patch.
-
-=== 0.3.0 2008-08-24
- * Changed response object from AmazonAWS::Response to Hash (patch from Yan Pritzker 'skwp') Thanks!
- * Added support for Elastic Block Storage (patch from Yann Klis 'yannski') Thanks!
- * Bumped AWS EC2 API version to 2008-05-05
- * Bumped gem version number
- * Whitespace cleanup
-
-=== 0.2.15 2008-08-20
- * Updated gem install instructions, and dependency specifications in the gemspec.
-
-=== 0.2.14 2008-06-30
- * Merged patch from 'orionz' which adds support for EC2 Availability Zones.  Thanks!
-
-=== 0.2.12 2008-04-25
- * A few adjustments to work with GitHub.
-
-=== 0.2.11 2008-04-25
- * Moved gem completely to GitHub.
- * Removed a LOT of RubyForge related cruft that's no longer needed.
-
-=== 0.2.10 2008-04-13
- * Fix bug where ec2#disassociate_address would return 'undefined method 'reject!' for "xxx.xxx.xxx.xxx":String'.
-   Thanks to Brian Thomas for reporting.
-
-=== 0.2.9 2008-03-31
- * Added initial support for API version 2008-02-01.  Support for new 'Elastic IP' functionality added.
-
-=== 0.2.8 2008-02-25
- * Change HTTP API requests to use POST instead of GET.  Based on patch #18380 from 'anonymous'.
-
-=== 0.2.7 2008-02-17
- * Add support for HTTP Proxy when :proxy_server argument is passed.  Based on patch from Mathias Dalheimer.
-
-=== 0.2.6 2007-10-16
- * Updated to support EC2 API version 2007-08-29 released on 2007-10-16
- * Supports new instances type feature.  Specify an instance type to launch
-   (m1.small, m1.large, m1.xlarge) when you call the 'run_instances' method.
-
-   e.g. add to the params hash ':instance_type => "m1.small"'
-  * RunInstances and DescribeInstances now return the time when the Amazon EC2 instance was launched.
-  * Code Tidyup : Removed trailing spaces in code docs.
-
-=== 0.2.5 2007-09-26
- * Updated using Dr. Nic's newgem v. 0.13.5
- * Updated email address.
- * No functional changes in the gem.
-
-=== 0.2.4 2007-07-09
- * Changed how require statement for xmlsimple is called so we don't get warnings when running in rails.
- Now it looks like: require 'xmlsimple' unless defined? XmlSimple
-
-=== 0.2.3 2007-07-06
- * Updated gem to work with new official release of AWS API version 2007-03-01 which occurred
- on July 6, 2007.
-  * Added support for primary new feature which supports Paid AMI's and the product codes
-  associated with them.  Modified several methods to support this change, updated the test
-  cases, and added a new method EC2#confirm_product_instance.
-
-=== 0.2.2 2007-07-03
- * Minor change to test case.
-
-=== 0.2.1 2007-07-03
- * Some minor changes to the RDocs and README.txt
-
-=== 0.2.0 2007-07-03
-
- * MAJOR library changes : THESE CHANGES ARE NOT BACKWARD COMPATIBLE!!  You will need to update
- the way in which you make calls, handle responses, and rescue exceptions from this library.
- If you prefer not to make these changes you can feel free to continue to use the older version
- of the gem.  These older versions however will no longer be maintained.
-
- * MAJOR refactoring of how methods calls are made.  Now all methods are called with a simple hash
- of arguments and none of them are positional.  This feels much more "Ruby'ish".
-
- * MAJOR refactoring of how responses are returned to users.  No longer do you have to call the
- .parse method, and no longer are you getting back simple arrays of information.  Responses
- now come in the form of OpenStruct objects that contain all of the data for an object in
- Enumerable form so you can use iterators (.each, .each_pair, etc).  All methods return an AWS::Response object
- which inherits from OpenStruct.  The return data from EC2, which is in XML form, is parsed
- with XmlSimple and is used to directly construct the return data structure.  This allows us
- to know with some confidence that the data structure returned from AWS will always be consistent
- with this library's responses.  There is also an .xml attribute for each response object that lets you
- see the full and complete XML response from AWS if that is useful to you.
-
- * Added an exception framework which will now throw appropriate Ruby exceptions
- that match those handed to us by Amazon EC2.  ArgumentError exceptions will also
- be thrown if you are making calls we know to be illegal or malformed.  You should rescue
- these exceptions in your application instead of parsing text responses.  All exceptions
- descend from AWS::Error.  You can see them all in exceptions.rb in the gem install.
-
- * Added a full suite of test/spec unit tests which currently cover 100% of the public methods
- in this library.  We have abot 92% code coverage according to rcov.  This has greatly enhanced
- the reliability of the library as well as our confidence in the code.
- We used to have 0% test coverage. :-/
-
- * Added an EC2 command shell : 'ec2sh' which can be called from anywhere and gives you
- an interactive irb session with an EC2 connection pre-made for you as @ec2.  You can use this
- to interactively execute any command on EC2 that this library supports.  Try @ec2.methods.sort
- or @ec2.describe_images to test it out.  You must first setup two shell environment variables
- which contain your ACCESS_KEY_ID and SECRET_ACCESS_KEY for this to work.  Otherwise an error
- will be thrown when you try to start it.  This is way cool and shamelessly borrowed from
- Marcel Molina's fine AWS::S3 library.
-
- * Updated API version in the query API request to 2007-01-19, and added all known method calls
- in this version of the API to the gem (including reboot, viewing console output, NAT addressing
- and more!)
-
- * Removed .parse method as it is no longer needed or wanted.
-
- * Removed 'verbose' attribute writer and a couple of related debug 'puts' calls in EC2.rb.
-
- * Removed deprecated alias's used in the library that were added in v0.0.3
-
- * Gem now requires XmlSimple gem to be installed.
-
-
-=== 0.1.0 2007-05-30
-
- * Repackaged with updated newgem generator v. 0.10.3 from http://newgem.rubyforge.org/ to take advantage of new deployment goodness.
-
-
-=== 0.0.7 2007-03-15
-
- * Applied patch from Kevin Clark which does the following:
-   * New method to the instances.rb to allow for issuing a reboot command to an EC2 instance.
-   * New Mocha based tests (Mocha test suite must be installed to run tests.  'sudo gem install mocha')
-   * Cleanup of the test directory.
- * Applied patch from Randy Bias related to CGI escaping error.  From his notes:
-
- I finally figured out what was going on.  It was a compound problem.  The first being that you can't
- CGI::encode the UserData early.    You have to just Base64 encode it.  Unfortunately, when you Base64
- encode it, it means that some encodings will be padded with extra chars, specifically the '=', but &, ?
- and = get stripped by EC2.canonial_string.  So if a Base64 encoding has trailing ='s for padding,
- these get stripped and then you sign the UserData Base64 payload sans the padding.  But it looks
- like Amazon's side is doing the right thing and is signing the padding.  So, the signatures mis-match.
-
- I've got the complete patch here and it's about as elegant/clean as I could make it in a short
- period of time.  It's a little tough to strip those equal signs when there are so many in the URI.
- I think this works pretty well, though.  I'm splitting the URI on '&', then for each field ripping
- out all '&' and '?' and only the first '='.  Then stitching it back together.
-
-
-=== 0.0.6 2007-03-02
- * Patched instances.rb with a bugfix and patch provided by Randy Bias (Thanks Randy!).
- Only minimally tested so please let me know if this causes any problems for anyone.
-
- From his notes:
- I wanted to let you know that there appears to be a bug in how user data is passed.  In
- instances.rb the line that creates the base64 encoded package of user data is as follows:
-
- userData = CGI::escape(Base64.encode64(in_params[:userData]).strip())
-
- This may have worked prior, but at least right now the CGI::escape appears to cause a
- breakage.  More specifically it turns something like this (the actual base64 encoded string):
-
- YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh
- eHh4eHh4eHh4eHh4eHh4eHh4eHgg
-
- Into this:
-
- YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh%
- 0AeHh4eHh4eHh4eHh4eHh4eHh4eHgg
-
- And it looks like EC2 chokes on the %0, which is CGI::escape's way for handling an EOL.
- Unfortunately, the Base64.encode64 (at least in my 1.8.5 version of Ruby) inserts a
- EOL at every 47 chars, no matter what:
-
- ---
- [randyb@master randyb] cat /tmp/foo.rb
- #!/usr/bin/env ruby
- #
- require 'rubygems'
- require_gem 'amazon-ec2'
- require 'getoptlong'
- puts Base64.encode64
- ("012345678901234567890123456789012345678901234567890123456789")
-
- [randyb@master randyb] /tmp/foo.rb
- MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0
- NTY3ODkwMTIzNDU2Nzg5
- ---
-
- The best way to handle this is to strip the CRLFs/EOLs before passing to CGI.escape.
-
-
-=== 0.0.5 2006-12-21
-
- * Changes to home page documentation and example files to indicate that you
-   should use 'require_gem' instead of a simple require.  Not sure if this
-   is a result of something I am doing in the packaging of the gem that is
-   incorrect or if this is right and proper.  I will investigate further.
- * Patched instances.rb run_instances method to allow for submission of
-   user data with the command to start an instance.  Patch submitted
-   anonymously on RubyForge.  This had not been functionally implemented
-   in the Amazon Web Services sample library prior to this patch.
- * Added simple framework for adding unit tests for the library under test dir.
-   No functional unit tests exist yet.
-
-
-=== 0.0.4 2006-12-21
-
- * Applied patch from Kevin Clark to svn version 7.  Thanks for the
-   patch and the description Kevin!  Please report if you
-   encounter any issues with this patched version.  Here is Kevin's
-   description which I requested :  "It helps me to think of modules as boxes full of classes and
-   methods.  REXML is a module which holds various classes related to parsing XML
-   including REXML::Node, REXML::Document and REXML::XPath. When you
-   include a module it takes everything out of the box and places it in
-   the local context.  So, when you include REXML in the global namespace
-   on line 27 of EC2.rb, it includes classes called Node, Document and XPath in the
-   global object space. This means that I can't have a class called Node
-   in my own project (which I do). The library would be a much better
-   neighbor if it instead accessed the REXML::Document and REXML::XPath
-   classes explicitly through the module."
-
-
-=== 0.0.3 2006-12-16
-
- * API CHANGE : Changed method name 'authorize' to 'authorize_security_group_ingress' to ensure consistent
-   naming of Ruby library methods to match AWS EC2 API actions. Alias to 'authorize' for backwards compatibility.
- * API CHANGE : Changed method name 'revoke' to 'revoke_security_group_ingress' to ensure consistent
-  naming of Ruby library methods to match AWS EC2 API actions. Alias to 'revoke' for backwards compatibility.
- * API CHANGE : Changed method name 'delete_securitygroup' to 'delete_security_group' to ensure consistent
-  naming of Ruby library methods to match AWS EC2 API actions. Alias to 'delete_securitygroup' for backwards compatibility.
- * API CHANGE : Changed method name 'describe_securitygroups' to 'describe_security_group' to ensure consistent
-  naming of Ruby library methods to match AWS EC2 API actions. Alias to 'describe_securitygroups' for backwards compatibility.
- * API CHANGE : Changed method name 'create_securitygroup' to 'create_security_group' to ensure consistent
-  naming of Ruby library methods to match AWS EC2 API actions. Alias to 'create_securitygroup' for backwards compatibility.
- * Added many API rdoc's, some method descriptions copied from Amazon Query API Developer Guide.
- * Extracted some parts of the formerly monolithic EC2 library out into separate files for manageability.
- * Changed the HTTP 'User-Agent' string used for each request so that we have our own user agent
-   to identify this library's calls.  Now set the version # in the user agent string based on the
-   master version number for this library which is stored in lib/EC2/version.rb and should only
-   be defined in one place.
- * Set @http.verify_mode = OpenSSL::SSL::VERIFY_NONE to avoid seeing SSL Cert warning
-   "warning: peer certificate won't be verified in this SSL session". File EC2.rb:96
- * Make 'pathlist' utility method a private method (EC2.rb:111).  No reason I can see for this to be exposed.
-
-
-=== 0.0.2 2006-12-14
-
- * Bugfix in run_instances method.  Method works now.  Patch submitted by Stephen Caudill on AWS forums.  Thanks!
-
-
-=== 0.0.1 2006-12-13
-
- * Initial release of the Ruby Gem.  This includes the version of the library exactly as provided by
-   Amazon Web Services as example code.  No changes or enhancements to that code were made other than
-   packaging it as a Ruby Gem.
- * RubyForge project created.  http://github.com/grempe/amazon-ec2/tree/master

data/vendor/gems/amazon-ec2/LICENSE

@@ -1,66 +0,0 @@
-Copyright (c) 2007-2009 Glenn Rempe
-
-This software is distributed under the Ruby License.  A copy of which is
-provided below.
-
-RUBY LICENSE
-
-http://www.ruby-lang.org/en/LICENSE.txt
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING.txt file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-          modifications to Usenet or an equivalent medium, or by allowing
-          the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-          with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-          together with instructions (in the manual page or equivalent)
-          on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-          the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.