diff options
| author | marino <marino@pkgsrc.org> | 2012-07-18 09:56:02 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-07-18 09:56:02 +0000 |
| commit | b0aa0f01d3ec21f7295915390d5597cbe805b5db (patch) | |
| tree | 651db2d5d8ccd08b9f7f259f8874e754a72edf0c /chat | |
| parent | 3c58e1e2a11d0da9e8d4c9c41e1109328f81a89d (diff) | |
| download | pkgsrc-b0aa0f01d3ec21f7295915390d5597cbe805b5db.tar.gz | |
chat/bitlbee: Fix regression due to upgrade to gnutils 3.0
GnuTLS deprecated gnutils_transport_set_lowat function in version 2.12.0
and finally removed it with version 3.0, breaking any packages that
still reference it.
The lowat feature is now disabled permanently I think.
The patch uses the GNUTLS_VERSION_NUMBER macro to appropriately conceal
the function reference. The same patch is widely seen on the 'net with
other packages that use GnuTLS.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/bitlbee/Makefile | 4 | ||||
| -rw-r--r-- | chat/bitlbee/distinfo | 3 | ||||
| -rw-r--r-- | chat/bitlbee/patches/patch-lib_ssl__gnutls.c | 17 |
3 files changed, 21 insertions, 3 deletions
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index dd10f82a7a9..9268b99a7ff 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2012/06/12 15:45:55 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2012/07/18 09:56:02 marino Exp $ # DISTNAME= bitlbee-3.0.3 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= chat MASTER_SITES= http://get.bitlbee.org/src/ diff --git a/chat/bitlbee/distinfo b/chat/bitlbee/distinfo index f8dfe68f06d..9df36439708 100644 --- a/chat/bitlbee/distinfo +++ b/chat/bitlbee/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.28 2011/11/18 21:06:19 tonio Exp $ +$NetBSD: distinfo,v 1.29 2012/07/18 09:56:02 marino Exp $ SHA1 (bitlbee-3.0.3.tar.gz) = 4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff RMD160 (bitlbee-3.0.3.tar.gz) = 4b537871eef1bb5b6839105bc7bc9f2567e5b8e1 Size (bitlbee-3.0.3.tar.gz) = 676417 bytes SHA1 (patch-lib_http__client.c) = 9659b12ee2ad796cab9ac4fa9b29067677df63fe +SHA1 (patch-lib_ssl__gnutls.c) = 48c888182d162c72be03d19f653b67771ac1db88 diff --git a/chat/bitlbee/patches/patch-lib_ssl__gnutls.c b/chat/bitlbee/patches/patch-lib_ssl__gnutls.c new file mode 100644 index 00000000000..7497bf957f3 --- /dev/null +++ b/chat/bitlbee/patches/patch-lib_ssl__gnutls.c @@ -0,0 +1,17 @@ +$NetBSD: patch-lib_ssl__gnutls.c,v 1.1 2012/07/18 09:56:02 marino Exp $ + +GnuTLS deprecated gnutls_transport_set_lowat in version 2.12.0 and removed it by version 3 +The lowat feature is always disabled now. + +--- lib/ssl_gnutls.c.orig 2012-07-18 08:30:44.294219000 +0000 ++++ lib/ssl_gnutls.c +@@ -134,7 +134,9 @@ static gboolean ssl_connected( gpointer + + gnutls_certificate_allocate_credentials( &conn->xcred ); + gnutls_init( &conn->session, GNUTLS_CLIENT ); ++#if GNUTLS_VERSION_NUMBER < 0x020c00 + gnutls_transport_set_lowat( conn->session, 1 ); ++#endif + gnutls_set_default_priority( conn->session ); + gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred ); + |