Use CFLAGS from environment (bug #240852). Use LDFLAGS and CC too. Do not strip. Use a patch instead of sed.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 78 insertions, 3 deletions

diff --git a/net-analyzer/fwlogwatch/ChangeLog b/net-analyzer/fwlogwatch/ChangeLog
index cdbb298824b3..abf678bb60ce 100644
--- a/net-analyzer/fwlogwatch/ChangeLog
+++ b/net-analyzer/fwlogwatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/fwlogwatch
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.19 2009/01/02 21:30:36 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.20 2009/08/25 22:37:06 jer Exp $
+
+*fwlogwatch-1.1-r1 (25 Aug 2009)
+
+  25 Aug 2009; Jeroen Roovers <jer@gentoo.org> +fwlogwatch-1.1-r1.ebuild,
+  +files/fwlogwatch-1.1-make.patch:
+  Use CFLAGS from environment (bug #240852). Use LDFLAGS and CC too. Do not
+  strip. Use a patch instead of sed.
 
   02 Jan 2009; Friedrich Oslage <bluebird@gentoo.org> fwlogwatch-1.1.ebuild:
   Stable on sparc, bug #253290
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index 5708f5b47f30..2953aec1e302 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,4 +1,6 @@
+AUX fwlogwatch-1.1-make.patch 654 RMD160 d1a0ecbda7bef98ec66e738bf74031054f299e06 SHA1 c1952989b19023ddbb1e9eb343ec5e2eb5fd99f2 SHA256 0cd782c06dbcde19c01c2b1404fabfdaadfe88c4cd5d46e858fd212b570b4b1e
 DIST fwlogwatch-1.1.tar.bz2 90341 RMD160 e1f4d979cfa71de64918bc2a07869f05288f80d3 SHA1 e5fab39991d894e8617dd63fee5d683868b1f97c SHA256 9908ef51f79aa069b31851e23550d5bfacb4583fc3569f87ad1a0957c974ba7f
+EBUILD fwlogwatch-1.1-r1.ebuild 1022 RMD160 2947e8fa86a0f831cb1a827085e5618ad3c1da00 SHA1 fdaa5b5c76c4805466ba06fafced37ad6e15629a SHA256 748d61aa0b62a3388c5c56c508d407f02ad65de5841918a2e0c8cf8aa3752fda
 EBUILD fwlogwatch-1.1.ebuild 1181 RMD160 ee4a2d995b43ce4d16ce640d8ddcc865b997af2d SHA1 26c52958da1995e57eea9bead71b22cec2397bbc SHA256 783a0bcc964cc2343d51d990df69a9df7a04e6b1ed7a6a7e4de30ee32b178e9d
-MISC ChangeLog 2437 RMD160 c37f72ef07be5904396d6112746c59532e9f60d4 SHA1 8814f3f043da0e1054b5fc6e751e1c0a55c15362 SHA256 8b93461bb2a01828c4c607ea39c5f5b14416294365e046c519d7be4a2f2bb062
+MISC ChangeLog 2690 RMD160 48cd785f6e5878f4346f859c97874d0cb0069c34 SHA1 b6d07eb2ec5f404dc70dcfd50736ed0b55e384c5 SHA256 331c72d7eea5280fa856cac1c9442005f5ad30d86246aa5c73598aed6e8e9fec
 MISC metadata.xml 236 RMD160 b5272c455699725e16a17ab6528f5351de551976 SHA1 853fad2ea905074246711c2f66af3a458a3f6b9d SHA256 e44031bf6799260ae62d8eba0aeaa1ecde4b80741e13b800daa3a96f37ced031
diff --git a/net-analyzer/fwlogwatch/files/fwlogwatch-1.1-make.patch b/net-analyzer/fwlogwatch/files/fwlogwatch-1.1-make.patch
new file mode 100644
index 000000000000..697f36605eb8
--- /dev/null
+++ b/net-analyzer/fwlogwatch/files/fwlogwatch-1.1-make.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2006-03-08 20:36:02.000000000 +0100
++++ Makefile	2009-08-26 00:34:02.000000000 +0200
+@@ -2,9 +2,7 @@
+ # $Id: fwlogwatch-1.1-make.patch,v 1.1 2009/08/25 22:37:06 jer Exp $
+ 
+ # Linux
+-CC = gcc
+-CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
+-LDFLAGS = #-g #-static -p
++CFLAGS += -DHAVE_ZLIB -DHAVE_GETTEXT
+ LIBS = -lcrypt -lz #-ladns #-lc_p
+ 
+ # Solaris
+@@ -39,7 +37,7 @@
+ LFLAGS = -B #-f #-p -p -d
+ 
+ INSTALL = install
+-INSTALL_PROGRAM = $(INSTALL) -s -m 0755
++INSTALL_PROGRAM = $(INSTALL) -m 0755
+ INSTALL_SCRIPT = $(INSTALL) -m 0755
+ INSTALL_DATA = $(INSTALL) -m 0644
+ INSTALL_DIR = /usr/local
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild
new file mode 100644
index 000000000000..261d6ba92e8b
--- /dev/null
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild,v 1.1 2009/08/25 22:37:06 jer Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A packet filter and firewall log analyzer"
+HOMEPAGE="http://fwlogwatch.inside-security.de/"
+SRC_URI="http://www.kybs.de/boris/sw/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-1"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-make.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin fwlogwatch
+	dosbin contrib/fwlw_notify
+	dosbin contrib/fwlw_respond
+	dodir /usr/share/fwlogwatch/contrib
+	insinto /usr/share/fwlogwatch/contrib
+
+	doins contrib/fwlogsummary.cgi
+	doins contrib/fwlogsummary_small.cgi
+	doins contrib/fwlogwatch.php
+	doins contrib
+	insinto /etc
+
+	doins fwlogwatch.config fwlogwatch.template
+
+	dodoc AUTHORS ChangeLog CREDITS README
+	doman fwlogwatch.8
+}