diff options
| author | gdt <gdt@pkgsrc.org> | 2010-05-04 18:33:35 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2010-05-04 18:33:35 +0000 |
| commit | 2c9ec33ce72f88aa3d5c399e6b7de61d7a2a964b (patch) | |
| tree | 3c324415ed54e82d22498fdbc577c336d6df364c /chat | |
| parent | f3656e16964201fb39133ea44b349bab71d26b88 (diff) | |
| download | pkgsrc-2c9ec33ce72f88aa3d5c399e6b7de61d7a2a964b.tar.gz | |
Call SSL_library_init() before any other operations. Fixes "no
ciphers" problem with newer openssl. From
http://lists.alioth.debian.org/pipermail/pkg-openssl-devel/2005-October/000219.html
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/jabberd/Makefile | 4 | ||||
| -rw-r--r-- | chat/jabberd/distinfo | 4 | ||||
| -rw-r--r-- | chat/jabberd/patches/patch-ad | 18 |
3 files changed, 17 insertions, 9 deletions
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index 7427f189f78..ca08a2a688b 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2010/01/17 12:02:07 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/05/04 18:33:35 gdt Exp $ # DISTNAME= jabber-1.4.2 PKGNAME= jabberd-1.4.2 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= chat MASTER_SITES= http://download.jabberd.org/jabberd14/ diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo index 2a71593f598..a0b97ac91e7 100644 --- a/chat/jabberd/distinfo +++ b/chat/jabberd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2008/08/03 05:17:40 obache Exp $ +$NetBSD: distinfo,v 1.8 2010/05/04 18:33:35 gdt Exp $ SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f @@ -6,4 +6,4 @@ Size (jabber-1.4.2.tar.gz) = 690217 bytes SHA1 (patch-aa) = 5e62a744f35697961fc6708c2be2c374a9782505 SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1 SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367 -SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093 +SHA1 (patch-ad) = 1eb45d4433731867bc23afebefb54b7e18217a8d diff --git a/chat/jabberd/patches/patch-ad b/chat/jabberd/patches/patch-ad index 03519a07697..1b2d65032c8 100644 --- a/chat/jabberd/patches/patch-ad +++ b/chat/jabberd/patches/patch-ad @@ -1,8 +1,16 @@ -$NetBSD: patch-ad,v 1.3 2005/03/20 18:50:09 salo Exp $ +$NetBSD: patch-ad,v 1.4 2010/05/04 18:33:35 gdt Exp $ ---- jabberd/mio_ssl.c.orig 2002-02-08 08:39:27.000000000 +0100 -+++ jabberd/mio_ssl.c 2005-03-20 19:38:42.000000000 +0100 -@@ -219,6 +219,15 @@ +--- jabberd/mio_ssl.c.orig 2002-02-08 07:39:27.000000000 +0000 ++++ jabberd/mio_ssl.c +@@ -63,6 +63,7 @@ void mio_ssl_init(xmlnode x) + + log_debug(ZONE, "Handling configuration using: %s", xmlnode2str(x)); + /* Generic SSL Inits */ ++ SSL_library_init(); + OpenSSL_add_all_algorithms(); + SSL_load_error_strings(); + +@@ -219,6 +220,15 @@ int _mio_ssl_accept(mio m, struct sockad SSL_CTX *ctx = NULL; int fd; int sret; @@ -18,7 +26,7 @@ $NetBSD: patch-ad,v 1.3 2005/03/20 18:50:09 salo Exp $ if(m->ip == NULL) { -@@ -226,8 +235,6 @@ +@@ -226,8 +236,6 @@ int _mio_ssl_accept(mio m, struct sockad return -1; } |