- Update ruby19 to 1.9.2.

- Do not link agains librt. [1]

PR:		ports/149003 [1]
Submitted by:	Anonymous <swell.k@gmail.com> [1]
This commit is contained in:
Stanislav Sedov 2010-10-11 03:09:54 +00:00
parent 155dfa9f7c
commit 54b52675de
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=262794
13 changed files with 322 additions and 397 deletions

View file

@ -198,17 +198,20 @@ RUBY19= "@comment "
#
# Ruby 1.9
#
RUBY_RELVERSION= 1.9.1
RUBY_PORTREVISION= 1
RUBY_RELVERSION= 1.9.2
RUBY_PORTREVISION= 0
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 430
RUBY_PATCHLEVEL= 0
RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION}
RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-1.9/"
RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-1.9/" \
--with-rubylibprefix="${PREFIX}/lib/ruby" \
--docdir="${RUBY_DOCDIR}" \
--with-soname=ruby19
#
# PLIST_SUB helpers

View file

@ -18,19 +18,20 @@ DIST_SUBDIR= ruby
MAINTAINER= stas@FreeBSD.org
COMMENT?= An object-oriented interpreted scripting language
MAKE_JOBS_UNSAFE= yes
LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
yaml-0.2:${PORTSDIR}/textproc/libyaml
GNU_CONFIGURE= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
--enable-shared \
--enable-pthread \
--with-openssl-include=${OPENSSLINC} \
--with-ruby-version=minor \
--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
USE_OPENSSL= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= autoconf:267
WRKSRC= ${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
@ -42,6 +43,8 @@ RUBY_NO_RUN_DEPENDS= yes
_RUBY_SYSLIBDIR= ${PREFIX}/lib
_RUBY_EXTDIR= ${PREFIX}/lib/ruby19
MAKE_JOBS_UNSAFE= yes
NO_LATEST_LINK= yes
OPTIONS= RDOC "Build and install Rdoc indexes" off \
@ -72,8 +75,8 @@ CONFIGURE_ARGS+= --enable-install-doc
CONFIGURE_ARGS+= --disable-install-doc
.endif
CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
LIBS="${LDFLAGS}" \
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" \
debugflags=
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
@ -83,25 +86,22 @@ PLIST_SUB+= IF_DEFAULT=""
PLIST_SUB+= IF_DEFAULT="@comment "
.endif
GEMS_DIR= ${PREFIX}/lib/ruby/gems/${RUBY_VER}
PLIST_SUB+= GEMS_DIR="lib/ruby/gems/${RUBY_VER}"
INSTALLED_SCRIPTS= irb erb rdoc ri ruby testrb rake gem
EXTSAMPLES= bigdecimal/sample/*.rb \
curses/hello.rb \
curses/rain.rb \
curses/view.rb \
curses/view2.rb \
pty/expect_sample.rb \
pty/script.rb \
pty/shl.rb
curses/view2.rb
EXTDOCS= bigdecimal/bigdecimal_*.html \
etc/etc.txt* \
pty/README* \
readline/README* \
ripper/README \
stringio/README \
syslog/syslog.txt \
zlib/doc/zlib.rd
syslog/syslog.txt
MAN1= ${RUBY_NAME}.1 erb${RUBY_SUFFIX}.1 irb${RUBY_SUFFIX}.1 \
rake${RUBY_SUFFIX}.1 ri${RUBY_SUFFIX}.1
@ -161,6 +161,10 @@ pre-su-install:
${TOUCH} ${RUBY_DOCDIR}/.keep_me
${TOUCH} ${RUBY_SITEARCHLIBDIR}/.keep_me
${TOUCH} ${RUBY_VENDORARCHLIBDIR}/.keep_me
.for D in cache doc gems
${MKDIR} ${GEMS_DIR}/${D}
${TOUCH} ${GEMS_DIR}/${D}/.keep_me
.endfor
post-install:
#
@ -209,10 +213,21 @@ post-install:
@${FIND} -ds ${RUBY_RIDIR}/ -type d -mindepth 1 | \
${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
#
# Add generated doxygen files to pkg-plist
#
.if defined(WITH_RDOC) && !defined(NOPORTDOCS)
@${FIND} -ds ${RUBY_DOCDIR}/capi ! -type d | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} -ds ${RUBY_DOCDIR}/capi -type d | \
${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.endif
@${ECHO_CMD} "@unexec rmdir %D/${RUBY_SITERIDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/${RUBY_RIDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/share/ri/${RUBY_VER} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/share/ri 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/${RUBY_DOCDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
@${CAT} ${PKGMESSAGE}
@ -237,10 +252,12 @@ plist::
#
# Vendor and site libs
#
@${FIND} -ds ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me | \
@${FIND} -Eds ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me \
! -regex "${RUBY_DOCDIR}/capi/?.*" | \
${SED} 's,^${RUBY_DOCDIR},%%PORTDOCS%%%%RUBY_DOCDIR%%,' \
>> pkg-plist
@${FIND} -ds ${RUBY_DOCDIR}/ -type d -mindepth 1 | ${SORT} -r | \
@${FIND} -Eds ${RUBY_DOCDIR}/ -type d -mindepth 1 ! \
-regex "${RUBY_DOCDIR}/capi/?.*" | ${SORT} -r | \
${SED} -E -e \
's,^${RUBY_DOCDIR}(.*),%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%\1,' \
>> pkg-plist
@ -254,7 +271,7 @@ plist::
>> pkg-plist
@${ECHO_CMD} "%%RUBY_DOCDIR%%/.keep_me" >> pkg-plist
@${ECHO_CMD} "@dirrmtry %%RUBY_DOCDIR%%" >> pkg-plist
# @${ECHO_CMD} "@dirrmtry %%RUBY_DOCDIR%%" >> pkg-plist
@${ECHO_CMD} "%%RUBY_EXAMPLESDIR%%/.keep_me" >> pkg-plist
@${ECHO_CMD} "@dirrmtry %%RUBY_EXAMPLESDIR%%" >> pkg-plist
@ -274,6 +291,14 @@ plist::
@${FIND} -ds ${RUBY_LIBDIR}/ -type d | ${SORT} -r | \
${SED} -E -e 's,^${RUBY_LIBDIR}(.*),@dirrm %%RUBY_LIBDIR%%\1,' >> pkg-plist
#
# Find all gem files/folders
#
@${FIND} -ds ${GEMS_DIR}/ ! -type d | \
${SED} 's,^${GEMS_DIR},%%GEMS_DIR%%,' >> pkg-plist
@${FIND} -ds ${GEMS_DIR}/ -type d | ${SORT} -r | \
${SED} -E -e 's,^${GEMS_DIR}(.*),@dirrm %%GEMS_DIR%%\1,' >> pkg-plist
@${ECHO_CMD} "%%RUBY_SITEARCHLIBDIR%%/.keep_me" >> pkg-plist
@${ECHO_CMD} "@dirrmtry %%RUBY_SITEARCHLIBDIR%%" >> pkg-plist
@${ECHO_CMD} "@dirrmtry %%RUBY_SITELIBDIR%%" >> pkg-plist
@ -283,6 +308,7 @@ plist::
@${ECHO_CMD} "@dirrmtry %%RUBY_VENDORARCHLIBDIR%%" >> pkg-plist
@${ECHO_CMD} "@dirrmtry %%RUBY_VENDORLIBDIR%%" >> pkg-plist
@${ECHO_CMD} "@dirrmtry lib/ruby/vendor_ruby" >> pkg-plist
@${ECHO_CMD} "@dirrmtry lib/ruby/gems" >> pkg-plist
@${ECHO_CMD} "@dirrmtry lib/ruby" >> pkg-plist
@ -291,4 +317,11 @@ plist::
test:
@(cd ${WRKSRC}; ${MAKE} test)
validate::
@${MKDIR} ${WRKSRC}/rubyspec
rm -rf ${WRKSRC}/rubyspec/*
(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX})
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (ruby/ruby-1.9.1-p430.tar.bz2) = f855103aebeb3318dccb409319b547a0
SHA256 (ruby/ruby-1.9.1-p430.tar.bz2) = 8d5cc11d819e476fb651db783f714cc4100922f47447f7acdce87ed769cf9d97
SIZE (ruby/ruby-1.9.1-p430.tar.bz2) = 7299829
MD5 (ruby/ruby-1.9.2-p0.tar.bz2) = d8a02cadf57d2571cd4250e248ea7e4b
SHA256 (ruby/ruby-1.9.2-p0.tar.bz2) = e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
SIZE (ruby/ruby-1.9.2-p0.tar.bz2) = 8495472

View file

@ -0,0 +1,11 @@
--- common.mk.orig 2010-10-10 16:40:15.000000000 -0700
+++ common.mk 2010-10-10 16:40:42.000000000 -0700
@@ -256,7 +256,7 @@
install-capi: capi pre-install-capi do-install-capi post-install-capi
pre-install-capi:: install-prereq
do-install-capi: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=capi
+ @$(NULLCMD)
post-install-capi::
@$(NULLCMD)

View file

@ -1,20 +0,0 @@
--- configure.orig 2009-01-30 18:26:04.000000000 +0300
+++ configure 2009-02-11 03:22:46.000000000 +0300
@@ -20418,7 +20418,7 @@
if test x"$enable_pthread" = xyes; then
- for pthread_lib in thr pthread pthreads c c_r root; do
+ for pthread_lib in pthread thr pthreads c c_r root; do
as_ac_Lib=`$as_echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
$as_echo_n "checking for pthread_kill in -l$pthread_lib... " >&6; }
@@ -22406,7 +22406,7 @@
rubyw_install_name="$RUBYW_INSTALL_NAME"
;;
esac
-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/${RUBY_INSTALL_NAME}\\"`
+RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
# Check whether --with-ruby-version was given.

View file

@ -0,0 +1,46 @@
--- configure.in.orig 2010-10-09 03:00:14.000000000 -0700
+++ configure.in 2010-10-09 03:07:18.000000000 -0700
@@ -959,11 +959,11 @@
[superux*], [ ac_cv_func_setitimer=no
],
[ LIBS="-lm $LIBS"])
-AC_CHECK_LIB(crypt, crypt)
-AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
-AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
-AC_CHECK_LIB(socket, socketpair) # SunOS/Solaris
-AC_CHECK_LIB(rt, clock_gettime) # GNU/Linux
+AC_SEARCH_LIBS(crypt, crypt)
+AC_SEARCH_LIBS(dlopen, dl) # Dynamic linking for SunOS/Solaris and SYSV
+AC_SEARCH_LIBS(shl_load, dld) # Dynamic linking for HP-UX
+AC_SEARCH_LIBS(socketpair, socket) # SunOS/Solaris
+AC_SEARCH_LIBS(clock_gettime, rt) # GNU/Linux
if test "${enable_win95}" = maybe; then
AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
fi
@@ -1576,7 +1576,7 @@
fi
if test x"$enable_pthread" = xyes; then
- for pthread_lib in thr pthread pthreads c c_r root; do
+ for pthread_lib in pthread thr pthreads c c_r root; do
AC_CHECK_LIB($pthread_lib, pthread_kill,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then break; fi
@@ -1590,6 +1590,7 @@
[c], [],
[root], [],
[c_r], [MAINLIBS="-pthread $MAINLIBS"],
+ [pthread], [MAINLIBS="-pthread $MAINLIBS"],
[LIBS="-l$pthread_lib $LIBS"])
else
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
@@ -1600,7 +1601,8 @@
thr_stksegment pthread_stackseg_np pthread_getthrds_np)
if test x"$ac_cv_func_nanosleep" = xno; then
AC_CHECK_LIB(rt, nanosleep)
- if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
+ AC_SEARCH_LIBS(nanosleep, rt)
+ if test x"$ac_cv_search_nanosleep" != xno; then
AC_DEFINE(HAVE_NANOSLEEP)
fi
fi

View file

@ -1,21 +0,0 @@
Index: trunk/ext/readline/readline.c
===================================================================
--- ext/readline/readline.c (revision 24139)
+++ ext/readline/readline.c (revision 24140)
@@ -253,6 +253,7 @@
if (status) {
#if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
/* restore terminal mode and signal handler*/
+ rl_free_line_state();
rl_cleanup_after_signal();
#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
/* restore terminal mode */
@@ -1450,6 +1451,8 @@
#elif defined HAVE_RL_EVENT_HOOK
rl_event_hook = readline_event;
#endif
+ rl_catch_signals = 0;
+ rl_catch_sigwinch = 0;
#ifdef HAVE_RL_CLEAR_SIGNALS
rl_clear_signals();
#endif

View file

@ -1,12 +0,0 @@
--- gem_prelude.rb.orig 2010-01-29 08:19:47.000000000 +0300
+++ gem_prelude.rb 2010-01-29 08:20:04.000000000 +0300
@@ -115,9 +115,6 @@
if defined? RUBY_FRAMEWORK_VERSION then
File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
ConfigMap[:ruby_version]
- elsif RUBY_VERSION > '1.9' then
- File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
- ConfigMap[:ruby_version])
else
File.join(ConfigMap[:libdir], ruby_engine, 'gems',
ConfigMap[:ruby_version])

