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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit e21966708f1fc688efb93713ada28b492390fb71
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 20:18:12 2011 +0200

    Added #ifndef for FCGI in hostinfo.cpp

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index a71a63c..90be56a 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -653,26 +653,6 @@ def builddir(*dirs):
  		if (bio_err == NULL)
  		    bio_err = BIO_new_fp(stdout, BIO_NOCLOSE);
          //enc=EVP_get_cipherbyname("des");
---- boinc-server-6.11.0+r18946.orig/lib/hostinfo.cpp
-+++ boinc-server-6.11.0+r18946/lib/hostinfo.cpp
-@@ -107,6 +107,8 @@
-     return ERR_XML_PARSE;
- }
- 
-+#ifndef _USING_FCGI_
-+
- // Write the host information, to the client state XML file
- // or in a scheduler request message
- //
-@@ -168,6 +170,8 @@
-     return 0;
- }
- 
-+#endif
-+
- // CPU benchmarks are run in a separate process,
- // which communicates its result via a file.
- // The following functions read and write this file.
 --- boinc-server-6.11.0+r18946.orig/m4/ax_check_glu.m4
 +++ boinc-server-6.11.0+r18946/m4/ax_check_glu.m4
 @@ -19,7 +19,7 @@
diff --git a/debian/patches/local_sztaki_NoWriteFcgiWithHostinfo.patch b/debian/patches/local_sztaki_NoWriteFcgiWithHostinfo.patch
new file mode 100644
index 0000000..e999bb7
--- /dev/null
+++ b/debian/patches/local_sztaki_NoWriteFcgiWithHostinfo.patch
@@ -0,0 +1,22 @@
+Index: boinc/lib/hostinfo.cpp
+===================================================================
+--- boinc.orig/lib/hostinfo.cpp	2011-06-12 20:17:12.000000000 +0200
++++ boinc/lib/hostinfo.cpp	2011-06-12 20:17:41.000000000 +0200
+@@ -119,6 +119,8 @@
+     return ERR_XML_PARSE;
+ }
+ 
++#ifndef _USING_FCGI_
++
+ // Write the host information to either:
+ // - client state XML file (net info, coprocs)
+ // - a GUI RPC reply (net info, coprocs)
+@@ -201,6 +203,8 @@
+     return 0;
+ }
+ 
++#endif
++
+ // CPU benchmarks are run in a separate process,
+ // which communicates its result via a file.
+ // The following functions read and write this file.
diff --git a/debian/patches/series b/debian/patches/series
index 27eac85..6090ee6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 upstream_sztaki_Help_Function_Declaration_with_void.patch
+local_sztaki_NoWriteFcgiWithHostinfo.patch
 upstream_sztaki_LIBEXEC_DIR.patch
 local_sztaki_allow_world_read_and_execute_directory.patch
 AvoidingBlanksInMakefiles.patch

-- 
BOINC packaging