Version bump. Fix building with recent linux-headers wrt #360875 by including signal.h where it's used.

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

4 files changed, 107 insertions, 2 deletions

diff --git a/net-analyzer/ipcad/ChangeLog b/net-analyzer/ipcad/ChangeLog
index 060d419a0db5..ce70dfd3bce7 100644
--- a/net-analyzer/ipcad/ChangeLog
+++ b/net-analyzer/ipcad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ipcad
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.31 2011/01/20 09:10:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.32 2011/03/31 17:27:08 ssuominen Exp $
+
+*ipcad-3.7.3 (31 Mar 2011)
+
+  31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> +ipcad-3.7.3.ebuild,
+  +files/ipcad-3.7.3-signal_h.patch:
+  Version bump. Fix building with recent linux-headers wrt #360875 by including
+  signal.h where it's used.
 
   20 Jan 2011; Peter Volkov <pva@gentoo.org> ipcad-3.7.ebuild,
   +files/ipcad-3.7-linux-2.6.35.patch:
diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest
index ec49f2c44f25..be07fffc318b 100644
--- a/net-analyzer/ipcad/Manifest
+++ b/net-analyzer/ipcad/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ipcad-3.7-linux-2.6.27.patch 521 RMD160 4a993f65332b7e078ac60538efec480a38e863a6 SHA1 456bede04a339c140fb2fe474583f2c4bc09468a SHA256 a1606dba9b31385751101add747b23e1efa49e16b753e449730b68b2d81f2d67
 AUX ipcad-3.7-linux-2.6.35.patch 1267 RMD160 dd3ab0d1e2d7d06d7eaf73ef6f9e10108e82adee SHA1 fac728e285f5f646547507cbc10a35820cf2daa7 SHA256 15266ab846c0cc5786811eb47e4d57b521fcf7ee9b7ec620af3eb06db6d57930
+AUX ipcad-3.7.3-signal_h.patch 1138 RMD160 ce71c0441073779ea844a5e65a854d94fb79e36f SHA1 0a874511e37b92d6c0150067708c5911c4c034ce SHA256 39512ef73d8e8fe8e4d25c86f0cad94bfecb24a34170c8c94ae89453b96e7c7b
 AUX ipcad.conf.d 429 RMD160 02956a6386a7448501658705a95dcb7d97f7531b SHA1 9be3112424e3d1e49b6c626f5c035128496b8668 SHA256 7b802d54f968ab3797e49934b78ace247274326559bfece2792c2490a7f0339c
 AUX ipcad.init 924 RMD160 e75dd67de1aff64b5979415942f3afc96909ffee SHA1 dbde21c675f216f9eed9b3c8752e8e7dfb0c9473 SHA256 9b6234267f23b50a4959444f90fe318d26d0559121804a100017e17406ffbe93
 DIST ipcad-3.7-20060828-cvs.patch.bz2 5999 RMD160 aa82bc0d72405393a71530ac63fb9fd42042da15 SHA1 5c15f76d71814c8984a80e78894d19a37152fd99 SHA256 3c168686fb9262a937225f2f37a9b994ea2f7c87a580ceb79475af7f4711ca17
+DIST ipcad-3.7.3.tar.gz 172457 RMD160 eec27dee7f0ca69b855e1e2a422afbf156fc685d SHA1 7b888b64eaf28cbbc375173cd08c7f66ddc63fb4 SHA256 72372d46ae35e4d7cc74d96fbaf8bb0ae189aa9ecfd89026487aca790c2f0716
 DIST ipcad-3.7.tar.gz 171814 RMD160 788f4b55bd7494bf7ea99a157a4efdcb4cdba71c SHA1 ef67a5313f672eb4cb7e9c2762d99d1e9d34fbc2 SHA256 3be5edebd7e8ce3a050c10f59b0c58619cae23f28d2c3daa38384dca01795352
+EBUILD ipcad-3.7.3.ebuild 1300 RMD160 be30f3f8fb60cdd2cc579e653849a5a84efcb32b SHA1 02dd0a6a966e4786532a2a78f8e963436e74e742 SHA256 79798fec930300f80d893ff685b8f91d9030821ac99d2825d2d800883cd75eb7
 EBUILD ipcad-3.7.ebuild 1307 RMD160 e860ec308b81bf31c3037cf525b8644e67a9039b SHA1 63f1990b63277aade9e9ac68a31228decb71084b SHA256 9f8bd1733c163a3a4b5d695283b97d55f193d38bb8e688994996f2d5da42b775
