From ff8f16665bd8d36fc2c59a4a72e7a307b7342633 Mon Sep 17 00:00:00 2001 From: dingo Date: Sun, 19 Dec 2010 14:27:56 +0000 Subject: [PATCH] [patch-team] - Upgrade ruby to 1.9.2-p0 - corrects file clashes between ruby-readline and ruby-irb - corrects file clashes between ruby-webrick and ruby-openssl - Signed-off-by: Vincent Neyen git-svn-id: svn://svn.openwrt.org/openwrt/packages@24727 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/ruby/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index dba34b9f9..c631e2ba4 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -15,14 +15,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby -PKG_VERSION:=1.9.1-p376 -PKG_RELEASE:=3 +PKG_VERSION:=1.9.2-p0 +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:=e019ae9c643c5efe91be49e29781fb94 +PKG_MD5SUM:=d8a02cadf57d2571cd4250e248ea7e4b PKG_BUILD_DEPENDS:=ruby/host PKG_INSTALL:=1 @@ -383,7 +383,6 @@ define Package/ruby-openssl/install usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \ usr/lib/ruby/$(PKG_LIBVER)/drb/ssl.rb \ usr/lib/ruby/$(PKG_LIBVER)/net/https.rb \ - usr/lib/ruby/$(PKG_LIBVER)/webrick/ssl.rb \ ) | ( cd $(1); $(TAR) -xf - ) endef @@ -406,8 +405,6 @@ endef define Package/ruby-readline/install ( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \ usr/lib/ruby/$(PKG_LIBVER)/*/readline.so \ - usr/lib/ruby/$(PKG_LIBVER)/irb/completion.rb \ - usr/lib/ruby/$(PKG_LIBVER)/irb/ext/save-history.rb \ ) | ( cd $(1); $(TAR) -xf - ) endef -- 2.11.0