Update to 0.2.0-pre0 and unbreak for Ruby 1.8 / OpenSSL 0.9.7.

4 files changed, 60 insertions, 12 deletions

diff --git a/security/ruby-openssl/Makefile b/security/ruby-openssl/Makefile
index c71d7d8f12e..86eff2a71d1 100644
--- a/security/ruby-openssl/Makefile
+++ b/security/ruby-openssl/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	openssl
-PORTVERSION=	0.1.3
+PORTVERSION=	0.2.0.p0
 CATEGORIES=	security ruby
 MASTER_SITES=	http://savannah.nongnu.org/download/rubypki/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ossl-${PORTVERSION}
+DISTNAME=	ossl-${PORTVERSION:S/.p/-pre/}
+EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -20,17 +21,16 @@ USE_OPENSSL=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-WRKSRC=		${WRKDIR}/ossl
-CONFIGURE_ARGS=	--with-openssl-include="${OPENSSLBASE}/include/openssl" \
+CONFIGURE_ARGS=	--with-openssl-include="${OPENSSLBASE}/include" \
 		--with-openssl-lib="${OPENSSLBASE}/lib"
 INSTALL_TARGET=	site-install
 
-DOCS=		ChangeLog README
+DOCS=		ChangeLog LEGAL README ToDo
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKSRC}/test/* ${RUBY_MODEXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/security/ruby-openssl/distinfo b/security/ruby-openssl/distinfo
index 4e7b44a84c3..baabf0f3cc2 100644
--- a/security/ruby-openssl/distinfo
+++ b/security/ruby-openssl/distinfo
@@ -1 +1 @@
-MD5 (ruby/ossl-0.1.3.tar.gz) = 0466db55da7d043db980d4db523857d2
+MD5 (ruby/ossl-0.2.0-pre0.tgz) = fd2466bf1535fd9e5113c1b37979b9a1
diff --git a/security/ruby-openssl/files/patch-ossl.c b/security/ruby-openssl/files/patch-ossl.c
new file mode 100644
index 00000000000..b8c8b8f3faa
--- /dev/null
+++ b/security/ruby-openssl/files/patch-ossl.c
@@ -0,0 +1,42 @@
+Index: ossl.c
+===================================================================
+RCS file: /cvsroot/rubypki/ossl2/ossl.c,v
+retrieving revision 1.23
+retrieving revision 1.24
+diff -u -r1.23 -r1.24
+--- ossl.c	21 Feb 2003 14:14:29 -0000	1.23
++++ ossl.c	24 Feb 2003 16:23:10 -0000	1.24
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: ossl.c,v 1.23 2003/02/21 14:14:29 majkl Exp $
++ * $Id: ossl.c,v 1.24 2003/02/24 16:23:10 majkl Exp $
+  * 'OpenSSL for Ruby' project
+  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  * All rights reserved.
+@@ -44,7 +44,8 @@
+ asn1time_to_time(ASN1_TIME *time)
+ {
+     struct tm tm;
+-
++    VALUE argv[6];
++    
+     if (!time) {
+ 	ossl_raise(rb_eTypeError, "ASN1_TIME is NULL!");
+     }
+@@ -64,8 +65,16 @@
+     default:
+ 	ossl_raise(rb_eTypeError, "unknown time format");
+     }
+-    return rb_time_new(mktime(&tm) - timezone, 0);
++//    return rb_time_new(mktime(&tm) - timezone, 0);
++    argv[0] = INT2NUM(tm.tm_year);
++    argv[1] = INT2NUM(tm.tm_mon+1);
++    argv[2] = INT2NUM(tm.tm_mday);
++    argv[3] = INT2NUM(tm.tm_hour);
++    argv[4] = INT2NUM(tm.tm_min);
++    argv[5] = INT2NUM(tm.tm_sec);
++
++    return rb_funcall2(rb_cTime, rb_intern("utc"), 6, argv);
+ }
+ 
+ /*
diff --git a/security/ruby-openssl/pkg-plist b/security/ruby-openssl/pkg-plist
index e298db46454..cbe83369cf0 100644
--- a/security/ruby-openssl/pkg-plist
+++ b/security/ruby-openssl/pkg-plist
@@ -1,10 +1,14 @@
 %%RUBY_SITEARCHLIBDIR%%/openssl.so
-%%RUBY_SITELIBDIR%%/openssl.rb
-%%RUBY_SITELIBDIR%%/ssl.rb
 %%RUBY_SITELIBDIR%%/net/https.rb
 %%RUBY_SITELIBDIR%%/net/protocols.rb
 %%RUBY_SITELIBDIR%%/net/telnets.rb
+%%RUBY_SITELIBDIR%%/openssl.rb
+%%RUBY_SITELIBDIR%%/openssl/bn.rb
 %%RUBY_SITELIBDIR%%/openssl/buffering.rb
+%%RUBY_SITELIBDIR%%/openssl/cipher.rb
+%%RUBY_SITELIBDIR%%/openssl/digest.rb
+%%RUBY_SITELIBDIR%%/openssl/ssl.rb
+%%RUBY_SITELIBDIR%%/openssl/x509.rb
 @dirrm %%RUBY_SITELIBDIR%%/openssl
 @dirrm %%RUBY_SITELIBDIR%%/net
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/01cert.pem
@@ -19,6 +23,8 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/0key.pem
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/1cert.pem
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/1key.pem
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/c/hash.c
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/c/key.c
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cacert.pem
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/config.cnf
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data
@@ -41,17 +47,17 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spki2cert.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spki_cert.pem
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spki_dn.txt
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/c/hash.c
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/c/key.c
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/cli.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/example.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/login.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/svr.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/verify_cb.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/wget.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ssl/wget2.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ssl
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/c
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LEGAL
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%