Add UTF-8 fix for bug #152883

Package-Manager: portage-2.1.1-r1

6 files changed, 162 insertions, 15 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 4174f4a27210..b8228fc6b932 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.47 2006/10/16 22:11:48 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.48 2006/11/14 20:25:34 cedk Exp $
+
+*iptraf-3.0.0-r3 (14 Nov 2006)
+
+  14 Nov 2006; Cedric Krier <ced@ced.homedns.org>
+  +files/iptraf-3.0.0-ncursesw.patch, +files/iptraf-3.0.0-setlocale.patch,
+  +iptraf-3.0.0-r3.ebuild:
+  Fixed UTF-8 display bug 152883
 
   16 Oct 2006; Jose Luis Rivero <yoswink@gentoo.org> iptraf-3.0.0-r2.ebuild:
   Stable on alpha wrt bug #146939
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 0e5c462ca4a9..9d22aef34145 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX iptraf-2.7.0-2.6.patch 1711 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b SHA1 9f448ea798350f5c97a8623f4b23ac6799bb4979 SHA256 59441534079f43a381c68d48f1160ddd64bbf0ecdc42bd364559287504e8b57a
 MD5 98fb7659373bc05930f0f3837135c811 files/iptraf-2.7.0-2.6.patch 1711
 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b files/iptraf-2.7.0-2.6.patch 1711
@@ -45,6 +42,14 @@ AUX iptraf-3.0.0-linux-headers.patch 963 RMD160 aac7828fdeab874ad44f6f019398497a
 MD5 59493b3c2f0bb06541a55aeffd9f097c files/iptraf-3.0.0-linux-headers.patch 963
 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 files/iptraf-3.0.0-linux-headers.patch 963
 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae files/iptraf-3.0.0-linux-headers.patch 963
+AUX iptraf-3.0.0-ncursesw.patch 1296 RMD160 d0c2648b15d0c0e76278f6ba47c7a3da39ebdbb2 SHA1 876073e52255ab283402c984d5dd33bb8df4f415 SHA256 87ff765718a45518c74ae23427a6f3e5b65dfa9c44774b67e9404ec12e8d5e0f
+MD5 e9cc01e018a1e0da2f30fa5640c365f9 files/iptraf-3.0.0-ncursesw.patch 1296
+RMD160 d0c2648b15d0c0e76278f6ba47c7a3da39ebdbb2 files/iptraf-3.0.0-ncursesw.patch 1296
+SHA256 87ff765718a45518c74ae23427a6f3e5b65dfa9c44774b67e9404ec12e8d5e0f files/iptraf-3.0.0-ncursesw.patch 1296
+AUX iptraf-3.0.0-setlocale.patch 474 RMD160 dafa0ce1dce44c1108c1a8e76ce03cde0a918a4f SHA1 6a2bc2ddd4f3b99cf4cbfa90dd32df4ddb94fcc0 SHA256 3e2b39946039d39ed35a17752790ac06be4c7726e71721224d9534d736f71f3a
+MD5 e10867d75a7ac82ce32104c1ebe92bec files/iptraf-3.0.0-setlocale.patch 474
+RMD160 dafa0ce1dce44c1108c1a8e76ce03cde0a918a4f files/iptraf-3.0.0-setlocale.patch 474
+SHA256 3e2b39946039d39ed35a17752790ac06be4c7726e71721224d9534d736f71f3a files/iptraf-3.0.0-setlocale.patch 474
 DIST iptraf-2.7.0-ipv6-alpha12.diff 57251 RMD160 5a1851ea0c5fa8d9a5f7910b80c8f35192d8ed6c SHA1 7ea33075729a2a77549fa122749752953ebd7933 SHA256 fca50b42120ae5dd4c86b00880c7867a4c9e6f804cd7d22ea3c8b8d4e1cf05a3
 DIST iptraf-2.7.0.tar.gz 363496 RMD160 49e09c9e74a09828c477cc22d75f9e64114d390b SHA1 f5ec59aaa31721e285e0cd509acf0026d47f4489 SHA256 5a335c8c22d02f7ccc640b37fcc7c0ea6840d4287e532a9efd0d0c9b6f1a16ae
 DIST iptraf-3.0.0-ipv6.patch.bz2 10069 RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 SHA1 f0032c78f72ba1c3fe7ecbb51135142fb7d3318c SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b
@@ -57,14 +62,18 @@ EBUILD iptraf-3.0.0-r2.ebuild 1918 RMD160 5e8e54ca063789dc9dd7143a7120d3bbc1ff06
 MD5 4828f6da3eea30da472cdeb31654b213 iptraf-3.0.0-r2.ebuild 1918
 RMD160 5e8e54ca063789dc9dd7143a7120d3bbc1ff0682 iptraf-3.0.0-r2.ebuild 1918
 SHA256 85a4d012aa98618c183b9cc1819b84b3e694cd99c0f40bcf0128e011490ddc28 iptraf-3.0.0-r2.ebuild 1918
