r855 - in /branches/boinc/etch-backports/debian: boinc-client.init boinc-client.install boinc-client.udev changelog compat control extra/udev-cpu_share patches/101_fix_memory_detection_on_kfreebsd.patch rules watch

fst at users.alioth.debian.org fst at users.alioth.debian.org
Mon Feb 25 10:24:34 UTC 2008 

Author: fst
Date: Mon Feb 25 10:24:34 2008
New Revision: 855

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=855
Log:
Merged from the trunk branch and resolved conflicts:
svn merge -r 831:853 svn+ssh://fst@svn.debian.org/svn/pkg-boinc/trunk/boinc .

Added:
    branches/boinc/etch-backports/debian/boinc-client.udev
      - copied unchanged from r853, trunk/boinc/debian/boinc-client.udev
    branches/boinc/etch-backports/debian/extra/udev-cpu_share
      - copied unchanged from r853, trunk/boinc/debian/extra/udev-cpu_share
Modified:
    branches/boinc/etch-backports/debian/boinc-client.init
    branches/boinc/etch-backports/debian/boinc-client.install
    branches/boinc/etch-backports/debian/changelog
    branches/boinc/etch-backports/debian/compat
    branches/boinc/etch-backports/debian/control
    branches/boinc/etch-backports/debian/patches/101_fix_memory_detection_on_kfreebsd.patch
    branches/boinc/etch-backports/debian/rules
    branches/boinc/etch-backports/debian/watch

Modified: branches/boinc/etch-backports/debian/boinc-client.init
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/boinc-client.init?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/boinc-client.init (original)
+++ branches/boinc/etch-backports/debian/boinc-client.init Mon Feb 25 10:24:34 2008
@@ -11,7 +11,7 @@
 ### END INIT INFO
 
 # Debian init.d script for the BOINC core client
-# Copyright © 2005, 2006, 2007
+# Copyright © 2005, 2006, 2007, 2008
 # Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 #
 # This file is licensed under the terms of the GNU General Public License,
@@ -148,6 +148,13 @@
         schedtool $children
       fi
     fi
+
+    # Display $BOINC_USER's cpu_share:
+    uid=`id -u $BOINC_USER`
+    cpu_share_file="/sys/kernel/uids/$uid/cpu_share"
+    if [ -f "$cpu_share_file" ]; then
+      log_success_msg "cpu_share: `cat "$cpu_share_file"`"
+    fi
   else
     log_success_msg "$STATUS stopped."
   fi

