r784 - in /trunk/boinc/debian: changelog patches/101_fix_memory_detection_on_kfreebsd.patch patches/201_missing_headers_for_gcc4.3.patch patches/series

fst at users.alioth.debian.org fst at users.alioth.debian.org
Thu Dec 20 05:06:06 UTC 2007


Author: fst
Date: Thu Dec 20 05:06:04 2007
New Revision: 784

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=784
Log:
debian/patches/: Added 101_fix_memory_detection_on_kfreebsd.patch from
upstream r14415 based on a patch by Andrew Deason <adeason2 at uiuc.edu> which
fixes memory detection on Debian GNU/kFreeBSD. (closes: #456586)


Added:
    trunk/boinc/debian/patches/101_fix_memory_detection_on_kfreebsd.patch
Modified:
    trunk/boinc/debian/changelog
    trunk/boinc/debian/patches/201_missing_headers_for_gcc4.3.patch
    trunk/boinc/debian/patches/series

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=784&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Thu Dec 20 05:06:04 2007
@@ -10,8 +10,11 @@
       headers to several source files. This is required to fix a FTBFS with
       recent GCC 4.3 snapshots. Thanks to Martin Michlmayr <tbm at cyrius.com>
       for the bug report. (closes: #456041)
-
- -- Frank S. Thomas <fst at debian.org>  Thu, 13 Dec 2007 17:54:37 +0100
+    - Added 101_fix_memory_detection_on_kfreebsd.patch from upstream r14415
+      based on a patch by Andrew Deason <adeason2 at uiuc.edu> which fixes memory
+      detection on Debian GNU/kFreeBSD. (closes: #456586)
+
+ -- Frank S. Thomas <fst at debian.org>  Thu, 20 Dec 2007 05:55:15 +0100
 
 boinc (5.10.30-1) unstable; urgency=low
 

Added: trunk/boinc/debian/patches/101_fix_memory_detection_on_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/101_fix_memory_detection_on_kfreebsd.patch?rev=784&op=file
==============================================================================
--- trunk/boinc/debian/patches/101_fix_memory_detection_on_kfreebsd.patch (added)
+++ trunk/boinc/debian/patches/101_fix_memory_detection_on_kfreebsd.patch Thu Dec 20 05:06:04 2007
@@ -1,0 +1,142 @@
+This patch fixes:
+http://bugs.debian.org/456586
+http://boinc.berkeley.edu/trac/ticket/521
+
+Index: boinc-5.10.30/client/hostinfo_unix.C
+===================================================================
+--- boinc-5.10.30.orig/client/hostinfo_unix.C	2007-10-24 21:12:05.000000000 +0200
++++ boinc-5.10.30/client/hostinfo_unix.C	2007-12-20 05:46:30.000000000 +0100
+@@ -105,6 +105,11 @@
+ #include <machine/cpuconf.h>
+ #endif
+ 
++// The following is intended to be true both on Linux
++// and Debian GNU/kFreeBSD (see trac #521)
++//
++#define LINUX_LIKE_SYSTEM defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++
+ // functions to get name/addr of local host
+ 
+ // Converts a int ip address to a string representation (i.e. "66.218.71.198")
+@@ -132,7 +137,7 @@
+     time_data = localtime( &cur_time );
+     // tm_gmtoff is already adjusted for daylight savings time
+     return time_data->tm_gmtoff;
+-#elif defined(linux)
++#elif LINUX_LIKE_SYSTEM
+     return -1*(__timezone);
+ #elif defined(__CYGWIN32__)
+     return -1*(_timezone);
+@@ -173,7 +178,7 @@
+   CFRelease(list);
+   return(retval);
+ 
+-#elif defined(linux)
++#elif LINUX_LIKE_SYSTEM
+     bool    retval = false;
+ 
+     FILE* fapm = fopen("/proc/apm", "r");
+@@ -237,7 +242,7 @@
+ #endif
+ }
+ 
+-#ifdef linux
++#if LINUX_LIKE_SYSTEM
+ static void parse_meminfo_linux(HOST_INFO& host) {
+     char buf[256];
+     double x;
+@@ -449,7 +454,7 @@
+     strlcpy(host.p_model, model_buf, sizeof(host.p_model));
+     fclose(f);
+ }
+-#endif  // linux
++#endif  // LINUX_LIKE_SYSTEM
+ 
+ #ifdef __APPLE__
+ static void get_cpu_info_maxosx(HOST_INFO& host) {
+@@ -520,7 +525,7 @@
+     get_filesystem_info(d_total, d_free);
+ 
+ ///////////// p_vendor, p_model, p_features /////////////////
+-#ifdef linux
++#if LINUX_LIKE_SYSTEM
+     parse_cpuinfo_linux(*this);
+ #elif defined( __APPLE__)
+     int mib[2];
+@@ -604,7 +609,7 @@
+         DosQuerySysInfo( QSV_TOTAVAILMEM, QSV_TOTAVAILMEM, &ulMem, sizeof(ulMem));
+         m_swap = ulMem;
+     }
+-#elif defined(linux)
++#elif LINUX_LIKE_SYSTEM
+     parse_meminfo_linux(*this);
+ #elif defined(_SC_USEABLE_MEMORY)
+     // UnixWare
+Index: boinc-5.10.30/client/main.C
+===================================================================
+--- boinc-5.10.30.orig/client/main.C	2007-11-13 17:47:35.000000000 +0100
++++ boinc-5.10.30/client/main.C	2007-12-20 05:46:30.000000000 +0100
+@@ -564,6 +564,8 @@
+ int main(int argc, char** argv) {
+     int retval = 0;
+ 
++    // TODO: clean up the following
++    //
+ #ifdef _WIN32
+     int i, len;
+     char *commandLine;
+@@ -627,13 +629,20 @@
+             break;
+         }
+     }
+-#elif defined linux
++#elif defined(__APPLE__)
++    // If the real user ID is root, we are executing as a daemon
++    if (getuid() == (uid_t)0) {
++        gstate.executing_as_daemon = true;
++    }
++#elif defined __EMX__
++#else
++    // non-Apple Unix
+     int i;
+     
+     for (i=1; i<argc; i++) {
+         if (strcmp(argv[i], "-daemon") == 0 || strcmp(argv[i], "--daemon") == 0) {
+             syslog(LOG_DAEMON|LOG_INFO,
+-                "Starting Boinc-Daemon, listening on port %d.", GUI_RPC_PORT
++                "Starting BOINC as daemon, listening on port %d.", GUI_RPC_PORT
+             );
+             // from <unistd.h>:
+             // Detach from the controlling terminal and run in the background as system daemon.
+@@ -643,9 +652,6 @@
+             break;
+         }
+     }
+-#elif defined(__APPLE__)
+-    if (getuid() == (uid_t)0)       // If the real user ID is root, we are executing as a daemon
+-        gstate.executing_as_daemon = true;
+ #endif
+ 
+     init_core_client(argc, argv);
+@@ -720,7 +726,7 @@
+             "To change ownership/permission, reinstall BOINC"
+ #ifdef __APPLE__
+             " or run\n the shell script Mac_SA_Secure.sh"
+-#elif defined linux
++#else
+             " or run\n the shell script secure.sh"
+ #endif
+             ". (Error code %d)\n", i
+Index: boinc-5.10.30/configure.ac
+===================================================================
+--- boinc-5.10.30.orig/configure.ac	2007-11-13 19:37:02.000000000 +0100
++++ boinc-5.10.30/configure.ac	2007-12-20 05:46:30.000000000 +0100
+@@ -230,7 +230,7 @@
+ dnl than subtract them.  If you need to remove something from the list above,
+ dnl please add it to the lists below...
+ case ${target} in
+-	*-linux*)	STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl"
++	*-linux*|*-k*bsd*-gnu)	STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl"
+ 	;;
+ 	*-solaris*)	STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto"
+ 	;;

