From: Marcus D. Hanwell Date: Sat, 29 Oct 2005 14:54:29 +0000 (+0000) Subject: Removed obsolete patches. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19231d9004cbc30474f9ed63ab83eece5e4d6a85;p=gentoo.git Removed obsolete patches. Package-Manager: portage-2.0.53_rc6 --- diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog index 3fc9eacee403..b5c70f00771e 100644 --- a/sci-misc/boinc/ChangeLog +++ b/sci-misc/boinc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-misc/boinc # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.12 2005/10/29 14:49:52 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.13 2005/10/29 14:54:29 cryos Exp $ + + 29 Oct 2005; Marcus D. Hanwell + -files/boinc-4.32_cmdline_options.patch, + -files/boinc-4.32_socket_close_fix.patch: + Removed obsolete patches. *boinc-4.72.20050813-r1 (29 Oct 2005) diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest index a084e51fdfa3..bd59024fad77 100644 --- a/sci-misc/boinc/Manifest +++ b/sci-misc/boinc/Manifest @@ -1,10 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0d751983462c8c424f43049ea6bd45ef ChangeLog 2826 +MD5 10476607dd4c21c0bee6d873ab90ace4 ChangeLog 2994 MD5 49a7e8cec076e51e91ff720503a859c8 boinc-4.72.20050813-r1.ebuild 2254 -MD5 f34dc99c2f866383c11c0a3ac849baf8 files/boinc-4.32_cmdline_options.patch 2477 -MD5 25cfc5918b31da56263edfee7a5fa682 files/boinc-4.32_socket_close_fix.patch 1208 MD5 5418cddcce4923a19fdf0c6bafea11bf files/boinc.conf 440 MD5 3629c69dacf62b1cb3f9118e757fae00 files/boinc.init 1730 MD5 54ee39e6bbb50b705cb5fac638568d8b files/digest-boinc-4.72.20050813-r1 80 @@ -12,7 +10,7 @@ MD5 4b2e94b92c84896e0204d9e7710f9c6a metadata.xml 420 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFDY4wbntT9W3vfTuoRAqOzAKCRQgG4jKWhynIej5bK6aEbY5SYOQCgpTLy -0SScI+ngtgVf5k9I8ml1erI= -=w5LN +iD8DBQFDY40wntT9W3vfTuoRAvQkAJ0d9hbJ+XPH7cwBN7Bahv6KeUfTUwCgnsxp +QiQ646l4TATG4MgLwBKA0ro= +=lvIq -----END PGP SIGNATURE----- diff --git a/sci-misc/boinc/files/boinc-4.32_cmdline_options.patch b/sci-misc/boinc/files/boinc-4.32_cmdline_options.patch deleted file mode 100644 index a020ebe9af85..000000000000 --- a/sci-misc/boinc/files/boinc-4.32_cmdline_options.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- client/cs_cmdline.C.orig 2005-04-19 08:52:35.000000000 -0500 -+++ client/cs_cmdline.C 2005-04-19 08:52:48.000000000 -0500 -@@ -35,18 +35,18 @@ - static void print_options(char* prog) { - printf( - "Usage: %s [options]\n" -- " -version show version info\n" -- " -exit_when_idle Get/process/report work, then exit\n" -- " -show_projects show attached projects\n" -- " -return_results_immediately contact server when have results\n" -- " -detach_project URL detach from a project\n" -- " -reset_project URL reset (clear) a project\n" -- " -attach_project attach to a project (will prompt for URL, account key)\n" -- " -update_prefs URL contact a project to update preferences\n" -- " -run_cpu_benchmarks run the CPU benchmarks\n" -- " -check_all_logins check input from remote users\n" -- " -allow_remote_gui_rpc allow remote GUI RPC connections\n" -- " -redirectio redirect stdout and stderr to log files\n", -+ " -version show version info\n" -+ " -exit_when_idle Get/process/report work, then exit\n" -+ " -show_projects show attached projects\n" -+ " -return_results_immediately contact server when have results\n" -+ " -detach_project detach from a project\n" -+ " -reset_project reset (clear) a project\n" -+ " -attach_project attach to a project\n" -+ " -update_prefs contact a project to update preferences\n" -+ " -run_cpu_benchmarks run the CPU benchmarks\n" -+ " -check_all_logins check input from remote users\n" -+ " -allow_remote_gui_rpc allow remote GUI RPC connections\n" -+ " -redirectio redirect stdout and stderr to log files\n", - prog - ); - } -@@ -148,9 +148,8 @@ - if (i > argc-2) { - show_options = true; - } else { -- strcpy(attach_project_url, argv[i+1]); -- strcpy(attach_project_auth, argv[i+1]); -- i += 2; -+ strcpy(attach_project_url, argv[++i]); -+ strcpy(attach_project_auth, argv[++i]); - } - } else if (ARG(version)) { - printf(BOINC_VERSION_STRING " " HOSTTYPE "\n"); diff --git a/sci-misc/boinc/files/boinc-4.32_socket_close_fix.patch b/sci-misc/boinc/files/boinc-4.32_socket_close_fix.patch deleted file mode 100644 index 66b63bbc7895..000000000000 --- a/sci-misc/boinc/files/boinc-4.32_socket_close_fix.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- lib/gui_rpc_client.C.orig 2005-04-19 11:00:04.000000000 -0500 -+++ lib/gui_rpc_client.C 2005-04-19 11:12:57.000000000 -0500 -@@ -936,16 +936,15 @@ - // - void RPC_CLIENT::close() { - //fprintf(stderr, "RPC_CLIENT::close called\n"); --#ifdef _WIN32 -- ::closesocket(sock); --#else -- ::close(sock); --#endif -- sock = 0; -+ if (sock) { -+ boinc_close_socket(sock); -+ sock = 0; -+ } - } - - int RPC_CLIENT::init(const char* host, bool asynch) { - int retval; -+ memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(GUI_RPC_PORT_ALT); - -@@ -957,7 +956,7 @@ - } - addr.sin_addr.s_addr = *(int*)hep->h_addr_list[0]; - } else { -- addr.sin_addr.s_addr = htonl(0x7f000001); -+ addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - } - - retval = boinc_socket(sock); -@@ -979,6 +978,10 @@ - } else { - retval = connect(sock, (const sockaddr*)(&addr), sizeof(addr)); - if (retval) { -+ //fprintf(stderr, "connect 2 on %d returned %d\n", sock, retval); -+ perror("connect"); -+ boinc_close_socket(sock); -+ boinc_socket(sock); - #ifdef _WIN32 - printf("connect 1: Winsock error '%d'\n", WSAGetLastError()); - #endif