diff options
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/gift-gnutella/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/gift-gnutella/Manifest | 24 | ||||
| -rw-r--r-- | net-p2p/gift-gnutella/files/cacheupdate.sh | 76 | ||||
| -rw-r--r-- | net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild | 38 |
4 files changed, 98 insertions, 46 deletions
diff --git a/net-p2p/gift-gnutella/ChangeLog b/net-p2p/gift-gnutella/ChangeLog index f8a20f64716b..0d463c02125d 100644 --- a/net-p2p/gift-gnutella/ChangeLog +++ b/net-p2p/gift-gnutella/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/gift-gnutella # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/ChangeLog,v 1.40 2007/07/12 14:33:49 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/ChangeLog,v 1.41 2007/08/17 22:56:49 coldwind Exp $ + + 17 Aug 2007; Santiago M. Mola <coldwind@gentoo.org> files/cacheupdate.sh, + gift-gnutella-0.0.11.ebuild: + Upgraded cacheupdate.sh, bug #162313 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml, gift-gnutella-0.0.11.ebuild: diff --git a/net-p2p/gift-gnutella/Manifest b/net-p2p/gift-gnutella/Manifest index 6042a365ecaa..e19bcbc7b966 100644 --- a/net-p2p/gift-gnutella/Manifest +++ b/net-p2p/gift-gnutella/Manifest @@ -1,16 +1,16 @@ -AUX cacheupdate.sh 829 RMD160 102df91f9d691a0cfcd6cb660ae049112f6faf3b SHA1 71e292eea685d17400554c1d5605792f51b2d997 SHA256 1d33a05558a4cefce05cb326e27065ff201be527014dcd7eb928496fdc91c5d3 -MD5 7d86808bd55fce69a1630271b31f9ade files/cacheupdate.sh 829 -RMD160 102df91f9d691a0cfcd6cb660ae049112f6faf3b files/cacheupdate.sh 829 -SHA256 1d33a05558a4cefce05cb326e27065ff201be527014dcd7eb928496fdc91c5d3 files/cacheupdate.sh 829 +AUX cacheupdate.sh 2100 RMD160 9b5c8285479c46e0d2bb08f018b9c8c43d181994 SHA1 ae83af6b65fa14c081fd7820439e414013239dc7 SHA256 b3192e126874a4c21281794d775edaddff18f92fb44e08b7cde0ad89db4558dc +MD5 b8eac1aa57e4954255cc5d0541019292 files/cacheupdate.sh 2100 +RMD160 9b5c8285479c46e0d2bb08f018b9c8c43d181994 files/cacheupdate.sh 2100 +SHA256 b3192e126874a4c21281794d775edaddff18f92fb44e08b7cde0ad89db4558dc files/cacheupdate.sh 2100 DIST gift-gnutella-0.0.11.tar.bz2 405742 RMD160 f9c39fc8c1e056483b3cc82c5e801efeee1cdf2a SHA1 da38599ad706fcbb0fa8d89a0f4570f9258dfcb7 SHA256 5a28fd53ad617a6acdc3042144829e74822510d80963a6ca35e7d256d5a06f86 -EBUILD gift-gnutella-0.0.11.ebuild 1299 RMD160 5aecbc96717a0d4ada2999f219d745260e141634 SHA1 901b0066c79166775b3f8a37a6968d0b4f9f5602 SHA256 3abaf9e4c90b3a3ff4e8b6e4495d7ff0430f60fd92522c1986b045bb3e33baf7 -MD5 cb054133ddf8de46071fae33519fb3bf gift-gnutella-0.0.11.ebuild 1299 -RMD160 5aecbc96717a0d4ada2999f219d745260e141634 gift-gnutella-0.0.11.ebuild 1299 -SHA256 3abaf9e4c90b3a3ff4e8b6e4495d7ff0430f60fd92522c1986b045bb3e33baf7 gift-gnutella-0.0.11.ebuild 1299 -MISC ChangeLog 5946 RMD160 b8207664ecb7291c5026be61f6acf1987ab85865 SHA1 0bd941215a4b18542695c5316ed8727f1fad7d2d SHA256 c1ddac797687040c2c424979c9745656cec51a3fde8c164a302b42447312ddc5 -MD5 86b1edb1e3d1310cbb17883d60e4b16a ChangeLog 5946 -RMD160 b8207664ecb7291c5026be61f6acf1987ab85865 ChangeLog 5946 -SHA256 c1ddac797687040c2c424979c9745656cec51a3fde8c164a302b42447312ddc5 ChangeLog 5946 +EBUILD gift-gnutella-0.0.11.ebuild 1327 RMD160 d0aeaee882f4134bb76da9b8d5e6a0cc2fbaec8d SHA1 29191118c15888cb93de761d6961ad0325124928 SHA256 109c2f827e9cfaa44b3081df5c8ad0ab0a8511b91afe9298cf70cde6a0475f26 +MD5 4bf20cf8999b34ed320b8e9449b046cd gift-gnutella-0.0.11.ebuild 1327 +RMD160 d0aeaee882f4134bb76da9b8d5e6a0cc2fbaec8d gift-gnutella-0.0.11.ebuild 1327 +SHA256 109c2f827e9cfaa44b3081df5c8ad0ab0a8511b91afe9298cf70cde6a0475f26 gift-gnutella-0.0.11.ebuild 1327 +MISC ChangeLog 6091 RMD160 3ba8d1ca9a9490da54f2a8d78aad840dd1fc805e SHA1 751990432a516931495b56606c08a51559feec97 SHA256 3af8407238a99d5612fe311e4c39d881d1e644b80cd90685e87cc0a57b6df13e +MD5 9e863dadff88a6981abfb3d564036d42 ChangeLog 6091 +RMD160 3ba8d1ca9a9490da54f2a8d78aad840dd1fc805e ChangeLog 6091 +SHA256 3af8407238a99d5612fe311e4c39d881d1e644b80cd90685e87cc0a57b6df13e ChangeLog 6091 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160 diff --git a/net-p2p/gift-gnutella/files/cacheupdate.sh b/net-p2p/gift-gnutella/files/cacheupdate.sh index 692e5f23beaf..8dc5e9a140e1 100644 --- a/net-p2p/gift-gnutella/files/cacheupdate.sh +++ b/net-p2p/gift-gnutella/files/cacheupdate.sh @@ -1,25 +1,73 @@ #!/bin/bash -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/files/cacheupdate.sh,v 1.9 2007/01/16 13:42:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/files/cacheupdate.sh,v 1.10 2007/08/17 22:56:50 coldwind Exp $ -CACHE=http://www.gnucleus.com/gwebcache/ +CACHE_LIST="g2.tjtech.org/g2/ + gwc1c.olden.ch.3557.nyud.net:8080/gwc/ + gwc.eod.cc/skulls.php + skulls.mi-cha-el.org/skulls.php + gwc.frodoslair.net/skulls/skulls" + +URLFILE="?urlfile=1\&client=GEN2\&version=0.2" +HOSTFILE="?hostfile=1\&client=GEN2\&version=0.2" if [ -d ~/.giFT/Gnutella/ ]; then cd ~/.giFT/Gnutella - wget ${CACHE}?urlfile=1\&client=GEN2\&version=0.2 -O gwebcaches.new || die "Unable to retrieve new caches." - if [ "`grep ERROR gwebcaches.new`" ]; then - cat gwebcaches.new + + # Try to fetch an updated list + wget http://gcachescan.jonatkins.com/ -O .my_list &> /dev/null + if [[ $? -eq 0 ]] ; then + my_cache_list=$(grep gcachedetail .my_list | sed -e "s:.*gcachedetail.cgi?\(.*\)\">?</a>.*:\1:g" | head -n 10) + [[ -n ${my_cache_list} ]] && CACHE_LIST=${my_cache_list} else - mv gwebcaches.new gwebcaches + echo "Failed to fetch gwebcaches' list, trying with local list." fi - wget ${CACHE}?hostfile=1\&client=GEN2\&version=0.2 -O nodes.new || die "Unable to retrieve new hosts." - if [ "`grep ERROR nodes.new`" ]; then - cat nodes.new - else - mv nodes.new nodes + + # Fetch gwebcaches + ok=0 + for cache in ${CACHE_LIST} ; do + wget ${cache}${URLFILE} -O .gwebcaches.new &> /dev/null + if [[ $? -ne 0 ]] ; then + echo "Failed to fetch gwebcaches file from ${cache}" + #CACHE_LIST=${CACHE_LIST/${cache}/} + elif [[ -z $(grep -e "^http://.*" .gwebcaches.new) ]] || [[ -n $(grep ERROR .gwebcaches.new) ]] ; then + echo "Fetched file from ${cache} is invalid" + else + mv .gwebcaches.new gwebcaches + echo -e "\ngwebcaches fetched\n" + ok=1 + break + fi + done + if [[ $ok -ne 1 ]] ; then + echo "Couldn't fetch gwebcaches!" + exit 1 fi - echo "Update complete!" + + # Fetch nodes + ok=0 + for cache in ${CACHE_LIST} ; do + wget ${cache}${HOSTFILE} -O .nodes.new &> /dev/null + if [[ $? -ne 0 ]] ; then + echo "Failed to fetch nodes file from ${cache}" + #CACHE_LIST=${CACHE_LIST/${cache}/} + elif [[ -n $(grep ERROR .nodes.new) ]] ; then + echo "Fetched file from ${cache} is invalid" + else + mv .nodes.new nodes + echo -e "\nnodes fetched\n" + ok=1 + break + fi + done + if [[ $ok -ne 1 ]] ; then + echo "Couldn't fetch nodes!" + exit 1 + fi + + rm .my_list + echo -e "\nUpdate complete!" else - echo "Please emerge gift-gnutella and run gift-setup." + echo " ~/.giFT/Gnutella/ does not exist. Please run gift-setup." fi diff --git a/net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild b/net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild index d194110fc861..56c87b1a8265 100644 --- a/net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild +++ b/net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild @@ -1,24 +1,23 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild,v 1.10 2007/07/13 05:52:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/gift-gnutella-0.0.11.ebuild,v 1.11 2007/08/17 22:56:49 coldwind Exp $ inherit eutils -IUSE="xml" - DESCRIPTION="The giFT Gnutella plugin" HOMEPAGE="http://gift.sf.net/" SRC_URI="mirror://sourceforge/gift/${P}.tar.bz2" + SLOT="0" LICENSE="GPL-2" KEYWORDS="alpha amd64 ia64 ~ppc sparc x86 ~x86-fbsd" +IUSE="xml" RDEPEND=">=net-p2p/gift-0.11.6" -DEPEND=" +DEPEND="${RDEPEND} dev-util/pkgconfig app-arch/bzip2 - dev-libs/libxml2 - ${RDEPEND}" + dev-libs/libxml2" src_compile() { econf $(use_with xml libxml) || die "failed to configure" @@ -26,22 +25,23 @@ src_compile() { } src_install() { - einstall giftconfdir=${D}/etc/giFT \ - plugindir=${D}/usr/$(get_libdir)/giFT \ - datadir=${D}/usr/share \ - giftperldir=${D}/usr/bin \ - libgiftincdir=${D}/usr/include/libgift || die "Install failed" + einstall giftconfdir="${D}"/etc/giFT \ + plugindir="${D}"/usr/$(get_libdir)/giFT \ + datadir="${D}"/usr/share \ + giftperldir="${D}"/usr/bin \ + libgiftincdir="${D}"/usr/include/libgift || die "einstall failed" + newbin "${FILESDIR}"/cacheupdate.sh ${PN}-cacheupdate.sh } pkg_postinst() { - einfo "It is recommended that you re-run gift-setup as" - einfo "the user you will run the giFT daemon as:" - einfo "\tgift-setup" + elog "It is recommended that you re-run gift-setup as" + elog "the user you will run the giFT daemon as:" + elog "\tgift-setup" echo - einfo "Alternatively you can add the following line to" - einfo "your ~/.giFT/giftd.conf configuration file:" - einfo "plugins = Gnutella" + elog "Alternatively you can add the following line to" + elog "your ~/.giFT/giftd.conf configuration file:" + elog "plugins = Gnutella" echo - einfo "To update your caches, run:" - einfo "\tsh /usr/portage/net-p2p/${PN}/files/cacheupdate.sh" + elog "To update your caches, run:" + elog "\t${PN}-cacheupdate.sh" } |