Update to wireshark-1.12.7.
Full ChangeLog since 1.10.14 is too long to include. A few highlights: - Expert information is now filterable when the new API is in use. - "malformed" display filter has been renamed to "_ws.malformed". - Transport name resolution is now disabled by default. - Support has been added for all versions of the DCBx protocol. - Cleanup of LLDP code, all dissected fields are now navigable. - Dissector output may be encoded as UTF-8. This includes TShark output. - The ASN1 plugin has been removed as it s deemed obsolete. - The GNM dissector has been removed as it was never used. - The Kerberos dissector has been replaced by one generated from ASN1 code. - A more flexible, modular memory manager (wmem) has been added. - A new API for expert information has been added, replacing the old one. - The tvbuff API has been cleaned up. - Support for 80+ new protocols
This commit is contained in:
tnn
parent
1ebe175f9c
commit
a0715af648
7 changed files with 124 additions and 132 deletions
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.136 2015/08/23 14:30:40 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.137 2015/09/12 19:03:59 tnn Exp $
|
||||
|
||||
DISTNAME= wireshark-1.10.14
|
||||
PKGREVISION= 2
|
||||
DISTNAME= wireshark-1.12.7
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= https://www.wireshark.org/download/src/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
@comment $NetBSD: PLIST,v 1.26 2015/05/07 21:40:43 roy Exp $
|
||||
@comment $NetBSD: PLIST,v 1.27 2015/09/12 19:03:59 tnn Exp $
|
||||
bin/capinfos
|
||||
bin/captype
|
||||
bin/dftest
|
||||
bin/dumpcap
|
||||
bin/editcap
|
||||
|
|
@ -9,11 +10,11 @@ bin/rawshark
|
|||
bin/reordercap
|
||||
bin/text2pcap
|
||||
bin/tshark
|
||||
${PLIST.gtk2}bin/wireshark
|
||||
${PLIST.gtk3}bin/wireshark
|
||||
lib/libfiletap.la
|
||||
lib/libwireshark.la
|
||||
lib/libwiretap.la
|
||||
lib/libwsutil.la
|
||||
lib/wireshark/plugins/${PKGVERSION}/asn1.la
|
||||
lib/wireshark/plugins/${PKGVERSION}/docsis.la
|
||||
lib/wireshark/plugins/${PKGVERSION}/ethercat.la
|
||||
lib/wireshark/plugins/${PKGVERSION}/gryphon.la
|
||||
|
|
@ -37,23 +38,23 @@ man/man1/rawshark.1
|
|||
man/man1/reordercap.1
|
||||
man/man1/text2pcap.1
|
||||
man/man1/tshark.1
|
||||
${PLIST.gtk2}man/man1/wireshark.1
|
||||
${PLIST.gtk3}man/man1/wireshark.1
|
||||
man/man4/wireshark-filter.4
|
||||
${PLIST.gtk2}share/applications/wireshark.desktop
|
||||
${PLIST.gtk3}share/applications/wireshark.desktop
|
||||
${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
|
||||
${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png
|
||||
${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
|
||||
${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
|
||||
share/wireshark/AUTHORS-SHORT
|
||||
share/wireshark/COPYING
|
||||
share/wireshark/capinfos.html
|
||||
|
|
@ -65,14 +66,17 @@ share/wireshark/dftest.html
|
|||
share/wireshark/diameter/AlcatelLucent.xml
|
||||
share/wireshark/diameter/ChinaTelecom.xml
|
||||
share/wireshark/diameter/Cisco.xml
|
||||
share/wireshark/diameter/Custom.xml
|
||||
share/wireshark/diameter/Ericsson.xml
|
||||
share/wireshark/diameter/Nokia.xml
|
||||
share/wireshark/diameter/NokiaSiemensNetworks.xml
|
||||
share/wireshark/diameter/SKT.xml
|
||||
share/wireshark/diameter/Starent.xml
|
||||
share/wireshark/diameter/TGPPGmb.xml
|
||||
share/wireshark/diameter/TGPPRx.xml
|
||||
share/wireshark/diameter/TGPPS9.xml
|
||||
share/wireshark/diameter/TGPPSh.xml
|
||||
share/wireshark/diameter/VerizonWireless.xml
|
||||
share/wireshark/diameter/Vodafone.xml
|
||||
share/wireshark/diameter/chargecontrol.xml
|
||||
share/wireshark/diameter/dictionary.dtd
|
||||
|
|
@ -125,6 +129,7 @@ share/wireshark/radius/dictionary.acc
|
|||
share/wireshark/radius/dictionary.acme
|
||||
share/wireshark/radius/dictionary.airespace
|
||||
share/wireshark/radius/dictionary.alcatel
|
||||
share/wireshark/radius/dictionary.alcatel-lucent.aaa
|
||||
share/wireshark/radius/dictionary.alcatel-lucent.xylan
|
||||
share/wireshark/radius/dictionary.alcatel.esam
|
||||
share/wireshark/radius/dictionary.alcatel.sr
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
$NetBSD: distinfo,v 1.82 2015/07/10 08:13:41 dsainty Exp $
|
||||
$NetBSD: distinfo,v 1.83 2015/09/12 19:03:59 tnn Exp $
|
||||
|
||||
SHA1 (wireshark-1.10.14.tar.bz2) = 47c359dc1b9791d2091887a26fdba65f4a7ef3b8
|
||||
RMD160 (wireshark-1.10.14.tar.bz2) = 7a14c8a2a7c991893ceef1572fe216f74f9992cf
|
||||
Size (wireshark-1.10.14.tar.bz2) = 26905113 bytes
|
||||
SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc
|
||||
SHA1 (wireshark-1.12.7.tar.bz2) = bed365bacfd0b5c653d8568ad25e52957659bd9f
|
||||
RMD160 (wireshark-1.12.7.tar.bz2) = 4a36875d9203112045c41a9adf312b0a4f83bd49
|
||||
Size (wireshark-1.12.7.tar.bz2) = 29202490 bytes
|
||||
SHA1 (patch-aa) = 237c60ae1bd860bdc3ee42a17a46b4e212b97c0f
|
||||
SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3
|
||||
SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
|
||||
SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
|
||||
SHA1 (patch-bb) = 2f6b72aeb99d87821ee6917d6c4c29a276d2e3a8
|
||||
SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
|
||||
SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
|
||||
SHA1 (patch-help_Makefile.in) = 3da440cacb51733c8fbd18e266f2ff5b893efd50
|
||||
SHA1 (patch-help_Makefile.in) = 8d7c27aa5d2c8b7998e4f7235fefaedd52059386
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
# $NetBSD: options.mk,v 1.8 2015/05/07 21:40:43 roy Exp $
|
||||
# $NetBSD: options.mk,v 1.9 2015/09/12 19:03:59 tnn Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
|
||||
PKG_SUPPORTED_OPTIONS= gtk2 lua
|
||||
PKG_SUGGESTED_OPTIONS= gtk2 lua
|
||||
|
||||
PKG_SUPPORTED_OPTIONS= gtk3 lua
|
||||
PKG_SUGGESTED_OPTIONS= gtk3 lua
|
||||
PKG_OPTIONS_LEGACY_OPTS+= gtk2:gtk3
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
PLIST_VARS+= gtk2
|
||||
PLIST_VARS+= gtk3
|
||||
PLIST_VARS+= icons
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mgtk2)
|
||||
.if !empty(PKG_OPTIONS:Mgtk3)
|
||||
CONFIGURE_ARGS+= --enable-wireshark
|
||||
PLIST.gtk2= yes
|
||||
CONFIGURE_ARGS+= --with-gtk3
|
||||
CONFIGURE_ARGS+= --without-qt # XXX make this an option
|
||||
PLIST.gtk3= yes
|
||||
POST_INSTALL_TARGETS+= install-gtk-desktop
|
||||
.include "../../x11/gtk2/buildlink3.mk"
|
||||
.include "../../x11/gtk3/buildlink3.mk"
|
||||
|
||||
install-gtk-desktop:
|
||||
${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
|
||||
|
|
@ -25,7 +27,7 @@ CONFIGURE_ARGS+= --disable-wireshark
|
|||
|
||||
# We might install the qt front end one day as well,
|
||||
# so have a generic icon target
|
||||
.if !empty(PKG_OPTIONS:Mgtk2)
|
||||
.if !empty(PKG_OPTIONS:Mgtk3)
|
||||
PLIST.icons= yes
|
||||
POST_INSTALL_TARGETS+= install-icons
|
||||
INSTALLATION_DIRS+= share/applications
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
$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 2013-05-29 16:52:27.000000000 +0000
|
||||
+++ AUTHORS
|
||||
@@ -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>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-bb,v 1.3 2012/08/20 08:34:44 christos Exp $
|
||||
$NetBSD: patch-bb,v 1.4 2015/09/12 19:03:59 tnn Exp $
|
||||
|
||||
Avoid conflict with NetBSD's popcount(3).
|
||||
|
||||
--- epan/dissectors/x11-extension-implementation.h.orig 2012-06-05 19:33:36.000000000 +0300
|
||||
+++ epan/dissectors/x11-extension-implementation.h 2012-08-19 17:16:48.000000000 +0300
|
||||
@@ -21153,8 +21153,8 @@
|
||||
--- epan/dissectors/x11-extension-implementation.h.orig 2015-08-12 16:47:42.000000000 +0000
|
||||
+++ epan/dissectors/x11-extension-implementation.h
|
||||
@@ -19990,8 +19990,8 @@ static int struct_size_xkb_DeviceLedInfo
|
||||
int f_namesPresent;
|
||||
f_namesPresent = VALUE32(tvb, *offsetp + size + 4);
|
||||
f_mapsPresent = VALUE32(tvb, *offsetp + size + 8);
|
||||
|
|
@ -15,50 +15,79 @@ Avoid conflict with NetBSD's popcount(3).
|
|||
return size + 20;
|
||||
}
|
||||
|
||||
@@ -21187,8 +21187,8 @@
|
||||
f_state = VALUE32(tvb, *offsetp);
|
||||
proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order);
|
||||
@@ -20018,8 +20018,8 @@ static void struct_xkb_DeviceLedInfo(tvb
|
||||
*offsetp += 4;
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order);
|
||||
- struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent));
|
||||
+ listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order);
|
||||
+ struct_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent));
|
||||
proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order);
|
||||
*offsetp += 4;
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order);
|
||||
- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent));
|
||||
+ listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order);
|
||||
+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23502,7 +23502,7 @@
|
||||
@@ -22060,7 +22060,7 @@ static void xkbGetMap_Reply(tvbuff_t *tv
|
||||
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
|
||||
}
|
||||
if ((f_present & (1 << 6)) != 0) {
|
||||
- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
|
||||
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order);
|
||||
if (*offsetp % 4) {
|
||||
UNUSED(4 - *offsetp % 4);
|
||||
}
|
||||
@@ -22210,8 +22210,8 @@ static void xkbSetMap(tvbuff_t *tvb, pac
|
||||
length -= f_totalKeyBehaviors * 4;
|
||||
}
|
||||
if ((f_present & (1 << 6)) != 0) {
|
||||
- listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, popcount(f_virtualMods), byte_order);
|
||||
- length -= popcount(f_virtualMods) * 1;
|
||||
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, my_popcount(f_virtualMods), byte_order);
|
||||
+ length -= my_popcount(f_virtualMods) * 1;
|
||||
}
|
||||
if ((f_present & (1 << 3)) != 0) {
|
||||
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
|
||||
@@ -22284,7 +22284,7 @@ static void xkbGetCompatMap_Reply(tvbuff
|
||||
*offsetp += 2;
|
||||
UNUSED(16);
|
||||
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), byte_order);
|
||||
- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
|
||||
+ struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
|
||||
struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn);
|
||||
- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
|
||||
+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
|
||||
}
|
||||
|
||||
static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
|
||||
@@ -23542,8 +23542,8 @@
|
||||
@@ -22316,8 +22316,8 @@ static void xkbSetCompatMap(tvbuff_t *tv
|
||||
UNUSED(2);
|
||||
listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), byte_order);
|
||||
length -= (16 * f_nSI) * 1;
|
||||
- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups));
|
||||
struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSI);
|
||||
length -= f_nSI * 10;
|
||||
- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups));
|
||||
- length -= popcount(f_groups) * 4;
|
||||
+ struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups));
|
||||
+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups));
|
||||
+ length -= my_popcount(f_groups) * 4;
|
||||
}
|
||||
|
||||
static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
|
||||
@@ -23638,8 +23638,8 @@
|
||||
@@ -22378,7 +22378,7 @@ static void xkbGetIndicatorMap_Reply(tvb
|
||||
proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_nIndicators, tvb, *offsetp, 1, byte_order);
|
||||
*offsetp += 1;
|
||||
UNUSED(15);
|
||||
- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
|
||||
+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which));
|
||||
}
|
||||
|
||||
static void xkbSetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
|
||||
@@ -22390,8 +22390,8 @@ static void xkbSetIndicatorMap(tvbuff_t
|
||||
f_which = VALUE32(tvb, *offsetp);
|
||||
proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order);
|
||||
*offsetp += 4;
|
||||
- struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
|
||||
- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
|
||||
- length -= popcount(f_which) * 12;
|
||||
+ struct_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which));
|
||||
+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which));
|
||||
+ length -= my_popcount(f_which) * 12;
|
||||
}
|
||||
|
||||
static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
|
||||
@@ -24136,13 +24136,13 @@
|
||||
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, byte_order);
|
||||
@@ -22806,13 +22806,13 @@ static void xkbGetNames_Reply(tvbuff_t *
|
||||
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 8)) != 0) {
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
|
||||
|
|
@ -73,9 +102,9 @@ Avoid conflict with NetBSD's popcount(3).
|
|||
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 9)) != 0) {
|
||||
struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
@@ -24304,16 +24304,16 @@
|
||||
length -= (length - 52) / 4 * 4;
|
||||
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
@@ -22957,16 +22957,16 @@ static void xkbSetNames(tvbuff_t *tvb, p
|
||||
length -= sumof_nLevelsPerType * 4;
|
||||
}
|
||||
if ((f_which & (1 << 8)) != 0) {
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
|
||||
|
|
@ -96,18 +125,27 @@ Avoid conflict with NetBSD's popcount(3).
|
|||
+ length -= my_popcount(f_groupNames) * 4;
|
||||
}
|
||||
if ((f_which & (1 << 9)) != 0) {
|
||||
struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
@@ -25102,7 +25102,7 @@
|
||||
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
@@ -23404,7 +23404,7 @@ static void xkbGetKbdByName_Reply(tvbuff
|
||||
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
|
||||
}
|
||||
if ((f_present & (1 << 6)) != 0) {
|
||||
- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
|
||||
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order);
|
||||
}
|
||||
if ((f_present & (1 << 3)) != 0) {
|
||||
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
|
||||
@@ -23447,7 +23447,7 @@ static void xkbGetKbdByName_Reply(tvbuff
|
||||
*offsetp += 2;
|
||||
UNUSED(16);
|
||||
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), byte_order);
|
||||
- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
|
||||
+ struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
|
||||
struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn);
|
||||
- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
|
||||
+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
|
||||
}
|
||||
if ((f_reported & (1 << 2)) != 0) {
|
||||
int f_clientDeviceID;
|
||||
@@ -25565,13 +25565,13 @@
|
||||
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, byte_order);
|
||||
if ((f_reported & (1 << 4)) != 0) {
|
||||
int f_nIndicators;
|
||||
@@ -23601,13 +23601,13 @@ static void xkbGetKbdByName_Reply(tvbuff
|
||||
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 8)) != 0) {
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
|
||||
|
|
@ -122,21 +160,4 @@ Avoid conflict with NetBSD's popcount(3).
|
|||
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 9)) != 0) {
|
||||
struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
@@ -25724,13 +25724,13 @@
|
||||
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 8)) != 0) {
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
|
||||
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 11)) != 0) {
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
|
||||
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 12)) != 0) {
|
||||
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
|
||||
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
|
||||
}
|
||||
if ((f_which & (1 << 9)) != 0) {
|
||||
struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
$NetBSD: patch-help_Makefile.in,v 1.1 2015/07/10 08:13:42 dsainty Exp $
|
||||
$NetBSD: patch-help_Makefile.in,v 1.2 2015/09/12 19:03:59 tnn Exp $
|
||||
|
||||
Not all shells (E.g. pdksh) support '((', whereas '( (' is portable.
|
||||
|
||||
--- help/Makefile.in.orig 2015-05-13 08:21:33.000000000 +1200
|
||||
+++ help/Makefile.in 2015-07-10 18:21:32.144104113 +1200
|
||||
@@ -673,7 +673,7 @@
|
||||
--- help/Makefile.in.orig 2015-08-12 16:48:07.000000000 +0000
|
||||
+++ help/Makefile.in
|
||||
@@ -684,7 +684,7 @@ uninstall-am: uninstall-helpDATA
|
||||
# can use it exclusively.
|
||||
faq.txt: $(srcdir)/faq.py
|
||||
$(AM_V_GEN)$(srcdir)/faq.py >$@.tmp && \
|
||||
- (( which elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
|
||||
+ ( ( which elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
|
||||
( which links > /dev/null && links -width 72 -html-numbered-links 0 -dump $@.tmp > $@ ) || \
|
||||
( which lynx > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html < $@.tmp > $@ ) || \
|
||||
- (( command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
|
||||
+ ( ( command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \
|
||||
( command -v links > /dev/null && links -width 72 -html-numbered-links 0 -dump $@.tmp > $@ ) || \
|
||||
( command -v lynx > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html < $@.tmp > $@ ) || \
|
||||
$(srcdir)/../tools/html2text.py --width=72 --no-links $@.tmp > $@ ) && \
|
||||
|
|
|
|||
Loading…
Reference in a new issue