Stabilise on all archs tested on ppc/x86/amd64 but it just fixes ldflags so deemed ok for sparc.

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 26 insertions, 68 deletions

diff --git a/net-analyzer/p0f/ChangeLog b/net-analyzer/p0f/ChangeLog
index 56b177c40f5e..46e4b2692264 100644
--- a/net-analyzer/p0f/ChangeLog
+++ b/net-analyzer/p0f/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/p0f
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.48 2012/03/30 04:39:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.49 2012/05/14 11:36:57 scarabeus Exp $
+
+  14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -p0f-2.0.8-r1.ebuild,
+  p0f-2.0.8-r2.ebuild:
+  Stabilise on all archs tested on ppc/x86/amd64 but it just fixes ldflags so
+  deemed ok for sparc.
 
 *p0f-3.04_beta (30 Mar 2012)
 
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index 1e4881c73968..e43c738a47b6 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX p0f.confd 66 RMD160 69e7a5a307986d818d1f45f447e392eaa8628aed SHA1 8879337caee72215897d5f17baf573b2c7b4b6af SHA256 6dbb67fcf77c4a38d5deefb9a8fec0f1435f6a26c53d682fe768c7a866d805b9
 AUX p0f.initd3 1411 RMD160 98ae569a7d0929400b99d66aec163e2ab1729795 SHA1 55f1880537424e9a24236b6352bf4a02344fb856 SHA256 d939c0203cf397d8c8a6edc18d2e3d3b32185d6a2c29391acc9286d59a79c2ce
@@ -7,21 +7,26 @@ DIST p0f-2.0.8.tgz 136877 RMD160 87d5b30d2d5e156b9fdcb026160155f413ce13d3 SHA1 7
 DIST p0f-3.00-rc5.tgz 90274 RMD160 65c160745f7bdb10f14a61dadc1b3bc57d2f0cfc SHA1 e36df9990af98244ad98e49952d2f275da4df2e8 SHA256 a8730d3ab089caa37766ac4606e733f14e592a8e530e299926dd8bb9f1c9d29b
 DIST p0f-3.03b.tgz 91707 RMD160 7db002e54d8c3a8333c949b9a26d38ac6a938be3 SHA1 a407ac62698f50ae029033355c941ae6117cb7db SHA256 b0d4f8a043d49c5f219be268c6cb10fe1a4eebc42a60843124e1e11bae16d8eb
 DIST p0f-3.04b.tgz 94646 RMD160 c95cad9f34234c7a7bb3996f903fd54ebb714d88 SHA1 f1c575c8708eecfc3646e4e2b303659d51020b14 SHA256 009897729383d9d2d447b4fadd6539795fa0be5098c94526a125e51c2d1839ea
-EBUILD p0f-2.0.8-r1.ebuild 1515 RMD160 5b3f2cb33fc74f7fa2e11dfdd73845909a21c568 SHA1 f0a3ba7cbf1d85a41918a71249f66325d165edb8 SHA256 0bac0dc1840d58ace2a1626791746772d4c961a20df32d051becd2d0616082e6
-EBUILD p0f-2.0.8-r2.ebuild 1768 RMD160 c0b6440de9dd66985008c33b87bf66b7c274fd93 SHA1 01e658dc157957cbae1ea87c19ddbf0c5e543ade SHA256 890fc8e91ef6255e6a79054e5c5ad6538c4898181a3a09ce818e0ac08bd4478a
+EBUILD p0f-2.0.8-r2.ebuild 1766 RMD160 e5ee165574c61d9e488eb969f14c233e76b793c7 SHA1 b1481e6664f7eb2311a33a6b226e924d31a95069 SHA256 e3f31208dc14f01596fbefdb3c448e4b468c429f71a9ae322af0034db342d6b8
 EBUILD p0f-3.00_rc5.ebuild 1297 RMD160 4384a4c4cc99094d50ac3a3029ed3f8d97847593 SHA1 bc6e35b5c9585a21cfc34ad837c32d3bb6130926 SHA256 2821fa46fab21ee2a88ba905833b231bbb51eeb51512de272180d6daca99e20b
 EBUILD p0f-3.03_beta.ebuild 1311 RMD160 09fec39059f3fa4aadd6a9759f9d5a3d91aa4ac5 SHA1 07b84abf457ef70e881d989024ad6b6f79cf55a2 SHA256 4023070bcf264769f69c8de36cd0cd7dd19b382384e7c8cf70408c98c623dfe3
 EBUILD p0f-3.04_beta.ebuild 1311 RMD160 7f33f4b439496f22a377fd91332caaba043ab1aa SHA1 a1b57d7137731a8ef56b92401ff0da96e5db7265 SHA256 3724fa06af9322e5db8748558531d14a9c3a8cc0a9818c877d53f24e25c19794
