[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. debian/1.0.3-1-12-g4d8cb50

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 4d8cb501a215418593e928f02ccfad087962720b
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri May 4 20:02:31 2012 +0200

    debian/rules: added hardening flags. (Closes: #655415)
    
    This is done via a dh_auto_configure override following
    http://wiki.debian.org/HardeningWalkthrough.

diff --git a/debian/changelog b/debian/changelog
index 4a2b3a9..91fa7d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,13 @@ ruby-gnome2 (1.1.3-1) unstable; urgency=low
     - Added patch Fix_erroneous_load_of_vte_deprecated. (Closes: #666986)
   * debian/ruby-gstreamer.install: gst.so is now called gstreamer.so.
   * debian/rules:
-    - Disable running debian/check-upstream-versus-debian that generates
+    - Disabled running debian/check-upstream-versus-debian that generates
       a patch as the debian tree is clean now w.r.t. upstream.
+    - Added hardening flags via a dh_auto_configure override as per
+      http://wiki.debian.org/HardeningWalkthrough (Closes: #655415)
   * debian/source/local-options: set "unapply-patches".
 
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 May 2012 19:42:14 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 May 2012 20:00:37 +0200
 
 ruby-gnome2 (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index fc64665..0bc3786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,9 @@
 %:
 	dh $@
 
-#override_dh_auto_configure:
+override_dh_auto_configure:
 #	debian/check-upstream-versus-debian
-#	dh_auto_configure
+	dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_install:
 	debian/build ruby1.8
diff --git a/exec_make.rb b/exec_make.rb
index 84550d7..76ed54f 100644
--- a/exec_make.rb
+++ b/exec_make.rb
@@ -29,7 +29,8 @@ SUBDIRS.each do |subdir|
 	if ret
 		success << subdir 
 	else
-		failure << subdir
+                puts "Building of #{subdir} failed."
+                exit(1)
 	end
 end
 
diff --git a/extconf.rb b/extconf.rb
index d85f497..4a72ccf 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -75,6 +75,10 @@ subdirs.each do |subdir|
   if ret
     targets << subdir
   else
+    if $strict
+        exit(1)
+    end
+
     ignore << subdir
   end
 end
@@ -114,6 +118,7 @@ def run_make_in_sub_dirs(command)
 	  echo "FAILED: $$failed";		\\
 	  echo "-----";				\\
 	  echo "Done.";				\\
+	  test "$$failed" = "NONE";             \\
 	)
     EOS
   end
diff --git a/vte/lib/vte.rb b/vte/lib/vte.rb
index a8a0e50..89a2f8e 100644
--- a/vte/lib/vte.rb
+++ b/vte/lib/vte.rb
@@ -1,4 +1,5 @@
 require "gtk2"
 require "vte.so"
-require "vte/deprecated"
+# Does not exist!
+#require "vte/deprecated"
 

-- 
ruby-gnome2.git