View file

@ -1,20 +0,0 @@
--- io.c.orig 2009-01-28 12:20:46.000000000 +0300
+++ io.c 2009-02-09 19:18:58.000000000 +0300
@@ -6685,7 +6685,7 @@
}
static int
-io_cntl(int fd, int cmd, long narg, int io_p)
+io_cntl(int fd, unsigned long cmd, long narg, int io_p)
{
int retval;
@@ -6707,7 +6707,7 @@
static VALUE
rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
{
- int cmd = NUM2ULONG(req);
+ unsigned long cmd = NUM2ULONG(req);
rb_io_t *fptr;
long len = 0;
long narg = 0;

View file

@ -1,21 +0,0 @@
--- mkconfig.rb.orig 2008-12-12 06:54:37.000000000 -0800
+++ mkconfig.rb 2010-09-19 17:51:43.000000000 -0700
@@ -102,7 +102,8 @@
drive = File::PATH_SEPARATOR == ';'
-prefix = '/lib/ruby/' + RUBY_VERSION + '/' + RUBY_PLATFORM
+major, minor, *rest = RUBY_VERSION.split('.')
+prefix = '/lib/ruby/' + "#{major}.#{minor}/" + RUBY_PLATFORM
print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
print " CONFIG = {}\n"
@@ -140,7 +141,7 @@
print(*v_fast)
print(*v_others)
print <<EOS
- CONFIG["rubylibdir"] = "$(libdir)/$(ruby_install_name)/$(ruby_version)"
+ CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"

View file

@ -1,207 +0,0 @@
commit 76526d091f1caeebf65667b8299eac12d63a36ca
Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Fri Jan 15 21:53:20 2010 +0900
OpenSSL
diff --git a/ext/openssl/ossl.c ext/openssl/ossl.c
index d4a2dc1..85ba654 100644
--- a/ext/openssl/ossl.c
+++ ext/openssl/ossl.c
@@ -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/ext/openssl/ossl.h ext/openssl/ossl.h
index 9ac1525..4bb18d5 100644
--- a/ext/openssl/ossl.h
+++ ext/openssl/ossl.h
@@ -104,6 +104,13 @@ extern VALUE eOSSLError;
} while (0)
/*
+ * Compatibility
+ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
+
+/*
* String to HEXString conversion
*/
int string2hex(const unsigned char *, int, char **, int *);
diff --git a/ext/openssl/ossl_pkcs7.c ext/openssl/ossl_pkcs7.c
index fe1ef7c..b0cc656 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ ext/openssl/ossl_pkcs7.c
@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert)
return self;
}
-static STACK *
-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
+static STACK_OF(X509) *
+pkcs7_get_certs(VALUE self)
{
PKCS7 *pkcs7;
STACK_OF(X509) *certs;
- STACK_OF(X509_CRL) *crls;
int i;
GetPKCS7(self, pkcs7);
@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs)
switch(i){
case NID_pkcs7_signed:
certs = pkcs7->d.sign->cert;
- crls = pkcs7->d.sign->crl;
break;
case NID_pkcs7_signedAndEnveloped:
certs = pkcs7->d.signed_and_enveloped->cert;
+ break;
+ default:
+ certs = NULL;
+ }
+
+ return certs;
+}
+
+static STACK_OF(X509_CRL) *
+pkcs7_get_crls(VALUE self)
+{
+ PKCS7 *pkcs7;
+ STACK_OF(X509_CRL) *crls;
+ int i;
+
+ GetPKCS7(self, pkcs7);
+ i = OBJ_obj2nid(pkcs7->type);
+ switch(i){
+ case NID_pkcs7_signed:
+ crls = pkcs7->d.sign->crl;
+ break;
+ case NID_pkcs7_signedAndEnveloped:
crls = pkcs7->d.signed_and_enveloped->crl;
break;
default:
- certs = crls = NULL;
+ crls = NULL;
}
- return want_certs ? certs : crls;
+ return crls;
}
static VALUE
@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
STACK_OF(X509) *certs;
X509 *cert;
- certs = pkcs7_get_certs_or_crls(self, 1);
+ certs = pkcs7_get_certs(self);
while((cert = sk_X509_pop(certs))) X509_free(cert);
rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
static VALUE
ossl_pkcs7_get_certificates(VALUE self)
{
- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
+ return ossl_x509_sk2ary(pkcs7_get_certs(self));
}
static VALUE
@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
STACK_OF(X509_CRL) *crls;
X509_CRL *crl;
- crls = pkcs7_get_certs_or_crls(self, 0);
+ crls = pkcs7_get_crls(self);
while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
static VALUE
ossl_pkcs7_get_crls(VALUE self)
{
- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
+ return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
}
static VALUE
diff --git a/ext/openssl/ossl_ssl.c ext/openssl/ossl_ssl.c
index 97c5583..fe6e74f 100644
--- a/ext/openssl/ossl_ssl.c
+++ ext/openssl/ossl_ssl.c
@@ -1403,10 +1403,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
}
chain = SSL_get_peer_cert_chain(ssl);
if(!chain) return Qnil;
- num = sk_num(chain);
+ num = sk_X509_num(chain);
ary = rb_ary_new2(num);
for (i = 0; i < num; i++){
- cert = (X509*)sk_value(chain, i);
+ cert = sk_X509_value(chain, i);
rb_ary_push(ary, ossl_x509_new(cert));
}
diff --git a/ext/openssl/ossl_x509attr.c ext/openssl/ossl_x509attr.c
index 1f817cd..2a4c481 100644
--- a/ext/openssl/ossl_x509attr.c
+++ ext/openssl/ossl_x509attr.c
@@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self)
ossl_str_adjust(str, p);
}
else{
- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
+ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set,
+ (unsigned char **) NULL, i2d_ASN1_TYPE,
+ V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
str = rb_str_new(0, length);
p = (unsigned char *)RSTRING_PTR(str);
i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
diff --git a/ext/openssl/ossl_x509crl.c ext/openssl/ossl_x509crl.c
index 1be9640..818fdba 100644
--- a/ext/openssl/ossl_x509crl.c
+++ ext/openssl/ossl_x509crl.c
@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self)
VALUE ary, revoked;
GetX509CRL(self, crl);
- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
+ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
if (num < 0) {
OSSL_Debug("num < 0???");
return rb_ary_new();
@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self)
ary = rb_ary_new2(num);
for(i=0; i<num; i++) {
/* NO DUP - don't free! */
- rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
+ rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
revoked = ossl_x509revoked_new(rev);
rb_ary_push(ary, revoked);
}

