diff --git a/config/patches/bzip2/soname_install_dir.patch b/config/patches/bzip2/soname_install_dir.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvYnppcDIvc29uYW1lX2luc3RhbGxfZGlyLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/bzip2/soname_install_dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzip2-1.0.6/Makefile-libbz2_so-orig 2014-07-10 09:51:05.000000000 -0700 -+++ bzip2-1.0.6/Makefile-libbz2_so 2014-07-10 09:53:59.000000000 -0700 -@@ -35,7 +35,7 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) -shared -Wl,-install_name -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 diff --git a/config/patches/libxslt/libxslt-solaris-configure.patch b/config/patches/libxslt/libxslt-solaris-configure.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvbGlieHNsdC9saWJ4c2x0LXNvbGFyaXMtY29uZmlndXJlLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/libxslt/libxslt-solaris-configure.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libxslt-1.1.28/configure.in 2016-01-19 13:45:52.000000000 -0800 -+++ libxslt-1.1.28/configure 2016-01-19 13:46:11.000000000 -0800 -@@ -12849,11 +12849,11 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to pass version script to the linker ($LD)" >&5 - $as_echo_n "checking how to pass version script to the linker ($LD)... " >&6; } - VERSION_SCRIPT_FLAGS=none --if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then -- VERSION_SCRIPT_FLAGS=-Wl,--version-script= --elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then -- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," --fi -+#if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then -+# VERSION_SCRIPT_FLAGS=-Wl,--version-script= -+#elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then -+# VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -+#fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION_SCRIPT_FLAGS" >&5 - $as_echo "$VERSION_SCRIPT_FLAGS" >&6; } - diff --git a/config/patches/ruby/ruby-aix-atomic.patch b/config/patches/ruby/ruby-aix-atomic.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LWFpeC1hdG9taWMucGF0Y2g=..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-aix-atomic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-2.1.2/ruby_atomic.h.orig 2014-09-29 14:08:29.000000000 -0500 -+++ ruby-2.1.2/ruby_atomic.h 2014-09-29 14:08:41.000000000 -0500 -@@ -117,7 +117,7 @@ - # endif - - #else --typedef int rb_atomic_t; -+typedef long rb_atomic_t; - #define NEED_RUBY_ATOMIC_OPS - extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val); - extern rb_atomic_t ruby_atomic_compare_and_swap(rb_atomic_t *ptr, diff --git a/config/patches/ruby/ruby-aix-configure.patch b/config/patches/ruby/ruby-aix-configure.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LWFpeC1jb25maWd1cmUucGF0Y2g=..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-aix-configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ruby-1.9.3-p547/configure.orig 2014-05-16 09:38:31 -0500 -+++ ruby-1.9.3-p547/configure 2014-07-15 19:58:29 -0500 -@@ -16488,6 +16488,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}" -@@ -17028,7 +17029,8 @@ - - LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS" - LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}' -- SOLIBS='-lm -lc' -+ SOLIBS='-lm -lc -lz' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).a' - ;; #( - beos*) : - diff --git a/config/patches/ruby/ruby-aix-vm-core.patch b/config/patches/ruby/ruby-aix-vm-core.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LWFpeC12bS1jb3JlLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-aix-vm-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ruby-2.1.2/vm_core.h.orig 2014-09-29 14:05:24.000000000 -0500 -+++ ruby-2.1.2/vm_core.h 2014-09-29 14:05:39.000000000 -0500 -@@ -392,9 +392,9 @@ - - /* postponed_job */ - struct rb_postponed_job_struct *postponed_job_buffer; -- int postponed_job_index; -+ long postponed_job_index; - -- int src_encoding_index; -+ long src_encoding_index; - - VALUE verbose, debug, orig_progname, progname; - VALUE coverages; diff --git a/config/patches/ruby/ruby-freebsd-9-zlib.patch b/config/patches/ruby/ruby-freebsd-9-zlib.patch deleted file mode 100644 diff --git a/config/patches/ruby/ruby-no-stack-protector.patch b/config/patches/ruby/ruby-no-stack-protector.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LW5vLXN0YWNrLXByb3RlY3Rvci5wYXRjaA==..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-no-stack-protector.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.dist b/configure -index d83c15a..bd4813c 100755 ---- a/configure.dist -+++ b/configure -@@ -7491,7 +7491,7 @@ main () - } - _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : -- stack_protector=yes -+ stack_protector=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else diff --git a/config/patches/ruby/ruby-openssl-1.0.1c.patch b/config/patches/ruby/ruby-openssl-1.0.1c.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LW9wZW5zc2wtMS4wLjFjLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-openssl-1.0.1c.patch +++ /dev/null @@ -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) diff --git a/config/patches/ruby/ruby-solaris-linux-socket-compat.patch b/config/patches/ruby/ruby-solaris-linux-socket-compat.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LXNvbGFyaXMtbGludXgtc29ja2V0LWNvbXBhdC5wYXRjaA==..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-solaris-linux-socket-compat.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ruby-2.1.5/ext/socket/raddrinfo.c.orig Fri Mar 20 13:53:18 2015 -+++ ruby-2.1.5/ext/socket/raddrinfo.c Fri Mar 20 13:53:34 2015 -@@ -8,6 +8,39 @@ - - ************************************************/ - -+/* Linux kernel socket model compat defs. -+ AIX/Solaris/HP-UX all use an alternate -+ interface called DLPI. See the below and -+ libpcap's pcap-dlpi.c for more info: -+ http://www.oracle.com/technetwork/server-storage/solaris/solaris-linux-app-139382.html*/ -+#define PACKET_HOST 0 /* To us. */ -+#define PACKET_BROADCAST 1 /* To all. */ -+#define PACKET_MULTICAST 2 /* To group. */ -+#define PACKET_OTHERHOST 3 /* To someone else. */ -+#define PACKET_OUTGOING 4 /* Originated by us . */ -+#define PACKET_LOOPBACK 5 -+#define PACKET_FASTROUTE 6 -+ -+/* Packet socket options. */ -+ -+#define PACKET_ADD_MEMBERSHIP 1 -+#define PACKET_DROP_MEMBERSHIP 2 -+#define PACKET_RECV_OUTPUT 3 -+#define PACKET_RX_RING 5 -+#define PACKET_STATISTICS 6 -+ -+struct packet_mreq -+ { -+ int mr_ifindex; -+ unsigned short int mr_type; -+ unsigned short int mr_alen; -+ unsigned char mr_address[8]; -+ }; -+ -+#define PACKET_MR_MULTICAST 0 -+#define PACKET_MR_PROMISC 1 -+#define PACKET_MR_ALLMULTI 2 -+ - #include "rubysocket.h" - - #if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6)) diff --git a/config/patches/ruby/ruby-sparc-1.9.3-c99.patch b/config/patches/ruby/ruby-sparc-1.9.3-c99.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5LXNwYXJjLTEuOS4zLWM5OS5wYXRjaA==..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby-sparc-1.9.3-c99.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ruby-1.9.3/sparc.c_orig Wed Apr 22 19:07:16 2015 -+++ ruby-1.9.3/sparc.c Wed Apr 22 19:07:57 2015 -@@ -11,7 +11,16 @@ - *********************************************************************/ - void rb_sparc_flush_register_windows(void) - { -- asm -+ /* -+ * gcc doesn't provide "asm" keyword if -ansi and the various -std options -+ * are given. -+ * http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html -+ */ -+#ifndef __GNUC__ -+#define __asm__ asm -+#endif -+ -+ __asm__ - #ifdef __GNUC__ - __volatile__ - #endif diff --git a/config/patches/ruby/ruby_aix_1_9_3_448_ssl_EAGAIN.patch b/config/patches/ruby/ruby_aix_1_9_3_448_ssl_EAGAIN.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5X2FpeF8xXzlfM180NDhfc3NsX0VBR0FJTi5wYXRjaA==..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby_aix_1_9_3_448_ssl_EAGAIN.patch +++ /dev/null @@ -1,58 +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 - diff --git a/config/patches/ruby/ruby_aix_2_1_3_ssl_EAGAIN.patch b/config/patches/ruby/ruby_aix_2_1_3_ssl_EAGAIN.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5X2FpeF8yXzFfM19zc2xfRUFHQUlOLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby_aix_2_1_3_ssl_EAGAIN.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ruby-2.1.3/ext/openssl/lib/openssl/ssl.rb_orig 2014-10-24 13:09:44.000000000 -0500 -+++ ruby-2.1.3/ext/openssl/lib/openssl/ssl.rb 2014-10-24 13:11:01.000000000 -0500 -@@ -194,7 +194,15 @@ - 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/config/patches/ruby/ruby_aix_openssl.patch b/config/patches/ruby/ruby_aix_openssl.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydWJ5X2FpeF9vcGVuc3NsLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/ruby/ruby_aix_openssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ruby-1.9.3-p547/ext/openssl/extconf.rb.orig 2014-07-15 17:50:30 -0500 -+++ ruby-1.9.3-p547/ext/openssl/extconf.rb 2014-07-15 17:50:39 -0500 -@@ -34,6 +34,7 @@ - end - - Logging::message "=== Checking for system dependent stuff... ===\n" -+have_library("z", "inflate") - have_library("nsl", "t_open") - have_library("socket", "socket") - have_header("assert.h") diff --git a/config/patches/ruby/rvm-cflags.patch b/config/patches/ruby/rvm-cflags.patch deleted file mode 100644 index f51989b8c4874da0e8aa9c4419e3810837b85685_Y29uZmlnL3BhdGNoZXMvcnVieS9ydm0tY2ZsYWdzLnBhdGNo..0000000000000000000000000000000000000000 --- a/config/patches/ruby/rvm-cflags.patch +++ /dev/null @@ -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