omnibus 3.2.2 → 4.0.0.beta.1

data/spec/data/complicated/config/patches/ruby/patch-configure

@@ -1,103 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2012/10/12 14:51:31 taca Exp $
-
-* Adding Interix and MirBSD support.
-* Ignore doxygen.
-
---- configure.orig	2012-10-12 09:23:46.000000000 +0000
-+++ configure
-@@ -10654,6 +10654,9 @@ esac
-   superux*) :
-	ac_cv_func_setitimer=no
-		 ;; #(
-+  interix*)	LIBS="-lm $LIBS"
-+	ac_cv_func_getpgrp_void=yes
-+		 ;; #(
-   *) :
-	LIBS="-lm $LIBS" ;;
- esac
-@@ -11980,6 +11983,9 @@ fi
- ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
- #include <time.h>
- #endif
-+#ifdef HAVE_SYS_TIME_H
-+# include <sys/time.h>
-+#endif
- "
- if test "x$ac_cv_type_struct_timespec" = xyes; then :
-
-@@ -15790,7 +15796,7 @@ done
-     MAINLIBS="-pthread $MAINLIBS" ;; #(
-   *) :
-     case "$target_os" in #(
--  openbsd*) :
-+  openbsd*|mirbsd*) :
-     LIBS="-pthread $LIBS" ;; #(
-   *) :
-     LIBS="-l$pthread_lib $LIBS" ;;
-@@ -16239,8 +16245,12 @@ esac ;; #(
-			rb_cv_dlopen=yes ;; #(
-   interix*) :
-	: ${LDSHARED='$(CC) -shared'}
-+			LDFLAGS="$LDFLAGS -Wl,-E"
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-+			# use special random-slot linkage in 0x[56]XXXXXXX
-			LIBPATHFLAG=" -L%1\$-s"
-+			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
-+			RPATHFLAG=' -Wl,-R%1$-s'
-			rb_cv_dlopen=yes ;; #(
-   freebsd*|dragonfly*) :
-
-@@ -16252,7 +16262,7 @@ esac ;; #(
-			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
-			fi
-			rb_cv_dlopen=yes ;; #(
--  openbsd*) :
-+  openbsd*|mirbsd*) :
-	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -16781,7 +16791,7 @@ _ACEOF
-   freebsd*|dragonfly*) :
-
-	SOLIBS='$(LIBS)'
--	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
-	if test "$rb_cv_binary_elf" != "yes" ; then
-	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
-	    LIBRUBY_ALIASES=''
-@@ -16798,7 +16808,7 @@ _ACEOF
-	   LIBRUBY_ALIASES=""
-	fi
-	 ;; #(
--  openbsd*) :
-+  openbsd*|mirbsd*) :
-
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -16859,7 +16869,12 @@ esac
-	 ;; #(
-   interix*) :
-
--	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
-+	SOLIBS='$(LIBS)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-+	# link explicitly to 0x48000000
-+	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
-+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
-+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
-	 ;; #(
-   *) :
-      ;;
-@@ -16922,11 +16937,7 @@ if test "$install_doc" != no; then
-     else
-	RDOCTARGET="nodoc"
-     fi
--    if test "$install_capi" != no -a -n "$DOXYGEN"; then
--	CAPITARGET="capi"
--    else
--	CAPITARGET="nodoc"
--    fi
-+    CAPITARGET="nodoc"
- else
-     RDOCTARGET="nodoc"
-     CAPITARGET="nodoc"

data/spec/data/complicated/config/patches/ruby/ruby-aix-configure.patch

@@ -1,10 +0,0 @@
---- a/configure	2013-05-14 11:42:05 -0500
-+++ b/configure	2013-05-22 14:49:01 -0500
-@@ -16314,6 +16314,7 @@
-   aix*) :
-	: ${LDSHARED='$(CC)'}
-			LDSHARED="$LDSHARED ${linker_flag}-G"
-+			DLDFLAGS='-eInit_$(TARGET)'
-			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
-			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
-			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"

data/spec/data/complicated/config/patches/ruby/ruby-openssl-1.0.1c.patch

