Changes 0.96.5:

Bug Fixes:
- 1870957: Wrong sign could cause out-of-bounds read and potentially a crash.
- Firewalled status was not re-verified after a port change if the previously
  used port was open.
- Fixed issue that caused the local peer cache to degenerate.

Improvements:
- Client-side support for tigertree hashes (TTH/THEX).
- Replaced navigation tree by tabs.
- Redesigned download user-interface to make it more accessible.
- Added some selectable pre-defined search filters.
- Bitzi tickets are displayed in full raw indented XML.
- Display Bitzi and ShareMonkey URLs as search result details.
- Topless mode is available at run-time via command-line switch.
- Added default shared filename extensions:
  .7z, .bittorrent, .oga, .ogv, .spx, .tbz2
- Removed default shared filename extensions: .doc
- Updated translations: Japanese, Norwegian Bokmal, French.

Under the hood:
- Changed default to dual use of IPv4 and IPv6 instead of IPv4-only.
- Support the "as" (Alternate Source) key in magnet links.
- Eszett is finally normalized to "ss" in search queries.
- Avoid display updates for elements not currently visible.
- Take full advantage of persistent HTTP connections to fetch multiple
  files from the same peer through over the same connection if scheduling
  permits.
- Improved TLS support and blocking detection.
- Updated list of hostile IP adress ranges, bogons, Geo-IP data,
  spam patterns and spam samples.

8 files changed, 108 insertions, 112 deletions

diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 15abf563628..c211492ba90 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2008/03/06 14:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2008/08/20 10:03:32 adam Exp $
 
-DISTNAME=	gtk-gnutella-0.96.4
-PKGREVISION=	1
+DISTNAME=	gtk-gnutella-0.96.5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,21 +12,18 @@ COMMENT=	GTK-based gnutella client
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ARGS+=	-d -e -r -s
-CONFIGURE_ARGS+=	-D prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	-D privlib="${PREFIX}/share/gtk-gnutella"
-CONFIGURE_ARGS+=	-D sysman="${PREFIX}/man"
-CONFIGURE_ARGS+=	-D locale="${PREFIX}/${PKGLOCALEDIR}/locale"
-CONFIGURE_ARGS+=	-D cc=${CC:Q}
-CONFIGURE_ARGS+=	-D ccflags="${CFLAGS:Unone}"
-CONFIGURE_ARGS+=	-D yacc="yacc"
-CONFIGURE_ARGS+=	-D official="true"
-CONFIGURE_ARGS+=	-U optimize
+CONFIGURE_SCRIPT=	./build.sh
+CONFIGURE_ARGS+=	--configure-only
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--localedir="${PREFIX}/${PKGLOCALEDIR}/locale"
+CONFIGURE_ARGS+=	--cc=${CC:Q}
+CONFIGURE_ARGS+=	--cflags=${CFLAGS:Unone:Q}
+CONFIGURE_ARGS+=	--yacc="yacc"
 
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo
index 0a9e932c45a..054439970f1 100644
--- a/net/gtk-gnutella/distinfo
+++ b/net/gtk-gnutella/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.26 2007/10/14 08:32:19 adam Exp $
+$NetBSD: distinfo,v 1.27 2008/08/20 10:03:32 adam Exp $
 
-SHA1 (gtk-gnutella-0.96.4.tar.bz2) = 03893f83b44f677a6cc8af277115f40b6d208a18
-RMD160 (gtk-gnutella-0.96.4.tar.bz2) = dd13dab4fec9a93c0cef7bcf7a73fb092f7bd0ec
-Size (gtk-gnutella-0.96.4.tar.bz2) = 6879974 bytes
-SHA1 (patch-aa) = 57506c333dc94a498eaf85ecb83dd622e8a29e6e
-SHA1 (patch-ac) = ececec363f9ddec013b144f6a7e3dd92407263a4
+SHA1 (gtk-gnutella-0.96.5.tar.bz2) = 80589a24322f509ed1c2494a1b5ce08951c7e216
+RMD160 (gtk-gnutella-0.96.5.tar.bz2) = 1f7b58b45955d940e19284110ad78bb6410cd3c6
+Size (gtk-gnutella-0.96.5.tar.bz2) = 13634700 bytes
+SHA1 (patch-aa) = b499e26fd7b714c6845d6d9914de29f733b785f8
+SHA1 (patch-ac) = db691de783cd1cf26110f391559ac146a3aa235a
 SHA1 (patch-ad) = 38a4940e17b04249797b9bc625bb9205981ce356
