@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.120 2016/02/24 10:14:10 jperkin Exp $
+$NetBSD: distinfo,v 1.121 2016/03/17 14:15:39 jperkin Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -61,7 +61,7 @@
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
 SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8
 SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b
-SHA1 (patch-ge) = 8470cf03d768d784714e926281757e9d68749360
+SHA1 (patch-ge) = ed4c7bbac47562e50a73120a0f990e62a321c778
 SHA1 (patch-gf) = 78de196a700fa9cd5e221ff57c295fdb3562f931
 SHA1 (patch-kcheckpass_checkpass_pam.c) = b5dd2e50c5f1047d3c195836c8b2d06e11edea3b
 SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b64919

@@ -1,8 +1,10 @@
-$NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $
+$NetBSD: patch-ge,v 1.5 2016/03/17 14:15:39 jperkin Exp $
 
---- kcontrol/crypto/crypto.cpp.orig	2006-10-02 06:31:49.000000000 +1300
+Disable SSLv2.
+
+--- kcontrol/crypto/crypto.cpp.orig	2006-10-01 17:31:49.000000000 +0000
 +++ kcontrol/crypto/crypto.cpp
-@@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() {
+@@ -2321,11 +2321,17 @@ bool KCryptoConfig::loadCiphers() {
  unsigned int i;
  SSL_CTX *ctx;
  SSL *ssl;
@@ -11,11 +13,20 @@
 +#else
 +const SSL_METHOD *meth;
 +#endif
++  CipherItem *item;
  
    SSLv2Box->clear();
    SSLv3Box->clear();
-@@ -2337,8 +2341,10 @@ SSL_METHOD *meth;
-   CipherItem *item;
+ 
++#if 0
+   meth = SSLv2_client_method();
+   SSLeay_add_ssl_algorithms();
+   ctx = SSL_CTX_new(meth);
+@@ -2334,11 +2340,12 @@ SSL_METHOD *meth;
+   ssl = SSL_new(ctx);
+   if (!ssl) return false;
+ 
+-  CipherItem *item;
    for (i=0; ; i++) {
      int j, k;
 -    SSL_CIPHER *sc;
@@ -27,7 +38,15 @@
      if (!sc)
        break;
      // Leak of sc*?
-@@ -2365,8 +2371,10 @@ SSL_METHOD *meth;
+@@ -2353,6 +2360,7 @@ SSL_METHOD *meth;
+ 
+   if (ctx) SSL_CTX_free(ctx);
+   if (ssl) SSL_free(ssl);
++#endif
+ 
+   // We repeat for SSLv3
+   meth = SSLv3_client_method();
+@@ -2365,8 +2373,10 @@ SSL_METHOD *meth;
  
    for (i=0; ; i++) {
      int j, k;