@@ -1,42 +0,0 @@
-diff -Naur ruby-1.9.3-p286.pristine/ext/openssl/openssl_missing.c ruby-1.9.3-p286/ext/openssl/openssl_missing.c
---- ruby-1.9.3-p286.pristine/ext/openssl/openssl_missing.c	2011-06-26 01:32:03.000000000 +0000
-+++ ruby-1.9.3-p286/ext/openssl/openssl_missing.c	2013-01-28 05:08:38.192083253 +0000
-@@ -22,7 +22,7 @@
- #include "openssl_missing.h"
-
- #if !defined(HAVE_HMAC_CTX_COPY)
--void
-+int
- HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
- {
-     if (!out || !in) return;
-@@ -118,7 +118,7 @@
-  * tested on 0.9.7d.
-  */
- int
--EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in)
-+EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
- {
-     memcpy(out, in, sizeof(EVP_CIPHER_CTX));
-
-diff -Naur ruby-1.9.3-p286.pristine/ext/openssl/openssl_missing.h ruby-1.9.3-p286/ext/openssl/openssl_missing.h
---- ruby-1.9.3-p286.pristine/ext/openssl/openssl_missing.h	2011-06-26 01:32:03.000000000 +0000
-+++ ruby-1.9.3-p286/ext/openssl/openssl_missing.h	2013-01-28 05:08:38.192500215 +0000
-@@ -68,7 +68,7 @@
- #endif
-
- #if !defined(HAVE_HMAC_CTX_COPY)
--void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
- #endif
-
- #if !defined(HAVE_HMAC_CTX_CLEANUP)
-@@ -92,7 +92,7 @@
- #endif
-
- #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
--int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
-+int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
- #endif
-
- #if !defined(HAVE_EVP_DIGESTINIT_EX)

data/spec/data/complicated/config/patches/ruby/ruby_aix_1_9_3_448_ssl_EAGAIN.patch

@@ -1,57 +0,0 @@
-diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb
-index 356d4e8..89a7a42 100644
---- a/ext/openssl/lib/openssl/ssl-internal.rb
-+++ b/ext/openssl/lib/openssl/ssl-internal.rb
-@@ -169,7 +169,15 @@ module OpenSSL
-         begin
-           ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-           ssl.sync_close = true
--          ssl.accept if @start_immediately
-+          if @start_immediately
-+            # Retry on EAGAIN (may be due to underlying inprogress for TLS handshake or renegotiation requested.)
-+            # Any other error is rescued further.
-+            begin
-+              ssl.accept
-+            rescue Errno::EAGAIN
-+              retry
-+            end
-+          end
-           ssl
-         rescue SSLError => ex
-           sock.close
-diff --git a/lib/net/http.rb b/lib/net/http.rb
-index 9e4fe6a..41a9c75 100644
---- a/lib/net/http.rb
-+++ b/lib/net/http.rb
-@@ -797,7 +797,14 @@ module Net   #:nodoc:
-           end
-           # Server Name Indication (SNI) RFC 3546
-           s.hostname = @address if s.respond_to? :hostname=
--          timeout(@open_timeout) { s.connect }
-+          timeout(@open_timeout) {
-+            # Retry on EAGAIN (may be due to underlying inprogress for TLS handshake or renegotiation requested.)
-+            begin
-+             s.connect
-+            rescue Errno::EAGAIN
-+             retry
-+            end
-+          }
-           if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-             s.post_connection_check(@address)
-           end
-diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
-index f374466..b6f9f17 100644
---- a/lib/net/protocol.rb
-+++ b/lib/net/protocol.rb
-@@ -153,6 +153,12 @@ module Net # :nodoc:
-         else
-           raise Timeout::Error
-         end
-+      rescue Errno::EAGAIN
-+        # read_nonblock calls underlying SSL_read. openssl doc states that data can be processed only when SSL/TLS
-+        # record has been received completely. Also data that was not retrieved at the last call of SSL_read()
-+        # can still be buffered inside the SSL layer and will be retrieved on the next call to SSL_read.
-+        # http://www.openssl.org/docs/ssl/SSL_read.html
-+        retry
-       end
-     end

data/spec/data/complicated/config/patches/ruby/rvm-cflags.patch

@@ -1,27 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -267,11 +267,9 @@
-     cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
- test -z "warnflags" ||
-     cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
--if test -z "${CFLAGS+set}"; then
--    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
--    orig_cflags="$cflags"
--    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
--fi
-+cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-+orig_cflags="$cflags"
-+cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
- if test -z "${CXXFLAGS+set}"; then
-     cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-     orig_cxxflags="$cxxflags"
-@@ -511,7 +509,8 @@
-     ])
- fi
-
--test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
-+test -z "${ac_env_CFLAGS_set}" && CFLAGS="$ARCH_FLAG"
-+test -n "${cflags:+set}" && eval CFLAGS="\"$cflags\${CFLAGS:+ $CFLAGS}\""
- test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
-
- dnl check for large file stuff

