From 2c4ea103d01c80ae8ff8f7b9f9bcc5059beca8e8 Mon Sep 17 00:00:00 2001 From: Luiz Angelo Daros de Luca Date: Fri, 22 Dec 2017 03:28:56 -0200 Subject: [PATCH] ruby: bump to 2.4.3 This release includes some bug fixes and a security fix. CVE-2017-17405: Command injection vulnerability in Net::FTP Signed-off-by: Luiz Angelo Daros de Luca (cherry picked from commit fc0105391766404699330e455bc028d8a52a2553) --- lang/ruby/Makefile | 4 +-- lang/ruby/patches/010-configure-2.4.2.patch | 40 --------------------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 lang/ruby/patches/010-configure-2.4.2.patch diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 471127d6ca..6b53d4267d 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby -PKG_VERSION:=2.4.2 +PKG_VERSION:=2.4.3 PKG_RELEASE:=1 # First two numbes @@ -19,7 +19,7 @@ PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://cache.ruby-lang.org/pub/ruby/$(PKG_ABI_VERSION)/ -PKG_HASH:=748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +PKG_HASH:=23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=COPYING diff --git a/lang/ruby/patches/010-configure-2.4.2.patch b/lang/ruby/patches/010-configure-2.4.2.patch deleted file mode 100644 index fddd81038b..0000000000 --- a/lang/ruby/patches/010-configure-2.4.2.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -pU3 a/configure b/configure ---- a/configure 2017-09-14 21:52:19.000000000 +0900 -+++ b/configure 2017-09-15 07:03:12.000000000 +0900 -@@ -10614,6 +10614,7 @@ fi - ac_res=$ac_cv_search___gmpz_init - if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ $as_echo "#define HAVE_LIBGMP 1" >>confdefs.h - - fi - -@@ -10683,6 +10684,7 @@ fi - ac_res=$ac_cv_search_malloc_conf - if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ $as_echo "#define HAVE_LIBJEMALLOC 1" >>confdefs.h - - else - with_jemalloc=no -diff -pU3 a/configure.in b/configure.in ---- a/configure.in 2017-08-04 23:39:29.000000000 +0900 -+++ b/configure.in 2017-09-15 07:20:40.000000000 +0900 -@@ -1403,13 +1403,15 @@ AC_ARG_WITH([gmp], - AS_IF([test "x$with_gmp" != xno], - [AC_CHECK_HEADERS(gmp.h) - AS_IF([test "x$ac_cv_header_gmp_h" != xno], -- AC_SEARCH_LIBS([__gmpz_init], [gmp]))]) -+ AC_SEARCH_LIBS([__gmpz_init], [gmp], -+ [AC_DEFINE(HAVE_LIBGMP, 1)]))]) - - AC_ARG_WITH([jemalloc], - [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])], - [with_jemalloc=$withval], [with_jemalloc=no]) - AS_IF([test "x$with_jemalloc" = xyes],[ -- AC_SEARCH_LIBS([malloc_conf], [jemalloc], [], [with_jemalloc=no]) -+ AC_SEARCH_LIBS([malloc_conf], [jemalloc], -+ [AC_DEFINE(HAVE_LIBJEMALLOC, 1)], [with_jemalloc=no]) - AC_CHECK_HEADER(jemalloc/jemalloc.h, [ - AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, []) - ]) -- 2.30.2