CVS commit: pkgsrc/net/gtk-gnutella

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Feb 26 12:58:28 UTC 2017

Modified Files:
        pkgsrc/net/gtk-gnutella: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/net/gtk-gnutella/patches: patch-Configure patch-config__h.SH
            patch-src_lib_pow2.h
Removed Files:
        pkgsrc/net/gtk-gnutella/patches: patch-aa patch-ab

Log Message:
Changes 1.1.11:
New Features:
- Flag uploads coming from G2 servents with a "[G2]" tag after IP address.
- Added alias support in sharing/querying.
- Made the "Clear completed" button in Downloads/Tools do something useful.
- Moved "Clear completed" button to the bottom right of the download pane.
- Remember fileinfo notebook tab number across sessions.
- Remember main notebook tab number across sessions, only restored after crash.
- Remember Gnet stats notebook tab number across sessions.
- Remember download info / tools notebook tab number across sessions.

Improvements:
- Added --cleanup to explicitly request for final memory cleanup sequence.
- Updated Italian translation.
- Updated GeoIP databases.

Bug Fixes:
- Leaf nodes could end-up being connected to more ultrapeers than configured.
- Fixed monitoring of alien threads, important when GTK file selector is used.

Under the Hood:
- Debian compatibility level changed from 4 to 5.
- Make sure we can deal with older pkg-config, which needs leading arguments.
- Use "embedded" symbols for xmalloc(), xfree() and friends.
- Added "query_trace" property to trace all queries which were searched.
- Moved halloc-based string functions like h_strdup() to dedicated hstrfn.c.
- Expanded search mask to 64 bits to be able to hold all digits and letters.
- Count aliased queries and hits from aliases.
- Pre-compute shared file media type at record creation time.
- Pass query limits to st_search() to avoid needless pattern matching.
- Added h_strsplit() and h_strsplit_set().
- Added strvec_append_with() to expand vector by appending another vector.
- crash_assert_logv(): don't call crash_mode() if assert failure was recorded.
- entropy_clock_time(): mix the entropy nonce through hashing for more diffusion.
- node_can_accept_connection(): only send headers back when handshaking.
- qrp_add_file(): optimized to avoid computing word length if not required.
- thread_stack_check_overflow(): ignore virtual addresses outside stack range.
- vmm_init_once(): ensure any shared library for stacktrace unwinding is loaded.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/net/gtk-gnutella/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/gtk-gnutella/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/gtk-gnutella/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/gtk-gnutella/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/gtk-gnutella/patches/patch-Configure \
    pkgsrc/net/gtk-gnutella/patches/patch-config__h.SH \
    pkgsrc/net/gtk-gnutella/patches/patch-src_lib_pow2.h
cvs rdiff -u -r1.9 -r0 pkgsrc/net/gtk-gnutella/patches/patch-aa
cvs rdiff -u -r1.7 -r0 pkgsrc/net/gtk-gnutella/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/gtk-gnutella/Makefile
diff -u pkgsrc/net/gtk-gnutella/Makefile:1.94 pkgsrc/net/gtk-gnutella/Makefile:1.95
--- pkgsrc/net/gtk-gnutella/Makefile:1.94       Sun Feb 12 06:25:51 2017
+++ pkgsrc/net/gtk-gnutella/Makefile    Sun Feb 26 12:58:28 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2017/02/12 06:25:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2017/02/26 12:58:28 adam Exp $
 
-DISTNAME=      gtk-gnutella-0.96.6
-PKGREVISION=   28
+DISTNAME=      gtk-gnutella-1.1.11
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
 EXTRACT_SUFX=  .tar.bz2
@@ -9,6 +8,7 @@ EXTRACT_SUFX=   .tar.bz2
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://gtk-gnutella.sourceforge.net/
 COMMENT=       GTK-based gnutella client
