Fixed ipv6 problems, bug #95530. Ebuild rewrite. Thanks aye in bug #101259

Package-Manager: portage-2.0.51.22-r2

5 files changed, 161 insertions, 9 deletions

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index ac07ae5e5efd..fea5db7787d0 100644
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gnunet
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.31 2005/07/10 20:54:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.32 2005/08/20 19:40:22 sekretarz Exp $
+
+*gnunet-0.6.6b-r1 (20 Aug 2005)
+
+  20 Aug 2005; <sekretarz@gentoo.org> +files/gnunet-ipv6-gentoo.patch,
+  +gnunet-0.6.6b-r1.ebuild:
+  Fixed ipv6 problems, bug #95530. Ebuild rewrite. Thanks aye in bug #101259
 
   10 Jul 2005; Sven Wegener <swegener@gentoo.org> gnunet-0.6.6b.ebuild:
   QA: Removed 'emake || make || die' and variants. Either a package is
diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index 28558d0d9324..0ae89569a351 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,7 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a3e29a9b1a0ecb0a65d2e28d39ac8a1e ChangeLog 5105
+MD5 833069f598ceea2e7f00a1bff60e983f ChangeLog 5316
+MD5 4f9226f4408ff37f868a8367513e9c56 gnunet-0.5.4-r1.ebuild 1260
+MD5 3d78de0ed5d6b9f64a9f638fe2b94e66 gnunet-0.6.2b.ebuild 1611
+MD5 2a23540ef540209f8cdc533675fb2b77 gnunet-0.6.6b.ebuild 2398
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 affd8f2466a8ae2491e96dc6a0c3d08d gnunet-0.6.6b-r1.ebuild 2503
 MD5 12b0bdd38d4a838fcc6d4e8b970870f5 files/digest-gnunet-0.5.4-r1 65
 MD5 d4a748c8e3536c6691b63794f7c17639 files/digest-gnunet-0.6.2b 66
 MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b 67
@@ -9,14 +14,12 @@ MD5 6113da0c1798ff38d8d4c1fd4c9dfbb6 files/gnunet 805
 MD5 6ac0938893978d5f2bc22bf808bc0fe3 files/gnunet-0.6.6b 794
 MD5 a38f2ed0178c5ebc09e4f5fc2c3baddd files/gnunet-0.6.6b-autotools.patch 2065
 MD5 7e0bb86547b0ad5e7744374d32c124f8 files/gnunet-download-manager.scm 13338
