Development June 2024

development@lists.ipfire.org

11 participants
41 discussions

Results from using qemu-user-static for trying to build other architectures
by Adolf Belka 24 Jun '24

24 Jun '24

Hi All, When ever I do a package update on something like samba then I normally only provide the rootfile for x86_64 and then others of you have to notice that and do the build for aarch64 or riscv64. So I thought I would have another go at using qemu-user-static to test out building samba for aarch64. I installed qemu-user-static and qemu-user-static-binfmt and then started a build with target-aarch64. Unfortunately after 68 hours of build time the system is still only at the start of the build-ipfire and should reach the rust build section in the next hour or two. Based on this then a full build could be around 8 or 9 days running 24/7. The computer I am using for this has a Ryzen 7 5700G processor with 32G of memory so it seems a reasonably powerful system. With the native x86_64 architecture the build is around 2 to 2.5 hours. For a lot of the packages when it is building the aarch64 the 16 CPU cores are 100% utilised. I know that it is said that a build using qemu-user-static will be slower due to the emulation but is the sort of speed I am experiencing what you would expect or am I doing something wrong. With the above sort of performance I cannot run the aarch64 and riscv64 architectures as the computer would just be unavailable for other things such as building update packages and trying to fix bugs. Thanks for any feedback. Regards, Adolf.

1 0

[PATCH] apcupsd: Update email scripts to work with dma
by Adolf Belka 21 Jun '24

21 Jun '24

- The standard email scripts supllied with apcupsd are coded on the basis that sendmail is being used. The format of the email information in those scripts does not work with the dma mail system implemented in IPFire. - The scripts provided in the config/apcupsd directory have been updated to work with dma. The scripts have been confirmed to work with my production system that is using a UPS. - This patch will replace the standard apcupsd scripts with the ones tailored for IPFire. - If any existing users have modified their scripts to already work with dma then their versions will be saved in their backup. - The apcupsd-3.14.14-2.ipfire package created in the build with the above changes has been installed on a vm system and confirmed to provide the IPFire tailored scripts. - The lfs change is the addition of the copying of the scripts to the /etc/apcupsd directory. - No change to the rootfile as the scripts names are the same. - The only thing a user will need to do is to ensure the IPFire email system is enabled, configure and confirmed working. Then valid FROM and TO email addresses need to be added to each script. - Once this patch submission is accepted then I will do an update to the apcupsd IPFire documentation page to describe these scripts and how to update the email addresses. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/apcupsd/changeme | 24 ++++++++++++++++++++++++ config/apcupsd/commfailure | 23 +++++++++++++++++++++++ config/apcupsd/commok | 24 ++++++++++++++++++++++++ config/apcupsd/offbattery | 24 ++++++++++++++++++++++++ config/apcupsd/onbattery | 24 ++++++++++++++++++++++++ lfs/apcupsd | 18 +++++++++++------- 6 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 config/apcupsd/changeme create mode 100644 config/apcupsd/commfailure create mode 100644 config/apcupsd/commok create mode 100644 config/apcupsd/offbattery create mode 100644 config/apcupsd/onbattery diff --git a/config/apcupsd/changeme b/config/apcupsd/changeme new file mode 100644 index 000000000..166b6e0cb --- /dev/null +++ b/config/apcupsd/changeme @@ -0,0 +1,24 @@ +#!/bin/sh +# +# This shell script if placed in /etc/apcupsd +# will be called by /etc/apcupsd/apccontrol when apcupsd +# detects that the battery should be replaced. +# We send an email message to root to notify him. +# + +FROM="enter from email address" +TO="enter to email address" + +HOSTNAME=`hostname` +MSG="$HOSTNAME Battery needs changing now on UPS $1" +# +( +echo From: $FROM +echo To: $TO +echo Subject: $MSG +echo " " +echo "$MSG" +echo " " +echo -ne $(echo "\r\n"; while read line; do echo "$line\r\n"; done < <(echo "$(/sbin/apcaccess status)")) +) | sudo -u nobody /usr/sbin/sendmail -t -f $FROM +exit 0 diff --git a/config/apcupsd/commfailure b/config/apcupsd/commfailure new file mode 100644 index 000000000..4771dcfa7 --- /dev/null +++ b/config/apcupsd/commfailure @@ -0,0 +1,23 @@ +#!/bin/sh +# +# This shell script if placed in /etc/apcupsd +# will be called by /etc/apcupsd/apccontrol when apcupsd +# loses contact with the UPS (i.e. the serial connection is not responding). +# We send an email message to root to notify him. +# + +FROM="enter from email address" +TO="enter to email address" + +HOSTNAME=`hostname` +MSG="$HOSTNAME Communications with UPS $1 lost" +( +echo From: $FROM +echo To: $TO +echo Subject: $MSG +echo " " +echo "$MSG" +echo " " +echo -ne $(echo "\r\n"; while read line; do echo "$line\r\n"; done < <(echo "$(/sbin/apcaccess status)")) +) | sudo -u nobody /usr/sbin/sendmail -t -f $FROM +exit 0 diff --git a/config/apcupsd/commok b/config/apcupsd/commok new file mode 100644 index 000000000..5871eda5d --- /dev/null +++ b/config/apcupsd/commok @@ -0,0 +1,24 @@ +#!/bin/sh +# +# This shell script if placed in /etc/apcupsd +# will be called by /etc/apcupsd/apccontrol when apcupsd +# restores contact with the UPS (i.e. the serial connection is restored). +# We send an email message to root to notify him. +# + +FROM="enter from email address" +TO="enter to email address" + +HOSTNAME=`hostname` +MSG="$HOSTNAME Communications with UPS $1 restored" +# +( +echo From: $FROM +echo To: $TO +echo Subject: $MSG +echo " " +echo "$MSG" +echo " " +echo -ne $(echo "\r\n"; while read line; do echo "$line\r\n"; done < <(echo "$(/sbin/apcaccess status)")) +) | sudo -u nobody /usr/sbin/sendmail -t -f $FROM +exit 0 diff --git a/config/apcupsd/offbattery b/config/apcupsd/offbattery new file mode 100644 index 000000000..99e773c42 --- /dev/null +++ b/config/apcupsd/offbattery @@ -0,0 +1,24 @@ +#!/bin/sh +# +# This shell script if placed in /etc/apcupsd +# will be called by /etc/apcupsd/apccontrol when the +# UPS goes back on to the mains after a power failure. +# We send an email message to root to notify him. +# + +FROM="enter from email address" +TO="enter to email address" + +HOSTNAME=`hostname` +MSG="$HOSTNAME Power has returned on UPS $1" +# +( +echo From: $FROM +echo To: $TO +echo Subject: $MSG +echo " " +echo "$MSG" +echo " " +echo -ne $(echo "\r\n"; while read line; do echo "$line\r\n"; done < <(echo "$(/sbin/apcaccess status)")) +) | sudo -u nobody /usr/sbin/sendmail -t -f $FROM +exit 0 diff --git a/config/apcupsd/onbattery b/config/apcupsd/onbattery new file mode 100644 index 000000000..b1df7dafd --- /dev/null +++ b/config/apcupsd/onbattery @@ -0,0 +1,24 @@ +#!/bin/sh +# +# This shell script if placed in /etc/apcupsd +# will be called by /etc/apcupsd/apccontrol when the UPS +# goes on batteries. +# We send an email message to root to notify him. +# + +FROM="enter from email address" +TO="enter to email address" + +HOSTNAME=`hostname` +MSG="$HOSTNAME Power Failure on UPS $1" +# +( +echo From: $FROM +echo To: $TO +echo Subject: $MSG +echo " " +echo "$MSG" +echo " " +echo -ne $(echo "\r\n"; while read line; do echo "$line\r\n"; done < <(echo "$(/sbin/apcaccess status)")) +) | sudo -u nobody /usr/sbin/sendmail -t -f $FROM +exit 0 diff --git a/lfs/apcupsd b/lfs/apcupsd index 8ed9bbd8c..82b55272b 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = apcupsd -PAK_VER = 11 +PAK_VER = 2 DEPS = @@ -82,14 +82,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-usb --enable-cgi \ - --with-cgi-bin=/srv/web/ipfire/cgi-bin + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-usb \ + --enable-cgi \ + --with-cgi-bin=/srv/web/ipfire/cgi-bin cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - - #install initscripts + # Copy the IPFire specific scripts for apccontrol to use. + # These have been modified to be able to use the dma mail agent in IPFire. + cp -rf $(DIR_SRC)/config/apcupsd/* /etc/apcupsd/ + # install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES)) - ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd -- 2.45.2

