Improve init script for bug #143415 and cross-compile

Package-Manager: portage-2.1.1-r2

6 files changed, 41 insertions, 31 deletions

diff --git a/net-analyzer/p0f/ChangeLog b/net-analyzer/p0f/ChangeLog
index 3a44321a7f7e..5f0223189fa2 100644
--- a/net-analyzer/p0f/ChangeLog
+++ b/net-analyzer/p0f/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/p0f
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.28 2006/12/10 03:51:35 vanquirius Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.29 2007/01/06 19:14:42 cedk Exp $
+
+  06 Jan 2007; Cedric Krier <cedk@gentoo.org> files/p0f.confd,
+  files/p0f.initd2, p0f-2.0.8.ebuild:
+  Improve init script for bug #143415 and cross-compile
 
 *p0f-2.0.8 (10 Dec 2006)
 
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index 42ae9875bd32..167b0b69d3d0 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,17 +1,17 @@
-AUX p0f.confd 68 RMD160 096e0a18fbe9338b646977a1f115b021edb353d5 SHA1 1a48b4904ac388f1da30c1bc4617ff49a228d544 SHA256 b21110b35e379450dda57385af91d3eb0550eaa44e0a3db2f4bcb01351e7359b
-MD5 366dc57024aeed06f2707e568a629dce files/p0f.confd 68
-RMD160 096e0a18fbe9338b646977a1f115b021edb353d5 files/p0f.confd 68
-SHA256 b21110b35e379450dda57385af91d3eb0550eaa44e0a3db2f4bcb01351e7359b files/p0f.confd 68
+AUX p0f.confd 66 RMD160 69e7a5a307986d818d1f45f447e392eaa8628aed SHA1 8879337caee72215897d5f17baf573b2c7b4b6af SHA256 6dbb67fcf77c4a38d5deefb9a8fec0f1435f6a26c53d682fe768c7a866d805b9
+MD5 e38f90c4ed9da72026a537dcd2e2097c files/p0f.confd 66
+RMD160 69e7a5a307986d818d1f45f447e392eaa8628aed files/p0f.confd 66
+SHA256 6dbb67fcf77c4a38d5deefb9a8fec0f1435f6a26c53d682fe768c7a866d805b9 files/p0f.confd 66
 AUX p0f.initd 1270 RMD160 88275517bb6e2277a22e4e95f723db56002a287c SHA1 62d219897c919b4a4d2562e6f63f8aa702c1cfc6 SHA256 b24c45453cc2b5e1d6ad2c9f679e85d7d4b61dfc2c3028386027be5f9517950a
 MD5 0c97d34501b34ec11763fde7fc38dac9 files/p0f.initd 1270
 RMD160 88275517bb6e2277a22e4e95f723db56002a287c files/p0f.initd 1270
 SHA256 b24c45453cc2b5e1d6ad2c9f679e85d7d4b61dfc2c3028386027be5f9517950a files/p0f.initd 1270
-AUX p0f.initd2 1327 RMD160 b3bab5aeb0f943b01b4246ce0ce66f72be35cfd4 SHA1 9cfff6a62f252a4e2f93521a259f15859eb95693 SHA256 a1081f1dbb64f8869fa5657a69846b704298b7e941c077f2be0196a7e3e6635c
-MD5 a326fd4ccb89a5551f5c7f81c427fdb7 files/p0f.initd2 1327
-RMD160 b3bab5aeb0f943b01b4246ce0ce66f72be35cfd4 files/p0f.initd2 1327
-SHA256 a1081f1dbb64f8869fa5657a69846b704298b7e941c077f2be0196a7e3e6635c files/p0f.initd2 1327
+AUX p0f.initd2 1380 RMD160 b1405bf17635a9e5340501381592a8c58cc76eae SHA1 c95b584f69da60c9693e432643632a6ec8aad102 SHA256 8b9c73990189302667533eb58be67c4746edb68ee7f20a4452252f3efc4c2812
+MD5 cbdbc5b871912e9c2213de2d229268c9 files/p0f.initd2 1380
+RMD160 b1405bf17635a9e5340501381592a8c58cc76eae files/p0f.initd2 1380
+SHA256 8b9c73990189302667533eb58be67c4746edb68ee7f20a4452252f3efc4c2812 files/p0f.initd2 1380
 DIST p0f-2.0.3.tgz 119407
-DIST p0f-2.0.5.tgz 130002
+DIST p0f-2.0.5.tgz 130002 RMD160 34ee678aa721ee38959419808ed798aa23228a16 SHA1 fb11a4138cad903072e3c8ef33316ac22b4ef8f4 SHA256 563c62f63acfbef79e79659c3f483813816c7d032ef73e96e462a3b4f9a2fc7f
 DIST p0f-2.0.6.tgz 131668 RMD160 926ae9a8ec382d158df000175612421f7bddc6d1 SHA1 b8d9f485c88dec0f3269fab6062e722c65d4db19 SHA256 95aaf7861475c76929a08aeb4b7dca3ee912a5405fbbb1e4b80b8cadc3600441
 DIST p0f-2.0.8.tgz 136877 RMD160 87d5b30d2d5e156b9fdcb026160155f413ce13d3 SHA1 7b4d5b2f24af4b5a299979134bc7f6d7b1eaf875 SHA256 6c4d8745f04e59f2ba68d56fd1554551592f08a0497c9fc21b84498f47d1aee0
 EBUILD p0f-2.0.3.ebuild 922 RMD160 cb136c716d252490b4d658909bf52e3d8e0bedc3 SHA1 cfea3ab4e003f67abe8ec079d8a3fe4297f5f881 SHA256 694e9e595f1c5a081378dcd7442c77e167170a1e16dca5e49e8240cb7ca55146
