[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-77-ga3fd1db

[Guo Yixuan]

The following commit has been merged in the master branch:
commit a3fd1db85e9815a1059fe1614df44001767baea0
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Fri Aug 17 20:26:45 2012 +0800

    #679207 workaround: boincmgr proxy-setting-segfault
    
    disable -O2 and stackprotector for clientgui/

diff --git a/debian/changelog b/debian/changelog
index f7746b7..0d78d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ boinc (7.0.33+dfsg-1) UNRELEASED; urgency=low
   * Conditional builds of debian/control
 
   [ Guo Yixuan ]
-  * debian/rules: disable optimization in api/, for SETI to work.
+  * debian/rules: partially disable some optimization and hardening flags,
+    - in api/, for SETI to work,
+    - in clientgui/, as a workaround for #679207.
 
  -- Steffen Moeller <moeller at debian.org>  Sat, 30 Jun 2012 21:59:59 +0200
 
diff --git a/debian/rules b/debian/rules
index 37f8cfe..b1ff1e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -206,8 +206,12 @@ update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 # build:
 #	dh build --parallel --with python2
 
+# noopt
 CFLAGS_noopt = $(subst -O2,-O0,$(CFLAGS))
 CXXFLAGS_noopt = $(subst -O2,-O0,$(CXXFLAGS))
+# noopt and no hardening
+CFLAGS_plain = -g -O0 -Wall
+CXXFLAGS_plain = $(CFLAGS_plain)
 
 override_dh_auto_build: update-boinc-applinks.1
 	@echo
@@ -217,6 +221,9 @@ override_dh_auto_build: update-boinc-applinks.1
 	@echo
 	# disable optimization in api/, for SETI to work
 	$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
+	# workaround for bug #679207 (proxy setting segfault)
+	$(MAKE) -C lib
+	$(MAKE) -C clientgui CFLAGS="$(CFLAGS_plain)" CXXFLAGS="$(CXXFLAGS_plain)"
 	$(MAKE)
 
 	# Generate binary message catalogs of the BOINC Manager.

-- 
BOINC packaging