1 0

Your patches for adding support of 3CORESec lists to ipblocklist
by Adolf Belka 19 Jun '24

19 Jun '24

Hallo Stefan, Michael has informed me that you have patches for the addition of the 3CORESec lists to the ipblocklist function in IPFire in your git repo. Unless you have a problem with it, I would plan to take those patches and submit them together with the Abuse.ch Botnet C2 IP Blacklist that was mentioned in the June Conf Call, adding the tag that the 3CORESec patches were provided by yourself. Regards, Adolf.

1 0

[PATCH 1/4] tshark: Update to version 4.2.5
by Adolf Belka 19 Jun '24

19 Jun '24

- Update from version 4.0.8 to 4.2.5 - Update of rootfile - Version 4.2.5 requires asciidoctor to be built for tshark to build. Despite lots of investigation and testing out various commands, tshark will not build if asciidoctor is not present, even if the docs are not going to be used. It is only required for the build - To build asciidoctor ruby has to be installed. It is only required for the build of asciidoctor - tshark has previously had its own version of speexdsp built in. It is only used to provide some "arbitrary resampling code" during the build and does not end up in the running tshark system. Version 4.2.5 has removed the internal speexdsp code but it is still a required dependency for building, so speexdsp also need to be installed but only for the build stage. - The associated patches with this one provide the build installation of ruby, asciidoctor and speexdsp. With these installed tshark was able to be built. - version 4.0.8 and 4.2.5 of tshark were tested out on a vm system with the command "tshark -c 100 > tshark" and this wrote 100 packets from the vm red0 interface to a text file. Both the old and new versions provided the same sort of result. To a first level of testing this shows that the 4.2.5 version is functioning as the previous version was. - This version had an sobump so find-dependencies was run. All files linked to the three libraries in tshark are all also in tshark. No other package is linked to. - Changelog There are 13 releases between 4.0.8 and 4.2.5 so the changelist is too large to include here. Details can be found in the release notes for each version at https://www.wireshark.org/docs/relnotes/ 21 CVE vulnerabilities have been fixed that were identified in 7 of the 13 versions. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/tshark | 766 ++++--------------------------- lfs/tshark | 13 +- 2 files changed, 83 insertions(+), 696 deletions(-) diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark index 14af184af..b3a75924d 100644 --- a/config/rootfiles/packages/tshark +++ b/config/rootfiles/packages/tshark @@ -10,671 +10,16 @@ usr/bin/dumpcap #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/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/cisco_pid.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_filter.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/dccpservicecodes.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/dissectors -#usr/include/wireshark/epan/dissectors/cond_ace_token_enum.h -#usr/include/wireshark/epan/dissectors/file-pcapng.h -#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-acdr.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-amp.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-asap+enrp-common.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-autosar-ipdu-multiplexer.h -#usr/include/wireshark/epan/dissectors/packet-bacapp.h -#usr/include/wireshark/epan/dissectors/packet-bacnet.h -#usr/include/wireshark/epan/dissectors/packet-bblog.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-bicc_mst.h -#usr/include/wireshark/epan/dissectors/packet-bluetooth.h -#usr/include/wireshark/epan/dissectors/packet-bpsec.h -#usr/include/wireshark/epan/dissectors/packet-bpv6.h -#usr/include/wireshark/epan/dissectors/packet-bpv7.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-btbredr_rf.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_iso.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-cose.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-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-dlt.h -#usr/include/wireshark/epan/dissectors/packet-dns.h -#usr/include/wireshark/epan/dissectors/packet-docsis-tlv.h -#usr/include/wireshark/epan/dissectors/packet-doip.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-dvbci.h -#usr/include/wireshark/epan/dissectors/packet-e164.h -#usr/include/wireshark/epan/dissectors/packet-e1ap.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-f1ap.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-flexray.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-ftdi-ft.h -#usr/include/wireshark/epan/dissectors/packet-gdt.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-iso10681.h -#usr/include/wireshark/epan/dissectors/packet-iso15765.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-lin.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-lppa.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-nrppa.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-pdu-transport.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-quic.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-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-someip.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-tcpcl.h -#usr/include/wireshark/epan/dissectors/packet-tecmp.h -#usr/include/wireshark/epan/dissectors/packet-tetra.h -#usr/include/wireshark/epan/dissectors/packet-thrift.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-uavcan-dsdl.h -#usr/include/wireshark/epan/dissectors/packet-ubertooth.h -#usr/include/wireshark/epan/dissectors/packet-udp.h -#usr/include/wireshark/epan/dissectors/packet-uds.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-xnap.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/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/introspection.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/pci-ids.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/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_scopes.h -#usr/include/wireshark/epan/wscbor.h -#usr/include/wireshark/epan/x264_prt_id.h -#usr/include/wireshark/epan/xdlc.h -#usr/include/wireshark/file.h -#usr/include/wireshark/wireshark.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_modules.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_log_defs.h -#usr/include/wireshark/ws_posix_compat.h -#usr/include/wireshark/ws_symbol_export.h -#usr/include/wireshark/ws_version.h -#usr/include/wireshark/wsutil -#usr/include/wireshark/wsutil/802_11-utils.h -#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/codecs.h -#usr/include/wireshark/wsutil/color.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/crc5.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/epochs.h -#usr/include/wireshark/wsutil/exported_pdu_tlvs.h -#usr/include/wireshark/wsutil/feature_list.h -#usr/include/wireshark/wsutil/filesystem.h -#usr/include/wireshark/wsutil/g711.h -#usr/include/wireshark/wsutil/glib-compat.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/please_report_bug.h -#usr/include/wireshark/wsutil/pow2.h -#usr/include/wireshark/wsutil/privileges.h -#usr/include/wireshark/wsutil/processes.h -#usr/include/wireshark/wsutil/regex.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/to_str.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/wmem -#usr/include/wireshark/wsutil/wmem/wmem.h -#usr/include/wireshark/wsutil/wmem/wmem_array.h -#usr/include/wireshark/wsutil/wmem/wmem_core.h -#usr/include/wireshark/wsutil/wmem/wmem_interval_tree.h -#usr/include/wireshark/wsutil/wmem/wmem_list.h -#usr/include/wireshark/wsutil/wmem/wmem_map.h -#usr/include/wireshark/wsutil/wmem/wmem_miscutl.h -#usr/include/wireshark/wsutil/wmem/wmem_multimap.h -#usr/include/wireshark/wsutil/wmem/wmem_queue.h -#usr/include/wireshark/wsutil/wmem/wmem_stack.h -#usr/include/wireshark/wsutil/wmem/wmem_strbuf.h -#usr/include/wireshark/wsutil/wmem/wmem_strutl.h -#usr/include/wireshark/wsutil/wmem/wmem_tree.h -#usr/include/wireshark/wsutil/wmem/wmem_user_cb.h -#usr/include/wireshark/wsutil/ws_assert.h -#usr/include/wireshark/wsutil/ws_cpuid.h -#usr/include/wireshark/wsutil/ws_getopt.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_return.h -#usr/include/wireshark/wsutil/ws_roundup.h -#usr/include/wireshark/wsutil/wsgcrypt.h -#usr/include/wireshark/wsutil/wsjson.h -#usr/include/wireshark/wsutil/wslog.h -#usr/include/wireshark/wsutil/xtea.h #usr/lib/libwireshark.so -usr/lib/libwireshark.so.16 -usr/lib/libwireshark.so.16.0.8 +usr/lib/libwireshark.so.17 +usr/lib/libwireshark.so.17.0.5 #usr/lib/libwiretap.so -usr/lib/libwiretap.so.13 -usr/lib/libwiretap.so.13.0.8 +usr/lib/libwiretap.so.14 +usr/lib/libwiretap.so.14.1.5 #usr/lib/libwsutil.so -usr/lib/libwsutil.so.14 -usr/lib/libwsutil.so.14.0.0 -#usr/lib/pkgconfig/wireshark.pc +usr/lib/libwsutil.so.15 +usr/lib/libwsutil.so.15.0.0 #usr/lib/wireshark -#usr/lib/wireshark/cmake -#usr/lib/wireshark/cmake/FindGLIB2.cmake -#usr/lib/wireshark/cmake/FindWSLibrary.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-release.cmake -#usr/lib/wireshark/cmake/WiresharkTargets.cmake #usr/lib/wireshark/extcap usr/lib/wireshark/extcap/androiddump usr/lib/wireshark/extcap/ciscodump @@ -684,29 +29,77 @@ usr/lib/wireshark/extcap/sshdump usr/lib/wireshark/extcap/udpdump usr/lib/wireshark/extcap/wifidump #usr/lib/wireshark/plugins -#usr/lib/wireshark/plugins/4.0 -#usr/lib/wireshark/plugins/4.0/codecs -usr/lib/wireshark/plugins/4.0/codecs/g711.so -usr/lib/wireshark/plugins/4.0/codecs/l16mono.so -usr/lib/wireshark/plugins/4.0/codecs/opus_dec.so -#usr/lib/wireshark/plugins/4.0/epan -usr/lib/wireshark/plugins/4.0/epan/ethercat.so -usr/lib/wireshark/plugins/4.0/epan/gryphon.so -usr/lib/wireshark/plugins/4.0/epan/irda.so -usr/lib/wireshark/plugins/4.0/epan/mate.so -usr/lib/wireshark/plugins/4.0/epan/opcua.so -usr/lib/wireshark/plugins/4.0/epan/profinet.so -usr/lib/wireshark/plugins/4.0/epan/stats_tree.so -usr/lib/wireshark/plugins/4.0/epan/transum.so -usr/lib/wireshark/plugins/4.0/epan/unistim.so -usr/lib/wireshark/plugins/4.0/epan/wimax.so -usr/lib/wireshark/plugins/4.0/epan/wimaxasncp.so -usr/lib/wireshark/plugins/4.0/epan/wimaxmacphy.so -#usr/lib/wireshark/plugins/4.0/wiretap -usr/lib/wireshark/plugins/4.0/wiretap/usbdump.so +usr/lib/wireshark/plugins/4.2 +usr/lib/wireshark/plugins/4.2/codecs +usr/lib/wireshark/plugins/4.2/codecs/g711.so +usr/lib/wireshark/plugins/4.2/codecs/l16mono.so +usr/lib/wireshark/plugins/4.2/codecs/opus_dec.so +usr/lib/wireshark/plugins/4.2/epan +usr/lib/wireshark/plugins/4.2/epan/ethercat.so +usr/lib/wireshark/plugins/4.2/epan/gryphon.so +usr/lib/wireshark/plugins/4.2/epan/irda.so +usr/lib/wireshark/plugins/4.2/epan/mate.so +usr/lib/wireshark/plugins/4.2/epan/opcua.so +usr/lib/wireshark/plugins/4.2/epan/profinet.so +usr/lib/wireshark/plugins/4.2/epan/stats_tree.so +usr/lib/wireshark/plugins/4.2/epan/transum.so +usr/lib/wireshark/plugins/4.2/epan/unistim.so +usr/lib/wireshark/plugins/4.2/epan/wimax.so +usr/lib/wireshark/plugins/4.2/epan/wimaxasncp.so +usr/lib/wireshark/plugins/4.2/epan/wimaxmacphy.so +usr/lib/wireshark/plugins/4.2/wiretap +usr/lib/wireshark/plugins/4.2/wiretap/usbdump.so +#usr/share/doc/wireshark +#usr/share/doc/wireshark/COPYING +#usr/share/doc/wireshark/README.xml-output +#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/dpauxmon.html +#usr/share/doc/wireshark/dumpcap.html +#usr/share/doc/wireshark/editcap.html +#usr/share/doc/wireshark/etwdump.html +#usr/share/doc/wireshark/extcap.html +#usr/share/doc/wireshark/falcodump.html +#usr/share/doc/wireshark/mergecap.html +#usr/share/doc/wireshark/pdml2html.xsl +#usr/share/doc/wireshark/randpkt.html +#usr/share/doc/wireshark/randpktdump.html +#usr/share/doc/wireshark/rawshark.html +#usr/share/doc/wireshark/release-notes.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/wifidump.html +#usr/share/doc/wireshark/wireshark-filter.html +#usr/share/doc/wireshark/wireshark.html +#usr/share/doc/wireshark/ws.css +#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/dpauxmon.1 +#usr/share/man/man1/dumpcap.1 +#usr/share/man/man1/editcap.1 +#usr/share/man/man1/etwdump.1 +#usr/share/man/man1/falcodump.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/wifidump.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/Acknowledgements.md -#usr/share/wireshark/COPYING usr/share/wireshark/cfilters usr/share/wireshark/colorfilters #usr/share/wireshark/dfilter_macros @@ -756,11 +149,7 @@ 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/enterprises.tsv -#usr/share/wireshark/gpl-2.0-standalone.html #usr/share/wireshark/ipmap.html -#usr/share/wireshark/manuf -#usr/share/wireshark/pdml2html.xsl #usr/share/wireshark/profiles #usr/share/wireshark/profiles/Bluetooth #usr/share/wireshark/profiles/Bluetooth/colorfilters @@ -776,6 +165,7 @@ 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.5x9 usr/share/wireshark/radius/dictionary.acc usr/share/wireshark/radius/dictionary.acme usr/share/wireshark/radius/dictionary.actelis @@ -979,7 +369,6 @@ 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/services usr/share/wireshark/smi_modules #usr/share/wireshark/tpncp usr/share/wireshark/tpncp/tpncp.dat @@ -987,4 +376,3 @@ usr/share/wireshark/tpncp/tpncp.dat usr/share/wireshark/wimaxasncp/dictionary.dtd usr/share/wireshark/wimaxasncp/dictionary.xml usr/share/wireshark/wka -usr/share/wireshark/ws.css diff --git a/lfs/tshark b/lfs/tshark index 297b5f7ac..3d3411eb3 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = A Network Traffic Analyser -VER = 4.0.8 +VER = 4.2.5 THISAPP = wireshark-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tshark DEPS = c-ares -PAK_VER = 15 +PAK_VER = 16 SERVICES = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778 +$(DL_FILE)_BLAKE2 = 536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc install : $(TARGET) @@ -82,12 +82,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @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 \ + cd $(DIR_APP)/build && cmake .. \ + -DBUILD_wireshark=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_mmdbresolve=OFF - cd $(DIR_APP)/build && make $(MAKETUNING) cd $(DIR_APP)/build && make install -- 2.45.2

