| 1 |
commit: 4b376d4e6d5163cc9d0c9f8f4fd9c3490a210d8f |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 16:28:54 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 16:28:54 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b376d4e |
| 7 |
|
| 8 |
[dev-qt/qtwebkit] Remove insecure RPATH wrt bug #466216. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch | 13 +++++++++++++ |
| 13 |
dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 5 ++++- |
| 14 |
dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 5 ++++- |
| 15 |
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 5 ++++- |
| 16 |
4 files changed, 25 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..ffe44d2 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch |
| 23 |
@@ -0,0 +1,13 @@ |
| 24 |
+Avoid insecure RPATH wrt bug #466216. |
| 25 |
+ |
| 26 |
+--- Tools/qmake/mkspecs/features/unix/default_post.prf |
| 27 |
++++ Tools/qmake/mkspecs/features/unix/default_post.prf |
| 28 |
+@@ -60,8 +60,6 @@ |
| 29 |
+ } |
| 30 |
+ } |
| 31 |
+ |
| 32 |
+-contains(TEMPLATE, app): CONFIG += rpath |
| 33 |
+- |
| 34 |
+ CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { |
| 35 |
+ # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. |
| 36 |
+ !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory |
| 37 |
|
| 38 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild |
| 39 |
index 08750fb..7812f80 100644 |
| 40 |
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild |
| 41 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild |
| 42 |
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND} |
| 43 |
virtual/rubygems |
| 44 |
" |
| 45 |
|
| 46 |
-PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) |
| 47 |
+PATCHES=( |
| 48 |
+ "${FILESDIR}/${PN}-5.4.1-leveldb.patch" |
| 49 |
+ "${FILESDIR}/${PN}-5.4.1-rpath.patch" |
| 50 |
+) |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
# ensure bundled library cannot be used |
| 54 |
|
| 55 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild |
| 56 |
index 88a5767..c9a2b5d 100644 |
| 57 |
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild |
| 58 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild |
| 59 |
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND} |
| 60 |
virtual/rubygems |
| 61 |
" |
| 62 |
|
| 63 |
-PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) |
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}/${PN}-5.4.1-leveldb.patch" |
| 66 |
+ "${FILESDIR}/${PN}-5.4.1-rpath.patch" |
| 67 |
+) |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
# ensure bundled library cannot be used |
| 71 |
|
| 72 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 73 |
index 88a5767..c9a2b5d 100644 |
| 74 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 75 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 76 |
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND} |
| 77 |
virtual/rubygems |
| 78 |
" |
| 79 |
|
| 80 |
-PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) |
| 81 |
+PATCHES=( |
| 82 |
+ "${FILESDIR}/${PN}-5.4.1-leveldb.patch" |
| 83 |
+ "${FILESDIR}/${PN}-5.4.1-rpath.patch" |
| 84 |
+) |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
# ensure bundled library cannot be used |
Archives