Development May 2019

development@lists.ipfire.org

15 participants
54 discussions

[PATCH] suricata: Limit to a maximum of "16" netfilter queues.
by Stefan Schantl 20 May '19

20 May '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/initscripts/system/suricata | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 38b6a40d8..5a567f2d7 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -6,7 +6,7 @@ # # Author : Stefan Schantl <stefan.schantl(a)ipfire.org> # -# Version : 01.01 +# Version : 01.02 # # Notes : # @@ -50,7 +50,13 @@ function get_cpu_count { [ "$line" ] && [ -z "${line%processor*}" ] && ((CPUCOUNT++)) done </proc/cpuinfo - echo $CPUCOUNT + # Limit to a maximum of 16 cores, because suricata does not support more than + # 16 netfilter queues at the moment. + if [ $CPUCOUNT -gt "16" ]; then + echo "16" + else + echo $CPUCOUNT + fi } # Function to flush the firewall chains. -- 2.20.1

2 1

[PATCH] tshark: New addon
by Erik Kapfer 20 May '19

20 May '19

- New group and user 'tshark' has been added to give the possiblity to run it without root privileges --> https://blog.wireshark.org/2010/02/running-wireshark-as-you/ . Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> --- config/rootfiles/packages/tshark | 1000 ++++++++++++++++++++++++++++++++++++ lfs/tshark | 89 ++++ make.sh | 1 + src/paks/tshark/install.sh | 46 ++ src/paks/tshark/nginx/install.sh | 32 ++ src/paks/tshark/nginx/uninstall.sh | 30 ++ src/paks/tshark/nginx/update.sh | 26 + src/paks/tshark/uninstall.sh | 27 + src/paks/tshark/update.sh | 26 + 9 files changed, 1277 insertions(+) create mode 100644 config/rootfiles/packages/tshark create mode 100644 lfs/tshark create mode 100644 src/paks/tshark/install.sh create mode 100644 src/paks/tshark/nginx/install.sh create mode 100644 src/paks/tshark/nginx/uninstall.sh create mode 100644 src/paks/tshark/nginx/update.sh create mode 100644 src/paks/tshark/uninstall.sh create mode 100644 src/paks/tshark/update.sh diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark new file mode 100644 index 000000000..fde4030a4 --- /dev/null +++ b/config/rootfiles/packages/tshark @@ -0,0 +1,1000 @@ +#usr/bin/capinfos +#usr/bin/captype +usr/bin/dumpcap +#usr/bin/editcap +#usr/bin/idl2wrs +#usr/bin/mergecap +#usr/bin/randpkt +#usr/bin/rawshark +#usr/bin/reordercap +#usr/bin/sharkd +#usr/bin/text2pcap +usr/bin/tshark +#usr/include/wireshark +#usr/include/wireshark/cfile.h +#usr/include/wireshark/cli_main.h +#usr/include/wireshark/codecs +#usr/include/wireshark/codecs/codecs.h +#usr/include/wireshark/epan +#usr/include/wireshark/epan/addr_and_mask.h +#usr/include/wireshark/epan/addr_resolv.h +#usr/include/wireshark/epan/address.h +#usr/include/wireshark/epan/address_types.h +#usr/include/wireshark/epan/afn.h +#usr/include/wireshark/epan/aftypes.h +#usr/include/wireshark/epan/app_mem_usage.h +#usr/include/wireshark/epan/arcnet_pids.h +#usr/include/wireshark/epan/arptypes.h +#usr/include/wireshark/epan/asn1.h +#usr/include/wireshark/epan/ax25_pids.h +#usr/include/wireshark/epan/bridged_pids.h +#usr/include/wireshark/epan/capture_dissectors.h +#usr/include/wireshark/epan/charsets.h +#usr/include/wireshark/epan/chdlctypes.h +#usr/include/wireshark/epan/color_filters.h +#usr/include/wireshark/epan/column-info.h +#usr/include/wireshark/epan/column-utils.h +#usr/include/wireshark/epan/column.h +#usr/include/wireshark/epan/conv_id.h +#usr/include/wireshark/epan/conversation.h +#usr/include/wireshark/epan/conversation_debug.h +#usr/include/wireshark/epan/conversation_table.h +#usr/include/wireshark/epan/crc10-tvb.h +#usr/include/wireshark/epan/crc16-tvb.h +#usr/include/wireshark/epan/crc32-tvb.h +#usr/include/wireshark/epan/crc6-tvb.h +#usr/include/wireshark/epan/crc8-tvb.h +#usr/include/wireshark/epan/decode_as.h +#usr/include/wireshark/epan/dfilter +#usr/include/wireshark/epan/dfilter/dfilter.h +#usr/include/wireshark/epan/dfilter/drange.h +#usr/include/wireshark/epan/diam_dict.h +#usr/include/wireshark/epan/disabled_protos.h +#usr/include/wireshark/epan/dissector_filters.h +#usr/include/wireshark/epan/dissectors +#usr/include/wireshark/epan/dissectors/file-rbm.h +#usr/include/wireshark/epan/dissectors/packet-6lowpan.h +#usr/include/wireshark/epan/dissectors/packet-a21.h +#usr/include/wireshark/epan/dissectors/packet-acp133.h +#usr/include/wireshark/epan/dissectors/packet-acse.h +#usr/include/wireshark/epan/dissectors/packet-actrace.h +#usr/include/wireshark/epan/dissectors/packet-adb_service.h +#usr/include/wireshark/epan/dissectors/packet-afp.h +#usr/include/wireshark/epan/dissectors/packet-alcap.h +#usr/include/wireshark/epan/dissectors/packet-ansi_a.h +#usr/include/wireshark/epan/dissectors/packet-ansi_map.h +#usr/include/wireshark/epan/dissectors/packet-ansi_tcap.h +#usr/include/wireshark/epan/dissectors/packet-arp.h +#usr/include/wireshark/epan/dissectors/packet-atalk.h +#usr/include/wireshark/epan/dissectors/packet-atm.h +#usr/include/wireshark/epan/dissectors/packet-atn-ulcs.h +#usr/include/wireshark/epan/dissectors/packet-bacapp.h +#usr/include/wireshark/epan/dissectors/packet-bacnet.h +#usr/include/wireshark/epan/dissectors/packet-ber.h +#usr/include/wireshark/epan/dissectors/packet-bfd.h +#usr/include/wireshark/epan/dissectors/packet-bgp.h +#usr/include/wireshark/epan/dissectors/packet-bluetooth.h +#usr/include/wireshark/epan/dissectors/packet-bssap.h +#usr/include/wireshark/epan/dissectors/packet-bssgp.h +#usr/include/wireshark/epan/dissectors/packet-btatt.h +#usr/include/wireshark/epan/dissectors/packet-btavctp.h +#usr/include/wireshark/epan/dissectors/packet-btavdtp.h +#usr/include/wireshark/epan/dissectors/packet-btavrcp.h +#usr/include/wireshark/epan/dissectors/packet-bthci_acl.h +#usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h +#usr/include/wireshark/epan/dissectors/packet-bthci_evt.h +#usr/include/wireshark/epan/dissectors/packet-bthci_sco.h +#usr/include/wireshark/epan/dissectors/packet-btl2cap.h +#usr/include/wireshark/epan/dissectors/packet-btle.h +#usr/include/wireshark/epan/dissectors/packet-btrfcomm.h +#usr/include/wireshark/epan/dissectors/packet-btsdp.h +#usr/include/wireshark/epan/dissectors/packet-c1222.h +#usr/include/wireshark/epan/dissectors/packet-camel.h +#usr/include/wireshark/epan/dissectors/packet-cdt.h +#usr/include/wireshark/epan/dissectors/packet-cell_broadcast.h +#usr/include/wireshark/epan/dissectors/packet-charging_ase.h +#usr/include/wireshark/epan/dissectors/packet-chdlc.h +#usr/include/wireshark/epan/dissectors/packet-cip.h +#usr/include/wireshark/epan/dissectors/packet-cipsafety.h +#usr/include/wireshark/epan/dissectors/packet-cmip.h +#usr/include/wireshark/epan/dissectors/packet-cmp.h +#usr/include/wireshark/epan/dissectors/packet-cms.h +#usr/include/wireshark/epan/dissectors/packet-coap.h +#usr/include/wireshark/epan/dissectors/packet-credssp.h +#usr/include/wireshark/epan/dissectors/packet-crmf.h +#usr/include/wireshark/epan/dissectors/packet-csn1.h +#usr/include/wireshark/epan/dissectors/packet-dap.h +#usr/include/wireshark/epan/dissectors/packet-dcc.h +#usr/include/wireshark/epan/dissectors/packet-dccp.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-browser.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-budb.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-butc.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-dce122.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-dcom.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-nt.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-pnp.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-rras.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-samr.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-tapi.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc.h +#usr/include/wireshark/epan/dissectors/packet-dcom-dispatch.h +#usr/include/wireshark/epan/dissectors/packet-dcom.h +#usr/include/wireshark/epan/dissectors/packet-diameter.h +#usr/include/wireshark/epan/dissectors/packet-diameter_3gpp.h +#usr/include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h +#usr/include/wireshark/epan/dissectors/packet-disp.h +#usr/include/wireshark/epan/dissectors/packet-dns.h +#usr/include/wireshark/epan/dissectors/packet-docsis-tlv.h +#usr/include/wireshark/epan/dissectors/packet-dop.h +#usr/include/wireshark/epan/dissectors/packet-dsp.h +#usr/include/wireshark/epan/dissectors/packet-dtls.h +#usr/include/wireshark/epan/dissectors/packet-dtn.h +#usr/include/wireshark/epan/dissectors/packet-dvbci.h +#usr/include/wireshark/epan/dissectors/packet-e164.h +#usr/include/wireshark/epan/dissectors/packet-e212.h +#usr/include/wireshark/epan/dissectors/packet-eapol.h +#usr/include/wireshark/epan/dissectors/packet-edonkey.h +#usr/include/wireshark/epan/dissectors/packet-eigrp.h +#usr/include/wireshark/epan/dissectors/packet-enip.h +#usr/include/wireshark/epan/dissectors/packet-epl.h +#usr/include/wireshark/epan/dissectors/packet-epmd.h +#usr/include/wireshark/epan/dissectors/packet-erf.h +#usr/include/wireshark/epan/dissectors/packet-ess.h +#usr/include/wireshark/epan/dissectors/packet-eth.h +#usr/include/wireshark/epan/dissectors/packet-f5ethtrailer.h +#usr/include/wireshark/epan/dissectors/packet-fc.h +#usr/include/wireshark/epan/dissectors/packet-fcbls.h +#usr/include/wireshark/epan/dissectors/packet-fcct.h +#usr/include/wireshark/epan/dissectors/packet-fcels.h +#usr/include/wireshark/epan/dissectors/packet-fcfcs.h +#usr/include/wireshark/epan/dissectors/packet-fcfzs.h +#usr/include/wireshark/epan/dissectors/packet-fclctl.h +#usr/include/wireshark/epan/dissectors/packet-fcsb3.h +#usr/include/wireshark/epan/dissectors/packet-fcswils.h +#usr/include/wireshark/epan/dissectors/packet-ff.h +#usr/include/wireshark/epan/dissectors/packet-fix.h +#usr/include/wireshark/epan/dissectors/packet-fmp.h +#usr/include/wireshark/epan/dissectors/packet-frame.h +#usr/include/wireshark/epan/dissectors/packet-ftam.h +#usr/include/wireshark/epan/dissectors/packet-geonw.h +#usr/include/wireshark/epan/dissectors/packet-giop.h +#usr/include/wireshark/epan/dissectors/packet-gluster.h +#usr/include/wireshark/epan/dissectors/packet-gmr1_common.h +#usr/include/wireshark/epan/dissectors/packet-gmr1_rr.h +#usr/include/wireshark/epan/dissectors/packet-gprscdr.h +#usr/include/wireshark/epan/dissectors/packet-gre.h +#usr/include/wireshark/epan/dissectors/packet-gsm_a_common.h +#usr/include/wireshark/epan/dissectors/packet-gsm_a_rr.h +#usr/include/wireshark/epan/dissectors/packet-gsm_map.h +#usr/include/wireshark/epan/dissectors/packet-gsm_rlcmac.h +#usr/include/wireshark/epan/dissectors/packet-gsm_sms.h +#usr/include/wireshark/epan/dissectors/packet-gsmtap.h +#usr/include/wireshark/epan/dissectors/packet-gssapi.h +#usr/include/wireshark/epan/dissectors/packet-gtp.h +#usr/include/wireshark/epan/dissectors/packet-gtpv2.h +#usr/include/wireshark/epan/dissectors/packet-h223.h +#usr/include/wireshark/epan/dissectors/packet-h225.h +#usr/include/wireshark/epan/dissectors/packet-h235.h +#usr/include/wireshark/epan/dissectors/packet-h245.h +#usr/include/wireshark/epan/dissectors/packet-h248.h +#usr/include/wireshark/epan/dissectors/packet-h263.h +#usr/include/wireshark/epan/dissectors/packet-h264.h +#usr/include/wireshark/epan/dissectors/packet-h265.h +#usr/include/wireshark/epan/dissectors/packet-h323.h +#usr/include/wireshark/epan/dissectors/packet-h450-ros.h +#usr/include/wireshark/epan/dissectors/packet-hpext.h +#usr/include/wireshark/epan/dissectors/packet-http.h +#usr/include/wireshark/epan/dissectors/packet-http2.h +#usr/include/wireshark/epan/dissectors/packet-iana-oui.h +#usr/include/wireshark/epan/dissectors/packet-iax2.h +#usr/include/wireshark/epan/dissectors/packet-icmp.h +#usr/include/wireshark/epan/dissectors/packet-idmp.h +#usr/include/wireshark/epan/dissectors/packet-idp.h +#usr/include/wireshark/epan/dissectors/packet-ieee1609dot2.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211-radio.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211.h +#usr/include/wireshark/epan/dissectors/packet-ieee802154.h +#usr/include/wireshark/epan/dissectors/packet-ieee8023.h +#usr/include/wireshark/epan/dissectors/packet-ieee802a.h +#usr/include/wireshark/epan/dissectors/packet-igmp.h +#usr/include/wireshark/epan/dissectors/packet-imf.h +#usr/include/wireshark/epan/dissectors/packet-inap.h +#usr/include/wireshark/epan/dissectors/packet-infiniband.h +#usr/include/wireshark/epan/dissectors/packet-ip.h +#usr/include/wireshark/epan/dissectors/packet-ipmi.h +#usr/include/wireshark/epan/dissectors/packet-ipsec.h +#usr/include/wireshark/epan/dissectors/packet-ipx.h +#usr/include/wireshark/epan/dissectors/packet-isakmp.h +#usr/include/wireshark/epan/dissectors/packet-isis-clv.h +#usr/include/wireshark/epan/dissectors/packet-isis.h +#usr/include/wireshark/epan/dissectors/packet-isl.h +#usr/include/wireshark/epan/dissectors/packet-isup.h +#usr/include/wireshark/epan/dissectors/packet-its.h +#usr/include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h +#usr/include/wireshark/epan/dissectors/packet-juniper.h +#usr/include/wireshark/epan/dissectors/packet-jxta.h +#usr/include/wireshark/epan/dissectors/packet-kerberos.h +#usr/include/wireshark/epan/dissectors/packet-knxip.h +#usr/include/wireshark/epan/dissectors/packet-knxip_decrypt.h +#usr/include/wireshark/epan/dissectors/packet-l2tp.h +#usr/include/wireshark/epan/dissectors/packet-lapdm.h +#usr/include/wireshark/epan/dissectors/packet-lbm.h +#usr/include/wireshark/epan/dissectors/packet-lbtrm.h +#usr/include/wireshark/epan/dissectors/packet-lbtru.h +#usr/include/wireshark/epan/dissectors/packet-lbttcp.h +#usr/include/wireshark/epan/dissectors/packet-lcsap.h +#usr/include/wireshark/epan/dissectors/packet-ldap.h +#usr/include/wireshark/epan/dissectors/packet-ldp.h +#usr/include/wireshark/epan/dissectors/packet-link16.h +#usr/include/wireshark/epan/dissectors/packet-lisp.h +#usr/include/wireshark/epan/dissectors/packet-llc.h +#usr/include/wireshark/epan/dissectors/packet-lnet.h +#usr/include/wireshark/epan/dissectors/packet-logotypecertextn.h +#usr/include/wireshark/epan/dissectors/packet-lpp.h +#usr/include/wireshark/epan/dissectors/packet-lte-rrc.h +#usr/include/wireshark/epan/dissectors/packet-mac-lte.h +#usr/include/wireshark/epan/dissectors/packet-mausb.h +#usr/include/wireshark/epan/dissectors/packet-mbim.h +#usr/include/wireshark/epan/dissectors/packet-mbtcp.h +#usr/include/wireshark/epan/dissectors/packet-mgcp.h +#usr/include/wireshark/epan/dissectors/packet-mle.h +#usr/include/wireshark/epan/dissectors/packet-mms.h +#usr/include/wireshark/epan/dissectors/packet-mount.h +#usr/include/wireshark/epan/dissectors/packet-mp4ves.h +#usr/include/wireshark/epan/dissectors/packet-mpeg-descriptor.h +#usr/include/wireshark/epan/dissectors/packet-mpeg-sect.h +#usr/include/wireshark/epan/dissectors/packet-mpls.h +#usr/include/wireshark/epan/dissectors/packet-mq.h +#usr/include/wireshark/epan/dissectors/packet-msrp.h +#usr/include/wireshark/epan/dissectors/packet-mstp.h +#usr/include/wireshark/epan/dissectors/packet-mtp3.h +#usr/include/wireshark/epan/dissectors/packet-nbap.h +#usr/include/wireshark/epan/dissectors/packet-ncp-int.h +#usr/include/wireshark/epan/dissectors/packet-ncp-nmas.h +#usr/include/wireshark/epan/dissectors/packet-ncp-sss.h +#usr/include/wireshark/epan/dissectors/packet-ndmp.h +#usr/include/wireshark/epan/dissectors/packet-ndps.h +#usr/include/wireshark/epan/dissectors/packet-netbios.h +#usr/include/wireshark/epan/dissectors/packet-netlink.h +#usr/include/wireshark/epan/dissectors/packet-nfs.h +#usr/include/wireshark/epan/dissectors/packet-ngap.h +#usr/include/wireshark/epan/dissectors/packet-nisplus.h +#usr/include/wireshark/epan/dissectors/packet-nlm.h +#usr/include/wireshark/epan/dissectors/packet-nr-rrc.h +#usr/include/wireshark/epan/dissectors/packet-nsh.h +#usr/include/wireshark/epan/dissectors/packet-ntlmssp.h +#usr/include/wireshark/epan/dissectors/packet-ntp.h +#usr/include/wireshark/epan/dissectors/packet-nvme.h +#usr/include/wireshark/epan/dissectors/packet-ocsp.h +#usr/include/wireshark/epan/dissectors/packet-oer.h +#usr/include/wireshark/epan/dissectors/packet-opensafety.h +#usr/include/wireshark/epan/dissectors/packet-oscore.h +#usr/include/wireshark/epan/dissectors/packet-osi-options.h +#usr/include/wireshark/epan/dissectors/packet-osi.h +#usr/include/wireshark/epan/dissectors/packet-p1.h +#usr/include/wireshark/epan/dissectors/packet-p22.h +#usr/include/wireshark/epan/dissectors/packet-p7.h +#usr/include/wireshark/epan/dissectors/packet-p772.h +#usr/include/wireshark/epan/dissectors/packet-pcap_pktdata.h +#usr/include/wireshark/epan/dissectors/packet-pcnfsd.h +#usr/include/wireshark/epan/dissectors/packet-pdcp-lte.h +#usr/include/wireshark/epan/dissectors/packet-pdcp-nr.h +#usr/include/wireshark/epan/dissectors/packet-per.h +#usr/include/wireshark/epan/dissectors/packet-pkcs1.h +#usr/include/wireshark/epan/dissectors/packet-pkcs12.h +#usr/include/wireshark/epan/dissectors/packet-pkinit.h +#usr/include/wireshark/epan/dissectors/packet-pkix1explicit.h +#usr/include/wireshark/epan/dissectors/packet-pkix1implicit.h +#usr/include/wireshark/epan/dissectors/packet-pkixac.h +#usr/include/wireshark/epan/dissectors/packet-pkixproxy.h +#usr/include/wireshark/epan/dissectors/packet-pkixqualified.h +#usr/include/wireshark/epan/dissectors/packet-pkixtsp.h +#usr/include/wireshark/epan/dissectors/packet-portmap.h +#usr/include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h +#usr/include/wireshark/epan/dissectors/packet-ppp.h +#usr/include/wireshark/epan/dissectors/packet-pres.h +#usr/include/wireshark/epan/dissectors/packet-ptp.h +#usr/include/wireshark/epan/dissectors/packet-ptpip.h +#usr/include/wireshark/epan/dissectors/packet-pw-atm.h +#usr/include/wireshark/epan/dissectors/packet-pw-common.h +#usr/include/wireshark/epan/dissectors/packet-q708.h +#usr/include/wireshark/epan/dissectors/packet-q931.h +#usr/include/wireshark/epan/dissectors/packet-q932.h +#usr/include/wireshark/epan/dissectors/packet-qsig.h +#usr/include/wireshark/epan/dissectors/packet-radius.h +#usr/include/wireshark/epan/dissectors/packet-raknet.h +#usr/include/wireshark/epan/dissectors/packet-ranap.h +#usr/include/wireshark/epan/dissectors/packet-rdm.h +#usr/include/wireshark/epan/dissectors/packet-rdt.h +#usr/include/wireshark/epan/dissectors/packet-reload.h +#usr/include/wireshark/epan/dissectors/packet-rlc-lte.h +#usr/include/wireshark/epan/dissectors/packet-rlc-nr.h +#usr/include/wireshark/epan/dissectors/packet-rmi.h +#usr/include/wireshark/epan/dissectors/packet-rmt-common.h +#usr/include/wireshark/epan/dissectors/packet-rohc.h +#usr/include/wireshark/epan/dissectors/packet-ros.h +#usr/include/wireshark/epan/dissectors/packet-rpc.h +#usr/include/wireshark/epan/dissectors/packet-rpcrdma.h +#usr/include/wireshark/epan/dissectors/packet-rrc.h +#usr/include/wireshark/epan/dissectors/packet-rsvp.h +#usr/include/wireshark/epan/dissectors/packet-rtcp.h +#usr/include/wireshark/epan/dissectors/packet-rtp-events.h +#usr/include/wireshark/epan/dissectors/packet-rtp.h +#usr/include/wireshark/epan/dissectors/packet-rtps.h +#usr/include/wireshark/epan/dissectors/packet-rtse.h +#usr/include/wireshark/epan/dissectors/packet-rtsp.h +#usr/include/wireshark/epan/dissectors/packet-rx.h +#usr/include/wireshark/epan/dissectors/packet-s1ap.h +#usr/include/wireshark/epan/dissectors/packet-s5066sis.h +#usr/include/wireshark/epan/dissectors/packet-s7comm.h +#usr/include/wireshark/epan/dissectors/packet-s7comm_szl_ids.h +#usr/include/wireshark/epan/dissectors/packet-sccp.h +#usr/include/wireshark/epan/dissectors/packet-scsi-mmc.h +#usr/include/wireshark/epan/dissectors/packet-scsi-osd.h +#usr/include/wireshark/epan/dissectors/packet-scsi-sbc.h +#usr/include/wireshark/epan/dissectors/packet-scsi-smc.h +#usr/include/wireshark/epan/dissectors/packet-scsi-ssc.h +#usr/include/wireshark/epan/dissectors/packet-scsi.h +#usr/include/wireshark/epan/dissectors/packet-sctp.h +#usr/include/wireshark/epan/dissectors/packet-sdp.h +#usr/include/wireshark/epan/dissectors/packet-ses.h +#usr/include/wireshark/epan/dissectors/packet-sflow.h +#usr/include/wireshark/epan/dissectors/packet-sip.h +#usr/include/wireshark/epan/dissectors/packet-skinny.h +#usr/include/wireshark/epan/dissectors/packet-sll.h +#usr/include/wireshark/epan/dissectors/packet-smb-browse.h +#usr/include/wireshark/epan/dissectors/packet-smb-common.h +#usr/include/wireshark/epan/dissectors/packet-smb-mailslot.h +#usr/include/wireshark/epan/dissectors/packet-smb-pipe.h +#usr/include/wireshark/epan/dissectors/packet-smb-sidsnooping.h +#usr/include/wireshark/epan/dissectors/packet-smb.h +#usr/include/wireshark/epan/dissectors/packet-smb2.h +#usr/include/wireshark/epan/dissectors/packet-smpp.h +#usr/include/wireshark/epan/dissectors/packet-smrse.h +#usr/include/wireshark/epan/dissectors/packet-snmp.h +#usr/include/wireshark/epan/dissectors/packet-socketcan.h +#usr/include/wireshark/epan/dissectors/packet-spice.h +#usr/include/wireshark/epan/dissectors/packet-sprt.h +#usr/include/wireshark/epan/dissectors/packet-sscop.h +#usr/include/wireshark/epan/dissectors/packet-stat-notify.h +#usr/include/wireshark/epan/dissectors/packet-stat.h +#usr/include/wireshark/epan/dissectors/packet-sv.h +#usr/include/wireshark/epan/dissectors/packet-syslog.h +#usr/include/wireshark/epan/dissectors/packet-t124.h +#usr/include/wireshark/epan/dissectors/packet-t30.h +#usr/include/wireshark/epan/dissectors/packet-t38.h +#usr/include/wireshark/epan/dissectors/packet-tacacs.h +#usr/include/wireshark/epan/dissectors/packet-tcap.h +#usr/include/wireshark/epan/dissectors/packet-tcp.h +#usr/include/wireshark/epan/dissectors/packet-tetra.h +#usr/include/wireshark/epan/dissectors/packet-tls-utils.h +#usr/include/wireshark/epan/dissectors/packet-tls.h +#usr/include/wireshark/epan/dissectors/packet-tn3270.h +#usr/include/wireshark/epan/dissectors/packet-tn5250.h +#usr/include/wireshark/epan/dissectors/packet-tpkt.h +#usr/include/wireshark/epan/dissectors/packet-tr.h +#usr/include/wireshark/epan/dissectors/packet-tte.h +#usr/include/wireshark/epan/dissectors/packet-ua.h +#usr/include/wireshark/epan/dissectors/packet-uaudp.h +#usr/include/wireshark/epan/dissectors/packet-ubertooth.h +#usr/include/wireshark/epan/dissectors/packet-udp.h +#usr/include/wireshark/epan/dissectors/packet-umts_fp.h +#usr/include/wireshark/epan/dissectors/packet-umts_mac.h +#usr/include/wireshark/epan/dissectors/packet-umts_rlc.h +#usr/include/wireshark/epan/dissectors/packet-usb-hid.h +#usr/include/wireshark/epan/dissectors/packet-usb.h +#usr/include/wireshark/epan/dissectors/packet-usbip.h +#usr/include/wireshark/epan/dissectors/packet-vxlan.h +#usr/include/wireshark/epan/dissectors/packet-wap.h +#usr/include/wireshark/epan/dissectors/packet-wccp.h +#usr/include/wireshark/epan/dissectors/packet-windows-common.h +#usr/include/wireshark/epan/dissectors/packet-wlancertextn.h +#usr/include/wireshark/epan/dissectors/packet-wps.h +#usr/include/wireshark/epan/dissectors/packet-wsp.h +#usr/include/wireshark/epan/dissectors/packet-wtls.h +#usr/include/wireshark/epan/dissectors/packet-wtp.h +#usr/include/wireshark/epan/dissectors/packet-x11-keysymdef.h +#usr/include/wireshark/epan/dissectors/packet-x11.h +#usr/include/wireshark/epan/dissectors/packet-x2ap.h +#usr/include/wireshark/epan/dissectors/packet-x509af.h +#usr/include/wireshark/epan/dissectors/packet-x509ce.h +#usr/include/wireshark/epan/dissectors/packet-x509if.h +#usr/include/wireshark/epan/dissectors/packet-x509sat.h +#usr/include/wireshark/epan/dissectors/packet-xml.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-conference.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-core.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-gtalk.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-jingle.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-other.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-utils.h +#usr/include/wireshark/epan/dissectors/packet-xmpp.h +#usr/include/wireshark/epan/dissectors/packet-ypbind.h +#usr/include/wireshark/epan/dissectors/packet-yppasswd.h +#usr/include/wireshark/epan/dissectors/packet-ypserv.h +#usr/include/wireshark/epan/dissectors/packet-ypxfr.h +#usr/include/wireshark/epan/dissectors/packet-zbee-aps.h +#usr/include/wireshark/epan/dissectors/packet-zbee-nwk.h +#usr/include/wireshark/epan/dissectors/packet-zbee-security.h +#usr/include/wireshark/epan/dissectors/packet-zbee-zcl.h +#usr/include/wireshark/epan/dissectors/packet-zbee-zdp.h +#usr/include/wireshark/epan/dissectors/packet-zbee.h +#usr/include/wireshark/epan/dissectors/packet-ziop.h +#usr/include/wireshark/epan/dtd.h +#usr/include/wireshark/epan/dtd_parse.h +#usr/include/wireshark/epan/dvb_chartbl.h +#usr/include/wireshark/epan/eap.h +#usr/include/wireshark/epan/eapol_keydes_types.h +#usr/include/wireshark/epan/epan.h +#usr/include/wireshark/epan/epan_dissect.h +#usr/include/wireshark/epan/etypes.h +#usr/include/wireshark/epan/ex-opt.h +#usr/include/wireshark/epan/except.h +#usr/include/wireshark/epan/exceptions.h +#usr/include/wireshark/epan/expert.h +#usr/include/wireshark/epan/export_object.h +#usr/include/wireshark/epan/exported_pdu.h +#usr/include/wireshark/epan/filter_expressions.h +#usr/include/wireshark/epan/follow.h +#usr/include/wireshark/epan/frame_data.h +#usr/include/wireshark/epan/frame_data_sequence.h +#usr/include/wireshark/epan/ftypes +#usr/include/wireshark/epan/ftypes/ftypes.h +#usr/include/wireshark/epan/funnel.h +#usr/include/wireshark/epan/garrayfix.h +#usr/include/wireshark/epan/golay.h +#usr/include/wireshark/epan/guid-utils.h +#usr/include/wireshark/epan/iana_charsets.h +#usr/include/wireshark/epan/iax2_codec_type.h +#usr/include/wireshark/epan/in_cksum.h +#usr/include/wireshark/epan/ip_opts.h +#usr/include/wireshark/epan/ipproto.h +#usr/include/wireshark/epan/ipv4.h +#usr/include/wireshark/epan/ipv6.h +#usr/include/wireshark/epan/lapd_sapi.h +#usr/include/wireshark/epan/llcsaps.h +#usr/include/wireshark/epan/maxmind_db.h +#usr/include/wireshark/epan/media_params.h +#usr/include/wireshark/epan/next_tvb.h +#usr/include/wireshark/epan/nlpid.h +#usr/include/wireshark/epan/oids.h +#usr/include/wireshark/epan/osi-utils.h +#usr/include/wireshark/epan/oui.h +#usr/include/wireshark/epan/packet.h +#usr/include/wireshark/epan/packet_info.h +#usr/include/wireshark/epan/params.h +#usr/include/wireshark/epan/plugin_if.h +#usr/include/wireshark/epan/ppptypes.h +#usr/include/wireshark/epan/prefs-int.h +#usr/include/wireshark/epan/prefs.h +#usr/include/wireshark/epan/print.h +#usr/include/wireshark/epan/print_stream.h +#usr/include/wireshark/epan/proto.h +#usr/include/wireshark/epan/proto_data.h +#usr/include/wireshark/epan/ps.h +#usr/include/wireshark/epan/ptvcursor.h +#usr/include/wireshark/epan/range.h +#usr/include/wireshark/epan/reassemble.h +#usr/include/wireshark/epan/reedsolomon.h +#usr/include/wireshark/epan/register.h +#usr/include/wireshark/epan/req_resp_hdrs.h +#usr/include/wireshark/epan/rtd_table.h +#usr/include/wireshark/epan/rtp_pt.h +#usr/include/wireshark/epan/sctpppids.h +#usr/include/wireshark/epan/secrets.h +#usr/include/wireshark/epan/show_exception.h +#usr/include/wireshark/epan/slow_protocol_subtypes.h +#usr/include/wireshark/epan/sminmpec.h +#usr/include/wireshark/epan/srt_table.h +#usr/include/wireshark/epan/stat_groups.h +#usr/include/wireshark/epan/stat_tap_ui.h +#usr/include/wireshark/epan/stats_tree.h +#usr/include/wireshark/epan/stats_tree_priv.h +#usr/include/wireshark/epan/stream.h +#usr/include/wireshark/epan/strutil.h +#usr/include/wireshark/epan/t35.h +#usr/include/wireshark/epan/tap-voip.h +#usr/include/wireshark/epan/tap.h +#usr/include/wireshark/epan/tfs.h +#usr/include/wireshark/epan/time_fmt.h +#usr/include/wireshark/epan/timestamp.h +#usr/include/wireshark/epan/timestats.h +#usr/include/wireshark/epan/to_str.h +#usr/include/wireshark/epan/tvbparse.h +#usr/include/wireshark/epan/tvbuff-int.h +#usr/include/wireshark/epan/tvbuff.h +#usr/include/wireshark/epan/uat-int.h +#usr/include/wireshark/epan/uat.h +#usr/include/wireshark/epan/unit_strings.h +#usr/include/wireshark/epan/value_string.h +#usr/include/wireshark/epan/wmem +#usr/include/wireshark/epan/wmem/wmem.h +#usr/include/wireshark/epan/wmem/wmem_array.h +#usr/include/wireshark/epan/wmem/wmem_core.h +#usr/include/wireshark/epan/wmem/wmem_interval_tree.h +#usr/include/wireshark/epan/wmem/wmem_list.h +#usr/include/wireshark/epan/wmem/wmem_map.h +#usr/include/wireshark/epan/wmem/wmem_miscutl.h +#usr/include/wireshark/epan/wmem/wmem_queue.h +#usr/include/wireshark/epan/wmem/wmem_scopes.h +#usr/include/wireshark/epan/wmem/wmem_stack.h +#usr/include/wireshark/epan/wmem/wmem_strbuf.h +#usr/include/wireshark/epan/wmem/wmem_strutl.h +#usr/include/wireshark/epan/wmem/wmem_tree.h +#usr/include/wireshark/epan/wmem/wmem_user_cb.h +#usr/include/wireshark/epan/x264_prt_id.h +#usr/include/wireshark/epan/xdlc.h +#usr/include/wireshark/file.h +#usr/include/wireshark/globals.h +#usr/include/wireshark/log.h +#usr/include/wireshark/version_info.h +#usr/include/wireshark/wiretap +#usr/include/wireshark/wiretap/file_wrappers.h +#usr/include/wireshark/wiretap/merge.h +#usr/include/wireshark/wiretap/pcap-encap.h +#usr/include/wireshark/wiretap/pcapng_module.h +#usr/include/wireshark/wiretap/secrets-types.h +#usr/include/wireshark/wiretap/wtap.h +#usr/include/wireshark/wiretap/wtap_opttypes.h +#usr/include/wireshark/ws_attributes.h +#usr/include/wireshark/ws_compiler_tests.h +#usr/include/wireshark/ws_diag_control.h +#usr/include/wireshark/ws_symbol_export.h +#usr/include/wireshark/ws_version.h +#usr/include/wireshark/wsutil +#usr/include/wireshark/wsutil/adler32.h +#usr/include/wireshark/wsutil/base32.h +#usr/include/wireshark/wsutil/bits_count_ones.h +#usr/include/wireshark/wsutil/bits_ctz.h +#usr/include/wireshark/wsutil/bitswap.h +#usr/include/wireshark/wsutil/buffer.h +#usr/include/wireshark/wsutil/color.h +#usr/include/wireshark/wsutil/copyright_info.h +#usr/include/wireshark/wsutil/cpu_info.h +#usr/include/wireshark/wsutil/crash_info.h +#usr/include/wireshark/wsutil/crc10.h +#usr/include/wireshark/wsutil/crc11.h +#usr/include/wireshark/wsutil/crc16-plain.h +#usr/include/wireshark/wsutil/crc16.h +#usr/include/wireshark/wsutil/crc32.h +#usr/include/wireshark/wsutil/crc6.h +#usr/include/wireshark/wsutil/crc7.h +#usr/include/wireshark/wsutil/crc8.h +#usr/include/wireshark/wsutil/curve25519.h +#usr/include/wireshark/wsutil/eax.h +#usr/include/wireshark/wsutil/filesystem.h +#usr/include/wireshark/wsutil/frequency-utils.h +#usr/include/wireshark/wsutil/g711.h +#usr/include/wireshark/wsutil/inet_addr.h +#usr/include/wireshark/wsutil/inet_ipv4.h +#usr/include/wireshark/wsutil/inet_ipv6.h +#usr/include/wireshark/wsutil/interface.h +#usr/include/wireshark/wsutil/jsmn.h +#usr/include/wireshark/wsutil/json_dumper.h +#usr/include/wireshark/wsutil/mpeg-audio.h +#usr/include/wireshark/wsutil/netlink.h +#usr/include/wireshark/wsutil/nstime.h +#usr/include/wireshark/wsutil/os_version_info.h +#usr/include/wireshark/wsutil/pint.h +#usr/include/wireshark/wsutil/plugins.h +#usr/include/wireshark/wsutil/pow2.h +#usr/include/wireshark/wsutil/privileges.h +#usr/include/wireshark/wsutil/processes.h +#usr/include/wireshark/wsutil/report_message.h +#usr/include/wireshark/wsutil/sign_ext.h +#usr/include/wireshark/wsutil/sober128.h +#usr/include/wireshark/wsutil/socket.h +#usr/include/wireshark/wsutil/str_util.h +#usr/include/wireshark/wsutil/strnatcmp.h +#usr/include/wireshark/wsutil/strtoi.h +#usr/include/wireshark/wsutil/tempfile.h +#usr/include/wireshark/wsutil/time_util.h +#usr/include/wireshark/wsutil/type_util.h +#usr/include/wireshark/wsutil/unicode-utils.h +#usr/include/wireshark/wsutil/utf8_entities.h +#usr/include/wireshark/wsutil/ws_cpuid.h +#usr/include/wireshark/wsutil/ws_mempbrk.h +#usr/include/wireshark/wsutil/ws_mempbrk_int.h +#usr/include/wireshark/wsutil/ws_pipe.h +#usr/include/wireshark/wsutil/ws_printf.h +#usr/include/wireshark/wsutil/wsjson.h +#usr/include/wireshark/wsutil/xtea.h +#usr/lib/libwireshark.so +usr/lib/libwireshark.so.12 +usr/lib/libwireshark.so.12.0.1 +#usr/lib/libwiretap.so +usr/lib/libwiretap.so.9 +usr/lib/libwiretap.so.9.0.1 +#usr/lib/libwscodecs.so +usr/lib/libwscodecs.so.2 +usr/lib/libwscodecs.so.2.0.0 +#usr/lib/libwsutil.so +usr/lib/libwsutil.so.10 +usr/lib/libwsutil.so.10.0.0 +#usr/lib/pkgconfig/wireshark.pc +#usr/lib/wireshark +#usr/lib/wireshark/cmake +#usr/lib/wireshark/cmake/FindGLIB2.cmake +#usr/lib/wireshark/cmake/FindWSWinLibs.cmake +#usr/lib/wireshark/cmake/LocatePythonModule.cmake +#usr/lib/wireshark/cmake/UseAsn2Wrs.cmake +#usr/lib/wireshark/cmake/UseMakePluginReg.cmake +#usr/lib/wireshark/cmake/WiresharkConfig.cmake +#usr/lib/wireshark/cmake/WiresharkConfigVersion.cmake +#usr/lib/wireshark/cmake/WiresharkTargets-relwithdebinfo.cmake +#usr/lib/wireshark/cmake/WiresharkTargets.cmake +#usr/lib/wireshark/extcap +usr/lib/wireshark/extcap/androiddump +usr/lib/wireshark/extcap/dpauxmon +usr/lib/wireshark/extcap/randpktdump +usr/lib/wireshark/extcap/udpdump +#usr/lib/wireshark/plugins +#usr/lib/wireshark/plugins/3.0 +#usr/lib/wireshark/plugins/3.0/codecs +usr/lib/wireshark/plugins/3.0/codecs/l16mono.so +#usr/lib/wireshark/plugins/3.0/epan +usr/lib/wireshark/plugins/3.0/epan/ethercat.so +usr/lib/wireshark/plugins/3.0/epan/gryphon.so +usr/lib/wireshark/plugins/3.0/epan/irda.so +usr/lib/wireshark/plugins/3.0/epan/mate.so +usr/lib/wireshark/plugins/3.0/epan/opcua.so +usr/lib/wireshark/plugins/3.0/epan/profinet.so +usr/lib/wireshark/plugins/3.0/epan/stats_tree.so +usr/lib/wireshark/plugins/3.0/epan/transum.so +usr/lib/wireshark/plugins/3.0/epan/unistim.so +usr/lib/wireshark/plugins/3.0/epan/wimax.so +usr/lib/wireshark/plugins/3.0/epan/wimaxasncp.so +usr/lib/wireshark/plugins/3.0/epan/wimaxmacphy.so +usr/lib/wireshark/plugins/3.0/wiretap +usr/lib/wireshark/plugins/3.0/wiretap/usbdump.so +#usr/share/doc/wireshark +#usr/share/doc/wireshark/androiddump.html +#usr/share/doc/wireshark/capinfos.html +#usr/share/doc/wireshark/captype.html +#usr/share/doc/wireshark/ciscodump.html +#usr/share/doc/wireshark/dftest.html +#usr/share/doc/wireshark/dpauxmon.html +#usr/share/doc/wireshark/dumpcap.html +#usr/share/doc/wireshark/editcap.html +#usr/share/doc/wireshark/extcap.html +#usr/share/doc/wireshark/mergecap.html +#usr/share/doc/wireshark/randpkt.html +#usr/share/doc/wireshark/randpktdump.html +#usr/share/doc/wireshark/rawshark.html +#usr/share/doc/wireshark/reordercap.html +#usr/share/doc/wireshark/sshdump.html +#usr/share/doc/wireshark/text2pcap.html +#usr/share/doc/wireshark/tshark.html +#usr/share/doc/wireshark/udpdump.html +#usr/share/doc/wireshark/wireshark-filter.html +#usr/share/doc/wireshark/wireshark.html +#usr/share/man/man1/androiddump.1 +#usr/share/man/man1/capinfos.1 +#usr/share/man/man1/captype.1 +#usr/share/man/man1/ciscodump.1 +#usr/share/man/man1/dftest.1 +#usr/share/man/man1/dpauxmon.1 +#usr/share/man/man1/dumpcap.1 +#usr/share/man/man1/editcap.1 +#usr/share/man/man1/mergecap.1 +#usr/share/man/man1/randpkt.1 +#usr/share/man/man1/randpktdump.1 +#usr/share/man/man1/rawshark.1 +#usr/share/man/man1/reordercap.1 +#usr/share/man/man1/sshdump.1 +#usr/share/man/man1/text2pcap.1 +#usr/share/man/man1/tshark.1 +#usr/share/man/man1/udpdump.1 +#usr/share/man/man1/wireshark.1 +#usr/share/man/man4/extcap.4 +#usr/share/man/man4/wireshark-filter.4 +#usr/share/wireshark +#usr/share/wireshark/AUTHORS-SHORT +#usr/share/wireshark/COPYING +#usr/share/wireshark/androiddump.html +#usr/share/wireshark/capinfos.html +#usr/share/wireshark/captype.html +usr/share/wireshark/cfilters +#usr/share/wireshark/ciscodump.html +usr/share/wireshark/colorfilters +usr/share/wireshark/dfilters +#usr/share/wireshark/dftest.html +#usr/share/wireshark/diameter +usr/share/wireshark/diameter/AlcatelLucent.xml +usr/share/wireshark/diameter/Cisco.xml +usr/share/wireshark/diameter/CiscoSystems.xml +usr/share/wireshark/diameter/Custom.xml +usr/share/wireshark/diameter/Ericsson.xml +usr/share/wireshark/diameter/HP.xml +usr/share/wireshark/diameter/Huawei.xml +usr/share/wireshark/diameter/Inovar.xml +usr/share/wireshark/diameter/Juniper.xml +usr/share/wireshark/diameter/Nokia.xml +usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml +usr/share/wireshark/diameter/Oracle.xml +usr/share/wireshark/diameter/Starent.xml +usr/share/wireshark/diameter/TGPP.xml +usr/share/wireshark/diameter/TGPP2.xml +usr/share/wireshark/diameter/VerizonWireless.xml +usr/share/wireshark/diameter/Vodafone.xml +usr/share/wireshark/diameter/chargecontrol.xml +usr/share/wireshark/diameter/dictionary.dtd +usr/share/wireshark/diameter/dictionary.xml +usr/share/wireshark/diameter/eap.xml +usr/share/wireshark/diameter/etsie2e4.xml +usr/share/wireshark/diameter/mobileipv4.xml +usr/share/wireshark/diameter/mobileipv6.xml +usr/share/wireshark/diameter/nasreq.xml +usr/share/wireshark/diameter/sip.xml +usr/share/wireshark/diameter/sunping.xml +#usr/share/wireshark/dtds +usr/share/wireshark/dtds/dc.dtd +usr/share/wireshark/dtds/itunes.dtd +usr/share/wireshark/dtds/mscml.dtd +usr/share/wireshark/dtds/pocsettings.dtd +usr/share/wireshark/dtds/presence.dtd +usr/share/wireshark/dtds/reginfo.dtd +usr/share/wireshark/dtds/rlmi.dtd +usr/share/wireshark/dtds/rss.dtd +usr/share/wireshark/dtds/smil.dtd +usr/share/wireshark/dtds/watcherinfo.dtd +usr/share/wireshark/dtds/xcap-caps.dtd +usr/share/wireshark/dtds/xcap-error.dtd +#usr/share/wireshark/dumpcap.html +#usr/share/wireshark/editcap.html +#usr/share/wireshark/enterprises.tsv +#usr/share/wireshark/extcap.html +#usr/share/wireshark/help +#usr/share/wireshark/help/capture_filters.txt +#usr/share/wireshark/help/capturing.txt +#usr/share/wireshark/help/display_filters.txt +#usr/share/wireshark/help/faq.py +#usr/share/wireshark/help/getting_started.txt +#usr/share/wireshark/help/overview.txt +#usr/share/wireshark/help/toc +#usr/share/wireshark/ipmap.html +#usr/share/wireshark/manuf +#usr/share/wireshark/mergecap.html +#usr/share/wireshark/pdml2html.xsl +#usr/share/wireshark/profiles +#usr/share/wireshark/profiles/Bluetooth +usr/share/wireshark/profiles/Bluetooth/colorfilters +usr/share/wireshark/profiles/Bluetooth/preferences +#usr/share/wireshark/profiles/Classic +usr/share/wireshark/profiles/Classic/colorfilters +#usr/share/wireshark/profiles/No +#Reassembly +#usr/share/wireshark/profiles/No +#Reassembly/preferences +#usr/share/wireshark/radius +#usr/share/wireshark/radius/README.radius_dictionary +usr/share/wireshark/radius/custom.includes +#usr/share/wireshark/radius/dictionary +usr/share/wireshark/radius/dictionary.3com +usr/share/wireshark/radius/dictionary.3gpp +usr/share/wireshark/radius/dictionary.3gpp2 +usr/share/wireshark/radius/dictionary.acc +usr/share/wireshark/radius/dictionary.acme +usr/share/wireshark/radius/dictionary.actelis +usr/share/wireshark/radius/dictionary.aerohive +usr/share/wireshark/radius/dictionary.airespace +usr/share/wireshark/radius/dictionary.alcatel +usr/share/wireshark/radius/dictionary.alcatel-lucent.aaa +usr/share/wireshark/radius/dictionary.alcatel.esam +usr/share/wireshark/radius/dictionary.alcatel.sr +usr/share/wireshark/radius/dictionary.alteon +usr/share/wireshark/radius/dictionary.altiga +usr/share/wireshark/radius/dictionary.alvarion +usr/share/wireshark/radius/dictionary.alvarion.wimax.v2_2 +usr/share/wireshark/radius/dictionary.apc +usr/share/wireshark/radius/dictionary.aptis +usr/share/wireshark/radius/dictionary.arbor +usr/share/wireshark/radius/dictionary.aruba +usr/share/wireshark/radius/dictionary.ascend +usr/share/wireshark/radius/dictionary.asn +usr/share/wireshark/radius/dictionary.audiocodes +usr/share/wireshark/radius/dictionary.avaya +usr/share/wireshark/radius/dictionary.azaire +usr/share/wireshark/radius/dictionary.bay +usr/share/wireshark/radius/dictionary.bintec +usr/share/wireshark/radius/dictionary.bluecoat +usr/share/wireshark/radius/dictionary.bristol +usr/share/wireshark/radius/dictionary.broadsoft +usr/share/wireshark/radius/dictionary.brocade +usr/share/wireshark/radius/dictionary.bskyb +usr/share/wireshark/radius/dictionary.bt +usr/share/wireshark/radius/dictionary.cablelabs +usr/share/wireshark/radius/dictionary.cabletron +usr/share/wireshark/radius/dictionary.camiant +usr/share/wireshark/radius/dictionary.chillispot +usr/share/wireshark/radius/dictionary.cisco +usr/share/wireshark/radius/dictionary.cisco.asa +usr/share/wireshark/radius/dictionary.cisco.bbsm +usr/share/wireshark/radius/dictionary.cisco.vpn3000 +usr/share/wireshark/radius/dictionary.cisco.vpn5000 +usr/share/wireshark/radius/dictionary.citrix +usr/share/wireshark/radius/dictionary.clavister +usr/share/wireshark/radius/dictionary.cnergee +usr/share/wireshark/radius/dictionary.colubris +usr/share/wireshark/radius/dictionary.columbia_university +usr/share/wireshark/radius/dictionary.compat +usr/share/wireshark/radius/dictionary.compatible +usr/share/wireshark/radius/dictionary.cosine +usr/share/wireshark/radius/dictionary.dante +usr/share/wireshark/radius/dictionary.dellemc +usr/share/wireshark/radius/dictionary.dhcp +usr/share/wireshark/radius/dictionary.digium +usr/share/wireshark/radius/dictionary.dlink +usr/share/wireshark/radius/dictionary.dragonwave +usr/share/wireshark/radius/dictionary.efficientip +usr/share/wireshark/radius/dictionary.eltex +usr/share/wireshark/radius/dictionary.epygi +usr/share/wireshark/radius/dictionary.equallogic +usr/share/wireshark/radius/dictionary.ericsson +usr/share/wireshark/radius/dictionary.ericsson.ab +usr/share/wireshark/radius/dictionary.ericsson.packet.core.networks +usr/share/wireshark/radius/dictionary.extreme +usr/share/wireshark/radius/dictionary.f5 +usr/share/wireshark/radius/dictionary.fdxtended +usr/share/wireshark/radius/dictionary.fortinet +usr/share/wireshark/radius/dictionary.foundry +usr/share/wireshark/radius/dictionary.freedhcp +usr/share/wireshark/radius/dictionary.freeradius +usr/share/wireshark/radius/dictionary.freeradius.internal +usr/share/wireshark/radius/dictionary.freeswitch +usr/share/wireshark/radius/dictionary.gandalf +usr/share/wireshark/radius/dictionary.garderos +usr/share/wireshark/radius/dictionary.gemtek +usr/share/wireshark/radius/dictionary.h3c +usr/share/wireshark/radius/dictionary.hp +usr/share/wireshark/radius/dictionary.huawei +usr/share/wireshark/radius/dictionary.iana +usr/share/wireshark/radius/dictionary.iea +usr/share/wireshark/radius/dictionary.infoblox +usr/share/wireshark/radius/dictionary.infonet +usr/share/wireshark/radius/dictionary.ipunplugged +usr/share/wireshark/radius/dictionary.issanni +usr/share/wireshark/radius/dictionary.itk +usr/share/wireshark/radius/dictionary.jradius +usr/share/wireshark/radius/dictionary.juniper +usr/share/wireshark/radius/dictionary.karlnet +usr/share/wireshark/radius/dictionary.kineto +usr/share/wireshark/radius/dictionary.lancom +usr/share/wireshark/radius/dictionary.livingston +usr/share/wireshark/radius/dictionary.localweb +usr/share/wireshark/radius/dictionary.lucent +usr/share/wireshark/radius/dictionary.manzara +usr/share/wireshark/radius/dictionary.meinberg +usr/share/wireshark/radius/dictionary.merit +usr/share/wireshark/radius/dictionary.meru +usr/share/wireshark/radius/dictionary.microsemi +usr/share/wireshark/radius/dictionary.microsoft +usr/share/wireshark/radius/dictionary.mikrotik +usr/share/wireshark/radius/dictionary.motorola +usr/share/wireshark/radius/dictionary.motorola.wimax +usr/share/wireshark/radius/dictionary.navini +usr/share/wireshark/radius/dictionary.netscreen +usr/share/wireshark/radius/dictionary.networkphysics +usr/share/wireshark/radius/dictionary.nexans +usr/share/wireshark/radius/dictionary.nokia +usr/share/wireshark/radius/dictionary.nokia.conflict +usr/share/wireshark/radius/dictionary.nomadix +usr/share/wireshark/radius/dictionary.nortel +usr/share/wireshark/radius/dictionary.ntua +usr/share/wireshark/radius/dictionary.openser +usr/share/wireshark/radius/dictionary.packeteer +usr/share/wireshark/radius/dictionary.paloalto +usr/share/wireshark/radius/dictionary.patton +usr/share/wireshark/radius/dictionary.perle +usr/share/wireshark/radius/dictionary.propel +usr/share/wireshark/radius/dictionary.prosoft +usr/share/wireshark/radius/dictionary.proxim +usr/share/wireshark/radius/dictionary.purewave +usr/share/wireshark/radius/dictionary.quiconnect +usr/share/wireshark/radius/dictionary.quintum +usr/share/wireshark/radius/dictionary.redcreek +usr/share/wireshark/radius/dictionary.rfc2865 +usr/share/wireshark/radius/dictionary.rfc2866 +usr/share/wireshark/radius/dictionary.rfc2867 +usr/share/wireshark/radius/dictionary.rfc2868 +usr/share/wireshark/radius/dictionary.rfc2869 +usr/share/wireshark/radius/dictionary.rfc3162 +usr/share/wireshark/radius/dictionary.rfc3576 +usr/share/wireshark/radius/dictionary.rfc3580 +usr/share/wireshark/radius/dictionary.rfc4072 +usr/share/wireshark/radius/dictionary.rfc4372 +usr/share/wireshark/radius/dictionary.rfc4603 +usr/share/wireshark/radius/dictionary.rfc4675 +usr/share/wireshark/radius/dictionary.rfc4679 +usr/share/wireshark/radius/dictionary.rfc4818 +usr/share/wireshark/radius/dictionary.rfc4849 +usr/share/wireshark/radius/dictionary.rfc5090 +usr/share/wireshark/radius/dictionary.rfc5176 +usr/share/wireshark/radius/dictionary.rfc5447 +usr/share/wireshark/radius/dictionary.rfc5580 +usr/share/wireshark/radius/dictionary.rfc5607 +usr/share/wireshark/radius/dictionary.rfc5904 +usr/share/wireshark/radius/dictionary.rfc6519 +usr/share/wireshark/radius/dictionary.rfc6572 +usr/share/wireshark/radius/dictionary.rfc6677 +usr/share/wireshark/radius/dictionary.rfc6911 +usr/share/wireshark/radius/dictionary.rfc6929 +usr/share/wireshark/radius/dictionary.rfc6930 +usr/share/wireshark/radius/dictionary.rfc7055 +usr/share/wireshark/radius/dictionary.rfc7155 +usr/share/wireshark/radius/dictionary.rfc7268 +usr/share/wireshark/radius/dictionary.rfc7499 +usr/share/wireshark/radius/dictionary.rfc7930 +usr/share/wireshark/radius/dictionary.riverbed +usr/share/wireshark/radius/dictionary.riverstone +usr/share/wireshark/radius/dictionary.roaringpenguin +usr/share/wireshark/radius/dictionary.ruckus +usr/share/wireshark/radius/dictionary.ruggedcom +usr/share/wireshark/radius/dictionary.sangoma +usr/share/wireshark/radius/dictionary.sg +usr/share/wireshark/radius/dictionary.shasta +usr/share/wireshark/radius/dictionary.shiva +usr/share/wireshark/radius/dictionary.siemens +usr/share/wireshark/radius/dictionary.slipstream +usr/share/wireshark/radius/dictionary.sofaware +usr/share/wireshark/radius/dictionary.sonicwall +usr/share/wireshark/radius/dictionary.springtide +usr/share/wireshark/radius/dictionary.starent +usr/share/wireshark/radius/dictionary.starent.vsa1 +usr/share/wireshark/radius/dictionary.surfnet +usr/share/wireshark/radius/dictionary.symbol +usr/share/wireshark/radius/dictionary.t_systems_nova +usr/share/wireshark/radius/dictionary.telebit +usr/share/wireshark/radius/dictionary.telkom +usr/share/wireshark/radius/dictionary.terena +usr/share/wireshark/radius/dictionary.trapeze +usr/share/wireshark/radius/dictionary.travelping +usr/share/wireshark/radius/dictionary.tropos +usr/share/wireshark/radius/dictionary.ukerna +usr/share/wireshark/radius/dictionary.unisphere +usr/share/wireshark/radius/dictionary.unix +usr/share/wireshark/radius/dictionary.usr +usr/share/wireshark/radius/dictionary.utstarcom +usr/share/wireshark/radius/dictionary.valemount +usr/share/wireshark/radius/dictionary.verizon +usr/share/wireshark/radius/dictionary.versanet +usr/share/wireshark/radius/dictionary.vqp +usr/share/wireshark/radius/dictionary.walabi +usr/share/wireshark/radius/dictionary.waverider +usr/share/wireshark/radius/dictionary.wichorus +usr/share/wireshark/radius/dictionary.wimax +usr/share/wireshark/radius/dictionary.wimax.alvarion +usr/share/wireshark/radius/dictionary.wimax.wichorus +usr/share/wireshark/radius/dictionary.wispr +usr/share/wireshark/radius/dictionary.xedia +usr/share/wireshark/radius/dictionary.xylan +usr/share/wireshark/radius/dictionary.yubico +usr/share/wireshark/radius/dictionary.zeus +usr/share/wireshark/radius/dictionary.zte +usr/share/wireshark/radius/dictionary.zyxel +#usr/share/wireshark/randpkt.html +#usr/share/wireshark/randpktdump.html +#usr/share/wireshark/rawshark.html +#usr/share/wireshark/reordercap.html +usr/share/wireshark/services +usr/share/wireshark/smi_modules +#usr/share/wireshark/sshdump.html +#usr/share/wireshark/text2pcap.html +#usr/share/wireshark/tpncp +usr/share/wireshark/tpncp/tpncp.dat +#usr/share/wireshark/tshark.html +#usr/share/wireshark/udpdump.html +#usr/share/wireshark/wimaxasncp +usr/share/wireshark/wimaxasncp/dictionary.dtd +usr/share/wireshark/wimaxasncp/dictionary.xml +usr/share/wireshark/wireshark-filter.html +usr/share/wireshark/wireshark.html +usr/share/wireshark/wka +usr/share/wireshark/ws.css diff --git a/lfs/tshark b/lfs/tshark new file mode 100644 index 000000000..a978cf73c --- /dev/null +++ b/lfs/tshark @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.0.1 + +THISAPP = wireshark-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = tshark +DEPS = "krb5" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 370a113e1c8ec240c4621cfb5abb0c52 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist : + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. \ + -DBUILD_wireshark=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) + cd $(DIR_APP)/build && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index bfcc83709..03861e2bf 100755 --- a/make.sh +++ b/make.sh @@ -1595,6 +1595,7 @@ buildipfire() { lfsmake2 zabbix_agentd lfsmake2 flashrom lfsmake2 firmware-update + lfsmake2 tshark } buildinstaller() { diff --git a/src/paks/tshark/install.sh b/src/paks/tshark/install.sh new file mode 100644 index 000000000..eab79df10 --- /dev/null +++ b/src/paks/tshark/install.sh @@ -0,0 +1,46 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files +restore_backup ${NAME} + +# Add user and group tshark if it not exists +if ! getent group tshark &>/dev/null; then + groupadd -g 62 tshark + chgrp tshark /usr/bin/dumpcap + chmod 4750 /usr/bin/dumpcap +fi + +if ! getent passwd tshark; then + useradd -u 62 -g tshark -c "Tshark user" -d /nonexistent -s /bin/bash tshark + usermod -a -G tshark tshark +fi + +# Use setcap to lower permissions +setcap cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap + +# Set permissions for tshark and dumpcap +chown -v root:tshark /usr/bin/{tshark,dumpcap} +chmod -v 6550 /usr/bin/{tshark,dumpcap} diff --git a/src/paks/tshark/nginx/install.sh b/src/paks/tshark/nginx/install.sh new file mode 100644 index 000000000..d5cb15524 --- /dev/null +++ b/src/paks/tshark/nginx/install.sh @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +ln -svf ../init.d/nginx /etc/rc.d/rc0.d/K20nginx +ln -svf ../init.d/nginx /etc/rc.d/rc3.d/S40nginx +ln -svf ../init.d/nginx /etc/rc.d/rc6.d/K20nginx + +start_service --background ${NAME} diff --git a/src/paks/tshark/nginx/uninstall.sh b/src/paks/tshark/nginx/uninstall.sh new file mode 100644 index 000000000..7c7bfe8b8 --- /dev/null +++ b/src/paks/tshark/nginx/uninstall.sh @@ -0,0 +1,30 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +extract_backup_includes +make_backup ${NAME} +remove_files + +rm -rf /etc/rc.d/rc*.d/*nginx diff --git a/src/paks/tshark/nginx/update.sh b/src/paks/tshark/nginx/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/tshark/nginx/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/paks/tshark/uninstall.sh b/src/paks/tshark/uninstall.sh new file mode 100644 index 000000000..a611696be --- /dev/null +++ b/src/paks/tshark/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_backup_includes +make_backup ${NAME} diff --git a/src/paks/tshark/update.sh b/src/paks/tshark/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/tshark/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh -- 2.12.2