-MISC ChangeLog 5820 RMD160 7c9b6c58bb1569ad413164fc69a417702d3ad072 SHA1 1c773058a53d21c40ec7fd6b7d155715cb8f0199 SHA256 b115bd57fda9fc2cf1c46ddc2ec4eb0a425158b14a3750d37ea4d12cb0d32189
+MISC ChangeLog 6022 RMD160 0d55bc4d74e0cf930befc48f01efad9286211c1a SHA1 1835a4c60ed20a9022c32d4537e0dd8372b386b2 SHA256 ebb4c3c4a7ef124846445a6d3286a47fb2908be155df1a43fbd0c818ef057c43
 MISC metadata.xml 250 RMD160 244e47f4f0dbe86b30f0c2be619f9688d432b206 SHA1 793e58097eef73ea5c92619a45e2edf657052803 SHA256 587772f399b3e3226a324317d01c3dfa529110fd7f0135296fd2c5778f8cc2c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPdTjyAAoJEEqz6FtPBkyjTQEH/i3NtsvKSkSEDwWElXOuFs3l
-aUkS5C7yp2o/zG3Hq+VlJi057yd0rgk/lUCkkjdvPtaoXd+tMwE/wCzPCJVOvomI
-cL7xZXht1ePgtNGP+jRDMIIXaXgPHZyW2KlhjKmgKlPnVmhVC122cHxZhU4wiuEs
-eanq84h282tnuW1NTbDbLxuaSul6KFKWVVlvXDbxwvcexy9cM0zhAikgZ86frmsI
-aZigjqeXjVZyFhAYX2EzQ3P1MEWMjS/A/nLQAr2lGePTp2PTxL7Ln45YDXn1FIFq
-EuS5pEmXjQ2sAdDsO4CPaDKXkp6zyy7R59Ue3ohLXqKBHqHaK5BUhlq7atcwnQs=
-=w7fd
+iQIcBAEBAgAGBQJPsO5iAAoJEOSiRoyO7jvomtEQAJKG19rCiRR6HlPm0XhFaiSX
+Q1iTTlJ6WkRtUesOHwsDh2FaRfprN6bfNwkcvWDV3rZT2OOH2Od1Zqov9JG5Zg+X
+MiY4it0PL8cQkUtxNu+ckEtsVnMCltFhZ4eFKG4tqpq4JIJ6zv7IuvhrsgVA2pJH
+cYjYyViqpdMgP8ZLDjYVnXPqnVsrqGi5DLqmLDMnDZmux2l0IzXAx1SeF+Nx/gvy
+dkkwlB5u7lAyGMElblCTYoxRu/jx2cbNMeiq6CzEsEiNfjqRur8QtKPZxXixrfvS
+CxMZzgQtWBGbFKpcDWDpJ0Ti8pZRfVqiHD02OVwBUwfmP9GINIvfttZLZ8rXaWG+
+g+koGHx8jPiNC/Gio38b1l/9LG7gKrMPgUNocz1WtGp3e+g8hbrY5pRMH41YxZ2U
+jLJHM1KmDXx3mL0N/lFU9xsQnoZDltyCWxoAXGCG/NOhdv32fkzNgNUA5LqpYB87
+tR9+2K5jrz6eU1CCP2WBoLCgb52CPIgQh/c8S/wpq6ZGYQMU/U/BpDr/vvq8x7mV
+VyQlnsD/bcHQj1dYQ1YSpR3qIqUn9Ju4iomRv6GDTF/Lyiq/jT95Q6cwrOBL7Ztc
+xS4UgN5WZ1UQSd6cWZWwDXbFqjQUTXOUVWPxeI1mh5oKARYgTfZBV2iTOxsjehqu
+KqZgTQeG/Y7gra76RkpY
+=1+Dk
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/p0f/p0f-2.0.8-r1.ebuild b/net-analyzer/p0f/p0f-2.0.8-r1.ebuild
deleted file mode 100644
index fed391c66f3b..000000000000
--- a/net-analyzer/p0f/p0f-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.9 2012/01/23 02:44:04 ssuominen Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="p0f performs passive OS detection based on SYN packets."
-HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
-SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static"
-
-DEPEND="net-libs/libpcap"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	sed -i 's;#include <net/bpf.h>;;' p0f.c || die "sed p0f.c failed"
-	sed -i -e 's|^\(all: $(FILE)\).*$|\1|' \
-		-e "s|^\(CFLAGS.*=\).*$|\1${CFLAGS}|" mk/* || die "sed makefiles failed"
-}
-
-src_compile() {
-	local static
-	use static && static="static"
-	emake CC="$(tc-getCC)" ${static} || die "emake ${static} failed"
-	emake CC="$(tc-getCC)" ${static} p0fq || die "emake ${static} p0fq failed"
-}
-
-src_install () {
-	use static && mv p0f-static p0f
-	dosbin p0f p0frep test/p0fq || die
-
-	insinto /etc/p0f
-	doins p0f.fp p0fa.fp p0fr.fp
-
-	doman p0f.1 || die
-	cd doc
-	dodoc ChangeLog CREDITS KNOWN_BUGS README TODO
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die "newconfd failed"
-	newinitd "${FILESDIR}"/${PN}.initd3 ${PN} || die "newinitd failed"
-}
-
-pkg_postinst(){
-	elog "Adjust /etc/conf.d/p0f to your liking before using the"
-	elog "init script. For more information on options, read man p0f."
-}
diff --git a/net-analyzer/p0f/p0f-2.0.8-r2.ebuild b/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
index 0e24ae0326bc..30d885ae8fc4 100644
--- a/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-r2.ebuild,v 1.2 2011/08/05 05:56:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.8-r2.ebuild,v 1.3 2012/05/14 11:36:57 scarabeus Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND="net-libs/libpcap"