From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-libs/libtrace/Manifest | 3 + .../files/libtrace-4.0.18_p1-build-system.patch | 133 +++++++++++++++++++++ net-libs/libtrace/libtrace-4.0.18_p1.ebuild | 70 +++++++++++ 3 files changed, 206 insertions(+) create mode 100644 net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch create mode 100644 net-libs/libtrace/libtrace-4.0.18_p1.ebuild (limited to 'net-libs/libtrace') diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest index 3d4b2e218fc0..c357c8df6c74 100644 --- a/net-libs/libtrace/Manifest +++ b/net-libs/libtrace/Manifest @@ -1,10 +1,13 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815a33f6d5cd21fc3bebe1e31a26ac3b17be27c4e3a5bd7b379bcc42705438b657576e28b597eaae786aa2319972f587b07e790 SHA512 6335e63cdf537700a60f8eeae940d963d582e9373e1ea6a14b7960a52e1c61464785134ec14bbe49ededf7554f0715fdb4d59565d1c9870f8a0bc5524538286e AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe +AUX libtrace-4.0.18_p1-build-system.patch 4161 BLAKE2B e2811873721fa703e5f2202258e2e943320a601020d6d1172b215917ddb3c0e04b22a2c73c948d64ca7e65716a4f4b7147f49150b607bd6364f4da244db76311 SHA512 cec579934f535ca5f0ae1f32860e13bfc9a5e7f1467d66100be3edb6c10585b2190987d93ab558feb5dd464c85c153faece29fe37f6e2dd8037f240c96ed0040 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c SHA512 85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e +DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2 EBUILD libtrace-4.0.15_p1.ebuild 1496 BLAKE2B 88e72d28f4b35dda288f0149ca2c889fc3c3608f2d35b033e1594ca0a46911ab1397a4634548f3e8ed2cdc89ead8e592f648a6e33c3876a19e45e3cbaf67e441 SHA512 7458355a9c04d27d4f048a20be606e7c480de502aa71c006b15ceb2790a618b642212ea488471d710b30e4daea530322256921afc573f2eb4b7ee028742dff75 EBUILD libtrace-4.0.17_p1.ebuild 1475 BLAKE2B 7f565abbfde064b57c025ab153b061bdd6773cd228c092a8040f7058b9615a70c8f7dc19f39f340c4bda5611af5114e65c96e737181513dd31f4992f1aa2256c SHA512 f35d8f786d59410a56c64069adf044027aef6b065b29f6bd1d3992a39a2c702a2f62175b78b276e39531d345d308c1dfbce1ab8607f54147691d356d8cc9fb63 +EBUILD libtrace-4.0.18_p1.ebuild 1447 BLAKE2B fc83d13a6c55acd782ecf7323a3015362587586f27b0ed08e1bba0ec690efecb44625d11575fbbbf71b0ad8909bbce33b88bac192a2d3f78814597725c4da363 SHA512 e04d235323a8eb091ee9ac37af8e899db41cddeab1421ebd738e55561288f8abca4aa221a53248174e9aa679fc743915b52ccaf5ca7011ba9db6977c231a5e80 EBUILD libtrace-9999.ebuild 1400 BLAKE2B 026e83c497d2fa1cd2d5ef6a41aac994dbfe4a10dc6bd7f28b391bf5f4538e9c194e723ed10076425951cfb7fd31ee26ec4be489c90673d4c343b06cb659c476 SHA512 c381dcd69c2a0398c27ffdf4bd4850bd0384153f2514c8edb4bc78461f60ed0bbfaaacf925523d320205ee969acff2691b90d2215ce26f56e6812fe819db4bf4 MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8 diff --git a/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch new file mode 100644 index 000000000000..b536302c30b9 --- /dev/null +++ b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch @@ -0,0 +1,133 @@ +https://github.com/LibtraceTeam/libtrace/pull/201 + +From dde6c39e5808f06f1450b03e7c682edb0f1290cf Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 8 Feb 2022 05:30:32 +0000 +Subject: [PATCH 1/3] build: fix bashism in configure + +configures have a shebang of #!/bin/sh so need to work with a POSIX-compliant +shell; let's use = instead of == which will have the same effect on both Bash +and said shells (like dash). + +Signed-off-by: Sam James +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 95d63fdc..dbbaabb7 100644 +--- a/configure.in ++++ b/configure.in +@@ -305,7 +305,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support), + + if test "$want_xdp" != no; then + AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0) +- if test "$elffound" == 1; then ++ if test "$elffound" = 1; then + # check for libbpf + AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf) + + +From 1525a42b386da02bda3982cf6e8b472f57f8ac34 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 8 Feb 2022 05:32:59 +0000 +Subject: [PATCH 2/3] build: make NUMA support optional + +This avoids an 'automagic dependency' [0] on NUMA. This is helpful for +downstreams to ensure we don't miss dependencies or when we may not +want to enable support for a feature even though a dependency is enabled. + +Gentoo has shipped this patch for quite some time. + +[0] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies + +Signed-off-by: Sam James +--- + configure.in | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index dbbaabb7..6fbff150 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,7 +518,23 @@ AC_CHECK_DECL([PACKET_FANOUT], + [[#include ]]) + + # If we use DPDK we might be able to use libnuma +-AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) ++AC_ARG_WITH(numa, ++ AS_HELP_STRING(--with-numa,include NUMA support), ++[ ++ if test "$withval" = no ++ then ++ want_numa=no ++ else ++ want_numa=yes ++ fi ++],[ ++ # Default to building without NUMA ++ want_numa=yes ++]) ++ ++if test "$want_numa" != no; then ++ AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) ++fi + + # Need libwandder for ETSI live decoding + AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0) + +From 153254413ae3cd6a62ee7d8b5eae189e84ebc066 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 8 Feb 2022 05:34:05 +0000 +Subject: [PATCH 3/3] build: use pkg-config to find ncurses + +ncurses can be built in a variety of configurations, but the motivating case +for Gentoo was "split tinfo" where libtinfo is no longer included within +libncurses. + +Use pkg-config to find where ncurses is installed and the required libraries +needed to link against it (which will include -ltinfo if required). + +We've been shipping this patch in Gentoo for quite some time. + +Signed-off-by: Sam James +--- + configure.in | 4 ++++ + tools/tracetop/Makefile.am | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 6fbff150..cbb94d55 100644 +--- a/configure.in ++++ b/configure.in +@@ -79,6 +79,8 @@ AC_PROG_INSTALL + AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) + AM_PROG_LEX + ++PKG_PROG_PKG_CONFIG ++ + # All our source files for function replacements are in lib/ + AC_CONFIG_LIBOBJ_DIR(lib) + +@@ -916,6 +918,8 @@ if (test "$use_llvm" != "no"); then + fi + fi + ++PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no) ++ + AC_ARG_WITH([ncurses], + AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)])) + +diff --git a/tools/tracetop/Makefile.am b/tools/tracetop/Makefile.am +index 2ebbc3a7..a2eb2797 100644 +--- a/tools/tracetop/Makefile.am ++++ b/tools/tracetop/Makefile.am +@@ -6,6 +6,6 @@ bin_PROGRAMS = tracetop + include ../Makefile.tools + + tracetop_SOURCES = tracetop.cc +-tracetop_LDADD = -lncurses ++tracetop_LDADD = @ncurses_LIBS@ + tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS) + endif + diff --git a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild new file mode 100644 index 000000000000..b43bb405d524 --- /dev/null +++ b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A library and tools for trace processing" +HOMEPAGE="https://research.wand.net.nz/software/libtrace.php" +SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/_p/-}" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# doxygen is always needed for man pages, but USE=doc controls installing docs themselves +# (not man pages) +IUSE="doc ncurses numa" + +RDEPEND=">=net-libs/libpcap-0.8 + dev-libs/libyaml + dev-libs/openssl:= + net-libs/wandio + ncurses? ( sys-libs/ncurses:= ) + numa? ( sys-process/numactl )" +DEPEND="${RDEPEND}" +BDEPEND="app-doc/doxygen[dot] + sys-devel/flex + virtual/os-headers + virtual/pkgconfig + virtual/yacc" + +PATCHES=( + "${FILESDIR}"/${PN}-4.0.18_p1-build-system.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + + eautoreconf + + # Comment out FILE_PATTERNS definition (bug #706230) + if has_version ~app-doc/doxygen-1.8.16; then + sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die + fi + + # Update doxygen configuration + doxygen -u docs/libtrace.doxygen.in || die +} + +src_configure() { + econf \ + $(use_with ncurses) \ + $(use_with numa) \ + --with-man \ + --without-dpdk +} + +src_install() { + default + + if use doc ; then + docinto html + dodoc -r docs/doxygen/html + fi + + find "${ED}" -name "*.la" -delete || die +} -- cgit v1.2.3