Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.117 2014/03/08 10:38:26 tron Exp $
# $NetBSD: Makefile,v 1.130 2015/03/09 18:47:18 tron Exp $
DISTNAME= wireshark-1.10.6
DISTNAME= wireshark-1.10.13
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
MASTER_SITES= https://www.wireshark.org/download/src/
EXTRACT_SUFX= .tar.bz2
OWNER= tron@NetBSD.org
@@ -33,7 +32,7 @@ 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
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.10.5
REPLACE_PYTHON+= help/faq.py
REPLACE_PYTHON+= tools/asn2deb
REPLACE_PYTHON+= tools/asn2wrs.py

View File

@@ -1,11 +1,10 @@
$NetBSD: distinfo,v 1.73 2014/03/08 10:38:26 tron Exp $
$NetBSD: distinfo,v 1.80 2015/03/09 09:04:25 tron Exp $
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 (wireshark-1.10.13.tar.bz2) = bf552798df85306a2634e98710ea7c0aafb4e5a5
RMD160 (wireshark-1.10.13.tar.bz2) = 86c5e443ce55f9ac0adfe31fa416eaa4b1a77b6c
Size (wireshark-1.10.13.tar.bz2) = 26954491 bytes
SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc
SHA1 (patch-aa) = c4b7a3d20fac115020069588e74f35e2e77235e6
SHA1 (patch-ab) = c68adc187ec802b076d3b3c3d3b0f3bb01a8a2eb
SHA1 (patch-aa) = 237c60ae1bd860bdc3ee42a17a46b4e212b97c0f
SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3
SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352

View File

@@ -1,12 +1,12 @@
$NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $
$NetBSD: patch-aa,v 1.14 2014/11/14 12:06:10 tron Exp $
Fix build.
--- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000
+++ ui/time_shift.c
@@ -29,6 +29,9 @@
--- ui/time_shift.c.orig 2014-11-12 18:49:17.000000000 +0000
+++ ui/time_shift.c 2014-11-14 10:08:51.000000000 +0000
@@ -28,6 +28,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <math.h>
+#ifndef HAVE_FLOORL
+#define floorl(a) floor((double)(a))

View File

@@ -1,22 +0,0 @@
$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
@@ -624,13 +624,13 @@ parse_hex_dump(char* dump, guint8 *buf,
if(isdigit((guchar)dump[pos])) {
buf[count] = (dump[pos] - '0') << 4;
} else {
- buf[count] = (toupper(dump[pos]) - 'A' + 10) << 4;
+ buf[count] = (toupper((guchar)dump[pos]) - 'A' + 10) << 4;
}
pos++;
if(isdigit((guchar)dump[pos])) {
buf[count] += dump[pos] - '0';
} else {
- buf[count] += toupper(dump[pos]) - 'A' + 10;
+ buf[count] += toupper((guchar)dump[pos]) - 'A' + 10;
}
pos++;
count++;