aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-12-22 17:18:54 -0500
committerAnthony G. Basile <blueness@gentoo.org>2013-12-22 17:18:54 -0500
commit43d35e97e3386add11a381e81c8b2d4341c3d49f (patch)
treeb1b1b06ee5433e336ac8a2a69c44f76cca3461d4
parentdev-lang/ruby: update for bug #484534 (diff)
downloadhardened-dev-43d35e97e3386add11a381e81c8b2d4341c3d49f.tar.gz
hardened-dev-43d35e97e3386add11a381e81c8b2d4341c3d49f.tar.bz2
hardened-dev-43d35e97e3386add11a381e81c8b2d4341c3d49f.zip
dev-lang/ruby: upstream's patch fails
Package-Manager: portage-2.2.7 Manifest-Sign-Key: 0xF52D4BBA
-rw-r--r--dev-lang/ruby/Manifest2
-rw-r--r--dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch40
2 files changed, 19 insertions, 23 deletions
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a2a2f6f5..bddd80c1 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,4 +1,4 @@
-AUX ruby-uclibc-isnan-isinf.patch 754 SHA256 dfa09cba70b094476109001ed3d570910b268c297f25210864ce61ac9f6e7161 SHA512 0c4254b38b82acd3eb432dde9449574bd7342df4ba7d40b125fe78846e0cc39ba226d2dff79bdee880cb23b7416ca306245cd4ab2285bc33a1c19870e3391b4e WHIRLPOOL ae06893bf3d368f07298bf797bc49c81d000e06d89d28c423675d0fed9ebf450f8bf75637ee90468aad9edf3d56afd049e970c0a21c1465080755519a0222391
+AUX ruby-uclibc-isnan-isinf.patch 720 SHA256 5e49c26f78079c1252cafee1cd91707a051f0d3c88e78900cfed05e159b25385 SHA512 ded0075f00121ba7ad3f9927534f870a61d8270d145d603a32c6cb60160a66d8afe7257904a1f787fe8af33a459c51679dbb87a3a1a16681eda434a386300750 WHIRLPOOL ab4eab44b70d5cea0f26a585b5d57ce9461bb273059107121aaa96eaa00bb507d89bc3c17aed24f1909d4ce1bee9fbb185f4f0a789c42ecdd79a96693308b05b
DIST ruby-2.0.0-p353.tar.bz2 10730412 SHA256 3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9 SHA512 52aa64c5991e61cc49c2062672554353bc88ab563da93a1d1591257153c2f6d8de02417a33d7a585eb0102f1079a993e46671fb6c97c62eac8615de567b575f2 WHIRLPOOL 8d3b616838290095ab389d32caa48941e9146676730975f2868d42cf43dd5f6ff6a26bb6ca1499a164a5c743e4f5c3ad122c1bed18556d85da98b821d66caf89
DIST ruby-patches-2.0.0_p353.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 SHA512 95cf20e26e43a1515843d74c558e3344ae33b7383362c1742a115c1b3e6d09e1ed947df8ab7fee6275e96c920bd0ef880647da70165ddccd40d0995ff43aae64 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
EBUILD ruby-2.0.0_p353.ebuild 6477 SHA256 ddce39b5893c6fd0811c7705ac332ceb48ebc08f51f659e9e9581e54bd0d62a2 SHA512 f3130d627f893059e85a26ad2045722b171fe2b03c729a61fa543b08646c4c1a645dc0eee801eb892382dee06eff1edd93dd9c59faaaf7a6ad56b01d8eab7f8b WHIRLPOOL 0975035183f4b49f2ea0a7d4d07f59d6b56300a995835725e88493fb22235a6280801dd7c889e7af7f148248ddd3500f2b151d8e3589a7bd6903c8f00517caff
diff --git a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch b/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
index d81b616a..47ecb2fe 100644
--- a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
+++ b/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
@@ -1,28 +1,24 @@
---- ruby-2.0.0-p353.orig/missing/isnan.c 2010-07-28 08:12:01.000000000 +0000
-+++ ruby-2.0.0-p353/missing/isnan.c 2013-12-22 19:24:26.748314966 +0000
-@@ -2,6 +2,20 @@
+diff -Naur ruby-2.0.0-p247.orig/missing/isinf.c ruby-2.0.0-p247/missing/isinf.c
+--- ruby-2.0.0-p247.orig/missing/isinf.c 2011-05-15 07:55:52.000000000 -0400
++++ ruby-2.0.0-p247/missing/isinf.c 2013-09-09 15:28:47.750452951 -0400
+@@ -52,6 +52,8 @@
+ static double one (void) { return 1.0; }
+ static double inf (void) { return one() / zero(); }
- #include "ruby/missing.h"
-
-+/*
-+ * isnan() may be a macro, a function or both.
-+ * (The C99 standard defines that isnan() is a macro, though.)
-+ * http://www.gnu.org/software/automake/manual/autoconf/Function-Portability.html
-+ *
-+ * macro only: uClibc
-+ * both: GNU libc
-+ *
-+ * This file is compile if no isnan() function is available.
-+ * (autoconf AC_REPLACE_FUNCS detects only the function.)
-+ * The macro is detected by following #ifndef.
-+ */
++#undef isinf
+
-+#ifndef isnan
+ int
+ isinf(double n)
+ {
+diff -Naur ruby-2.0.0-p247.orig/missing/isnan.c ruby-2.0.0-p247/missing/isnan.c
+--- ruby-2.0.0-p247.orig/missing/isnan.c 2010-07-28 04:12:01.000000000 -0400
++++ ruby-2.0.0-p247/missing/isnan.c 2013-09-09 15:28:32.791451837 -0400
+@@ -4,6 +4,8 @@
+
static int double_ne(double n1, double n2);
++#undef isnan
++
int
-@@ -15,3 +29,4 @@
+ isnan(double n)
{
- return n1 != n2;
- }
-+#endif