-MISC ChangeLog 4712 RMD160 9c53a0ccae9981a377041580d4219339f542b190 SHA1 4f8e177e7b98bce3d973c9bd38e12b6d86b4081a SHA256 9e10f6f8904cfc0bf0ef07934558711d5ccc28a0878f95376e19832ecd19dbe2
+MISC ChangeLog 4967 RMD160 b8287134cc7037aa2168c4fa60617e5fe229c4c2 SHA1 48e93bdb37d08de71bedea15ab66d67cff30938f SHA256 2fe22bc44befba77d823808b0886a719304130bcbc0b8aea5a3cd4c3cf6f0f18
 MISC metadata.xml 221 RMD160 9bf9934cf7def883af53fd96eb920842aeb5f10e SHA1 31d376e84b2e0b9793e1555038bb438a9167cc1a SHA256 26daf450814a6f339001173abdb07aa9c0bfae6a5432db67bf6a73c19c9fdd5e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2UuZ0ACgkQXkR9YqOcLPEwJAD/SCy2v3l5CYldIEyT6LwSXyd0
+nDh9Ay7jKYfBbGdHFIkA/R+nppqrdo3RdjtA4F16XDuOKCtQ/rMW8ErkcbBAY9lf
+=/ibP
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
new file mode 100644
index 000000000000..6fac35ea99e2
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
@@ -0,0 +1,35 @@
+diff -ur ipcad-3.7.3.orig/main.c ipcad-3.7.3/main.c
+--- ipcad-3.7.3.orig/main.c	2007-04-22 11:08:45.000000000 +0300
++++ ipcad-3.7.3/main.c	2011-03-31 20:19:12.000000000 +0300
+@@ -26,6 +26,8 @@
+  * $Id: ipcad-3.7.3-signal_h.patch,v 1.1 2011/03/31 17:27:08 ssuominen Exp $
+  */
+ 
++#include <signal.h> /* signal */
++
+ #include "ipcad.h"
+ #include "cfgvar.h"
+ #include "servers.h"
+diff -ur ipcad-3.7.3.orig/pps.c ipcad-3.7.3/pps.c
+--- ipcad-3.7.3.orig/pps.c	2007-04-22 11:08:45.000000000 +0300
++++ ipcad-3.7.3/pps.c	2011-03-31 20:18:45.000000000 +0300
+@@ -26,6 +26,7 @@
+  * $Id: ipcad-3.7.3-signal_h.patch,v 1.1 2011/03/31 17:27:08 ssuominen Exp $
+  */
+ 
++#include <signal.h> /* sigprocmask */
+ 
+ #include "ipcad.h"
+ #include "opt.h"
+diff -ur ipcad-3.7.3.orig/servers.c ipcad-3.7.3/servers.c
+--- ipcad-3.7.3.orig/servers.c	2007-04-22 11:08:45.000000000 +0300
++++ ipcad-3.7.3/servers.c	2011-03-31 20:25:10.000000000 +0300
+@@ -26,6 +26,8 @@
+  * $Id: ipcad-3.7.3-signal_h.patch,v 1.1 2011/03/31 17:27:08 ssuominen Exp $
+  */
+ 
++#include <signal.h> /* pthread_kill and sigprocmask */
++
+ #include "ipcad.h"
+ #include "servers.h"
+ #include "opt.h"
diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
new file mode 100644
index 000000000000..d082ecce30d1
--- /dev/null
+++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.3.ebuild,v 1.1 2011/03/31 17:27:08 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="IP Cisco Accounting Daemon"
+HOMEPAGE="http://ipcad.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	net-firewall/iptables"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch \
+		"${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \
+		"${FILESDIR}"/${P}-signal_h.patch
+
+	eautoreconf
+}
+
+src_install() {
+	sed -i -e "s/^chroot = \/adm\/tmp;/chroot = \/var\/ipcad;/" ipcad.conf.default
+	sed -i -e "s/^interface/#interface/" ipcad.conf.default
+	sed -i -e "s/^aggregate/#aggregate/" ipcad.conf.default
+	sed -i -e "s/^pidfile = ipcad.pid;/pidfile = \/run\/ipcad.pid;/" ipcad.conf.default
+
+	dodoc AUTHORS ChangeLog README BUGS FAQ ipcad.conf.simple ipcad.conf.default
+
+	dosbin ipcad || die
+
+	insinto /etc
+	insopts -m0600
+	newins ipcad.conf.default ipcad.conf
+
+	keepdir /var/ipcad/run
+
+	doman ipcad.8 ipcad.conf.5
+
+	newinitd "${FILESDIR}"/ipcad.init ipcad
+	newconfd "${FILESDIR}"/ipcad.conf.d ipcad
+}