Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ruby: fix build with libressl2.3

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