[gentoo-commits] repo/gentoo:master commit in: net-wireless/airtraf/, net-wireless/airtraf/files/

[gentoo-commits] repo/gentoo:master commit in: net-wireless/airtraf/, net-wireless/airtraf/files/

[Jeroen Roovers]

commit:     16af3d82ec7b1bb84ec123ffe3380f1bd11bbae6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 15:09:14 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 15:10:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16af3d82

net-wireless/airtraf: Fix linker failure (bug #574434 by Toralf Förster).

	Also, rename patch

Package-Manager: portage-2.2.27

 net-wireless/airtraf/airtraf-1.1-r3.ebuild                            | 4 ++--
 .../airtraf/files/{airtraf-1.1.patch => airtraf-1.1-sniffd.patch}     | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/airtraf/airtraf-1.1-r3.ebuild b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
index bd4dd8f..a110042 100644
--- a/net-wireless/airtraf/airtraf-1.1-r3.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}.patch \
+		"${FILESDIR}"/${P}-sniffd.patch \
 		"${FILESDIR}"/${P}-off-by-one.patch \
 		"${FILESDIR}"/${P}-fprintf-format.patch
 
@@ -32,7 +32,7 @@ src_prepare() {
 		-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
 		src/libncurses/Makefile || die
 	sed -i \
-		-e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs panel)|' \
+		-e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs ncurses panel)|' \
 		src/sniffd/Makefile || die
 	tc-export PKG_CONFIG
 }

diff --git a/net-wireless/airtraf/files/airtraf-1.1.patch b/net-wireless/airtraf/files/airtraf-1.1-sniffd.patch
similarity index 100%
rename from net-wireless/airtraf/files/airtraf-1.1.patch
rename to net-wireless/airtraf/files/airtraf-1.1-sniffd.patch

[gentoo-commits] repo/gentoo:master commit in: net-wireless/airtraf/, net-wireless/airtraf/files/

[Jeroen Roovers]

commit:     2eaa80cf1221b95ca3734e47b470db53424e2721
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 14:43:46 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 14:44:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eaa80cf

net-wireless/airtraf: Fix CFLAGS=-fno-common

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706908
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-wireless/airtraf/airtraf-1.1-r4.ebuild         | 54 ++++++++++++++++++++++
 .../airtraf/files/airtraf-1.1-fno-common.patch     | 21 +++++++++
 2 files changed, 75 insertions(+)

diff --git a/net-wireless/airtraf/airtraf-1.1-r4.ebuild b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
new file mode 100644
index 00000000000..c0d5978fdf8
--- /dev/null
+++ b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.elixar.com/"
+SRC_URI="http://www.elixar.com/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-sniffd.patch
+	"${FILESDIR}"/${P}-off-by-one.patch
+	"${FILESDIR}"/${P}-fprintf-format.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
+		src/libncurses/Makefile || die
+	sed -i \
+		-e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs ncurses panel)|' \
+		src/sniffd/Makefile || die
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	# parallel make (bug #297331)
+	emake -C src -j1 \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin src/airtraf
+	dodoc Authors COMPATIBILITY docs/airtraf_doc.html
+}

diff --git a/net-wireless/airtraf/files/airtraf-1.1-fno-common.patch b/net-wireless/airtraf/files/airtraf-1.1-fno-common.patch
new file mode 100644
index 00000000000..9945f170d53
--- /dev/null
+++ b/net-wireless/airtraf/files/airtraf-1.1-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/sniffd/capture_engine.c
++++ b/src/sniffd/capture_engine.c
+@@ -52,7 +52,6 @@
+ FILE * capture_stream;
+ FILE * error_stream;
+ 
+-char atime[TIME_TARGET_MAX];
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////
+--- a/src/libcommon/logger.h
++++ b/src/libcommon/logger.h
+@@ -33,6 +33,8 @@
+ #ifndef __logger_h__
+ #define __logger_h__
+ 
++extern char atime[TIME_TARGET_MAX];
++
+ int init_log(int, char*);
+ int write_log(int, char*);
+ void flush_log(int);