3 10

Re: [FEATURE] Zone configuration
by Michael Tremer 20 May '19

20 May '19

Hey, Thank you Florian. All merged. -Michael P.S. You forgot to CC the list... > On 19 May 2019, at 22:34, Florian Bührle <erdlof(a)protonmail.com> wrote: > > Hey, > > sorry for my late response :) > > I think you both are right regarding switching the rows/columns. I'm glad to announce that I just finished implementing all your proposed changes so the new version can be shipped with Core 132. > > Regards > Florian > > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ > Am Freitag, 17. Mai 2019 23:38 schrieb Michael Tremer <michael.tremer(a)ipfire.org>: > >> Hey guys, >> >> Great work here :) >> >> I talked to Florian in private and said that I do not think it is a good idea to swap the columns. I have no idea what I was thinking there. Of course it makes sense. Must have switched my brain off before talking. >> >> I am in favour of this. I just have no idea if we can have this land in Core Update 132 since we have some urgent security stuff in there and Arne wants to close it as soon as possible. >> >> Florian, what is your availability and do you think you can have this done by Monday? No pressure, I do not think it is the end of the world if we ship it like this. Alternatively we can deactivate the menu option so that users won’t see it yet. Whatever you prefer. >> >> Best, >> -Michael >> >>> On 14 May 2019, at 22:04, Alexander Koch ipfire(a)starkstromkonsument.de wrote: >>> Hi Florian, >>> I vote for switching columns/rows. I think a maximum of four columns (or are you planning to extend the zones too?) results in a better usability than an additional horizontal scrollbar. And the other GUI-pages grow vertically too. The Network Settings could be placed in the first row(s), just like a NIC. What about alternating the background colour (light grey/dark gray) of the rows like on the firewall rules and the logs pages? >>> Different topic, but related to yours: I'm currently running multiple SSIDs with hostapd on my IPFire machines (one for green and one for blue) by creating the bridges in an initscript and editing the hostapd-config manually. Based on your new Zoneconfig-Feature (it creates the bridges required by hostapd and makes things a lot easier) it is possible to write a patch for the wlanap.cgi to implement this properly. Are you or anybody else already working on this? I would join in or start it ... >>> Regards, Alex >>> From: Florian Bührle [mailto:erdlof@protonmail.com] >>> Sent: Tuesday, 14 May 2019, 07:23 CEST >>> To: ipfire(a)starkstromkonsument.de >>> Cc: development(a)lists.ipfire.org >>> Subject: [FEATURE] Zone configuration >>> >>>> Hello Alexander, >>>> thank you for your feedback! >>>> >>>> 1. Yes, applying these settings requires a restart. I also think we should inform users of that in the GUI. >>>> 2. This is actually a major issue. I thought of two possible fixes: either the columns/rows get switched so the table grows vertically; or we introduce a scrollbar. Personally I think a scrollbar would be a better idea as I plan to also introduce network settings to the zoneconf interface so the site could get rather large if a user has many NICs on their machine. Also I think the height of the site should be consistent. >>>> What do you think? >>>> >>>> >>>> Regards >>>> Florian >>>> -------- Original-Nachricht -------- >>>> An 13. Mai 2019, 23:58, Alexander Koch schrieb: >>>> Hello Florian, >>>> thank you for providing this new feature. I think it is a big enhancement to the user experience to bring this to the GUI. I tested the current nightly build (next/9d959ac1) and found two little issues: >>>> • The changes will not be applied until I reboot the machine. Is this the expected behaviour? If yes: I think there should be a hint on the page to inform the user about it and the file /var/run/need_reboot should be created to activate the corresponding banner "An update requires a restart!" in the GUI. Maybe the translations should be updated too. E.g. "An update or config change requires a reboot! >>>> • If I use the GUI-Theme "ipfire-legacy" and the system has more than three NICSs, the GUI-Content will overlap the sidemenu. I attached a screenshot with this. >>>> Regards, Alex >>>> From: Florian Bührle [mailto:erdlof@protonmail.com] >>>> Sent: Saturday, 11 May 2019, 15:57 CEST >>>> To: development(a)lists.ipfire.org development(a)lists.ipfire.org >>>> Subject: [FEATURE] Zone configuration >>>> >>>>> Hey all, >>>>> I made a new web interface that allows users to assign network interfaces to zones. Check out the wiki article https://wiki.ipfire.org/configuration/network/zoneconf. >>>>> This feature is already part of the "next" branch of the IPFire 2.x main tree. Please review it and check for bugs :) >>>>> Regards >>>>> Flo > >

