diff options
| author | wiz <wiz> | 2016-03-17 07:55:43 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-03-17 07:55:43 +0000 |
| commit | 3f0edbc13f9257882d4185387ea66d6bc1b7231d (patch) | |
| tree | b7ef22736df1d4aedba6adcb8f099eddce9feb6e /lang | |
| parent | 376f7315225696c75e6a3276ced63e0d7198a8ca (diff) | |
| download | pkgsrc-3f0edbc13f9257882d4185387ea66d6bc1b7231d.tar.gz | |
Add upstream patch from SVN to fix build with RELRO.
I don't see a relation to relro, but the linker found out about
a missing symbol it didn't complain about before.
SVN 54139:
Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
for TCPI msec member inspection function.
[ruby-core:74388] [Bug #12185]
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby23-base/Makefile | 5 | ||||
| -rw-r--r-- | lang/ruby23-base/distinfo | 5 | ||||
| -rw-r--r-- | lang/ruby23-base/patches/patch-ext_socket_option.c | 26 |
3 files changed, 30 insertions, 6 deletions
diff --git a/lang/ruby23-base/Makefile b/lang/ruby23-base/Makefile index 1e9fd80a49d..398057f8f59 100644 --- a/lang/ruby23-base/Makefile +++ b/lang/ruby23-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:44 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.4 2016/03/17 07:55:43 wiz Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby23-base/distinfo b/lang/ruby23-base/distinfo index 0cd50bd21f7..00e882dec5c 100644 --- a/lang/ruby23-base/distinfo +++ b/lang/ruby23-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2015/12/30 14:59:42 taca Exp $ +$NetBSD: distinfo,v 1.2 2016/03/17 07:55:43 wiz Exp $ SHA1 (ruby-2.3.0.tar.bz2) = 6c8a832d49d22755ea8c45b6d53faf2ccc6d6ac9 RMD160 (ruby-2.3.0.tar.bz2) = 4e9066b169b1b00435ba154069416e14457fe22e @@ -8,8 +8,7 @@ SHA1 (patch-configure) = ccddb80f90f75a09dc7d802d1ddad6255ba13ffa SHA1 (patch-eval.c) = 16e6eadca15c95ac3e2291a2003cb0fc606eafeb SHA1 (patch-eval__error.c) = 8ed04dec5c3c0bf4d9ca8516888b331676f7c957 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b -SHA1 (patch-ext_fiddle_depend) = f1de70280e55a036d1063635bfc24f8856a4d508 -SHA1 (patch-ext_readline_depend) = 9c5f22eac751c9333f9292ce32860e3b714a61b8 +SHA1 (patch-ext_socket_option.c) = 210753a7db6ab7b8c459765f1ec656948da86e28 SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e SHA1 (patch-lib_rdoc_ri_driver.rb) = bdbe04aa1dd1719d901233b16bcb318172a42b6c SHA1 (patch-lib_rubygems.rb) = d8968f54bdc973379675a3ebb5ca68325cff6644 diff --git a/lang/ruby23-base/patches/patch-ext_socket_option.c b/lang/ruby23-base/patches/patch-ext_socket_option.c new file mode 100644 index 00000000000..f208564f2a4 --- /dev/null +++ b/lang/ruby23-base/patches/patch-ext_socket_option.c @@ -0,0 +1,26 @@ +$NetBSD: patch-ext_socket_option.c,v 1.1 2016/03/17 07:55:43 wiz Exp $ + +SVN 54139: + +Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/option.c (inspect_tcpi_msec): more accurate condition + for TCPI msec member inspection function. + [ruby-core:74388] [Bug #12185] + +--- ext/socket/option.c.orig 2015-08-15 04:32:15.000000000 +0000 ++++ ext/socket/option.c +@@ -928,7 +928,12 @@ inspect_tcpi_usec(VALUE ret, const char + rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000); + } + +-#if defined(__linux__) || defined(__sun) ++#if !defined __FreeBSD__ && ( \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV || \ ++ 0) + static void + inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t) + { |