Fix gcc 4.3 compilation

Package-Manager: portage-2.1.5.5

5 files changed, 123 insertions, 80 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index 5b4347169750..b79ed7159d3b 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/freenet6
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.33 2008/06/15 10:44:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.34 2008/06/16 18:05:04 voyageur Exp $
+
+  16 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/freenet6-5.1-gcc43.patch, -freenet6-4.2.2.ebuild,
+  freenet6-5.1.ebuild:
+  gcc 4.3 compilation fix, thanks to Marek Miller <mlm@shells.pl>
+  Fixes bug #226663. Also remove last 4.2 version
 
   15 Jun 2008; Zac Medico <zmedico@gentoo.org> freenet6-4.2.2.ebuild,
   freenet6-5.0.ebuild, freenet6-5.1.ebuild:
diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
index 8c1f17bc48ca..c3bb53ec0f84 100644
--- a/net-misc/freenet6/Manifest
+++ b/net-misc/freenet6/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freenet6-4.2.2-noretry.patch 1273 RMD160 42dc48455d43ae02cf0f59bdf8c05fd85f5e09f7 SHA1 f8d9a3bb5812353312bf451b6ae97f6a58eda7b0 SHA256 8e9ce8e4fbaf92339c15c56085e3d8c41677f08645f1fa869882038721b12e2f
+AUX freenet6-5.1-gcc43.patch 3412 RMD160 3893e9618184f1bfbfb009f64cf4a9b9c74f9883 SHA1 11b3c622c40fe89cc2e8a9f613c909a2833e6bfc SHA256 c5f384d07109a6c1a7efa3c178544fad0f022705e2fd30413a3200e9bd8f1adb
 AUX gw6c.conf 8536 RMD160 633eb8d49378459d93931415be401babf88ef42c SHA1 dde098066da1014bb1374d2d5b18de200105f35e SHA256 8da6f62ed5164d54d272ae9d380f1b2387f2ad819ffcd8f52349beeca44c7b1c
 AUX gw6c.rc 644 RMD160 89bcf7d0329c59eaee58f5c98924c4c1968df6e9 SHA1 643f89719a0141b271a4808281cf79da757f3f73 SHA256 cafd899ebd4bb315b0491e47b3a2a824351e3ff61553f42dd4d5ffdb93ffe9ac
 DIST gw6c-5_0-RELEASE-src.tar.gz 2441593 RMD160 737e4d0cc74d78df9543715f8a5f0e3c9a11c699 SHA1 aad5d89ac87ef50fb930d854c7f97277f83167b4 SHA256 431e59a6590f0826f1cb34a6319bd69d024ca89e36f8578a2befe039a489e894
 DIST gw6c-5_1-RELEASE-src.tar.gz 1055230 RMD160 bb507ce6e56e9fd71363d2fdd27ba61c04ab125f SHA1 1ffab56a93d2271001f257d4dcaea82c38aa81f9 SHA256 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
-DIST gw6c4_2_2src.tar.gz 113738 RMD160 d918e08bf1670a2e875880bdef582ad2a971ed38 SHA1 9837e29d5ca4236f244d1507716c815728623026 SHA256 938021f16f88f984c33f714b3f7a75c54927e0d63f1a0bdfc723a03758e9ee73
-EBUILD freenet6-4.2.2.ebuild 1620 RMD160 d46f015e0dcfc2f5d62ca979309e8dfd87ea02ae SHA1 c5c0ec6bfedce085869f20ca29541af0a838f5ca SHA256 80e53b1ea317b847e7174878e4f11740e677778576036d18c44593ebc493f6d5
 EBUILD freenet6-5.0.ebuild 1633 RMD160 415202f9badc666b33ea1b2e0a6b2e25a9d5f54a SHA1 ba5925de1e7215cd2f38dfbc08845e4ff404d449 SHA256 6fed189f2e7a7056c1a0285ed5f7e10bfec5953060cf014dfe45b05a4f256a69