1 3

[PATCH] Stop unbound-dhcp-leases-bridge from continually restarting unbound
by Nick Howitt 18 Jun '24

18 Jun '24

Hi all, **** This is a repost of an email incorrectly submitted. **** Please bear with me as I am new to IPFire and not at all used to this style of development, so any guidance would be appreciated. There is a bug, https://bugzilla.ipfire.org/show_bug.cgi?id=13254, where unbound-dhcp-leases-bridge restarts unbound a lot when it is totally unnecessary. It appears to be because when a lease is renewed, the script gets triggered, created a new /etc/unbound/dhcp-leases.conf then restarts Unbound to read the file. Generally this seems to be unnecessary as, with a renewed lease, the old and new /etc/unbound/dhcp-leases.conf files are the same. With 5 leases in that file (one for a machine not active) I am getting 3-4 restarts an hour of Unbound when I have a min/max lease time of 60/120min. Looking at the code, it is fairly easy to fix. The current code creates a temp file then copies it into place then restarts unbound. All I am doing is doing a file comparison before the copy and skipping the restart if the files are the same. There were a couple of gotchas because setting the file attributes and copying the file were done inside the "with" block for generating the temporary file. This meant a file comparison always returned False as the temp file was still open and so never the same is the old file. I moved those two statements outside the "with". This forced me to change the fchmod to chmod. It could be argued that the file copy should not be done if the files are not different, but it would take an extra "if" and you'd have to remember to delete the temp file. If required, I can make that change. Also, one small thing I noticed once is that the old and new dhcp-leases.conf files could occasionally contain the same leases but in a different order. I have been unable to reproduce, but to sidestep it, instead of stepping through the leases variable directly, I sort it and step through that. It should make the resulting file completely deterministic and make the file comparison more effective. My patch is: From 73873d4944944a2f02317a73074a6894726f36f7 Mon Sep 17 00:00:00 2001 From: Nick Howitt <nick(a)howitts.co.uk> Date: Sun, 24 Mar 2024 15:17:19 +0000 Subject: [PATCH] Stop unbound-dhcp-leases-bridge from restarting unbound every time it write dhcp-leases.conf as it is very often unchanged and does not require a restart. --- config/unbound/unbound-dhcp-leases-bridge | 28 +++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index e9f022aff..d22772066 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -22,6 +22,7 @@ import argparse import datetime import daemon +import filecmp import functools import ipaddress import logging @@ -516,26 +517,35 @@ class UnboundConfigWriter(object): def update_dhcp_leases(self, leases): # Write out all leases - self.write_dhcp_leases(leases) + if self.write_dhcp_leases(leases): - log.debug("Reloading Unbound...") + log.debug("Reloading Unbound...") - # Reload the configuration without dropping the cache - self._control("reload_keep_cache") + # Reload the configuration without dropping the cache + self._control("reload_keep_cache") + + else: + + log.debug("Not reloading Unbound. Leases not changed.") def write_dhcp_leases(self, leases): log.debug("Writing DHCP leases...") with tempfile.NamedTemporaryFile(mode="w", delete=False) as f: - for l in leases: + for l in sorted(leases): for rr in l.rrset: f.write("local-data: \"%s\"\n" % " ".join(rr)) - # Make file readable for everyone - os.fchmod(f.fileno(), stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH) + filecmp.clear_cache() + RequireUnboundReload = not filecmp.cmp(f.name, self.path, shallow=False) + + # Make file readable for everyone + os.chmod(f.name, stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH) + + # Move the file to its destination + os.rename(f.name, self.path) - # Move the file to its destination - os.rename(f.name, self.path) + return RequireUnboundReload def _control(self, *args): command = ["unbound-control"] -- 2.43.0 I have this locally on a branch on my firewall. If it is OK, do I need some sort of rights to push my branch and then how I get it merged? Regards, Nick

