From e180e1120b9c17e06a07533cfbca2414312fd5b2 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 14 Oct 2007 08:32:19 +0000 Subject: Changes 0.96.4: Bug Fixes: - The download overlap checking was incorrectly detecting mismatches. - A bug in the network queue caused frequent crashes. - A bug in the event timing caused failures after 25 days uptime. - A stalling issue with TLS connections. - The search retry timeouts weren't accepted. - The order of items in the search history was wrong. - The quick-connect limit wasn't respected causing too frequent connection attempts during startup. - Removed incorrect use of SF_NODISKIO flag for sendfile() on FreeBSD. - Fixed crash that could be triggered by changing the listening port temporarily to zero. - iconv() was not used correctly which could cause wrong conversions for longer strings. - Generated filenames weren't properly restricted in length which could cause crashes. - There was a compile issue on NetBSD caused by namespace pollution. - Added workaround for the issue that on Solaris only the file descriptors 0..255 can be used for stdio. Improvements: - Finished downloads are now seeded for the whole session or until they are manually purged, if partial file-sharing is enabled. - Server-side support for Tigertree hashes and THEX thanks to patches provided by Martijn van Oosterhout. - Improved spam filters. --- net/gtk-gnutella/Makefile | 5 +- net/gtk-gnutella/PLIST | 8 ++- net/gtk-gnutella/distinfo | 22 +++---- net/gtk-gnutella/patches/patch-aa | 6 +- net/gtk-gnutella/patches/patch-ab | 53 ---------------- net/gtk-gnutella/patches/patch-ac | 6 +- net/gtk-gnutella/patches/patch-ad | 10 +-- net/gtk-gnutella/patches/patch-ae | 125 ++++++++++++++++++-------------------- net/gtk-gnutella/patches/patch-ag | 8 +-- net/gtk-gnutella/patches/patch-ah | 13 ---- net/gtk-gnutella/patches/patch-ai | 8 +-- 11 files changed, 95 insertions(+), 169 deletions(-) delete mode 100644 net/gtk-gnutella/patches/patch-ab delete mode 100644 net/gtk-gnutella/patches/patch-ah (limited to 'net/gtk-gnutella') diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 711bc279f53..ef8945a1e29 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.58 2007/06/05 05:37:32 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2007/10/14 08:32:19 adam Exp $ -DISTNAME= gtk-gnutella-0.96.3 -PKGREVISION= 1 +DISTNAME= gtk-gnutella-0.96.4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/gtk-gnutella/PLIST b/net/gtk-gnutella/PLIST index e2978e539de..c4db644d280 100644 --- a/net/gtk-gnutella/PLIST +++ b/net/gtk-gnutella/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2007/01/20 14:50:03 cbiere Exp $ +@comment $NetBSD: PLIST,v 1.14 2007/10/14 08:32:19 adam Exp $ bin/gtk-gnutella share/applications/gtk-gnutella.desktop share/gtk-gnutella/bogons.txt @@ -6,7 +6,6 @@ share/gtk-gnutella/el/FAQ share/gtk-gnutella/en/FAQ share/gtk-gnutella/favicon.png share/gtk-gnutella/geo-ip.txt -share/gtk-gnutella/gwcache.boot share/gtk-gnutella/hostiles.txt share/gtk-gnutella/ja/FAQ share/gtk-gnutella/pixmaps/arrow_down.xpm @@ -14,6 +13,7 @@ share/gtk-gnutella/pixmaps/arrow_up.xpm share/gtk-gnutella/pixmaps/booklib.xpm share/gtk-gnutella/pixmaps/booksha.xpm share/gtk-gnutella/pixmaps/bookshav.xpm +share/gtk-gnutella/pixmaps/booktth.xpm share/gtk-gnutella/pixmaps/chip.xpm share/gtk-gnutella/pixmaps/clanbomber_red.xpm share/gtk-gnutella/pixmaps/clanbomber_yellow.xpm @@ -26,6 +26,8 @@ share/gtk-gnutella/pixmaps/firewall_tcp.xpm 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/icon.16x16.xpm +share/gtk-gnutella/pixmaps/icon.32x32.xpm share/gtk-gnutella/pixmaps/icon.xpm share/gtk-gnutella/pixmaps/leaf.xpm share/gtk-gnutella/pixmaps/legacy.xpm @@ -43,6 +45,8 @@ share/gtk-gnutella/pixmaps/ultra.xpm share/gtk-gnutella/pixmaps/upload.xpm share/gtk-gnutella/pixmaps/warning.xpm share/gtk-gnutella/robots.txt +share/gtk-gnutella/spam.txt +share/gtk-gnutella/spam_sha1.txt share/locale/de/LC_MESSAGES/gtk-gnutella.mo share/locale/el/LC_MESSAGES/gtk-gnutella.mo share/locale/es/LC_MESSAGES/gtk-gnutella.mo diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo index 8ce09ddf0fe..0a9e932c45a 100644 --- a/net/gtk-gnutella/distinfo +++ b/net/gtk-gnutella/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.25 2007/06/15 14:26:22 darcy Exp $ +$NetBSD: distinfo,v 1.26 2007/10/14 08:32:19 adam Exp $ -SHA1 (gtk-gnutella-0.96.3.tar.bz2) = 7469d4ea685c387f38e927efeb8b9947a9ec72e3 -RMD160 (gtk-gnutella-0.96.3.tar.bz2) = fd5f04d22349a584e9b26cefbbbef41a2dbef7b2 -Size (gtk-gnutella-0.96.3.tar.bz2) = 2845172 bytes -SHA1 (patch-aa) = 16cc12d99624677d81fd1a7746b2afb80db0b570 -SHA1 (patch-ab) = 9ffbe8d12c7e4747a2110cd825bf957e2f3f393a -SHA1 (patch-ac) = b5d3053d8fb7095adc72464a09b83c278d7616a8 -SHA1 (patch-ad) = 18126a316296828aca62e9e5b8dbd801f06427eb -SHA1 (patch-ae) = aa45736568209888dae66f5c74aaf3e292e1a314 +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 (patch-ad) = 38a4940e17b04249797b9bc625bb9205981ce356 +SHA1 (patch-ae) = 634fa16ef65780d57c4f5df595f404d3db38d979 SHA1 (patch-af) = d0a0f4ea8e6833350fb97b9b59b32903a61865d1 -SHA1 (patch-ag) = 4f60ae6d30c159b900c896baae28c11a2d77a879 -SHA1 (patch-ah) = d2d20e345411662ea9134557aea508b67ea3ec6f -SHA1 (patch-ai) = 0a1f4b2be7873c8d9e204a1b6312cb0591770943 +SHA1 (patch-ag) = 622c1b09e3f902bf5d5c9559feb52a54665adac0 +SHA1 (patch-ai) = e6a348d33e22c4ef47977c358a360c9d9ebb0b43 diff --git a/net/gtk-gnutella/patches/patch-aa b/net/gtk-gnutella/patches/patch-aa index 3bb51733e8a..4735d289df5 100644 --- a/net/gtk-gnutella/patches/patch-aa +++ b/net/gtk-gnutella/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2006/05/12 20:43:54 adam Exp $ +$NetBSD: patch-aa,v 1.7 2007/10/14 08:32:19 adam Exp $ ---- Configure.orig 2006-02-22 17:50:18.000000000 +0100 +--- Configure.orig 2007-07-07 06:21:09.000000000 +0200 +++ Configure -@@ -4576,6 +4576,11 @@ done' +@@ -3500,6 +3500,11 @@ done' set libintl.h i_libintl eval $inhdr diff --git a/net/gtk-gnutella/patches/patch-ab b/net/gtk-gnutella/patches/patch-ab deleted file mode 100644 index bba52ca4d20..00000000000 --- a/net/gtk-gnutella/patches/patch-ab +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2007/01/20 14:50:03 cbiere Exp $ - ---- Configure 2007-01-05 01:02:13.000000000 +0100 -+++ Configure 2007-01-05 01:01:24.000000000 +0100 -@@ -69,28 +69,6 @@ - fi - fi - --: Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -- --for p in $paths --do -- case "$p_$PATH$p_" in -- *$p_$p$p_*) ;; -- *) test -d $p && PATH=$PATH$p_$p ;; -- esac --done -- --PATH=.$p_$PATH --export PATH -- - : shall we be using ksh? - inksh='' - needksh='' -@@ -569,8 +547,7 @@ - archobjs='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -581,8 +558,7 @@ - : change the next line if compiling for Xenix/286 on Xenix/386 - xlibpth='/usr/lib/386 /lib/386' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries - glibpth="/lib /usr/lib $xlibpth" diff --git a/net/gtk-gnutella/patches/patch-ac b/net/gtk-gnutella/patches/patch-ac index 87ef5fb826e..c044fd8d4ad 100644 --- a/net/gtk-gnutella/patches/patch-ac +++ b/net/gtk-gnutella/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2007/06/15 14:26:22 darcy Exp $ +$NetBSD: patch-ac,v 1.6 2007/10/14 08:32:19 adam Exp $ ---- src/if/gui_property.c.orig 2007-06-14 12:07:07.000000000 -0400 +--- src/if/gui_property.c.orig 2007-07-07 06:21:34.000000000 +0200 +++ src/if/gui_property.c -@@ -2453,7 +2453,7 @@ gui_prop_shutdown(void) { +@@ -2434,7 +2434,7 @@ gui_prop_shutdown(void) { } for (n = 0; n < GUI_PROPERTY_NUM; n ++) { diff --git a/net/gtk-gnutella/patches/patch-ad b/net/gtk-gnutella/patches/patch-ad index 7c4ce607db8..96bdb5aeaff 100644 --- a/net/gtk-gnutella/patches/patch-ad +++ b/net/gtk-gnutella/patches/patch-ad @@ -1,9 +1,9 @@ -$NetBSD: patch-ad,v 1.4 2007/06/15 14:26:22 darcy Exp $ +$NetBSD: patch-ad,v 1.5 2007/10/14 08:32:19 adam Exp $ ---- src/if/props.tpl.orig 2007-06-14 12:07:07.000000000 -0400 +--- src/if/props.tpl.orig 2007-07-07 06:21:34.000000000 +0200 +++ src/if/props.tpl -@@ -468,7 +468,7 @@ FOR prop =][= - (sprintf "%s_choices" (. prop-var-name ))=];[= +@@ -510,7 +510,7 @@ FOR prop =][= + (sprintf "%s_choices" (. prop-var))=];[= = string =] - [=(. current-prop)=].type = PROP_TYPE_STRING; @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2007/06/15 14:26:22 darcy Exp $ [=(. current-prop)=].data.string.def = [=(. prop-def-var)=]; [=(. current-prop)=].data.string.value = [=(. prop-var)=]; if ([=(. current-prop)=].data.string.def) { -@@ -500,7 +500,7 @@ void +@@ -542,7 +542,7 @@ void } for (n = 0; n < [=(. prop-num)=]; n ++) { diff --git a/net/gtk-gnutella/patches/patch-ae b/net/gtk-gnutella/patches/patch-ae index 84e78e33314..39e95ee435a 100644 --- a/net/gtk-gnutella/patches/patch-ae +++ b/net/gtk-gnutella/patches/patch-ae @@ -1,116 +1,107 @@ -$NetBSD: patch-ae,v 1.4 2007/06/15 14:26:23 darcy Exp $ +$NetBSD: patch-ae,v 1.5 2007/10/14 08:32:19 adam Exp $ ---- src/if/gnet_property.c.orig 2007-06-14 12:07:07.000000000 -0400 +--- src/if/gnet_property.c.orig 2007-07-07 06:21:34.000000000 +0200 +++ src/if/gnet_property.c -@@ -730,7 +730,7 @@ gnet_prop_init(void) { +@@ -743,7 +743,7 @@ gnet_prop_init(void) { gnet_property->props[3].vector_size = 1; /* Type specific data: */ - gnet_property->props[3].type = PROP_TYPE_STRING; + gnet_property->props[3].type = gg_PROP_TYPE_STRING; - gnet_property->props[3].data.string.def = &new_version_str_def; - gnet_property->props[3].data.string.value = &new_version_str; + 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) { -@@ -2843,7 +2843,7 @@ gnet_prop_init(void) { +@@ -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) { 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 = &socks_user_def; - gnet_property->props[113].data.string.value = &socks_user; + 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; if (gnet_property->props[113].data.string.def) { -@@ -2864,7 +2864,7 @@ gnet_prop_init(void) { - gnet_property->props[114].vector_size = 1; +@@ -2894,7 +2894,7 @@ gnet_prop_init(void) { + gnet_property->props[115].vector_size = 1; /* Type specific data: */ -- gnet_property->props[114].type = PROP_TYPE_STRING; -+ gnet_property->props[114].type = gg_PROP_TYPE_STRING; - gnet_property->props[114].data.string.def = &socks_pass_def; - gnet_property->props[114].data.string.value = &socks_pass; - if (gnet_property->props[114].data.string.def) { -@@ -2901,7 +2901,7 @@ gnet_prop_init(void) { - gnet_property->props[116].vector_size = 1; +- 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; /* Type specific data: */ -- gnet_property->props[116].type = PROP_TYPE_STRING; -+ gnet_property->props[116].type = gg_PROP_TYPE_STRING; - gnet_property->props[116].data.string.def = &proxy_hostname_def; - gnet_property->props[116].data.string.value = &proxy_hostname; - if (gnet_property->props[116].data.string.def) { -@@ -3492,7 +3492,7 @@ gnet_prop_init(void) { - gnet_property->props[146].vector_size = 1; +- 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; /* Type specific data: */ -- gnet_property->props[146].type = PROP_TYPE_STRING; -+ gnet_property->props[146].type = gg_PROP_TYPE_STRING; - gnet_property->props[146].data.string.def = &scan_extensions_def; - gnet_property->props[146].data.string.value = &scan_extensions; - if (gnet_property->props[146].data.string.def) { -@@ -3547,7 +3547,7 @@ gnet_prop_init(void) { +- 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[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 = &save_file_path_def; - gnet_property->props[149].data.string.value = &save_file_path; + 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; if (gnet_property->props[149].data.string.def) { -@@ -3568,7 +3568,7 @@ gnet_prop_init(void) { +@@ -3582,7 +3582,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 = &move_file_path_def; - gnet_property->props[150].data.string.value = &move_file_path; + 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; if (gnet_property->props[150].data.string.def) { -@@ -3589,7 +3589,7 @@ gnet_prop_init(void) { +@@ -3603,7 +3603,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 = &bad_file_path_def; - gnet_property->props[151].data.string.value = &bad_file_path; + 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; if (gnet_property->props[151].data.string.def) { -@@ -3610,7 +3610,7 @@ gnet_prop_init(void) { +@@ -3624,7 +3624,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 = &shared_dirs_paths_def; - gnet_property->props[152].data.string.value = &shared_dirs_paths; + 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; if (gnet_property->props[152].data.string.def) { -@@ -3631,7 +3631,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 = &local_netmasks_string_def; - gnet_property->props[153].data.string.value = &local_netmasks_string; - if (gnet_property->props[153].data.string.def) { -@@ -4765,7 +4765,7 @@ gnet_prop_init(void) { - gnet_property->props[214].vector_size = 1; - - /* Type specific data: */ -- gnet_property->props[214].type = PROP_TYPE_STRING; -+ gnet_property->props[214].type = gg_PROP_TYPE_STRING; - gnet_property->props[214].data.string.def = &server_hostname_def; - gnet_property->props[214].data.string.value = &server_hostname; - if (gnet_property->props[214].data.string.def) { -@@ -5630,7 +5630,7 @@ gnet_prop_init(void) { - gnet_property->props[259].vector_size = 1; +@@ -4702,7 +4702,7 @@ gnet_prop_init(void) { + gnet_property->props[210].vector_size = 1; /* Type specific data: */ -- gnet_property->props[259].type = PROP_TYPE_STRING; -+ gnet_property->props[259].type = gg_PROP_TYPE_STRING; - gnet_property->props[259].data.string.def = &ancient_version_force_def; - gnet_property->props[259].data.string.value = &ancient_version_force; - if (gnet_property->props[259].data.string.def) { -@@ -6223,7 +6223,7 @@ gnet_prop_shutdown(void) { +- 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) { } 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 134b1fc5789..a51fb0a522b 100644 --- a/net/gtk-gnutella/patches/patch-ag +++ b/net/gtk-gnutella/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.1 2007/06/15 14:26:23 darcy Exp $ +$NetBSD: patch-ag,v 1.2 2007/10/14 08:32:19 adam Exp $ ---- src/lib/prop.c.orig 2007-06-14 12:07:07.000000000 -0400 +--- src/lib/prop.c.orig 2007-07-07 06:21:38.000000000 +0200 +++ src/lib/prop.c @@ -466,7 +466,7 @@ prop_get_def(prop_set_t *ps, property_t sizeof buf->data.ip.value * PROP(ps,p).vector_size); @@ -68,7 +68,7 @@ $NetBSD: patch-ag,v 1.1 2007/06/15 14:26:23 darcy Exp $ g_strlcpy(s, *p->data.string.def ? *p->data.string.def : "", sizeof s); break; case PROP_TYPE_IP: -@@ -1727,7 +1727,7 @@ prop_save_to_file(prop_set_t *ps, const +@@ -1725,7 +1725,7 @@ prop_save_to_file(prop_set_t *ps, const val = g_strjoinv(",", vbuf); quotes = TRUE; break; @@ -77,7 +77,7 @@ $NetBSD: patch-ag,v 1.1 2007/06/15 14:26:23 darcy Exp $ val = g_strdup(*p->data.string.value); if ( (val == NULL && *p->data.string.def != NULL) || -@@ -1874,7 +1874,7 @@ prop_set_from_string(prop_set_t *ps, pro +@@ -1872,7 +1872,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-ah b/net/gtk-gnutella/patches/patch-ah deleted file mode 100644 index a0d9aedb08f..00000000000 --- a/net/gtk-gnutella/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2007/06/15 14:26:23 darcy Exp $ - ---- src/core/shell.c.orig 2007-06-14 12:07:07.000000000 -0400 -+++ src/core/shell.c -@@ -530,7 +530,7 @@ shell_exec_set(gnutella_shell_t *sh, con - stub->guint64.set(prop, &val, 0, 1); - } - break; -- case PROP_TYPE_STRING: -+ case gg_PROP_TYPE_STRING: - stub->string.set(prop, tok_value); - break; - case PROP_TYPE_STORAGE: diff --git a/net/gtk-gnutella/patches/patch-ai b/net/gtk-gnutella/patches/patch-ai index e4513e1bb1a..37d1144e0c5 100644 --- a/net/gtk-gnutella/patches/patch-ai +++ b/net/gtk-gnutella/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1 2007/06/15 14:26:23 darcy Exp $ +$NetBSD: patch-ai,v 1.2 2007/10/14 08:32:20 adam Exp $ ---- src/ui/gtk/settings.c.orig 2007-06-14 12:07:07.000000000 -0400 +--- src/ui/gtk/settings.c.orig 2007-07-07 06:21:48.000000000 +0200 +++ src/ui/gtk/settings.c -@@ -105,7 +105,7 @@ typedef struct prop_map { +@@ -104,7 +104,7 @@ typedef struct prop_map { /* * Automatic field filled in by settings_gui_init_prop_map */ @@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.1 2007/06/15 14:26:23 darcy Exp $ prop_set_stub_t *stub; /**< property set stub */ gint *init_list; /**< init_list for reverse lookup */ } prop_map_t; -@@ -174,7 +174,7 @@ static gchar *prop_to_string(property_t +@@ -173,7 +173,7 @@ static gchar *prop_to_string(property_t gm_snprintf(s, sizeof(s), "%u", val); break; } -- cgit v1.2.3