diff options
| -rw-r--r-- | net-p2p/gnunet/ChangeLog | 7 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.6.2b | 3 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 | 3 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch | 55 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch | 48 | ||||
| -rw-r--r-- | net-p2p/gnunet/gnunet-0.6.2b.ebuild | 72 | ||||
| -rw-r--r-- | net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild | 122 | ||||
| -rw-r--r-- | net-p2p/gnunet/gnunet-0.7.0e.ebuild | 4 |
8 files changed, 8 insertions, 306 deletions
diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog index 7759d6b68aee..cd23c868feb4 100644 --- a/net-p2p/gnunet/ChangeLog +++ b/net-p2p/gnunet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/gnunet # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.52 2007/01/12 21:10:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.53 2007/01/21 14:27:02 armin76 Exp $ + + 21 Jan 2007; Raúl Porcel <armin76@gentoo.org> + -files/gnunet-ipv6-gentoo.patch, -files/gnunet-0.7.0d-nulludp.patch, + -gnunet-0.6.2b.ebuild, -gnunet-0.7.0d-r1.ebuild, gnunet-0.7.0e.ebuild: + Stable x86 to fix bug 147739, remove old, remove old patches *gnunet-0.7.0e (12 Jan 2007) diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.2b b/net-p2p/gnunet/files/digest-gnunet-0.6.2b deleted file mode 100644 index 0a353e597c4c..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.6.2b +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c3c8dcc940d3fdf35c0f606624362938 GNUnet-0.6.2b.tar.bz2 980714 -RMD160 6bcf1f1a12b1a15c745bea1fbe0c77f450613907 GNUnet-0.6.2b.tar.bz2 980714 -SHA256 015dc02aef8ea748723829d27b76c03fe48dc685082e858a9f48bcdf493d02e4 GNUnet-0.6.2b.tar.bz2 980714 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 b/net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 deleted file mode 100644 index 8d4042c25a97..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.7.0d-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c910ceb8acf02e8ef100951bf72ec71a GNUnet-0.7.0d.tar.bz2 1371958 -RMD160 b00d19a326ca0ae92641b89d3039f02782b286d6 GNUnet-0.7.0d.tar.bz2 1371958 -SHA256 990c00d41cb31b52ca30e54ad833327e73f22eca602fdb374bbf1e3eebe0ee33 GNUnet-0.7.0d.tar.bz2 1371958 diff --git a/net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch b/net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch deleted file mode 100644 index 5e666af21ec8..000000000000 --- a/net-p2p/gnunet/files/gnunet-0.7.0d-nulludp.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur GNUnet-0.7.0d.orig/src/transports/udp.c GNUnet-0.7.0d/src/transports/udp.c ---- GNUnet-0.7.0d.orig/src/transports/udp.c 2006-03-12 01:04:29.000000000 -0600 -+++ GNUnet-0.7.0d/src/transports/udp.c 2006-05-13 23:17:45.000000000 -0500 -@@ -247,7 +247,21 @@ - } - if (pending <= 0) { - LOG(LOG_WARNING, -- _("UDP: select returned, but ioctl reports 0 bytes available!\n")); -+ _("UDP: select returned, but ioctl reports %d bytes available!\n"), -+ pending); -+ if (pending == 0) { -+ /* maybe empty UDP packet was sent (see report on bug-gnunet, -+ 5/11/6; read 0 bytes from UDP just to kill potential empty packet! */ -+ memset(&incoming, -+ 0, -+ sizeof(struct sockaddr_in)); -+ RECVFROM(udp_sock, -+ NULL, -+ 0, -+ 0, -+ (struct sockaddr * )&incoming, -+ &addrlen); -+ } - continue; - } - if (pending >= 65536) { -diff -Naur GNUnet-0.7.0d.orig/src/transports/udp6.c GNUnet-0.7.0d/src/transports/udp6.c ---- GNUnet-0.7.0d.orig/src/transports/udp6.c 2006-03-11 15:32:00.000000000 -0600 -+++ GNUnet-0.7.0d/src/transports/udp6.c 2006-05-13 23:17:45.000000000 -0500 -@@ -230,6 +230,25 @@ - LOG_STRERROR(LOG_ERROR, "ioctl"); - continue; - } -+ if (pending <= 0) { -+ LOG(LOG_WARNING, -+ _("UDP6: select returned, but ioctl reports %d bytes available!\n"), -+ pending); -+ if (pending == 0) { -+ /* maybe empty UDP packet was sent (see report on bug-gnunet, -+ 5/11/6; read 0 bytes from UDP just to kill potential empty packet! */ -+ memset(&incoming, -+ 0, -+ sizeof(struct sockaddr_in6)); -+ RECVFROM(udp6_sock, -+ NULL, -+ 0, -+ 0, -+ (struct sockaddr * )&incoming, -+ &addrlen); -+ } -+ continue; -+ } - if (pending >= 65536) { - BREAK(); - continue; diff --git a/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch b/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch deleted file mode 100644 index acd779131aa6..000000000000 --- a/net-p2p/gnunet/files/gnunet-ipv6-gentoo.patch +++ /dev/null @@ -1,48 +0,0 @@ -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.2b.ebuild b/net-p2p/gnunet/gnunet-0.6.2b.ebuild deleted file mode 100644 index 5fa3b22fd6ed..000000000000 --- a/net-p2p/gnunet/gnunet-0.6.2b.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.2b.ebuild,v 1.4 2006/11/23 17:30:57 vivo Exp $ - -inherit 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 gtk crypt mysql" - -KEYWORDS="x86 ~ppc" -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=dev-libs/openssl-0.9.6d - >=sys-libs/gdbm-1.8.0 - crypt? ( dev-libs/libgcrypt ) - gtk? ( =x11-libs/gtk+-1.2* ) - mysql? ( virtual/mysql ) - >=media-libs/libextractor-0.3.1" - -src_unpack() { - unpack ${A} - cp ${FILESDIR}/gnunet-download-manager.scm ${S}/contrib/ - cd ${S} -} - -src_compile() { - elibtoolize - - local myconf - - if ! use gtk; then - myconf="${myconf} --without-gtk" - fi - - if ! use crypt; then - myconf="${myconf} --without-gcrypt" - fi - - if ! use mysql; then - myconf="${myconf} --without-mysql" - fi - - econf ${myconf} `use_enable ipv6` || die - - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog PLATFORMS README UPDATING - insinto /etc - newins contrib/gnunet.root gnunet.conf - docinto contrib - dodoc contrib/* - exeinto /etc/init.d - doexe ${FILESDIR}/gnunet -} - -pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" - einfo - einfo "now copy an appropriate config file from" - einfo "/usr/share/doc/${P}/contrib" - einfo "to ~/.gnunet/gnunet.conf" - einfo -} diff --git a/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild b/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild deleted file mode 100644 index d596ddbe942e..000000000000 --- a/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0d-r1.ebuild,v 1.6 2007/01/10 17:41:23 hkbst Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -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" -#tests don't work -RESTRICT="test" - -IUSE="ipv6 mysql sqlite guile ncurses nls gtk" -KEYWORDS="~amd64 ~ppc ~sparc x86" -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=dev-libs/libgcrypt-1.2.0 - >=media-libs/libextractor-0.5.13 - >=dev-libs/gmp-4.0.0 - sys-libs/zlib - gtk? ( >=x11-libs/gtk+-2.6.10 ) - sys-apps/sed - ncurses? ( sys-libs/ncurses ) - mysql? ( >=virtual/mysql-4.0 ) - sqlite? ( >=dev-db/sqlite-3.0.8 ) - guile? ( >=dev-scheme/guile-1.6.0 ) - nls? ( sys-devel/gettext )" - - -pkg_setup() { - if ! use mysql && ! use sqlite; then - einfo - einfo "You need to specify at least one of 'mysql' or 'sqlite'" - einfo "USE flag in order to have properly installed gnunet" - einfo - die "Invalid USE flag set" - fi -} - -pkg_preinst() { - enewgroup gnunet || die "Problem adding gnunet group" - enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user" -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-nulludp.patch - - # make mysql default sqstore if we do not compile sql support - # (bug #107330) - ! use sqlite && \ - sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \ - contrib/config-daemon.in - - # we do not want to built gtk support with USE=-gtk - if ! use gtk ; then - sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac - fi - - AT_M4DIR="${S}/m4" eautoreconf -} - -src_compile() { - - 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 - - use mysql || myconf="${myconf} --without-mysql" - - econf \ - $(use_with sqlite) \ - $(use_enable nls) \ - $(use_enable ncurses) \ - $(use_enable guile) \ - ${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}/${PN}-2 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 "To configure" - einfo " 1) Add user(s) to the gnunet group" - einfo " 2) Run 'gnunet-setup' to generate your client config file" - einfo " 3) Run gnunet-setup -d to generate a server config file" - einfo " 4) Optionally copy the .gnunet/gnunetd.conf into /etc and" - einfo "\tuse as a global server config file:" - einfo "$ gnunet-setup -d" - einfo "# cp ~/.gnunet/gnunetd.conf /etc/" - einfo -} - diff --git a/net-p2p/gnunet/gnunet-0.7.0e.ebuild b/net-p2p/gnunet/gnunet-0.7.0e.ebuild index a7ff34e8adce..e650c2bbe42a 100644 --- a/net-p2p/gnunet/gnunet-0.7.0e.ebuild +++ b/net-p2p/gnunet/gnunet-0.7.0e.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0e.ebuild,v 1.1 2007/01/12 21:10:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0e.ebuild,v 1.2 2007/01/21 14:27:02 armin76 Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2" RESTRICT="test" IUSE="ipv6 mysql sqlite guile ncurses nls gtk" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" LICENSE="GPL-2" SLOT="0" |