[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-320-g05a36d6

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 8cd9756b066be71548a7fde43304e3cb46213d80
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 13:27:27 2011 +0200

    Patches, moving to master or local branch

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 2ead1e5..a60d59e 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -58,27 +58,6 @@
  
  AC_CANONICAL_TARGET
  
-@@ -275,6 +274,20 @@
- 
- AC_SUBST([TOP_BUILD_DIR], [`pwd`])
- 
-+dnl We can't just export the value of ${bindir} etc. since it may reference
-+dnl ${prefix}, so we must resolve those references first
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+m4_foreach([dir], [libexecdir], [
-+    x="$dir"
-+    eval y="$x"
-+    while test "x$x" != "x$y"; do
-+        x="$y"
-+        eval y="$x"
-+    done
-+    AC_SUBST([CONFIG_]m4_translit(dir, [a-z], [A-Z]), ["$x"])
-+])
-+
- ## commented this out to turn all maintainer-mode features ON by default,
- ## such as automatic reconfiguring on changes in Makefile.am's and configure.ac
- ## AM_MAINTAINER_MODE
 @@ -480,7 +493,6 @@
  
  dnl ---------- decide wether to build the graphical boinc-api libs or not
@@ -590,69 +569,6 @@ def builddir(*dirs):
  
  
  while true ; do 
-@@ -10,10 +19,11 @@
- msgfile=`mktemp -p /tmp setimods.XXXXXX` || exit 1
- sec_from_hour=`expr $now % 3600`
- 
--dbhost=`grep db_host ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
--dbuser=`grep db_user ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
--dbname=`grep db_name ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
--MYSQL="mysql -D $dbname -h $dbhost -u $dbuser -N -B"
-+dbhost=`parse_config db_host`
-+dbuser=`parse_config db_user`
-+dbname=`parse_config db_name`
-+dbpass=`parse_config db_passwd`
-+MYSQL="mysql -D $dbname -h $dbhost -u $dbuser --password='$dbpass' -N -B"
- 
- nmods=`$MYSQL --execute="select count(userid) from forum_preferences where special_user like '1%'"`
- major=`expr $nmods / 2`
---- boinc-server-6.11.0+r18946.orig/tools/upgrade
-+++ boinc-server-6.11.0+r18946/tools/upgrade
-@@ -74,12 +74,6 @@
- 
- print "Upgrading files... done"
- 
--svn_version_file = INSTALL_DIR+'/local.revision'
--try:
--    os.system('/bin/sh -c /usr/bin/svnversion > '+svn_version_file)
--except:
--    print '''Couldn't find svnversion'''
--
- try:
-     os.system('cd '+INSTALL_DIR+'/html/ops; ./update_translations.php -d 1')
- except:
---- boinc-server-6.11.0+r18946.orig/tools/calculate_credit_multiplier
-+++ boinc-server-6.11.0+r18946/tools/calculate_credit_multiplier
-@@ -7,21 +7,22 @@
- FILE_DELETE_DONE=2
- FILE_DELETE_ERROR=3
- 
--dbhost=`grep db_host ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
--replica_dbhost=`grep replica_db_host ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
--dbuser=`grep db_user ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
--dbname=`grep db_name ../config.xml | tr '[\<\>]' '[  ]' | head -1 | awk '{print $2}'`
-+dbhost=`parse_config db_host`
-+replica_dbhost=`parse_config replica_db_host`
-+dbuser=`parse_config db_user`
-+dbname=`parse_config db_name`
-+dbpass=`parse_config db_passwd`
- 
- if test ! -z "${replica_dbhost}" ; then
--  slave_gap=`mysql -E -h ${replica_dbhost} --execute="show slave status" | grep Seconds_Behind_Master | awk '{print $2}'`
-+  slave_gap=`mysql -E -h ${replica_dbhost} --password="$dbpass" --execute="show slave status" | grep Seconds_Behind_Master | awk '{print $2}'`
- fi
- 
- if test -z "${replica_dbhost}" || test "$slave_gap" = "NULL" || test $slave_gap -gt $RUN_INCREMENT ; then
-   replica_dbhost=${dbhost}
- fi
- 
--MYSQL="mysql -D $dbname -h $dbhost -u $dbuser -N -B"
--MYSQL_R="mysql -D $dbname -h $replica_dbhost -u $dbuser -N -B"
-+MYSQL="mysql -D $dbname -h $dbhost -u $dbuser --password='$dbpass' -N -B"
-+MYSQL_R="mysql -D $dbname -h $replica_dbhost -u $dbuser --password='$dbpass' -N -B"
- 
- function median_host_query() {
-   $MYSQL --execute="
 --- boinc-server-6.11.0+r18946.orig/tools/backend_lib.cpp
 +++ boinc-server-6.11.0+r18946/tools/backend_lib.cpp
 @@ -187,9 +187,9 @@

-- 
BOINC packaging