[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: ad2ec83a9e95bbda5fa11377037223fde75e664b Author: Sam James gentoo org> AuthorDate: Fri Dec 16 07:53:04 2022 + Commit: Sam James gentoo org> CommitDate: Fri Dec 16 07:53:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2ec83a net-libs/libnids: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-libs/libnids/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml index 7e2868ad9d1e..5468909d526b 100644 --- a/net-libs/libnids/metadata.xml +++ b/net-libs/libnids/metadata.xml @@ -12,5 +12,6 @@ libnids + MITRECND/libnids
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: dbdffde695a536544998966b73b7343e0349a313
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 07:52:26 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 07:52:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdffde6
net-libs/libnids: Stabilize 1.26-r1 ppc, #886239
Signed-off-by: Sam James gentoo.org>
net-libs/libnids/libnids-1.26-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libnids/libnids-1.26-r1.ebuild
b/net-libs/libnids/libnids-1.26-r1.ebuild
index 41c55cf592e9..61751f90a22a 100644
--- a/net-libs/libnids/libnids-1.26-r1.ebuild
+++ b/net-libs/libnids/libnids-1.26-r1.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz -> $
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="+glib +libnet static-libs"
RDEPEND="!net-libs/libnids:1.1
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: 592d1029fb06727a821fcbddb7fedbb7b2544c43
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 07:51:29 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 07:51:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592d1029
net-libs/libnids: Stabilize 1.26-r1 amd64, #886239
Signed-off-by: Sam James gentoo.org>
net-libs/libnids/libnids-1.26-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libnids/libnids-1.26-r1.ebuild
b/net-libs/libnids/libnids-1.26-r1.ebuild
index 747ff563674e..41c55cf592e9 100644
--- a/net-libs/libnids/libnids-1.26-r1.ebuild
+++ b/net-libs/libnids/libnids-1.26-r1.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz -> $
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="+glib +libnet static-libs"
RDEPEND="!net-libs/libnids:1.1
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: 14f88cfead424f5aabf969523321265cff0c70ec
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 07:51:28 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 07:51:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f88cfe
net-libs/libnids: Stabilize 1.26-r1 x86, #886239
Signed-off-by: Sam James gentoo.org>
net-libs/libnids/libnids-1.26-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/libnids/libnids-1.26-r1.ebuild
b/net-libs/libnids/libnids-1.26-r1.ebuild
index 364e3468fe7f..747ff563674e 100644
--- a/net-libs/libnids/libnids-1.26-r1.ebuild
+++ b/net-libs/libnids/libnids-1.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz -> $
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="+glib +libnet static-libs"
RDEPEND="!net-libs/libnids:1.1
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/, net-libs/libnids/files/
commit: eb57f9fa838562b3e70f3d1274336853b7e7a428
Author: Sam James gentoo org>
AuthorDate: Tue Dec 14 01:31:03 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 14 01:31:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb57f9fa
net-libs/libnids: revert SONAME change
Seems to be accidental. Avoid breaking consumers.
Bug: https://github.com/MITRECND/libnids/issues/9
Signed-off-by: Sam James gentoo.org>
.../files/libnids-1.26-revert-SONAME-bump.patch| 26 ++
...{libnids-1.26.ebuild => libnids-1.26-r1.ebuild} | 1 +
2 files changed, 27 insertions(+)
diff --git a/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
new file mode 100644
index ..dc6abccd8c83
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
@@ -0,0 +1,26 @@
+From 0f07fe39585971b4c59f3a9b235e68d9c68184e3 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Tue, 14 Dec 2021 01:30:00 +
+Subject: [PATCH] Revert SONAME bump
+
+Bug: https://github.com/MITRECND/libnids/issues/9
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index e7b6dd8..e72a5da 100644
+--- a/src/Makefile.in
b/src/Makefile.in
+@@ -13,7 +13,7 @@ includedir = @includedir@
+ libdir= @libdir@
+ mandir= @mandir@
+ LIBSTATIC = libnids.a
+-LIBSHARED = libnids.so.1.26
++LIBSHARED = libnids.so.1.24
+
+ CC= @CC@
+ CFLAGS= @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@
-DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@
-DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@
+--
+2.34.1
+
diff --git a/net-libs/libnids/libnids-1.26.ebuild
b/net-libs/libnids/libnids-1.26-r1.ebuild
similarity index 96%
rename from net-libs/libnids/libnids-1.26.ebuild
rename to net-libs/libnids/libnids-1.26-r1.ebuild
index fa141da12665..364e3468fe7f 100644
--- a/net-libs/libnids/libnids-1.26.ebuild
+++ b/net-libs/libnids/libnids-1.26-r1.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.24-libdir.patch
"${FILESDIR}"/${PN}-1.24-static-libs.patch
"${FILESDIR}"/${PN}-1.24-no-inline.patch
+ "${FILESDIR}"/${PN}-1.26-revert-SONAME-bump.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: 9c3599ecfad6d11d77c76c8c43f1b7580406d1fa
Author: Sam James gentoo org>
AuthorDate: Mon Dec 13 23:44:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 13 23:44:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3599ec
net-libs/libnids: add 1.26
Signed-off-by: Sam James gentoo.org>
net-libs/libnids/Manifest| 1 +
net-libs/libnids/libnids-1.26.ebuild | 59
2 files changed, 60 insertions(+)
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index a12c6bfcb8d3..9469393608ac 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1 +1,2 @@
DIST libnids-1.24.tar.gz 151021 BLAKE2B
ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc
SHA512
2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
+DIST libnids-1.26.tar.gz 146172 BLAKE2B
c84329a8da493f49d340d263835070c948a00d8400cd3e7a2a727b567f672b7af8017446281879ec19cb6d9e89eb07564c463fdf0521aa441ad5dc6ac2b97c73
SHA512
d582287f2c64241895ae437e501e92ef68adc8eac1a3df597d089634b994faee35d8b1cc018bbf20ced440bcd286af28f48c6f88da740a7c3de935ce3723561d
diff --git a/net-libs/libnids/libnids-1.26.ebuild
b/net-libs/libnids/libnids-1.26.ebuild
new file mode 100644
index ..fa141da12665
--- /dev/null
+++ b/net-libs/libnids/libnids-1.26.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="An implementation of an E-component of Network Intrusion
Detection System"
+HOMEPAGE="https://github.com/MITRECND/libnids http://libnids.sourceforge.net/;
+SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+ mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="!net-libs/libnids:1.1
+ net-libs/libpcap
+ glib? ( dev-libs/glib:2 )
+ libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.24-ldflags.patch
+ "${FILESDIR}"/${PN}-1.24-libdir.patch
+ "${FILESDIR}"/${PN}-1.24-static-libs.patch
+ "${FILESDIR}"/${PN}-1.24-no-inline.patch
+)
+
+src_prepare() {
+ default
+ eautoconf
+}
+
+src_configure() {
+ tc-export AR
+
+ append-flags -fno-strict-aliasing
+
+ econf \
+ --enable-shared \
+ $(usex glib '' --disable-libglib) \
+ $(use_enable libnet)
+}
+
+src_compile() {
+ emake shared $(usex static-libs static '')
+}
+
+src_install() {
+ local tgt
+ for tgt in _installshared $(usex static-libs _install ''); do
+ emake install_prefix="${D}" ${tgt}
+ done
+
+ dodoc CHANGES CREDITS MISC README doc/*
+}
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/files/, net-libs/libnids/
commit: d5b5288d2eda333a283575c184c61f062cea7918
Author: Sam James gentoo org>
AuthorDate: Sun Oct 17 00:08:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 17 00:09:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b5288d
net-libs/libnids: don't inline exported functions
Closes: https://bugs.gentoo.org/818517
Signed-off-by: Sam James gentoo.org>
.../libnids/files/libnids-1.24-no-inline.patch | 43 ++
...bnids-1.24-r7.ebuild => libnids-1.24-r8.ebuild} | 18 -
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/net-libs/libnids/files/libnids-1.24-no-inline.patch
b/net-libs/libnids/files/libnids-1.24-no-inline.patch
new file mode 100644
index 000..8a57c6354d3
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-no-inline.patch
@@ -0,0 +1,43 @@
+https://src.fedoraproject.org/rpms/libnids/raw/rawhide/f/libnids-1.24-inline.patch
+https://bugs.gentoo.org/818517
+
+Patch by Robert Scheck for libnids <= 1.24 which
+avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and
+my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well.
+
+--- a/src/checksum.c
b/src/checksum.c
+@@ -120,7 +120,7 @@
+ By Jorge Cwik , adapted for linux by Arnt
+ Gulbrandsen.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+ u_int sum;
+ if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -191,13 +191,13 @@
+ this routine is used for miscellaneous IP-like checksums, mainly in
+ icmp.c
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+ return (csum_fold(csum_partial(buff, len, 0)));
+ }
+
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+ if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+ return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ csum_partial((u_char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+ if (dontchksum(saddr))
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild
b/net-libs/libnids/libnids-1.24-r8.ebuild
similarity index 82%
rename from net-libs/libnids/libnids-1.24-r7.ebuild
rename to net-libs/libnids/libnids-1.24-r8.ebuild
index aec872f3286..a993c8d9129 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="an implementation of an E-component of Network Intrusion
Detection System"
@@ -13,20 +14,18 @@ SLOT="1.2"
KEYWORDS="amd64 ppc x86"
IUSE="+glib +libnet static-libs"
-RDEPEND="
- !net-libs/libnids:1.1
+RDEPEND="!net-libs/libnids:1.1
net-libs/libpcap
glib? ( dev-libs/glib:2 )
- libnet? ( >=net-libs/libnet-1.1.0-r3 )
-"
-DEPEND="
- ${RDEPEND}
- glib? ( virtual/pkgconfig )
-"
+ libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
PATCHES=(
"${FILESDIR}"/${P}-ldflags.patch
"${FILESDIR}"/${P}-libdir.patch
"${FILESDIR}"/${P}-static-libs.patch
+ "${FILESDIR}"/${P}-no-inline.patch
)
src_prepare() {
@@ -36,6 +35,7 @@ src_prepare() {
src_configure() {
tc-export AR
+
append-flags -fno-strict-aliasing
econf \
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: 848c47e37703c6bae0b7dec1030eeb907a635c8f
Author: David Seifert gentoo org>
AuthorDate: Sun Nov 29 09:55:33 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Nov 29 09:55:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=848c47e3
net-libs/libnids: Remove old
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: David Seifert gentoo.org>
net-libs/libnids/libnids-1.24-r6.ebuild | 53 -
1 file changed, 53 deletions(-)
diff --git a/net-libs/libnids/libnids-1.24-r6.ebuild
b/net-libs/libnids/libnids-1.24-r6.ebuild
deleted file mode 100644
index d4a4fe94a92..000
--- a/net-libs/libnids/libnids-1.24-r6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion
Detection System"
-HOMEPAGE="http://libnids.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE="+glib +libnet static-libs"
-
-RDEPEND="
- !net-libs/libnids:1.1
- glib? ( dev-libs/glib:2 )
- libnet? ( >=net-libs/libnet-1.1.0-r3 )
- net-libs/libpcap
-"
-DEPEND="
- ${RDEPEND}
- glib? ( virtual/pkgconfig )
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-ldflags.patch"
- epatch "${FILESDIR}/${P}-static-libs.patch"
-}
-
-src_configure() {
- tc-export AR
- append-flags -fno-strict-aliasing
-
- econf \
- --enable-shared \
- $(usex glib '' --disable-libglib) \
- $(use_enable libnet)
-}
-
-src_compile() {
- emake shared $(usex static-libs static '')
-}
-
-src_install() {
- local tgt
- for tgt in _installshared $(usex static-libs _install ''); do
- emake install_prefix="${D}" ${tgt}
- done
-
- dodoc CHANGES CREDITS MISC README doc/*
-}
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: 7534b287c3b053194c03cb46f8207ceb4f12b284
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Nov 29 08:18:06 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Nov 29 08:19:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7534b287
net-libs/libnids: ppc stable wrt bug #757183
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-libs/libnids/libnids-1.24-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild
b/net-libs/libnids/libnids-1.24-r7.ebuild
index e68aea56b3d..aec872f3286 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="+glib +libnet static-libs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: f7ea7f6d01aeac02cc5e183f6ea70e18c6fbd1aa
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Nov 29 08:13:01 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Nov 29 08:13:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ea7f6d
net-libs/libnids: amd64 stable wrt bug #757183
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-libs/libnids/libnids-1.24-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild
b/net-libs/libnids/libnids-1.24-r7.ebuild
index 2e9dbb9cef3..e68aea56b3d 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="+glib +libnet static-libs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/
commit: e788dec30a1169a397b353801fb7244ae3d8060d
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Nov 27 16:45:35 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Nov 27 16:45:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e788dec3
net-libs/libnids: x86 stable (bug #757183)
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
net-libs/libnids/libnids-1.24-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild
b/net-libs/libnids/libnids-1.24-r7.ebuild
index 09d5cfe6dc0..2e9dbb9cef3 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="+glib +libnet static-libs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnids/files/, net-libs/libnids/
commit: 7d53382788c01a83443fad67473898c478cdd4c4
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 20:06:16 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 20:07:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d533827
net-libs/libnids: Strip libdir from linker flags
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Closes: https://bugs.gentoo.org/740708
Signed-off-by: Jeroen Roovers gentoo.org>
net-libs/libnids/files/libnids-1.24-libdir.patch | 44 ++
net-libs/libnids/libnids-1.24-r7.ebuild | 58
2 files changed, 102 insertions(+)
diff --git a/net-libs/libnids/files/libnids-1.24-libdir.patch
b/net-libs/libnids/files/libnids-1.24-libdir.patch
new file mode 100644
index 000..578d9001d16
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-libdir.patch
@@ -0,0 +1,44 @@
+--- a/configure.in
b/configure.in
+@@ -69,7 +69,7 @@
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ PCAP_CFLAGS="-I$withval -I$withval/bpf"
+- PCAPLIB="-L$withval -lpcap"
++ PCAPLIB="-lpcap"
+ else
+ AC_ERROR(pcap.h or libpcap.a not found in $withval)
+ fi
+@@ -77,7 +77,7 @@
+ esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+ PCAP_CFLAGS="-I${prefix}/include"
+- PCAPLIB="-L${exec_prefix}/lib -lpcap"
++ PCAPLIB="-lpcap"
+ elif test -f /usr/include/pcap/pcap.h; then
+ PCAP_CFLAGS="-I/usr/include/pcap"
+ PCAPLIB="-lpcap"
+@@ -146,12 +146,12 @@
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
+- LNETLIB="-L$withval/lib -lnet"
++ LNETLIB="-lnet"
+ elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ LNET_CFLAGS="-I$withval/include"
+- LNETLIB="-L$withval/src -lnet"
++ LNETLIB="-lnet"
+ else
+ echo "A working combination of libnet.h, libnet.a and libnet-config not
found in $withval; get libnet from www.packetfactory.net/projects/libnet and
reinstall"
+ AC_ERROR(libnet)
+@@ -163,7 +163,7 @@
+ else
+ if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ;
then
+LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config
--defines 2>/dev/null`"
+- LNETLIB="-L${exec_prefix}/lib -lnet"
++ LNETLIB="-lnet"
+ else
+LNET_CFLAGS="`libnet-config --defines 2>/dev/null`"
+LNETLIB="-lnet"
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild
b/net-libs/libnids/libnids-1.24-r7.ebuild
new file mode 100644
index 000..09d5cfe6dc0
--- /dev/null
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="an implementation of an E-component of Network Intrusion
Detection System"
+HOMEPAGE="http://libnids.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="
+ !net-libs/libnids:1.1
+ net-libs/libpcap
+ glib? ( dev-libs/glib:2 )
+ libnet? ( >=net-libs/libnet-1.1.0-r3 )
+"
+DEPEND="
+ ${RDEPEND}
+ glib? ( virtual/pkgconfig )
+"
+PATCHES=(
+ "${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-libdir.patch
+ "${FILESDIR}"/${P}-static-libs.patch
+)
+
+src_prepare() {
+ default
+ eautoconf
+}
+
+src_configure() {
+ tc-export AR
+ append-flags -fno-strict-aliasing
+
+ econf \
+ --enable-shared \
+ $(usex glib '' --disable-libglib) \
+ $(use_enable libnet)
+}
+
+src_compile() {
+ emake shared $(usex static-libs static '')
+}
+
+src_install() {
+ local tgt
+ for tgt in _installshared $(usex static-libs _install ''); do
+ emake install_prefix="${D}" ${tgt}
+ done
+
+ dodoc CHANGES CREDITS MISC README doc/*
+}