@@ -26,14 +26,14 @@ EBUILD p0f-2.0.6.ebuild 1443 RMD160 3ac9b241b2af2746bb44dbbf5dc9002680663de5 SHA
 MD5 579422c2589328e526b7e5d13fac4305 p0f-2.0.6.ebuild 1443
 RMD160 3ac9b241b2af2746bb44dbbf5dc9002680663de5 p0f-2.0.6.ebuild 1443
 SHA256 0df319b58bcfc165bf1c39ee29870199c28757c310333ef24bfd7f2f1d5516b2 p0f-2.0.6.ebuild 1443
-EBUILD p0f-2.0.8.ebuild 1443 RMD160 d19b82fce6786c0cc55b88bb22f5b05894d0f641 SHA1 5c34e0c06a80ccb51a479c8a38e0adb84df03550 SHA256 a751a8d141607122d6b6a220f0dc740f1ca13cee6b061b97a61b21c6ccf43e49
-MD5 d9c53e1a202501579712a84f23f28839 p0f-2.0.8.ebuild 1443
-RMD160 d19b82fce6786c0cc55b88bb22f5b05894d0f641 p0f-2.0.8.ebuild 1443
-SHA256 a751a8d141607122d6b6a220f0dc740f1ca13cee6b061b97a61b21c6ccf43e49 p0f-2.0.8.ebuild 1443
-MISC ChangeLog 3503 RMD160 15640b93152aa456e7d3ce0e710e353aab6abf04 SHA1 64f1e3c4c675623600dfb11e996a2e3780377c61 SHA256 27a7cd0e806fbd272f1c1a18cc677064729c733a9a9ea327b85a092f3646209f
-MD5 2382b45b3f1543b3f5e0d2bcc066c01e ChangeLog 3503
-RMD160 15640b93152aa456e7d3ce0e710e353aab6abf04 ChangeLog 3503
-SHA256 27a7cd0e806fbd272f1c1a18cc677064729c733a9a9ea327b85a092f3646209f ChangeLog 3503
+EBUILD p0f-2.0.8.ebuild 1487 RMD160 ffb3ceb15ec6ed14472afdb0bf96c41cfdd06948 SHA1 1b44f060c5dfbedc9e5064e5cfdca04eaaad747c SHA256 9b1fcf0beaa4bd8ce35909fe5cb9fd51299a1507a80fde1858bdd8d993fbb421
+MD5 7659285352e7e3eca6dff0d7615a6dbf p0f-2.0.8.ebuild 1487
+RMD160 ffb3ceb15ec6ed14472afdb0bf96c41cfdd06948 p0f-2.0.8.ebuild 1487
+SHA256 9b1fcf0beaa4bd8ce35909fe5cb9fd51299a1507a80fde1858bdd8d993fbb421 p0f-2.0.8.ebuild 1487
+MISC ChangeLog 3655 RMD160 1e3cbfb8de6f316b2fc43af753d470ea797972d7 SHA1 37e3a69e76e167e8e906b80dc737ddcf3ce1dd53 SHA256 c0f1ae2d0b5023785383e8d48a153c8b32f3a8654402355acbea9add6620e9eb
+MD5 863240bf746f08fd6569a393e6d139b7 ChangeLog 3655
+RMD160 1e3cbfb8de6f316b2fc43af753d470ea797972d7 ChangeLog 3655
+SHA256 c0f1ae2d0b5023785383e8d48a153c8b32f3a8654402355acbea9add6620e9eb ChangeLog 3655
 MISC metadata.xml 250 RMD160 244e47f4f0dbe86b30f0c2be619f9688d432b206 SHA1 793e58097eef73ea5c92619a45e2edf657052803 SHA256 587772f399b3e3226a324317d01c3dfa529110fd7f0135296fd2c5778f8cc2c8
 MD5 a6504b2ab3f5f778d46643a087162f71 metadata.xml 250
 RMD160 244e47f4f0dbe86b30f0c2be619f9688d432b206 metadata.xml 250
@@ -41,9 +41,9 @@ SHA256 587772f399b3e3226a324317d01c3dfa529110fd7f0135296fd2c5778f8cc2c8 metadata
 MD5 d68117a6108bcd2769ac8128cec37896 files/digest-p0f-2.0.3 58
 RMD160 10fb18db1bd8c855297232038f72b7e191cbf051 files/digest-p0f-2.0.3 58
 SHA256 530d9b9862fd5330f67a63a6e5dcb86a64d189be812b9b429112fecb77200585 files/digest-p0f-2.0.3 58
