pkg/49851: gtk-gnutella is outdated

[german%free.fr@localhost]

>Number:         49851
>Category:       pkg
>Synopsis:       gtk-gnutella is outdated
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 24 10:20:00 +0000 2015
>Originator:     Germain Le Chapelain
>Release:        HEAD
>Organization:
cgn
>Environment:
NetBSD germ 7.99.6 NetBSD 7.99.6 (GENERIC) #0: Sat Mar 28 21:51:45 UTC 2015  german@germ:/usr/obj/sys/arch/amd64/compile/GENERIC amd64

>Description:
gtk-gnutella has been updated (to version 1.1.3)

I am trying to get it going, but I'am having a problem with PTHREAD_STACK_MIN, which is not defined for us ?

I've tried replacing it with sysconf(_SC_THREAD_STACK_MIN) as I saw in http://mail-index.netbsd.org/tech-userlevel/2014/08/15/msg008729.html

but now gtk-gnutella isn't going.


When I look in `top' I see it at the bottom of the screen, it says:

 1303 root      85    0    13M  852K kqueue/3   0:00  0.00%  0.00% powerd
29978 german    43    0   126M 9276K parked/3   0:00  0.00%  0.00% gtk-gnutella

>How-To-Repeat:
Try building gtk-gnutella with the enclosed patches

The change to the Makefile, PLIST & distinfo I use to build are the following:


-bash-4.3$ cvs diff -ub Makefile PLIST distinfo
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/gtk-gnutella/Makefile,v
retrieving revision 1.88
diff -u -b -r1.88 Makefile
--- Makefile    21 Aug 2014 09:48:30 -0000      1.88
+++ Makefile    23 Apr 2015 18:51:23 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.88 2014/08/21 09:48:30 jperkin Exp $

-DISTNAME=      gtk-gnutella-0.96.6
+DISTNAME=      gtk-gnutella-1.1.3
 PKGREVISION=   22
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/gtk-gnutella/PLIST,v
retrieving revision 1.16
diff -u -b -r1.16 PLIST
--- PLIST       14 Jun 2009 18:09:29 -0000      1.16
+++ PLIST       23 Apr 2015 18:51:23 -0000
@@ -1,11 +1,16 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:09:29 joerg Exp $
+@comment $NetBSD$
 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/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
@@ -28,26 +33,39 @@
 share/gtk-gnutella/pixmaps/firewall_udp_punchable.xpm
 share/gtk-gnutella/pixmaps/freeze.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/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: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/gtk-gnutella/distinfo,v
retrieving revision 1.30
diff -u -b -r1.30 distinfo
--- distinfo    14 Jul 2009 09:41:31 -0000      1.30
+++ distinfo    23 Apr 2015 18:51:23 -0000
@@ -1,7 +1,9 @@
 $NetBSD: distinfo,v 1.30 2009/07/14 09:41:31 hasso Exp $

-SHA1 (gtk-gnutella-0.96.6.tar.bz2) = 319417e8de104b33913e08a0aaec8c0f22a6129d
-RMD160 (gtk-gnutella-0.96.6.tar.bz2) = 0dae6af9ac64fa8d75980cafd55c5a3e9eb18dfe
-Size (gtk-gnutella-0.96.6.tar.bz2) = 15739240 bytes
-SHA1 (patch-aa) = 0df2e52177c1601b0533862a841ef61b2ac440ca
-SHA1 (patch-ab) = 45d59a62acbfa38a952cf31e8ceecacc9c90f077
+SHA1 (gtk-gnutella-1.1.3.tar.bz2) = f3e6e5e336a7728038a444b419f3de1d1478b257
+RMD160 (gtk-gnutella-1.1.3.tar.bz2) = 108e2dbf43d0d4641ca4ac5591a0aad5fe20f7f6
+Size (gtk-gnutella-1.1.3.tar.bz2) = 19504243 bytes
+SHA1 (patch-entropy.c) = e4b37c5d2e7056bf334abfd3eb22d14474a412cc
+SHA1 (patch-pow2.h) = ae4de22d8f9360bec3e215932744927b9a30e86f
+SHA1 (patch-rand31.c) = 3b67b8999e51c58c4566af05d67c1682b424594f
+SHA1 (patch-thread.c) = 248e2b40457afcaca6e71dcb347c029b42db6def
-bash-4.3$

>Fix:
--- patch-thread.c begins here ---
$NetBSD$

--- src/lib/thread.c.orig       2014-09-02 06:45:46.000000000 +0000
+++ src/lib/thread.c
@@ -6934,7 +6934,7 @@ thread_launch(struct thread_element *te,
 #endif
                stacksize = MAX(stacksize, THREAD_STACK_MIN);
        } else {
-               stacksize = MAX(THREAD_STACK_DFLT, PTHREAD_STACK_MIN);
+               stacksize = MAX(THREAD--- patch-rand31.c begins here ---
$NetBSD$

--- src/lib/rand31.c.orig       2014-09-02 06:45:46.000000000 +0000
+++ src/lib/rand31.c
@@ -146,7 +146,7 @@ rand31_random_seed(void)
        nsecs += now.tv_nsec;
        entropy_delay();
        tm_precise_time(&now);
-       seed = UINT32_ROTL(seed, popcount(nsecs + now.tv_nsec));
+       seed = UINT32_ROTL(seed, popcount_(nsecs + now.tv_nsec));
        while (0 != discard--) {                seed = rand31_prng_next(seed);
        }
--- patch-rand31.c ends here ---
_STACK_DFLT, sysconf(_SC_THREAD_STACK_MIN));
        }

        stacksize = round_pagesize(stacksize);  /* In case they supply odd values */
--- patch-thread.c ends here ---
--- patch-entropy.c begins here ---
$NetBSD$

--- src/lib/entropy.c.orig      2014-09-02 06:45:46.000000000 +0000
+++ src/lib/entropy.c
@@ -1136,7 +1136,7 @@ entropy_seed(struct entropy_minictx *c)
        tm_precise_time(&now);          /* Do not use tm_now_exact(), it's too soon */
        SHA1_INPUT(&ctx, now);

-       j = popcount(now.tv_nsec);
+       j = popcount_(now.tv_nsec);
        for (i = 0; i <= j; i++) {
                ENTROPY_CONTEXT_FEED;                                                                           \
        }
@@ -1208,7 +1208,7 @@ entropy_seed(struct entropy_minictx *c)
        SHA1_INPUT(&ctx, now);

        tm_precise_time(&now);
-       j = popcount(now.tv_nsec * 11);
+       j = popcount_(now.tv_nsec * 11);
        for (i = 0; i <= j; i++) {
                ENTROPY_CONTEXT_FEED;
        }
@@ -1225,7 +1225,7 @@ entropy_seed(struct entropy_minictx *c)

                entropy_delay();
                tm_precise_time(&now);
-               n = popcount(peek_be32(p) + now.tv_nsec);
+               n = popcount_(peek_be32(p) + now.tv_nsec);
                j = UINT32_ROTR(v, n) & 0xff;
                for (i = 0; i <= j; i++) {
                ENTROPY_CONTEXT_FEED;
        }
@@ -1225,7 +1225,7 @@ entropy_seed(struct entropy_minictx *c)

                entropy_delay();
                tm_precise_time(&now);
-               n = popcount(peek_be32(p) + now.tv_nsec);
+               n = popcount_(peek_be32(p) + now.tv_nsec);
                j = UINT32_ROTR(v, n) & 0xff;
                for (i = 0; i <= j; i++) {
                        ENTROPY_CONTEXT_FEED;
--- patch-entropy.c ends here ---
--- patch-pow2.h begins here ---
$NetBSD$

--- src/lib/pow2.h.orig 2014-09-02 06:45:46.000000000 +0000
+++ src/lib/pow2.h
@@ -67,7 +67,7 @@ is_pow2(uint32 value)
  * @return number of 1 bits in a 32-bit integer.
  */
 static inline ALWAYS_INLINE G_GNUC_CONST int
-popcount(uint32 x)
+popcount_(uint32 x)
 #ifdef HAS_BUILTIN_POPCOUNT
 {
        return __builtin_popcount(x);
@@ -153,7 +153,7 @@ clz(uint32 x)
        x |= x >> 4;
        x |= x >> 8;
        x |= x >> 16;
-       return 32 - popcount(x);
+       return 32 - popcount_(x);
 }
 #endif /* HAS_BUILTIN_CLZ */

@@ -176,7 +176,7 @@ int bits_set(uint8 b) G_GNUC_PURE;
 static inline ALWAYS_INLINE G_GNUC_CONST int
 bits_set32(uint32 v)
 {
-       return popcount(v);
+       return popcount_(v);
 }

 #endif /* _pow2_h_ */
--- patch-pow2.h ends here ---