From 088d28992468012941f013aadf6778311f232993 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Wed, 2 Mar 2005 20:27:19 +0000 Subject: Patch for faulty proxy support, closes bug #83539. Also purged old ebuild and stale patches. (Portage version: 2.0.51.18) --- media-sound/grip/files/digest-grip-3.0.3 | 1 - media-sound/grip/files/digest-grip-3.2.0-r1 | 1 + .../grip/files/grip-3.0.6-NPTL-compat.patch | 11 ------ media-sound/grip/files/grip-3.1.4-cdda.patch | 13 ------- .../grip/files/grip-3.1.8-statuscheck-lp64.patch | 11 ------ .../grip/files/grip-3.1.9-statuscheck-lp64.patch | 11 ------ media-sound/grip/files/grip-3.2.0-proxy.patch | 44 ++++++++++++++++++++++ 7 files changed, 45 insertions(+), 47 deletions(-) delete mode 100644 media-sound/grip/files/digest-grip-3.0.3 create mode 100644 media-sound/grip/files/digest-grip-3.2.0-r1 delete mode 100644 media-sound/grip/files/grip-3.0.6-NPTL-compat.patch delete mode 100644 media-sound/grip/files/grip-3.1.4-cdda.patch delete mode 100644 media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch delete mode 100644 media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch create mode 100644 media-sound/grip/files/grip-3.2.0-proxy.patch (limited to 'media-sound/grip/files') diff --git a/media-sound/grip/files/digest-grip-3.0.3 b/media-sound/grip/files/digest-grip-3.0.3 deleted file mode 100644 index c8ff2c6ca7ab..000000000000 --- a/media-sound/grip/files/digest-grip-3.0.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 b580ca44ed12d478bb6289d09cb7ad38 grip-3.0.3.tar.gz 885333 diff --git a/media-sound/grip/files/digest-grip-3.2.0-r1 b/media-sound/grip/files/digest-grip-3.2.0-r1 new file mode 100644 index 000000000000..3a68edede1db --- /dev/null +++ b/media-sound/grip/files/digest-grip-3.2.0-r1 @@ -0,0 +1 @@ +MD5 9b51933a03dd7d7ddfbb3643fc82c2d0 grip-3.2.0.tar.gz 722039 diff --git a/media-sound/grip/files/grip-3.0.6-NPTL-compat.patch b/media-sound/grip/files/grip-3.0.6-NPTL-compat.patch deleted file mode 100644 index fba9bb32e621..000000000000 --- a/media-sound/grip/files/grip-3.0.6-NPTL-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grip-3.0.6/src/cdplay.c.orig 2003-03-06 22:01:14.000000000 +0200 -+++ grip-3.0.6/src/cdplay.c 2003-03-06 22:01:58.000000000 +0200 -@@ -90,7 +90,7 @@ - #elif defined(__FreeBSD__) - pthread_kill(ginfo->discdb_thread,0); - #else -- pthread_kill_other_threads_np(); -+ pthread_kill(ginfo->discdb_thread,0); - #endif - Debug(_("Aborted\n")); - diff --git a/media-sound/grip/files/grip-3.1.4-cdda.patch b/media-sound/grip/files/grip-3.1.4-cdda.patch deleted file mode 100644 index 9f314ffd94cf..000000000000 --- a/media-sound/grip/files/grip-3.1.4-cdda.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/cdpar.c.org 2004-01-03 16:16:56.000000000 +0100 -+++ src/cdpar.c 2004-01-03 16:17:03.000000000 +0100 -@@ -44,8 +44,8 @@ - #define size16 short - #define size32 int - --#include --#include -+#include -+#include - - static void PutNum(long num,int f,int endianness,int bytes); - static void WriteWav(int f,long bytes); diff --git a/media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch b/media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch deleted file mode 100644 index 6dfd24914586..000000000000 --- a/media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grip-3.1.4-orig/src/status_window.c 2004-02-14 01:21:01.193001784 -0500 -+++ grip-3.1.4/src/status_window.c 2004-02-14 01:19:32.069550608 -0500 -@@ -83,7 +83,7 @@ - void StatusWindowWrite(StatusWindow *sw,char *msg) - { - char *buf, *locale_msg; -- int len; -+ gsize len; - int pos=0; - - /* gtk_widget_queue_resize(sw->term_widget);*/ diff --git a/media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch b/media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch deleted file mode 100644 index 4586408a4f79..000000000000 --- a/media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grip-3.1.9-orig/src/status_window.c 2004-03-31 04:29:50.000000000 +0200 -+++ grip-3.1.9/src/status_window.c 2004-04-04 00:17:15.664086496 +0200 -@@ -83,7 +83,7 @@ - void StatusWindowWrite(StatusWindow *sw,char *msg) - { - char *buf, *locale_msg=NULL; -- int len; -+ gsize len; - int pos=0; - - /* gtk_widget_queue_resize(sw->term_widget);*/ diff --git a/media-sound/grip/files/grip-3.2.0-proxy.patch b/media-sound/grip/files/grip-3.2.0-proxy.patch new file mode 100644 index 000000000000..c98f1be8e439 --- /dev/null +++ b/media-sound/grip/files/grip-3.2.0-proxy.patch @@ -0,0 +1,44 @@ +diff -Naur grip-3.2.0/src/discdb.c grip-3.2.0-patched/src/discdb.c +--- grip-3.2.0/src/discdb.c 2004-04-15 12:23:37.000000000 -0600 ++++ grip-3.2.0-patched/src/discdb.c 2004-11-09 15:22:15.000000000 -0700 +@@ -187,17 +187,14 @@ + g_string_sprintf(proxy,"%s:%d",server->proxy->name, + server->proxy->port); + +- curl_easy_setopt(curl_handle,CURLOPT_PROXY,proxy); +- +- g_string_free(proxy,TRUE); ++ curl_easy_setopt(curl_handle,CURLOPT_PROXY,proxy->str); + + if(*server->proxy->username) { ++ user=g_string_new(NULL); + g_string_sprintf(user,"%s:%s",server->proxy->username, + server->proxy->pswd); + +- curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,user); +- +- g_string_free(user,TRUE); ++ curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,user->str); + } + } + +@@ -238,11 +235,17 @@ + fclose(outfile); + } + +- g_string_free(uri,TRUE); +- + curl_slist_free_all(headers); + + curl_easy_cleanup(curl_handle); ++ ++ g_string_free(uri,TRUE); ++ if(server->use_proxy) { ++ g_string_free(proxy,TRUE); ++ if(*server->proxy->username) { ++ g_string_free(user,TRUE); ++ } ++ } + } + + curl_global_cleanup(); -- cgit v1.2.3-65-gdbad