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

[Steffen Moeller]

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

    Specifying www-data as httpd_user

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 6b16244..c9dbccc 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -279,14 +279,6 @@ def builddir(*dirs):
  
  
  class Project:
-@@ -415,6 +381,7 @@
-         if web_only:
-             config.no_computing = 1
- 
-+        config.httpd_user    = 'www-data'
-         config.master_url    = master_url or os.path.join(options.html_url , self.short_name , '')
-         config.download_url  = os.path.join(config.master_url, 'download')
-         config.cgi_url       = cgi_url or os.path.join(options.cgi_url, self.short_name)
 @@ -423,7 +390,7 @@
          config.upload_dir    = os.path.join(self.project_dir , 'upload')
          config.key_dir       = key_dir or os.path.join(self.project_dir , 'keys')
diff --git a/debian/patches/debian_sztaki_httpdUserIsWwwData.patch b/debian/patches/debian_sztaki_httpdUserIsWwwData.patch
new file mode 100644
index 0000000..b83a32b
--- /dev/null
+++ b/debian/patches/debian_sztaki_httpdUserIsWwwData.patch
@@ -0,0 +1,12 @@
+Index: boinc/py/Boinc/setup_project.py
+===================================================================
+--- boinc.orig/py/Boinc/setup_project.py	2011-06-13 20:26:34.000000000 +0200
++++ boinc/py/Boinc/setup_project.py	2011-06-13 20:26:38.000000000 +0200
+@@ -423,6 +423,7 @@
+         if web_only:
+             config.no_computing = 1
+ 
++        config.httpd_user    = 'www-data'
+         config.master_url    = master_url or os.path.join(options.html_url , self.short_name , '')
+         config.download_url  = os.path.join(config.master_url, 'download')
+         config.cgi_url       = cgi_url or os.path.join(options.cgi_url, self.short_name)
diff --git a/debian/patches/series b/debian/patches/series
index 26e4b11..12b2e30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch
 upstream_sztaki_voteMonChecksConfig.patch

-- 
BOINC packaging