-MD5 4f9226f4408ff37f868a8367513e9c56 gnunet-0.5.4-r1.ebuild 1260
-MD5 3d78de0ed5d6b9f64a9f638fe2b94e66 gnunet-0.6.2b.ebuild 1611
-MD5 2a23540ef540209f8cdc533675fb2b77 gnunet-0.6.6b.ebuild 2398
-MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b-r1 67
+MD5 53aa63a0ddf902a57c6ac427560b9664 files/gnunet-ipv6-gentoo.patch 1891
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC0YsqI1lqEGTUzyQRAujEAJ4k5qh7OBvL6tUDoAd1ahmFmLzahgCgsAG0
-/9SpDWZKb/KLHZ0zx2f3R8Q=
-=BOsZ
+iD8DBQFDB6RtZ/iYVBmujdURAkX/AKCR2nj7ByumkllJtFzg+g/6v50wwgCg51m5
+IeO7FiqmKYUy33npiBM9QLA=
+=imOb
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.6b-r1 b/net-p2p/gnunet/files/digest-gnunet-0.6.6b-r1
new file mode 100644
index 000000000000..467660b4348f
--- /dev/null
+++ b/net-p2p/gnunet/files/digest-gnunet-0.6.6b-r1
@@ -0,0 +1 @@
+MD5 dc04ecf7d1e7d4ccfde62fad101a301f GNUnet-0.6.6b.tar.bz2 1291441
diff --git a/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch b/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch
new file mode 100644
index 000000000000..acd779131aa6
--- /dev/null
+++ b/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch
@@ -0,0 +1,48 @@
+diff -Naur src/include/gnunet_util.h /tmp/GNUnet-0.6.6b/src/include/gnunet_util.h
+--- src/include/gnunet_util.h	2005-02-28 00:43:33.000000000 +0100
++++ /tmp/GNUnet-0.6.6b/src/include/gnunet_util.h	2005-08-03 14:35:23.000000000 +0200
+@@ -1067,7 +1067,7 @@
+  * @param routeList a string specifying the forbidden networks
+  * @return the converted list, NULL if the synatx is flawed
+  */
+-CIDR6Network * parseRoutes6(const char * routeList);
++CIDR6Network * parseRoutes6(char * routeList);
+ 
+ 
+ 
+diff -Naur src/transports/tcp6.c /tmp/GNUnet-0.6.6b/src/transports/tcp6.c
+--- src/transports/tcp6.c	2005-01-26 02:58:46.000000000 +0100
++++ /tmp/GNUnet-0.6.6b/src/transports/tcp6.c	2005-08-03 14:34:56.000000000 +0200
+@@ -825,6 +825,7 @@
+   }
+   ok = SYSERR;
+   MUTEX_LOCK(&tcp6lock);
++  int sucess;
+   if (tcp6Session->wpos > 0) {
+     ret = 0;
+   } else {
+diff -Naur src/transports/udp6.c /tmp/GNUnet-0.6.6b/src/transports/udp6.c
+--- src/transports/udp6.c	2005-01-26 02:58:46.000000000 +0100
++++ /tmp/GNUnet-0.6.6b/src/transports/udp6.c	2005-08-03 14:35:09.000000000 +0200
+@@ -275,6 +275,7 @@
+ #endif
+     /* quick test of the packet, if failed, repeat! */
+     if (size != ntohs(udp6m.size)) {
++	  char * tmp = MALLOC(INET6_ADDRSTRLEN);
+       LOG(LOG_WARNING,
+ 	  _("Packed received from %s:%d (UDP6) failed format check."),
+ 	  inet_ntop(AF_INET6,
+diff -Naur src/util/ipcheck.c /tmp/GNUnet-0.6.6b/src/util/ipcheck.c
+--- src/util/ipcheck.c	2005-01-26 02:58:55.000000000 +0100
++++ /tmp/GNUnet-0.6.6b/src/util/ipcheck.c	2005-08-03 14:34:41.000000000 +0200
+@@ -281,8 +281,8 @@
+  * @param ip the IP to check (in network byte order)
+  * @return NO if the IP is not in the list, YES if it it is
+  */
+-int checkIP6Listed(CIDR6Network * list,
+-		   IP6addr * ip) {
++int checkIP6Listed(const CIDR6Network * list,
++		   const IP6addr * ip) {
+   unsigned int i;
+   unsigned int j;
+   struct in6_addr zero;
diff --git a/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild b/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild
new file mode 100644
index 000000000000..29daa38c6b6c
--- /dev/null
+++ b/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild,v 1.1 2005/08/20 19:40:22 sekretarz Exp $
+
+inherit eutils libtool
+
+S="${WORKDIR}/GNUnet-${PV}"
+DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
+HOMEPAGE="http://www.gnu.org/software/GNUnet/"
+SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
+RESTRICT="nomirror"
+
+IUSE="ipv6 mysql sqlite guile nls gdbm"
+KEYWORDS="~x86 ~ppc ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=dev-libs/libgcrypt-1.2.0
+	>=x11-libs/gtk+-2.6.0
+	>=media-libs/libextractor-0.3.1
+	>=dev-libs/gmp-4.0.0
+	mysql? ( >=dev-db/mysql-3.23.56 )
+	sqlite? ( >=dev-db/sqlite-3.0.8 )
+	guile? ( >=dev-util/guile-1.6.0 )
+	nls? ( sys-devel/gettext )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+pkg_preinst() {
+	enewgroup gnunet || die "Problem adding gnunet group"
+	enewuser gnunet -1 /bin/false /dev/null gnunet || die "Problem adding gnunet user"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-autotools.patch
+	libtoolize --copy --force
+	use ipv6 && epatch ${FILESDIR}/${PN}-ipv6-gentoo.patch
+}
+
+src_compile() {
+#	elibtoolize --copy --force
+
+	local myconf
+
+	if use ipv6; then
+		if use amd64; then
+			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
+		else
+			myconf="${myconf} --enable-ipv6"
+		fi
+	fi
+
+	econf $(use_with gdbm) \
+		$(use_with mysql) \
+		$(use_with sqlite) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "make install failed"
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
+	insinto /etc
+	newins contrib/gnunet.root gnunet.conf
+	docinto contrib
+	dodoc contrib/*
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/gnunet-0.6.6b gnunet
+	dodir /var/lib/GNUnet
+	chown gnunet:gnunet ${D}/var/lib/GNUnet
+}
+
+pkg_postinst() {
+	# make sure permissions are ok
+	chown -R gnunet:gnunet /var/lib/GNUnet
+
+	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
+	einfo
+	einfo "If you want to run GNUnet as a user"
+	einfo "copy an appropriate config file from"
+	einfo "/usr/share/doc/${P}/contrib"
+	einfo "to ~/.gnunet/gnunet.conf"
+	einfo
+	einfo "It is also possible to run GNUnet as"
+	einfo "a system service. You can start it by"
+	einfo "running /etc/init.d/gnunet start"
+	einfo "The config file is in /etc/gnunet.conf"
+}
+