Accepting request 125846 from network:utilities

update to upstream 1.8.0 (forwarded request 125845 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/125846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=55

include.filelist

@@ -1,8 +1,9 @@
 color.h
 config.h
+register.h
 epan/addr_and_mask.h
-epan/addr_resolv.h
 epan/address.h
+epan/addr_resolv.h
 epan/adler32.h
 epan/afn.h
 epan/aftypes.h
@@ -19,33 +20,32 @@ epan/charsets.h
 epan/chdlctypes.h
 epan/circuit.h
 epan/codecs.h
-epan/column-utils.h
 epan/column.h
 epan/column_info.h
+epan/column-utils.h
 epan/conversation.h
-epan/crc10.h
+epan/conv_id.h
-epan/crc16.h
+epan/crc16-tvb.h
-epan/crc32.h
+epan/crc32-tvb.h
-epan/crc6.h
+epan/crc8-tvb.h
-epan/crc8.h
+epan/crypt/aes.h
-epan/crcdrm.h
 epan/crypt/airpdcap_debug.h
-epan/crypt/airpdcap_int.h
 epan/crypt/airpdcap_interop.h
+epan/crypt/airpdcap_int.h
 epan/crypt/airpdcap_rijndael.h
 epan/crypt/airpdcap_system.h
 epan/crypt/airpdcap_user.h
 epan/crypt/airpdcap_ws.h
-epan/crypt/crypt-aes.h
+epan/crypt/des.h
-epan/crypt/crypt-des.h
+epan/crypt/eax.h
-epan/crypt/crypt-md4.h
+epan/crypt/md4.h
-epan/crypt/crypt-md5.h
+epan/crypt/md5.h
-epan/crypt/crypt-rc4.h
+epan/crypt/rc4.h
-epan/crypt/crypt-sha1.h
+epan/crypt/sha1.h
 epan/crypt/wep-wpadefs.h
+epan/dfilter/dfilter.h
 epan/dfilter/dfilter-int.h
 epan/dfilter/dfilter-macro.h
-epan/dfilter/dfilter.h
 epan/dfilter/dfunctions.h
 epan/dfilter/dfvm.h
 epan/dfilter/drange.h
@@ -60,12 +60,13 @@ epan/dfilter/syntax-tree.h
 epan/diam_dict.h
 epan/diam_dict_lex.h
 epan/dissector_filters.h
-epan/dissectors/packet-acn.h
+epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.h
+epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.h
+epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.h
 epan/dissectors/packet-acp133.h
 epan/dissectors/packet-acse.h
 epan/dissectors/packet-actrace.h
 epan/dissectors/packet-afp.h
-epan/dissectors/packet-afs.h
 epan/dissectors/packet-aim.h
 epan/dissectors/packet-alcap.h
 epan/dissectors/packet-ansi_a.h
@@ -74,30 +75,31 @@ epan/dissectors/packet-ansi_tcap.h
 epan/dissectors/packet-ap1394.h
 epan/dissectors/packet-arcnet.h
 epan/dissectors/packet-arp.h
-epan/dissectors/packet-assa_r3_public.h
 epan/dissectors/packet-atalk.h
 epan/dissectors/packet-atm.h
 epan/dissectors/packet-bacapp.h
 epan/dissectors/packet-ber.h
-epan/dissectors/packet-bgp.h
+epan/dissectors/packet-bfd.h
-epan/dissectors/packet-bootparams.h
 epan/dissectors/packet-bssap.h
 epan/dissectors/packet-bssgp.h
 epan/dissectors/packet-bthci_acl.h
 epan/dissectors/packet-btl2cap.h
 epan/dissectors/packet-btrfcomm.h
 epan/dissectors/packet-btsdp.h
+epan/dissectors/packet-c1222.h
 epan/dissectors/packet-camel.h
 epan/dissectors/packet-cdt.h
+epan/dissectors/packet-cell_broadcast.h
 epan/dissectors/packet-charging_ase.h
 epan/dissectors/packet-chdlc.h
-epan/dissectors/packet-cimd.h
 epan/dissectors/packet-cip.h
+epan/dissectors/packet-cipsafety.h
 epan/dissectors/packet-clearcase.h
 epan/dissectors/packet-clip.h
 epan/dissectors/packet-cmip.h
 epan/dissectors/packet-cmp.h
 epan/dissectors/packet-cms.h
+epan/dissectors/packet-credssp.h
 epan/dissectors/packet-crmf.h
 epan/dissectors/packet-csn1.h
 epan/dissectors/packet-dap.h
@@ -119,9 +121,11 @@ epan/dissectors/packet-dcerpc-eventlog.h
 epan/dissectors/packet-dcerpc-frsapi.h
 epan/dissectors/packet-dcerpc-frsrpc.h
 epan/dissectors/packet-dcerpc-frstrans.h
+epan/dissectors/packet-dcerpc.h
 epan/dissectors/packet-dcerpc-initshutdown.h
 epan/dissectors/packet-dcerpc-lsa.h
 epan/dissectors/packet-dcerpc-mapi.h
+epan/dissectors/packet-dcerpc-misc.h
 epan/dissectors/packet-dcerpc-netlogon.h
 epan/dissectors/packet-dcerpc-nspi.h
 epan/dissectors/packet-dcerpc-nt.h
@@ -136,7 +140,6 @@ epan/dissectors/packet-dcerpc-tapi.h
 epan/dissectors/packet-dcerpc-winreg.h
 epan/dissectors/packet-dcerpc-wkssvc.h
 epan/dissectors/packet-dcerpc-wzcsvc.h
-epan/dissectors/packet-dcerpc.h
 epan/dissectors/packet-dcm.h
 epan/dissectors/packet-dcom-dispatch.h
 epan/dissectors/packet-dcom.h
@@ -158,17 +161,16 @@ epan/dissectors/packet-edonkey.h
 epan/dissectors/packet-enc.h
 epan/dissectors/packet-enip.h
 epan/dissectors/packet-epmd.h
-epan/dissectors/packet-erf.h
 epan/dissectors/packet-esis.h
 epan/dissectors/packet-ess.h
 epan/dissectors/packet-eth.h
-epan/dissectors/packet-fc.h
 epan/dissectors/packet-fcbls.h
 epan/dissectors/packet-fcct.h
 epan/dissectors/packet-fcdns.h
 epan/dissectors/packet-fcels.h
 epan/dissectors/packet-fcfcs.h
 epan/dissectors/packet-fcfzs.h
+epan/dissectors/packet-fc.h
 epan/dissectors/packet-fclctl.h
 epan/dissectors/packet-fcp.h
 epan/dissectors/packet-fcsb3.h
@@ -177,10 +179,12 @@ epan/dissectors/packet-fddi.h
 epan/dissectors/packet-ff.h
 epan/dissectors/packet-fix.h
 epan/dissectors/packet-fmp.h
-epan/dissectors/packet-fr.h
 epan/dissectors/packet-frame.h
+epan/dissectors/packet-fr.h
 epan/dissectors/packet-ftam.h
 epan/dissectors/packet-giop.h
+epan/dissectors/packet-gluster.h
+epan/dissectors/packet-gmr1_common.h
 epan/dissectors/packet-gnm.h
 epan/dissectors/packet-gnutella.h
 epan/dissectors/packet-gprscdr.h
@@ -191,6 +195,7 @@ epan/dissectors/packet-gsm_rlcmac.h
 epan/dissectors/packet-gsm_sms.h
 epan/dissectors/packet-gssapi.h
 epan/dissectors/packet-gtp.h
+epan/dissectors/packet-gtpv2.h
 epan/dissectors/packet-h223.h
 epan/dissectors/packet-h225.h
 epan/dissectors/packet-h235.h
@@ -202,6 +207,7 @@ epan/dissectors/packet-h323.h
 epan/dissectors/packet-h450-ros.h
 epan/dissectors/packet-hci_h4.h
 epan/dissectors/packet-hclnfsd.h
+epan/dissectors/packet-hdcp.h
 epan/dissectors/packet-hpext.h
 epan/dissectors/packet-http.h
 epan/dissectors/packet-i2c.h
@@ -210,6 +216,9 @@ epan/dissectors/packet-icmp.h
 epan/dissectors/packet-idmp.h
 epan/dissectors/packet-idp.h
 epan/dissectors/packet-ieee80211.h
+epan/dissectors/packet-ieee80211-radiotap-defs.h
+epan/dissectors/packet-ieee80211-radiotap.h
+epan/dissectors/packet-ieee80211-radiotap-iter.h
 epan/dissectors/packet-ieee802154.h
 epan/dissectors/packet-ieee8021ah.h
 epan/dissectors/packet-ieee8023.h
@@ -219,35 +228,39 @@ epan/dissectors/packet-igmp.h
 epan/dissectors/packet-imf.h
 epan/dissectors/packet-inap.h
 epan/dissectors/packet-infiniband.h
-epan/dissectors/packet-ip.h
-epan/dissectors/packet-ipdc.h
 epan/dissectors/packet-ipfc.h
+epan/dissectors/packet-ip.h
 epan/dissectors/packet-ipmi.h
 epan/dissectors/packet-ipsec.h
 epan/dissectors/packet-ipv6.h
 epan/dissectors/packet-ipx.h
 epan/dissectors/packet-isakmp.h
 epan/dissectors/packet-isis-clv.h
+epan/dissectors/packet-isis.h
 epan/dissectors/packet-isis-hello.h
 epan/dissectors/packet-isis-lsp.h
 epan/dissectors/packet-isis-snp.h
-epan/dissectors/packet-isis.h
 epan/dissectors/packet-isl.h
 epan/dissectors/packet-isup.h
 epan/dissectors/packet-jxta.h
 epan/dissectors/packet-kerberos.h
 epan/dissectors/packet-klm.h
+epan/dissectors/packet-lcsap.h
 epan/dissectors/packet-ldap.h
 epan/dissectors/packet-ldp.h
 epan/dissectors/packet-llc.h
+epan/dissectors/packet-lldp.h
 epan/dissectors/packet-logotypecertextn.h
+epan/dissectors/packet-lpp.h
 epan/dissectors/packet-lte-rrc.h
 epan/dissectors/packet-mac-lte.h
-epan/dissectors/packet-meta.h
+epan/dissectors/packet-mbtcp.h
 epan/dissectors/packet-mgcp.h
 epan/dissectors/packet-mms.h
 epan/dissectors/packet-mount.h
 epan/dissectors/packet-mp4ves.h
+epan/dissectors/packet-mpeg-descriptor.h
+epan/dissectors/packet-mpeg-sect.h
 epan/dissectors/packet-mpls.h
 epan/dissectors/packet-mq.h
 epan/dissectors/packet-mrdisc.h
@@ -269,19 +282,18 @@ epan/dissectors/packet-ntlmssp.h
 epan/dissectors/packet-ntp.h
 epan/dissectors/packet-null.h
 epan/dissectors/packet-ocsp.h
-epan/dissectors/packet-osi-options.h
 epan/dissectors/packet-osi.h
+epan/dissectors/packet-osi-options.h
 epan/dissectors/packet-p1.h
 epan/dissectors/packet-p22.h
-epan/dissectors/packet-p7.h
 epan/dissectors/packet-p772.h
+epan/dissectors/packet-p7.h
 epan/dissectors/packet-pcnfsd.h
 epan/dissectors/packet-pdcp-lte.h
 epan/dissectors/packet-per.h
-epan/dissectors/packet-pflog.h
 epan/dissectors/packet-pim.h
-epan/dissectors/packet-pkcs1.h
 epan/dissectors/packet-pkcs12.h
+epan/dissectors/packet-pkcs1.h
 epan/dissectors/packet-pkinit.h
 epan/dissectors/packet-pkix1explicit.h
 epan/dissectors/packet-pkix1implicit.h
@@ -301,22 +313,21 @@ epan/dissectors/packet-q708.h
 epan/dissectors/packet-q931.h
 epan/dissectors/packet-q932.h
 epan/dissectors/packet-qsig.h
-epan/dissectors/packet-radiotap-defs.h
-epan/dissectors/packet-radiotap-iter.h
-epan/dissectors/packet-radiotap.h
 epan/dissectors/packet-radius.h
 epan/dissectors/packet-ranap.h
 epan/dissectors/packet-raw.h
 epan/dissectors/packet-rdt.h
+epan/dissectors/packet-reload.h
 epan/dissectors/packet-rgmp.h
-epan/dissectors/packet-rlc-lte.h
 epan/dissectors/packet-rlc.h
+epan/dissectors/packet-rlc-lte.h
 epan/dissectors/packet-rmi.h
 epan/dissectors/packet-rmt-alc.h
 epan/dissectors/packet-rmt-common.h
 epan/dissectors/packet-rmt-fec.h
 epan/dissectors/packet-rmt-lct.h
 epan/dissectors/packet-rmt-norm.h
+epan/dissectors/packet-rohc.h
 epan/dissectors/packet-ros.h
 epan/dissectors/packet-rpc.h
 epan/dissectors/packet-rquota.h
@@ -325,42 +336,44 @@ epan/dissectors/packet-rsvp.h
 epan/dissectors/packet-rtcp.h
 epan/dissectors/packet-rtp-events.h
 epan/dissectors/packet-rtp.h
-epan/dissectors/packet-rtps.h
 epan/dissectors/packet-rtps2.h
+epan/dissectors/packet-rtps.h
 epan/dissectors/packet-rtse.h
+epan/dissectors/packet-rtsp.h
 epan/dissectors/packet-rwall.h
 epan/dissectors/packet-rx.h
 epan/dissectors/packet-s1ap.h
 epan/dissectors/packet-sccp.h
+epan/dissectors/packet-scsi.h
 epan/dissectors/packet-scsi-mmc.h
 epan/dissectors/packet-scsi-osd.h
 epan/dissectors/packet-scsi-sbc.h
 epan/dissectors/packet-scsi-smc.h
 epan/dissectors/packet-scsi-ssc.h
-epan/dissectors/packet-scsi.h
 epan/dissectors/packet-sctp.h
 epan/dissectors/packet-sdp.h
 epan/dissectors/packet-ses.h
 epan/dissectors/packet-sip.h
 epan/dissectors/packet-skinny.h
 epan/dissectors/packet-sll.h
+epan/dissectors/packet-smb2.h
 epan/dissectors/packet-smb-browse.h
 epan/dissectors/packet-smb-common.h
+epan/dissectors/packet-smb.h
 epan/dissectors/packet-smb-mailslot.h
 epan/dissectors/packet-smb-pipe.h
 epan/dissectors/packet-smb-sidsnooping.h
-epan/dissectors/packet-smb.h
-epan/dissectors/packet-smb2.h
 epan/dissectors/packet-smpp.h
 epan/dissectors/packet-smrse.h
 epan/dissectors/packet-snmp.h
 epan/dissectors/packet-spray.h
 epan/dissectors/packet-sscop.h
-epan/dissectors/packet-ssl-utils.h
 epan/dissectors/packet-ssl.h
-epan/dissectors/packet-stat-notify.h
+epan/dissectors/packet-ssl-utils.h
 epan/dissectors/packet-stat.h
+epan/dissectors/packet-stat-notify.h
 epan/dissectors/packet-sv.h
+epan/dissectors/packet-t124.h
 epan/dissectors/packet-t30.h
 epan/dissectors/packet-t38.h
 epan/dissectors/packet-tacacs.h
@@ -373,12 +386,15 @@ epan/dissectors/packet-tns.h
 epan/dissectors/packet-tpkt.h
 epan/dissectors/packet-tr.h
 epan/dissectors/packet-tte.h
+epan/dissectors/packet-ua.h
+epan/dissectors/packet-uaudp.h
 epan/dissectors/packet-udp.h
 epan/dissectors/packet-umts_fp.h
 epan/dissectors/packet-umts_mac.h
-epan/dissectors/packet-usb-hid.h
 epan/dissectors/packet-usb.h
+epan/dissectors/packet-usb-hid.h
 epan/dissectors/packet-vines.h
+epan/dissectors/packet-vlan.h
 epan/dissectors/packet-wap.h
 epan/dissectors/packet-wccp.h
 epan/dissectors/packet-wifi-p2p.h
@@ -388,25 +404,38 @@ epan/dissectors/packet-wps.h
 epan/dissectors/packet-wsp.h
 epan/dissectors/packet-wtls.h
 epan/dissectors/packet-wtp.h
-epan/dissectors/packet-x11-keysym.h
 epan/dissectors/packet-x11-keysymdef.h
+epan/dissectors/packet-x11-keysym.h
 epan/dissectors/packet-x509af.h
 epan/dissectors/packet-x509ce.h
 epan/dissectors/packet-x509if.h
 epan/dissectors/packet-x509sat.h
 epan/dissectors/packet-xml.h
+epan/dissectors/packet-xmpp-conference.h
+epan/dissectors/packet-xmpp-core.h
+epan/dissectors/packet-xmpp-gtalk.h
+epan/dissectors/packet-xmpp.h
+epan/dissectors/packet-xmpp-jingle.h
+epan/dissectors/packet-xmpp-other.h
+epan/dissectors/packet-xmpp-utils.h
 epan/dissectors/packet-ypbind.h
 epan/dissectors/packet-yppasswd.h
 epan/dissectors/packet-ypserv.h
 epan/dissectors/packet-ypxfr.h
 epan/dissectors/packet-zbee-aps.h
+epan/dissectors/packet-zbee.h
 epan/dissectors/packet-zbee-nwk.h
 epan/dissectors/packet-zbee-security.h
 epan/dissectors/packet-zbee-zcl.h
 epan/dissectors/packet-zbee-zdp.h
-epan/dissectors/packet-zbee.h
 epan/dissectors/packet-zep.h
 epan/dissectors/packet-ziop.h
+epan/dissectors/pidl/idl_types.h
+epan/dissectors/pidl/mapi/mapicodes_enum.h
+epan/dissectors/pidl/mapi/mapitags_enum.h
+epan/dissectors/pidl/nspi/mapicodes_enum.h
+epan/dissectors/pidl/nspi/mapitags_enum.h
+epan/dissectors/pidl/rfr/mapicodes_enum.h
 epan/dissectors/rpc_defrag.h
 epan/dissectors/x11-declarations.h
 epan/dissectors/x11-enum.h
@@ -414,28 +443,28 @@ epan/dissectors/x11-extension-errors.h
 epan/dissectors/x11-extension-implementation.h
 epan/dissectors/x11-glx-render-enum.h
 epan/dissectors/x11-register-info.h
-epan/dtd.h
 epan/dtd_grammar.h
+epan/dtd.h
 epan/dtd_parse.h
 epan/dtd_parse_lex.h
 epan/dtd_preparse_lex.h
 epan/eap.h
 epan/emem.h
-epan/epan.h
 epan/epan_dissect.h
+epan/epan.h
 epan/etypes.h
-epan/ex-opt.h
 epan/except.h
 epan/exceptions.h
+epan/ex-opt.h
 epan/expert.h
 epan/filesystem.h
+epan/filter_expressions.h
 epan/follow.h
 epan/frame_data.h
 epan/frequency-utils.h
-epan/ftypes/ftypes-int.h
 epan/ftypes/ftypes.h
+epan/ftypes/ftypes-int.h
 epan/funnel.h
-epan/g_gnuc.h
 epan/garrayfix.h
 epan/gcp.h
 epan/geoip_db.h
@@ -460,11 +489,12 @@ epan/osi-utils.h
 epan/oui.h
 epan/packet.h
 epan/packet_info.h
+epan/params.h
 epan/pint.h
 epan/plugins.h
 epan/ppptypes.h
-epan/prefs-int.h
 epan/prefs.h
+epan/prefs-int.h
 epan/proto.h
 epan/ptvcursor.h
 epan/radius_dict_lex.h
@@ -475,8 +505,8 @@ epan/report_err.h
 epan/req_resp_hdrs.h
 epan/rtp_pt.h
 epan/sctpppids.h
-epan/sigcomp-udvm.h
 epan/sigcomp_state_hdlr.h
+epan/sigcomp-udvm.h
 epan/slab.h
 epan/sminmpec.h
 epan/sna-utils.h
@@ -486,8 +516,8 @@ epan/stats_tree_priv.h
 epan/stream.h
 epan/strutil.h
 epan/t35.h
-epan/tap-voip.h
 epan/tap.h
+epan/tap-voip.h
 epan/tcap-persistentdata.h
 epan/tfs.h
 epan/time_fmt.h
@@ -495,13 +525,19 @@ epan/timestamp.h
 epan/to_str.h
 epan/tvbparse.h
 epan/tvbuff.h
-epan/uat-int.h
+epan/tvbuff-int.h
 epan/uat.h
+epan/uat-int.h
 epan/uat_load_lex.h
 epan/value_string.h
+epan/wslua/declare_wslua.h
+epan/wslua/wslua.h
+epan/wspython/wspy_proto.h
+epan/wspython/wspy_register.h
 epan/x264_prt_id.h
 epan/xdlc.h
 wiretap/5views.h
+wiretap/aethra.h
 wiretap/airopeek9.h
 wiretap/ascend.h
 wiretap/ascend-int.h
@@ -523,16 +559,17 @@ wiretap/etherpeek.h
 wiretap/eyesdn.h
 wiretap/file_wrappers.h
 wiretap/hcidump.h
-wiretap/i4btrace.h
 wiretap/i4b_trace.h
+wiretap/i4btrace.h
 wiretap/ipfix.h
 wiretap/iptrace.h
 wiretap/iseries.h
-wiretap/jpeg_jfif.h
 wiretap/k12.h
 wiretap/k12text_lex.h
 wiretap/lanalyzer.h
 wiretap/libpcap.h
+wiretap/mime_file.h
+wiretap/mp2t.h
 wiretap/mpeg.h
 wiretap/netmon.h
 wiretap/netscaler.h
@@ -552,8 +589,16 @@ wiretap/tnef.h
 wiretap/toshiba.h
 wiretap/visual.h
 wiretap/vms.h
+wiretap/vwr.h
 wiretap/wtap.h
 wiretap/wtap-int.h
+wsutil/crc10.h
+wsutil/crc16.h
+wsutil/crc16-plain.h
+wsutil/crc32.h
+wsutil/crc6.h
+wsutil/crc8.h
+wsutil/crcdrm.h
 wsutil/file_util.h
 wsutil/inet_aton.h
 wsutil/inet_v6defs.h
@@ -564,4 +609,4 @@ wsutil/str_util.h
 wsutil/type_util.h
 wsutil/unicode-utils.h
 wsutil/wsgetopt.h
-register.h
+wsutil/wsgetopt_int.h

wireshark-1.2.0-disable-warning-dialog.patch

@@ -1,6 +1,8 @@
---- gtk/main.c.orig	2011-11-03 03:42:21.018970202 -0400
+Index: ui/gtk/main.c
-+++ gtk/main.c	2011-11-03 03:45:09.134971896 -0400
+===================================================================
-@@ -1382,11 +1382,13 @@
+--- ui/gtk/main.c.orig	2012-06-16 19:38:51.000000000 +0100
++++ ui/gtk/main.c	2012-06-21 22:17:49.000000000 +0100
+@@ -1400,11 +1400,13 @@ main_colorize_changed(gboolean packet_li
  
  static GtkWidget           *close_dlg = NULL;
  
@@ -14,7 +16,7 @@
  
  #ifdef _WIN32
  static void
-@@ -1967,9 +1969,10 @@
+@@ -2082,9 +2084,10 @@ check_and_warn_user_startup(gchar *cf_na
  #endif
  {
    gchar               *cur_user, *cur_group;
@@ -26,7 +28,7 @@
    if (running_with_special_privs() && recent.privs_warn_if_elevated) {
      cur_user = get_cur_username();
      cur_group = get_cur_groupname();
-@@ -1981,6 +1984,7 @@
+@@ -2099,6 +2102,7 @@ check_and_warn_user_startup(gchar *cf_na
      simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
      simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
    }

wireshark-1.2.0-geoip.patch

@@ -1,12 +1,14 @@
---- epan/geoip_db.c.orig	2011-11-03 03:52:16.118977107 -0400
+Index: epan/geoip_db.c
-+++ epan/geoip_db.c	2011-11-03 03:56:23.711016549 -0400
+===================================================================
-@@ -165,6 +165,9 @@
+--- epan/geoip_db.c.orig	2012-06-05 17:33:40.000000000 +0100
- 			geoip_dat_scan_dir(geoip_db_paths[i].path);
++++ epan/geoip_db.c	2012-06-21 21:55:14.000000000 +0100
- 		}
+@@ -177,6 +177,9 @@ geoip_db_init(void) {
- 	}
+             geoip_dat_scan_dir(geoip_db_paths[i].path);
-+	if (num_geoip_db_paths < 1) {
+         }
-+		geoip_dat_scan_dir("/var/lib/GeoIP");
+     }
-+	}
++    if (num_geoip_db_paths < 1) {
++        geoip_dat_scan_dir("/var/lib/GeoIP");
++    }
  
      /* add fake databases for latitude and longitude (using "City" in reality) */
      {

wireshark-1.6.5-netlogon-aes.patch

@@ -1,29 +0,0 @@
-Index: wireshark-1.6.5/epan/dissectors/packet-dcerpc-netlogon.c
-===================================================================
---- wireshark-1.6.5.orig/epan/dissectors/packet-dcerpc-netlogon.c	2012-01-10 20:08:57.000000000 +0100
-+++ wireshark-1.6.5/epan/dissectors/packet-dcerpc-netlogon.c	2012-03-02 14:28:11.415607283 +0100
-@@ -6669,12 +6669,12 @@ static int netlogon_dissect_neg_options(
-           hf_netlogon_neg_flags_2000000,
-           tvb, offset, 4, flags);
-           proto_tree_add_boolean (negotiate_flags_tree,
--          hf_netlogon_neg_flags_1000000,
--          tvb, offset, 4, flags);
--          proto_tree_add_boolean (negotiate_flags_tree,
-           hf_netlogon_neg_flags_800000,
-           tvb, offset, 4, flags);*/
-         proto_tree_add_boolean (negotiate_flags_tree,
-+                                hf_netlogon_neg_flags_1000000,
-+                                tvb, offset, 4, flags);
-+        proto_tree_add_boolean (negotiate_flags_tree,
-                                 hf_netlogon_neg_flags_400000,
-                                 tvb, offset, 4, flags);
-         proto_tree_add_boolean (negotiate_flags_tree,
-@@ -8807,7 +8807,7 @@ proto_register_dcerpc_netlogon(void)
-           { "Not used 2000000", "ntlmssp.neg_flags.na200000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2000000, "Not used", HFILL }},
- 
-         { &hf_netlogon_neg_flags_1000000,
--          { "Not used 1000000", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "Not used", HFILL }},
-+          { "AES supported", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "AES", HFILL }},
- 
-         { &hf_netlogon_neg_flags_800000,
-           { "Not used 800000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_800000, "Not used", HFILL }},

wireshark-1.6.8.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4fbaffa4fd32543ed1d03b3097bf89a7d492e6d02e9bf8f8aa8a71281f3057f
-size 21967111

wireshark-1.8.0-gmodule.patch

@@ -0,0 +1,12 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig	2012-06-23 12:08:53.000000000 +0100
++++ Makefile.in	2012-06-23 12:09:00.000000000 +0100
+@@ -1051,6 +1051,7 @@ wireshark_LDADD = \
+ 	@LIBGNUTLS_LIBS@		\
+ 	@LIBSMI_LDFLAGS@		\
+ 	@PORTAUDIO_LIBS@		\
++	-lgmodule-2.0	\
+ 	@GTK_LIBS@ -lm
+ 
+ wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)

wireshark-1.8.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62
+size 24425043

wireshark.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Jun 22 21:13:23 UTC 2012 - andreas.stieger@gmx.de
+
+- update to upstream 1.8.0:
+  * supports capturing from multiple interfaces at once.
+  * add, edit, and save packet and capture file annotations.
+  * pcap-ng file format is default
+  * Decryption key management for IEEE 802.11, IPsec, and ISAKMP
+    is easier.
+  * GeoIP IPv6 databases are now supported.
+  * large number of protocol dissectors added and updated
+  * support for many capture file formats added and updated
+
+  For a full list refer to the release notes:
+  https://www.wireshark.org/docs/relnotes/wireshark-1.8.0.html
+
+- drop wireshark-corosync-packet-dissector.patch, no longer compiles
+  even after updating
+- drop wireshark-1.6.5-netlogon-aes.patch, applied upstream
+- drop idl2wrs command from -devel package
+- update header files in include.filelist
+- refresh wireshark-1.2.0-disable-warning-dialog.patch
+- refresh wireshark-1.2.0-geoip.patch
+- add wireshark-1.8.0-gmodule.patch to fix linking in factory
+
 -------------------------------------------------------------------
 Sun Jun 03 19:29:50 UTC 2012 - opensuse@sukimashita.com
 

wireshark.spec

@@ -20,7 +20,7 @@
 %define use_caps 0
 
 Name:           wireshark
-Version:        1.6.8
+Version:        1.8.0
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0+
@@ -32,11 +32,10 @@ Source1:        include.filelist
 Patch1:         %{name}-1.2.0-disable-warning-dialog.patch
 # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak@suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders
 Patch2:         %{name}-1.2.0-geoip.patch
-# PATCH-FEATURE-UPSTREAM wireshark-corosync-packet-dissector.patch tserong@novell.com -- add corosync packet dissector
-Patch3:         %{name}-corosync-packet-dissector.patch
 # PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434
 Patch4:         %{name}-1.2.4-enable_lua.patch
-Patch5:         %{name}-1.6.5-netlogon-aes.patch
+# PATCH-FIX-OPENSUSE wireshark-1.8.0-gmodule.patch andreas.stieger@gmx.de -- fix "undefined reference to symbol 'g_module_name'" when linking
+Patch5:         wireshark-1.8.0-gmodule.patch
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
@@ -95,9 +94,8 @@ view the reconstructed stream of a TCP session.
 %prep
 %setup -q
 %patch2
-%patch3
 %patch4
-%patch5 -p1
+%patch5
 
 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop
 # run as root on 11.3 and older - bnc#349782
@@ -179,7 +177,5 @@ getent group wireshark >/dev/null || groupadd wireshark
 %dir %{_includedir}/wireshark/wsutil
 %{_includedir}/wireshark/*
 %{_libdir}/*.so
-%{_bindir}/idl2wrs
-%{_mandir}/man1/idl2wrs*
 
 %changelog