[gentoo-commits] repo/proj/guru:dev commit in: net-analyzer/netsniff-ng/

2023-12-28 Thread YiFei Zhu
commit: 17459d22ae169dca5639fea5f33a9f7d4ab99412
Author: YiFei Zhu  gmail  com>
AuthorDate: Fri Dec 29 04:46:11 2023 +
Commit: YiFei Zhu  gmail  com>
CommitDate: Fri Dec 29 04:46:11 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=17459d22

net-analyzer/netsniff-ng: Respect CFLAGS, cleanup emake command

Closes: https://bugs.gentoo.org/920892
Closes: https://bugs.gentoo.org/920893
Signed-off-by: YiFei Zhu  gmail.com>

 ...niff-ng-0.6.8.ebuild => netsniff-ng-0.6.8-r1.ebuild} | 17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild 
b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild
similarity index 80%
rename from net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild
rename to net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild
index a013c30f42..077fe39404 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-   sys-devel/flex
+   app-alternatives/lex
sys-devel/bison
dev-libs/libsodium
virtual/pkgconfig
@@ -41,14 +41,9 @@ BDEPEND="
 src_prepare() {
default
 
-   sed -e '/CFLAGS/s:?=:+=:' \
-   -e '/CPPFLAGS/s:?=:+=:' \
-   -e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-   -i Makefile || die
-
-   if ! grep -Fq nacl-20110221 curvetun/nacl_build.sh ; then
-   die "have nacl-20110221, expected $(grep ${MY_NACL_P} 
curvetun/nacl_build.sh)"
-   fi
+   # force mausezahn to respect CFLAGS
+   sed -e '/CFLAGS/s:=:+=:' -i Extra || die
+   sed -e 's/ -O2//' -i mausezahn/Makefile || die
 
export NACL_INC_DIR="${EPREFIX}/usr/include/nacl"
export NACL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/nacl"
@@ -77,9 +72,7 @@ src_configure() {
 }
 
 src_compile() {
-   emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-   LEX=lex YAAC=bison STRIP=true \
-   Q= HARDENING=1
+   emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" Q=
 }
 
 src_install() {



[gentoo-commits] repo/proj/guru:dev commit in: net-analyzer/netsniff-ng/

2023-12-25 Thread YiFei Zhu
commit: c2255a6e8a9ab46a280ab47b00cdd494b82bbdff
Author: YiFei Zhu  gmail  com>
AuthorDate: Mon Dec 25 17:10:45 2023 +
Commit: YiFei Zhu  gmail  com>
CommitDate: Mon Dec 25 17:35:58 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c2255a6e

net-analyzer/netsniff-ng: new package, add 0.6.8

ebuild mosyly copied from SwordArMor [1], with some minor fixes.

[1] 
https://github.com/gentoo-mirror/SwordArMor/blob/master/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild

Signed-off-by: YiFei Zhu  gmail.com>

 net-analyzer/netsniff-ng/Manifest |  1 +
 net-analyzer/netsniff-ng/metadata.xml | 11 +++
 net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild | 89 +++
 3 files changed, 101 insertions(+)

diff --git a/net-analyzer/netsniff-ng/Manifest 
b/net-analyzer/netsniff-ng/Manifest
new file mode 100644
index 00..598463ad45
--- /dev/null
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -0,0 +1 @@
+DIST netsniff-ng-0.6.8.tar.xz 617820 BLAKE2B 
1810b505e1bb2d973820629be30bd37de87f6c49b5c044c7ee6e7e5eb983c2e8b80f6ad772a7b42d315502dfdd92143cf1cd340101c91b074cba1ad53c9f40ea
 SHA512 
5cb0e66ea399068a7017a77612165fca94509176e0b4d3bac146e4bd73e09682cb1ee82c276b842263497fa74d8875dbda0e6c63b5b5ffe76531c1f43cf9bb99

diff --git a/net-analyzer/netsniff-ng/metadata.xml 
b/net-analyzer/netsniff-ng/metadata.xml
new file mode 100644
index 00..d93287ed0c
--- /dev/null
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   zhuyifei1...@gmail.com
+   YiFei Zhu
+   
+   
+   borkmann/netsniff-ng
+   
+

diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild 
b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild
new file mode 100644
index 00..a013c30f42
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/;
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/borkmann/${PN}.git;
+else
+   SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.xz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug geoip zlib"
+
+RDEPEND="
+   dev-libs/libcli:=
+   dev-libs/libnl:3
+   dev-libs/userspace-rcu:=
+   net-libs/libnet:1.1
+   net-libs/libnetfilter_conntrack
+   net-libs/libpcap
+   sys-libs/ncurses:0=
+   geoip? ( dev-libs/geoip )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/flex
+   sys-devel/bison
+   dev-libs/libsodium
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   default
+
+   sed -e '/CFLAGS/s:?=:+=:' \
+   -e '/CPPFLAGS/s:?=:+=:' \
+   -e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
+   -i Makefile || die
+
+   if ! grep -Fq nacl-20110221 curvetun/nacl_build.sh ; then
+   die "have nacl-20110221, expected $(grep ${MY_NACL_P} 
curvetun/nacl_build.sh)"
+   fi
+
+   export NACL_INC_DIR="${EPREFIX}/usr/include/nacl"
+   export NACL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/nacl"
+
+   # do not compress man pages by default
+   sed \
+   -e '/gzip/s@\$(Q).*$@$(Q)cp $(1).8 $(1)/$(1).8@' \
+   -e 's@\.8\.gz@.8@' \
+   -i Template || die
+
+   # fix build ordering in parallel make
+   sed -e 's/^trafgen_post_install:$/trafgen_post_install: 
trafgen_do_install/' \
+   -i trafgen/Makefile || die
+}
+
+src_configure() {
+   local myconfargs=(
+   --prefix="${EPREFIX}/usr"
+   --sysconfdir="${EPREFIX}/etc"
+   $(usex debug --enable-debug '')
+   $(usex geoip '' --disable-geoip)
+   $(usex zlib '' --disable-zlib)
+   )
+   # not an autoconf generated configure
+   ./configure "${myconfargs[@]}" || die
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+   LEX=lex YAAC=bison STRIP=true \
+   Q= HARDENING=1
+}
+
+src_install() {
+   emake PREFIX="${ED}/usr" ETCDIR="${ED}/etc" install
+
+   dodoc AUTHORS README REPORTING-BUGS
+}