3 21

[PATCH] iw: Update to version 6.9
by Adolf Belka 18 Jun '24

18 Jun '24

- Update from version 5.19 to 6.9 - Update of rootfile not required - Changelog There is no changelog available for this package. Details of changes can be found in the git commit log https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git/log/ Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/iw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/iw b/lfs/iw index 46bd8c23c..eb4a5c77f 100644 --- a/lfs/iw +++ b/lfs/iw @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 5.19 +VER = 6.9 THISAPP = iw-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a +$(DL_FILE)_BLAKE2 = 90fca854795fb7e32675d14158250c0b0b06b0d757f375636bcf538fc5f9a658eab8ee39331465b93545e0b0b49ad29f92f5119a6f4e187fb84eca9c9e5151c2 install : $(TARGET) -- 2.45.2

1 5

[PATCH 1/2] taglib: Update to version 2.0.1
by Adolf Belka 17 Jun '24

17 Jun '24

- Update from version 1.12 to 2.0.1 - Update of rootfile - sobump so ran find-dependencies. None found except taglib itself. - build of taglib now requires utfcpp. Patch for build of this is part of this patch set. - Changelog 2.0.1 (Apr 9, 2024) * Fix aborting when _GLIBCXX_ASSERTIONS are enabled. * Fall back to utf8cpp header detection in the case that its CMake configuration is removed. * Improve compatibility with the SWIG interface compiler. * Build system fixes for testing without bindings, Emscripten and Illumos. * C bindings: Fix setting UTF-8 encoded property values. * Windows: Fix opening long paths. 2.0 (Jan 24, 2024) * New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted. * Requires a C++17 compiler and uses features of C++17. * Major code cleanup, fixed warnings issued by compilers and static analyzers. * Made methods virtual which should have been virtual but could not be changed to keep binary compatibility, remove related workarounds. * Removed deprecated functions: - APE::Item::Item(const String &, const String &) - APE::Item::toStringList(): Use values() - APE::Item::value(): Use binaryData() - ASF::Properties::setLength() - ByteVector::checksum() - ByteVector::isNull(): Use isEmpty() - ByteVector::null - FLAC::File::setID3v2FrameFactory() - FLAC::File::streamInfoData() - FLAC::File::streamLength() - FLAC::Properties::Properties(File *, ReadStyle) - FLAC::Properties::sampleWidth(): Use bitsPerSample() - File::isReadable(): Use system functions - File::isWritable(): Use system functions - FileName::str() - FileRef::create(): Use constructor - MP4::Tag::itemListMap(): Use itemMap() - MPC::File::remove(): Use strip() - MPC::Properties::Properties(const ByteVector &, long, ReadStyle) - MPEG::File::save(int, ...): Use overload - MPEG::File::setID3v2FrameFactory(): Use constructor - MPEG::ID3v2::Frame::Header::Header(const ByteVector &, bool) - MPEG::ID3v2::Frame::Header::frameAlterPreservation(): Use fileAlterPreservation() - MPEG::ID3v2::Frame::Header::setData(const ByteVector &, bool) - MPEG::ID3v2::Frame::Header::size(unsigned int): Use size() - MPEG::ID3v2::Frame::Header::unsycronisation(): use unsynchronisation() - MPEG::ID3v2::Frame::checkEncoding(const StringList &, String::Type): Use checkTextEncoding(const StringList &, String::Type) - MPEG::ID3v2::Frame::headerSize(): Use Header::size() - MPEG::ID3v2::Frame::headerSize(unsigned int): Use Header::size(unsigned int) - MPEG::ID3v2::FrameFactory::createFrame(const ByteVector &, bool) - MPEG::ID3v2::FrameFactory::createFrame(const ByteVector &, unsigned int): Use createFrame(const ByteVector &, const Header *) - MPEG::ID3v2::RelativeVolumeFrame::channelType() - MPEG::ID3v2::RelativeVolumeFrame::peakVolume(): Use peakVolume(ChannelType) - MPEG::ID3v2::RelativeVolumeFrame::setChannelType() - MPEG::ID3v2::RelativeVolumeFrame::setPeakVolume(const PeakVolume &): Use setPeakVolume(const PeakVolume &, ChannelType) - MPEG::ID3v2::RelativeVolumeFrame::setVolumeAdjustment(float): Use setVolumeAdjustment(float, ChannelType) - MPEG::ID3v2::RelativeVolumeFrame::setVolumeAdjustmentIndex(short): Use setVolumeAdjustmentIndex(short, ChannelType) - MPEG::ID3v2::RelativeVolumeFrame::volumeAdjustment(): Use volumeAdjustment(ChannelType) - MPEG::ID3v2::RelativeVolumeFrame::volumeAdjustmentIndex(): Use volumeAdjustmentIndex(ChannelType) - MPEG::ID3v2::Tag::footer() - MPEG::ID3v2::Tag::render(int): Use render(Version) - MPEG::XingHeader::xingHeaderOffset() - Ogg::Page::getCopyWithNewPageSequenceNumber() - Ogg::XiphComment::removeField(): Use removeFields() - PropertyMap::unsupportedData(): Returns now const reference, use addUnsupportedData() to add keys - RIFF::AIFF::Properties::Properties(const ByteVector &, ReadStyle) - RIFF::AIFF::Properties::Properties(const ByteVector &, int, ReadStyle) - RIFF::AIFF::Properties::sampleWidth(): Use bitsPerSample() - RIFF::WAV::File::save(TagTypes, bool, int): Use save(TagTypes, StripTags, Version) - RIFF::WAV::File::tag(): Returns now a TagUnion, use ID3v2Tag() to get an ID3v2::Tag - String::isNull(): Use isEmpty() - String::null - TrueAudio::File::setID3v2FrameFactory(): Use constructor - WavPack::Properties::Properties(const ByteVector &, long, ReadStyle) * Made methods const: Frame::Header::size(), Frame::headerSize(), MP4::Atom::findall(), MP4::Atoms::find(), MP4::Atoms::path(). * Made classes non-virtual: APE::Footer, APE::Item, ASF::Attribute, ASF::Picture, MP4::CoverArt, MP4::Item, ID3v2::ExtendedHeader, ID3v2::Footer, ID3v2::Header, MPEG::Header, MPEG::XingHeader, Ogg::Page, Ogg::PageHeader. * Removed type definitions in TagLib namespace: wchar, uchar, ushort, uint, ulong, ulonglong, wstring: Use the standard types. * Removed include file taglib_config.h and its defines TAGLIB_WITH_ASF, TAGLIB_WITH_MP4: They were always 1 since version 1.8. * Behavioral changes: - The basic tag methods (e.g. genre()) separate multiple values with " / " instead of " ". - The stream operator for String uses UTF-8 instead of ISO-8859-1 encoding. - MP4 property ORIGINALDATE is mapped to "----:com.apple.iTunes:ORIGINALDATE" instead of "----:com.apple.iTunes:originaldate". - MP4 property ENCODEDBY is mapped to "©enc" instead of "©too", which is now mapped to ENCODING. * Unified interface for complex properties like pictures. * Simplified the unified properties interface by providing its methods on FileRef. * C bindings: Support for properties (taglib_property_...) and complex properties like cover art (taglib_complex_property_...), memory I/O streams. * Support for Direct Stream Digital (DSD) stream files (DSF) and interchange file format (DSDIFF, DFF), ADTS (AAC) files. * The runtime version can be queried. * Additional utility functions ByteVector::fromUShort(), ByteVector::fromULongLong(), ByteVector::toULongLong(), ByteVector::toULongLong(), List::sort(). * Fixed List::setAutoDelete() affecting implicitly shared copies. * Build system: Direct support for CMake, find_package(TagLib) exports target TagLib::tag. * Build system: Fixed PackageConfig to support both relative and absolute paths. * Build system: utf8cpp is no longer included, it can be provided via a system package or a Git submodule. * ASF: Support additional properties ARTISTWEBPAGE, ENCODING, ENCODINGTIME, FILEWEBPAGE, INITIALKEY, ORIGINALALBUM, ORIGINALARTIST, ORIGINALFILENAME, ORIGINALLYRICIST. * ID3v2: Fixed extensibility of FrameFactory, use it also for WAV and AIFF files. * MP4: Support additional properties OWNER, RELEASEDATE. * MP4: Introduced ItemFactory allowing clients to support new atom types. * MP4: Detect duration from mvhd atom if not present in mdhd atom. * MP4: Fixed type of hdvd atom to be integer instead of boolean. * MP4: Tolerate trailing garbage in M4A files. * MPC: Fixed content check in presence of an ID3v2 tag. * MPEG: Do not scan full file for ID3v2 tag when ReadStyle Fast is used. * RIFF: Support properties ALBUM, ARRANGER, ARTIST, ARTISTWEBPAGE, BPM, COMMENT, COMPOSER, COPYRIGHT, DATE, DISCSUBTITLE, ENCODEDBY, ENCODING, ENCODINGTIME, GENRE, ISRC, LABEL, LANGUAGE, LYRICIST, MEDIA, PERFORMER, RELEASECOUNTRY, REMIXER, TITLE, TRACKNUMBER. * WAV: Fixed crash with files having the "id3 " chunk as the only valid chunk. * Windows: Fixed support for files larger than 2GB. 1.13.1 (Jul 1, 2023) * Fixed parsing of TXXX frames without description. * Detect MP4 atoms with invalid length or type. * Do not miss ID3v2 frames when an extended header is present. * Use property "DISCSUBTITLE" for ID3v2 "TSST" frame. * Build system improvements: Use absolute path for macOS dylib install name, support --define-prefix when using pkg-config, fixed minimum required CppUnit version. * Code clean up using clang-tidy. 1.13 (Oct 27, 2022) * Added interface StreamTypeResolver to support streams which cannot be fopen()'ed, e.g. network files. * Added MP4::File::strip() to remove meta atom from MP4 file. * Added Map::value() to look up without creating entry. * Use property "WORK" instead of "CONTENTGROUP" for ID3v2 "TIT1" frame, use property "WORK" for ASF "WM/ContentGroupDescription", use property "COMPILATION" for ID3v2 "TCMP" frame. * Build system improvements: option WITH_ZLIB, BUILD_TESTING instead of BUILD_TESTS, GNUInstallDirs, FeatureSummary, tests with BUILD_SHARED_LIBS, cross compilation with Buildroot, systems without HAVE_GCC_ATOMIC, Clang. * Fixed heap-buffer-overflows when handling ASF, APE, FLAC, ID3v2, MP4, MPC tags. * Fixed detection of invalid file by extension when correct type can be detected by contents. * Fixed unnecessary creation of map entries in APE and FLAC tags if looked up tag does not exist. * Fixed parsing of MP4 non-full meta atoms. * Fixed potential ID3v1 false positive in the presence of an APE tag. * Fixed ID3v2 version handling for frames embedded in CHAP or CTOC frames. * Fixed parsing of multiple strings with a single BOM in ID3v2.4.0. * Fixed several smaller issues reported by clang-tidy. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/taglib | 28 ++++++++++++++++++++-------- lfs/taglib | 8 ++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/taglib b/config/rootfiles/packages/taglib index fa341c1e5..1341d11ed 100644 --- a/config/rootfiles/packages/taglib +++ b/config/rootfiles/packages/taglib @@ -16,6 +16,11 @@ usr/bin/taglib-config #usr/include/taglib/audioproperties.h #usr/include/taglib/chapterframe.h #usr/include/taglib/commentsframe.h +#usr/include/taglib/dsdiffdiintag.h +#usr/include/taglib/dsdifffile.h +#usr/include/taglib/dsdiffproperties.h +#usr/include/taglib/dsffile.h +#usr/include/taglib/dsfproperties.h #usr/include/taglib/eventtimingcodesframe.h #usr/include/taglib/fileref.h #usr/include/taglib/flacfile.h @@ -44,6 +49,7 @@ usr/bin/taglib-config #usr/include/taglib/mp4coverart.h #usr/include/taglib/mp4file.h #usr/include/taglib/mp4item.h +#usr/include/taglib/mp4itemfactory.h #usr/include/taglib/mp4properties.h #usr/include/taglib/mp4tag.h #usr/include/taglib/mpcfile.h @@ -72,7 +78,6 @@ usr/bin/taglib-config #usr/include/taglib/tag.h #usr/include/taglib/tag_c.h #usr/include/taglib/taglib.h -#usr/include/taglib/taglib_config.h #usr/include/taglib/taglib_export.h #usr/include/taglib/tbytevector.h #usr/include/taglib/tbytevectorlist.h @@ -86,12 +91,14 @@ usr/bin/taglib-config #usr/include/taglib/tlist.tcc #usr/include/taglib/tmap.h #usr/include/taglib/tmap.tcc +#usr/include/taglib/tpicturetype.h #usr/include/taglib/tpropertymap.h -#usr/include/taglib/trefcounter.h #usr/include/taglib/trueaudiofile.h #usr/include/taglib/trueaudioproperties.h #usr/include/taglib/tstring.h #usr/include/taglib/tstringlist.h +#usr/include/taglib/tvariant.h +#usr/include/taglib/tversionnumber.h #usr/include/taglib/uniquefileidentifierframe.h #usr/include/taglib/unknownframe.h #usr/include/taglib/unsynchronizedlyricsframe.h @@ -106,11 +113,16 @@ usr/bin/taglib-config #usr/include/taglib/xiphcomment.h #usr/include/taglib/xmfile.h #usr/include/taglib/xmproperties.h -usr/lib/libtag.so -usr/lib/libtag.so.1 -usr/lib/libtag.so.1.18.0 -usr/lib/libtag_c.so -usr/lib/libtag_c.so.0 -usr/lib/libtag_c.so.0.0.0 +#usr/lib/cmake/taglib +#usr/lib/cmake/taglib/taglib-config-version.cmake +#usr/lib/cmake/taglib/taglib-config.cmake +#usr/lib/cmake/taglib/taglib-targets-release.cmake +#usr/lib/cmake/taglib/taglib-targets.cmake +#usr/lib/libtag.so +usr/lib/libtag.so.2 +usr/lib/libtag.so.2.0.1 +#usr/lib/libtag_c.so +usr/lib/libtag_c.so.2 +usr/lib/libtag_c.so.2.0.1 #usr/lib/pkgconfig/taglib.pc #usr/lib/pkgconfig/taglib_c.pc diff --git a/lfs/taglib b/lfs/taglib index 8177c9939..a211df139 100644 --- a/lfs/taglib +++ b/lfs/taglib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Audio Meta-Data Library -VER = 1.12 +VER = 2.0.1 THISAPP = taglib-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = taglib -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3b1a3a9c43c54d502a0bc97935ce4bc521684ad06c955b893a5700dcf458da14aaa96dde991ef33cc8c2ad4f0b4a4625c4345d20f2594455df84c9e11f3e2a5d +$(DL_FILE)_BLAKE2 = a39997b3185609b47b4d20c12b9d131eee32a2846627799d83df98eaaf5b909514fd97667e779715b940f0866252d02a523fa9d87534ea3cdefbd27449cbe714 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) -- 2.45.2

