[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-31-g6367466

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 6367466f2fe735573b9a9a05d64ecb8c2b727833
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 19 23:44:19 2012 +0800

    New patch: 75-hardening-flag.patch.

diff --git a/debian/patches/75-hardening-flag.patch b/debian/patches/75-hardening-flag.patch
new file mode 100644
index 0000000..f8bd72d
--- /dev/null
+++ b/debian/patches/75-hardening-flag.patch
@@ -0,0 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -6460,7 +6460,7 @@
+     fi
+ 
+     sed -e "s|@useconfig@|TRUE|"                       \
+-        -e "s|@cflags@|$haveconfig|"                   \
++        -e "s|@cflags@|$haveconfig $CFLAGS|"                   \
+             < Makefile.tmp > Makefile.tmpp
+     mv Makefile.tmpp Makefile.tmp
+ else
+--- a/net/globusauth/src/GlobusAuth.cxx
++++ b/net/globusauth/src/GlobusAuth.cxx
+@@ -1010,7 +1010,7 @@
+          fn = Form("%s/.globus/usercert.pem",gSystem->HomeDirectory());
+       if (gSystem->AccessPathName(fn, kReadPermission)) {
+          emsg += fn;
+-         Error("GlobusIssuerName", emsg.Data());
++         Error("GlobusIssuerName", "%s", emsg.Data());
+          return 1;
+       }
+    }
diff --git a/debian/patches/series b/debian/patches/series
index 1710fbb..dccc588 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@
 71-remove-root-plugin-proof-xproof.patch
 73-ruby-1.9.1.patch
 74-kfreebsd.patch
+75-hardening-flag.patch
diff --git a/debian/rules b/debian/rules
index b0a61c0..e167e60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,13 +18,10 @@ DEB_BUILD_ARCH	     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS   := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
-
-EXTRA_CFLAGS   := $(CFLAGS)
-EXTRA_CXXFLAGS := $(CXXFLAGS)
 EXTRA_LDFLAGS  := $(LDFLAGS)
-export CPPFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS RUBYARCHINC DEB_HOST_MULTIARCH
+
+export CFLAGS EXTRA_LDFLAGS RUBYARCHINC DEB_HOST_MULTIARCH
 
 RUBYHEADERDIR   := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"]')
 

-- 
root-system: CERN's ROOT Data Analysis Framework