OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jul-2005 11:45:21
Branch: HEAD Handle: 2005070710452100
Modified files:
openpkg-src/ruby ruby.patch ruby.spec
Log:
fix building against OpenSSL 0.9.8
Summary:
Revision Changes Path
1.5 +46 -12 openpkg-src/ruby/ruby.patch
1.37 +1 -1 openpkg-src/ruby/ruby.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ruby/ruby.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 ruby.patch
--- openpkg-src/ruby/ruby.patch 17 Mar 2005 15:44:15 -0000 1.4
+++ openpkg-src/ruby/ruby.patch 7 Jul 2005 09:45:21 -0000 1.5
@@ -1,17 +1,6 @@
---- ext/dbm/extconf.rb.orig 2002-12-16 08:34:23.000000000 +0100
-+++ ext/dbm/extconf.rb 2002-12-30 10:04:05.000000000 +0100
-@@ -47,7 +47,7 @@
- if dblib
- db_check(dblib)
- else
-- for dblib in %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
-+ for dblib in %w(dbm db2 db1 db gdbm gdbm_compat qdbm)
- db_check(dblib) and break
- end
- end
Index: configure
--- configure.orig 2004-12-25 03:24:04 +0100
-+++ configure 2005-03-17 13:07:01 +0100
++++ configure 2005-07-07 11:41:28 +0200
@@ -13991,7 +13991,7 @@
rb_cv_dlopen=yes ;;
esix*|uxpds*) : ${LDSHARED="ld -G"}
@@ -21,3 +10,48 @@
rb_cv_dlopen=yes ;;
bsdi3*) case "$CC" in
*shlicc*) : ${LDSHARED="$CC -r"}
+Index: ext/dbm/extconf.rb
+--- ext/dbm/extconf.rb.orig 2003-07-24 09:41:36 +0200
++++ ext/dbm/extconf.rb 2005-07-07 11:41:28 +0200
+@@ -48,7 +48,7 @@
+ if dblib
+ db_check(dblib)
+ else
+- for dblib in %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
++ for dblib in %w(dbm db2 db1 db gdbm gdbm_compat qdbm)
+ db_check(dblib) and break
+ end
+ end
+Index: ext/digest/md5/md5ossl.h
+--- ext/digest/md5/md5ossl.h.orig 2002-09-26 18:27:23 +0200
++++ ext/digest/md5/md5ossl.h 2005-07-07 11:42:52 +0200
+@@ -3,6 +3,7 @@
+ #ifndef MD5OSSL_H_INCLUDED
+ #define MD5OSSL_H_INCLUDED
+
++#include <sys/types.h>
+ #include <openssl/md5.h>
+
+ void MD5_End(MD5_CTX *pctx, unsigned char *hexdigest);
+Index: ext/digest/rmd160/rmd160ossl.h
+--- ext/digest/rmd160/rmd160ossl.h.orig 2002-09-26 19:26:46 +0200
++++ ext/digest/rmd160/rmd160ossl.h 2005-07-07 11:43:15 +0200
+@@ -3,6 +3,7 @@
+ #ifndef RMD160OSSL_H_INCLUDED
+ #define RMD160OSSL_H_INCLUDED
+
++#include <sys/types.h>
+ #include <openssl/ripemd.h>
+
+ #define RMD160_CTX RIPEMD160_CTX
+Index: ext/digest/sha1/sha1ossl.h
+--- ext/digest/sha1/sha1ossl.h.orig 2002-09-26 19:44:33 +0200
++++ ext/digest/sha1/sha1ossl.h 2005-07-07 11:43:46 +0200
+@@ -3,6 +3,7 @@
+ #ifndef SHA1OSSL_H_INCLUDED
+ #define SHA1OSSL_H_INCLUDED
+
++#include <sys/types.h>
+ #include <openssl/sha.h>
+
+ #define SHA1_CTX SHA_CTX
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ruby/ruby.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 ruby.spec
--- openpkg-src/ruby/ruby.spec 24 Mar 2005 11:20:13 -0000 1.36
+++ openpkg-src/ruby/ruby.spec 7 Jul 2005 09:45:21 -0000 1.37
@@ -33,7 +33,7 @@
Group: Language
License: GPL
Version: 1.8.2
-Release: 20050317
+Release: 20050707
# list of sources
Source0: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
