From 86835b4ac5ee593e8bd5b142504194370df71728 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Tue, 14 Apr 2015 17:46:36 -0700
Subject: ruby: Update to 2.2.2

Includes among other things: CVE-2015-1855: Ruby OpenSSL Hostname Verification

for more info see:
http://svn.ruby-lang.org/repos/ruby/tags/v2_2_2/ChangeLog

also, fixed runtime error.
only include "enable-wide-getaddrinfo" if IVP6 is enabled in disto feature
otherwise 'gem install rails' throws an error for the missing symbol 'getipnodebyname'.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb | 39 -------------------------
 meta-ruby/recipes-devtools/ruby/ruby_2.2.2.bb | 41 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby_2.2.2.bb

(limited to 'meta-ruby')

diff --git a/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb b/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb
deleted file mode 100644
index 29f2291559..0000000000
--- a/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require ruby.inc
-
-SRC_URI[md5sum] = "b49fc67a834e4f77249eb73eecffb1c9"
-SRC_URI[sha256sum] = "5a4de38068eca8919cb087d338c0c2e3d72c9382c804fb27ab746e6c7819ab28"
-
-# it's unknown to configure script, but then passed to extconf.rb
-# maybe it's not really needed as we're hardcoding the result with
-# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
-UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
-PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp"
-
-EXTRA_OECONF = "\
-    --enable-wide-getaddrinfo \
-    --disable-versioned-paths \
-    --disable-rpath \
-    --enable-shared \
-    --enable-load-relative \
-"
-
-EXTRA_OEMAKE = " \
-    LIBRUBYARG='-lruby-static' \
-"
-
-do_install() {
-    oe_runmake 'DESTDIR=${D}' install
-}
-
-FILES_${PN} += "${datadir}/rubygems \
-                ${datadir}/ri"
-
-FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \
-                    ${libdir}/ruby/*/*/.debug \
-                    ${libdir}/ruby/*/*/*/.debug \
-                    ${libdir}/ruby/*/*/*/*/.debug"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-ruby/recipes-devtools/ruby/ruby_2.2.2.bb b/meta-ruby/recipes-devtools/ruby/ruby_2.2.2.bb
new file mode 100644
index 0000000000..c463525c22
--- /dev/null
+++ b/meta-ruby/recipes-devtools/ruby/ruby_2.2.2.bb
@@ -0,0 +1,41 @@
+require ruby.inc
+
+SRC_URI[md5sum] = "326e99ddc75381c7b50c85f7089f3260"
+SRC_URI[sha256sum] = "5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44"
+
+# it's unknown to configure script, but then passed to extconf.rb
+# maybe it's not really needed as we're hardcoding the result with
+# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
+UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+
+PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
+PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp"
+PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo,"
+
+EXTRA_OECONF = "\
+    --disable-versioned-paths \
+    --disable-rpath \
+    --enable-shared \
+    --enable-load-relative \
+"
+
+EXTRA_OEMAKE = " \
+    LIBRUBYARG='-lruby-static' \
+"
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
+FILES_${PN} += "${datadir}/rubygems \
+                ${datadir}/ri"
+
+FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \
+                    ${libdir}/ruby/*/*/.debug \
+                    ${libdir}/ruby/*/*/*/.debug \
+                    ${libdir}/ruby/*/*/*/*/.debug"
+
+BBCLASSEXTEND = "native"
-- 
cgit 1.2.3-korg