r613 - in /trunk/boinc: clientgui/ debian/ debian/conffiles/
debian/extra/ debian/manpages/ debian/patches/
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Mon Apr 9 22:08:49 UTC 2007
Author: fst-guest
Date: Mon Apr 9 22:08:46 2007
New Revision: 613
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=613
Log:
Moved branch/experimental/boinc (which is at 5.8.15) to trunk/boinc and updated to 5.8.17.
Added:
trunk/boinc/debian/boinc-client.NEWS
trunk/boinc/debian/boinc-client.preinst
trunk/boinc/debian/boinc-manager.examples
trunk/boinc/debian/conffiles/cc_config.xml
trunk/boinc/debian/extra/run-boincmgr (with props)
trunk/boinc/debian/patches/001_amd64_disable_platform_reset.patch
trunk/boinc/debian/patches/003_use_sensible-browser.patch
trunk/boinc/debian/patches/004_exclude_sea.patch
trunk/boinc/debian/patches/101_gcc_4.3_fixes.patch
trunk/boinc/debian/patches/README.patches
trunk/boinc/debian/patches/series
Removed:
trunk/boinc/clientgui/
trunk/boinc/debian/conffiles/log_flags.xml
trunk/boinc/debian/patches/00list
trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
trunk/boinc/debian/patches/07_use-sensible-browser.dpatch
trunk/boinc/debian/patches/10_exclude-sea.dpatch
Modified:
trunk/boinc/debian/boinc-client.README.Debian
trunk/boinc/debian/boinc-client.install
trunk/boinc/debian/boinc-client.postinst
trunk/boinc/debian/boinc-client.postrm
trunk/boinc/debian/boinc-dev.install
trunk/boinc/debian/boinc-dev.links
trunk/boinc/debian/changelog
trunk/boinc/debian/control
trunk/boinc/debian/copyright
trunk/boinc/debian/extra/move-boinc-dir.sh
trunk/boinc/debian/manpages/boinc_cmd.xml
trunk/boinc/debian/manpages/boincmgr.xml
trunk/boinc/debian/rules
Added: trunk/boinc/debian/boinc-client.NEWS
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.NEWS?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/boinc-client.NEWS (added)
+++ trunk/boinc/debian/boinc-client.NEWS Mon Apr 9 22:08:46 2007
@@ -1,0 +1,17 @@
+boinc (5.8.17-1) unstable; urgency=low
+
+ The configuration file "log_flags.xml" of the BOINC 5.4 series was renamed
+ during the development of the 5.6 series to "cc_config.xml". Also the
+ syntax of this file was changed.
+
+ If you have made local changes to /etc/boinc-client/log_flags.xml you may
+ want to migrate those changes to the new /etc/boinc-client/cc_config.xml.
+ See http://boinc.berkeley.edu/client_msgs.php for full list of available
+ configuration options and a description of it's format.
+
+ After updating the new /etc/boinc-client/cc_config.xml file, it is safe to
+ remove the old /etc/boinc-client/log_flags.xml.dpkg-bak from your system.
+ If you did not changed the old configuration file locally, it will be
+ removed from your system automatically by the boinc-client package.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Wed, 14 Mar 2007 12:57:01 +0100
Modified: trunk/boinc/debian/boinc-client.README.Debian
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.README.Debian?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.README.Debian (original)
+++ trunk/boinc/debian/boinc-client.README.Debian Mon Apr 9 22:08:46 2007
@@ -12,6 +12,8 @@
2. Installing and configuring BOINC application packages
3. Moving a BOINC data directory to /var/lib/boinc-client
4. Making the BOINC core client usable on AMD64
+ 5. Mass deployment of boinc-client that automatically attach to an
+ Account Manager
1. Configuring the BOINC core client
@@ -82,8 +84,8 @@
% ln -s /etc/boinc-client/gui_rpc_auth.cfg /var/lib/boinc-client/gui_rpc_auth.cfg
Repeat the last step for the following configuration files if they
- exist in your old BOINC data directory: 'global_prefs_override.xml',
- 'log_flags.xml', and 'remote_hosts.cfg'
+ exist in your old BOINC data directory: 'cc_config.xml',
+ 'global_prefs_override.xml' and 'remote_hosts.cfg'
5. Start the BOINC core client again:
% /etc/init.d/boinc-client start
@@ -123,3 +125,18 @@
4. Start the BOINC core client again:
% /etc/init.d/boinc-client start
+
+
+5. Mass deployment of boinc-client that automatically attach to an
+------------------------------------------------------------------
+ Account Manager
+ ---------------
+
+With small modifications to the boinc-client package it is possible
+to make it automatically attach to an Account Manager which aids in
+mass deployment of the BOINC client over a network of hosts.
+
+For specific instructions consult this message and the attached
+cookdiff.patch:
+
+ http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2007-March/000553.html
Modified: trunk/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.install?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.install (original)
+++ trunk/boinc/debian/boinc-client.install Mon Apr 9 22:08:46 2007
@@ -1,7 +1,8 @@
+debian/conffiles/cc_config.xml etc/boinc-client
debian/conffiles/global_prefs_override.xml etc/boinc-client
debian/conffiles/gui_rpc_auth.cfg etc/boinc-client
-debian/conffiles/log_flags.xml etc/boinc-client
debian/conffiles/remote_hosts.cfg etc/boinc-client
debian/extra/update-boinc-applinks usr/bin
debian/overrides/boinc-client usr/share/lintian/overrides
debian/tmp/usr/bin/boinc_cmd usr/bin
+debian/tmp/usr/bin/switcher usr/lib/boinc-client
Modified: trunk/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.postinst?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.postinst (original)
+++ trunk/boinc/debian/boinc-client.postinst Mon Apr 9 22:08:46 2007
@@ -15,7 +15,15 @@
mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
fi
ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
- chown boinc:boinc "$BOINC_DIR/$1"
+}
+
+ch_stat()
+{
+ # Don't do anything if an override exists.
+ if ! dpkg-statoverride --list "$3" >/dev/null 2>&1; then
+ chmod "$1" "$3"
+ chown "$2" "$3"
+ fi
}
case "$1" in
@@ -34,14 +42,30 @@
# Make sure the /var/lib/boinc-client directory exists and
# is owned by the boinc user.
mkdir $BOINC_DIR 2>/dev/null || true
- chown boinc:boinc $BOINC_DIR 2>/dev/null || true
+ chown -h boinc:boinc $BOINC_DIR 2>/dev/null || true
# Move old configuration files to /etc/boinc-client/ and
# create symlinks for the BOINC core client.
+ mv_conffile cc_config.xml
mv_conffile global_prefs_override.xml
mv_conffile gui_rpc_auth.cfg
- mv_conffile log_flags.xml
mv_conffile remote_hosts.cfg
+
+ # Set reasonable permissions for boinc-client's conffiles (see #407678)
+ # but only if no 'stat override' exists.
+ ch_stat 0644 root:boinc "$CONF_DIR/cc_config.xml"
+ ch_stat 0644 root:boinc "$CONF_DIR/global_prefs_override.xml"
+ ch_stat 0640 root:boinc "$CONF_DIR/gui_rpc_auth.cfg"
+ ch_stat 0644 root:boinc "$CONF_DIR/remote_hosts.cfg"
+
+ # Make a symlink to ca-certificates certs file. BOINC's original file
+ # is in curl/ca-bundle.crt (which is not in our tarball, because the
+ # export-boinc script removes the curl dir).
+ CA_FILE=/etc/ssl/certs/ca-certificates.crt
+ CA_LINK="$BOINC_DIR/ca-bundle.crt"
+ if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+ ln -sf $CA_FILE $CA_LINK
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/boinc/debian/boinc-client.postrm
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.postrm?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.postrm (original)
+++ trunk/boinc/debian/boinc-client.postrm Mon Apr 9 22:08:46 2007
@@ -3,8 +3,10 @@
set -e
-# Source the debconf shell library.
-. /usr/share/debconf/confmodule
+# Source the debconf shell library if it is available.
+if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+fi
BOINC_DIR=/var/lib/boinc-client
@@ -24,7 +26,7 @@
case "$1" in
purge)
db_input high boinc-client/remove_boinc_dir || true
- db_go
+ db_go || true
db_get boinc-client/remove_boinc_dir || true
if [ "$RET" = "true" ]; then
rm_boinc_dir
Added: trunk/boinc/debian/boinc-client.preinst
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.preinst?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/boinc-client.preinst (added)
+++ trunk/boinc/debian/boinc-client.preinst Mon Apr 9 22:08:46 2007
@@ -1,0 +1,52 @@
+#!/bin/sh
+# preinst script for boinc-client
+
+set -e
+
+BOINC_DIR=/var/lib/boinc-client
+CONF_DIR=/etc/boinc-client
+
+# Remove a no-longer used conffile.
+# from http://wiki.debian.org/DpkgConffileHandling
+rm_conffile()
+{
+ CONFFILE="$CONF_DIR/$1"
+ SYMLINK="$BOINC_DIR/$1"
+
+ if [ -e "$CONFFILE" ]; then
+ cur_md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+ if [ "$cur_md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+
+ if [ -L "$SYMLINK" ]; then
+ rm -f "$SYMLINK"
+ fi
+}
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" le "5.4.11-5"; then
+ rm_conffile log_flags.xml
+ fi
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/boinc/debian/boinc-dev.install
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-dev.install?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-dev.install (original)
+++ trunk/boinc/debian/boinc-dev.install Mon Apr 9 22:08:46 2007
@@ -5,9 +5,5 @@
api/reduce.h usr/include/BOINC/api
api/boinc_gl.h usr/include/BOINC/api
api/txf_util.h usr/include/BOINC/api
-lib/error_numbers.h usr/include/BOINC/lib
-lib/gui_rpc_client.h usr/include/BOINC/lib
-lib/std_fixes.h usr/include/BOINC/lib
+lib/md5_file.h usr/include/BOINC/lib
Makefile.am usr/share/boinc-dev
-config.h usr/share/boinc-dev
-version.h usr/share/boinc-dev
Modified: trunk/boinc/debian/boinc-dev.links
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-dev.links?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-dev.links (original)
+++ trunk/boinc/debian/boinc-dev.links Mon Apr 9 22:08:46 2007
@@ -7,8 +7,9 @@
usr/include/BOINC/boinc_win.h usr/share/boinc-dev/lib/boinc_win.h
usr/include/BOINC/crypt.h usr/share/boinc-dev/lib/crypt.h
usr/include/BOINC/diagnostics.h usr/share/boinc-dev/lib/diagnostics.h
-usr/include/BOINC/exception.h usr/share/boinc-dev/lib/exception.h
+usr/include/BOINC/error_numbers.h usr/share/boinc-dev/lib/error_numbers.h
usr/include/BOINC/filesys.h usr/share/boinc-dev/lib/filesys.h
+usr/include/BOINC/gui_rpc_client.h usr/share/boinc-dev/lib/gui_rpc_client.h
usr/include/BOINC/hostinfo.h usr/share/boinc-dev/lib/hostinfo.h
usr/include/BOINC/mfile.h usr/share/boinc-dev/lib/mfile.h
usr/include/BOINC/miofile.h usr/share/boinc-dev/lib/miofile.h
@@ -16,14 +17,15 @@
usr/include/BOINC/parse.h usr/share/boinc-dev/lib/parse.h
usr/include/BOINC/prefs.h usr/share/boinc-dev/lib/prefs.h
usr/include/BOINC/proxy_info.h usr/share/boinc-dev/lib/proxy_info.h
+usr/include/BOINC/std_fixes.h usr/share/boinc-dev/lib/std_fixes.h
usr/include/BOINC/util.h usr/share/boinc-dev/lib/util.h
+usr/include/BOINC/config.h usr/share/boinc-dev/config.h
+usr/include/BOINC/version.h usr/share/boinc-dev/version.h
usr/include/BOINC/api/boinc_gl.h usr/share/boinc-dev/api/boinc_gl.h
usr/include/BOINC/api/graphics_data.h usr/share/boinc-dev/api/graphics_data.h
usr/include/BOINC/api/reduce.h usr/share/boinc-dev/api/reduce.h
-usr/include/BOINC/lib/error_numbers.h usr/share/boinc-dev/lib/error_numbers.h
-usr/include/BOINC/lib/gui_rpc_client.h usr/share/boinc-dev/lib/gui_rpc_client.h
-usr/include/BOINC/lib/std_fixes.h usr/share/boinc-dev/lib/std_fixes.h
+usr/include/BOINC/lib/md5_file.h usr/share/boinc-dev/lib/md5_file.h
usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
usr/lib/libboinc_api.a usr/share/boinc-dev/api/libboinc_api.a
Added: trunk/boinc/debian/boinc-manager.examples
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-manager.examples?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/boinc-manager.examples (added)
+++ trunk/boinc/debian/boinc-manager.examples Mon Apr 9 22:08:46 2007
@@ -1,0 +1,1 @@
+debian/extra/run-boincmgr
Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Mon Apr 9 22:08:46 2007
@@ -1,3 +1,65 @@
+boinc (5.8.17) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * New upstream release.
+ - BM: Display project names in the "Reset Project" dialog correctly.
+ (LP: #83708)
+ - BM: Fixed run mode entries in the "Activity" menu. (LP: #93850)
+ * debian/control:
+ - Bumped versioned Build-Depends on libcurl3-openssl-dev to >= 7.15.5
+ which is required for the bandwith-throttling feature. Also removed the
+ alternative on libcurl-ssl-dev because this was only added to aid
+ backporting BOINC to sarge but sarge has only libcurl3-dev/7.13.2.
+ - Added libxml2-utils to Build-Depends for xmllint which is used in the
+ unit-test target in debian/rules.
+ * debian/rules:
+ - Added the unit-test target which uses xmllint to check if the XML
+ conffiles cc_config.xml and global_prefs_override.xml are well-formed.
+ - Since backporting to sarge is not possible any more, also removed the
+ compatibility code for sarge's version of dpkg-architecture.
+ * Switched patch system from dpatch to quilt.
+ * debian/patches/:
+ - Updated 001_amd64_disable_platform_reset.patch for the new release.
+ - Updated 003_use_sensible-browser.patch for the new release.
+ - Added 101_gcc_4.3_fixes.patch that fixes a FTBFS with GCC 4.3, thanks to
+ Martin Michlmayr <tbm at cyrius.com>. (closes: #413307)
+ * debian/boinc-client.postinst: Change the permission and ownership of
+ boinc-client's conffiles from 0644 boinc:boinc to 0640 root:boinc for
+ gui_rpc_auth.cfg and to 0644 root:boinc for the rest but only if no
+ "stat override" exists. (closes: #407678)
+ * debian/boinc-client.postrm: Changed postrm so it does not fail if debconf
+ is not available. (closes: #416663)
+ * Replaced the log_flags.xml conffile with cc_config.xml:
+ - Added debian/boinc-client.preinst which removes the obsolete conffile
+ /etc/boinc-client/log_flags.xml if it was not modified locally or
+ renames it to /etc/boinc-client/log_flags.xml.dpkg-bak if it was.
+ - Added debian/boinc-client.NEWS which explains that the conffile
+ /etc/boinc-client/log_flags.xml is now obsolete and is superseded by
+ /etc/boinc-client/cc_config.xml.
+ * Added the run-boincmgr shell script as example to the boinc-manager
+ package. This script sources /etc/default/boinc-client and chdir into
+ $BOINC_DIR before starting boincmgr so that the BOINC Manager can read the
+ password from $BOINC_DIR/gui_rpc_auth.cfg file. See Ubuntu bug #48768 for
+ more details.
+ * debian/boinc-client.README.Debian: Added paragraph "Mass deployment of
+ boinc-client that automatically attach to an Account Manager" which points
+ (at the moment) to T-Bone's post on the pkg-boinc-devel mailing list.
+ * debian/boinc-client.install: Install the switcher binary into
+ /usr/lib/boinc-client/.
+ * debian/boinc-dev.{install,links}:
+ - Don't install lib/error_numbers.h, lib/gui_rpc_client.h,
+ lib/std_fixes.h, config.h and version.h manually because they are now
+ installed by the upstream makefiles.
+ - Added lib/md5_file.h to boinc-dev as requested by Alex Owen.
+ * Added ca-certificates to boinc-client's Depends field and create the
+ ca-bundle.crt symlink (which points to /etc/ssl/certs/ca-certificates) in
+ Debian's default BOINC data directory (/var/lib/boinc-client/) in
+ boinc-client.postinst.
+ * Updated boinc_cmd's and boincmgr's manual pages for the new release.
+ * Updated debian/copyright for the new release.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 10 Apr 2007 00:04:36 +0200
+
boinc (5.4.11-5) unstable; urgency=low
[ Frank S. Thomas ]
Added: trunk/boinc/debian/conffiles/cc_config.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/conffiles/cc_config.xml?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/conffiles/cc_config.xml (added)
+++ trunk/boinc/debian/conffiles/cc_config.xml Mon Apr 9 22:08:46 2007
@@ -1,0 +1,33 @@
+<cc_config>
+ <options>
+ </options>
+ <log_flags>
+ <task>1</task>
+ <file_xfer>1</file_xfer>
+ <sched_ops>1</sched_ops>
+
+ <cpu_sched>0</cpu_sched>
+ <cpu_sched_debug>0</cpu_sched_debug>
+ <rr_simulation>0</rr_simulation>
+ <debt_debug>0</debt_debug>
+ <task_debug>0</task_debug>
+ <work_fetch_debug>0</work_fetch_debug>
+ <unparsed_xml>0</unparsed_xml>
+ <state_debug>0</state_debug>
+ <file_xfer_debug>0</file_xfer_debug>
+ <sched_op_debug>0</sched_op_debug>
+ <http_debug>0</http_debug>
+ <proxy_debug>0</proxy_debug>
+ <time_debug>0</time_debug>
+ <http_xfer_debug>0</http_xfer_debug>
+ <benchmark_debug>0</benchmark_debug>
+ <poll_debug>0</poll_debug>
+ <guirpc_debug>0</guirpc_debug>
+ <scrsave_debug>0</scrsave_debug>
+ <app_msg_send>0</app_msg_send>
+ <app_msg_receive>0</app_msg_receive>
+ <mem_usage_debug>0</mem_usage_debug>
+ <network_status_debug>0</network_status_debug>
+ <checkpoint_debug>0</checkpoint_debug>
+ </log_flags>
+</cc_config>
Modified: trunk/boinc/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/control?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/control (original)
+++ trunk/boinc/debian/control Mon Apr 9 22:08:46 2007
@@ -4,14 +4,14 @@
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2) | libcurl-ssl-dev, 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
XS-Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/
Package: boinc-client
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser, lsb-base (>= 3.0-6), ca-certificates
Suggests: boinc-app-seti, boinc-manager | kboincspy
Description: core client for the BOINC distributed computing infrastructure
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
Modified: trunk/boinc/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/copyright?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/copyright (original)
+++ trunk/boinc/debian/copyright Mon Apr 9 22:08:46 2007
@@ -8,7 +8,7 @@
Rom Walton <rwalton at ssl.berkeley.edu>
and others, see http://boinc.berkeley.edu/contact.php
-Copyright © 2005 University of California at Berkeley
+Copyright © 2002-2007 University of California at Berkeley
BOINC is licensed under the terms of the LGPL:
@@ -32,6 +32,28 @@
Copyright and license notices for additional software included in this package:
+
+clientgui/common/wxFlatNotebook*
+================================
+
+Author: Eran Ifrah <eranif at bezeqint.net>
+
+Copyright © 2005 Eran Ifrah
+
+License: wxWindows Licence
+(a copy of this license is included below)
+
+
+clientgui/common/wxPieCtrl.cpp, clientgui/common/wxPieCtrl.h
+============================================================
+
+Author: Volodymir (T-Rex) Tryapichko
+
+Copyright © 2005 Volodymir (T-Rex) Tryapichko
+
+License: wxWindows Licence
+(a copy of this license is included below)
+
clientgui/msw/taskbar.cpp, clientgui/msw/taskbar.h
==================================================
@@ -176,8 +198,8 @@
Public License can be found in `/usr/share/common-licenses/GPL'.
-html/inc/paypal_global_config.inc
-=================================
+html/inc/paypal_global_config.inc, html/user/payment_process.php
+================================================================
PHP Toolkit for PayPal v0.50 - http://www.paypal.com/pdn
@@ -941,7 +963,7 @@
own source and binary releases.
-The Debian packaging is © 2004-2006 Debian BOINC Maintainers
+The Debian packaging is © 2004-2007 Debian BOINC Maintainers
<pkg-boinc-devel at lists.alioth.debian.org> and is licensed under
the GPL.
Modified: trunk/boinc/debian/extra/move-boinc-dir.sh
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/extra/move-boinc-dir.sh?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/extra/move-boinc-dir.sh (original)
+++ trunk/boinc/debian/extra/move-boinc-dir.sh Mon Apr 9 22:08:46 2007
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# This script can be used to move an BOINC data directory to Debian's
+# This script can be used to move a BOINC data directory to Debian's
# default location of the BOINC data directory /var/lib/boinc-client.
# Invoke it with the old data directory as it's only argument,
# for example:
# % move-boinc-dir.sh /home/john/BOINC
#
-# Copyright © 2006 Debian BOINC Maintainers
-# <pkg-boinc-devel at lists.alioth.debian.org>
+# Copyright © 2006-2007 Debian BOINC Maintainers
+# <pkg-boinc-devel at lists.alioth.debian.org>
#
# This file is licensed under the terms of the GNU General Public License,
# Version 2 or any later version published by the Free Software Foundation.
@@ -19,7 +19,7 @@
echo "Error: Old BOINC directory not specified."
exit 1
elif [ ! -d "$OLD_DIR" ]; then
- echo "Error: $OLD_DIR does not exists or is not a directory."
+ echo "Error: $OLD_DIR does not exist or is not a directory."
exit 1
fi
@@ -32,7 +32,6 @@
mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
fi
ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
- chown boinc:boinc "$BOINC_DIR/$1" || true
}
# Stop the BOINC core client.
@@ -48,10 +47,16 @@
# Move old configuration files to /etc/boinc-client/ and
# create symlinks for the BOINC core client.
+mv_conffile cc_config.xml
mv_conffile global_prefs_override.xml
mv_conffile gui_rpc_auth.cfg
-mv_conffile log_flags.xml
mv_conffile remote_hosts.cfg
+
+CA_FILE=/etc/ssl/certs/ca-certificates.crt
+CA_LINK="$BOINC_DIR/ca-bundle.crt"
+if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+ ln -sf $CA_FILE $CA_LINK
+fi
# Start the BOINC core client again.
invoke-rc.d boinc-client start
Added: trunk/boinc/debian/extra/run-boincmgr
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/extra/run-boincmgr?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/extra/run-boincmgr (added)
+++ trunk/boinc/debian/extra/run-boincmgr Mon Apr 9 22:08:46 2007
@@ -1,0 +1,14 @@
+#!/bin/sh
+
+# Source the configuration file for the boinc-client init script.
+if [ -e /etc/default/boinc-client ]; then
+ . /etc/default/boinc-client
+fi
+
+# If $BOINC_DIR is empty or if it isn't a directory, set it to the default
+# BOINC data directory.
+if [ -z "$BOINC_DIR" -o ! -d "$BOINC_DIR" ]; then
+ BOINC_DIR=/var/lib/boinc-client
+fi
+
+cd $BOINC_DIR && exec boincmgr "$@"
Propchange: trunk/boinc/debian/extra/run-boincmgr
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/boinc/debian/manpages/boinc_cmd.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/manpages/boinc_cmd.xml?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/manpages/boinc_cmd.xml (original)
+++ trunk/boinc/debian/manpages/boinc_cmd.xml Mon Apr 9 22:08:46 2007
@@ -7,7 +7,7 @@
This file is licensed under the terms of the GNU General Public License,
Version 2 or any later version published by the Free Software Foundation.
- Copyright © 2005, 2006 Debian BOINC Maintainers
+ Copyright © 2005, 2006, 2007 Debian BOINC Maintainers
-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
@@ -17,7 +17,7 @@
<!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
<!ENTITY dhbinary "boinc_cmd">
- <!ENTITY dhdate "<date>July 24, 2006</date>">
+ <!ENTITY dhdate "<date>March 02, 2007</date>">
<!ENTITY debian "<productname>Debian</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
@@ -45,6 +45,7 @@
<copyright>
<year>2005</year>
<year>2006</year>
+ <year>2007</year>
<holder>&dhgroupname;</holder>
</copyright>
&dhdate;
@@ -306,13 +307,6 @@
</varlistentry>
<varlistentry>
- <term><option>--get_run_mode</option></term>
- <listitem>
- <para>Show current run mode.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>
<option>--set_run_mode {always | auto | never}</option>
</term>
@@ -341,13 +335,6 @@
</listitem>
</varlistentry>
</variablelist>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--get_network_mode</option></term>
- <listitem>
- <para>Show current network mode.</para>
</listitem>
</varlistentry>
@@ -481,10 +468,6 @@
</varlistentry>
<varlistentry>
- <term><option>--lookup_account_poll</option></term>
- </varlistentry>
-
- <varlistentry>
<term>
<option>--create_account
<replaceable>url</replaceable>
@@ -493,10 +476,6 @@
<replaceable>name</replaceable>
</option>
</term>
- </varlistentry>
-
- <varlistentry>
- <term><option>--create_account_poll</option></term>
</varlistentry>
<varlistentry>
Modified: trunk/boinc/debian/manpages/boincmgr.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/manpages/boincmgr.xml?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/manpages/boincmgr.xml (original)
+++ trunk/boinc/debian/manpages/boincmgr.xml Mon Apr 9 22:08:46 2007
@@ -17,7 +17,7 @@
<!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
<!ENTITY dhbinary "boincmgr">
- <!ENTITY dhdate "<date>January 27, 2006</date>">
+ <!ENTITY dhdate "<date>August 12, 2006</date>">
<!ENTITY debian "<productname>Debian</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
@@ -90,6 +90,13 @@
visible.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>-insecure, --insecure</option></term>
+ <listitem>
+ <para>Disable BOINC security users and permissions.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
Added: trunk/boinc/debian/patches/001_amd64_disable_platform_reset.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/001_amd64_disable_platform_reset.patch?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/patches/001_amd64_disable_platform_reset.patch (added)
+++ trunk/boinc/debian/patches/001_amd64_disable_platform_reset.patch Mon Apr 9 22:08:46 2007
@@ -1,0 +1,26 @@
+See these mailing lists post for a description of this patch:
+http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000352.html
+http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000350.html
+
+Index: boinc-5.8.15/client/client_state.C
+===================================================================
+--- boinc-5.8.15.orig/client/client_state.C 2007-03-16 18:07:20.000000000 +0100
++++ boinc-5.8.15/client/client_state.C 2007-03-16 18:08:13.000000000 +0100
+@@ -318,6 +318,9 @@
+ // This could happen e.g. if user copies files from PPC to Intel Mac
+ //
+ if (statefile_platform_name.size() && strcmp(platform_name, statefile_platform_name.c_str())) {
++#ifdef __x86_64__
++ platform_name = strdup(statefile_platform_name.c_str());
++#else
+ msg_printf(NULL, MSG_INFO,
+ "Platform changed from %s to %s - resetting projects",
+ statefile_platform_name.c_str(), platform_name
+@@ -326,6 +329,7 @@
+ p = projects[i];
+ reset_project(p);
+ }
++#endif
+ }
+
+ #if (defined(SANDBOX) && ! defined(_WIN32))
Added: trunk/boinc/debian/patches/003_use_sensible-browser.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/003_use_sensible-browser.patch?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/patches/003_use_sensible-browser.patch (added)
+++ trunk/boinc/debian/patches/003_use_sensible-browser.patch Mon Apr 9 22:08:46 2007
@@ -1,0 +1,17 @@
+This patch is Debian-specific. Don't use it for non Debian packages. The
+program "sensible-browser" is part of the essential package debianutils.
+
+Index: boinc-5.8.15/clientgui/hyperlink.cpp
+===================================================================
+--- boinc-5.8.15.orig/clientgui/hyperlink.cpp 2007-03-16 18:07:18.000000000 +0100
++++ boinc-5.8.15/clientgui/hyperlink.cpp 2007-03-16 18:08:16.000000000 +0100
+@@ -171,7 +171,8 @@
+ }
+
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+- if (!wxLaunchDefaultBrowser(strLink)) {
++ wxString cmd = wxT("sensible-browser ") + strLink;
++ if (!::wxExecute(cmd, wxEXEC_ASYNC)) {
+ wxString strDialogTitle = wxEmptyString;
+ wxString strDialogMessage = wxEmptyString;
+
Added: trunk/boinc/debian/patches/004_exclude_sea.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/004_exclude_sea.patch?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/patches/004_exclude_sea.patch (added)
+++ trunk/boinc/debian/patches/004_exclude_sea.patch Mon Apr 9 22:08:46 2007
@@ -1,0 +1,13 @@
+Index: boinc-5.8.15/Makefile.am
+===================================================================
+--- boinc-5.8.15.orig/Makefile.am 2007-03-16 18:07:17.000000000 +0100
++++ boinc-5.8.15/Makefile.am 2007-03-16 18:08:16.000000000 +0100
+@@ -17,7 +17,7 @@
+ endif
+
+ if BUILD_CLIENTGUI
+- CLIENTGUI_SUBDIRS = clientgui sea
++ CLIENTGUI_SUBDIRS = clientgui
+ endif
+
+ # ORDER MATTERS below. One must build dependencies FIRST, then things
Added: trunk/boinc/debian/patches/101_gcc_4.3_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/101_gcc_4.3_fixes.patch?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/patches/101_gcc_4.3_fixes.patch (added)
+++ trunk/boinc/debian/patches/101_gcc_4.3_fixes.patch Mon Apr 9 22:08:46 2007
@@ -1,0 +1,24 @@
+Index: boinc-5.8.15/client/client_state.h
+===================================================================
+--- boinc-5.8.15.orig/client/client_state.h 2007-03-16 18:09:44.000000000 +0100
++++ boinc-5.8.15/client/client_state.h 2007-03-16 18:09:54.000000000 +0100
+@@ -21,6 +21,7 @@
+ #define _CLIENT_STATE_
+
+ #ifndef _WIN32
++#include <string>
+ #include <vector>
+ #include <ctime>
+ #endif
+Index: boinc-5.8.15/lib/boinc_cmd.C
+===================================================================
+--- boinc-5.8.15.orig/lib/boinc_cmd.C 2007-03-16 18:09:59.000000000 +0100
++++ boinc-5.8.15/lib/boinc_cmd.C 2007-03-16 18:10:20.000000000 +0100
+@@ -35,6 +35,7 @@
+ #endif
+
+ #include <vector>
++#include <string>
+ using std::vector;
+ using std::string;
+
Added: trunk/boinc/debian/patches/README.patches
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/README.patches?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/patches/README.patches (added)
+++ trunk/boinc/debian/patches/README.patches Mon Apr 9 22:08:46 2007
@@ -1,0 +1,9 @@
+0xx patches are Debian-specific build patches, that have not and will not be
+proposed upstream; they don't need to be.
+
+If there are any:
+
+1xx patches have been proposed upstream and accepted; these can safely be
+deleted when updating to a new release.
+
+2xx patches are awaiting the approval of upstream.
Added: trunk/boinc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/series?rev=613&op=file
==============================================================================
--- trunk/boinc/debian/patches/series (added)
+++ trunk/boinc/debian/patches/series Mon Apr 9 22:08:46 2007
@@ -1,0 +1,4 @@
+001_amd64_disable_platform_reset.patch
+003_use_sensible-browser.patch
+004_exclude_sea.patch
+101_gcc_4.3_fixes.patch
Modified: trunk/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/rules?rev=613&op=diff
==============================================================================
--- trunk/boinc/debian/rules (original)
+++ trunk/boinc/debian/rules Mon Apr 9 22:08:46 2007
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -22,12 +22,6 @@
TYPE_FLAGS += --target i686-linux-gnu --program-prefix=""
endif
-# This is the same as above, but only for compatibility with sarge's version
-# of dpkg-architecture.
-ifeq ($(DEB_HOST_GNU_TYPE), i386-linux)
- TYPE_FLAGS += --target i686-linux-gnu --program-prefix=""
-endif
-
CFLAGS += -g -Wall
CXXFLAGS += -g -Wall
@@ -53,6 +47,7 @@
--prefix=/usr \
--enable-client \
--disable-server \
+ --enable-unicode \
--with-ssl \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -66,7 +61,12 @@
CFLAGS="$(CFLAGS_boinc-client)" \
CXXFLAGS="$(CXXFLAGS_boinc-client)"
-pre-build: patch pre-build-stamp
+unit-test:
+ xmllint --noout \
+ debian/conffiles/cc_config.xml \
+ debian/conffiles/global_prefs_override.xml
+
+pre-build: unit-test patch pre-build-stamp
pre-build-stamp:
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub config.sub
@@ -93,11 +93,14 @@
touch $@
clean: clean-patched unpatch
-clean-patched: clean-boinc-client
+clean-patched:
dh_testdir
dh_testroot
+ rm -f pre-build-stamp
rm -f build-stamp
- rm -f pre-build-stamp
+ rm -f build-stamp-boinc-client
+
+ dh_clean client/boinc_client.optimized
-$(MAKE) clean
-$(MAKE) distclean
@@ -140,12 +143,6 @@
debconf-updatepo
-clean-boinc-client:
- dh_testdir
- dh_testroot
- rm -f build-stamp-boinc-client
- dh_clean client/boinc_client.optimized
-
install: install-arch
install-arch: build
dh_testdir
@@ -199,5 +196,5 @@
dh_builddeb -a
binary: binary-arch
-.PHONY: build clean clean-patched binary-arch binary install install-arch \
- patch unpatch
+.PHONY: patch unpatch unit-test pre-build build clean clean-patched install \
+ install-arch binary-arch binary
More information about the pkg-boinc-commits
mailing list