[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-296-gdc96a5e

Steffen Moeller moeller at debian.org
Sun Jul 24 22:59:52 UTC 2011 

The following commit has been merged in the master branch:
commit 506194079b670895c1e14befb6c4020ca243c31c
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 24 23:21:00 2011 +0200

    Adjusted a series of patches.

diff --git a/debian/patches/MakefileWrapper.patch b/debian/patches/MakefileWrapper.patch
deleted file mode 100644
index e0387c5..0000000
--- a/debian/patches/MakefileWrapper.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Index: boinc/samples/wrapper/Makefile
-===================================================================
---- boinc.orig/samples/wrapper/Makefile	2011-04-27 22:39:13.000000000 +0200
-+++ boinc/samples/wrapper/Makefile	2011-04-27 22:45:42.000000000 +0200
-@@ -1,30 +1,43 @@
- # This should work on Linux.  Modify as needed for other platforms.
- 
- # Change the following to match your installation
--BOINC_DIR = ../..
-+BOINC_DIR = /usr/include/boinc
- BOINC_API_DIR = $(BOINC_DIR)/api
- BOINC_LIB_DIR = $(BOINC_DIR)/lib
- 
- CXXFLAGS = -g \
-+    -I../.. \
-+    -I../../api \
-+    -I../../lib \
-+    -L../../lib \
-     -I$(BOINC_DIR) \
-     -I$(BOINC_LIB_DIR) \
-     -I$(BOINC_API_DIR) \
-     -L$(BOINC_API_DIR) \
-     -L$(BOINC_LIB_DIR) \
--    -L.
- 
--PROGS = wrapper
-+PROGS= wrapper
-+EXTRA_SOURCES=
- 
- all: $(PROGS)
- 
--libstdc++.a:
--	ln -s `g++ -print-file-name=libstdc++.a`
-+LIBS=libstdc++.a libboinc_api.a libboinc.a
-+
-+$(LIBS):
-+	if [ -r "../../lib/$@" ]; then \
-+		ln -sf "../../lib/$@" . ; \
-+	elif [ -r "../../api/$@" ]; then \
-+		ln -sf "../../api/$@" . ; \
-+	else \
-+		ln -sf `g++ -print-file-name=$@` ; \
-+	fi
- 
- clean:
--	rm $(PROGS) *.o
-+	rm -f $(PROGS) *.o *.a
- 
- distclean:
--	/bin/rm -f $(PROGS) *.o libstdc++.a
-+	/bin/rm -f $(PROGS) *.o $(LIBS)
-+
-+$(PROGS):  $(LIBS)
-+	g++ $(CXXFLAGS) -Wl,--as-needed -o $@ $(@).cpp $(EXTRA_SOURCES) -L . $(LIBS) -pthread
- 
--wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
--	g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
-Index: boinc/samples/sleeper/Makefile
-===================================================================
---- boinc.orig/samples/sleeper/Makefile	2011-04-27 22:39:13.000000000 +0200
-+++ boinc/samples/sleeper/Makefile	2011-04-27 22:45:42.000000000 +0200
-@@ -1,29 +1,43 @@
- # This should work on Linux.  Modify as needed for other platforms.
- 
--BOINC_DIR = ../..
-+# Change the following to match your installation
-+BOINC_DIR = /usr/include/boinc
- BOINC_API_DIR = $(BOINC_DIR)/api
- BOINC_LIB_DIR = $(BOINC_DIR)/lib
- 
- CXXFLAGS = -g \
-+    -I../.. \
-+    -I../../api \
-+    -I../../lib \
-+    -L../../lib \
-     -I$(BOINC_DIR) \
-     -I$(BOINC_LIB_DIR) \
-     -I$(BOINC_API_DIR) \
-     -L$(BOINC_API_DIR) \
-     -L$(BOINC_LIB_DIR) \
--    -L.
- 
--PROGS = sleeper
-+PROGS= sleeper
-+EXTRA_SOURCES=
- 
- all: $(PROGS)
- 
--libstdc++.a:
--	ln -s `g++ -print-file-name=libstdc++.a`
-+LIBS=libstdc++.a libboinc_api.a libboinc.a
-+
-+$(LIBS):
-+	if [ -r "../../lib/$@" ]; then \
-+		ln -sf "../../lib/$@" . ; \
-+	elif [ -r "../../api/$@" ]; then \
-+		ln -sf "../../api/$@" . ; \
-+	else \
-+		ln -sf `g++ -print-file-name=$@` ; \
-+	fi
- 
- clean:
--	rm $(PROGS)
-+	rm -f $(PROGS) *.o *.a
- 
- distclean:
--	/bin/rm -f $(PROGS) *.o libstdc++.a
-+	/bin/rm -f $(PROGS) *.o $(LIBS)
-+
-+$(PROGS):  $(LIBS)
-+	g++ $(CXXFLAGS) -Wl,--as-needed -o $@ $(@).cpp $(EXTRA_SOURCES) -L . $(LIBS) -pthread
- 
--sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
--	g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/debian/patches/calculate_credit_multiplier.patch b/debian/patches/calculate_credit_multiplier.patch
deleted file mode 100644
index 2c30503..0000000
--- a/debian/patches/calculate_credit_multiplier.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: boinc/tools/calculate_credit_multiplier
-===================================================================
---- boinc.orig/tools/calculate_credit_multiplier	2011-04-27 22:39:13.000000000 +0200
-+++ boinc/tools/calculate_credit_multiplier	2011-04-27 22:45:42.000000000 +0200
-@@ -23,7 +23,7 @@
- MYSQL="mysql -D $dbname -h $dbhost -u $dbuser -N -B"
- MYSQL_R="mysql -D $dbname -h $replica_dbhost -u $dbuser -N -B"
- 
--function median_host_query() {
-+median_host_query() {
-   $MYSQL --execute="
-      create temporary table medians (id int auto_increment primary key)
-        select $1 from host 
-@@ -40,7 +40,7 @@
-      drop table ids;"
- }
- 
--function get_recent_credited_results() {
-+get_recent_credited_results() {
-   $MYSQL_R --execute="
-     set session transaction isolation level read uncommitted;
-     create temporary table recent_results 
diff --git a/debian/patches/file_upload_handler_permission.patch b/debian/patches/file_upload_handler_permission.patch
index e961f0c..11a58d7 100644
--- a/debian/patches/file_upload_handler_permission.patch
+++ b/debian/patches/file_upload_handler_permission.patch
@@ -6,12 +6,12 @@ Disclaimer: This patch aims at being adopted by upstream. It may
 
 Index: boinc/sched/file_upload_handler.cpp
 ===================================================================
---- boinc.orig/sched/file_upload_handler.cpp	2011-06-09 19:51:40.000000000 +0200
-+++ boinc/sched/file_upload_handler.cpp	2011-06-09 19:52:47.000000000 +0200
+--- boinc.orig/sched/file_upload_handler.cpp	2011-07-24 19:39:10.000000000 +0200
++++ boinc/sched/file_upload_handler.cpp	2011-07-24 22:58:24.000000000 +0200
 @@ -159,7 +159,7 @@
      //
      int fd = open(path,
-         O_WRONLY|O_CREAT|O_APPEND,
+         O_WRONLY|O_CREAT,
 -        S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH
 +        S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH
      );
diff --git a/debian/patches/generate_less.patch b/debian/patches/generate_less.patch
index f488682..97c6c45 100644
--- a/debian/patches/generate_less.patch
+++ b/debian/patches/generate_less.patch
@@ -1,15 +1,15 @@
 Index: boinc/generate_svn_version.sh
 ===================================================================
---- boinc.orig/generate_svn_version.sh	2011-04-27 22:39:13.000000000 +0200
-+++ boinc/generate_svn_version.sh	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/generate_svn_version.sh	2011-07-24 19:39:09.000000000 +0200
++++ boinc/generate_svn_version.sh	2011-07-24 22:50:22.000000000 +0200
 @@ -7,7 +7,9 @@
  echo "#define SVN_VERSION_H" >> $TMPFILE
  echo "" >> $TMPFILE
  
--if [ -d .git ]; then
-+if [ -d debian ]; then
+-if [ -d .git/svn ]; then
++if [ -d "debian" ]; then
 +    CMD=""
-+elif [ -d .git ]; then
++elif [ -d .git/svn ]; then
      CMD="git svn info"
- elif [ -d .svn ]; then
-     CMD="svn info"
+ elif [ -d .git ]; then
+     GIT_LOG=`git log -n1 --pretty="format:%H"`
diff --git a/debian/patches/pythonPath.patch b/debian/patches/pythonPath.patch
index 80edcff..ec177be 100644
--- a/debian/patches/pythonPath.patch
+++ b/debian/patches/pythonPath.patch
@@ -1,7 +1,7 @@
 Index: boinc/tools/appmgr
 ===================================================================
---- boinc.orig/tools/appmgr	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/appmgr	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/tools/appmgr	2011-06-20 21:38:42.000000000 +0200
++++ boinc/tools/appmgr	2011-07-24 22:46:49.000000000 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/python
@@ -10,8 +10,8 @@ Index: boinc/tools/appmgr
  # Licensed under the same terms as the rest of BOINC.
 Index: boinc/tools/dbcheck_files_exist
 ===================================================================
---- boinc.orig/tools/dbcheck_files_exist	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/dbcheck_files_exist	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/tools/dbcheck_files_exist	2011-06-20 21:38:42.000000000 +0200
++++ boinc/tools/dbcheck_files_exist	2011-07-24 22:46:49.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
@@ -20,48 +20,38 @@ Index: boinc/tools/dbcheck_files_exist
  from Boinc import database, db_mid, boinc_db, configxml
 Index: boinc/tools/make_project
 ===================================================================
---- boinc.orig/tools/make_project	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/make_project	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/tools/make_project	2011-07-24 19:39:10.000000000 +0200
++++ boinc/tools/make_project	2011-07-24 22:46:49.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
- # $Id: make_project 20737 2010-02-26 00:30:09Z davea $
+ # $Id: make_project 23509 2011-05-06 12:33:12Z davea $
  # Creates a new BOINC project.
 Index: boinc/tools/parse_config
 ===================================================================
---- boinc.orig/tools/parse_config	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/parse_config	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/tools/parse_config	2011-06-20 21:38:42.000000000 +0200
++++ boinc/tools/parse_config	2011-07-24 22:46:49.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  # -*- mode: python; python-indent: 4; -*-
  
-Index: boinc/tools/update_versions
-===================================================================
---- boinc.orig/tools/update_versions	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/update_versions	2011-04-27 22:45:42.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- # $Id: update_versions 18903 2009-08-24 19:08:05Z davea $
- 
 Index: boinc/tools/upgrade
 ===================================================================
---- boinc.orig/tools/upgrade	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/upgrade	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/tools/upgrade	2011-07-24 19:39:10.000000000 +0200
++++ boinc/tools/upgrade	2011-07-24 22:46:49.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
- # $Id: upgrade 22315 2010-09-04 22:13:27Z davea $
+ # $Id: upgrade 23358 2011-04-09 03:10:29Z davea $
  
 Index: boinc/tools/xadd
 ===================================================================
---- boinc.orig/tools/xadd	2011-04-27 22:39:14.000000000 +0200
-+++ boinc/tools/xadd	2011-04-27 22:45:42.000000000 +0200
+--- boinc.orig/tools/xadd	2011-06-20 21:38:42.000000000 +0200
++++ boinc/tools/xadd	2011-07-24 22:46:49.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
diff --git a/debian/patches/series b/debian/patches/series
index 72e7765..9c2e4f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,11 @@
 stripchart_debian.patch
 upstream_sztaki_configureEval.patch
-AvoidingBlanksInMakefiles.patch
 pythonPath.patch
-calculate_credit_multiplier.patch
 generate_less.patch
 texfont_removal.patch
 Makefile_subdirs.patch
-MakefileWrapper.patch
-wrapperURL.patch
 csh2tcsh.patch
 file_upload_handler_permission.patch
-upstream_sztaki_usingTempfileInUpdateVersions.patch
+possible_size_type_error.patch
 upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
-upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
 debian_debian_AdjustBoincTopdirPython.patch
diff --git a/debian/patches/upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch b/debian/patches/upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
deleted file mode 100644
index 71639d6..0000000
--- a/debian/patches/upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: boinc/html/ops/job_times.php
-===================================================================
---- boinc.orig/html/ops/job_times.php	2011-06-12 21:52:01.000000000 +0200
-+++ boinc/html/ops/job_times.php	2011-06-12 21:56:15.000000000 +0200
-@@ -205,11 +205,16 @@
- 
- if (get_str('submit', true)=='OK') {
-     set_time_limit(0);
--    $appid = $_GET['appid'];
-+
-+    $appid=0;
-+    if (!array_key_exists('appid',$_GET)) {
-+        $appid = $_GET['appid'];
-+    }
-     if (!$appid) {
-         echo "Must supply an appid";
-         exit;
-     }
-+
-     $platformid = $_GET['platformid'];
-     $quantum = $_GET['quantum'];
-     $nresults = $_GET['nresults'];
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
index 33117bc..12b1888 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,7 +1,7 @@
 Index: boinc/configure.ac
 ===================================================================
---- boinc.orig/configure.ac	2011-06-13 13:34:16.000000000 +0200
-+++ boinc/configure.ac	2011-06-13 13:34:32.000000000 +0200
+--- boinc.orig/configure.ac	2011-07-24 22:44:11.000000000 +0200
++++ boinc/configure.ac	2011-07-24 22:44:26.000000000 +0200
 @@ -277,6 +277,20 @@
  
  AC_SUBST([TOP_BUILD_DIR], [`pwd`])
@@ -23,3 +23,13 @@ Index: boinc/configure.ac
  ## 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
+Index: boinc/tools/update_versions
+===================================================================
+--- boinc.orig/tools/update_versions	2011-07-24 22:45:22.000000000 +0200
++++ boinc/tools/update_versions	2011-07-24 22:45:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env php
++#!/usr/bin/php
+ 
+ <?php
+ 
diff --git a/debian/patches/upstream_sztaki_usingTempfileInUpdateVersions.patch b/debian/patches/upstream_sztaki_usingTempfileInUpdateVersions.patch
deleted file mode 100644
index 12c037e..0000000
--- a/debian/patches/upstream_sztaki_usingTempfileInUpdateVersions.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: boinc/tools/update_versions
-===================================================================
---- boinc.orig/tools/update_versions	2011-06-12 20:36:24.000000000 +0200
-+++ boinc/tools/update_versions	2011-06-12 20:36:37.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- import boinc_path_config
- from Boinc import database, db_mid, configxml, tools, boinc_project_path
--import sys, os, re, time, string
-+import sys, os, re, time, string, tempfile
- from optparse import OptionParser
- 
- parser = OptionParser(usage="usage: %prog [options]")
-@@ -54,19 +54,16 @@
-     return map(lambda file: os.path.join(dir, file), os.listdir(dir))
- 
- def get_api_version(exec_file):
--    tmpfile = '.uvtemp'
--    cmd = "strings %s | grep API_VERSION > %s"%(exec_file, tmpfile)
-+    tmpfile = tempfile.NamedTemporaryFile()
-+    cmd = "strings %s | grep API_VERSION > %s"%(exec_file, tmpfile.name)
-     os.system(cmd)
--    f = open(tmpfile, 'r')
--    if (f):
--        s = string.strip(f.read())
--        f.close()
--        os.unlink(tmpfile)
--        prefix = 'API_VERSION_'
--        n = string.find(s, prefix)
--        if (n == 0):
--            k = len(prefix)
--            return s[k:]
-+    s = string.strip(tmpfile.read())
-+    tmpfile.close()
-+    prefix = 'API_VERSION_'
-+    n = string.find(s, prefix)
-+    if (n == 0):
-+        k = len(prefix)
-+        return s[k:]
-     return ''
- 
- # we've scanned an app version directory or file.
diff --git a/debian/patches/wrapperURL.patch b/debian/patches/wrapperURL.patch
deleted file mode 100644
index 57913fc..0000000
--- a/debian/patches/wrapperURL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boinc/samples/wrapper/wrapper.cpp
-===================================================================
---- boinc.orig/samples/wrapper/wrapper.cpp	2011-04-27 22:39:13.000000000 +0200
-+++ boinc/samples/wrapper/wrapper.cpp	2011-04-27 22:45:42.000000000 +0200
-@@ -25,7 +25,7 @@
- // - checkpointing
- //      (at the level of task; or potentially within task)
- //
--// See http://boinc.berkeley.edu/wrapper.php for details
-+// See http://boinc.berkeley.edu/trac/wiki/WrapperApp for details
- // Contributor: Andrew J. Younge (ajy4490 at umiacs.umd.edu)
- 
- #include <stdio.h>

-- 
BOINC packaging

More information about the pkg-boinc-commits mailing list