Thu Mar 17 14:15:39 2016 UTC ()
Disable SSLv2, fixing build against newer OpenSSL.


(jperkin)
diff -r1.120 -r1.121 pkgsrc/x11/kdebase3/distinfo
diff -r1.4 -r1.5 pkgsrc/x11/kdebase3/patches/patch-ge
cvs diff -r1.120 -r1.121 pkgsrc/x11/kdebase3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdebase3/Attic/distinfo 2016/02/24 10:14:10 1.120
+++ pkgsrc/x11/kdebase3/Attic/distinfo 2016/03/17 14:15:39 1.121
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.120 2016/02/24 10:14:10 jperkin Exp $ 1$NetBSD: distinfo,v 1.121 2016/03/17 14:15:39 jperkin Exp $
2 2
3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b 3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
5SHA512 (Daemon.README) = 8aaf704a95c7cd25c85c4e0d789ed050b555f3ec0a3c11754b79d8b118b68c32d0eac1fbc3022124b10a7c588e78b592e77ad2f718ab4120a95b8859ca94fa5b 5SHA512 (Daemon.README) = 8aaf704a95c7cd25c85c4e0d789ed050b555f3ec0a3c11754b79d8b118b68c32d0eac1fbc3022124b10a7c588e78b592e77ad2f718ab4120a95b8859ca94fa5b
6Size (Daemon.README) = 2191 bytes 6Size (Daemon.README) = 2191 bytes
7SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d 7SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
8RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7 8RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
9SHA512 (Daemon.png) = 60a5406526f351644bb2c0bfd3d0b04ffe652bac9adf156e03c4f3c143671527db383e90e376475cfdcae5a94d1d39bd0a18318e46dd27c7ee1f89a08db52284 9SHA512 (Daemon.png) = 60a5406526f351644bb2c0bfd3d0b04ffe652bac9adf156e03c4f3c143671527db383e90e376475cfdcae5a94d1d39bd0a18318e46dd27c7ee1f89a08db52284
10Size (Daemon.png) = 15725 bytes 10Size (Daemon.png) = 15725 bytes
11SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c 11SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
12RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 12RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
13SHA512 (NetBSD-flag-1.0.png) = 79921ca035a3aafba9f9c750fd9793d146ffbe64238cd76a11eab72d98f6eb89844efabb17f2b8c49bc5e638c7fbfc61ae29c68b862abc1aecd545ea65e61654 13SHA512 (NetBSD-flag-1.0.png) = 79921ca035a3aafba9f9c750fd9793d146ffbe64238cd76a11eab72d98f6eb89844efabb17f2b8c49bc5e638c7fbfc61ae29c68b862abc1aecd545ea65e61654
14Size (NetBSD-flag-1.0.png) = 4532 bytes 14Size (NetBSD-flag-1.0.png) = 4532 bytes
@@ -51,27 +51,27 @@ SHA1 (patch-fb) = 5f6895322c186813c43a34 @@ -51,27 +51,27 @@ SHA1 (patch-fb) = 5f6895322c186813c43a34
51SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31 51SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
52SHA1 (patch-fd) = 879a072170b5a38ae80d6854540ab1dae5f59bfc 52SHA1 (patch-fd) = 879a072170b5a38ae80d6854540ab1dae5f59bfc
53SHA1 (patch-fe) = 3da89e7228d5246e98a244d7f52d9052c3dbcfa2 53SHA1 (patch-fe) = 3da89e7228d5246e98a244d7f52d9052c3dbcfa2
54SHA1 (patch-ff) = f86edffa3c26caa4538f6cc2ff32ed30ddc7e248 54SHA1 (patch-ff) = f86edffa3c26caa4538f6cc2ff32ed30ddc7e248
55SHA1 (patch-fg) = bdd6fbbf1f82e174d5ceb70e67763813c13b14dd 55SHA1 (patch-fg) = bdd6fbbf1f82e174d5ceb70e67763813c13b14dd
56SHA1 (patch-fh) = 387857dcf275acdcebe2c9b900f95fcc1206b85f 56SHA1 (patch-fh) = 387857dcf275acdcebe2c9b900f95fcc1206b85f
57SHA1 (patch-fi) = d2587d0e264284830338d34270fc70d33bc3e671 57SHA1 (patch-fi) = d2587d0e264284830338d34270fc70d33bc3e671
58SHA1 (patch-fj) = 25de89b959a365f57f68557a878cc7dff5f62df5 58SHA1 (patch-fj) = 25de89b959a365f57f68557a878cc7dff5f62df5
59SHA1 (patch-fk) = 05b3a6a6451185b3f0eee3a8b9d2001ead62211a 59SHA1 (patch-fk) = 05b3a6a6451185b3f0eee3a8b9d2001ead62211a
60SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29 60SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
61SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e 61SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
62SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8 62SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8
63SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b 63SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b
64SHA1 (patch-ge) = 8470cf03d768d784714e926281757e9d68749360 64SHA1 (patch-ge) = ed4c7bbac47562e50a73120a0f990e62a321c778
65SHA1 (patch-gf) = 78de196a700fa9cd5e221ff57c295fdb3562f931 65SHA1 (patch-gf) = 78de196a700fa9cd5e221ff57c295fdb3562f931
66SHA1 (patch-kcheckpass_checkpass_pam.c) = b5dd2e50c5f1047d3c195836c8b2d06e11edea3b 66SHA1 (patch-kcheckpass_checkpass_pam.c) = b5dd2e50c5f1047d3c195836c8b2d06e11edea3b
67SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b64919 67SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b64919
68SHA1 (patch-kcontrol_arts_hardwaretab.ui) = 794be317ba42a3660b9f2b6d24565cdc681592fa 68SHA1 (patch-kcontrol_arts_hardwaretab.ui) = 794be317ba42a3660b9f2b6d24565cdc681592fa
69SHA1 (patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui) = 7df8baced10a7c57caa2bc744e17e60b642ef2b0 69SHA1 (patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui) = 7df8baced10a7c57caa2bc744e17e60b642ef2b0
70SHA1 (patch-kcontrol_info_info__osx.cpp) = 29a2de37107069fa719bd41e019ed3ded4be6537 70SHA1 (patch-kcontrol_info_info__osx.cpp) = 29a2de37107069fa719bd41e019ed3ded4be6537
71SHA1 (patch-kcontrol_kfontinst_kfontinst_GetPid.c) = b56389ec10d4388ba10f01798b0119efbbb72c4c 71SHA1 (patch-kcontrol_kfontinst_kfontinst_GetPid.c) = b56389ec10d4388ba10f01798b0119efbbb72c4c
72SHA1 (patch-kcontrol_kio_cache_ui.ui) = 7ff30b98aa9be5b386c8e983bcf54666846e9205 72SHA1 (patch-kcontrol_kio_cache_ui.ui) = 7ff30b98aa9be5b386c8e983bcf54666846e9205
73SHA1 (patch-kcontrol_kio_envvarproxy_ui.ui) = 0d5d6c19fcce2a97c5c96d5d3152fb1591800e0e 73SHA1 (patch-kcontrol_kio_envvarproxy_ui.ui) = 0d5d6c19fcce2a97c5c96d5d3152fb1591800e0e
74SHA1 (patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui) = 03c28df1e5da70edd97ece70d0fe20b66606cd11 74SHA1 (patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui) = 03c28df1e5da70edd97ece70d0fe20b66606cd11
75SHA1 (patch-kcontrol_kio_kproxydlg_ui.ui) = 17139a647cc54c6160b0206fabef7f140f93af38 75SHA1 (patch-kcontrol_kio_kproxydlg_ui.ui) = 17139a647cc54c6160b0206fabef7f140f93af38
76SHA1 (patch-kcontrol_kio_manualproxy_ui.ui) = 8fb0ed00fc60172588af958cf12ea0ee19f78844 76SHA1 (patch-kcontrol_kio_manualproxy_ui.ui) = 8fb0ed00fc60172588af958cf12ea0ee19f78844
77SHA1 (patch-kcontrol_kio_policydlg_ui.ui) = f110d17d419818ebf707df519fcc70d956c5a752 77SHA1 (patch-kcontrol_kio_policydlg_ui.ui) = f110d17d419818ebf707df519fcc70d956c5a752
cvs diff -r1.4 -r1.5 pkgsrc/x11/kdebase3/patches/Attic/patch-ge (expand / switch to unified diff)

