* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b71fe1a1e7bea7d95777ceb6a0bc0c8a87ea14f6
@ 2024-10-12 9:38 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2024-10-12 9:38 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 18336 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via b71fe1a1e7bea7d95777ceb6a0bc0c8a87ea14f6 (commit)
via 32ec5667d9a63b64ae39274af22b44eb4adc5fbd (commit)
from 24f875d7878d7caddcbc809169464f248bc75b26 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b71fe1a1e7bea7d95777ceb6a0bc0c8a87ea14f6
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Oct 10 18:01:11 2024 +0200
tshark: Update to version 4.4.1
- Update from version 4.2.7 to 4.4.1
- The 4.4.x series is the new Stable Release replascing the 4.2.x series which becomes
the Old Stable Release.
- There is an sobump so find-dependencies was run for the three libraries with changes
but all linked programs are within tshark.
- Changelog is too large to include here. Links provided
4.4.1
https://www.wireshark.org/docs/relnotes/wireshark-4.4.1.html
4.4.0
https://www.wireshark.org/docs/relnotes/wireshark-4.4.0.html
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 32ec5667d9a63b64ae39274af22b44eb4adc5fbd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 12 09:34:45 2024 +0000
make.sh: Show rootfiles that contain some architecture
Previously, make.sh just failed but did not explain why it was unhappy.
This patch adds a message which rootfiles contain which architecture.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/tshark | 100 +++++++++++++++++++++++++++------------
lfs/tshark | 6 +--
make.sh | 16 +++++--
3 files changed, 85 insertions(+), 37 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index a177b7b31..1a2df8938 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -11,14 +11,14 @@ usr/bin/dumpcap
#usr/bin/text2pcap
usr/bin/tshark
#usr/lib/libwireshark.so
-usr/lib/libwireshark.so.17
-usr/lib/libwireshark.so.17.0.7
+usr/lib/libwireshark.so.18
+usr/lib/libwireshark.so.18.0.1
#usr/lib/libwiretap.so
-usr/lib/libwiretap.so.14
-usr/lib/libwiretap.so.14.1.7
+usr/lib/libwiretap.so.15
+usr/lib/libwiretap.so.15.0.1
#usr/lib/libwsutil.so
-usr/lib/libwsutil.so.15
-usr/lib/libwsutil.so.15.0.0
+usr/lib/libwsutil.so.16
+usr/lib/libwsutil.so.16.0.0
#usr/lib/wireshark
#usr/lib/wireshark/extcap
usr/lib/wireshark/extcap/androiddump
@@ -29,26 +29,27 @@ usr/lib/wireshark/extcap/sshdump
usr/lib/wireshark/extcap/udpdump
usr/lib/wireshark/extcap/wifidump
#usr/lib/wireshark/plugins
-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/lib/wireshark/plugins/4.4
+usr/lib/wireshark/plugins/4.4/codecs
+usr/lib/wireshark/plugins/4.4/codecs/g711.so
+usr/lib/wireshark/plugins/4.4/codecs/l16mono.so
+usr/lib/wireshark/plugins/4.4/codecs/opus_dec.so
+usr/lib/wireshark/plugins/4.4/epan
+usr/lib/wireshark/plugins/4.4/epan/ethercat.so
+usr/lib/wireshark/plugins/4.4/epan/gryphon.so
+usr/lib/wireshark/plugins/4.4/epan/ipaddr.so
+usr/lib/wireshark/plugins/4.4/epan/irda.so
+usr/lib/wireshark/plugins/4.4/epan/mate.so
+usr/lib/wireshark/plugins/4.4/epan/opcua.so
+usr/lib/wireshark/plugins/4.4/epan/profinet.so
+usr/lib/wireshark/plugins/4.4/epan/stats_tree.so
+usr/lib/wireshark/plugins/4.4/epan/transum.so
+usr/lib/wireshark/plugins/4.4/epan/unistim.so
+usr/lib/wireshark/plugins/4.4/epan/wimax.so
+usr/lib/wireshark/plugins/4.4/epan/wimaxasncp.so
+usr/lib/wireshark/plugins/4.4/epan/wimaxmacphy.so
+usr/lib/wireshark/plugins/4.4/wiretap
+usr/lib/wireshark/plugins/4.4/wiretap/usbdump.so
#usr/share/doc/wireshark
#usr/share/doc/wireshark/COPYING
#usr/share/doc/wireshark/README.xml-output
@@ -102,7 +103,6 @@ usr/lib/wireshark/plugins/4.2/wiretap/usbdump.so
#usr/share/wireshark
usr/share/wireshark/cfilters
usr/share/wireshark/colorfilters
-#usr/share/wireshark/dfilter_macros
usr/share/wireshark/dfilters
#usr/share/wireshark/diameter
usr/share/wireshark/diameter/AlcatelLucent.xml
@@ -124,6 +124,7 @@ usr/share/wireshark/diameter/Starent.xml
usr/share/wireshark/diameter/TGPP.xml
usr/share/wireshark/diameter/TGPP2.xml
usr/share/wireshark/diameter/Telefonica.xml
+usr/share/wireshark/diameter/Travelping.xml
usr/share/wireshark/diameter/VerizonWireless.xml
usr/share/wireshark/diameter/Vodafone.xml
usr/share/wireshark/diameter/chargecontrol.xml
@@ -136,6 +137,7 @@ 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/dmacros
#usr/share/wireshark/dtds
usr/share/wireshark/dtds/dc.dtd
usr/share/wireshark/dtds/itunes.dtd
@@ -159,6 +161,7 @@ usr/share/wireshark/dtds/xcap-error.dtd
#usr/share/wireshark/profiles/No Reassembly
#usr/share/wireshark/profiles/No Reassembly/preferences
#usr/share/wireshark/radius
+usr/share/wireshark/radius/.editorconfig
#usr/share/wireshark/radius/README.radius_dictionary
usr/share/wireshark/radius/custom.includes
usr/share/wireshark/radius/dictionary
@@ -169,12 +172,15 @@ usr/share/wireshark/radius/dictionary.5x9
usr/share/wireshark/radius/dictionary.acc
usr/share/wireshark/radius/dictionary.acme
usr/share/wireshark/radius/dictionary.actelis
+usr/share/wireshark/radius/dictionary.adtran
+usr/share/wireshark/radius/dictionary.adva
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.alphion
usr/share/wireshark/radius/dictionary.alteon
usr/share/wireshark/radius/dictionary.altiga
usr/share/wireshark/radius/dictionary.alvarion
@@ -183,15 +189,19 @@ usr/share/wireshark/radius/dictionary.apc
usr/share/wireshark/radius/dictionary.aptilo
usr/share/wireshark/radius/dictionary.aptis
usr/share/wireshark/radius/dictionary.arbor
+usr/share/wireshark/radius/dictionary.arista
usr/share/wireshark/radius/dictionary.aruba
usr/share/wireshark/radius/dictionary.ascend
+usr/share/wireshark/radius/dictionary.ascend.illegal
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.bigswitch
usr/share/wireshark/radius/dictionary.bintec
usr/share/wireshark/radius/dictionary.bluecoat
+usr/share/wireshark/radius/dictionary.boingo
usr/share/wireshark/radius/dictionary.bristol
usr/share/wireshark/radius/dictionary.broadsoft
usr/share/wireshark/radius/dictionary.brocade
@@ -199,14 +209,20 @@ 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.calix
+usr/share/wireshark/radius/dictionary.cambium
usr/share/wireshark/radius/dictionary.camiant
+usr/share/wireshark/radius/dictionary.centec
+usr/share/wireshark/radius/dictionary.checkpoint
usr/share/wireshark/radius/dictionary.chillispot
+usr/share/wireshark/radius/dictionary.ciena
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.ckey
usr/share/wireshark/radius/dictionary.clavister
usr/share/wireshark/radius/dictionary.cnergee
usr/share/wireshark/radius/dictionary.colubris
@@ -214,13 +230,14 @@ 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.covaro
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.eleven
usr/share/wireshark/radius/dictionary.eltex
usr/share/wireshark/radius/dictionary.enterasys
usr/share/wireshark/radius/dictionary.epygi
@@ -228,24 +245,29 @@ 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.erx
usr/share/wireshark/radius/dictionary.extreme
usr/share/wireshark/radius/dictionary.f5
usr/share/wireshark/radius/dictionary.fdxtended
+usr/share/wireshark/radius/dictionary.force10
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.evs5
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.hillstone
usr/share/wireshark/radius/dictionary.hp
usr/share/wireshark/radius/dictionary.huawei
usr/share/wireshark/radius/dictionary.iana
usr/share/wireshark/radius/dictionary.identity_engines
usr/share/wireshark/radius/dictionary.iea
+usr/share/wireshark/radius/dictionary.infinera
usr/share/wireshark/radius/dictionary.infoblox
usr/share/wireshark/radius/dictionary.infonet
usr/share/wireshark/radius/dictionary.ipunplugged
@@ -256,39 +278,50 @@ 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.lantronix
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.mellanox
usr/share/wireshark/radius/dictionary.meraki
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.mimosa
usr/share/wireshark/radius/dictionary.motorola
+usr/share/wireshark/radius/dictionary.motorola.illegal
usr/share/wireshark/radius/dictionary.motorola.wimax
usr/share/wireshark/radius/dictionary.navini
+usr/share/wireshark/radius/dictionary.net
+usr/share/wireshark/radius/dictionary.netelastic
usr/share/wireshark/radius/dictionary.netscreen
usr/share/wireshark/radius/dictionary.networkphysics
usr/share/wireshark/radius/dictionary.nexans
+usr/share/wireshark/radius/dictionary.nile
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.openwifi
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.pfsense
+usr/share/wireshark/radius/dictionary.pica8
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.rcntec
usr/share/wireshark/radius/dictionary.redcreek
usr/share/wireshark/radius/dictionary.rfc2865
usr/share/wireshark/radius/dictionary.rfc2866
@@ -322,6 +355,8 @@ 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.rfc8045
+usr/share/wireshark/radius/dictionary.rfc8559
usr/share/wireshark/radius/dictionary.riverbed
usr/share/wireshark/radius/dictionary.riverstone
usr/share/wireshark/radius/dictionary.roaringpenguin
@@ -333,7 +368,9 @@ 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.smartsharesystems
usr/share/wireshark/radius/dictionary.sofaware
+usr/share/wireshark/radius/dictionary.softbank
usr/share/wireshark/radius/dictionary.sonicwall
usr/share/wireshark/radius/dictionary.springtide
usr/share/wireshark/radius/dictionary.starent
@@ -343,22 +380,27 @@ 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.telrad
usr/share/wireshark/radius/dictionary.terena
+usr/share/wireshark/radius/dictionary.tplink
usr/share/wireshark/radius/dictionary.trapeze
usr/share/wireshark/radius/dictionary.travelping
+usr/share/wireshark/radius/dictionary.tripplite
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.usr.illegal
usr/share/wireshark/radius/dictionary.utstarcom
usr/share/wireshark/radius/dictionary.valemount
+usr/share/wireshark/radius/dictionary.vasexperts
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.wifialliance
usr/share/wireshark/radius/dictionary.wimax
usr/share/wireshark/radius/dictionary.wimax.alvarion
usr/share/wireshark/radius/dictionary.wimax.wichorus
diff --git a/lfs/tshark b/lfs/tshark
index c4d29c8e1..de079aa8d 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -26,7 +26,7 @@ include Config
SUMMARY = A Network Traffic Analyser
-VER = 4.2.7
+VER = 4.4.1
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 = 18
+PAK_VER = 19
SERVICES =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ab82c4ff9afa0fecb3cddbabc7441c3f457c2ccfc39f8a1e65f5d4df752bbdf7cb3d892db5a3de86ec055b12c512f4d067f6d98626ecd2f58f31052e10415be8
+$(DL_FILE)_BLAKE2 = 747ffe14a7b30c4d7bb435bff1fded11efcf03a8bfcacd48d36141fae7a9cfb7965076b1a807d7f095f66bb99148732c090493d2c3654b4a20355f8dbeac3972
install : $(TARGET)
diff --git a/make.sh b/make.sh
index c85d9dbb6..7129c36e7 100755
--- a/make.sh
+++ b/make.sh
@@ -2197,12 +2197,18 @@ check_rootfiles_for_arch() {
args+=( "--exclude" "${x}" )
done
- # Search for all lines that contain the architecture, but exclude commented lines
- if grep -r "^[^#].*${arch}" "${args[@]}"; then
- return 1
- fi
+ # Search for all files that contain the architecture, but exclude commented lines
+ local files=(
+ $(grep --files-with-matches -r "^[^#].*${arch}" "${args[@]}")
+ )
- return 0
+ local file
+ for file in ${files[@]}; do
+ print_line "${file} contains ${arch}"
+ print_status FAIL
+ done
+
+ return "${#files[@]}"
}
check_rootfiles_for_pattern() {
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-10-12 9:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-12 9:38 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b71fe1a1e7bea7d95777ceb6a0bc0c8a87ea14f6 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox