Merge lp:~kees/firefox/firefox-3.5.head+lp507744 into lp:firefox/3.5

[Micah Gersten]

[Micah Gersten (micahg)]

Sorry for the merge spam...still learning :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-20 02:17:11 +0000
+++ debian/changelog	2010-01-22 04:52:13 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low
 
   * implement MIN_SYS_DEPS approach that does not use system xulrunner
@@ -27,6 +28,15 @@
 
  -- Alexander Sack <[e-mail]>  Wed, 20 Jan 2010 03:16:55 +0100
 
+=======
+firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/{rules,control}: enable PIE build for stronger security
+    (LP: #507744).
+
+ -- Kees Cook <[e-mail]>  Wed, 13 Jan 2010 23:50:37 -0800
+
+>>>>>>> MERGE-SOURCE
 firefox-3.5 (3.5.7+nobinonly-0ubuntu1) lucid; urgency=low
 
   * New upstream release v3.5.7 (FIREFOX_3_5_7_RELEASE)
 
=== modified file 'debian/control'
--- debian/control	2010-01-20 02:17:11 +0000
+++ debian/control	2010-01-22 04:52:13 +0000
@@ -22,6 +22,7 @@
 	libdbus-glib-1-dev (>= 0.60),
 	libnspr4-dev, libnss3-dev,
 	mozilla-devscripts (>= 0.10~),
+	hardening-wrapper,
 	lsb-release
 Standards-Version: 3.8.1
 
 
=== modified file 'debian/rules'
--- debian/rules	2010-01-18 23:45:44 +0000
+++ debian/rules	2010-01-22 04:52:14 +0000
@@ -73,6 +73,8 @@
 LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
 export LDFLAGS
 
+export DEB_BUILD_HARDENING=1
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-optimize
 endif