From a5573afff926867cdf21811f4c06ee4964772368050aec61429e9ca2e23c41c5 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 5 Jun 2013 21:48:12 +0000 Subject: [PATCH] Accepting request 177834 from home:AndreasStieger:branches:network:utilities 1.10.0 OBS-URL: https://build.opensuse.org/request/show/177834 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=89 --- SIGNATURES-1.10.0.txt | 44 +++ SIGNATURES-1.8.7.txt | 54 --- include.filelist | 612 ------------------------------ wireshark-1.10.0-enable_lua.patch | 24 ++ wireshark-1.10.0.tar.bz2 | 3 + wireshark-1.2.4-enable_lua.patch | 13 - wireshark-1.8.7.tar.bz2 | 3 - wireshark-suidflags.patch | 14 - wireshark.changes | 59 +++ wireshark.spec | 56 +-- 10 files changed, 159 insertions(+), 723 deletions(-) create mode 100644 SIGNATURES-1.10.0.txt delete mode 100644 SIGNATURES-1.8.7.txt delete mode 100644 include.filelist create mode 100644 wireshark-1.10.0-enable_lua.patch create mode 100644 wireshark-1.10.0.tar.bz2 delete mode 100644 wireshark-1.2.4-enable_lua.patch delete mode 100644 wireshark-1.8.7.tar.bz2 delete mode 100644 wireshark-suidflags.patch diff --git a/SIGNATURES-1.10.0.txt b/SIGNATURES-1.10.0.txt new file mode 100644 index 0000000..38a5da1 --- /dev/null +++ b/SIGNATURES-1.10.0.txt @@ -0,0 +1,44 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +wireshark-1.10.0.tar.bz2: 27101631 bytes +MD5(wireshark-1.10.0.tar.bz2)=72e51cd33fd33c7044a41c2ab51ad7af +SHA1(wireshark-1.10.0.tar.bz2)=c78a5d5e589edc8ebc702eb00a284ccbca7721bc +RIPEMD160(wireshark-1.10.0.tar.bz2)=924e8d94275c1512b9624d009d69fefa8626b5b2 + +Wireshark-win32-1.10.0.exe: 22238848 bytes +MD5(Wireshark-win32-1.10.0.exe)=32c76e130a7c0746e738bd56f07da3ba +SHA1(Wireshark-win32-1.10.0.exe)=f6fad836afe9f44e451773ce617a56165646c202 +RIPEMD160(Wireshark-win32-1.10.0.exe)=15887841d1084e2cfc26706a048355bae737fdb8 + +Wireshark-win64-1.10.0.exe: 28087416 bytes +MD5(Wireshark-win64-1.10.0.exe)=7a053d1ef8a133429802f705d574cb58 +SHA1(Wireshark-win64-1.10.0.exe)=344192f708ced148705536b49f45a2f325cac814 +RIPEMD160(Wireshark-win64-1.10.0.exe)=64ed5c9a91363328ef15d4b101f2b4987e575bcc + +Wireshark-1.10.0.u3p: 30772650 bytes +MD5(Wireshark-1.10.0.u3p)=973cb0abe4a5c3409be5aa623704f4f0 +SHA1(Wireshark-1.10.0.u3p)=7b00ba6ee13e528cd65c716a0fb4f27d7c909f3a +RIPEMD160(Wireshark-1.10.0.u3p)=76f46ed49fe908ac12e24bd1573c8b2c2fa41b19 + +WiresharkPortable-1.10.0.paf.exe: 23594648 bytes +MD5(WiresharkPortable-1.10.0.paf.exe)=3a2bb29ad8c87366d1bcd210b69941d1 +SHA1(WiresharkPortable-1.10.0.paf.exe)=411ebf3c448e7ae79c8de694b2089a8e644c89f3 +RIPEMD160(WiresharkPortable-1.10.0.paf.exe)=03e18603bd42c9f0d416162f42f20e0b92b7b49f + +Wireshark 1.10.0 Intel 64.dmg: 23905721 bytes +MD5(Wireshark 1.10.0 Intel 64.dmg)=b49214148e57551a3b6d94eb02d0ee14 +SHA1(Wireshark 1.10.0 Intel 64.dmg)=4e7a94ff56f418ca6e25439196efb9f4671687a2 +RIPEMD160(Wireshark 1.10.0 Intel 64.dmg)=858db55d405d5bffc2ce8647393d173dd0b4c88e + +Wireshark 1.10.0 Intel 32.dmg: 21857711 bytes +MD5(Wireshark 1.10.0 Intel 32.dmg)=5926c5018617d5d01127b873f7fddb62 +SHA1(Wireshark 1.10.0 Intel 32.dmg)=540abecf355e1b35b1b713ed37da4c5d47155b3e +RIPEMD160(Wireshark 1.10.0 Intel 32.dmg)=15b43fd47ce8d4b35349106d10e58d59ab574ebe +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (Darwin) + +iEYEARECAAYFAlGvhkwACgkQpw8IXSHylJqhogCgqk24EpieK9oFxOgUb3cqawfj +8zAAoKrbxy5ywMzMo5qLorwz0V5sbPE3 +=sYV8 +-----END PGP SIGNATURE----- diff --git a/SIGNATURES-1.8.7.txt b/SIGNATURES-1.8.7.txt deleted file mode 100644 index 7ce04c5..0000000 --- a/SIGNATURES-1.8.7.txt +++ /dev/null @@ -1,54 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -wireshark-1.8.7.tar.bz2: 24273700 bytes -MD5(wireshark-1.8.7.tar.bz2)=f4198728a20aa40752906031e08544f8 -SHA1(wireshark-1.8.7.tar.bz2)=c131ce10555e608e691aa36190c8d5a1b271c955 -RIPEMD160(wireshark-1.8.7.tar.bz2)=c9a2b59441a517e4943a2b7e3e994694125b1759 - -Wireshark-win32-1.8.7.exe: 20868704 bytes -MD5(Wireshark-win32-1.8.7.exe)=7aee0d82ed4efa3e709aa9e42a86c34c -SHA1(Wireshark-win32-1.8.7.exe)=95f42bfaee23351b504aca3fa57e29c0c2cd3227 -RIPEMD160(Wireshark-win32-1.8.7.exe)=a95e303f9176d754d86a8f8198a801cba5c3e04f - -Wireshark-win64-1.8.7.exe: 26549232 bytes -MD5(Wireshark-win64-1.8.7.exe)=a832cae3e9d0e312c3c1241a970f1080 -SHA1(Wireshark-win64-1.8.7.exe)=845da671608323ca3154c03e47365e26fce80d69 -RIPEMD160(Wireshark-win64-1.8.7.exe)=696f0c8090bcb22e7c2c641925db7b6958ce5df1 - -Wireshark-1.8.7.u3p: 28621210 bytes -MD5(Wireshark-1.8.7.u3p)=e38ae665e9a6799961c75e1c794b0241 -SHA1(Wireshark-1.8.7.u3p)=5feb3b235ffe38315b94bd1de1fd269249737853 -RIPEMD160(Wireshark-1.8.7.u3p)=162f88f661a31fd1902ece049b6d8a4937dd18f7 - -WiresharkPortable-1.8.7.paf.exe: 22051216 bytes -MD5(WiresharkPortable-1.8.7.paf.exe)=5f7624d355520650b1d61f86552ef06c -SHA1(WiresharkPortable-1.8.7.paf.exe)=7fbba81263fb957f37a8694ab36f39aa2d0dda7c -RIPEMD160(WiresharkPortable-1.8.7.paf.exe)=f1ee0f1aff528a88aad79024df371560a593f963 - -Wireshark 1.8.7 PPC 32.dmg: 22938629 bytes -MD5(Wireshark 1.8.7 PPC 32.dmg)=2df64ff6c884f8c9aa036be0ac850dc4 -SHA1(Wireshark 1.8.7 PPC 32.dmg)=fac403ed5616d4f3736dc26ad6b46b43d92eeca5 -RIPEMD160(Wireshark 1.8.7 PPC 32.dmg)=a3a2de3aeac6bfce17f95ed1bc803277cab504b5 - -Wireshark 1.8.7 Intel 64.dmg: 21653924 bytes -MD5(Wireshark 1.8.7 Intel 64.dmg)=8615eade01f43e6229d83a3148bd5566 -SHA1(Wireshark 1.8.7 Intel 64.dmg)=3816f7a1d9fdea109a02c49d559f804516ebab6d -RIPEMD160(Wireshark 1.8.7 Intel 64.dmg)=847401b192639fd9ae85c4f2fe33cf6fc25df077 - -Wireshark 1.8.7 Intel 32.dmg: 19734453 bytes -MD5(Wireshark 1.8.7 Intel 32.dmg)=4c5e9c6ae11d0db53cb101acf06fe96f -SHA1(Wireshark 1.8.7 Intel 32.dmg)=5aaf4924318705e041041f2af4145966b63f4baf -RIPEMD160(Wireshark 1.8.7 Intel 32.dmg)=e324792142ea8a76f6f949b3fbe998dba7290c84 - -patch-wireshark-1.8.6-to-1.8.7.diff.bz2: 238913 bytes -MD5(patch-wireshark-1.8.6-to-1.8.7.diff.bz2)=898cc367b1ca964d13d5add01abd7dc3 -SHA1(patch-wireshark-1.8.6-to-1.8.7.diff.bz2)=44668ceb45fc4953d9f782c61abcd67bd75cb8d1 -RIPEMD160(patch-wireshark-1.8.6-to-1.8.7.diff.bz2)=43047d437df36cefce63d295fbbde1973d4867f7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (Darwin) - -iEYEARECAAYFAlGWkAQACgkQpw8IXSHylJo+gQCgiLc/mfvg7xrsMJ3kEauFEc6/ -uNEAoJz+W0IDVOfXTeHrOTq/WRKiw6vD -=334H ------END PGP SIGNATURE----- diff --git a/include.filelist b/include.filelist deleted file mode 100644 index 4e5057f..0000000 --- a/include.filelist +++ /dev/null @@ -1,612 +0,0 @@ -color.h -config.h -register.h -epan/addr_and_mask.h -epan/address.h -epan/addr_resolv.h -epan/adler32.h -epan/afn.h -epan/aftypes.h -epan/arcnet_pids.h -epan/arptypes.h -epan/asm_utils.h -epan/asn1.h -epan/atalk-utils.h -epan/base64.h -epan/bitswap.h -epan/bridged_pids.h -epan/camel-persistentdata.h -epan/charsets.h -epan/chdlctypes.h -epan/circuit.h -epan/codecs.h -epan/column.h -epan/column_info.h -epan/column-utils.h -epan/conversation.h -epan/conv_id.h -epan/crc16-tvb.h -epan/crc32-tvb.h -epan/crc8-tvb.h -epan/crypt/aes.h -epan/crypt/airpdcap_debug.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/des.h -epan/crypt/eax.h -epan/crypt/md4.h -epan/crypt/md5.h -epan/crypt/rc4.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/dfunctions.h -epan/dfilter/dfvm.h -epan/dfilter/drange.h -epan/dfilter/gencode.h -epan/dfilter/grammar.h -epan/dfilter/scanner_lex.h -epan/dfilter/semcheck.h -epan/dfilter/sttype-function.h -epan/dfilter/sttype-range.h -epan/dfilter/sttype-test.h -epan/dfilter/syntax-tree.h -epan/diam_dict.h -epan/diam_dict_lex.h -epan/dissector_filters.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-aim.h -epan/dissectors/packet-alcap.h -epan/dissectors/packet-ansi_a.h -epan/dissectors/packet-ansi_map.h -epan/dissectors/packet-ansi_tcap.h -epan/dissectors/packet-ap1394.h -epan/dissectors/packet-arcnet.h -epan/dissectors/packet-arp.h -epan/dissectors/packet-atalk.h -epan/dissectors/packet-atm.h -epan/dissectors/packet-bacapp.h -epan/dissectors/packet-ber.h -epan/dissectors/packet-bfd.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-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 -epan/dissectors/packet-data.h -epan/dissectors/packet-dcc.h -epan/dissectors/packet-dccp.h -epan/dissectors/packet-dcerpc-atsvc.h -epan/dissectors/packet-dcerpc-browser.h -epan/dissectors/packet-dcerpc-budb.h -epan/dissectors/packet-dcerpc-butc.h -epan/dissectors/packet-dcerpc-dce122.h -epan/dissectors/packet-dcerpc-dcom.h -epan/dissectors/packet-dcerpc-dfs.h -epan/dissectors/packet-dcerpc-dnsserver.h -epan/dissectors/packet-dcerpc-drsuapi.h -epan/dissectors/packet-dcerpc-dssetup.h -epan/dissectors/packet-dcerpc-efs.h -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 -epan/dissectors/packet-dcerpc-pnp.h -epan/dissectors/packet-dcerpc-rfr.h -epan/dissectors/packet-dcerpc-rras.h -epan/dissectors/packet-dcerpc-samr.h -epan/dissectors/packet-dcerpc-spoolss.h -epan/dissectors/packet-dcerpc-srvsvc.h -epan/dissectors/packet-dcerpc-svcctl.h -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-dcm.h -epan/dissectors/packet-dcom-dispatch.h -epan/dissectors/packet-dcom.h -epan/dissectors/packet-ddtp.h -epan/dissectors/packet-diameter.h -epan/dissectors/packet-diffserv-mpls-common.h -epan/dissectors/packet-dis-enums.h -epan/dissectors/packet-dis-fields.h -epan/dissectors/packet-dis-pdus.h -epan/dissectors/packet-disp.h -epan/dissectors/packet-dns.h -epan/dissectors/packet-dop.h -epan/dissectors/packet-dsp.h -epan/dissectors/packet-dtn.h -epan/dissectors/packet-dvmrp.h -epan/dissectors/packet-e164.h -epan/dissectors/packet-e212.h -epan/dissectors/packet-edonkey.h -epan/dissectors/packet-enc.h -epan/dissectors/packet-enip.h -epan/dissectors/packet-epmd.h -epan/dissectors/packet-esis.h -epan/dissectors/packet-ess.h -epan/dissectors/packet-eth.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 -epan/dissectors/packet-fcswils.h -epan/dissectors/packet-fddi.h -epan/dissectors/packet-ff.h -epan/dissectors/packet-fix.h -epan/dissectors/packet-fmp.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 -epan/dissectors/packet-gre.h -epan/dissectors/packet-gsm_a_common.h -epan/dissectors/packet-gsm_map.h -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 -epan/dissectors/packet-h245.h -epan/dissectors/packet-h248.h -epan/dissectors/packet-h263.h -epan/dissectors/packet-h264.h -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 -epan/dissectors/packet-iax2.h -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 -epan/dissectors/packet-ieee802a.h -epan/dissectors/packet-igap.h -epan/dissectors/packet-igmp.h -epan/dissectors/packet-imf.h -epan/dissectors/packet-inap.h -epan/dissectors/packet-infiniband.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-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-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 -epan/dissectors/packet-msnip.h -epan/dissectors/packet-msrp.h -epan/dissectors/packet-mstp.h -epan/dissectors/packet-mtp3.h -epan/dissectors/packet-ncp-int.h -epan/dissectors/packet-ncp-nmas.h -epan/dissectors/packet-ncp-sss.h -epan/dissectors/packet-ndmp.h -epan/dissectors/packet-ndps.h -epan/dissectors/packet-netbios.h -epan/dissectors/packet-nfs.h -epan/dissectors/packet-nhrp.h -epan/dissectors/packet-nisplus.h -epan/dissectors/packet-nlm.h -epan/dissectors/packet-ntlmssp.h -epan/dissectors/packet-ntp.h -epan/dissectors/packet-null.h -epan/dissectors/packet-ocsp.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-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-pim.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 -epan/dissectors/packet-pkixac.h -epan/dissectors/packet-pkixproxy.h -epan/dissectors/packet-pkixqualified.h -epan/dissectors/packet-pkixtsp.h -epan/dissectors/packet-pktc.h -epan/dissectors/packet-portmap.h -epan/dissectors/packet-ppi-geolocation-common.h -epan/dissectors/packet-ppi.h -epan/dissectors/packet-ppp.h -epan/dissectors/packet-pres.h -epan/dissectors/packet-pw-atm.h -epan/dissectors/packet-pw-common.h -epan/dissectors/packet-q708.h -epan/dissectors/packet-q931.h -epan/dissectors/packet-q932.h -epan/dissectors/packet-qsig.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.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 -epan/dissectors/packet-rrc.h -epan/dissectors/packet-rsvp.h -epan/dissectors/packet-rtcp.h -epan/dissectors/packet-rtp-events.h -epan/dissectors/packet-rtp.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-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-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.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 -epan/dissectors/packet-tcap.h -epan/dissectors/packet-tcp.h -epan/dissectors/packet-tetra.h -epan/dissectors/packet-tn3270.h -epan/dissectors/packet-tn5250.h -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.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 -epan/dissectors/packet-windows-common.h -epan/dissectors/packet-wlancertextn.h -epan/dissectors/packet-wps.h -epan/dissectors/packet-wsp.h -epan/dissectors/packet-wtls.h -epan/dissectors/packet-wtp.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-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 -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_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_dissect.h -epan/epan.h -epan/etypes.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.h -epan/ftypes/ftypes-int.h -epan/funnel.h -epan/garrayfix.h -epan/gcp.h -epan/geoip_db.h -epan/golay.h -epan/greproto.h -epan/guid-utils.h -epan/h225-persistentdata.h -epan/iana_snap_pid.h -epan/iax2_codec_type.h -epan/in_cksum.h -epan/ip_opts.h -epan/ipproto.h -epan/ipv4.h -epan/ipv6-utils.h -epan/lapd_sapi.h -epan/llcsaps.h -epan/next_tvb.h -epan/nlpid.h -epan/nstime.h -epan/oids.h -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.h -epan/prefs-int.h -epan/proto.h -epan/ptvcursor.h -epan/radius_dict_lex.h -epan/range.h -epan/reassemble.h -epan/reedsolomon.h -epan/report_err.h -epan/req_resp_hdrs.h -epan/rtp_pt.h -epan/sctpppids.h -epan/sigcomp_state_hdlr.h -epan/sigcomp-udvm.h -epan/slab.h -epan/sminmpec.h -epan/sna-utils.h -epan/stat_cmd_args.h -epan/stats_tree.h -epan/stats_tree_priv.h -epan/stream.h -epan/strutil.h -epan/t35.h -epan/tap.h -epan/tap-voip.h -epan/tcap-persistentdata.h -epan/tfs.h -epan/time_fmt.h -epan/timestamp.h -epan/to_str.h -epan/tvbparse.h -epan/tvbuff.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 -wiretap/ascend_scanner_lex.h -wiretap/ascendtext.h -wiretap/atm.h -wiretap/ber.h -wiretap/btsnoop.h -wiretap/buffer.h -wiretap/catapult_dct2000.h -wiretap/commview.h -wiretap/cosine.h -wiretap/csids.h -wiretap/daintree-sna.h -wiretap/dbs-etherwatch.h -wiretap/dct3trace.h -wiretap/erf.h -wiretap/etherpeek.h -wiretap/eyesdn.h -wiretap/file_wrappers.h -wiretap/hcidump.h -wiretap/i4b_trace.h -wiretap/i4btrace.h -wiretap/ipfix.h -wiretap/iptrace.h -wiretap/iseries.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 -wiretap/netscreen.h -wiretap/nettl.h -wiretap/network_instruments.h -wiretap/netxray.h -wiretap/ngsniffer.h -wiretap/packetlogger.h -wiretap/pcap-common.h -wiretap/pcap-encap.h -wiretap/pcapng.h -wiretap/pppdump.h -wiretap/radcom.h -wiretap/snoop.h -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 -wsutil/mpeg-audio.h -wsutil/privileges.h -wsutil/strptime.h -wsutil/str_util.h -wsutil/type_util.h -wsutil/unicode-utils.h -wsutil/wsgetopt.h -wsutil/wsgetopt_int.h diff --git a/wireshark-1.10.0-enable_lua.patch b/wireshark-1.10.0-enable_lua.patch new file mode 100644 index 0000000..4fb5c59 --- /dev/null +++ b/wireshark-1.10.0-enable_lua.patch @@ -0,0 +1,24 @@ +From: prusnak@opensuse.org +References: [bnc#650434] +Upstream: never + +- fix lua error at startup (enable_lua.patch) [bnc#650434] +previously named wireshark-1.2.4-enable_lua.patch + +--- + epan/wslua/template-init.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: wireshark-1.10.0rc2/epan/wslua/template-init.lua +=================================================================== +--- wireshark-1.10.0rc2.orig/epan/wslua/template-init.lua 2013-04-22 19:04:37.000000000 +0100 ++++ wireshark-1.10.0rc2/epan/wslua/template-init.lua 2013-05-26 17:43:20.000000000 +0100 +@@ -43,7 +43,7 @@ if running_superuser then + local disabled_lib = {} + setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } ); + +- dofile = function() error("dofile " .. hint) end ++-- dofile = function() error("dofile " .. hint) end + loadfile = function() error("loadfile " .. hint) end + loadlib = function() error("loadlib " .. hint) end + require = function() error("require " .. hint) end diff --git a/wireshark-1.10.0.tar.bz2 b/wireshark-1.10.0.tar.bz2 new file mode 100644 index 0000000..6242fc2 --- /dev/null +++ b/wireshark-1.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add +size 27101631 diff --git a/wireshark-1.2.4-enable_lua.patch b/wireshark-1.2.4-enable_lua.patch deleted file mode 100644 index b438830..0000000 --- a/wireshark-1.2.4-enable_lua.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: epan/wslua/template-init.lua -=================================================================== ---- epan/wslua/template-init.lua -+++ epan/wslua/template-init.lua -@@ -42,7 +42,7 @@ if running_superuser then - local disabled_lib = {} - setmetatable(disabled_lib,{ __index = function() error("this package has been disabled") end } ); - -- dofile = function() error("dofile has been disabled") end -+-- dofile = function() error("dofile has been disabled") end - loadfile = function() error("loadfile has been disabled") end - loadlib = function() error("loadlib has been disabled") end - require = function() error("require has been disabled") end diff --git a/wireshark-1.8.7.tar.bz2 b/wireshark-1.8.7.tar.bz2 deleted file mode 100644 index f4c9f16..0000000 --- a/wireshark-1.8.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842 -size 24273700 diff --git a/wireshark-suidflags.patch b/wireshark-suidflags.patch deleted file mode 100644 index 1c2b6dd..0000000 --- a/wireshark-suidflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: wireshark-1.8.4/Makefile.am -=================================================================== ---- wireshark-1.8.4.orig/Makefile.am -+++ wireshark-1.8.4/Makefile.am -@@ -487,7 +487,8 @@ dumpcap_LDADD = \ - @NSL_LIBS@ \ - @CORESERVICES_FRAMEWORKS@ \ - @LIBCAP_LIBS@ --dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) -+dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(SUID_CFLAGS) -+dumpcap_LDFLAGS = $(SUID_LDFLAGS) - - # Common headers - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \ diff --git a/wireshark.changes b/wireshark.changes index 7003586..af0220b 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Wed Jun 5 21:08:57 UTC 2013 - andreas.stieger@gmx.de + +- 1.10.0 +- new or significantly updated features since version 1.8: + * You can now display a list of resolved host names in "hosts" + format within Wireshark. + * The wireless toolbar has been updated. + * Wireshark on Linux does a better job of detecting interface + addition and removal. + * It is now possible to compare two fields in a display filter + (for example: udp.srcport != udp.dstport). The two fields must + be of the same type for this to work. + * USB type and product name support has been improved. + * All Bluetooth profiles and protocols are now supported. + * Wireshark now calculates HTTP response times and presents the + result in a new field in the HTTP response. Links from the + request’s frame to the response’s frame and vice-versa are + also added. + * The main welcome screen and status bar now display file sizes + using strict SI prefixes instead of old-style binary prefixes. + * Capinfos now prints human-readable statistics with SI suffixes + by default. + * It is now possible to open a referenced packet (such as the + matched request or response packet) in a new window. + * Tshark can now display only the hex/ascii packet data without + requiring that the packet summary and/or packet details are also + displayed. If you want the old behavior, use -Px instead of + just -x. + * Wireshark can be compiled using GTK+ 3. + * The Wireshark application icon, capture toolbar icons, and other + icons have been updated. + * Tshark’s filtering and multi-pass analysis have been reworked + for consistency and in order to support dependent frame + calculations during reassembly. See the man page descriptions + for -2, -R, and -Y. + * Tshark’s -G fields2 and -G fields3 options have been eliminated. + The -G fields option now includes the 2 extra fields that + -G fields3 previously provided, and the blurb information has been + relegated to the last column since in many cases it is blank + anyway. + * Wireshark dropped the left-handed settings from the preferences. + This is still configurable via the GTK settings (add + "gtk-scrolled-window-placement = top-right" in the config file, + which might be called /.gtkrc-2.0 or /.config/gtk-3.0/settings.ini). + * Wireshark now ships with two global configuration files: Bluetooth, + which contains coloring rules for Bluetooth and Classic, which + contains the old-style coloring rules. + * The LOAD() metric in the IO-graph now shows the load in IO + units instead of thousands of IO units. +- packaging changes + * drop wireshark-suidflags.patch + -fPIE and -pie now set on SUID binaries by upstream + no longer require or call call autoreconf + * wireshark-1.2.4-enable_lua.patch refreshed with upstream changes + to wireshark-1.10.0-enable_lua.patch + * drop include.filelist, instead find files for -devel package + during build + ------------------------------------------------------------------- Thu May 23 19:37:57 UTC 2013 - andreas.stieger@gmx.de diff --git a/wireshark.spec b/wireshark.spec index 31c3285..854e797 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -20,25 +20,21 @@ %define use_caps 0 Name: wireshark -Version: 1.8.7 +Version: 1.10.0 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ and GPL-3.0+ Group: Productivity/Networking/Diagnostic Url: https://www.wireshark.org/ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 -Source1: include.filelist Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt # https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg Source3: wireshark.keyring # PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root -Patch1: %{name}-1.2.0-disable-warning-dialog.patch +Patch1: wireshark-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-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434 -Patch4: %{name}-1.2.4-enable_lua.patch -# PATCH-FEATURE-UPSTREAM wireshark-suidflags.patch -- Allow to specify sep. flags for SUID binaries. -Patch5: wireshark-suidflags.patch +Patch2: wireshark-1.2.0-geoip.patch +Patch4: wireshark-1.10.0-enable_lua.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -54,8 +50,6 @@ BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel BuildRequires: libpcap-devel BuildRequires: libsmi-devel -# Needed for patch5 -BuildRequires: libtool # required for Lua support in openSUSE 12.2 and later [bnc#780669] %if 0%{?suse_version} >= 1220 BuildRequires: lua51-devel @@ -119,8 +113,7 @@ echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep SHA1 | head -n1 | cut -d= - %setup -q %patch2 -%patch4 -%patch5 -p1 +%patch4 -p1 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 @@ -130,10 +123,6 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark %endif %build -# Needed for patch5 -autoreconf -fiv -export SUID_CFLAGS="-fPIE" -export SUID_LDFLAGS="-pie" # zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2 %configure \ @@ -159,10 +148,28 @@ ln -fs tshark %{buildroot}%{_bindir}/tethereal install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ # install -m 0644 *.1 %%{buildroot}%%{_mandir}/man1/ + +# -devel install -d -m 0755 %{buildroot}%{_includedir}/wireshark -for i in `cat %{SOURCE1}`; do - install -D -m 644 $i %{buildroot}%{_includedir}/wireshark/$i -done +IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark" +mkdir -p "${IDIR}/epan" +mkdir -p "${IDIR}/epan/crypt" +mkdir -p "${IDIR}/epan/ftypes" +mkdir -p "${IDIR}/epan/dfilter" +mkdir -p "${IDIR}/epan/dissectors" +mkdir -p "${IDIR}/wiretap" +mkdir -p "${IDIR}/wsutil" +install -m 644 color.h config.h register.h "${IDIR}/" +install -m 644 cfile.h file.h "${IDIR}/" +install -m 644 packet-range.h print.h "${IDIR}/" +install -m 644 epan/*.h "${IDIR}/epan/" +install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" +install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" +install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" +install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" +install -m 644 wiretap/*.h "${IDIR}/wiretap" +install -m 644 wsutil/*.h "${IDIR}/wsutil" + install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop %if 0%{?suse_version} @@ -195,6 +202,7 @@ getent group wireshark >/dev/null || groupadd wireshark %{_bindir}/editcap %{_bindir}/tshark %{_bindir}/mergecap +%{_bindir}/reordercap %{_bindir}/text2pcap %{_bindir}/dftest %{_bindir}/capinfos @@ -212,13 +220,7 @@ getent group wireshark >/dev/null || groupadd wireshark %files devel %defattr(-,root,root) %doc doc/README.* -%dir %{_includedir}/wireshark -%dir %{_includedir}/wireshark/epan -%dir %{_includedir}/wireshark/epan/dfilter -%dir %{_includedir}/wireshark/epan/dissectors -%dir %{_includedir}/wireshark/wiretap -%dir %{_includedir}/wireshark/wsutil -%{_includedir}/wireshark/* -%{_libdir}/*.so +%{_includedir}/wireshark +%{_libdir}/lib*.so %changelog