bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages: ruby update to 1.9.3-p484

Browse Source 
This also fixes a compile problem with OpenSSL.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@39542 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2014-02-08 19:05:58 +00:00
parent 528f9f8af3
commit bddb038bef
2 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lang/ruby/Makefile
View File

@ -15,18 +15,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ruby
PKG_VERSION:=1.9.2-p0
PKG_VERSION:=1.9.3-p484
PKG_RELEASE:=1
PKG_LIBVER:=1.9
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
PKG_MD5SUM:=d8a02cadf57d2571cd4250e248ea7e4b
PKG_MD5SUM:=03f5b08804927ceabe5122cb90f5d0a9
PKG_BUILD_DEPENDS:=ruby/host
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
@ -217,13 +218,6 @@ MAKE_FLAGS += \
DESTDIR="$(PKG_INSTALL_DIR)" \
SHELL="/bin/bash"
define Build/Prepare
$(call Build/Prepare/Default)
( cd $(PKG_BUILD_DIR) ; \
autoconf ; \
)
endef
define Package/ruby/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ruby $(1)/usr/bin/

53
lang/ruby/patches/0001-Add-option-which-enable-SSLv2-support.patch
View File

@ -1,53 +0,0 @@
From b983e73adf7a7d3fd07fdf493eee51c22881a6e6 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Wed, 6 Apr 2011 02:28:09 +0900
Subject: [PATCH] Add option which enable SSLv2 support
From openssl 1.0, SSLv2 becomes disable by default.
If you want to use SSLv2 in ruby, you need config with --enable-opensslv2.
The SSLv2 support is disable by default.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
ext/openssl/extconf.rb | 8 ++++++++
ext/openssl/ossl_ssl.c | 2 ++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index b1f2d88..89c6f19 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -33,6 +33,14 @@ if with_config("debug") or enable_config("debug")
end
end
+##
+## From openssl 1.0, SSLv2 becomes disable by default.
+## If you want to use SSLv2 in ruby, you need config with --enable-opensslv2.
+##
+if enable_config("opensslv2")
+ $defs << "-DENABLE_OPENSSLV2"
+end
+
message "=== Checking for system dependent stuff... ===\n"
have_library("nsl", "t_open")
have_library("socket", "socket")
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index d8951fb..d0c9059 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -107,9 +107,11 @@ struct {
OSSL_SSL_METHOD_ENTRY(TLSv1),
OSSL_SSL_METHOD_ENTRY(TLSv1_server),
OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+#if defined(ENABLE_OPENSSLV2)
OSSL_SSL_METHOD_ENTRY(SSLv2),
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+#endif
OSSL_SSL_METHOD_ENTRY(SSLv3),
OSSL_SSL_METHOD_ENTRY(SSLv3_server),
OSSL_SSL_METHOD_ENTRY(SSLv3_client),
--
1.7.4.1