+EBUILD iptraf-3.0.0-r3.ebuild 2021 RMD160 835fb15cc97812886d58d7bdc59f7b4cd791c10d SHA1 4d0b15f575082d89b17e202c4417902959367416 SHA256 3032f8e47fa2ff057dc61cec3c804fa786a2a4843adfc87cf5e0651acbb21abe
+MD5 153fe41036086706e882814be4886494 iptraf-3.0.0-r3.ebuild 2021
+RMD160 835fb15cc97812886d58d7bdc59f7b4cd791c10d iptraf-3.0.0-r3.ebuild 2021
+SHA256 3032f8e47fa2ff057dc61cec3c804fa786a2a4843adfc87cf5e0651acbb21abe iptraf-3.0.0-r3.ebuild 2021
 EBUILD iptraf-3.0.0.ebuild 1159 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 SHA1 4d8359fb8ed9abb73789494f6da84612ad453108 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0
 MD5 31ec4dadb0b55040e589c0048b14298b iptraf-3.0.0.ebuild 1159
 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 iptraf-3.0.0.ebuild 1159
 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0 iptraf-3.0.0.ebuild 1159
-MISC ChangeLog 6495 RMD160 479d478052de40a4904d3dc69e979329341c68a4 SHA1 5ffedc025c7484b5c357906abd60d3e99eaa93c0 SHA256 569c9ed6c3a74d28f70a4dffa9a3d2f764e8d2b0606a4109bcc621e06e223b3a
-MD5 fb4dce20f99a2f0d996e6857f32c69cf ChangeLog 6495
-RMD160 479d478052de40a4904d3dc69e979329341c68a4 ChangeLog 6495
-SHA256 569c9ed6c3a74d28f70a4dffa9a3d2f764e8d2b0606a4109bcc621e06e223b3a ChangeLog 6495
+MISC ChangeLog 6710 RMD160 171a1f84e7c37fd7f84e0e44c5588a3a4bd06bec SHA1 fa9a7a39d53f5593c6bde85f97774ceb0d0db9f2 SHA256 7cd1feacdd8e1160067c6bf727cf980433113b04b26f752aa1795bd27955860a
+MD5 2823872f0a72a1c28797a73a2e53e270 ChangeLog 6710
+RMD160 171a1f84e7c37fd7f84e0e44c5588a3a4bd06bec ChangeLog 6710
+SHA256 7cd1feacdd8e1160067c6bf727cf980433113b04b26f752aa1795bd27955860a ChangeLog 6710
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 metadata.xml 236
@@ -78,10 +87,6 @@ SHA256 5df7e88a160f3a9b5411467810527af2ae0cb3bc1f381c8f9827d086985f44cb files/di
 MD5 d17a4675bb2066a4624512c84292e321 files/digest-iptraf-3.0.0-r2 497
 RMD160 5bcc0c5ecc6945b3abfd43dcc11dc409ae5af4c8 files/digest-iptraf-3.0.0-r2 497
 SHA256 3a40ce7007c51191bedddacfcab6de40e1e66c2a00dff68832e22126f8f410c8 files/digest-iptraf-3.0.0-r2 497
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFFNASc3og80iZgVQgRAvijAJ9vU/2PR3Gq0BBThxFUKhBVu4gXRACfSEqh
-G2xHafGvn0qv9jBPpIpZPhQ=
-=146w
------END PGP SIGNATURE-----
+MD5 d17a4675bb2066a4624512c84292e321 files/digest-iptraf-3.0.0-r3 497
+RMD160 5bcc0c5ecc6945b3abfd43dcc11dc409ae5af4c8 files/digest-iptraf-3.0.0-r3 497
+SHA256 3a40ce7007c51191bedddacfcab6de40e1e66c2a00dff68832e22126f8f410c8 files/digest-iptraf-3.0.0-r3 497
diff --git a/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r3 b/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r3
new file mode 100644
index 000000000000..a97bd2feb121
--- /dev/null
+++ b/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r3
@@ -0,0 +1,6 @@
+MD5 1cea10de695741befcdf9d3d4c31b9b8 iptraf-3.0.0-ipv6.patch.bz2 10069
+RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 iptraf-3.0.0-ipv6.patch.bz2 10069
+SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b iptraf-3.0.0-ipv6.patch.bz2 10069
+MD5 377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz 575169
+RMD160 aaef797076056d6b788a9c9eff29500060594526 iptraf-3.0.0.tar.gz 575169
+SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163 iptraf-3.0.0.tar.gz 575169
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch
new file mode 100644
index 000000000000..a75a014762f1
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch
@@ -0,0 +1,31 @@
+diff -ru iptraf-3.0.0~/src/Makefile iptraf-3.0.0/src/Makefile
+--- iptraf-3.0.0~/src/Makefile	2006-11-14 21:14:31.000000000 +0100
++++ iptraf-3.0.0/src/Makefile	2006-11-14 21:15:12.000000000 +0100
+@@ -18,7 +18,7 @@
+ BINDIR		= ../../iptraf-$(VERNUMBER).bin.$(ARCH)
+ 
+ CC		= gcc
+-LIBS		= -L../support -ltextbox -lpanel -lncurses   # in this order!
++LIBS		= -L../support -ltextbox -lpanelw -lncursesw   # in this order!
+ 
+ # comment this one out to omit debug code when done.
+ 
+@@ -163,7 +163,7 @@
+ # and the compiled programs for release as a ready-to-run distribution.
+ 
+ dist-bin: all
+-	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
++	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a
+ 	rm -rf $(BINDIR)
+ 	mkdir $(BINDIR)
+ 	/bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
+@@ -179,7 +179,7 @@
+ # Just in case anyone needs to link a static binary
+ #
+ static: $(OBJS)
+-	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses
++	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw
+ 	$(CC) -static -o rvnamed rvnamed.o getpath.o
+ 	$(CC) -static -o rawtime rawtime.c
+ 
+Only in iptraf-3.0.0~/src: Makefile.orig
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch
new file mode 100644
index 000000000000..073a8c4e4d8f
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch
@@ -0,0 +1,19 @@
+--- iptraf-3.0.0/src/iptraf.c.orig	2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/iptraf.c	2006-01-30 08:38:49.000000000 +0100
+@@ -39,6 +39,7 @@
+ #include <menurt.h>
+ #include <winops.h>
+ #include <msgboxes.h>
++#include <locale.h>
+ #include "dirs.h"
+ #include "deskman.h"
+ #include "fltdefs.h"
+@@ -499,6 +500,8 @@
+     }
+ #endif
+ 
++    setlocale(LC_ALL, "");
++
+     strcpy(current_logfile, "");
+     strcpy(graphing_logfile, "");
+     strcpy(graphing_filter, "");
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild
new file mode 100644
index 000000000000..52eb1445b8eb
--- /dev/null
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild,v 1.1 2006/11/14 20:25:34 cedk Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
+HOMEPAGE="http://iptraf.seul.org/"
+SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
+	mirror://gentoo/${P}-ipv6.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 suid"
+
+DEPEND=">=sys-libs/ncurses-5.2-r1"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-atheros.patch
+	epatch ${FILESDIR}/${P}-build.patch
+	epatch ${FILESDIR}/${P}-linux-headers.patch
+	epatch ${FILESDIR}/${P}-bnep.patch
+	epatch ${FILESDIR}/${P}-Makefile.patch
+	# bug 152883
+	epatch "${FILESDIR}/${P}-ncursesw.patch"
+	epatch "${FILESDIR}/${P}-setlocale.patch"
+
+	# bug 128965
+	epatch ${FILESDIR}/${P}-headerfix.patch
+
+	sed -i \
+		-e 's:/var/local/iptraf:/var/lib/iptraf:g' \
+		-e "s:Documentation/:/usr/share/doc/${PF}:g" \
+		Documentation/*.* || die "sed doc paths"
+
+	if use ipv6 ; then
+		epatch ${DISTDIR}/${P}-ipv6.patch.bz2
+
+		# bug 126479
+		if has_version '>=sys-libs/glibc-2.4' ; then
+			epatch ${FILESDIR}/${P}-ipv6-glibc24.patch
+		fi
+
+		# bug 128965
+		epatch ${FILESDIR}/${P}-ipv6-headerfix.patch
+	fi
+}
+
+src_compile() {
+	if use suid ; then
+		append-flags -DALLOWUSERS
+	fi
+	emake CFLAGS="$CFLAGS" -C src || die "emake failed"
+}
+
+src_install() {
+	dosbin src/{iptraf,rawtime,rvnamed} || die
+	dodoc FAQ README* CHANGES RELEASE-NOTES
+	doman Documentation/*.8
+	dohtml -r Documentation/*
+	keepdir /var/{lib,run,log}/iptraf
+}
+
+pkg_postinst() {
+	if use suid ; then
+		einfo
+		einfo "You've chosen to build iptraf with run-as-user support"
+		einfo
+		einfo "The app now has this support, but for security reasons"
+		einfo "you need to run the following command to allow your users"
+		einfo "to suid-run it:"
+		einfo
+		einfo " # chmod 4755 /usr/sbin/iptraf"
+		einfo
+	fi
+}