1 0

missing core131 image maybe for backup script
by Paul Titjen 20 May '19

20 May '19

Hi, Have upgraded to core131 and running happily. I think I may have spotted an oversight in the backup part though. When I try to create backup of new core 131 with ISO option I get a file size of 0MB. I think the script /usr/local/bin/backupiso is working ok but when I try to use wget on the URL manually the core131 image seems to be missing. https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core131/ipfire-2.21.x8 6_64-full-core131.iso The old address for core130 seems to be fine. https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core130/ipfire-2.21.x8 6_64-full-core130.iso Regards, Paul

2 1

[PATCH] Tor: specify correct user for default configuration
by Peter Müller 20 May '19

20 May '19

While being built with user/group set to "tor", the default configuration still contains the old username. This patch adjusts it to the correct value. The issue was caused by insufficient testing, which I apologise for. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/tor/defaults-torrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tor/defaults-torrc b/config/tor/defaults-torrc index 703d821fe..ee8f809d9 100644 --- a/config/tor/defaults-torrc +++ b/config/tor/defaults-torrc @@ -1,3 +1,3 @@ DataDirectory /var/lib/tor -User nobody +User tor Log notice syslog -- 2.16.4

2 1

[PATCH v2] sslh: update to 1.20
by Jon Murphy 19 May '19

