diff options
| -rw-r--r-- | net-analyzer/ipcad/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch | 5 | ||||
| -rw-r--r-- | net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch | 4 | ||||
| -rw-r--r-- | net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch | 18 | ||||
| -rw-r--r-- | net-analyzer/ipcad/ipcad-3.7.3.ebuild | 29 |
5 files changed, 36 insertions, 29 deletions
diff --git a/net-analyzer/ipcad/ChangeLog b/net-analyzer/ipcad/ChangeLog index ae6fde171605..8af7cf2b8842 100644 --- a/net-analyzer/ipcad/ChangeLog +++ b/net-analyzer/ipcad/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/ipcad -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.37 2012/12/05 16:23:23 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.38 2014/07/12 17:45:38 jer Exp $ + + 12 Jul 2014; Jeroen Roovers <jer@gentoo.org> ipcad-3.7.3.ebuild, + files/ipcad-3.7-linux-2.6.27.patch, files/ipcad-3.7.3-signal_h.patch, + files/ipcad-3.7-linux-2.6.35.patch: + EAPI bump. Add new HOMEPAGE. Run sed once and in src_prepare(). 05 Dec 2012; Jeroen Roovers <jer@gentoo.org> ipcad-3.7.3.ebuild: Fix LICENSE by Ulrich Müller (bug #446056). diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch index 2de1e185844a..3b21efb4ff4e 100644 --- a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch +++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch @@ -1,6 +1,5 @@ -=== modified file 'configure.in' ---- configure.in 2008-11-09 18:27:08 +0000 -+++ configure.in 2008-11-09 18:28:02 +0000 +--- a/configure.in ++++ b/configure.in @@ -156,6 +156,7 @@ ]) diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch index ae80adb2ae1f..84cc52da6bfb 100644 --- a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch +++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch @@ -6,8 +6,8 @@ In file included from ipcad.h:33:0, from disp.c:29: psrc.h:93:23: error: field ‘peer’ has incomplete type ---- configure.in 2011-01-20 09:03:05 +0000 -+++ configure.in 2011-01-20 09:03:14 +0000 +--- a/configure.in ++++ b/configure.in @@ -155,17 +155,29 @@ #endif ]) 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 index 29a04f7da531..f05664de949f 100644 --- a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch +++ b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch @@ -1,7 +1,7 @@ ---- main.c -+++ main.c +--- a/main.c ++++ b/main.c @@ -26,6 +26,8 @@ - * $Id: ipcad-3.7.3-signal_h.patch,v 1.2 2011/03/31 17:28:14 ssuominen Exp $ + * $Id: ipcad-3.7.3-signal_h.patch,v 1.3 2014/07/12 17:45:38 jer Exp $ */ +#include <signal.h> /* signal */ @@ -9,20 +9,20 @@ #include "ipcad.h" #include "cfgvar.h" #include "servers.h" ---- pps.c -+++ pps.c +--- a/pps.c ++++ b/pps.c @@ -26,6 +26,7 @@ - * $Id: ipcad-3.7.3-signal_h.patch,v 1.2 2011/03/31 17:28:14 ssuominen Exp $ + * $Id: ipcad-3.7.3-signal_h.patch,v 1.3 2014/07/12 17:45:38 jer Exp $ */ +#include <signal.h> /* sigprocmask */ #include "ipcad.h" #include "opt.h" ---- servers.c -+++ servers.c +--- a/servers.c ++++ b/servers.c @@ -26,6 +26,8 @@ - * $Id: ipcad-3.7.3-signal_h.patch,v 1.2 2011/03/31 17:28:14 ssuominen Exp $ + * $Id: ipcad-3.7.3-signal_h.patch,v 1.3 2014/07/12 17:45:38 jer Exp $ */ +#include <signal.h> /* pthread_kill and sigprocmask */ diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild index 75511781d342..b5562497fa7b 100644 --- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild +++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 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.6 2012/12/05 16:23:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.3.ebuild,v 1.7 2014/07/12 17:45:38 jer Exp $ -EAPI=2 +EAPI=5 inherit autotools eutils DESCRIPTION="IP Cisco Accounting Daemon" -HOMEPAGE="http://ipcad.sourceforge.net/" +HOMEPAGE="http://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/" SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz" LICENSE="BSD-2 GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="net-libs/libpcap - net-firewall/iptables" +RDEPEND=" + net-libs/libpcap + net-firewall/iptables +" DEPEND="${RDEPEND}" src_prepare() { @@ -24,18 +25,20 @@ src_prepare() { "${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \ "${FILESDIR}"/${P}-signal_h.patch + sed -i \ + -e "s|^chroot = /adm/tmp;|chroot = /var/ipcad;|" \ + -e "s|^interface|#&|" \ + -e "s|^aggregate|#&|" \ + -e "s|^pidfile = ipcad.pid;|pidfile = /run/ipcad.pid;|" \ + ipcad.conf.default || die + 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 + dosbin ipcad insinto /etc insopts -m0600 |