-SHA1 (patch-ae) = 634fa16ef65780d57c4f5df595f404d3db38d979
+SHA1 (patch-ae) = cdbe5440cadeb7f247ce01abb8a5ce76e80a35c3
 SHA1 (patch-af) = d0a0f4ea8e6833350fb97b9b59b32903a61865d1
-SHA1 (patch-ag) = 622c1b09e3f902bf5d5c9559feb52a54665adac0
-SHA1 (patch-ai) = e6a348d33e22c4ef47977c358a360c9d9ebb0b43
+SHA1 (patch-ag) = 25ccbbbd237500535e857f244f449bdd69104530
+SHA1 (patch-ai) = f0a2bcad7100c30d6fee32479250004325f7bd98
diff --git a/net/gtk-gnutella/options.mk b/net/gtk-gnutella/options.mk
index 659ee01fa02..ed49b2a09ff 100644
--- a/net/gtk-gnutella/options.mk
+++ b/net/gtk-gnutella/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/01/20 14:50:03 cbiere Exp $
+# $NetBSD: options.mk,v 1.3 2008/08/20 10:03:32 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk-gnutella
 PKG_SUPPORTED_OPTIONS=		# empty
@@ -9,16 +9,16 @@ PKG_SUGGESTED_OPTIONS=		gtk2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgtk1)
-CONFIGURE_ARGS+=	-D gtkversion=1
+CONFIGURE_ARGS+=	--gtk1
 .  include "../../x11/gtk/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+=	-D gtkversion=2
+CONFIGURE_ARGS+=	--gtk2
 .  include "../../x11/gtk2/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mheadless)
-CONFIGURE_ARGS+=	-D d_headless
+CONFIGURE_ARGS+=	--topless
 .  include "../../devel/glib2/buildlink3.mk"
 .endif
diff --git a/net/gtk-gnutella/patches/patch-aa b/net/gtk-gnutella/patches/patch-aa
index 4735d289df5..039f02fe69b 100644
--- a/net/gtk-gnutella/patches/patch-aa
+++ b/net/gtk-gnutella/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2007/10/14 08:32:19 adam Exp $
+$NetBSD: patch-aa,v 1.8 2008/08/20 10:03:32 adam Exp $
 
---- Configure.orig	2007-07-07 06:21:09.000000000 +0200
+--- Configure.orig	2008-04-02 01:19:12.000000000 +0200
 +++ Configure
-@@ -3500,6 +3500,11 @@ done'
+@@ -3465,6 +3465,11 @@ done'
  set libintl.h i_libintl
  eval $inhdr
  
diff --git a/net/gtk-gnutella/patches/patch-ac b/net/gtk-gnutella/patches/patch-ac
index c044fd8d4ad..9d5cffc7586 100644
--- a/net/gtk-gnutella/patches/patch-ac
+++ b/net/gtk-gnutella/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2007/10/14 08:32:19 adam Exp $
+$NetBSD: patch-ac,v 1.7 2008/08/20 10:03:32 adam Exp $
 
---- src/if/gui_property.c.orig	2007-07-07 06:21:34.000000000 +0200
+--- src/if/gui_property.c.orig	2008-04-02 01:19:44.000000000 +0200
 +++ src/if/gui_property.c
