diff options
| author | marino <marino@pkgsrc.org> | 2012-07-18 09:52:44 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-07-18 09:52:44 +0000 |
| commit | a4ddfbed28501cc26d8a7a088931d2a3dc3d1577 (patch) | |
| tree | ea39bfafc5fec5352f5713fd8e19123cdb05d033 | |
| parent | 6e51f1c27f82b8a96244320d7ce88258892d03ca (diff) | |
| download | pkgsrc-a4ddfbed28501cc26d8a7a088931d2a3dc3d1577.tar.gz | |
security/openvas-libraries: 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 like OpenVAS.
| -rw-r--r-- | security/openvas-libraries/Makefile | 4 | ||||
| -rw-r--r-- | security/openvas-libraries/distinfo | 3 | ||||
| -rw-r--r-- | security/openvas-libraries/patches/patch-libopenvas_network.c | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile index cf215a9e013..51e23dbf154 100644 --- a/security/openvas-libraries/Makefile +++ b/security/openvas-libraries/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2012/07/05 15:44:07 drochner Exp $ +# $NetBSD: Makefile,v 1.10 2012/07/18 09:52:44 marino Exp $ # DISTNAME= openvas-libraries-2.0.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/548/ diff --git a/security/openvas-libraries/distinfo b/security/openvas-libraries/distinfo index f22f790e069..4de428a71a8 100644 --- a/security/openvas-libraries/distinfo +++ b/security/openvas-libraries/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2011/01/01 12:13:10 obache Exp $ +$NetBSD: distinfo,v 1.4 2012/07/18 09:52:44 marino Exp $ SHA1 (openvas-libraries-2.0.0.tar.gz) = e3b5614e8fa4721ad93a9eb483f4f0a23242d84b RMD160 (openvas-libraries-2.0.0.tar.gz) = c7365d81289bca625ae984fceab901ced0626ce0 @@ -13,3 +13,4 @@ SHA1 (patch-ag) = 16d1e43ec3f098b86019e54e189a4b66a87d8b64 SHA1 (patch-ah) = 097d76cced6ef5f5b909e1b9ab9fb9e0815b876a SHA1 (patch-ai) = a60270be1eccc5bfc2b8bd36ed969f498a9c1e05 SHA1 (patch-aj) = ab833a1146f2e9962d9ecdeda0c84a722ff49eb6 +SHA1 (patch-libopenvas_network.c) = b9946bd479bc9053bb7ca9f98b73c42a910f96e3 diff --git a/security/openvas-libraries/patches/patch-libopenvas_network.c b/security/openvas-libraries/patches/patch-libopenvas_network.c new file mode 100644 index 00000000000..ebdc3f54ce9 --- /dev/null +++ b/security/openvas-libraries/patches/patch-libopenvas_network.c @@ -0,0 +1,20 @@ +$NetBSD: patch-libopenvas_network.c,v 1.1 2012/07/18 09:52:44 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. + +--- libopenvas/network.c.orig 2008-12-16 13:03:21.000000000 +0000 ++++ libopenvas/network.c +@@ -819,9 +819,10 @@ open_SSL_connection(nessus_connection *f + } + + unblock_socket(fp->fd); +- /* for non-blocking sockets, gnutls requires a 0 lowat value */ ++#if GNUTLS_VERSION_NUMBER < 0x020c00 ++ /* for non-blocking sockets, gnutls < 2.12.0 requires a 0 lowat value */ + gnutls_transport_set_lowat(fp->tls_session, 0); +- ++#endif + gnutls_transport_set_ptr(fp->tls_session, (gnutls_transport_ptr_t) GSIZE_TO_POINTER(fp->fd)); + + tictac = time(NULL); |