-EBUILD freenet6-5.1.ebuild 2454 RMD160 01d7ab4b41f3713d78db7cd19986adc2251d62ad SHA1 a2ef6a2afc171a50c301a0399b8746ae801568a6 SHA256 dfd4b21ab4788680d1f79d733e07c80e6c13d4b5f2cb30b961aa0b6e892dbbf9
-MISC ChangeLog 4488 RMD160 925b9f0d7e898fb67767b160c25e4ad9e46f9a96 SHA1 f732a8dbddd0315dec37ac9aeaa202357e97286e SHA256 dc0ff20c7c046d62cccadf2920e40848f6cd0b165dfb5161414b76c88dbc82d7
+EBUILD freenet6-5.1.ebuild 2496 RMD160 614a3398eebfd3a0875e6d4eae751fb22491ce43 SHA1 e7f1765dca996703e22bf2c9a63f0e91d5268ec0 SHA256 985bcfc33c7a9f26a2f867c35300812a1fb2ab31266aa17413d5606a887d4c30
+MISC ChangeLog 4743 RMD160 d615e620d2b046ce6e487b4fa25894b8aeda2e55 SHA1 72a873a3370bfa76cf36508c2870f99df3e52463 SHA256 b09be891fd20d170552b8830b3183e155ee28b66649769bb708f98e50b545e55
 MISC metadata.xml 348 RMD160 831527825fdc6b58538bb671987c0a562e1559df SHA1 2517554158e3a9d0cd11e7a8ecbe4fa1843a170f SHA256 9a455a8b1ebafab91dcd8d5a1c0d3cc61fc75abc59ad2988d7118032f8309730
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhU8noACgkQ/ejvha5XGaMPRgCdEOeS98EL0M+JyDQSC0FlS39H
-E7oAoIqJFf/l39Xh7JVMSdVYSFN2xO4z
-=cDsv
------END PGP SIGNATURE-----
diff --git a/net-misc/freenet6/files/freenet6-5.1-gcc43.patch b/net-misc/freenet6/files/freenet6-5.1-gcc43.patch
new file mode 100644
index 000000000000..fb8e11f6ad48
--- /dev/null
+++ b/net-misc/freenet6/files/freenet6-5.1-gcc43.patch
@@ -0,0 +1,109 @@
+
+
+--- gw6c-messaging/src/clientmsgsender.cc.orig	2008-06-16 15:28:00.000000000 +0000
++++ gw6c-messaging/src/clientmsgsender.cc	2008-06-16 15:28:11.000000000 +0000
+@@ -19,6 +19,8 @@
+ // **************************************************************************
+ #include <gw6cmessaging/clientmsgsender.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ namespace gw6cmessaging
+
+--- gw6c-messaging/src/servermsgsender.cc.orig	2008-06-16 15:31:47.000000000 +0000
++++ gw6c-messaging/src/servermsgsender.cc	2008-06-16 15:31:56.000000000 +0000
+@@ -19,6 +19,8 @@
+ // **************************************************************************
+ #include <gw6cmessaging/servermsgsender.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/namevalueparser.cc.orig	2008-06-16 15:32:41.000000000 +0000
++++ gw6c-config/src/namevalueparser.cc	2008-06-16 15:32:51.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <fstream>
+ #include <time.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #define NV_SEPARATOR          "="                   // Name=value separator
+
+--- gw6c-config/src/gw6cconfig.cc.orig	2008-06-16 15:33:33.000000000 +0000
++++ gw6c-config/src/gw6cconfig.cc	2008-06-16 15:33:43.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ #include <assert.h>
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ 
+ // Configuration data variable NAMES
+
+--- gw6c-config/src/gw6cvalidation.cc.orig	2008-06-16 15:34:19.000000000 +0000
++++ gw6c-config/src/gw6cvalidation.cc	2008-06-16 15:34:29.000000000 +0000
+@@ -18,6 +18,8 @@
+ // __________________________________________________________________________
+ // **************************************************************************
+ #include <gw6cconfig/gw6cvalidation.h>
++#include <cstring>
++#include <cstdlib> 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:38:18.000000000 +0000
++++ gw6c-config/src/gw6c_c_wrapper.cc	2008-06-16 15:38:30.000000000 +0000
+@@ -22,6 +22,9 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ using namespace gw6cconfig;
+ #include <assert.h>
++#include <cstring>
++#include <cstdlib>
++
+ 
+ #ifdef WIN32
+ #define strcasecmp      _stricmp
+
+--- gw6c-messaging/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:39:04.000000000 +0000
++++ gw6c-messaging/src/gw6c_c_wrapper.cc	2008-06-16 15:39:20.000000000 +0000
+@@ -17,6 +17,8 @@
+ // Creation Date: December 2006
+ // __________________________________________________________________________
+ // **************************************************************************
++
++#include <cstring>
+ #include <gw6cmessaging/gw6c_c_wrapper.h>
+ #include <gw6cmessaging/clientmsgdataretriever.h>
+ #include <gw6cmessaging/clientmessengerimpl.h>
+
+--- gw6c-config/src/hap6devicemappingconfig.cc.orig	2008-06-16 15:40:58.000000000 +0000
++++ gw6c-config/src/hap6devicemappingconfig.cc	2008-06-16 15:41:09.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <gw6cconfig/hap6devicemappingconfig.h>
+ #include <gw6cconfig/gw6cuistrings.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/hap6_devmap_c_wrap.cc.orig	2008-06-16 15:41:44.000000000 +0000
++++ gw6c-config/src/hap6_devmap_c_wrap.cc	2008-06-16 15:41:54.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ using namespace gw6cconfig;
+ #include <assert.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #define strcasecmp      _stricmp
+
diff --git a/net-misc/freenet6/freenet6-4.2.2.ebuild b/net-misc/freenet6/freenet6-4.2.2.ebuild
deleted file mode 100644
index c52ebdfb0e84..000000000000
--- a/net-misc/freenet6/freenet6-4.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-4.2.2.ebuild,v 1.8 2008/06/15 10:44:02 zmedico Exp $
-
-inherit eutils versionator
-
-MY_PV=$(replace_all_version_separators "_")
-DESCRIPTION="Client to configure an IPv6 tunnel to freenet6"
-HOMEPAGE="http://www.freenet6.net/"
-SRC_URI="mirror://gentoo/gw6c${MY_PV}src.tar.gz"
-
-LICENSE="VPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/tspc-advanced"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-noretry.patch
-}
-
-src_compile() {
-	emake all target=linux || die "Build Failed"
-}
-
-src_install() {
-	dosbin bin/gw6c
-
-	insopts -m 600
-	insinto /etc/freenet6
-	doins ${FILESDIR}/gw6c.conf
-	exeinto /etc/freenet6/template
-	doexe template/{linux,checktunnel}.sh
-
-	newinitd ${FILESDIR}/gw6c.rc gw6c
-
-	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1*"
-	upgrade_from_1_x=$?
-}
-
-pkg_postinst() {
-	if [[ $upgrade_from_1_x = 0 ]] ; then
-		ewarn "Warning: you are upgrading from an older version"
-		ewarn "The configuration file has been renamed to gw6c.conf"
-		ewarn "Remember to port your personal settings from tspc.conf to it"
-		ewarn "The init script has been renamed to 'gw6c',"
-	else
-		elog "The freenet6 ebuild installs an init script named 'gw6c'"
-	fi
-	elog "to coincide with the name of the client binary installed"
-	elog "To add support for a freenet6 connection at startup, do"
-	elog ""
-	elog "# rc-update add gw6c default"
-}
diff --git a/net-misc/freenet6/freenet6-5.1.ebuild b/net-misc/freenet6/freenet6-5.1.ebuild
index d890a07348ae..d58d8f84f120 100644
--- a/net-misc/freenet6/freenet6-5.1.ebuild
+++ b/net-misc/freenet6/freenet6-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.3 2008/06/15 10:44:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.4 2008/06/16 18:05:04 voyageur Exp $
 
 inherit eutils versionator toolchain-funcs
 
@@ -22,6 +22,9 @@ S="${WORKDIR}/tspc-advanced"
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
 	for i in gw6c-config gw6c-messaging ; do
 		sed -i -e "/ARCHIVER=/s:ar:$(tc-getAR):" \
 			-e "/COMPILER=/s:g++:$(tc-getCXX):" \