* [PATCH 1/2] c-ares: New package. Needed as tshark Dependency
@ 2020-12-06 15:03 ummeegge
2020-12-06 15:03 ` [PATCH 2/2] tshark: Update to version 3.4.0 ummeegge
0 siblings, 1 reply; 2+ messages in thread
From: ummeegge @ 2020-12-06 15:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7508 bytes --]
- Since tshark uses with version 3.4.0 an always enabled asynchronous DNS
resolution c-ares is a needed dependency.
- Since curl can also use c-ares --> https://c-ares.haxx.se/ it has been
placed in make.sh before curl even no compiletime options has been set
to enable this. c-ares has also been placed in packages and not in common
which would be needed if it should be used for curl too.
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
---
config/rootfiles/packages/c-ares | 68 ++++++++++++++++++++++++
lfs/c-ares | 89 ++++++++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 158 insertions(+)
create mode 100644 config/rootfiles/packages/c-ares
create mode 100644 lfs/c-ares
diff --git a/config/rootfiles/packages/c-ares b/config/rootfiles/packages/c-ares
new file mode 100644
index 000000000..6027768f3
--- /dev/null
+++ b/config/rootfiles/packages/c-ares
@@ -0,0 +1,68 @@
+#usr/include/ares.h
+#usr/include/ares_build.h
+#usr/include/ares_dns.h
+#usr/include/ares_rules.h
+#usr/include/ares_version.h
+#usr/lib/libcares.la
+#usr/lib/libcares.so
+usr/lib/libcares.so.2
+usr/lib/libcares.so.2.4.2
+#usr/lib/pkgconfig/libcares.pc
+#usr/share/man/man3/ares_cancel.3
+#usr/share/man/man3/ares_create_query.3
+#usr/share/man/man3/ares_destroy.3
+#usr/share/man/man3/ares_destroy_options.3
+#usr/share/man/man3/ares_dup.3
+#usr/share/man/man3/ares_expand_name.3
+#usr/share/man/man3/ares_expand_string.3
+#usr/share/man/man3/ares_fds.3
+#usr/share/man/man3/ares_free_data.3
+#usr/share/man/man3/ares_free_hostent.3
+#usr/share/man/man3/ares_free_string.3
+#usr/share/man/man3/ares_freeaddrinfo.3
+#usr/share/man/man3/ares_get_servers.3
+#usr/share/man/man3/ares_get_servers_ports.3
+#usr/share/man/man3/ares_getaddrinfo.3
+#usr/share/man/man3/ares_gethostbyaddr.3
+#usr/share/man/man3/ares_gethostbyname.3
+#usr/share/man/man3/ares_gethostbyname_file.3
+#usr/share/man/man3/ares_getnameinfo.3
+#usr/share/man/man3/ares_getsock.3
+#usr/share/man/man3/ares_inet_ntop.3
+#usr/share/man/man3/ares_inet_pton.3
+#usr/share/man/man3/ares_init.3
+#usr/share/man/man3/ares_init_options.3
+#usr/share/man/man3/ares_library_cleanup.3
+#usr/share/man/man3/ares_library_init.3
+#usr/share/man/man3/ares_library_init_android.3
+#usr/share/man/man3/ares_library_initialized.3
+#usr/share/man/man3/ares_mkquery.3
+#usr/share/man/man3/ares_parse_a_reply.3
+#usr/share/man/man3/ares_parse_aaaa_reply.3
+#usr/share/man/man3/ares_parse_caa_reply.3
+#usr/share/man/man3/ares_parse_mx_reply.3
+#usr/share/man/man3/ares_parse_naptr_reply.3
+#usr/share/man/man3/ares_parse_ns_reply.3
+#usr/share/man/man3/ares_parse_ptr_reply.3
+#usr/share/man/man3/ares_parse_soa_reply.3
+#usr/share/man/man3/ares_parse_srv_reply.3
+#usr/share/man/man3/ares_parse_txt_reply.3
+#usr/share/man/man3/ares_process.3
+#usr/share/man/man3/ares_query.3
+#usr/share/man/man3/ares_save_options.3
+#usr/share/man/man3/ares_search.3
+#usr/share/man/man3/ares_send.3
+#usr/share/man/man3/ares_set_local_dev.3
+#usr/share/man/man3/ares_set_local_ip4.3
+#usr/share/man/man3/ares_set_local_ip6.3
+#usr/share/man/man3/ares_set_servers.3
+#usr/share/man/man3/ares_set_servers_csv.3
+#usr/share/man/man3/ares_set_servers_ports.3
+#usr/share/man/man3/ares_set_servers_ports_csv.3
+#usr/share/man/man3/ares_set_socket_callback.3
+#usr/share/man/man3/ares_set_socket_configure_callback.3
+#usr/share/man/man3/ares_set_socket_functions.3
+#usr/share/man/man3/ares_set_sortlist.3
+#usr/share/man/man3/ares_strerror.3
+#usr/share/man/man3/ares_timeout.3
+#usr/share/man/man3/ares_version.3
diff --git a/lfs/c-ares b/lfs/c-ares
new file mode 100644
index 000000000..1f07623ac
--- /dev/null
+++ b/lfs/c-ares
@@ -0,0 +1,89 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.17.1
+
+THISAPP = c-ares-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = c-ares
+PAK_VER = 1
+
+DEPS =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 28f65c8ee6c097986bd902fd4f0804e2
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --enable-static=no
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
diff --git a/make.sh b/make.sh
index b17aca457..e1d5db220 100755
--- a/make.sh
+++ b/make.sh
@@ -1233,6 +1233,7 @@ buildipfire() {
lfsmake2 linux-atm
lfsmake2 gdbm
lfsmake2 pam
+ lfsmake2 c-ares
lfsmake2 curl
lfsmake2 tcl
lfsmake2 sqlite
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] tshark: Update to version 3.4.0
2020-12-06 15:03 [PATCH 1/2] c-ares: New package. Needed as tshark Dependency ummeegge
@ 2020-12-06 15:03 ` ummeegge
0 siblings, 0 replies; 2+ messages in thread
From: ummeegge @ 2020-12-06 15:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 9554 bytes --]
- Since tshark uses since 3.4.0 an always enabled asynchronous DNS
resolution, c-ares is a needed dependency.
- Since the current actual version 3.2.6 a lot of bug fixes, fixed
vulnerabilities, updated features, new protocols but also updated
protocols has been integrated.
A full overview of all changes can be found in here -->
Update to version 3.2.7:
https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html
Update to version 3.2.8:
https://www.wireshark.org/docs/relnotes/wireshark-3.2.8.html
Update to version 3.4.0
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
---
config/rootfiles/packages/tshark | 68 +++++++++++++++++++-------------
lfs/tshark | 8 ++--
2 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index c5081989c..48db7c329 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -29,6 +29,7 @@ usr/bin/tshark
#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
@@ -53,6 +54,7 @@ usr/bin/tshark
#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
@@ -82,6 +84,7 @@ usr/bin/tshark
#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
@@ -146,6 +149,7 @@ usr/bin/tshark
#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
@@ -161,6 +165,7 @@ usr/bin/tshark
#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-geonw.h
#usr/include/wireshark/epan/dissectors/packet-giop.h
#usr/include/wireshark/epan/dissectors/packet-gluster.h
@@ -238,6 +243,7 @@ usr/bin/tshark
#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
@@ -417,6 +423,7 @@ usr/bin/tshark
#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
@@ -572,6 +579,7 @@ usr/bin/tshark
#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/filesystem.h
#usr/include/wireshark/wsutil/frequency-utils.h
#usr/include/wireshark/wsutil/g711.h
@@ -611,14 +619,14 @@ usr/bin/tshark
#usr/include/wireshark/wsutil/wsjson.h
#usr/include/wireshark/wsutil/xtea.h
#usr/lib/libwireshark.so
-usr/lib/libwireshark.so.13
-usr/lib/libwireshark.so.13.0.6
+usr/lib/libwireshark.so.14
+usr/lib/libwireshark.so.14.0.0
#usr/lib/libwiretap.so
-usr/lib/libwiretap.so.10
-usr/lib/libwiretap.so.10.0.6
+usr/lib/libwiretap.so.11
+usr/lib/libwiretap.so.11.0.0
#usr/lib/libwsutil.so
-usr/lib/libwsutil.so.11
-usr/lib/libwsutil.so.11.0.0
+usr/lib/libwsutil.so.12
+usr/lib/libwsutil.so.12.0.0
#usr/lib/pkgconfig/wireshark.pc
#usr/lib/wireshark
#usr/lib/wireshark/cmake
@@ -640,27 +648,28 @@ usr/lib/wireshark/extcap/randpktdump
usr/lib/wireshark/extcap/sshdump
usr/lib/wireshark/extcap/udpdump
#usr/lib/wireshark/plugins
-#usr/lib/wireshark/plugins/3.2
-#usr/lib/wireshark/plugins/3.2/codecs
-usr/lib/wireshark/plugins/3.2/codecs/g711.so
-usr/lib/wireshark/plugins/3.2/codecs/g722.so
-usr/lib/wireshark/plugins/3.2/codecs/g726.so
-usr/lib/wireshark/plugins/3.2/codecs/l16mono.so
-#usr/lib/wireshark/plugins/3.2/epan
-usr/lib/wireshark/plugins/3.2/epan/ethercat.so
-usr/lib/wireshark/plugins/3.2/epan/gryphon.so
-usr/lib/wireshark/plugins/3.2/epan/irda.so
-usr/lib/wireshark/plugins/3.2/epan/mate.so
-usr/lib/wireshark/plugins/3.2/epan/opcua.so
-usr/lib/wireshark/plugins/3.2/epan/profinet.so
-usr/lib/wireshark/plugins/3.2/epan/stats_tree.so
-usr/lib/wireshark/plugins/3.2/epan/transum.so
-usr/lib/wireshark/plugins/3.2/epan/unistim.so
-usr/lib/wireshark/plugins/3.2/epan/wimax.so
-usr/lib/wireshark/plugins/3.2/epan/wimaxasncp.so
-usr/lib/wireshark/plugins/3.2/epan/wimaxmacphy.so
-#usr/lib/wireshark/plugins/3.2/wiretap
-usr/lib/wireshark/plugins/3.2/wiretap/usbdump.so
+#usr/lib/wireshark/plugins/3.4
+#usr/lib/wireshark/plugins/3.4/codecs
+usr/lib/wireshark/plugins/3.4/codecs/g711.so
+usr/lib/wireshark/plugins/3.4/codecs/g722.so
+usr/lib/wireshark/plugins/3.4/codecs/g726.so
+usr/lib/wireshark/plugins/3.4/codecs/l16mono.so
+usr/lib/wireshark/plugins/3.4/codecs/opus_dec.so
+#usr/lib/wireshark/plugins/3.4/epan
+usr/lib/wireshark/plugins/3.4/epan/ethercat.so
+usr/lib/wireshark/plugins/3.4/epan/gryphon.so
+usr/lib/wireshark/plugins/3.4/epan/irda.so
+usr/lib/wireshark/plugins/3.4/epan/mate.so
+usr/lib/wireshark/plugins/3.4/epan/opcua.so
+usr/lib/wireshark/plugins/3.4/epan/profinet.so
+usr/lib/wireshark/plugins/3.4/epan/stats_tree.so
+usr/lib/wireshark/plugins/3.4/epan/transum.so
+usr/lib/wireshark/plugins/3.4/epan/unistim.so
+usr/lib/wireshark/plugins/3.4/epan/wimax.so
+usr/lib/wireshark/plugins/3.4/epan/wimaxasncp.so
+usr/lib/wireshark/plugins/3.4/epan/wimaxmacphy.so
+#usr/lib/wireshark/plugins/3.4/wiretap
+usr/lib/wireshark/plugins/3.4/wiretap/usbdump.so
#usr/share/doc/wireshark
#usr/share/doc/wireshark/androiddump.html
#usr/share/doc/wireshark/capinfos.html
@@ -711,7 +720,7 @@ usr/lib/wireshark/plugins/3.2/wiretap/usbdump.so
usr/share/wireshark/cfilters
#usr/share/wireshark/ciscodump.html
usr/share/wireshark/colorfilters
-usr/share/wireshark/dfilter_macros
+#usr/share/wireshark/dfilter_macros
usr/share/wireshark/dfilters
#usr/share/wireshark/dftest.html
#usr/share/wireshark/diameter
@@ -724,6 +733,7 @@ usr/share/wireshark/diameter/HP.xml
usr/share/wireshark/diameter/Huawei.xml
usr/share/wireshark/diameter/Inovar.xml
usr/share/wireshark/diameter/Juniper.xml
+usr/share/wireshark/diameter/Metaswitch.xml
usr/share/wireshark/diameter/Microsoft.xml
usr/share/wireshark/diameter/Nokia.xml
usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
@@ -839,6 +849,7 @@ usr/share/wireshark/radius/dictionary.dlink
usr/share/wireshark/radius/dictionary.dragonwave
usr/share/wireshark/radius/dictionary.efficientip
usr/share/wireshark/radius/dictionary.eltex
+usr/share/wireshark/radius/dictionary.enterasys
usr/share/wireshark/radius/dictionary.epygi
usr/share/wireshark/radius/dictionary.equallogic
usr/share/wireshark/radius/dictionary.ericsson
@@ -860,6 +871,7 @@ usr/share/wireshark/radius/dictionary.h3c
usr/share/wireshark/radius/dictionary.hp
usr/share/wireshark/radius/dictionary.huawei
usr/share/wireshark/radius/dictionary.iana
+usr/share/wireshark/radius/dictionary.identity_engines
usr/share/wireshark/radius/dictionary.iea
usr/share/wireshark/radius/dictionary.infoblox
usr/share/wireshark/radius/dictionary.infonet
diff --git a/lfs/tshark b/lfs/tshark
index 7b124ef5b..29c84c4c2 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.6
+VER = 3.4.0
THISAPP = wireshark-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,8 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tshark
-DEPS = krb5
-PAK_VER = 7
+DEPS = krb5 c-ares
+PAK_VER = 8
###############################################################################
# Top-level Rules
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f14ef8d73fa5f30b57fec51283e6b73e
+$(DL_FILE)_MD5 = 5c656cd9d6b01dd2ad93ed665ca532e6
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-06 15:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-06 15:03 [PATCH 1/2] c-ares: New package. Needed as tshark Dependency ummeegge
2020-12-06 15:03 ` [PATCH 2/2] tshark: Update to version 3.4.0 ummeegge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox