bulk package update

6 files changed, 76 insertions, 12 deletions

diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 21ec52811..2fd190fde 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -4,14 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ruby
-PKG_VERSION:=		1.9.1-p378
+PKG_VERSION:=		1.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		9fc5941bda150ac0a33b299e1e53654c
 PKG_DESCR:=		interpreter for the ruby language
 PKG_SECTION:=		net
 PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.ruby-lang.org
-PKG_SITES:=		ftp://ftp.ruby-lang.org/pub/ruby/1.9/
+PKG_SITES:=		ftp://ftp.ruby-lang.org/pub/ruby/
+
+DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}-stable.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}-1.9.1-p378
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ruby/patches/patch-Makefile_in b/package/ruby/patches/patch-Makefile_in
index 0e1e996bc..992921e8c 100644
--- a/package/ruby/patches/patch-Makefile_in
+++ b/package/ruby/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
 --- ruby-1.9.1-p378.orig/Makefile.in	2009-11-12 17:01:28.000000000 +0100
-+++ ruby-1.9.1-p378/Makefile.in	2010-02-13 21:10:02.000000000 +0100
++++ ruby-1.9.1-p378/Makefile.in	2010-06-02 20:50:05.821613650 +0200
 @@ -274,7 +274,7 @@ INSNS	= opt_sc.inc optinsn.inc optunifs.
-
+ 
  $(INSNS):
-	@$(RM) $(PROGRAM)
+ 	@$(RM) $(PROGRAM)
 -	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
 +	$(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
-
+ 
  node_name.inc:
-	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
+ 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
diff --git a/package/ruby/patches/patch-common_mk b/package/ruby/patches/patch-common_mk
index 06a4a7e10..80870ae97 100644
--- a/package/ruby/patches/patch-common_mk
+++ b/package/ruby/patches/patch-common_mk
@@ -1,10 +1,11 @@
 --- ruby-1.9.1-p378.orig/common.mk	2009-11-12 17:01:28.000000000 +0100
-+++ ruby-1.9.1-p378/common.mk	2010-02-13 20:20:27.000000000 +0100
++++ ruby-1.9.1-p378/common.mk	2010-06-02 20:50:05.701612890 +0200
 @@ -400,7 +400,7 @@ extconf: $(PREP)
-	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-
+ 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
+ 
  $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
 -	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
 +	$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
-		-install_name=$(RUBY_INSTALL_NAME) \
-		-so_name=$(RUBY_SO_NAME) rbconfig.rb
+ 		-install_name=$(RUBY_INSTALL_NAME) \
+ 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
+ 
diff --git a/package/ruby/patches/patch-ext_openssl_ossl_c b/package/ruby/patches/patch-ext_openssl_ossl_c
new file mode 100644
index 000000000..2b649c7dd
--- /dev/null
+++ b/package/ruby/patches/patch-ext_openssl_ossl_c
@@ -0,0 +1,29 @@
+--- ruby-1.9.1-p378.orig/ext/openssl/ossl.c	2009-01-15 16:39:30.000000000 +0100
++++ ruby-1.9.1-p378/ext/openssl/ossl.c	2010-06-12 21:01:58.171613505 +0200
+@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
+ 
+ #define OSSL_IMPL_SK2ARY(name, type)	        \
+ VALUE						\
+-ossl_##name##_sk2ary(STACK *sk)			\
++ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
+ {						\
+     type *t;					\
+     int i, num;					\
+@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
+ 	OSSL_Debug("empty sk!");		\
+ 	return Qnil;				\
+     }						\
+-    num = sk_num(sk);				\
++    num = sk_##type##_num(sk);			\
+     if (num < 0) {				\
+ 	OSSL_Debug("items in sk < -1???");	\
+ 	return rb_ary_new();			\
+@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
+     ary = rb_ary_new2(num);			\
+ 						\
+     for (i=0; i<num; i++) {			\
+-	t = (type *)sk_value(sk, i);		\
++	t = sk_##type##_value(sk, i);		\
+ 	rb_ary_push(ary, ossl_##name##_new(t));	\
+     }						\
+     return ary;					\
diff --git a/package/ruby/patches/patch-ext_openssl_ossl_h b/package/ruby/patches/patch-ext_openssl_ossl_h
new file mode 100644
index 000000000..b33b476aa
--- /dev/null
+++ b/package/ruby/patches/patch-ext_openssl_ossl_h
@@ -0,0 +1,19 @@
+--- ruby-1.9.1-p378.orig/ext/openssl/ossl.h	2008-09-26 05:05:47.000000000 +0200
++++ ruby-1.9.1-p378/ext/openssl/ossl.h	2010-06-12 21:10:22.781613550 +0200
+@@ -109,6 +109,16 @@ extern VALUE eOSSLError;
+ int string2hex(const unsigned char *, int, char **, int *);
+ 
+ /*
++ * Compatibility
++ */
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define OSSL_MORE_CONST const
++#define STACK _STACK
++#else
++#define OSSL_MORE_CONST
++#endif
++
++/*
+  * Data Conversion
+  */
+ STACK_OF(X509) *ossl_x509_ary2sk0(VALUE);
diff --git a/package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c b/package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c
new file mode 100644
index 000000000..1649e0f10
--- /dev/null
+++ b/package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c
@@ -0,0 +1,12 @@
+--- ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c	2008-07-22 17:34:23.000000000 +0200
++++ ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c	2010-06-02 21:05:44.261613234 +0200
+@@ -572,7 +572,8 @@ ossl_pkcs7_add_certificate(VALUE self, V
+     return self;
+ }
+ 
+-static STACK *
++
++static STACK_OF(X509) *
+ pkcs7_get_certs_or_crls(VALUE self, int want_certs)
+ {
+     PKCS7 *pkcs7;