+LICENSE=       gnu-gpl-v2
 
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake msgfmt pkg-config
@@ -28,6 +28,7 @@ LDFLAGS.SunOS+=       -lsocket -lnsl -liconv
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/gtk-gnutella/PLIST
diff -u pkgsrc/net/gtk-gnutella/PLIST:1.16 pkgsrc/net/gtk-gnutella/PLIST:1.17
--- pkgsrc/net/gtk-gnutella/PLIST:1.16  Sun Jun 14 18:09:29 2009
+++ pkgsrc/net/gtk-gnutella/PLIST       Sun Feb 26 12:58:28 2017
@@ -1,11 +1,17 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:09:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/02/26 12:58:28 adam Exp $
 bin/gtk-gnutella
+lib/gtk-gnutella/gtk-gnutella.nm
+share/appdata/gtk-gnutella.appdata.xml
 share/applications/gtk-gnutella.desktop
 share/gtk-gnutella/bogons.txt
 share/gtk-gnutella/el/FAQ
 share/gtk-gnutella/en/FAQ
+share/gtk-gnutella/en/glossary
 share/gtk-gnutella/favicon.png
+share/gtk-gnutella/fr/FAQ
 share/gtk-gnutella/geo-ip.txt
+share/gtk-gnutella/geo-ipv6.txt
+share/gtk-gnutella/gwcache.boot
 share/gtk-gnutella/hostiles.txt
 share/gtk-gnutella/ja/FAQ
 share/gtk-gnutella/pixmaps/arrow_down.xpm
@@ -27,27 +33,43 @@ share/gtk-gnutella/pixmaps/firewall_tcp.
 share/gtk-gnutella/pixmaps/firewall_udp.xpm
 share/gtk-gnutella/pixmaps/firewall_udp_punchable.xpm
 share/gtk-gnutella/pixmaps/freeze.xpm
+share/gtk-gnutella/pixmaps/go_back.xpm
+share/gtk-gnutella/pixmaps/hungup.xpm
 share/gtk-gnutella/pixmaps/icon.16x16.xpm
-share/gtk-gnutella/pixmaps/icon.32x32.xpm
+share/gtk-gnutella/pixmaps/icon.48x48.xpm
 share/gtk-gnutella/pixmaps/icon.xpm
 share/gtk-gnutella/pixmaps/leaf.xpm
 share/gtk-gnutella/pixmaps/legacy.xpm
 share/gtk-gnutella/pixmaps/magnet.16x16.png
 share/gtk-gnutella/pixmaps/magnet.32x32.png
 share/gtk-gnutella/pixmaps/magnet.64x64.png
+share/gtk-gnutella/pixmaps/natpmp.xpm
 share/gtk-gnutella/pixmaps/no_firewall.xpm
+share/gtk-gnutella/pixmaps/no_listening.xpm
 share/gtk-gnutella/pixmaps/offline.xpm
 share/gtk-gnutella/pixmaps/online.xpm
+share/gtk-gnutella/pixmaps/pause.xpm
 share/gtk-gnutella/pixmaps/save.xpm
 share/gtk-gnutella/pixmaps/smallserver.xpm
+share/gtk-gnutella/pixmaps/star-black.xpm
+share/gtk-gnutella/pixmaps/star-blue.xpm
+share/gtk-gnutella/pixmaps/star-green.xpm
+share/gtk-gnutella/pixmaps/star-red.xpm
+share/gtk-gnutella/pixmaps/star-violet.xpm
+share/gtk-gnutella/pixmaps/star-yellow.xpm
 share/gtk-gnutella/pixmaps/stock_form-time-field-16.xpm
 share/gtk-gnutella/pixmaps/thaw.xpm
 share/gtk-gnutella/pixmaps/ultra.xpm
+share/gtk-gnutella/pixmaps/upload-red.xpm
+share/gtk-gnutella/pixmaps/upload-yellow.xpm
 share/gtk-gnutella/pixmaps/upload.xpm
+share/gtk-gnutella/pixmaps/upnp-unusable.xpm
+share/gtk-gnutella/pixmaps/upnp.xpm
 share/gtk-gnutella/pixmaps/warning.xpm
 share/gtk-gnutella/robots.txt
 share/gtk-gnutella/spam.txt
 share/gtk-gnutella/spam_sha1.txt
