Added fix for gcc-4.1 (#133322).

(Portage version: 2.0.54-r2)

5 files changed, 95 insertions, 10 deletions

diff --git a/net-misc/dibbler/ChangeLog b/net-misc/dibbler/ChangeLog
index f8c1bac3c406..58b1541db867 100644
--- a/net-misc/dibbler/ChangeLog
+++ b/net-misc/dibbler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dibbler
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.1 2005/09/20 07:53:59 gmsoft Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.2 2006/05/16 18:46:59 gmsoft Exp $
+
+  16 May 2006; Guy Martin <gmsoft@gentoo.org> +files/dibbler-gcc-4.1.patch,
+  dibbler-0.4.1.ebuild:
+  Added fix for gcc-4.1 (#133322).
 
 *dibbler-0.4.1 (20 Sep 2005)
 
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index cc87a99bdaf8..0f5933ba604a 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,7 +1,8 @@
 MD5 3eb192e81f6a38f8c1bddfa85f69ec45 ChangeLog 465
-MD5 31508375d60731e83c03bd5cf19cd8b8 dibbler-0.4.1.ebuild 1457
-MD5 bbb94d56dd1c61e150293ce213bb61e1 metadata.xml 218
-MD5 f4f93d6cec932f44908ea817b2306213 files/digest-dibbler-0.4.1 140
+MD5 b1d60b2fa33f1648d5218358b6a859df dibbler-0.4.1.ebuild 1455
 MD5 ef5ae7d52342350eab3c684d8aa3dbe0 files/dibbler-client 465
+MD5 c00cfddc3093220bb75272c275995a96 files/dibbler-gcc-4.1.patch 3060
 MD5 c584858dc5d5056fdae143114c65a211 files/dibbler-relay 458
 MD5 2102046a4e21f60ef9bee94a0dc5330c files/dibbler-server 465
+MD5 773b06b0534d715f593ddc4d20998b1a files/digest-dibbler-0.4.1 140
+MD5 bbb94d56dd1c61e150293ce213bb61e1 metadata.xml 218
diff --git a/net-misc/dibbler/dibbler-0.4.1.ebuild b/net-misc/dibbler/dibbler-0.4.1.ebuild
index 13c76c4912ab..30db6e5bdaf1 100644
--- a/net-misc/dibbler/dibbler-0.4.1.ebuild
+++ b/net-misc/dibbler/dibbler-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.4.1.ebuild,v 1.1 2005/09/20 07:53:59 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.4.1.ebuild,v 1.2 2006/05/16 18:46:59 gmsoft Exp $
 
 inherit eutils
 
@@ -19,8 +19,8 @@ DIBBLER_DOCDIR=${WORKDIR}/doc
 
 src_unpack() {
 	unpack ${A}
-#	cd ${S}
-#	epatch ${FILESDIR}/${P}-security.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gcc-4.1.patch
 }
 
 src_compile() {
diff --git a/net-misc/dibbler/files/dibbler-gcc-4.1.patch b/net-misc/dibbler/files/dibbler-gcc-4.1.patch
new file mode 100644
index 000000000000..e5b19d20c0c9
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-gcc-4.1.patch
@@ -0,0 +1,80 @@
+diff -ruN dibbler-0.4.1.orig/CfgMgr/CfgMgr.h dibbler-0.4.1/CfgMgr/CfgMgr.h
+--- dibbler-0.4.1.orig/CfgMgr/CfgMgr.h	2006-05-14 02:45:22.000000000 -0500
++++ dibbler-0.4.1/CfgMgr/CfgMgr.h	2006-05-14 02:49:20.000000000 -0500
+@@ -40,7 +40,7 @@
+ {
+  public:
+     TCfgMgr(SmartPtr<TIfaceMgr> IfaceMgr);
+-    virtual TCfgMgr::~TCfgMgr();
++    virtual ~TCfgMgr();
+ 
+     bool compareConfigs(const string cfgFile, const string oldCfgFile);
+     void copyFile(const string cfgFile, const string oldCfgFile);
+diff -ruN dibbler-0.4.1.orig/ClntCfgMgr/ClntCfgMgr.h dibbler-0.4.1/ClntCfgMgr/ClntCfgMgr.h
+--- dibbler-0.4.1.orig/ClntCfgMgr/ClntCfgMgr.h	2006-05-14 02:45:22.000000000 -0500
++++ dibbler-0.4.1/ClntCfgMgr/ClntCfgMgr.h	2006-05-14 02:51:15.000000000 -0500
+@@ -66,7 +66,7 @@
+     int countAddrForIA(long IAID);
+     
+     SmartPtr<TClntCfgGroup> getGroupForIA(long IAID);
+-    SmartPtr<TClntCfgIface> TClntCfgMgr::getIfaceByIAID(int iaid);
++    SmartPtr<TClntCfgIface> getIfaceByIAID(int iaid);
+     bool isDone();
+ 
+ private:
+diff -ruN dibbler-0.4.1.orig/Makefile dibbler-0.4.1/Makefile
+--- dibbler-0.4.1.orig/Makefile	2006-05-14 02:45:22.000000000 -0500
++++ dibbler-0.4.1/Makefile	2006-05-14 02:53:38.000000000 -0500
+@@ -54,10 +54,10 @@
+ 	-L$(SRVOPTIONS)  -lSrvOptions \
+ 	-L$(SRVTRANSMGR) -lSrvTransMgr \
+ 	-L$(SRVCFGMGR)   -lSrvCfgMgr \
+-	-L$(CFGMGR)      -lCfgMgr\
++	-L$(CFGMGR)      -lCfgMgr \
+ 	-L$(SRVIFACEMGR) -lSrvIfaceMgr \
+ 	-L$(IFACEMGR)     -lIfaceMgr \
+-	-L$(MISC)        -lMisc\
++	-L$(MISC)        -lMisc \
+ 	-lSrvIfaceMgr -lSrvMsg -lSrvCfgMgr \
+ 	-L$(SRVADDRMGR)  -lSrvAddrMgr \
+ 	                 -lAddrMgr \
+@@ -81,10 +81,10 @@
+ 	-L$(RELIFACEMGR) -lRelIfaceMgr \
+ 	-L$(RELOPTIONS)  -lRelOptions \
+ 	-L$(RELMESSAGES) -lRelMsg \
+-	-L$(LOWLEVEL)    -lLowLevel\
+-	-L$(CFGMGR)      -lCfgMgr\
++	-L$(LOWLEVEL)    -lLowLevel \
++	-L$(CFGMGR)      -lCfgMgr \
+ 	-L$(IFACEMGR)     -lIfaceMgr \
+-	-L$(MISC)        -lMisc\
++	-L$(MISC)        -lMisc \
+ 	-L$(MESSAGES)    -lMsg \
+ 	-L$(MISC)        -lMisc \
+ 	-L$(OPTIONS)     -lOptions \
+diff -ruN dibbler-0.4.1.orig/Misc/DUID.h dibbler-0.4.1/Misc/DUID.h
+--- dibbler-0.4.1.orig/Misc/DUID.h	2006-05-14 02:45:22.000000000 -0500
++++ dibbler-0.4.1/Misc/DUID.h	2006-05-14 02:52:47.000000000 -0500
+@@ -38,8 +38,8 @@
+     TDUID(char* Plain); // plain
+     TDUID(const TDUID &duid);
+     TDUID& operator=(const TDUID& duid);
+-    bool TDUID::operator==(const TDUID &duid);
+-    bool TDUID::operator<=(const TDUID &duid);
++    bool operator==(const TDUID &duid);
++    bool operator<=(const TDUID &duid);
+     int getLen();
+     char * storeSelf(char* buf);
+     const string getPlain();
+diff -ruN dibbler-0.4.1.orig/Options/Opt.h dibbler-0.4.1/Options/Opt.h
+--- dibbler-0.4.1.orig/Options/Opt.h	2006-05-14 02:45:22.000000000 -0500
++++ dibbler-0.4.1/Options/Opt.h	2006-05-14 02:49:49.000000000 -0500
+@@ -41,7 +41,7 @@
+     int getOptType();
+     int getSubOptSize();
+     
+-    char* TOpt::storeSubOpt(char* buf);
++    char* storeSubOpt(char* buf);
+     SmartPtr<TOpt> getOption(int optType);
+ 
+     // suboptions management
diff --git a/net-misc/dibbler/files/digest-dibbler-0.4.1 b/net-misc/dibbler/files/digest-dibbler-0.4.1
index 74379b42ea8b..e1f751034423 100644
--- a/net-misc/dibbler/files/digest-dibbler-0.4.1
+++ b/net-misc/dibbler/files/digest-dibbler-0.4.1
@@ -1,2 +1,2 @@
-MD5 e9c25cc84b881309bbb650d2d36c5fb0 dibbler-0.4.1-src.tar.gz 1158094
 MD5 d7ee175bb1994b597e07583f4cc0113f dibbler-0.4.1-doc.tar.gz 1251723
+MD5 e9c25cc84b881309bbb650d2d36c5fb0 dibbler-0.4.1-src.tar.gz 1158094