Modified: trunk/boinc/debian/patches/201_missing_headers_for_gcc4.3.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/201_missing_headers_for_gcc4.3.patch?rev=784&op=diff
==============================================================================
--- trunk/boinc/debian/patches/201_missing_headers_for_gcc4.3.patch (original)
+++ trunk/boinc/debian/patches/201_missing_headers_for_gcc4.3.patch Thu Dec 20 05:06:04 2007
@@ -1,7 +1,7 @@
-Index: boinc/db/db_base.h
+Index: boinc-5.10.30/db/db_base.h
 ===================================================================
---- boinc/db/db_base.h	(revision 14381)
-+++ boinc/db/db_base.h	(working copy)
+--- boinc-5.10.30.orig/db/db_base.h	2007-02-13 22:41:07.000000000 +0100
++++ boinc-5.10.30/db/db_base.h	2007-12-20 05:53:11.000000000 +0100
 @@ -20,6 +20,9 @@
  #ifndef _DB_BASE_
  #define _DB_BASE_
@@ -12,10 +12,10 @@
  #include <mysql.h>
  
  // if SQL columns are not 'not null', you must use these safe_atoi, safe_atof
-Index: boinc/sched/edf_sim.C
+Index: boinc-5.10.30/sched/edf_sim.C
 ===================================================================