1 1

Core Update 186 overwrites latest Squid access.log file
by Peter Müller 17 Jun '24

17 Jun '24

Hello *, while installing stable Core Update 186, I noticed that it ships /var/log/squid/access.log, which will effectively overwrite the latest Squid access log file with an empty file. This is not something we want to do, but I defer to your judgement whether or not this warrants a rebuild of stable Core Update 186. :-) Thanks, and best regards, Peter Müller

2 1

[PATCH] cleanfs: Clean /home/nobody/ as well
by Peter Müller 16 Jun '24

16 Jun '24

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/initscripts/system/cleanfs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs index d1cbb2547..c78703070 100644 --- a/src/initscripts/system/cleanfs +++ b/src/initscripts/system/cleanfs @@ -112,6 +112,9 @@ case "${1}" in fi boot_mesg -n "Cleaning file systems:" ${INFO} + boot_mesg -n " /home/nobody" ${NORMAL} + cd /home/nobody/ && find . -mindepth 1 -delete || failed=1 + boot_mesg -n " /tmp" ${NORMAL} cd /tmp && find . -xdev -mindepth 1 ! -name lost+found \ -- 2.35.3

2 2

[PATCH] strongswan: Create firewall rules for outgoing IPsec traffic as well
by Peter Müller 16 Jun '24

