Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,6 +1,11 @@
Wireshark (formerly known as Ethereal) is a free network protocol analyzer for
Unix and Windows. It allows you to examine data from a live network or from a
capture file on disk. You can interactively browse the capture data, viewing
summary and detail information for each packet. Wireshark has several powerful
features, including a rich display filter language and the ability to view the
reconstructed stream of a TCP session.
Wireshark is a network traffic analyzer, or "sniffer", for Unix and
Unix-like operating systems. It uses GTK+, a graphical user interface
library, and libpcap, a packet capture and filtering library.
The Wireshark distribution also comes with TShark, which is a
line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the
same dissection, capture-file reading and writing, and packet filtering
code as Wireshark, and with editcap, which is a program to read capture
files and write the packets from that capture file, possibly in a
different capture file format, and with some packets possibly removed
from the capture.

View File

@@ -1,26 +1,26 @@
# $NetBSD: Makefile,v 1.103.2.2 2013/09/18 09:55:31 spz Exp $
# $NetBSD: Makefile,v 1.117 2014/03/08 10:38:26 tron Exp $
DISTNAME= wireshark-1.8.10
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
EXTRACT_SUFX= .tar.bz2
DISTNAME= wireshark-1.10.6
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
EXTRACT_SUFX= .tar.bz2
OWNER= tron@NetBSD.org
HOMEPAGE= http://www.wireshark.org/
COMMENT= Network protocol analyzer
LICENSE= gnu-gpl-v2
OWNER= tron@NetBSD.org
HOMEPAGE= http://www.wireshark.org/
COMMENT= Network protocol analyzer
LICENSE= gnu-gpl-v2
CONFLICTS+= ethereal-[0-9]*
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config yacc lex
USE_LIBTOOL= YES
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= # empty
CHECK_PORTABILITY_SKIP+= packaging/macosx/*/*
CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
GNU_CONFIGURE= YES
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-static=no
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
@@ -32,6 +32,24 @@ CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
PTHREAD_OPTS+= require
PYTHON_FOR_BUILD_ONLY= yes
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.10.5
REPLACE_PYTHON+= help/faq.py
REPLACE_PYTHON+= tools/asn2deb
REPLACE_PYTHON+= tools/asn2wrs.py
REPLACE_PYTHON+= tools/dfilter-test.py
REPLACE_PYTHON+= tools/ftsanity.py
REPLACE_PYTHON+= tools/html2text.py
REPLACE_PYTHON+= tools/idl2deb
REPLACE_PYTHON+= tools/indexcap.py
REPLACE_PYTHON+= tools/make-dissector-reg.py
REPLACE_PYTHON+= tools/make-tap-reg.py
REPLACE_PYTHON+= tools/msnchat
REPLACE_PYTHON+= tools/ncp2222.py
REPLACE_PYTHON+= tools/netscreen2dump.py
REPLACE_PYTHON+= tools/pkt-from-core.py
REPLACE_PYTHON+= tools/rdps.py
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
@@ -51,5 +69,6 @@ BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
.include "../../security/gnutls/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.24 2012/10/04 20:15:48 tron Exp $
@comment $NetBSD: PLIST,v 1.25 2013/07/04 21:33:14 adam Exp $
bin/capinfos
bin/dftest
bin/dumpcap
@@ -6,6 +6,7 @@ bin/editcap
bin/mergecap
bin/randpkt
bin/rawshark
bin/reordercap
bin/text2pcap
bin/tshark
${PLIST.gtk2}bin/wireshark
@@ -25,6 +26,7 @@ lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
lib/wireshark/plugins/${PKGVERSION}/unistim.la
lib/wireshark/plugins/${PKGVERSION}/wimax.la
lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la
man/man1/capinfos.1
man/man1/dftest.1
man/man1/dumpcap.1
@@ -32,6 +34,7 @@ man/man1/editcap.1
man/man1/mergecap.1
man/man1/randpkt.1
man/man1/rawshark.1
man/man1/reordercap.1
man/man1/text2pcap.1
man/man1/tshark.1
${PLIST.gtk2}man/man1/wireshark.1
@@ -45,8 +48,12 @@ ${PLIST.lua}share/wireshark/console.lua
share/wireshark/dfilters
share/wireshark/dftest.html
share/wireshark/diameter/AlcatelLucent.xml
share/wireshark/diameter/ChinaTelecom.xml
share/wireshark/diameter/Cisco.xml
share/wireshark/diameter/Ericsson.xml
share/wireshark/diameter/Nokia.xml
share/wireshark/diameter/NokiaSiemensNetworks.xml
share/wireshark/diameter/SKT.xml
share/wireshark/diameter/TGPPGmb.xml
share/wireshark/diameter/TGPPRx.xml
share/wireshark/diameter/TGPPS9.xml
@@ -91,7 +98,10 @@ share/wireshark/ipmap.html
share/wireshark/manuf
share/wireshark/mergecap.html
share/wireshark/pdml2html.xsl
share/wireshark/profiles/Bluetooth/colorfilters
share/wireshark/profiles/Classic/colorfilters
share/wireshark/radius/README.radius_dictionary
share/wireshark/radius/custom.includes
share/wireshark/radius/dictionary
share/wireshark/radius/dictionary.3com
share/wireshark/radius/dictionary.3gpp
@@ -200,9 +210,12 @@ share/wireshark/radius/dictionary.rfc4818
share/wireshark/radius/dictionary.rfc4849
share/wireshark/radius/dictionary.rfc5090
share/wireshark/radius/dictionary.rfc5176
share/wireshark/radius/dictionary.rfc5447
share/wireshark/radius/dictionary.rfc5580
share/wireshark/radius/dictionary.rfc5607
share/wireshark/radius/dictionary.rfc5904
share/wireshark/radius/dictionary.rfc6519
share/wireshark/radius/dictionary.rfc6572
share/wireshark/radius/dictionary.riverstone
share/wireshark/radius/dictionary.roaringpenguin
share/wireshark/radius/dictionary.shasta
@@ -234,6 +247,7 @@ share/wireshark/radius/dictionary.xedia
share/wireshark/radius/dictionary.zyxel
share/wireshark/randpkt.html
share/wireshark/rawshark.html
share/wireshark/reordercap.html
share/wireshark/services
share/wireshark/smi_modules
share/wireshark/text2pcap.html

View File

@@ -1,12 +1,12 @@
$NetBSD: distinfo,v 1.66.2.2 2013/09/18 09:55:31 spz Exp $
$NetBSD: distinfo,v 1.73 2014/03/08 10:38:26 tron Exp $
SHA1 (wireshark-1.8.10.tar.bz2) = ebb41dde83532205e989eb5a7b03a21250d865b9
RMD160 (wireshark-1.8.10.tar.bz2) = 1477510a40e0dbb21403432807779635419f83a9
Size (wireshark-1.8.10.tar.bz2) = 24125925 bytes
SHA1 (patch-AUTHORS) = c2329d7b6d9cdbc9139b356e74dbe77e26e58da3
SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d
SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
SHA1 (wireshark-1.10.6.tar.bz2) = 081a2daf85e3257d7a2699e84a330712e3e5b9bb
RMD160 (wireshark-1.10.6.tar.bz2) = 3018f4d60d1ac86dfffd875a53373c85f5be44e8
Size (wireshark-1.10.6.tar.bz2) = 26719003 bytes
SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc
SHA1 (patch-aa) = c4b7a3d20fac115020069588e74f35e2e77235e6
SHA1 (patch-ab) = c68adc187ec802b076d3b3c3d3b0f3bb01a8a2eb
SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3
SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e

View File

@@ -1,25 +1,34 @@
$NetBSD: patch-AUTHORS,v 1.1 2013/06/01 07:46:43 wiz Exp $
$NetBSD: patch-AUTHORS,v 1.2 2013/07/04 21:33:14 adam Exp $
Remove characters that perl-5.18's pod2man doesn't like
(this file is included verbatim in the docs).
--- AUTHORS.orig 2012-06-16 18:38:51.000000000 +0000
--- AUTHORS.orig 2013-05-29 16:52:27.000000000 +0000
+++ AUTHORS
@@ -3550,7 +3550,7 @@ Cvetan Ivanov <zezo [AT] spnet.net>
Vasanth Manickam <vasanth.manickam [AT] bt.com>
Julian Onions <julian.onions [AT] gmail.com>
Samuel Thibault <samuel.thibault [AT] ens-lyon.org>
-Peter Kovář <peter.kovar [AT] gmail.com>
+Peter Kovar <peter.kovar [AT] gmail.com>
Paul Ollis <paul.ollis [AT] roke.co.uk>
Dominik Kuhlen <dkuhlen [AT] gmx.net>
Karl Knoebl <karl.knoebl [AT] siemens.com>
@@ -3641,7 +3641,7 @@ Paul Stath <pstath [AT] axxcelera.com>
DeCount <aatrade [AT] libero.it>
Andras Veres-Szentkiralyi <vsza [AT] vsza.hu>
Jakob Hirsch <jh.wireshark-bugzilla [AT] plonk.de>
-Роман Донченко <DXDragon [AT] yandex.ru>
+ <DXDragon [AT] yandex.ru>
<billyjeans [AT] gmail.com>
Evan Huus <eapache [AT] gmail.com>
Tom Cook <tcook [AT] ixiacom.com>
@@ -3509,7 +3509,7 @@ Peter Hatina <phatina[AT]redhat.com> {
Gtk3 Wireshark fixes
}
-Tomasz Moń <desowin[AT]gmail.com> {
+Tomasz Mon <desowin[AT]gmail.com> {
USBPcap support
}
@@ -3612,7 +3612,7 @@ Cvetan Ivanov <zezo[AT]spnet.net>
Vasanth Manickam <vasanth.manickam[AT]bt.com>
Julian Onions <julian.onions[AT]gmail.com>
Samuel Thibault <samuel.thibault[AT]ens-lyon.org>
-Peter Kovář <peter.kovar[AT]gmail.com>
+Peter Kovar <peter.kovar[AT]gmail.com>
Paul Ollis <paul.ollis[AT]roke.co.uk>
Dominik Kuhlen <dkuhlen[AT]gmx.net>
Karl Knoebl <karl.knoebl[AT]siemens.com>
@@ -3703,7 +3703,7 @@ Paul Stath <pstath[AT]axxcelera.com>
DeCount <aatrade[AT]libero.it>
Andras Veres-Szentkiralyi <vsza[AT]vsza.hu>
Jakob Hirsch <jh.wireshark-bugzilla[AT]plonk.de>
-Роман Донченко <DXDragon[AT]yandex.ru>
+Roman Dontzenko <DXDragon[AT]yandex.ru>
<billyjeans[AT]gmail.com>
Evan Huus <eapache[AT]gmail.com>
Tom Cook <tcook[AT]ixiacom.com>

View File

@@ -1,15 +1,16 @@
$NetBSD: patch-aa,v 1.11 2012/08/20 08:34:44 christos Exp $
$NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $
--- ui/gtk/time_shift_dlg.c.orig 2012-06-05 19:33:15.000000000 +0300
+++ ui/gtk/time_shift_dlg.c 2012-08-19 19:30:08.000000000 +0300
@@ -90,6 +90,10 @@
*/
static GtkWidget *time_shift_frame_w;
Fix build.
--- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000
+++ ui/time_shift.c
@@ -29,6 +29,9 @@
#include <string.h>
#include <ctype.h>
#include <math.h>
+#ifndef HAVE_FLOORL
+#define floorl(a) floor((double)(a))
+#endif
+
void
time_shift_cb(GtkWidget *w _U_, gpointer d _U_)
{
#include <glib.h>

View File

@@ -1,4 +1,6 @@
$NetBSD: patch-ab,v 1.3 2007/07/06 17:59:16 drochner Exp $
$NetBSD: patch-ab,v 1.4 2013/12/18 11:52:25 tron Exp $
Fix compiler warning caused by improper use of toupper(3).
--- wiretap/dbs-etherwatch.c.orig 2007-07-06 12:52:45.000000000 +0200
+++ wiretap/dbs-etherwatch.c

View File

@@ -1,4 +1,6 @@
$NetBSD: patch-ac,v 1.1 2008/10/26 14:06:52 tron Exp $
$NetBSD: patch-ac,v 1.2 2013/12/18 11:52:25 tron Exp $
Fix build problem caused by name space polution.
--- epan/dissectors/packet-mtp3.h.orig 2008-10-20 20:19:32.000000000 +0100
+++ epan/dissectors/packet-mtp3.h 2008-10-26 13:41:50.000000000 +0000