19 May '19

> If we find a proper solution for the outstanding questions i can send > the updated patch and would then also start with the wiki for sslh. > > Best, > > Erik Erik, I created a quick sslh wiki at https://wiki.ipfire.org/addons/sslh/start Feel free to use or delete. I am certainly not the expert! Jon

1 0

[PATCH] suricata: Fixed logs.dat regex for suricata
by Erik Kapfer 19 May '19

19 May '19

Fixes: #12084 Since the Suricata regex did not match the messages output, Suricata was not displayed in the "System Logs" section in the WUI. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> --- html/cgi-bin/logs.cgi/log.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 136fed77c..061525382 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -67,7 +67,7 @@ my %sections = ( 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', 'pakfire' => '(pakfire:)', 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', - 'suricata' => '(suricata\[.*\]: )', + 'suricata' => '(suricata: )', 'squid' => '(squid\[.*\]: |squid: )', 'ssh' => '(sshd(?:$.*$)?\[.*\]: )', 'unbound' => '(unbound: \[.*:.*\])(.*:.*$)', -- 2.12.2

1 0

[PATCH] BUG 11696: VPN Subnets missing from wpad.dat
by Oliver Fuhrer 19 May '19

19 May '19

This patch fixes the behavior in 11696 and adds IPSEC and OpenVPN n2n subnets to wpad.dat so they don't pass through the proxy. --- Hi All Apologies for the line-wrapping mess with the previous attempt. Looks like Outlook isn't up for the task. This Message is now sent directly via git, which should hopefully fix the issue. As I currently don't have any OpenVPN n2n connections, I could not fully test this part, however some dry-runs looked rather promising html/cgi-bin/proxy.cgi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 6daa7fb..e7ee1f3 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2738,6 +2738,10 @@ sub write_acls sub writepacfile { + my %vpnconfig=(); + my %ovpnconfig=(); + &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig); open(FILE, ">/srv/web/ipfire/html/proxy.pac"); flock(FILE, 2); print FILE "function FindProxyForURL(url, host)\n"; @@ -2763,6 +2767,26 @@ END print FILE " (isInNet(host, \"$netsettings{'ORANGE_NETADDRESS'}\", \"$netsettings{'ORANGE_NETMASK'}\")) ||\n"; } + foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) { + if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') { + my @networks = split(/\|/, $vpnconfig{$key}[11]); + foreach my $network (@networks) { + my ($vpnip, $vpnsub) = split("/", $network); + $vpnsub = &Network::convert_prefix2netmask($vpnsub) || $vpnsub; + print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; + } + } + } + + foreach my $key (sort { uc($ovpnconfig{$a}[1]) cmp uc($ovpnconfig{$b}[1]) } keys %ovpnconfig) { + if ($ovpnconfig{$key}[0] eq 'on' && $ovpnconfig{$key}[3] ne 'host') { + my @networks = split(/\|/, $ovpnconfig{$key}[11]); + foreach my $network (@networks) { + my ($vpnip, $vpnsub) = split("/", $network); + print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; + } + } + } print FILE <<END (isInNet(host, "169.254.0.0", "255.255.0.0")) ) -- 1.8.3.1

