diff options
| author | Treeve Jelbert | 2015-12-18 12:25:52 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2015-12-18 12:26:19 +0100 |
| commit | ef4d5c08adc75d286f1930c32766d24c3110cb13 (patch) | |
| tree | 89a458711b3039769df3693d896d930afa2b06e9 /ruby-raa | |
| parent | f42ac50aaf11e788a2bcef64a27aa7a30b028c73 (diff) | |
ruby-2.2-2.2.4 SECURITY FIX
Diffstat (limited to 'ruby-raa')
| -rwxr-xr-x | ruby-raa/ruby-2.2/DETAILS | 6 | ||||
| -rw-r--r-- | ruby-raa/ruby-2.2/HISTORY | 5 | ||||
| -rwxr-xr-x | ruby-raa/ruby-2.2/PRE_BUILD | 5 | ||||
| -rw-r--r-- | ruby-raa/ruby-2.2/ruby-sslv3.diff | 31 |
4 files changed, 8 insertions, 39 deletions
diff --git a/ruby-raa/ruby-2.2/DETAILS b/ruby-raa/ruby-2.2/DETAILS index 7fbea52ffb..8cdf3d76ea 100755 --- a/ruby-raa/ruby-2.2/DETAILS +++ b/ruby-raa/ruby-2.2/DETAILS @@ -1,8 +1,8 @@ SPELL=ruby-2.2 PACKAGE=ruby - VERSION=2.2.3 - SOURCE_HASH=sha512:e3ce3333e8d59f4f3bfc84cf9bbbc6f74272470e12913d299fd1d41fc166dee21921eed1789591f50c3f3b6e5fd38fd1b99855c16aff28bdc4ae8fcc680c71bd - SECURITY_PATCH=2 + VERSION=2.2.4 + SOURCE_HASH=sha512:755257eea0cb79f28f1d2dc6e2a5ee4b1954280f51153e5fe90605a875b1d52077660b87e4e04d11552591a1f60a1241e4c70056f073a217b3bad896f64780da + SECURITY_PATCH=3 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$PACKAGE-$VERSION.tar.xz SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE diff --git a/ruby-raa/ruby-2.2/HISTORY b/ruby-raa/ruby-2.2/HISTORY index 750584d497..9ec072ca3a 100644 --- a/ruby-raa/ruby-2.2/HISTORY +++ b/ruby-raa/ruby-2.2/HISTORY @@ -1,3 +1,8 @@ +2015-12-18 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.2.4 + SECURITY_PATCH++ fixes CVE-2015-7551 + PRE_BUILD, ruby-sslv3.diff: deleted + 2015-11-09 Pavel Vinogradov <public@sourcemage.org> * PRE_BUILD, ruby-sslv3.diff: added patch to detect SSLv3 methods availability in open/libressl, diff --git a/ruby-raa/ruby-2.2/PRE_BUILD b/ruby-raa/ruby-2.2/PRE_BUILD deleted file mode 100755 index e760253a65..0000000000 --- a/ruby-raa/ruby-2.2/PRE_BUILD +++ /dev/null @@ -1,5 +0,0 @@ -default_pre_build && -cd ${SOURCE_DIRECTORY} && - -# Remove this on the next update -patch -p0 < ${SPELL_DIRECTORY}/ruby-sslv3.diff diff --git a/ruby-raa/ruby-2.2/ruby-sslv3.diff b/ruby-raa/ruby-2.2/ruby-sslv3.diff deleted file mode 100644 index c829029518..0000000000 --- a/ruby-raa/ruby-2.2/ruby-sslv3.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: ext/openssl/extconf.rb -=================================================================== ---- ext/openssl/extconf.rb (revision 51718) -+++ ext/openssl/extconf.rb (working copy) -@@ -104,6 +104,9 @@ - have_func("SSLv2_method") - have_func("SSLv2_server_method") - have_func("SSLv2_client_method") -+have_func("SSLv3_method") -+have_func("SSLv3_server_method") -+have_func("SSLv3_client_method") - have_func("TLSv1_1_method") - have_func("TLSv1_1_server_method") - have_func("TLSv1_1_client_method") -Index: ext/openssl/ossl_ssl.c -=================================================================== ---- ext/openssl/ossl_ssl.c (revision 51718) -+++ ext/openssl/ossl_ssl.c (working copy) -@@ -109,9 +109,12 @@ - OSSL_SSL_METHOD_ENTRY(SSLv2_server), - OSSL_SSL_METHOD_ENTRY(SSLv2_client), - #endif -+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ -+ defined(HAVE_SSLV3_CLIENT_METHOD) - OSSL_SSL_METHOD_ENTRY(SSLv3), - OSSL_SSL_METHOD_ENTRY(SSLv3_server), - OSSL_SSL_METHOD_ENTRY(SSLv3_client), -+#endif - OSSL_SSL_METHOD_ENTRY(SSLv23), - OSSL_SSL_METHOD_ENTRY(SSLv23_server), - OSSL_SSL_METHOD_ENTRY(SSLv23_client), |