-MD5 393eeebe57dc144d2d5c60ccb33f96e6 files/digest-p0f-2.0.5 58
-RMD160 a858ea147b0d40e4000bf7757848a77c73687010 files/digest-p0f-2.0.5 58
-SHA256 0fe70b9149e9d874edd6a8f1be495e5b8165e565760aaee21612869728be787b files/digest-p0f-2.0.5 58
+MD5 3757f17ca83b73fc1b96873ac68d1d14 files/digest-p0f-2.0.5 220
+RMD160 5dcbc791cd5dcad5606704aede6821c62261752b files/digest-p0f-2.0.5 220
+SHA256 a666e1723f03d3d68d2a50998f4ea0cbfacb6bb837147791583013d9768de6d8 files/digest-p0f-2.0.5 220
 MD5 e8854e5cbba22b50ebbb4f6898d0f654 files/digest-p0f-2.0.6 220
 RMD160 356084f8ce6ca8b014c4b5292300dc053f8c0f27 files/digest-p0f-2.0.6 220
 SHA256 f1534bb0db920c9824ed534b378f7f3045e1133f84d3bcf29a8aef651a203038 files/digest-p0f-2.0.6 220
diff --git a/net-analyzer/p0f/files/digest-p0f-2.0.5 b/net-analyzer/p0f/files/digest-p0f-2.0.5
index 07d6ee7ea1cd..6c3b8b5796fa 100644
--- a/net-analyzer/p0f/files/digest-p0f-2.0.5
+++ b/net-analyzer/p0f/files/digest-p0f-2.0.5
@@ -1 +1,3 @@
 MD5 78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz 130002
+RMD160 34ee678aa721ee38959419808ed798aa23228a16 p0f-2.0.5.tgz 130002
+SHA256 563c62f63acfbef79e79659c3f483813816c7d032ef73e96e462a3b4f9a2fc7f p0f-2.0.5.tgz 130002
diff --git a/net-analyzer/p0f/files/p0f.confd b/net-analyzer/p0f/files/p0f.confd
index ae3a068cebad..01c02896ec01 100644
--- a/net-analyzer/p0f/files/p0f.confd
+++ b/net-analyzer/p0f/files/p0f.confd
@@ -1,3 +1,3 @@
 P0FLOGFILE=/var/log/p0f-audit.log
 P0FDEVICE=eth0
-P0FOPTIONS="-tdlo"
+P0FOPTIONS="-tl"
diff --git a/net-analyzer/p0f/files/p0f.initd2 b/net-analyzer/p0f/files/p0f.initd2
index f32f11ca82c0..75e1a5089f1b 100755
--- a/net-analyzer/p0f/files/p0f.initd2
+++ b/net-analyzer/p0f/files/p0f.initd2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd2,v 1.1 2005/06/19 01:54:40 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd2,v 1.2 2007/01/06 19:14:42 cedk Exp $
 
 start() {
 	ebegin "Starting p0f"
@@ -18,15 +18,19 @@ start() {
 	for OneIP in `/sbin/ifconfig 2>/dev/null | grep 'inet addr' | sed -e 's/.*addr://' -e 's/ .*//'` ; do
 		BpfFilter="$BpfFilter and not src host $OneIP"
 	done
-	
+
+
 	# Create a lock file.
 	mkdir -p /var/lock/subsys
 	touch /var/lock/subsys/p0f
 	
 	# Start up p0f and filter out all packets originating from any of this machines IP's.
+	if [ -z "${P0FLOGFILE}" ]; then
+		P0FLOGFILE="/var/log/p0f"
+	fi
 	einfo "Logfile: ${P0FLOGFILE}"
 	start-stop-daemon --start --quiet --exec /usr/sbin/p0f -- -i "${P0FDEVICE}" \
-	"${P0FOPTIONS}" "${P0FLOGFILE}" "${BpfFilter}" >> "/var/log/p0f" 2>&1 &
+		"${P0FOPTIONS}" -o "${P0FLOGFILE}" -d "${BpfFilter}" 2>/dev/null
 	eend ${?}
 }
 
diff --git a/net-analyzer/p0f/p0f-2.0.8.ebuild b/net-analyzer/p0f/p0f-2.0.8.ebuild
index 9be6be0e2479..16c5608250a3 100644
--- a/net-analyzer/p0f/p0f-2.0.8.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.8.ebuild,v 1.1 2006/12/10 03:51:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.8.ebuild,v 1.2 2007/01/06 19:14:42 cedk Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="p0f performs passive OS detection based on SYN packets."
 HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
@@ -27,8 +27,8 @@ src_unpack() {
 src_compile() {
 	local static
 	use static && static="static"
-	emake ${static} || die "emake ${static} failed"
-	emake ${static} p0fq || die "emake ${static} p0fq failed"
+	emake CC="$(tc-getCC)" ${static} || die "emake ${static} failed"
+	emake CC="$(tc-getCC)" ${static} p0fq || die "emake ${static} p0fq failed"
 }
 
 src_install () {