--- pkgsrc/x11/kdebase3/patches/Attic/patch-ge 2009/09/01 09:51:02 1.4
+++ pkgsrc/x11/kdebase3/patches/Attic/patch-ge 2016/03/17 14:15:39 1.5
@@ -1,42 +1,61 @@ @@ -1,42 +1,61 @@
1$NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $ 1$NetBSD: patch-ge,v 1.5 2016/03/17 14:15:39 jperkin Exp $
2 2
3--- kcontrol/crypto/crypto.cpp.orig 2006-10-02 06:31:49.000000000 +1300 3Disable SSLv2.
 4
 5--- kcontrol/crypto/crypto.cpp.orig 2006-10-01 17:31:49.000000000 +0000
4+++ kcontrol/crypto/crypto.cpp 6+++ kcontrol/crypto/crypto.cpp
5@@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() { 7@@ -2321,11 +2321,17 @@ bool KCryptoConfig::loadCiphers() {
6 unsigned int i; 8 unsigned int i;
7 SSL_CTX *ctx; 9 SSL_CTX *ctx;
8 SSL *ssl; 10 SSL *ssl;
9+#if OPENSSL_VERSION_NUMBER < 0x00909000L 11+#if OPENSSL_VERSION_NUMBER < 0x00909000L
10 SSL_METHOD *meth; 12 SSL_METHOD *meth;
11+#else 13+#else
12+const SSL_METHOD *meth; 14+const SSL_METHOD *meth;
13+#endif 15+#endif
 16+ CipherItem *item;
14  17
15 SSLv2Box->clear(); 18 SSLv2Box->clear();
16 SSLv3Box->clear(); 19 SSLv3Box->clear();
17@@ -2337,8 +2341,10 @@ SSL_METHOD *meth; 20
18 CipherItem *item; 21+#if 0
 22 meth = SSLv2_client_method();
 23 SSLeay_add_ssl_algorithms();
 24 ctx = SSL_CTX_new(meth);
 25@@ -2334,11 +2340,12 @@ SSL_METHOD *meth;
 26 ssl = SSL_new(ctx);
 27 if (!ssl) return false;
 28
 29- CipherItem *item;
19 for (i=0; ; i++) { 30 for (i=0; ; i++) {
20 int j, k; 31 int j, k;
21- SSL_CIPHER *sc; 32- SSL_CIPHER *sc;
22- sc = (meth->get_cipher)(i); 33- sc = (meth->get_cipher)(i);
23+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L 34+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
24+ const 35+ const
25+#endif 36+#endif
26+ SSL_CIPHER *sc = (meth->get_cipher)(i); 37+ SSL_CIPHER *sc = (meth->get_cipher)(i);
27 if (!sc) 38 if (!sc)
28 break; 39 break;
29 // Leak of sc*? 40 // Leak of sc*?
30@@ -2365,8 +2371,10 @@ SSL_METHOD *meth; 41@@ -2353,6 +2360,7 @@ SSL_METHOD *meth;
 42
 43 if (ctx) SSL_CTX_free(ctx);
 44 if (ssl) SSL_free(ssl);
 45+#endif
 46
 47 // We repeat for SSLv3
 48 meth = SSLv3_client_method();
 49@@ -2365,8 +2373,10 @@ SSL_METHOD *meth;
31  50
32 for (i=0; ; i++) { 51 for (i=0; ; i++) {
33 int j, k; 52 int j, k;
34- SSL_CIPHER *sc; 53- SSL_CIPHER *sc;
35- sc = (meth->get_cipher)(i); 54- sc = (meth->get_cipher)(i);
36+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L 55+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
37+ const 56+ const
38+#endif 57+#endif
39+ SSL_CIPHER *sc = (meth->get_cipher)(i); 58+ SSL_CIPHER *sc = (meth->get_cipher)(i);
40 if (!sc) 59 if (!sc)
41 break; 60 break;
42 // Leak of sc*? 61 // Leak of sc*?