Import of pkgsrc-2016Q3

This commit is contained in:
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
+9 -13
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2015/08/20 15:27:43 taca Exp $
# $NetBSD: Makefile,v 1.24 2016/09/08 15:19:18 joerg Exp $
#
DISTNAME= ${RUBY_DISTNAME}
@@ -9,12 +9,11 @@ MASTER_SITES= ${MASTER_SITE_RUBY}
MAINTAINER= taca@NetBSD.org
HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby ${RUBY_VERSION} release minimum base package
LICENSE= ${RUBY_LICENSE}
RUBY_VERSION_SUPPORTED= 21
RUBY_VERSIONS_ACCEPTED= 21
USE_LANGUAGES= c
USE_TOOLS+= pax yacc
USE_LANGUAGES= c c99
USE_TOOLS+= pax yacc pkg-config
GNU_CONFIGURE= yes
TEST_TARGET= test
CONFIGURE_ARGS+= --enable-shared
@@ -23,12 +22,14 @@ WRKSRC= ${RUBY_WRKSRC}
MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB}
#
# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
# Don't reference pkgsrc's INSTALL macro since Ruby expect it could
# execute by unprivileged user.
#
CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG=""
.include "../../mk/compiler.mk"
# /usr/bin/dtrace is not DTrace.
@@ -44,15 +45,10 @@ CONFIGURE_ENV+= LDSHARED="${CC} -G"
LIBS.SunOS+= -lm
.endif
.if ${OPSYS} == "SunOS"
CONFIGURE_ENV+= OBJCOPY=:
CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG=""
.endif
CONFIGURE_ENV.SunOS+= OBJCOPY=:
.if ${OPSYS} == "MirBSD"
# if present, an unsupported sysconf call is used
CONFIGURE_ENV+= ac_cv_func_getgrnam_r=no
.endif
CONFIGURE_ENV.MirBSD+= ac_cv_func_getgrnam_r=no
# bmake doesn't like the codesign/POSTLINK constructs for Darwin.
.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
+5 -3
View File
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.7 2015/08/20 15:27:43 taca Exp $
@comment $NetBSD: PLIST,v 1.9 2016/05/15 14:15:14 taca Exp $
bin/erb${RUBY_SUFFIX}
bin/gem${RUBY_SUFFIX}
bin/irb${RUBY_SUFFIX}
@@ -890,7 +890,9 @@ ${RUBY_ARCHLIB}/enc/utf_16be.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/utf_16le.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/utf_32be.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/utf_32le.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/windows_1250.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/windows_1251.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/windows_1252.${RUBY_DLEXT}
${RUBY_ARCHLIB}/enc/windows_31j.${RUBY_DLEXT}
${RUBY_ARCHLIB}/etc.${RUBY_DLEXT}
${RUBY_ARCHLIB}/fcntl.${RUBY_DLEXT}
@@ -923,7 +925,7 @@ ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
${GEM_HOME}/gems/rake-10.1.0/bin/rake
${GEM_HOME}/gems/rdoc-4.1.0/bin/rdoc
${GEM_HOME}/gems/rdoc-4.1.0/bin/ri
${GEM_HOME}/gems/test-unit-2.1.7.0/bin/testrb
${GEM_HOME}/gems/test-unit-2.1.10.0/bin/testrb
${GEM_HOME}/specifications/default/bigdecimal-1.2.4.gemspec
${GEM_HOME}/specifications/default/io-console-0.4.3.gemspec
${GEM_HOME}/specifications/default/json-1.8.1.gemspec
@@ -931,7 +933,7 @@ ${GEM_HOME}/specifications/default/minitest-4.7.5.gemspec
${GEM_HOME}/specifications/default/psych-2.0.5.gemspec
${GEM_HOME}/specifications/default/rake-10.1.0.gemspec
${GEM_HOME}/specifications/default/rdoc-4.1.0.gemspec
${GEM_HOME}/specifications/default/test-unit-2.1.7.0.gemspec
${GEM_HOME}/specifications/default/test-unit-2.1.10.0.gemspec
man/man1/erb${RUBY_SUFFIX}.1
man/man1/irb${RUBY_SUFFIX}.1
man/man1/rake${RUBY_SUFFIX}.1
+11 -4
View File
@@ -1,10 +1,14 @@
$NetBSD: distinfo,v 1.19 2015/08/20 15:27:43 taca Exp $
$NetBSD: distinfo,v 1.25 2016/05/15 14:15:14 taca Exp $
SHA1 (ruby-2.1.7.tar.bz2) = 9c2d3c73b3d2aed2c8f018d3a27e970846dcf143
RMD160 (ruby-2.1.7.tar.bz2) = 1fb05a54d255cf3ef3b9933412e935b780ff3258
Size (ruby-2.1.7.tar.bz2) = 12019706 bytes
SHA1 (ruby-2.1.10.tar.bz2) = 22dcd759d8cbb14c8735988fbc7ee5c35f9d4720
RMD160 (ruby-2.1.10.tar.bz2) = 10715c21fec59b94e1fb4077b2aa71367adf422e
SHA512 (ruby-2.1.10.tar.bz2) = 4b7213695416876e4de3cbce912f61ac89db052c74f0daa8424477991cfc49b07300e960177ff576b634a97ee8afef3c5aded5d5806329dbd01d0ce7b42b9b63
Size (ruby-2.1.10.tar.bz2) = 12015299 bytes
SHA1 (patch-configure) = 7f1f6d2dc7d32c96d6ae65562a9bc6d50d2b79dd
SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de
SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4
SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
SHA1 (patch-ext_openssl_ossl__ssl.c) = d6aa1a2036597e7b51411d6eed9501f6a264c26c
SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b
@@ -32,4 +36,7 @@ SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3
SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0
SHA1 (patch-template_verconf.h.in) = 1f4c0676d1335a9fc32ccf8cbfa41678dde96dcd
SHA1 (patch-test_rubygems_test__gem.rb) = 4d8cc50c2782e29eefea0ea6deedf295a7f09bc2
SHA1 (patch-thread.c) = 93bba713014dfb92a59ba9715f50f23c5329de6a
SHA1 (patch-tool_rbinstall.rb) = 845e5136dc2b5e3c41aeb833890e786544d6f5d5
SHA1 (patch-vm__eval.c) = b0739a5e64f99ce3adb86d7d676759cbc3aa7b1b
SHA1 (patch-vm__trace.c) = 8e992c214b69c6237d4c4418aaba892079f9873e
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-eval.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
--- eval.c.orig 2015-11-16 14:50:49.000000000 +0000
+++ eval.c
@@ -743,7 +743,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), V
{
int state;
rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
+ rb_control_frame_t *volatile cfp = th->cfp;
volatile VALUE result = Qfalse;
volatile VALUE e_info = th->errinfo;
va_list args;
@@ -809,7 +809,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE
volatile VALUE result = Qnil;
volatile int status;
rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
+ rb_control_frame_t * volatile cfp = th->cfp;
struct rb_vm_protect_tag protect_tag;
rb_jmpbuf_t org_jmpbuf;
@@ -0,0 +1,17 @@
$NetBSD: patch-eval__error.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
--- eval_error.c.orig 2015-11-16 15:02:19.000000000 +0000
+++ eval_error.c
@@ -80,9 +80,9 @@ static void
error_print(void)
{
volatile VALUE errat = Qundef;
- rb_thread_t *th = GET_THREAD();
- VALUE errinfo = th->errinfo;
- int raised_flag = th->raised_flag;
+ rb_thread_t * volatile th = GET_THREAD();
+ volatile VALUE errinfo = th->errinfo;
+ volatile int raised_flag = th->raised_flag;
volatile VALUE eclass = Qundef, e = Qundef;
const char *volatile einfo;
volatile long elen;
@@ -0,0 +1,15 @@
$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:29:50 taca Exp $
Utilize OPENSSL_NO_SSL2.
--- ext/openssl/ossl_ssl.c.orig 2015-11-18 11:34:19.000000000 +0000
+++ ext/openssl/ossl_ssl.c
@@ -128,7 +128,7 @@ struct {
OSSL_SSL_METHOD_ENTRY(TLSv1_1_server),
OSSL_SSL_METHOD_ENTRY(TLSv1_1_client),
#endif
-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
defined(HAVE_SSLV2_CLIENT_METHOD)
OSSL_SSL_METHOD_ENTRY(SSLv2),
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-thread.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
--- thread.c.orig 2015-11-16 15:03:41.000000000 +0000
+++ thread.c
@@ -420,8 +420,8 @@ rb_threadptr_unlock_all_locking_mutexes(
void
rb_thread_terminate_all(void)
{
- rb_thread_t *th = GET_THREAD(); /* main thread */
- rb_vm_t *vm = th->vm;
+ rb_thread_t *volatile th = GET_THREAD(); /* main thread */
+ rb_vm_t *volatile vm = th->vm;
if (vm->main_thread != th) {
rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)",
+33
View File
@@ -0,0 +1,33 @@
$NetBSD: patch-vm__eval.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
--- vm_eval.c.orig 2015-11-16 14:55:47.000000000 +0000
+++ vm_eval.c
@@ -1062,7 +1062,7 @@ rb_iterate(VALUE (* it_proc) (VALUE), VA
int state;
volatile VALUE retval = Qnil;
NODE *node = NEW_IFUNC(bl_proc, data2);
- rb_thread_t *th = GET_THREAD();
+ rb_thread_t * volatile th = GET_THREAD();
rb_control_frame_t *volatile cfp = th->cfp;
node->nd_aid = rb_frame_this_func();
@@ -1190,7 +1190,7 @@ eval_string_with_cref(VALUE self, VALUE
int state;
VALUE result = Qundef;
VALUE envval;
- rb_thread_t *th = GET_THREAD();
+ rb_thread_t *volatile th = GET_THREAD();
rb_env_t *env = NULL;
rb_block_t block, *base_block;
volatile int parse_in_eval;
@@ -1843,8 +1843,8 @@ rb_catch_protect(VALUE t, rb_block_call_
{
int state;
volatile VALUE val = Qnil; /* OK */
- rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *saved_cfp = th->cfp;
+ rb_thread_t * volatile th = GET_THREAD();
+ rb_control_frame_t * volatile saved_cfp = th->cfp;
volatile VALUE tag = t;
TH_PUSH_TAG(th);
@@ -0,0 +1,13 @@
$NetBSD: patch-vm__trace.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
--- vm_trace.c.orig 2015-11-16 15:02:00.000000000 +0000
+++ vm_trace.c
@@ -390,7 +390,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE)
volatile int raised;
volatile int outer_state;
VALUE result = Qnil;
- rb_thread_t *th = GET_THREAD();
+ rb_thread_t * volatile th = GET_THREAD();
int state;
const int tracing = th->trace_arg ? 1 : 0;
rb_trace_arg_t dummy_trace_arg;