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

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 93 insertions, 1 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/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
+}