+share/gtk-gnutella/tr/FAQ
 share/locale/de/LC_MESSAGES/gtk-gnutella.mo
 share/locale/el/LC_MESSAGES/gtk-gnutella.mo
 share/locale/es/LC_MESSAGES/gtk-gnutella.mo

Index: pkgsrc/net/gtk-gnutella/distinfo
diff -u pkgsrc/net/gtk-gnutella/distinfo:1.31 pkgsrc/net/gtk-gnutella/distinfo:1.32
--- pkgsrc/net/gtk-gnutella/distinfo:1.31       Wed Nov  4 00:35:03 2015
+++ pkgsrc/net/gtk-gnutella/distinfo    Sun Feb 26 12:58:28 2017
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.31 2015/11/04 00:35:03 agc Exp $
+$NetBSD: distinfo,v 1.32 2017/02/26 12:58:28 adam Exp $
 
-SHA1 (gtk-gnutella-0.96.6.tar.bz2) = 319417e8de104b33913e08a0aaec8c0f22a6129d
-RMD160 (gtk-gnutella-0.96.6.tar.bz2) = 0dae6af9ac64fa8d75980cafd55c5a3e9eb18dfe
-SHA512 (gtk-gnutella-0.96.6.tar.bz2) = ac888fc8a0f52fe8cf5869a3259123618127b578275d8b79b49cccbbf42070742becdfb10c85c8df98be6e609bbda3fe495a2037c28c79ea78d42e542aefac67
-Size (gtk-gnutella-0.96.6.tar.bz2) = 15739240 bytes
-SHA1 (patch-aa) = 0df2e52177c1601b0533862a841ef61b2ac440ca
-SHA1 (patch-ab) = 45d59a62acbfa38a952cf31e8ceecacc9c90f077
+SHA1 (gtk-gnutella-1.1.11.tar.bz2) = ae26020a9f134caea3223b530294307fd523b234
+RMD160 (gtk-gnutella-1.1.11.tar.bz2) = 0c5841346af8ea51712ef6ecc1080a313c6044dd
+SHA512 (gtk-gnutella-1.1.11.tar.bz2) = 87d2d66b555180c0db7c360106377133b9e1f8ad8d28fc0f9a38498f3b4502a817650f9683cf92919b7d3a1b3602f7136143d2f1c920e10727576c703e233d07
+Size (gtk-gnutella-1.1.11.tar.bz2) = 19966423 bytes
+SHA1 (patch-Configure) = 926736a79a7bc469810f4887b5d0cecfedbac201
+SHA1 (patch-config__h.SH) = 2ed9d100cc044e10f2633a614cfc4100edc4cc02
+SHA1 (patch-src_lib_pow2.h) = f8a36d58f84ef782535e363df6144bbfc766013e

Index: pkgsrc/net/gtk-gnutella/options.mk
diff -u pkgsrc/net/gtk-gnutella/options.mk:1.3 pkgsrc/net/gtk-gnutella/options.mk:1.4
--- pkgsrc/net/gtk-gnutella/options.mk:1.3      Wed Aug 20 10:03:32 2008
+++ pkgsrc/net/gtk-gnutella/options.mk  Sun Feb 26 12:58:28 2017
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.3 2008/08/20 10:03:32 adam Exp $
+# $NetBSD: options.mk,v 1.4 2017/02/26 12:58:28 adam Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk-gnutella
+PKG_OPTIONS_VAR=               PKG_OPTIONS.gtk-gnutella
 PKG_SUPPORTED_OPTIONS=         # empty
 PKG_OPTIONS_OPTIONAL_GROUPS=   gui
 PKG_OPTIONS_GROUP.gui=         gtk1 gtk2 headless

Added files:

