diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-07-17 21:21:05 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-07-17 21:21:05 +0000 |
| commit | 0072e0a18b7d012b30ae6160200d222b78fcc88d (patch) | |
| tree | a29e600b1ca2d5614769829b3a001b9939fbab4c /net-analyzer | |
| parent | arm64 stable, bug #516114 (diff) | |
| download | gentoo-2-0072e0a18b7d012b30ae6160200d222b78fcc88d.tar.gz gentoo-2-0072e0a18b7d012b30ae6160200d222b78fcc88d.tar.bz2 gentoo-2-0072e0a18b7d012b30ae6160200d222b78fcc88d.zip | |
Clean up variables, patch.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/tptest/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch | 10 | ||||
| -rw-r--r-- | net-analyzer/tptest/tptest-3.1.7-r2.ebuild | 15 |
3 files changed, 15 insertions, 18 deletions
diff --git a/net-analyzer/tptest/ChangeLog b/net-analyzer/tptest/ChangeLog index e7f3cb318a8e..90a36446f5db 100644 --- a/net-analyzer/tptest/ChangeLog +++ b/net-analyzer/tptest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/tptest -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/ChangeLog,v 1.18 2013/10/26 20:06:15 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/ChangeLog,v 1.19 2014/07/17 21:21:05 jer Exp $ + + 17 Jul 2014; Jeroen Roovers <jer@gentoo.org> tptest-3.1.7-r2.ebuild, + files/tptest-3.1.7-getstatsfromlinevuln.patch: + Clean up variables, patch. 26 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> -tptest-3.1.7.ebuild: Drop old vulnerable revision, wrt bug #261191 diff --git a/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch index ad0cf08c18a9..4b7fd209f9e4 100644 --- a/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch +++ b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch @@ -1,6 +1,5 @@ -diff -Nurp tptest-3.1.7/engine/tpcommon.c tptest-3.1.7.new/engine/tpcommon.c ---- tptest-3.1.7/engine/tpcommon.c 2004-03-22 15:49:12.000000000 -0500 -+++ tptest-3.1.7.new/engine/tpcommon.c 2009-06-11 16:48:25.000000000 -0400 +--- a/engine/tpcommon.c ++++ b/engine/tpcommon.c @@ -37,6 +37,8 @@ #include <stdio.h> #include <string.h> @@ -138,9 +137,8 @@ diff -Nurp tptest-3.1.7/engine/tpcommon.c tptest-3.1.7.new/engine/tpcommon.c } -diff -Nurp tptest-3.1.7/engine/tpcommon.h tptest-3.1.7.new/engine/tpcommon.h ---- tptest-3.1.7/engine/tpcommon.h 2002-09-16 10:10:42.000000000 -0400 -+++ tptest-3.1.7.new/engine/tpcommon.h 2009-06-11 16:40:10.000000000 -0400 +--- a/engine/tpcommon.h ++++ b/engine/tpcommon.h @@ -43,7 +43,7 @@ int SameTag(char *s1, char *s2); int CopyTagField(char *destp, int destSize, char *srcp, char *pname); int GetSessionFromLine(char *, TPEngine *); diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index 091197ea2518..a7f565689651 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2013 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/tptest/tptest-3.1.7-r2.ebuild,v 1.5 2013/10/09 17:09:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/tptest-3.1.7-r2.ebuild,v 1.6 2014/07/17 21:21:05 jer Exp $ EAPI=5 - inherit toolchain-funcs eutils MY_PV="${PV/./_}" @@ -15,15 +14,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND="" -DEPEND="" src_prepare() { sed -i apps/unix/{client,server}/Makefile \ -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ - || die "sed Makefiles" + || die epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch" cp -f os-dep/unix/* . cp -f engine/* . @@ -33,11 +28,11 @@ src_compile() { emake -C apps/unix/client \ CC=$(tc-getCC) \ LDFLAGS="${LDFLAGS}" \ - || die "emake client" + || die emake -C apps/unix/server \ CC=$(tc-getCC) \ LDFLAGS="${LDFLAGS}" \ - || die "emake server" + || die } src_install() { |