-@@ -2434,7 +2434,7 @@ gui_prop_shutdown(void) {
+@@ -2327,7 +2327,7 @@ gui_prop_shutdown(void) {
      }
  
      for (n = 0; n < GUI_PROPERTY_NUM; n ++) {
diff --git a/net/gtk-gnutella/patches/patch-ae b/net/gtk-gnutella/patches/patch-ae
index 39e95ee435a..81c66696cf8 100644
--- a/net/gtk-gnutella/patches/patch-ae
+++ b/net/gtk-gnutella/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2007/10/14 08:32:19 adam Exp $
+$NetBSD: patch-ae,v 1.6 2008/08/20 10:03:32 adam Exp $
 
---- src/if/gnet_property.c.orig	2007-07-07 06:21:34.000000000 +0200
+--- src/if/gnet_property.c.orig	2008-04-02 01:19:44.000000000 +0200
 +++ src/if/gnet_property.c
-@@ -743,7 +743,7 @@ gnet_prop_init(void) {
+@@ -778,7 +778,7 @@ gnet_prop_init(void) {
      gnet_property->props[3].vector_size = 1;
  
      /* Type specific data: */
@@ -11,97 +11,106 @@ $NetBSD: patch-ae,v 1.5 2007/10/14 08:32:19 adam Exp $
      gnet_property->props[3].data.string.def    = (void *) &gnet_property_variable_new_version_str_default;
      gnet_property->props[3].data.string.value  = (void *) &gnet_property_variable_new_version_str;
      if (gnet_property->props[3].data.string.def) {
-@@ -2836,7 +2836,7 @@ gnet_prop_init(void) {
-     gnet_property->props[112].vector_size = 1;
- 
-     /* Type specific data: */
--    gnet_property->props[112].type               = PROP_TYPE_STRING;
-+    gnet_property->props[112].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[112].data.string.def    = (void *) &gnet_property_variable_socks_user_default;
-     gnet_property->props[112].data.string.value  = (void *) &gnet_property_variable_socks_user;
-     if (gnet_property->props[112].data.string.def) {
-@@ -2857,7 +2857,7 @@ gnet_prop_init(void) {
+@@ -2888,7 +2888,7 @@ gnet_prop_init(void) {
      gnet_property->props[113].vector_size = 1;
  
      /* Type specific data: */
 -    gnet_property->props[113].type               = PROP_TYPE_STRING;
 +    gnet_property->props[113].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[113].data.string.def    = (void *) &gnet_property_variable_socks_pass_default;
-     gnet_property->props[113].data.string.value  = (void *) &gnet_property_variable_socks_pass;
+     gnet_property->props[113].data.string.def    = (void *) &gnet_property_variable_socks_user_default;
+     gnet_property->props[113].data.string.value  = (void *) &gnet_property_variable_socks_user;
      if (gnet_property->props[113].data.string.def) {
-@@ -2894,7 +2894,7 @@ gnet_prop_init(void) {
-     gnet_property->props[115].vector_size = 1;
+@@ -2909,7 +2909,7 @@ gnet_prop_init(void) {
+     gnet_property->props[114].vector_size = 1;
  
      /* Type specific data: */
--    gnet_property->props[115].type               = PROP_TYPE_STRING;
-+    gnet_property->props[115].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[115].data.string.def    = (void *) &gnet_property_variable_proxy_hostname_default;
-     gnet_property->props[115].data.string.value  = (void *) &gnet_property_variable_proxy_hostname;
-     if (gnet_property->props[115].data.string.def) {
-@@ -3485,7 +3485,7 @@ gnet_prop_init(void) {
-     gnet_property->props[145].vector_size = 1;
+-    gnet_property->props[114].type               = PROP_TYPE_STRING;
++    gnet_property->props[114].type               = gg_PROP_TYPE_STRING;
+     gnet_property->props[114].data.string.def    = (void *) &gnet_property_variable_socks_pass_default;
+     gnet_property->props[114].data.string.value  = (void *) &gnet_property_variable_socks_pass;
+     if (gnet_property->props[114].data.string.def) {
+@@ -2946,7 +2946,7 @@ gnet_prop_init(void) {
+     gnet_property->props[116].vector_size = 1;
  
      /* Type specific data: */
--    gnet_property->props[145].type               = PROP_TYPE_STRING;
-+    gnet_property->props[145].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[145].data.string.def    = (void *) &gnet_property_variable_scan_extensions_default;
-     gnet_property->props[145].data.string.value  = (void *) &gnet_property_variable_scan_extensions;
-     if (gnet_property->props[145].data.string.def) {
-@@ -3540,7 +3540,7 @@ gnet_prop_init(void) {
-     gnet_property->props[148].vector_size = 1;
+-    gnet_property->props[116].type               = PROP_TYPE_STRING;
++    gnet_property->props[116].type               = gg_PROP_TYPE_STRING;
+     gnet_property->props[116].data.string.def    = (void *) &gnet_property_variable_proxy_hostname_default;
+     gnet_property->props[116].data.string.value  = (void *) &gnet_property_variable_proxy_hostname;
+     if (gnet_property->props[116].data.string.def) {
+@@ -3537,7 +3537,7 @@ gnet_prop_init(void) {
+     gnet_property->props[146].vector_size = 1;
  
      /* Type specific data: */
--    gnet_property->props[148].type               = PROP_TYPE_STRING;
-+    gnet_property->props[148].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[148].data.string.def    = (void *) &gnet_property_variable_save_file_path_default;
-     gnet_property->props[148].data.string.value  = (void *) &gnet_property_variable_save_file_path;
-     if (gnet_property->props[148].data.string.def) {
-@@ -3561,7 +3561,7 @@ gnet_prop_init(void) {
+-    gnet_property->props[146].type               = PROP_TYPE_STRING;
++    gnet_property->props[146].type               = gg_PROP_TYPE_STRING;
+     gnet_property->props[146].data.string.def    = (void *) &gnet_property_variable_scan_extensions_default;
+     gnet_property->props[146].data.string.value  = (void *) &gnet_property_variable_scan_extensions;
+     if (gnet_property->props[146].data.string.def) {
+@@ -3592,7 +3592,7 @@ gnet_prop_init(void) {
      gnet_property->props[149].vector_size = 1;
  
      /* Type specific data: */
 -    gnet_property->props[149].type               = PROP_TYPE_STRING;
 +    gnet_property->props[149].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[149].data.string.def    = (void *) &gnet_property_variable_move_file_path_default;
-     gnet_property->props[149].data.string.value  = (void *) &gnet_property_variable_move_file_path;
+     gnet_property->props[149].data.string.def    = (void *) &gnet_property_variable_save_file_path_default;
+     gnet_property->props[149].data.string.value  = (void *) &gnet_property_variable_save_file_path;
      if (gnet_property->props[149].data.string.def) {
-@@ -3582,7 +3582,7 @@ gnet_prop_init(void) {
+@@ -3613,7 +3613,7 @@ gnet_prop_init(void) {
      gnet_property->props[150].vector_size = 1;
  
      /* Type specific data: */
 -    gnet_property->props[150].type               = PROP_TYPE_STRING;
 +    gnet_property->props[150].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[150].data.string.def    = (void *) &gnet_property_variable_bad_file_path_default;
-     gnet_property->props[150].data.string.value  = (void *) &gnet_property_variable_bad_file_path;
+     gnet_property->props[150].data.string.def    = (void *) &gnet_property_variable_move_file_path_default;
+     gnet_property->props[150].data.string.value  = (void *) &gnet_property_variable_move_file_path;
      if (gnet_property->props[150].data.string.def) {
-@@ -3603,7 +3603,7 @@ gnet_prop_init(void) {
+@@ -3634,7 +3634,7 @@ gnet_prop_init(void) {
      gnet_property->props[151].vector_size = 1;
  
      /* Type specific data: */
 -    gnet_property->props[151].type               = PROP_TYPE_STRING;
 +    gnet_property->props[151].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[151].data.string.def    = (void *) &gnet_property_variable_shared_dirs_paths_default;
-     gnet_property->props[151].data.string.value  = (void *) &gnet_property_variable_shared_dirs_paths;
+     gnet_property->props[151].data.string.def    = (void *) &gnet_property_variable_bad_file_path_default;
+     gnet_property->props[151].data.string.value  = (void *) &gnet_property_variable_bad_file_path;
      if (gnet_property->props[151].data.string.def) {
-@@ -3624,7 +3624,7 @@ gnet_prop_init(void) {
+@@ -3655,7 +3655,7 @@ gnet_prop_init(void) {
      gnet_property->props[152].vector_size = 1;
  
      /* Type specific data: */
 -    gnet_property->props[152].type               = PROP_TYPE_STRING;
 +    gnet_property->props[152].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[152].data.string.def    = (void *) &gnet_property_variable_local_netmasks_string_default;
-     gnet_property->props[152].data.string.value  = (void *) &gnet_property_variable_local_netmasks_string;
+     gnet_property->props[152].data.string.def    = (void *) &gnet_property_variable_shared_dirs_paths_default;
+     gnet_property->props[152].data.string.value  = (void *) &gnet_property_variable_shared_dirs_paths;
      if (gnet_property->props[152].data.string.def) {
-@@ -4702,7 +4702,7 @@ gnet_prop_init(void) {
-     gnet_property->props[210].vector_size = 1;
+@@ -3676,7 +3676,7 @@ gnet_prop_init(void) {
+     gnet_property->props[153].vector_size = 1;
+ 
+     /* Type specific data: */
+-    gnet_property->props[153].type               = PROP_TYPE_STRING;
++    gnet_property->props[153].type               = gg_PROP_TYPE_STRING;
+     gnet_property->props[153].data.string.def    = (void *) &gnet_property_variable_local_netmasks_string_default;
+     gnet_property->props[153].data.string.value  = (void *) &gnet_property_variable_local_netmasks_string;
+     if (gnet_property->props[153].data.string.def) {
+@@ -4774,7 +4774,7 @@ gnet_prop_init(void) {
+     gnet_property->props[212].vector_size = 1;
+ 
+     /* Type specific data: */
+-    gnet_property->props[212].type               = PROP_TYPE_STRING;
++    gnet_property->props[212].type               = gg_PROP_TYPE_STRING;
+     gnet_property->props[212].data.string.def    = (void *) &gnet_property_variable_server_hostname_default;
+     gnet_property->props[212].data.string.value  = (void *) &gnet_property_variable_server_hostname;
+     if (gnet_property->props[212].data.string.def) {
+@@ -6489,7 +6489,7 @@ gnet_prop_init(void) {
+     gnet_property->props[303].vector_size = 1;
  
      /* Type specific data: */
--    gnet_property->props[210].type               = PROP_TYPE_STRING;
-+    gnet_property->props[210].type               = gg_PROP_TYPE_STRING;
-     gnet_property->props[210].data.string.def    = (void *) &gnet_property_variable_server_hostname_default;
-     gnet_property->props[210].data.string.value  = (void *) &gnet_property_variable_server_hostname;
-     if (gnet_property->props[210].data.string.def) {
-@@ -6327,7 +6327,7 @@ gnet_prop_shutdown(void) {
+-    gnet_property->props[303].type               = PROP_TYPE_STRING;
++    gnet_property->props[303].type               = gg_PROP_TYPE_STRING;
+     gnet_property->props[303].data.string.def    = (void *) &gnet_property_variable_latest_svn_release_signature_default;
+     gnet_property->props[303].data.string.value  = (void *) &gnet_property_variable_latest_svn_release_signature;
+     if (gnet_property->props[303].data.string.def) {
+@@ -6687,7 +6687,7 @@ gnet_prop_shutdown(void) {
      }
  
      for (n = 0; n < GNET_PROPERTY_NUM; n ++) {
diff --git a/net/gtk-gnutella/patches/patch-ag b/net/gtk-gnutella/patches/patch-ag
index a51fb0a522b..6b34d14611a 100644
--- a/net/gtk-gnutella/patches/patch-ag
+++ b/net/gtk-gnutella/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
+$NetBSD: patch-ag,v 1.3 2008/08/20 10:03:32 adam Exp $
 
---- src/lib/prop.c.orig	2007-07-07 06:21:38.000000000 +0200
+--- src/lib/prop.c.orig	2008-04-02 01:19:48.000000000 +0200
 +++ src/lib/prop.c
-@@ -466,7 +466,7 @@ prop_get_def(prop_set_t *ps, property_t 
+@@ -420,7 +420,7 @@ prop_get_def(prop_set_t *ps, property_t 
  			sizeof buf->data.ip.value * PROP(ps,p).vector_size);
  		break;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
  		buf->data.string.def	= g_new(gchar*, 1);
  		*buf->data.string.def   = g_strdup(*PROP(ps,p).data.string.def);
  		buf->data.string.value  = g_new(gchar*, 1);
-@@ -521,7 +521,7 @@ prop_free_def(prop_def_t *d)
+@@ -475,7 +475,7 @@ prop_free_def(prop_def_t *d)
  	case PROP_TYPE_IP:
  		G_FREE_NULL(d->data.ip.value);
  		break;
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
  		G_FREE_NULL(*d->data.string.value);
  		G_FREE_NULL(*d->data.string.def);
  		G_FREE_NULL(d->data.string.value);
-@@ -1198,12 +1198,12 @@ prop_set_string(prop_set_t *ps, property
+@@ -1152,12 +1152,12 @@ prop_set_string(prop_set_t *ps, property
  
  	if (!prop_in_range(ps, prop))
  		g_error("prop_get_gchar: unknown property %d", prop);
@@ -35,7 +35,7 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
  
  	prop_assert(ps, prop, PROP(ps,prop).vector_size == 1);
  
-@@ -1260,12 +1260,12 @@ prop_get_string(prop_set_t *ps, property
+@@ -1214,12 +1214,12 @@ prop_get_string(prop_set_t *ps, property
  
  	if (!prop_in_range(ps, prop))
  		g_error("prop_get_gchar: unknown property %d", prop);
@@ -50,7 +50,7 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
  
  	s = *PROP(ps,prop).data.string.value;
  
-@@ -1375,7 +1375,7 @@ prop_to_string(prop_set_t *ps, property_
+@@ -1329,7 +1329,7 @@ prop_to_string(prop_set_t *ps, property_
  			timestamp_to_string_buf(val, s, sizeof s);
  		}
  		break;
@@ -59,7 +59,7 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
  		{
  			gchar *buf = prop_get_string(ps, prop, NULL, 0);
  
-@@ -1452,7 +1452,7 @@ prop_default_to_string(prop_set_t *ps, p
+@@ -1406,7 +1406,7 @@ prop_default_to_string(prop_set_t *ps, p
  	case PROP_TYPE_TIMESTAMP:
  		uint64_to_string_buf(p->data.timestamp.def[0], s, sizeof s);
  		break;
@@ -68,7 +68,7 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
  		g_strlcpy(s, *p->data.string.def ? *p->data.string.def : "", sizeof s);
  		break;
  	case PROP_TYPE_IP:
-@@ -1725,7 +1725,7 @@ prop_save_to_file(prop_set_t *ps, const 
+@@ -1679,7 +1679,7 @@ prop_save_to_file(prop_set_t *ps, const 
  			val = g_strjoinv(",", vbuf);
  			quotes = TRUE;
  			break;
@@ -76,8 +76,8 @@ $NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $
 +		case gg_PROP_TYPE_STRING:
  			val = g_strdup(*p->data.string.value);
  			if (
- 				(val == NULL && *p->data.string.def != NULL) ||
-@@ -1872,7 +1872,7 @@ prop_set_from_string(prop_set_t *ps, pro
+ 				val != *p->data.string.def &&
+@@ -1828,7 +1828,7 @@ prop_set_from_string(prop_set_t *ps, pro
  			p->vector_size, vecbuf.timestamp);
  		stub->timestamp.set(prop, vecbuf.timestamp, 0, 0);
  		break;
diff --git a/net/gtk-gnutella/patches/patch-ai b/net/gtk-gnutella/patches/patch-ai
index 37d1144e0c5..34e9c29b7d1 100644
--- a/net/gtk-gnutella/patches/patch-ai
+++ b/net/gtk-gnutella/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2007/10/14 08:32:20 adam Exp $
+$NetBSD: patch-ai,v 1.3 2008/08/20 10:03:32 adam Exp $
 
---- src/ui/gtk/settings.c.orig	2007-07-07 06:21:48.000000000 +0200
+--- src/ui/gtk/settings.c.orig	2008-04-02 01:19:57.000000000 +0200
 +++ src/ui/gtk/settings.c
-@@ -104,7 +104,7 @@ typedef struct prop_map {
+@@ -103,7 +103,7 @@ typedef struct prop_map {
      /*
       * Automatic field filled in by settings_gui_init_prop_map
       */
@@ -11,12 +11,3 @@ $NetBSD: patch-ai,v 1.2 2007/10/14 08:32:20 adam Exp $
      prop_set_stub_t *stub;            /**< property set stub */
      gint *init_list;                  /**< init_list for reverse lookup */
  } prop_map_t;
-@@ -173,7 +173,7 @@ static gchar *prop_to_string(property_t 
-             gm_snprintf(s, sizeof(s), "%u", val);
-             break;
-         }
--        case PROP_TYPE_STRING: {
-+        case gg_PROP_TYPE_STRING: {
-             gchar *buf = stub->string.get(prop, NULL, 0);
-             gm_snprintf(s, sizeof(s), "%s", buf);
-             g_free(buf);