16 Jun '24

This will avoid outgoing IPsec traffic being dropped by IPFire itself, if the default firewall behavior for outgoing traffic is set to "blocked", and no appropriate rules have been manually configured in the web interface. To ensure configured IPsec tunnels will always work flawlessly, regardless of the firewall default policy and any manually created firewall rules, create and delete outgoing iptables rules accordingly when bringing an IPsec connection up or down. Tested-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/patches/strongswan-ipfire.patch | 49 +++++++++++++++++------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/src/patches/strongswan-ipfire.patch b/src/patches/strongswan-ipfire.patch index d8e35cd52..a1f80d361 100644 --- a/src/patches/strongswan-ipfire.patch +++ b/src/patches/strongswan-ipfire.patch @@ -1,13 +1,5 @@ -commit b439f74361d393bcb85109b6c41a905cf613a296 -Author: Peter Müller <peter.mueller(a)ipfire.org> -Date: Wed May 18 17:46:57 2022 +0000 - - IPFire modifications to _updown script - - Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> - diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in -index 34eaf68c7..9ed387a0a 100644 +index 34eaf68c7..38aa63354 100644 --- a/src/_updown/_updown.in +++ b/src/_updown/_updown.in @@ -242,10 +242,10 @@ up-host:iptables) @@ -98,7 +90,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT fi # -@@ -342,47 +324,37 @@ up-client:iptables) +@@ -342,47 +324,46 @@ up-client:iptables) if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO \ @@ -111,7 +103,7 @@ index 34eaf68c7..9ed387a0a 100644 fi fi + -+ # Open Firewall for IPinIP + AH + ESP Traffic ++ # Open firewall for incoming and outgoing IPinIP + AH + ESP traffic to the peers' IP + iptables --wait -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p IPIP \ + -s $PLUTO_PEER $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT -j ACCEPT @@ -121,6 +113,15 @@ index 34eaf68c7..9ed387a0a 100644 + iptables --wait -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \ + -s $PLUTO_PEER $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables --wait -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p IPIP \ ++ -s $PLUTO_ME $D_MY_PORT \ ++ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT ++ iptables --wait -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p AH \ ++ -s $PLUTO_ME $D_MY_PORT \ ++ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT ++ iptables --wait -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p ESP \ ++ -s $PLUTO_ME $D_MY_PORT \ ++ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT + ;; down-client:iptables) @@ -161,7 +162,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT fi # -@@ -392,12 +364,24 @@ down-client:iptables) +@@ -392,12 +373,32 @@ down-client:iptables) if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO -- \ @@ -174,7 +175,7 @@ index 34eaf68c7..9ed387a0a 100644 fi fi + -+ # Close Firewall for IPinIP + AH + ESP Traffic ++ # Close firewall for incoming and outgoing IPinIP + AH + ESP traffic to the peers' IP + iptables --wait -D IPSECINPUT -i $PLUTO_INTERFACE -p IPIP \ + -s $PLUTO_PEER $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT -j ACCEPT @@ -184,11 +185,19 @@ index 34eaf68c7..9ed387a0a 100644 + iptables --wait -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \ + -s $PLUTO_PEER $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ ++ iptables --wait -D IPSECINPUT -o $PLUTO_INTERFACE -p IPIP \ ++ -s $PLUTO_ME $D_MY_PORT \ ++ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT ++ iptables --wait -D IPSECINPUT -o $PLUTO_INTERFACE -p AH \ ++ -s $PLUTO_ME $D_MY_PORT \ ++ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT ++ iptables --wait -D IPSECINPUT -o $PLUTO_INTERFACE -p ESP \ ++ -s $PLUTO_ME $D_MY_PORT \ ++ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT ;; # # IPv6 -@@ -422,10 +406,10 @@ up-host-v6:iptables) +@@ -422,10 +423,10 @@ up-host-v6:iptables) # connection to me, with (left/right)firewall=yes, coming up # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -201,7 +210,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT # -@@ -454,10 +438,10 @@ down-host-v6:iptables) +@@ -454,10 +455,10 @@ down-host-v6:iptables) # connection to me, with (left/right)firewall=yes, going down # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -214,7 +223,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT # -@@ -487,10 +471,10 @@ up-client-v6:iptables) +@@ -487,10 +488,10 @@ up-client-v6:iptables) # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] then @@ -227,7 +236,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT fi -@@ -499,10 +483,10 @@ up-client-v6:iptables) +@@ -499,10 +500,10 @@ up-client-v6:iptables) # or sometimes host access via the internal IP is needed if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] then @@ -240,7 +249,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_MY_CLIENT $S_MY_PORT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT fi -@@ -535,11 +519,11 @@ down-client-v6:iptables) +@@ -535,11 +536,11 @@ down-client-v6:iptables) # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] then @@ -254,7 +263,7 @@ index 34eaf68c7..9ed387a0a 100644 -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT \ $IPSEC_POLICY_IN -j ACCEPT -@@ -549,11 +533,11 @@ down-client-v6:iptables) +@@ -549,11 +550,11 @@ down-client-v6:iptables) # or sometimes host access via the internal IP is needed if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] then -- 2.35.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2024