summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:55:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:55:47 +0000
commitb55af856433f4759553b9a1a6df9a85ff9ed228a (patch)
tree490246710d05a049114a50e1a7ec6ad80c118893 /net-analyzer/trafshow
parentFix compilation with gcc-4.4. Patch by Vistor Ostorga <vostorga AT gentoo DO... (diff)
downloadhistorical-b55af856433f4759553b9a1a6df9a85ff9ed228a.tar.gz
historical-b55af856433f4759553b9a1a6df9a85ff9ed228a.tar.bz2
historical-b55af856433f4759553b9a1a6df9a85ff9ed228a.zip
Fix building with GCC 4.4 wrt #277797.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/trafshow')
-rw-r--r--net-analyzer/trafshow/ChangeLog6
-rw-r--r--net-analyzer/trafshow/Manifest5
-rw-r--r--net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch12
-rw-r--r--net-analyzer/trafshow/trafshow-5.2.3.ebuild9
4 files changed, 26 insertions, 6 deletions
diff --git a/net-analyzer/trafshow/ChangeLog b/net-analyzer/trafshow/ChangeLog
index e38d53202057..5b407ab48cf5 100644
--- a/net-analyzer/trafshow/ChangeLog
+++ b/net-analyzer/trafshow/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/trafshow
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.38 2009/07/06 22:23:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.39 2009/07/25 20:55:47 ssuominen Exp $
+
+ 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> trafshow-5.2.3.ebuild,
+ +files/trafshow-5.2.3-gcc44.patch:
+ Fix building with GCC 4.4 wrt #277797.
06 Jul 2009; Jeroen Roovers <jer@gentoo.org> trafshow-5.2.3.ebuild:
Stable for HPPA too.
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index 8862b43130ca..212c23ec4417 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -1,5 +1,6 @@
+AUX trafshow-5.2.3-gcc44.patch 382 RMD160 0a2cf030bc01517c5290bb2abb0a040c1255dc42 SHA1 815c32cee19d8ea00cd2b715e619d2a5b8a6d412 SHA256 456eda4c522bf4d3123dcc69aa0d303990435062920a63696792652fcd9cb4e1
AUX trafshow-5.2.3-gentoo.patch 741 RMD160 6e281877134c5f60867d108322e9b1b089d36cf7 SHA1 7f6ff2529fc4010aebb4a4b600d0fe34797b43cf SHA256 cda7764e58287aea1595dff346a926577cd568f21d312b537e42e4757d7b324a
DIST trafshow-5.2.3.tgz 142615 RMD160 f1ae068f898160f16ae9b3cb5f9d73ae3aece6cb SHA1 1c68f603f12357e932c83de850366c9b46e53d89 SHA256 ea7e22674a66afcc7174779d0f803c1f25b42271973b4f75fab293b8d7db11fc
-EBUILD trafshow-5.2.3.ebuild 941 RMD160 26c955d5d3a431fba7c593bb9c70a59d8f47b7c2 SHA1 81745d15ff44cebafc716ebb10a2091e69271b18 SHA256 f4a007b592dc5eff52f5119bb55247405def3ae671a435411cc7f68a16a76ea2
-MISC ChangeLog 4734 RMD160 2efaa5d3977568b79fe1decb99764c0331579af8 SHA1 e9da4bb145ca3ceb9a37d47f4979a76405da3d02 SHA256 1bbb16b2a8cc86c707ac06fad7bb9e6e494d07afdacf372decd65515a728e0f8
+EBUILD trafshow-5.2.3.ebuild 983 RMD160 f7c23e91d8c9bee94d8eb067d771f49077ad9ff8 SHA1 5d84396f14a10d62f45cd43e094842008407cc5b SHA256 cd36ef4a1459171e97af6c271924d600036372e94dd1a87563301d39f22f62b7
+MISC ChangeLog 4896 RMD160 0861fa50470a4d097ca81fb1331d722b3d0bf984 SHA1 ca457bd0e444f9b6028236765758618195e89efc SHA256 1f2e8023155e9cbcd2161f354ffd751683975436de462101838c3bc98edfdeea
MISC metadata.xml 243 RMD160 422486f9f6b0b9c73cdcae1cf03902100aabccfe SHA1 05ef6a72919796eaa8753d983408fe6715892751 SHA256 e55f8915328809444208a99003ebebee8247b729e70320c57748069e1ba48586
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
new file mode 100644
index 000000000000..c9fdcc8b7ec3
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur trafshow-5.2.3.orig/session.c trafshow-5.2.3/session.c
+--- trafshow-5.2.3.orig/session.c 2006-01-08 07:58:08.000000000 +0200
++++ trafshow-5.2.3/session.c 2009-07-25 23:54:32.000000000 +0300
+@@ -40,7 +40,7 @@
+ #define ASYNC_MODE FNDELAY
+ #elif O_ASYNC
+ #define ASYNC_MODE O_ASYNC
+-#elif
++#else
+ #error the fcntl argument to turn ON/OFF non-blocking I/O is unknown
+ #endif
+
diff --git a/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
index a00831af16d8..970920f853a7 100644
--- a/net-analyzer/trafshow/trafshow-5.2.3.ebuild
+++ b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-5.2.3.ebuild,v 1.11 2009/07/06 22:23:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-5.2.3.ebuild,v 1.12 2009/07/25 20:55:47 ssuominen Exp $
inherit eutils
DESCRIPTION="Full screen visualization of the network traffic"
HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
+
LICENSE="as-is"
SLOT="3"
KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
@@ -17,8 +18,10 @@ DEPEND="net-libs/libpcap
slang? ( >=sys-libs/slang-1.4 )"
src_unpack() {
- unpack ${A}; cd "${S}"
- epatch "${FILESDIR}/${P}-gentoo.patch"
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-gcc44.patch
}
src_compile() {