diff options
| author | wiz <wiz> | 2016-03-17 07:53:46 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-03-17 07:53:46 +0000 |
| commit | 33ea95efa08cc9d7f9b81cbd9e12bd7067274beb (patch) | |
| tree | 19279f97dc5f76cb3d7f6cd3db2371f2eddffd0e /lang | |
| parent | bd72c8dcfcab0c6a09abe1df0f693c1c476eb06b (diff) | |
| download | pkgsrc-33ea95efa08cc9d7f9b81cbd9e12bd7067274beb.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/ruby22-base/Makefile | 5 | ||||
| -rw-r--r-- | lang/ruby22-base/distinfo | 3 | ||||
| -rw-r--r-- | lang/ruby22-base/patches/patch-ext_socket_option.c | 26 |
3 files changed, 30 insertions, 4 deletions
diff --git a/lang/ruby22-base/Makefile b/lang/ruby22-base/Makefile index a2fcee67937..ad9f8aea969 100644 --- a/lang/ruby22-base/Makefile +++ b/lang/ruby22-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2016/03/05 11:28:44 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.12 2016/03/17 07:53:46 wiz Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby22-base/distinfo b/lang/ruby22-base/distinfo index f3acc4e10b5..7892933df74 100644 --- a/lang/ruby22-base/distinfo +++ b/lang/ruby22-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/12/17 01:36:36 taca Exp $ +$NetBSD: distinfo,v 1.13 2016/03/17 07:53:46 wiz Exp $ SHA1 (ruby-2.2.4.tar.bz2) = 6132840a859dbf2ac1498ba313021f299a870038 RMD160 (ruby-2.2.4.tar.bz2) = 012fa73d430db36e5b807cd677a961d6e2700758 @@ -8,6 +8,7 @@ SHA1 (patch-configure) = 8abbc486b8cf30bb789ef58d1cb289191dcd1af6 SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 +SHA1 (patch-ext_socket_option.c) = 8759eabfe884a891fd6adab6921418a1ab56d21f SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079 diff --git a/lang/ruby22-base/patches/patch-ext_socket_option.c b/lang/ruby22-base/patches/patch-ext_socket_option.c new file mode 100644 index 00000000000..9787dfc6316 --- /dev/null +++ b/lang/ruby22-base/patches/patch-ext_socket_option.c @@ -0,0 +1,26 @@ +$NetBSD: patch-ext_socket_option.c,v 1.1 2016/03/17 07:53:46 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-10 15:33:59.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) + { |