remove some appearently unnecessary "#include <gnutls/openssl.h>" so that

this pkg can be built against a gnutls which was built without
"openssl emulation". We build against the real openssl anyway, and
having both the real openssl and one emulated by gnutls has some
potential for namespace collisions, thus I'm considering to build
the pkgsrc gnutls w/o openssl emulation.
(This is just a build issue as far as wireshark is concerned, so
no PKGREV bump is needed.)
This commit is contained in:
drochner 2009-06-05 16:05:55 +00:00
parent 3d3c04b07e
commit ef6a082a67
2 changed files with 14 additions and 1 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.21 2009/05/23 08:12:08 tron Exp $
$NetBSD: distinfo,v 1.22 2009/06/05 16:05:55 drochner Exp $
SHA1 (wireshark-1.0.8.tar.bz2) = cfd4ac05eb9c0d13236003deaeabfffc21f7c9e9
RMD160 (wireshark-1.0.8.tar.bz2) = a702e78da673435361344ffda13c753386aee1a4
@ -6,3 +6,4 @@ Size (wireshark-1.0.8.tar.bz2) = 13347689 bytes
SHA1 (patch-aa) = c155f38e66a553b14778dc73344b46f8614eb9b0
SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
SHA1 (patch-ad) = cb8850c7534b37092baded8e4118e4e0c4e7554c

View file

@ -0,0 +1,12 @@
$NetBSD: patch-ad,v 1.3 2009/06/05 16:05:55 drochner Exp $
--- epan/dissectors/packet-ssl-utils.h.orig 2009-06-05 16:47:40.000000000 +0200
+++ epan/dissectors/packet-ssl-utils.h
@@ -38,7 +38,6 @@
#include <gcrypt.h>
#include <gnutls/x509.h>
#include <gnutls/pkcs12.h>
-#include <gnutls/openssl.h>
#include <epan/conversation.h>