View file

@ -0,0 +1,11 @@
--- thread_pthread.c.orig 2010-10-10 03:11:47.000000000 -0700
+++ thread_pthread.c 2010-10-10 03:13:05.000000000 -0700
@@ -809,7 +809,7 @@
int err;
pthread_attr_init(&attr);
-#ifdef PTHREAD_STACK_MIN
+#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__)
pthread_attr_setstacksize(&attr,
PTHREAD_STACK_MIN + (THREAD_DEBUG ? BUFSIZ : 0));
#endif

View file

@ -35,6 +35,7 @@ include/ruby-1.9/ruby/regex.h
include/ruby-1.9/ruby/ruby.h
include/ruby-1.9/ruby/st.h
include/ruby-1.9/ruby/util.h
include/ruby-1.9/ruby/version.h
include/ruby-1.9/ruby/vm.h
include/ruby-1.9/ruby.h
@dirrm include/ruby-1.9/%%RUBY_ARCH%%/ruby
@ -49,16 +50,18 @@ include/ruby-1.9/ruby.h
%%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog-YARV
%%PORTDOCS%%%%RUBY_DOCDIR%%/LEGAL
%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.8.7
%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.9.1
%%PORTDOCS%%%%RUBY_DOCDIR%%/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal/bigdecimal_en.html
%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal/bigdecimal_ja.html
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/images/boottime-classes.png
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
@ -66,22 +69,43 @@ include/ruby-1.9/ruby.h
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/CHANGES
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/command_line_usage.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/Rakefile1
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/Rakefile2
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/a.c
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/b.c
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/main.c
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/glossary.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/jamis.rb
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/proto_rake.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/rakefile.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/rational.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/release_notes/rake-0.8.7.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/re.rdoc
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/ripper/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/ChangeLog
%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/History.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/LICENSE.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/stringio/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/zlib/zlib.rd
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/zlib
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/stringio
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rubygems
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ripper
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rake/release_notes
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rake/example
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rake
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/images
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bigdecimal
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/linear.rb
@ -208,6 +232,7 @@ include/ruby-1.9/ruby.h
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/tc_subtracter.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/ts_examples.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/time.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/timeout.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/trojan.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tsvr.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uumerge.rb
@ -234,7 +259,6 @@ include/ruby-1.9/ruby.h
%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bigdecimal
%%RUBY_DOCDIR%%/.keep_me
@dirrmtry %%RUBY_DOCDIR%%
%%RUBY_EXAMPLESDIR%%/.keep_me
@dirrmtry %%RUBY_EXAMPLESDIR%%
@exec /bin/mkdir -p %D/%%RUBY_RIDIR%%
@ -243,6 +267,8 @@ include/ruby-1.9/ruby.h
@exec /bin/mkdir -p %D/%%RUBY_SITERIDIR%%
@exec env LC_TIME=C /bin/date > %D/%%RUBY_SITERIDIR%%/created.rid
@unexec /bin/rm -f %D/%%RUBY_SITERIDIR%%/created.rid
%%RUBY_LIBDIR%%/English.rb
%%RUBY_LIBDIR%%/abbrev.rb
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/bigdecimal.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/continuation.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/coverage.so
@ -254,6 +280,7 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/sha1.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/sha2.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl/callback.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/big5.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/cp949.so
@ -285,6 +312,11 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/shift_jis.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/big5.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/chinese.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/emoji.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/emoji_iso2022_kddi.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/emoji_sjis_docomo.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/emoji_sjis_kddi.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/emoji_sjis_softbank.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/escape.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/gb18030.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/gbk.so
@ -295,6 +327,7 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/korean.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/single_byte.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/transdb.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/utf8_mac.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/utf_16_32.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/utf_16be.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/utf_16le.so
@ -304,13 +337,17 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/etc.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fcntl.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fiber.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fiddle.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io/nonblock.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io/wait.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext/generator.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext/parser.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/mathn/complex.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/mathn/rational.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/nkf.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/objspace.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/openssl.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/psych.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/pty.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/racc/cparse.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/rbconfig.rb
@ -323,8 +360,6 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syck.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syslog.so
%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/zlib.so
%%RUBY_LIBDIR%%/English.rb
%%RUBY_LIBDIR%%/abbrev.rb
%%RUBY_LIBDIR%%/base64.rb
%%RUBY_LIBDIR%%/benchmark.rb
%%RUBY_LIBDIR%%/bigdecimal/jacobian.rb
@ -342,6 +377,9 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/cmath.rb
%%RUBY_LIBDIR%%/complex.rb
%%RUBY_LIBDIR%%/csv.rb
%%RUBY_LIBDIR%%/date/delta/parser.rb
%%RUBY_LIBDIR%%/date/delta/parser.ry
%%RUBY_LIBDIR%%/date/delta.rb
%%RUBY_LIBDIR%%/date/format.rb
%%RUBY_LIBDIR%%/date.rb
%%RUBY_LIBDIR%%/debug.rb
@ -358,6 +396,7 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/dl/struct.rb
%%RUBY_LIBDIR%%/dl/types.rb
%%RUBY_LIBDIR%%/dl/value.rb
%%RUBY_LIBDIR%%/dl.rb
%%RUBY_LIBDIR%%/drb/acl.rb
%%RUBY_LIBDIR%%/drb/drb.rb
%%RUBY_LIBDIR%%/drb/eq.rb
@ -373,12 +412,14 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/e2mmap.rb
%%RUBY_LIBDIR%%/erb.rb
%%RUBY_LIBDIR%%/expect.rb
%%RUBY_LIBDIR%%/fiddle/closure.rb
%%RUBY_LIBDIR%%/fiddle/function.rb
%%RUBY_LIBDIR%%/fiddle.rb
%%RUBY_LIBDIR%%/fileutils.rb
%%RUBY_LIBDIR%%/find.rb
%%RUBY_LIBDIR%%/forwardable.rb
%%RUBY_LIBDIR%%/getoptlong.rb
%%RUBY_LIBDIR%%/gserver.rb
%%RUBY_LIBDIR%%/io/nonblock.rb
%%RUBY_LIBDIR%%/ipaddr.rb
%%RUBY_LIBDIR%%/irb/cmd/chws.rb
%%RUBY_LIBDIR%%/irb/cmd/fork.rb
@ -403,6 +444,7 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/irb/help.rb
%%RUBY_LIBDIR%%/irb/init.rb
%%RUBY_LIBDIR%%/irb/input-method.rb
%%RUBY_LIBDIR%%/irb/inspector.rb
%%RUBY_LIBDIR%%/irb/lc/error.rb
%%RUBY_LIBDIR%%/irb/lc/help-message
%%RUBY_LIBDIR%%/irb/lc/ja/encoding_aliases.rb
@ -454,7 +496,9 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/openssl/buffering.rb
%%RUBY_LIBDIR%%/openssl/cipher.rb
%%RUBY_LIBDIR%%/openssl/digest.rb
%%RUBY_LIBDIR%%/openssl/ssl-internal.rb
%%RUBY_LIBDIR%%/openssl/ssl.rb
%%RUBY_LIBDIR%%/openssl/x509-internal.rb
%%RUBY_LIBDIR%%/openssl/x509.rb
%%RUBY_LIBDIR%%/openssl.rb
%%RUBY_LIBDIR%%/optparse/date.rb
@ -471,9 +515,39 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/profile.rb
%%RUBY_LIBDIR%%/profiler.rb
%%RUBY_LIBDIR%%/pstore.rb
%%RUBY_LIBDIR%%/psych/coder.rb
%%RUBY_LIBDIR%%/psych/core_ext.rb
%%RUBY_LIBDIR%%/psych/deprecated.rb
%%RUBY_LIBDIR%%/psych/handler.rb
%%RUBY_LIBDIR%%/psych/json/tree_builder.rb
%%RUBY_LIBDIR%%/psych/nodes/alias.rb
%%RUBY_LIBDIR%%/psych/nodes/document.rb
%%RUBY_LIBDIR%%/psych/nodes/mapping.rb
%%RUBY_LIBDIR%%/psych/nodes/node.rb
%%RUBY_LIBDIR%%/psych/nodes/scalar.rb
%%RUBY_LIBDIR%%/psych/nodes/sequence.rb
%%RUBY_LIBDIR%%/psych/nodes/stream.rb
%%RUBY_LIBDIR%%/psych/nodes.rb
%%RUBY_LIBDIR%%/psych/omap.rb
%%RUBY_LIBDIR%%/psych/parser.rb
%%RUBY_LIBDIR%%/psych/scalar_scanner.rb
%%RUBY_LIBDIR%%/psych/set.rb
%%RUBY_LIBDIR%%/psych/tree_builder.rb
%%RUBY_LIBDIR%%/psych/visitors/emitter.rb
%%RUBY_LIBDIR%%/psych/visitors/json_tree.rb
%%RUBY_LIBDIR%%/psych/visitors/to_ruby.rb
%%RUBY_LIBDIR%%/psych/visitors/visitor.rb
%%RUBY_LIBDIR%%/psych/visitors/yaml_tree.rb
%%RUBY_LIBDIR%%/psych/visitors.rb
%%RUBY_LIBDIR%%/psych.rb
%%RUBY_LIBDIR%%/racc/parser.rb
%%RUBY_LIBDIR%%/rake/classic_namespace.rb
%%RUBY_LIBDIR%%/rake/clean.rb
%%RUBY_LIBDIR%%/rake/contrib/compositepublisher.rb
%%RUBY_LIBDIR%%/rake/contrib/ftptools.rb
%%RUBY_LIBDIR%%/rake/contrib/publisher.rb
%%RUBY_LIBDIR%%/rake/contrib/rubyforgepublisher.rb
%%RUBY_LIBDIR%%/rake/contrib/sshpublisher.rb
%%RUBY_LIBDIR%%/rake/gempackagetask.rb
%%RUBY_LIBDIR%%/rake/loaders/makefile.rb
%%RUBY_LIBDIR%%/rake/packagetask.rb
@ -486,64 +560,97 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/rake.rb
%%RUBY_LIBDIR%%/rational.rb
%%RUBY_LIBDIR%%/rbconfig/datadir.rb
%%RUBY_LIBDIR%%/rdoc/alias.rb
%%RUBY_LIBDIR%%/rdoc/anon_class.rb
%%RUBY_LIBDIR%%/rdoc/any_method.rb
%%RUBY_LIBDIR%%/rdoc/attr.rb
%%RUBY_LIBDIR%%/rdoc/class_module.rb
%%RUBY_LIBDIR%%/rdoc/code_object.rb
%%RUBY_LIBDIR%%/rdoc/code_objects.rb
%%RUBY_LIBDIR%%/rdoc/diagram.rb
%%RUBY_LIBDIR%%/rdoc/dot.rb
%%RUBY_LIBDIR%%/rdoc/generator/chm/chm.rb
%%RUBY_LIBDIR%%/rdoc/generator/chm.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/common.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/frameless.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/hefss.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/html.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/kilmer.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/kilmerfactory.rb
%%RUBY_LIBDIR%%/rdoc/generator/html/one_page_html.rb
%%RUBY_LIBDIR%%/rdoc/generator/html.rb
%%RUBY_LIBDIR%%/rdoc/constant.rb
%%RUBY_LIBDIR%%/rdoc/context.rb
%%RUBY_LIBDIR%%/rdoc/generator/darkfish.rb
%%RUBY_LIBDIR%%/rdoc/generator/markup.rb
%%RUBY_LIBDIR%%/rdoc/generator/ri.rb
%%RUBY_LIBDIR%%/rdoc/generator/texinfo/class.texinfo.erb
%%RUBY_LIBDIR%%/rdoc/generator/texinfo/file.texinfo.erb
%%RUBY_LIBDIR%%/rdoc/generator/texinfo/method.texinfo.erb
%%RUBY_LIBDIR%%/rdoc/generator/texinfo/texinfo.erb
%%RUBY_LIBDIR%%/rdoc/generator/texinfo.rb
%%RUBY_LIBDIR%%/rdoc/generator/xml/rdf.rb
%%RUBY_LIBDIR%%/rdoc/generator/xml/xml.rb
%%RUBY_LIBDIR%%/rdoc/generator/xml.rb
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/classpage.rhtml
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/filepage.rhtml
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/brick.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/brick_link.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bug.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bullet_black.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/date.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/find.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/loadingAnimation.gif
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/macFFBgHack.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/package.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/page_green.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/page_white_text.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/page_white_width.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/plugin.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/ruby.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/tag_green.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/wrench.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/wrench_orange.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/zoom.png
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/index.rhtml
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/darkfish.js
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/jquery.js
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/quicksearch.js
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/thickbox-compressed.js
%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/rdoc.css
%%RUBY_LIBDIR%%/rdoc/generator.rb
%%RUBY_LIBDIR%%/rdoc/ghost_method.rb
%%RUBY_LIBDIR%%/rdoc/include.rb
%%RUBY_LIBDIR%%/rdoc/known_classes.rb
%%RUBY_LIBDIR%%/rdoc/markup/attribute_manager.rb
%%RUBY_LIBDIR%%/rdoc/markup/blank_line.rb
%%RUBY_LIBDIR%%/rdoc/markup/document.rb
%%RUBY_LIBDIR%%/rdoc/markup/formatter.rb
%%RUBY_LIBDIR%%/rdoc/markup/fragments.rb
%%RUBY_LIBDIR%%/rdoc/markup/formatter_test_case.rb
%%RUBY_LIBDIR%%/rdoc/markup/heading.rb
%%RUBY_LIBDIR%%/rdoc/markup/inline.rb
%%RUBY_LIBDIR%%/rdoc/markup/lines.rb
%%RUBY_LIBDIR%%/rdoc/markup/list.rb
%%RUBY_LIBDIR%%/rdoc/markup/list_item.rb
%%RUBY_LIBDIR%%/rdoc/markup/paragraph.rb
%%RUBY_LIBDIR%%/rdoc/markup/parser.rb
%%RUBY_LIBDIR%%/rdoc/markup/preprocess.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_flow.rb
%%RUBY_LIBDIR%%/rdoc/markup/raw.rb
%%RUBY_LIBDIR%%/rdoc/markup/rule.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_ansi.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_bs.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_html.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_html_crossref.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_latex.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_rdoc.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_test.rb
%%RUBY_LIBDIR%%/rdoc/markup/to_texinfo.rb
%%RUBY_LIBDIR%%/rdoc/markup/verbatim.rb
%%RUBY_LIBDIR%%/rdoc/markup.rb
%%RUBY_LIBDIR%%/rdoc/meta_method.rb
%%RUBY_LIBDIR%%/rdoc/normal_class.rb
%%RUBY_LIBDIR%%/rdoc/normal_module.rb
%%RUBY_LIBDIR%%/rdoc/options.rb
%%RUBY_LIBDIR%%/rdoc/parser/c.rb
%%RUBY_LIBDIR%%/rdoc/parser/f95.rb
%%RUBY_LIBDIR%%/rdoc/parser/perl.rb
%%RUBY_LIBDIR%%/rdoc/parser/ruby.rb
%%RUBY_LIBDIR%%/rdoc/parser/ruby_tools.rb
%%RUBY_LIBDIR%%/rdoc/parser/simple.rb
%%RUBY_LIBDIR%%/rdoc/parser.rb
%%RUBY_LIBDIR%%/rdoc/rdoc.rb
%%RUBY_LIBDIR%%/rdoc/ri/cache.rb
%%RUBY_LIBDIR%%/rdoc/ri/descriptions.rb
%%RUBY_LIBDIR%%/rdoc/ri/display.rb
%%RUBY_LIBDIR%%/rdoc/require.rb
%%RUBY_LIBDIR%%/rdoc/ri/driver.rb
%%RUBY_LIBDIR%%/rdoc/ri/formatter.rb
%%RUBY_LIBDIR%%/rdoc/ri/paths.rb
%%RUBY_LIBDIR%%/rdoc/ri/reader.rb
%%RUBY_LIBDIR%%/rdoc/ri/util.rb
%%RUBY_LIBDIR%%/rdoc/ri/writer.rb
%%RUBY_LIBDIR%%/rdoc/ri/store.rb
%%RUBY_LIBDIR%%/rdoc/ri.rb
%%RUBY_LIBDIR%%/rdoc/ruby_lex.rb
%%RUBY_LIBDIR%%/rdoc/ruby_token.rb
%%RUBY_LIBDIR%%/rdoc/single_class.rb
%%RUBY_LIBDIR%%/rdoc/stats.rb
%%RUBY_LIBDIR%%/rdoc/template.rb
%%RUBY_LIBDIR%%/rdoc/task.rb
%%RUBY_LIBDIR%%/rdoc/text.rb
%%RUBY_LIBDIR%%/rdoc/tokenstream.rb
%%RUBY_LIBDIR%%/rdoc/top_level.rb
%%RUBY_LIBDIR%%/rdoc.rb
%%RUBY_LIBDIR%%/resolv-replace.rb
%%RUBY_LIBDIR%%/resolv.rb
@ -676,11 +783,14 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/rubygems/commands/lock_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/mirror_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/outdated_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/owner_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/pristine_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/push_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/query_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/rdoc_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/search_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/server_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/setup_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/sources_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/specification_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/stale_command.rb
@ -694,11 +804,8 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/rubygems/dependency.rb
%%RUBY_LIBDIR%%/rubygems/dependency_installer.rb
%%RUBY_LIBDIR%%/rubygems/dependency_list.rb
%%RUBY_LIBDIR%%/rubygems/digest/digest_adapter.rb
%%RUBY_LIBDIR%%/rubygems/digest/md5.rb
%%RUBY_LIBDIR%%/rubygems/digest/sha1.rb
%%RUBY_LIBDIR%%/rubygems/digest/sha2.rb
%%RUBY_LIBDIR%%/rubygems/doc_manager.rb
%%RUBY_LIBDIR%%/rubygems/errors.rb
%%RUBY_LIBDIR%%/rubygems/exceptions.rb
%%RUBY_LIBDIR%%/rubygems/ext/builder.rb
%%RUBY_LIBDIR%%/rubygems/ext/configure_builder.rb
@ -709,11 +816,7 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/rubygems/gem_openssl.rb
%%RUBY_LIBDIR%%/rubygems/gem_path_searcher.rb
%%RUBY_LIBDIR%%/rubygems/gem_runner.rb
%%RUBY_LIBDIR%%/rubygems/indexer/abstract_index_builder.rb
%%RUBY_LIBDIR%%/rubygems/indexer/latest_index_builder.rb
%%RUBY_LIBDIR%%/rubygems/indexer/marshal_index_builder.rb
%%RUBY_LIBDIR%%/rubygems/indexer/master_index_builder.rb
%%RUBY_LIBDIR%%/rubygems/indexer/quick_index_builder.rb
%%RUBY_LIBDIR%%/rubygems/gemcutter_utilities.rb
%%RUBY_LIBDIR%%/rubygems/indexer.rb
%%RUBY_LIBDIR%%/rubygems/install_update_options.rb
%%RUBY_LIBDIR%%/rubygems/installer.rb
@ -727,11 +830,11 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/rubygems/package/tar_reader.rb
%%RUBY_LIBDIR%%/rubygems/package/tar_writer.rb
%%RUBY_LIBDIR%%/rubygems/package.rb
%%RUBY_LIBDIR%%/rubygems/package_task.rb
%%RUBY_LIBDIR%%/rubygems/platform.rb
%%RUBY_LIBDIR%%/rubygems/remote_fetcher.rb
%%RUBY_LIBDIR%%/rubygems/require_paths_builder.rb
%%RUBY_LIBDIR%%/rubygems/requirement.rb
%%RUBY_LIBDIR%%/rubygems/rubygems_version.rb
%%RUBY_LIBDIR%%/rubygems/security.rb
%%RUBY_LIBDIR%%/rubygems/server.rb
%%RUBY_LIBDIR%%/rubygems/source_index.rb
@ -740,7 +843,7 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb
%%RUBY_LIBDIR%%/rubygems/specification.rb
%%RUBY_LIBDIR%%/rubygems/test_utilities.rb
%%RUBY_LIBDIR%%/rubygems/timer.rb
%%RUBY_LIBDIR%%/rubygems/text.rb
%%RUBY_LIBDIR%%/rubygems/uninstaller.rb
%%RUBY_LIBDIR%%/rubygems/user_interaction.rb
%%RUBY_LIBDIR%%/rubygems/validator.rb
@ -760,6 +863,22 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/shell.rb
%%RUBY_LIBDIR%%/shellwords.rb
%%RUBY_LIBDIR%%/singleton.rb
%%RUBY_LIBDIR%%/socket.rb
%%RUBY_LIBDIR%%/syck/baseemitter.rb
%%RUBY_LIBDIR%%/syck/basenode.rb
%%RUBY_LIBDIR%%/syck/constants.rb
%%RUBY_LIBDIR%%/syck/encoding.rb
%%RUBY_LIBDIR%%/syck/error.rb
%%RUBY_LIBDIR%%/syck/loader.rb
%%RUBY_LIBDIR%%/syck/rubytypes.rb
%%RUBY_LIBDIR%%/syck/stream.rb
%%RUBY_LIBDIR%%/syck/stringio.rb
%%RUBY_LIBDIR%%/syck/syck.rb
%%RUBY_LIBDIR%%/syck/tag.rb
%%RUBY_LIBDIR%%/syck/types.rb
%%RUBY_LIBDIR%%/syck/yamlnode.rb
%%RUBY_LIBDIR%%/syck/ypath.rb
%%RUBY_LIBDIR%%/syck.rb
%%RUBY_LIBDIR%%/sync.rb
%%RUBY_LIBDIR%%/tempfile.rb
%%RUBY_LIBDIR%%/test/unit/assertions.rb
@ -829,22 +948,9 @@ include/ruby-1.9/ruby.h
%%RUBY_LIBDIR%%/xmlrpc/parser.rb
%%RUBY_LIBDIR%%/xmlrpc/server.rb
%%RUBY_LIBDIR%%/xmlrpc/utils.rb
%%RUBY_LIBDIR%%/yaml/baseemitter.rb
%%RUBY_LIBDIR%%/yaml/basenode.rb
%%RUBY_LIBDIR%%/yaml/constants.rb
%%RUBY_LIBDIR%%/yaml/dbm.rb
%%RUBY_LIBDIR%%/yaml/encoding.rb
%%RUBY_LIBDIR%%/yaml/error.rb
%%RUBY_LIBDIR%%/yaml/loader.rb
%%RUBY_LIBDIR%%/yaml/rubytypes.rb
%%RUBY_LIBDIR%%/yaml/store.rb
%%RUBY_LIBDIR%%/yaml/stream.rb
%%RUBY_LIBDIR%%/yaml/stringio.rb
%%RUBY_LIBDIR%%/yaml/syck.rb
%%RUBY_LIBDIR%%/yaml/tag.rb
%%RUBY_LIBDIR%%/yaml/types.rb
%%RUBY_LIBDIR%%/yaml/yamlnode.rb
%%RUBY_LIBDIR%%/yaml/ypath.rb
%%RUBY_LIBDIR%%/yaml.rb
@dirrm %%RUBY_LIBDIR%%/yaml
@dirrm %%RUBY_LIBDIR%%/xmlrpc
@ -854,12 +960,11 @@ include/ruby-1.9/ruby.h
@dirrm %%RUBY_LIBDIR%%/uri
@dirrm %%RUBY_LIBDIR%%/test/unit
@dirrm %%RUBY_LIBDIR%%/test
@dirrm %%RUBY_LIBDIR%%/syck
@dirrm %%RUBY_LIBDIR%%/shell
@dirrm %%RUBY_LIBDIR%%/rubygems/package/tar_reader
@dirrm %%RUBY_LIBDIR%%/rubygems/package
@dirrm %%RUBY_LIBDIR%%/rubygems/indexer
@dirrm %%RUBY_LIBDIR%%/rubygems/ext
@dirrm %%RUBY_LIBDIR%%/rubygems/digest
@dirrm %%RUBY_LIBDIR%%/rubygems/commands
@dirrm %%RUBY_LIBDIR%%/rubygems
@dirrm %%RUBY_LIBDIR%%/rss/maker
@ -877,19 +982,22 @@ include/ruby-1.9/ruby.h
@dirrm %%RUBY_LIBDIR%%/rexml
@dirrm %%RUBY_LIBDIR%%/rdoc/ri
@dirrm %%RUBY_LIBDIR%%/rdoc/parser
@dirrm %%RUBY_LIBDIR%%/rdoc/markup/simple_markup
@dirrm %%RUBY_LIBDIR%%/rdoc/markup
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/xml
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/texinfo
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/html
@dirrm %%RUBY_LIBDIR%%/rdoc/generator/chm
@dirrm %%RUBY_LIBDIR%%/rdoc/generator
@dirrm %%RUBY_LIBDIR%%/rdoc
@dirrm %%RUBY_LIBDIR%%/rbconfig
@dirrm %%RUBY_LIBDIR%%/rake/loaders
@dirrm %%RUBY_LIBDIR%%/rake/contrib
@dirrm %%RUBY_LIBDIR%%/rake
@dirrm %%RUBY_LIBDIR%%/racc
@dirrm %%RUBY_LIBDIR%%/psych/visitors
@dirrm %%RUBY_LIBDIR%%/psych/nodes
@dirrm %%RUBY_LIBDIR%%/psych/json
@dirrm %%RUBY_LIBDIR%%/psych
@dirrm %%RUBY_LIBDIR%%/optparse
@dirrm %%RUBY_LIBDIR%%/openssl
@dirrm %%RUBY_LIBDIR%%/net
@ -901,10 +1009,11 @@ include/ruby-1.9/ruby.h
@dirrm %%RUBY_LIBDIR%%/irb/ext
@dirrm %%RUBY_LIBDIR%%/irb/cmd
@dirrm %%RUBY_LIBDIR%%/irb
@dirrm %%RUBY_LIBDIR%%/io
@dirrm %%RUBY_LIBDIR%%/fiddle
@dirrm %%RUBY_LIBDIR%%/drb
@dirrm %%RUBY_LIBDIR%%/dl
@dirrm %%RUBY_LIBDIR%%/digest
@dirrm %%RUBY_LIBDIR%%/date/delta
@dirrm %%RUBY_LIBDIR%%/date
@dirrm %%RUBY_LIBDIR%%/cgi/session
@dirrm %%RUBY_LIBDIR%%/cgi
@ -916,9 +1025,21 @@ include/ruby-1.9/ruby.h
@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io
@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans
@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc
@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl
@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest
@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%
@dirrm %%RUBY_LIBDIR%%/
%%GEMS_DIR%%/cache/.keep_me
%%GEMS_DIR%%/doc/.keep_me
%%GEMS_DIR%%/gems/.keep_me
%%GEMS_DIR%%/specifications/minitest.gemspec
%%GEMS_DIR%%/specifications/rake.gemspec
%%GEMS_DIR%%/specifications/rdoc.gemspec
@dirrm %%GEMS_DIR%%/specifications
@dirrm %%GEMS_DIR%%/gems
@dirrm %%GEMS_DIR%%/doc
@dirrm %%GEMS_DIR%%/cache
@dirrm %%GEMS_DIR%%/
%%RUBY_SITEARCHLIBDIR%%/.keep_me
@dirrmtry %%RUBY_SITEARCHLIBDIR%%
@dirrmtry %%RUBY_SITELIBDIR%%
@ -927,4 +1048,5 @@ include/ruby-1.9/ruby.h
@dirrmtry %%RUBY_VENDORARCHLIBDIR%%
@dirrmtry %%RUBY_VENDORLIBDIR%%
@dirrmtry lib/ruby/vendor_ruby
@dirrmtry lib/ruby/gems
@dirrmtry lib/ruby