From 1ddcee0bd115d2f843f82061cb0d1741bf90151d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2024 08:03:20 +0000 Subject: gentoo auto-resync : 05:01:2024 - 08:03:20 --- net-analyzer/fprobe/Manifest | 2 + .../fprobe/files/fprobe-1.1-autoconf.patch | 315 +++++++++++++++++++++ net-analyzer/fprobe/fprobe-1.1-r7.ebuild | 47 +++ 3 files changed, 364 insertions(+) create mode 100644 net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch create mode 100644 net-analyzer/fprobe/fprobe-1.1-r7.ebuild (limited to 'net-analyzer/fprobe') diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest index 2e983a0c613a..6107961524ed 100644 --- a/net-analyzer/fprobe/Manifest +++ b/net-analyzer/fprobe/Manifest @@ -1,7 +1,9 @@ AUX conf.d-fprobe-r1 1650 BLAKE2B bd28485ea2a7335cd086977584880615e9f11a114470e25034d448a82ee673d1ade68ee304af11256e184098494f3e06d0a272185fe2750b281d3c1653bb66d4 SHA512 554c94bf2bde9aaa63e22c7a32abed95bc2272a18e507bc43411a1f687920717e4a43cabb2c87c6425a4733f0498bfb90870039aba533e5a437fe44243ff5427 +AUX fprobe-1.1-autoconf.patch 8897 BLAKE2B e48c0eb7b4d504d9ad013dc1c8b5e285a2460f7bb6fd011fe7d07de1fb7f0b7ccbd979ebea71e024c4efb28039f2f817a4bbf4eed00993461491ee70559a75d0 SHA512 7e8b5692437ec23d6be04d82d2b7a588167fbef139050b1ba942ec0b15bf02a650aaa0040da3fe9de6bfd4e85121e4c5bb8bd9aff482a157f575f3b4a93be863 AUX fprobe-1.1-pidfile-sanity.patch 1319 BLAKE2B 911a4ec1f48f602c750a659c478380aae6b2bff983599e4720793223a640a27c8f9014e2da33699909e7d43fc1e0590c80bf3feee244f7046c766f0bfd790276 SHA512 c33d4f0f14c5b5523ffddc8ad43cd11d6d21c96a18cfbca72551426ea1fcec4bfbc86af23a63732129ee6b905f44fb0d05f045d692eb2e1406c400a9d4994c49 AUX fprobe-1.1-setgroups.patch 436 BLAKE2B 7bcff851652f7500ca509878948db87881a497857bef842f58901af5978f85d300a5dcef0c398a83f97741586860b605249b67466bea490264fb854b65f41352 SHA512 87f4ee868c9e481fa547bf67d7bf5ab2f69281b3459cddb0bdb405eff2412331b5a38d1d6d63d1c4169e20208d8de5d17bb3d1f3311020df76417d4c0da4d63f AUX init.d-fprobe-r1 1061 BLAKE2B 15baf6583dd9e00d228d49ef35bcb1c1029e4410288188070058d58be0798c81afdc1d7227fd25a341534aa68c61244b15673709762c057cdd0ae9f48fbaf494 SHA512 0a1286a71bdd3a2002eb750664eac0d7a56b3772c31edb2fe6dbec9831850431211dcd04fa86ed5b15131bb7fdbb541b30bd796c9de3ed616b00c52765cd757f DIST fprobe-1.1.tar.bz2 104358 BLAKE2B 960fd8941ec2a7656b9eb02a0b6ae091b6ab564b4f97aa8147ce1bc3785964008168a1ac43a3fbe2e342987ee68fff711648edb910a059222017fe1282205e8e SHA512 35fa4bedf2c615093b6637630322115e12f005bc43186b86c55c6bdc76ae5308dd31e1d05632e26e07a30fba88d76b9acc98632bee4f372edcf9df5da3e32210 EBUILD fprobe-1.1-r6.ebuild 852 BLAKE2B abb2b074f4be433585d28b3153c6afeb578371b9efda5f852b015e983c85190a58dcdcea8b5186884e7f83b00b79fab2187a4c8b1e3297cc70ebc424f9bb4a44 SHA512 8d11124b5f5f96b6847569d1a33a4be3f21d1ffb3cf5e0bcf377e6e383aedcbf23a93e876133f7e59857020d236d8f4fa32c4e3579befd96d3c14cc927e61e8c +EBUILD fprobe-1.1-r7.ebuild 896 BLAKE2B 0338eae28acaf540b07d0a1e09a21280b7d900eb79770736b7852672238a17b9e4a9b11381adbd37ae09247ab36eace8d2c89c33ddde7e36366b841118c04804 SHA512 72b15ad17e596281a0bc5089d22313a2267cec25c87a43b16964ab37aa82c3ea6f779ff2817e4271a464e24fb1e0e5e900223d76b154f2748302cd0fd12961bc MISC metadata.xml 427 BLAKE2B b088738560ccdfb0de31d8efb51b0a47bec78b87f6331c8621627e1acef0c97f04de92efaa711f839953a11e4f943fab447503da1486db45ace918ce55682f80 SHA512 433edbd738899b119195e8630503e51cf9f2b72662820b8ad986b770d2fe6c78b55ab1b718a33416378dce3348bfb0dba4352d334523b095df5b634d8a632f09 diff --git a/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch b/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch new file mode 100644 index 000000000000..9adccbe127e3 --- /dev/null +++ b/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch @@ -0,0 +1,315 @@ +https://bugs.gentoo.org/921189 + +Fix various underquoting issues and use of old macros. +--- a/configure.in ++++ b/configure.in +@@ -3,44 +3,42 @@ define([AC_CACHE_LOAD], ) + define([AC_CACHE_SAVE], ) + + AC_INIT +-AC_CANONICAL_SYSTEM +-AM_INIT_AUTOMAKE(fprobe,1.1) +-AM_CONFIG_HEADER(config.h) ++AC_CANONICAL_HOST ++AM_INIT_AUTOMAKE([fprobe], [1.1]) ++AM_CONFIG_HEADER([config.h]) + + AC_PROG_CC + AC_PROG_INSTALL + +-AC_CHECK_LIB(pthread, pthread_create, , +- AC_CHECK_LIB(c_r, pthread_create), , +- [AC_ERROR(POSIX threads not found)]) +-AC_SEARCH_LIBS(socket, socket) +-AC_SEARCH_LIBS(gethostbyname, nsl) +-AC_SEARCH_LIBS(sched_setscheduler, rt) ++AC_CHECK_LIB([pthread], [pthread_create], [], [AC_CHECK_LIB([c_r], [pthread_create], [], [AC_MSG_ERROR(POSIX threads not found)])]) ++AC_SEARCH_LIBS([socket], [socket]) ++AC_SEARCH_LIBS([gethostbyname], [nsl]) ++AC_SEARCH_LIBS([sched_setscheduler], [rt]) + + dnl ************************************************ + dnl inttypes + +-AC_CHECK_HEADER(inttypes.h, , +- [AC_CHECK_SIZEOF(int, 8) +- AC_CHECK_SIZEOF(long, 8) +- AC_CHECK_SIZEOF(long long, 8)] +-) ++AC_CHECK_HEADER([inttypes.h], [], [ ++ AC_CHECK_SIZEOF([int], [8]) ++ AC_CHECK_SIZEOF([long], [8]) ++ AC_CHECK_SIZEOF([long long], [8]) ++]) + + dnl ************************************************ + dnl OS type + +-case "${target}" in ++case "${host}" in + *-*-*linux*) +- AC_DEFINE_UNQUOTED(OS_LINUX, , OS type) +- AC_DEFINE_UNQUOTED(CLONEBASED_THREADS, , clone()-based threads) ++ AC_DEFINE_UNQUOTED([OS_LINUX], [], [OS type]) ++ AC_DEFINE_UNQUOTED([CLONEBASED_THREADS], [], [clone()-based threads]) + CFLAGS="$CFLAGS -D_BSD_SOURCE" + ;; + *-*-solaris*) +- AC_DEFINE_UNQUOTED(OS_SOLARIS, , OS type) ++ AC_DEFINE_UNQUOTED([OS_SOLARIS], [], [OS type]) + CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" + ;; + *-*-freebsd*) +- AC_DEFINE_UNQUOTED(OS_FREEBSD, , OS type) ++ AC_DEFINE_UNQUOTED([OS_FREEBSD], [], [OS type]) + CFLAGS="$CFLAGS -pthread" + ;; + esac +@@ -48,12 +46,12 @@ esac + dnl ************************************************ + dnl pcap.h location + +-AC_ARG_WITH(pcap, ++AC_ARG_WITH([pcap], + [ --with-pcap=DIR pcap.h location], +- pcap="$withval") ++ [pcap="$withval"]) + +-AC_CHECK_HEADER(pcap.h, , [ +- AC_MSG_CHECKING(for pcap.h in alternative location) ++AC_CHECK_HEADER([pcap.h], [] , [ ++ AC_MSG_CHECKING([for pcap.h in alternative location]) + found="" + pcap_dirs="$pcap /usr/include/pcap" + for pcap in $pcap_dirs; do +@@ -64,18 +62,18 @@ AC_CHECK_HEADER(pcap.h, , [ + fi + done + +- AC_MSG_RESULT($found) ++ AC_MSG_RESULT([$found]) + if test -z "$found"; then +- AC_ERROR(pcap.h not found) ++ AC_MSG_ERROR([pcap.h not found]) + fi + ]) + + dnl ************************************************ + dnl libpcap location + +-AC_ARG_WITH(libpcap, ++AC_ARG_WITH([libpcap], + [ --with-libpcap=DIR libpcap location], +- libpcap="$withval") ++ [libpcap="$withval"]) + + if test "$libpcap" = "yes"; then + libpcap="" +@@ -85,15 +83,15 @@ if test "$libpcap"; then + LDFLAGS="$LDFLAGS -L$libpcap" + fi + +-AC_CHECK_LIB(pcap, pcap_loop, , AC_ERROR(libpcap not found), $LDFLAGS) ++AC_CHECK_LIB([pcap], [pcap_loop], [], [AC_MSG_ERROR(libpcap not found)], [$LDFLAGS]) + + dnl ************************************************ + dnl Memory bulk indexing mode + +-AC_MSG_CHECKING(which memory bulk indexing mode to use) +-AC_ARG_WITH(membulk, ++AC_MSG_CHECKING([which memory bulk indexing mode to use]) ++AC_ARG_WITH([membulk], + [ --with-membulk=MODE indexing mode: index8|index16|ptr [default=ptr]], +- mem="$withval", mem="ptr") ++ [mem="$withval"], [mem="ptr"]) + + case "$mem" in + ptr) +@@ -106,95 +104,95 @@ case "$mem" in + mem_bits="16" + ;; + *) +- AC_ERROR(Invalid argument: "$mem") ++ AC_MSG_ERROR([Invalid argument: "$mem"]) + ;; + esac + +-AC_MSG_RESULT("$mem") +-AC_DEFINE_UNQUOTED(MEM_BITS, $mem_bits, Memory bulk indexing mode) ++AC_MSG_RESULT([$mem]) ++AC_DEFINE_UNQUOTED([MEM_BITS], [$mem_bits], [Memory bulk indexing mode]) + + dnl ************************************************ + dnl Hash type + +-AC_MSG_CHECKING(which hash type and size to use) +-AC_ARG_WITH(hash, ++AC_MSG_CHECKING([which hash type and size to use]) ++AC_ARG_WITH([hash], + [ --with-hash=TYPE hash type: crc16|xor16|xor8 [default=crc16]], +- hash="$withval", hash="crc16") ++ [hash="$withval"], [hash="crc16"]) + + hash_type=`echo "$hash"|cut -b -3` + hash_bits=`echo "$hash"|cut -b 4-` + + if test "$hash_type" = "xor"; then +- AC_DEFINE_UNQUOTED(HASH_TYPE_XOR, , Hash type) ++ AC_DEFINE_UNQUOTED([HASH_TYPE_XOR], [], [Hash type]) + if test "$hash_bits" != "8" -a "$hash_bits" != "16"; then +- AC_ERROR(Invalid argument: "$withval") ++ AC_MSG_ERROR([Invalid argument: "$withval"]) + fi + else + if test "$hash" != "crc16"; then +- AC_ERROR(Invalid argument: "$hash") ++ AC_MSG_ERROR([Invalid argument: "$hash"]) + fi +- AC_DEFINE_UNQUOTED(HASH_TYPE_CRC, , Hash type) ++ AC_DEFINE_UNQUOTED([HASH_TYPE_CRC], [], [Hash type]) + fi + +-AC_DEFINE_UNQUOTED(HASH_BITS, $hash_bits , Hash size) +-AC_MSG_RESULT("$hash") ++AC_DEFINE_UNQUOTED([HASH_BITS], [$hash_bits], [Hash size]) ++AC_MSG_RESULT([$hash]) + + dnl ************************************************ + dnl Uptime trick + +-AC_MSG_CHECKING(whether to enable uptime trick) +-AC_ARG_ENABLE(uptime_trick, ++AC_MSG_CHECKING([whether to enable uptime trick]) ++AC_ARG_ENABLE([uptime_trick], + [ --enable-uptime_trick enable uptime trick [default=yes]], +- uptime_trick="$enableval", uptime_trick="yes") ++ [uptime_trick="$enableval"], [uptime_trick="yes"]) + case "$uptime_trick" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(UPTIME_TRICK, , Uptime trick) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([UPTIME_TRICK], [], [Uptime trick]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl ICMP trick + +-AC_MSG_CHECKING(whether to enable icmp trick) +-AC_ARG_ENABLE(icmp_trick, ++AC_MSG_CHECKING([whether to enable icmp trick]) ++AC_ARG_ENABLE([icmp_trick], + [ --enable-icmp_trick enable icmp trick: yes|cisco|no [default=yes]], +- icmp_trick="$enableval", icmp_trick="yes") ++ [icmp_trick="$enableval"], [icmp_trick="yes"]) + case "$icmp_trick" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(ICMP_TRICK, , ICMP trick) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([ICMP_TRICK], [], [ICMP trick]) + ;; + cisco) +- AC_MSG_RESULT(yes: cisco) +- AC_DEFINE_UNQUOTED(ICMP_TRICK_CISCO, , ICMP trick) ++ AC_MSG_RESULT([yes: cisco]) ++ AC_DEFINE_UNQUOTED([ICMP_TRICK_CISCO], [], [ICMP trick]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl Debugging output + +-AC_MSG_CHECKING(whether to enable debugging) ++AC_MSG_CHECKING([whether to enable debugging]) + AC_ARG_ENABLE(debug, + [ --enable-debug enable debugging [default=no]], +- debug="$enableval", debug="no") ++ [debug="$enableval"], [debug="no"]) + case "$debug" in + no) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + debug_val="0" + ;; + yes) +- AC_MSG_RESULT(all) ++ AC_MSG_RESULT([all]) + debug_val="-1" + ;; + *) +- AC_MSG_RESULT(custom: $debug) ++ AC_MSG_RESULT([custom: $debug]) + debug_val="0" + debug=`echo $debug|tr , " "` + for i in $debug; do +@@ -202,43 +200,44 @@ case "$debug" in + done + ;; + esac +-AC_DEFINE_UNQUOTED(DEBUG, ($debug_val) , Debugging output) ++AC_DEFINE_UNQUOTED([DEBUG], [$debug_val], [Debugging output]) + + dnl ************************************************ + dnl Runtime messages + +-AC_MSG_CHECKING(whether to enable runtime messages) +-AC_ARG_ENABLE(messages, ++AC_MSG_CHECKING([whether to enable runtime messages]) ++AC_ARG_ENABLE([messages], + [ --enable-messages enable runtime messages [default=no]], +- messages="$enableval", messages="no") ++ [messages="$enableval"], [messages="no"]) + case "$messages" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(MESSAGES, , Runtime messages) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([MESSAGES], [], [Runtime messages]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl Pidfiles location + +-AC_MSG_CHECKING(directory to store pidfiles) +-AC_ARG_WITH(piddir, ++AC_MSG_CHECKING([directory to store pidfiles]) ++AC_ARG_WITH([piddir], + [ --with-piddir=DIR pidfiles location [default=/var/run]], +- piddir="$withval", piddir="/var/run") +- AC_DEFINE_UNQUOTED(PID_DIR, "$piddir", Pidfiles location) +- AC_MSG_RESULT("$piddir") ++ [piddir="$withval"], [piddir="/var/run"]) ++AC_DEFINE_UNQUOTED([PID_DIR], ["$piddir"], [Pidfiles location]) ++AC_MSG_RESULT([$piddir]) + + dnl ************************************************ + + CFLAGS="$CFLAGS -D_REENTRANT" + CFLAGS="$CFLAGS -DWALL -W -Wall" + +-AC_SUBST(PACKAGE) +-AC_SUBST(VERSION) ++AC_SUBST([PACKAGE]) ++AC_SUBST([VERSION]) + DATE=`date +%Y-%m-%d` +-AC_SUBST(DATE) ++AC_SUBST([DATE]) + +-AC_OUTPUT(Makefile src/Makefile) ++AC_CONFIG_FILES([Makefile src/Makefile]) ++AC_OUTPUT diff --git a/net-analyzer/fprobe/fprobe-1.1-r7.ebuild b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild new file mode 100644 index 000000000000..2e60316ccd2c --- /dev/null +++ b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" +HOMEPAGE="https://fprobe.sourceforge.net" +SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug messages" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch + "${FILESDIR}"/fprobe-1.1-setgroups.patch + "${FILESDIR}"/fprobe-1.1-autoconf.patch +) + +src_prepare() { + default + + # Clang 16, bug #899924 + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable messages) +} + +src_install() { + default + + docinto contrib + dodoc contrib/tg.sh + + newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe + newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe +} -- cgit v1.2.3