Index: pkgsrc/net/gtk-gnutella/patches/patch-Configure
diff -u /dev/null pkgsrc/net/gtk-gnutella/patches/patch-Configure:1.1
--- /dev/null   Sun Feb 26 12:58:28 2017
+++ pkgsrc/net/gtk-gnutella/patches/patch-Configure     Sun Feb 26 12:58:28 2017
@@ -0,0 +1,43 @@
+$NetBSD: patch-Configure,v 1.1 2017/02/26 12:58:28 adam Exp $
+
+Detect popcount().
+
+--- Configure.orig     2017-02-26 12:37:14.000000000 +0000
++++ Configure
+@@ -324,6 +324,7 @@ d_built_bswap64=''
+ d_built_clz=''
+ d_built_ctz=''
+ d_built_popcount=''
++d_popcount=''
+ d_bzero=''
+ d_clearenv=''
+ d_clock_getres=''
+@@ -4979,6 +4980,20 @@ cyn=__builtin_popcount
+ set d_built_popcount
+ eval $trylink
+ 
++: check for popcount
++$cat >try.c <<EOC
++#include <strings.h>
++int main(void)
++{
++      static int ret;
++      ret |= popcount(127);
++      return ret ? 0 : 1;
++}
++EOC
++cyn=popcount
++set d_popcount
++eval $trylink
++
+ : see if bzero exists
+ $cat >try.c <<EOC
+ #include <strings.h>
+@@ -11463,6 +11478,7 @@ d_built_bswap64='$d_built_bswap64'
+ d_built_clz='$d_built_clz'
+ d_built_ctz='$d_built_ctz'
+ d_built_popcount='$d_built_popcount'
++d_popcount='$d_popcount'
+ d_bzero='$d_bzero'
+ d_can64='$d_can64'
+ d_clearenv='$d_clearenv'
Index: pkgsrc/net/gtk-gnutella/patches/patch-config__h.SH
diff -u /dev/null pkgsrc/net/gtk-gnutella/patches/patch-config__h.SH:1.1
--- /dev/null   Sun Feb 26 12:58:28 2017
+++ pkgsrc/net/gtk-gnutella/patches/patch-config__h.SH  Sun Feb 26 12:58:28 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-config__h.SH,v 1.1 2017/02/26 12:58:28 adam Exp $
+
+Define HAS_POPCOUNT.
+
+--- config_h.SH.orig   2017-02-26 12:33:26.000000000 +0000
++++ config_h.SH
+@@ -204,6 +204,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
+  */
+ #$d_built_popcount HAS_BUILTIN_POPCOUNT       /**/
+ 
++/* HAS_POPCOUNT:
++ *    This symbol, if defined, indicates that popcount routine is
++ *    available to compute the amount of '1' bits in a word.
++ */
++#$d_popcount HAS_POPCOUNT     /**/
++
+ /* HAS_BZERO:
+  *    This symbol is defined if the bzero() routine is available to
+  *    set a memory block to 0.
Index: pkgsrc/net/gtk-gnutella/patches/patch-src_lib_pow2.h
diff -u /dev/null pkgsrc/net/gtk-gnutella/patches/patch-src_lib_pow2.h:1.1
--- /dev/null   Sun Feb 26 12:58:28 2017
+++ pkgsrc/net/gtk-gnutella/patches/patch-src_lib_pow2.h        Sun Feb 26 12:58:28 2017
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_lib_pow2.h,v 1.1 2017/02/26 12:58:28 adam Exp $
+
+Don't define popcount() if it exists in system.
+
+--- src/lib/pow2.h.orig        2017-02-26 12:17:53.469638084 +0000
++++ src/lib/pow2.h
+@@ -66,6 +66,7 @@ is_pow2(uint32 value)
+  *
+  * @return number of 1 bits in a 32-bit integer.
+  */
++#ifndef HAS_POPCOUNT
+ static inline ALWAYS_INLINE G_CONST int
+ popcount(uint32 x)
+ #ifdef HAS_BUILTIN_POPCOUNT
+@@ -84,6 +85,7 @@ popcount(uint32 x)
+       return ((x + (x >> 4) & 0xf0f0f0f) * 0x1010101) >> 24;
+ }
+ #endif        /* HAS_BUILTIN_POPCOUNT */
++#endif        /* HAS_POPCOUNT */
+ 
+ /**
+  * Count trailing zeroes in a 32-bit integer, -1 for zero.