data/spec/data/complicated/config/projects/angrychef.rb

@@ -1,32 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-#
-
-# This is a clone of chef that we can install on build and test machines
-# without interfering with the regular build/test.
-
-name "angrychef"
-maintainer "Opscode, Inc."
-homepage "http://www.opscode.com"
-
-replaces        "angrychef"
-install_dir     "/opt/angrychef"
-build_version   '1.0.0'
-build_iteration 4
-
-dependency "preparation"
-dependency "chef"
-dependency "version-manifest"

data/spec/data/complicated/config/projects/chef-windows.rb

@@ -1,32 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-#
-
-name "chef-windows"
-maintainer "Opscode, Inc."
-homepage "http://www.opscode.com"
-
-# NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
-#       Native gems will use gcc which will barf on files with spaces,
-#       which is only fixable if everyone in the world fixes their Makefiles
-install_dir    "C:/opscode/chef"
-build_version   '1.0.0'
-build_iteration 4
-package_name    "chef-client"
-
-dependency "preparation"
-dependency "chef-windows"
-dependency "chef-client-msi"

data/spec/data/complicated/config/projects/chef.rb

@@ -1,32 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-#
-
-name "chef"
-friendly_name "Chef Client"
-maintainer "Opscode, Inc."
-homepage "http://www.opscode.com"
-
-replaces        "chef-full"
-install_dir     "/opt/chef"
-build_version   '1.0.0'
-build_iteration 4
-mac_pkg_identifier "com.getchef.pkg.chef"
-resources_path File.join(files_path, name)
-
-dependency "preparation"
-dependency "chef"
-dependency "version-manifest"

data/spec/data/complicated/config/projects/chefdk-windows.rb

@@ -1,41 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-#
-
-name "chefdk-windows"
-maintainer "Opscode, Inc."
-homepage "http://www.opscode.com"
-
-# NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
-#       Native gems will use gcc which will barf on files with spaces,
-#       which is only fixable if everyone in the world fixes their Makefiles
-install_dir     "C:/opscode/chefdk"
-build_version   '1.0.0'
-build_iteration 1
-
-package_name    "chef-dk"
-
-override :berkshelf, version: "3.0.0.beta6"
-override :bundler,   version: "1.5.2"
-override :nokogiri,  version: "1.6.1"
-
-dependency "preparation"
-dependency "ruby-windows"
-dependency "libyaml-windows"
-dependency "ruby-windows-devkit"
-dependency "chef-windows"
-dependency "chefdk"
-dependency "chef-client-msi"

data/spec/data/complicated/config/projects/chefdk.rb

@@ -1,44 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-#
-
-name       "chefdk"
-friendly_name "Chef DK"
-maintainer "Opscode, Inc."
-homepage   "http://www.opscode.com"
-
-install_dir     "/opt/chefdk"
-build_version   '1.0.0'
-build_iteration 1
-mac_pkg_identifier "com.getchef.pkg.chefdk"
-resources_path File.join(files_path, name)
-
-override :berkshelf, version: "master"
-override :bundler,   version: "1.5.2"
-override :libedit,   version: "20130712-3.1"
-override :libtool,   version: "2.4.2"
-override :libxml2,   version: "2.9.1"
-override :libxslt,   version: "1.1.28"
-override :nokogiri,  version: "1.6.1"
-override :ruby,      version: "2.1.1"
-override :rubygems,  version: "2.2.1"
-override :yajl,      version: "1.2.0"
-override :zlib,      version: "1.2.8"
-
-dependency "preparation"
-dependency "chefdk"
-dependency "rubygems-customization"
-dependency "version-manifest"

data/spec/data/complicated/config/software/appbundler.rb

@@ -1,25 +0,0 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-#
-
-name "appbundler"
-default_version "0.1.0.beta.0"
-
-dependency "bundler"
-
-build do
-  gem "install appbundler --no-rdoc --no-ri -v '#{version}'"
-end