Mozilla Firefox

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

  1. firefox-3.5.head+lp507744
  2. Merge into firefox-3.5.head
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kees/firefox/firefox-3.5.head+lp507744
Merge into: lp:firefox/3.5
Diff against target: 49 lines (+13/-0)
3 files modified
debian/changelog (+10/-0)
debian/control (+1/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~kees/firefox/firefox-3.5.head+lp507744
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Review via email: mp+17867@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-01-20 02:17:11 +0000
3+++ debian/changelog 2010-01-22 04:52:13 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low
7
8 * implement MIN_SYS_DEPS approach that does not use system xulrunner
9@@ -27,6 +28,15 @@
10
11 -- Alexander Sack <asac@ubuntu.com> Wed, 20 Jan 2010 03:16:55 +0100
12
13+=======
14+firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low
15+
16+ * debian/{rules,control}: enable PIE build for stronger security
17+ (LP: #507744).
18+
19+ -- Kees Cook <kees@ubuntu.com> Wed, 13 Jan 2010 23:50:37 -0800
20+
21+>>>>>>> MERGE-SOURCE
22 firefox-3.5 (3.5.7+nobinonly-0ubuntu1) lucid; urgency=low
23
24 * New upstream release v3.5.7 (FIREFOX_3_5_7_RELEASE)
25
26=== modified file 'debian/control'
27--- debian/control 2010-01-20 02:17:11 +0000
28+++ debian/control 2010-01-22 04:52:13 +0000
29@@ -22,6 +22,7 @@
30 libdbus-glib-1-dev (>= 0.60),
31 libnspr4-dev, libnss3-dev,
32 mozilla-devscripts (>= 0.10~),
33+ hardening-wrapper,
34 lsb-release
35 Standards-Version: 3.8.1
36
37
38=== modified file 'debian/rules'
39--- debian/rules 2010-01-18 23:45:44 +0000
40+++ debian/rules 2010-01-22 04:52:14 +0000
41@@ -73,6 +73,8 @@
42 LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
43 export LDFLAGS
44
45+export DEB_BUILD_HARDENING=1
46+
47 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
48 EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-optimize
49 endif

Subscribers

People subscribed via source and target branches