2 4

[PATCH] sslh: Update to version 1.20
by Erik Kapfer 19 May '19

19 May '19

- Added USELIBCAP=1 to enable the possibility for transparent option. - Wrote configuration directives in initscript into variable for better overview. - Introduce chroot directive in start parameter. - Added new user and group sslh (will be deleted if uninstall). - Changed EXTERNAL_IP_FUNCT to serve data also for configuration block but use it also as check as before. - Added symlinks in sslh paks since the initscripts LFS do not serves it in old installation (a reboot does not started sslh again). - Deleted sslh symlinks in initscripts LFS since they are served via sslh paks and are not needed anymore. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> --- lfs/initscripts | 3 -- lfs/sslh | 12 ++++---- src/initscripts/packages/sslh | 65 +++++++++++++++++++++++++++++++++---------- src/paks/sslh/install.sh | 13 +++++++++ src/paks/sslh/uninstall.sh | 9 ++++++ 5 files changed, 79 insertions(+), 23 deletions(-) diff --git a/lfs/initscripts b/lfs/initscripts index 055e106d0..3173a04e4 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -136,9 +136,6 @@ $(TARGET) : ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175 ln -sf ../init.d/client175 /etc/rc.d/rc3.d/S66client175 ln -sf ../init.d/client175 /etc/rc.d/rc6.d/K34client175 - ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh - ln -sf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh - ln -sf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh ln -sf ../init.d/vdradmin /etc/rc.d/rc3.d/S99vdradmin ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin diff --git a/lfs/sslh b/lfs/sslh index 100cec065..dedd10272 100644 --- a/lfs/sslh +++ b/lfs/sslh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.7a +VER = 1.20 THISAPP = sslh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sslh -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ee124654412198a5e11fe28acf10634d +$(DL_FILE)_MD5 = 0db26ed2825b1ef6c83959a988279912 install : $(TARGET) @@ -77,8 +77,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) USELIBWRAP= - cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin + cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) USELIBCAP=1 USELIBWRAP= + cd $(DIR_APP) && install -v -m 755 sslh-fork /usr/sbin/sslh #install initscripts $(call INSTALL_INITSCRIPT,sslh) diff --git a/src/initscripts/packages/sslh b/src/initscripts/packages/sslh index 43e58f392..0935b1114 100644 --- a/src/initscripts/packages/sslh +++ b/src/initscripts/packages/sslh @@ -3,31 +3,68 @@ # Based on sysklogd script from LFS-3.1 and earlier. # Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org +# +# $LastChangedBy: ummeegge - ummeegge(a)ipfire.org $ +# $Date: 2019-04-04 04:35:09 -0500 (Thu, 04 Apr 2019) $ +# +############################################################# +# . /etc/sysconfig/rc . $rc_functions +DAEMON="/usr/sbin/sslh" + +# Check for external IP address and provide it to listening option +EXTERNAL_IP_ADDRESS="$(</var/ipfire/red/local-ipaddress)" +EXTERNAL_IP_FUNCT() { + if [ -z "${EXTERNAL_IP_ADDRESS}" ]; then + echo_failure + boot_mesg -n "FAILURE:\n\nCould not determine" ${FAILURE} + boot_mesg -n " your external IP address." + boot_mesg "" ${NORMAL} + exit 1 + fi +} + +# Loopback interface +LO="127.0.0.1" +# Used TCP ports +LISTENPORT="443" +SSHPORT="222" +TLSPORT="444" +OPENVPNPORT="1194" + +# Configuration options +DAEMON_OPTS=" +--user sslh +--listen ${EXTERNAL_IP_ADDRESS}:${LISTENPORT} +--ssh ${LO}:${SSHPORT} +--tls ${LO}:${TLSPORT} +--openvpn ${LO}:${OPENVPNPORT} +--pidfile /var/run/sslh.pid +-C /var/empty +" + +# Check for binary +if ! [ -x "$(command -v ${DAEMON})" ]; then + echo "Error: could not find ${DAEMON}" >&2 + exit 1 +fi + +# Check for external IP +EXTERNAL_IP_FUNCT + case "$1" in start) boot_mesg "Starting SSLH Deamon..." - - LOCAL_IP_ADDRESS="$(</var/ipfire/red/local-ipaddress)" - if [ -z "${LOCAL_IP_ADDRESS}" ]; then - echo_failure - boot_mesg -n "FAILURE:\n\nCould not determine" ${FAILURE} - boot_mesg -n " your external IP address." - boot_mesg "" ${NORMAL} - exit 1 - fi - - loadproc /usr/sbin/sslh -u nobody \ - -p "${LOCAL_IP_ADDRESS}:443" -s localhost:222 -l localhost:444 + loadproc ${DAEMON} ${DAEMON_OPTS} evaluate_retval ;; stop) boot_mesg "Stopping SSLH Deamon..." - killproc /usr/sbin/sslh + killproc ${DAEMON} evaluate_retval ;; @@ -38,7 +75,7 @@ case "$1" in ;; status) - statusproc /usr/sbin/sslh + statusproc ${DAEMON} ;; *) diff --git a/src/paks/sslh/install.sh b/src/paks/sslh/install.sh index 626884bdd..df7cafc78 100644 --- a/src/paks/sslh/install.sh +++ b/src/paks/sslh/install.sh @@ -23,5 +23,18 @@ # . /opt/pakfire/lib/functions.sh extract_files + +# Add user and group for sslh if not already done +if ! grep -q sslh /etc/passwd; then + groupadd sslh; + useradd -g sslh -M -s /sbin/nologin sslh +fi + ln -s /etc/init.d/sslh /etc/rc.d/init.d/networking/red.up/50-sslh + +# Set symlink for runlevels +ln -svf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh +ln -svf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh +ln -svf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh + start_service --background ${NAME} diff --git a/src/paks/sslh/uninstall.sh b/src/paks/sslh/uninstall.sh index dca34ccbd..05bb27945 100644 --- a/src/paks/sslh/uninstall.sh +++ b/src/paks/sslh/uninstall.sh @@ -23,5 +23,14 @@ # . /opt/pakfire/lib/functions.sh stop_service ${NAME} + +# Delete user and group sslh +if grep -q sslh /etc/passwd; then + userdel sslh + groupdel sslh +fi + remove_files rm -f /etc/rc.d/init.d/networking/red.up/50-sslh +# Delete initscript symlinks +rm -f /etc/rc.d/rc?.d/???sslh -- 2.12.2

3 10

suricata - Threshold.config syntax different from snort syntax
by Horace Michael 18 May '19

18 May '19

Hello, For whoever yned snort through threshold.conf: at first glance it seems that suricata is not able to understand all suppression syntax used by snort. Ex of suricata error for the syntax '![]' suricata: [ERRCODE: SC_ERR_PCRE_MATCH(2)] - pcre_exec parse error, ret -1, string , track by_dst, ip ![1.1.1.1,8.8.8.8] Moving snort threshold.comf to suricata threshold.config might generate such pcre parsing errors. Hope it helps! Horace

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development May 2019