Modified: branches/boinc/etch-backports/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/boinc-client.install?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/boinc-client.install (original)
+++ branches/boinc/etch-backports/debian/boinc-client.install Mon Feb 25 10:24:34 2008
@@ -1,6 +1,7 @@
 debian/bug/boinc-client/script      usr/share/bug/boinc-client
 debian/conffiles/*                  etc/boinc-client
 debian/extra/bash/*                 etc/bash_completion.d
+debian/extra/udev-cpu_share         usr/share/boinc-client
 debian/extra/update-boinc-applinks  usr/bin
 debian/overrides/boinc-client       usr/share/lintian/overrides
 debian/tmp/usr/bin/switcher         usr/lib/boinc-client

Modified: branches/boinc/etch-backports/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/changelog?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/changelog (original)
+++ branches/boinc/etch-backports/debian/changelog Mon Feb 25 10:24:34 2008
@@ -1,8 +1,69 @@
-boinc (5.10.30-5~bpo40+1) etch-backports; urgency=low
+boinc (5.10.42-1~bpo40+1) etch-backports; urgency=low
 
   * Rebuild for Etch backports.
 
- -- Frank S. Thomas <fst at debian.org>  Tue, 08 Jan 2008 17:39:24 +0100
+ -- Frank S. Thomas <fst at debian.org>  Mon, 25 Feb 2008 11:22:19 +0100
+
+boinc (5.10.42-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+  * debian/rules: Make the scripts /usr/share/bug/boinc-client/script and
+    /usr/share/doc/boinc-manager/examples/run-boincmgr executable because
+    they have a shebang. Thanks Lintian for noticing this.
+  * debian/patches/: Updated 101_fix_memory_detection_on_kfreebsd.patch for
+    the new release.
+  * debian/watch: Only check for versions with an even minor version number.
+    Versions with an odd minor version number are test releases which are not
+    intended for a wider audience.
+  * Reverted the debhelper compat level bump. It was just unnecessary (boinc
+    does not need V6) and it would have made backporting harder.
+  * Merged the workaround from Ubuntu's 5.10.30-5ubuntu3 for Linux's new CFS
+    with the following changes:
+    - Renamed debian/extra/udev-usr_share to debian/extra/udev-cpu_share
+      because this name seems to be more appropriate since this script changes
+      the boinc user's cpu_share.
+    - Install udev-cpu_share into /usr/share/boinc-client instead of
+      /usr/lib/boinc-client since it is an architecture-independent shell
+      script.
+    - Use lowercase variables in the init script because UID is set by bash
+      and it complains when trying to overwrite it.
+    Thanks to Daniel Hahler <daniel at thequod.de> for investigating this issue
+    and the patch. (closes: #461630)
+
+ -- Frank S. Thomas <fst at debian.org>  Mon, 25 Feb 2008 00:53:20 +0100
+
+boinc (5.10.30-5ubuntu3) hardy; urgency=low
+
+  * Install /usr/lib/boinc-client/udev-usr_share with correct perms
+    (executable), so that it gets called by udevd.
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Mon, 04 Feb 2008 00:40:08 +0100
+
+boinc (5.10.30-5ubuntu2) hardy; urgency=low
+
+  * Revert changes from ubuntu1 and instead use the uevent udev
+    interface to assign the lowest possible cpu_share to the
+    boinc user. This is still considered to be a workaround.
+    - Add debian/boinc-client.udev
+    - debian/rules: call dh_installudev
+    - Add debian/extra/udev-usr_share, which gets run by udevd
+    - Drop debian/patches/ubuntu_temp_cfs_fix.patch
+  * debian/boinc-client.init: Display cpu_share info for "status"
+    action
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 02 Feb 2008 23:32:25 +0100
+
+boinc (5.10.30-5ubuntu1) hardy; urgency=low
+
+  * debian/patches/ubuntu_temp_cfs_fix.patch:
+    Temporary workaround for the new CFS Linux scheduler,
+    by adjusting the "boinc" user's cpu_share to the minimum (2)
+    in the init script (LP: #177713)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 02 Feb 2008 02:48:01 +0100
 
 boinc (5.10.30-5) unstable; urgency=low
 

Modified: branches/boinc/etch-backports/debian/compat
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/compat?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/compat (original)
+++ branches/boinc/etch-backports/debian/compat Mon Feb 25 10:24:34 2008
@@ -1,1 +1,1 @@
-6
+5

Modified: branches/boinc/etch-backports/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/control?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/control (original)
+++ branches/boinc/etch-backports/debian/control Mon Feb 25 10:24:34 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <fst at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 6), quilt (>= 0.40), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libxml2-utils, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.15.5), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libxml2-utils, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.15.5), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
 Homepage: http://boinc.berkeley.edu
 Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/

Modified: branches/boinc/etch-backports/debian/patches/101_fix_memory_detection_on_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/patches/101_fix_memory_detection_on_kfreebsd.patch?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/patches/101_fix_memory_detection_on_kfreebsd.patch (original)
+++ branches/boinc/etch-backports/debian/patches/101_fix_memory_detection_on_kfreebsd.patch Mon Feb 25 10:24:34 2008
@@ -2,11 +2,11 @@
 http://bugs.debian.org/456586
 http://boinc.berkeley.edu/trac/ticket/521
 
-Index: boinc-5.10.30/client/hostinfo_unix.C
+Index: b/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 @@
+--- a/client/hostinfo_unix.C
++++ b/client/hostinfo_unix.C
+@@ -107,6 +107,11 @@
  #include <machine/cpuconf.h>
  #endif
  
@@ -18,7 +18,7 @@
  // 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 @@
+@@ -134,7 +139,7 @@
      time_data = localtime( &cur_time );
      // tm_gmtoff is already adjusted for daylight savings time
      return time_data->tm_gmtoff;
@@ -27,7 +27,7 @@
      return -1*(__timezone);
  #elif defined(__CYGWIN32__)
      return -1*(_timezone);
-@@ -173,7 +178,7 @@
+@@ -175,7 +180,7 @@
    CFRelease(list);
    return(retval);
  
@@ -36,7 +36,7 @@
      bool    retval = false;
  
      FILE* fapm = fopen("/proc/apm", "r");
-@@ -237,7 +242,7 @@
+@@ -239,7 +244,7 @@
  #endif
  }
  
@@ -45,7 +45,7 @@
  static void parse_meminfo_linux(HOST_INFO& host) {
      char buf[256];
      double x;
-@@ -449,7 +454,7 @@
+@@ -451,7 +456,7 @@
      strlcpy(host.p_model, model_buf, sizeof(host.p_model));
      fclose(f);
  }
@@ -54,7 +54,7 @@
  
  #ifdef __APPLE__
  static void get_cpu_info_maxosx(HOST_INFO& host) {
-@@ -520,7 +525,7 @@
+@@ -522,7 +527,7 @@
      get_filesystem_info(d_total, d_free);
  
  ///////////// p_vendor, p_model, p_features /////////////////
@@ -63,7 +63,7 @@
      parse_cpuinfo_linux(*this);
  #elif defined( __APPLE__)
      int mib[2];
-@@ -604,7 +609,7 @@
+@@ -606,7 +611,7 @@
          DosQuerySysInfo( QSV_TOTAVAILMEM, QSV_TOTAVAILMEM, &ulMem, sizeof(ulMem));
          m_swap = ulMem;
      }
@@ -72,10 +72,10 @@
      parse_meminfo_linux(*this);
  #elif defined(_SC_USEABLE_MEMORY)
      // UnixWare
-Index: boinc-5.10.30/client/main.C
+Index: b/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
+--- a/client/main.C
++++ b/client/main.C
 @@ -564,6 +564,8 @@
  int main(int argc, char** argv) {
      int retval = 0;
@@ -108,17 +108,7 @@
              );
              // 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 @@
+@@ -717,7 +726,7 @@
              "To change ownership/permission, reinstall BOINC"
  #ifdef __APPLE__
              " or run\n the shell script Mac_SA_Secure.sh"
@@ -127,10 +117,10 @@
              " or run\n the shell script secure.sh"
  #endif
              ". (Error code %d)\n", i
-Index: boinc-5.10.30/configure.ac
+Index: b/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
+--- a/configure.ac
++++ b/configure.ac
 @@ -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...

Modified: branches/boinc/etch-backports/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/rules?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/rules (original)
+++ branches/boinc/etch-backports/debian/rules Mon Feb 25 10:24:34 2008
@@ -207,18 +207,14 @@
 	
 	dh_install -a
 	
-	#
-	# boinc-client
-	#
+	# Install files for the boinc-client package.
 	install -D client/boinc_client.optimized \
 	  debian/boinc-client/usr/bin/boinc_client
 	
 	install -D lib/boinccmd.unmodified \
 	  debian/boinc-client/usr/bin/boinc_cmd
 	
-	#
-	# boinc-manager
-	#
+	# Install files for the boinc-manager package.
 	install -D clientgui/boincmgr.unmodified \
 	  debian/boinc-manager/usr/bin/boincmgr
 	
@@ -243,11 +239,16 @@
 	dh_desktop -a
 	dh_installinit -a
 	dh_installman -a
+	dh_installudev -a
 	dh_buildinfo -a
 	dh_link -a
 	dh_strip -a --dbg-package=boinc-dbg
 	dh_compress -a
 	dh_fixperms -a
+	chmod 755 \
+	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
+	  debian/boinc-client/usr/share/bug/boinc-client/script \
+	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a

Modified: branches/boinc/etch-backports/debian/watch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/etch-backports/debian/watch?rev=855&op=diff
==============================================================================
--- branches/boinc/etch-backports/debian/watch (original)
+++ branches/boinc/etch-backports/debian/watch Mon Feb 25 10:24:34 2008
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/_/\./g;s/\///" \
-  http://boinc.berkeley.edu/svn/tags/boinc_core_release_(.*)
+  http://boinc.berkeley.edu/svn/tags/boinc_core_release_(\d+_\d*[02468]_.*)

More information about the pkg-boinc-commits mailing list