tjh.dev
ruby: fix build with libressl2.3
+33
-12
pkgs/development/interpreters/ruby/patchsets.nix
+33
-12
pkgs/development/interpreters/ruby/patchsets.nix
···
1
{ patchSet, useRailsExpress, ops, patchLevel }:
2
3
-
let self = rec {
4
"1.9.3" = [
5
./ruby19-parallel-install.patch
6
./bitperfect-rdoc.patch
7
] ++ ops useRailsExpress [
···
25
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
26
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
27
];
28
-
"2.0.0" = ops useRailsExpress [
29
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch"
30
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch"
31
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
32
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
33
];
34
-
"2.1.0" = ops useRailsExpress [
35
"${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch"
36
"${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch"
37
"${patchSet}/patches/ruby/2.1.0/railsexpress/03-improve-gc-stats.patch"
···
45
"${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
46
"${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
47
];
48
-
"2.1.1" = ops useRailsExpress [
49
"${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch"
50
"${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch"
51
"${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch"
···
58
"${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
59
"${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
60
];
61
-
"2.1.2" = ops useRailsExpress [
62
"${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch"
63
"${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch"
64
"${patchSet}/patches/ruby/2.1.2/railsexpress/03-display-more-detailed-stack-trace.patch"
···
70
"${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch"
71
"${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
72
];
73
-
"2.1.3" = ops useRailsExpress [
74
"${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch"
75
"${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch"
76
"${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch"
···
80
"${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch"
81
"${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch"
82
];
83
-
"2.1.6" = ops useRailsExpress [
84
"${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
85
"${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
86
"${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
···
91
"${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
92
"${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
93
];
94
-
"2.1.7" = ops useRailsExpress [
95
"${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch"
96
"${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch"
97
"${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch"
···
102
"${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch"
103
"${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch"
104
];
105
-
"2.2.0" = ops useRailsExpress [
106
"${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
107
"${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
108
"${patchSet}/patches/ruby/2.2.0/railsexpress/03-display-more-detailed-stack-trace.patch"
109
"${patchSet}/patches/ruby/2.2.0/railsexpress/04-backport-401c8bb.patch"
110
"${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
111
];
112
-
"2.2.2" = ops useRailsExpress [
113
"${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
114
"${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
115
"${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
116
"${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
117
];
118
-
"2.2.3" = ops useRailsExpress [
119
"${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch"
120
"${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
121
"${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
122
];
123
-
}; in self
···
1
{ patchSet, useRailsExpress, ops, patchLevel }:
2
3
+
rec {
4
"1.9.3" = [
5
+
./ssl_v3.patch
6
./ruby19-parallel-install.patch
7
./bitperfect-rdoc.patch
8
] ++ ops useRailsExpress [
···
26
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
27
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
28
];
29
+
"2.0.0" = [
30
+
./ssl_v3.patch
31
+
] ++ ops useRailsExpress [
32
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch"
33
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch"
34
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
35
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
36
];
37
+
"2.1.0" = [
38
+
./ssl_v3.patch
39
+
] ++ ops useRailsExpress [
40
"${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch"
41
"${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch"
42
"${patchSet}/patches/ruby/2.1.0/railsexpress/03-improve-gc-stats.patch"
···
50
"${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
51
"${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
52
];
53
+
"2.1.1" = [
54
+
./ssl_v3.patch
55
+
] ++ ops useRailsExpress [
56
"${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch"
57
"${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch"
58
"${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch"
···
65
"${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
66
"${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
67
];
68
+
"2.1.2" = [
69
+
./ssl_v3.patch
70
+
] ++ ops useRailsExpress [
71
"${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch"
72
"${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch"
73
"${patchSet}/patches/ruby/2.1.2/railsexpress/03-display-more-detailed-stack-trace.patch"
···
79
"${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch"
80
"${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
81
];
82
+
"2.1.3" = [
83
+
./ssl_v3.patch
84
+
] ++ ops useRailsExpress [
85
"${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch"
86
"${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch"
87
"${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch"
···
91
"${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch"
92
"${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch"
93
];
94
+
"2.1.6" = [
95
+
./ssl_v3.patch
96
+
] ++ ops useRailsExpress [
97
"${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
98
"${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
99
"${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
···
104
"${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
105
"${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
106
];
107
+
"2.1.7" = [
108
+
./ssl_v3.patch
109
+
] ++ ops useRailsExpress [
110
"${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch"
111
"${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch"
112
"${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch"
···
117
"${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch"
118
"${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch"
119
];
120
+
"2.2.0" = [
121
+
./ssl_v3.patch
122
+
] ++ ops useRailsExpress [
123
"${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
124
"${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
125
"${patchSet}/patches/ruby/2.2.0/railsexpress/03-display-more-detailed-stack-trace.patch"
126
"${patchSet}/patches/ruby/2.2.0/railsexpress/04-backport-401c8bb.patch"
127
"${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
128
];
129
+
"2.2.2" = [
130
+
./ssl_v3.patch
131
+
] ++ ops useRailsExpress [
132
"${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
133
"${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
134
"${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
135
"${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
136
];
137
+
"2.2.3" = [
138
+
./ssl_v3.patch
139
+
] ++ ops useRailsExpress [
140
"${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch"
141
"${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
142
"${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
143
];
144
+
}
+16
pkgs/development/interpreters/ruby/ssl_v3.patch
+16
pkgs/development/interpreters/ruby/ssl_v3.patch
···
···
1
+
--- a/ext/openssl/ossl_ssl.c 2015-11-26 16:41:03.775058140 +0000
2
+
+++ b/ext/openssl/ossl_ssl.c 2015-11-26 16:40:56.191907346 +0000
3
+
@@ -138,9 +138,12 @@
4
+
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
5
+
OSSL_SSL_METHOD_ENTRY(SSLv2_client),
6
+
#endif
7
+
+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
8
+
+ defined(HAVE_SSLV3_CLIENT_METHOD)
9
+
OSSL_SSL_METHOD_ENTRY(SSLv3),
10
+
OSSL_SSL_METHOD_ENTRY(SSLv3_server),
11
+
OSSL_SSL_METHOD_ENTRY(SSLv3_client),
12
+
+#endif
13
+
OSSL_SSL_METHOD_ENTRY(SSLv23),
14
+
OSSL_SSL_METHOD_ENTRY(SSLv23_server),
15
+
OSSL_SSL_METHOD_ENTRY(SSLv23_client),
16
+