---- boinc/sched/edf_sim.C	(revision 14381)
-+++ boinc/sched/edf_sim.C	(working copy)
+--- boinc-5.10.30.orig/sched/edf_sim.C	2007-05-10 23:50:52.000000000 +0200
++++ boinc-5.10.30/sched/edf_sim.C	2007-12-20 05:53:11.000000000 +0100
 @@ -19,6 +19,7 @@
  
  #include <vector>
@@ -24,10 +24,10 @@
  
  #include "edf_sim.h"
  
-Index: boinc/sched/edf_sim.h
+Index: boinc-5.10.30/sched/edf_sim.h
 ===================================================================
---- boinc/sched/edf_sim.h	(revision 14381)
-+++ boinc/sched/edf_sim.h	(working copy)
+--- boinc-5.10.30.orig/sched/edf_sim.h	2007-05-10 18:23:10.000000000 +0200
++++ boinc-5.10.30/sched/edf_sim.h	2007-12-20 05:53:11.000000000 +0100
 @@ -20,6 +20,7 @@
  #ifndef _EDF_SIM_H
  #define _EDF_SIM_H
@@ -36,10 +36,10 @@
  #include <vector>
  
  struct IP_RESULT {
-Index: boinc/sched/validator.C
+Index: boinc-5.10.30/sched/validator.C
 ===================================================================
---- boinc/sched/validator.C	(revision 14381)
-+++ boinc/sched/validator.C	(working copy)
+--- boinc-5.10.30.orig/sched/validator.C	2007-05-11 18:30:13.000000000 +0200
++++ boinc-5.10.30/sched/validator.C	2007-12-20 05:53:11.000000000 +0100
 @@ -37,6 +37,7 @@
  
  #include "config.h"
@@ -48,10 +48,10 @@
  #include <cmath>
  #include <vector>
  
-Index: boinc/sched/sched_locality.C
+Index: boinc-5.10.30/sched/sched_locality.C
 ===================================================================
---- boinc/sched/sched_locality.C	(revision 14381)
-+++ boinc/sched/sched_locality.C	(working copy)
+--- boinc-5.10.30.orig/sched/sched_locality.C	2007-05-31 20:14:45.000000000 +0200
++++ boinc-5.10.30/sched/sched_locality.C	2007-12-20 05:53:11.000000000 +0100
 @@ -39,6 +39,8 @@
  #include "sched_locality.h"
  #include "sched_util.h"
@@ -61,10 +61,10 @@
  #include <vector>
  #include <string>
  #include <cstring>
-Index: boinc/lib/crypt.C
+Index: boinc-5.10.30/lib/crypt.C
 ===================================================================
---- boinc/lib/crypt.C	(revision 14381)
-+++ boinc/lib/crypt.C	(working copy)
+--- boinc-5.10.30.orig/lib/crypt.C	2006-12-19 21:49:12.000000000 +0100
++++ boinc-5.10.30/lib/crypt.C	2007-12-20 05:53:11.000000000 +0100
 @@ -26,6 +26,7 @@
  #include <cctype>
  #include <cstdio>
@@ -73,10 +73,10 @@
  #endif
  
  #include "md5_file.h"
-Index: boinc/lib/parse.h
+Index: boinc-5.10.30/lib/parse.h
 ===================================================================
---- boinc/lib/parse.h	(revision 14381)
-+++ boinc/lib/parse.h	(working copy)
+--- boinc-5.10.30.orig/lib/parse.h	2007-08-18 02:45:03.000000000 +0200
++++ boinc-5.10.30/lib/parse.h	2007-12-20 05:53:11.000000000 +0100
 @@ -25,6 +25,7 @@
  #else
  #include <cstdio>
@@ -85,10 +85,10 @@
  #include <string>
  #include <math.h>
  #ifdef solaris
-Index: boinc/lib/procinfo_unix.C
+Index: boinc-5.10.30/lib/procinfo_unix.C
 ===================================================================
---- boinc/lib/procinfo_unix.C	(revision 14381)
-+++ boinc/lib/procinfo_unix.C	(working copy)
+--- boinc-5.10.30.orig/lib/procinfo_unix.C	2007-03-21 00:12:22.000000000 +0100
++++ boinc-5.10.30/lib/procinfo_unix.C	2007-12-20 05:53:11.000000000 +0100
 @@ -29,6 +29,7 @@
  
  #include <stdio.h>
@@ -97,10 +97,10 @@
  #include <ctype.h>
  #include <sys/types.h>
  #include <dirent.h>
-Index: boinc/client/cs_account.C
+Index: boinc-5.10.30/client/cs_account.C
 ===================================================================
---- boinc/client/cs_account.C	(revision 14381)
-+++ boinc/client/cs_account.C	(working copy)
+--- boinc-5.10.30.orig/client/cs_account.C	2007-05-14 21:18:45.000000000 +0200
++++ boinc-5.10.30/client/cs_account.C	2007-12-20 05:53:11.000000000 +0100
 @@ -23,6 +23,7 @@
  
  #ifndef _WIN32
@@ -109,10 +109,10 @@
  #include <cstdio>
  #include <cassert>
  #ifdef HAVE_SYS_STAT_H
-Index: boinc/client/client_msgs.C
+Index: boinc-5.10.30/client/client_msgs.C
 ===================================================================
---- boinc/client/client_msgs.C	(revision 14381)
-+++ boinc/client/client_msgs.C	(working copy)
+--- boinc-5.10.30.orig/client/client_msgs.C	2006-06-22 21:40:30.000000000 +0200
++++ boinc-5.10.30/client/client_msgs.C	2007-12-20 05:53:11.000000000 +0100
 @@ -22,6 +22,7 @@
  #else
  #include "config.h"

Modified: trunk/boinc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/series?rev=784&op=diff
==============================================================================
--- trunk/boinc/debian/patches/series (original)
+++ trunk/boinc/debian/patches/series Thu Dec 20 05:06:04 2007
@@ -2,4 +2,5 @@
 002_remove_hardcoded_optimization.patch
 003_use_sensible-browser.patch
 004_exclude_sea.patch
+101_fix_memory_detection_on_kfreebsd.patch
 201_missing_headers_for_gcc4.3.patch




More information about the pkg-boinc-commits mailing list