summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2018-06-19 18:57:24 -0500
committerJory A. Pratt <anarchy@gentoo.org>2018-06-19 18:57:24 -0500
commit29e79b063b17fcac4fe6a03b5e28964d66d8037f (patch)
tree3e8f4098d352ab5e938b8b547e852b069c3e8140
parentapp-office/libreoffice: Add support for musl, hardened still needs to (diff)
downloadanarchy-29e79b063b17fcac4fe6a03b5e28964d66d8037f.tar.gz
anarchy-29e79b063b17fcac4fe6a03b5e28964d66d8037f.tar.bz2
anarchy-29e79b063b17fcac4fe6a03b5e28964d66d8037f.zip
app-office/libreoffice: Include patch for pax enabled kernels
-rw-r--r--app-office/libreoffice/Manifest3
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch27
-rw-r--r--app-office/libreoffice/libreoffice-6.0.4.2.ebuild3
3 files changed, 32 insertions, 1 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 94b3073..2874148 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94aca
AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
AUX libreoffice-6.0.4.2-glm-0.9.9.patch 1017 BLAKE2B 7a85f652d6a9c01157da37a9bcc72261849f8f5b64816a8b55b149a44c50e684102a63f0d758b69ed2199259a3a934fa4c47f56ca65b66a82558a72dca991084 SHA512 aca8b606c5ef7c7333938d489faa24f86f454f22797d40ff735653ef57b70874cb4b9d22f32099a8cbc45b23c6943dc1d9dbdda9b6a08052c63ef2ac99a3f1a1
+AUX libreoffice-6.0.4.2-paxkernel.patch 881 BLAKE2B e0cf510589723842568b6616a28da945204f8b61ed384da4b9a65b5cda7801780985a175c4b9e34d8d40a4762c0363b337ba3eb14d58a08ad314a6e108b78342 SHA512 1b1b69a0116ebb2805f7c0ecf9a5656dfd1a27a15e7d94a7df310f47a4fe817a52fab2151688ec8c0543ae0bfb235770a418ed736968f88ec63850a09b5e337d
AUX linux-musl.patch 2198 BLAKE2B 2eec2c03ad678170b121f23a12c5b33c502d0edc6ce4970ca5562b9108c1cf21b88908a1d8b628c2f2cc572bdea75ce12b78dd29c5ec1697713bddd646f3a18c SHA512 52da356200beb292a1abcdcd64caaec0d5da59eeeb2741869188ec36da2e03247b926be924078ae1bd7099022ac6d09339523838eba3b207465e8896d4e5068a
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
@@ -16,4 +17,4 @@ DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157da
DIST libreoffice-6.0.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
-EBUILD libreoffice-6.0.4.2.ebuild 17004 BLAKE2B 35b72485938074d20738679fd3d1efce7a1c8b2fc11cb996157a21da099d4f22f813844c30c246feb66faeb813546fead6ca60155d07ad350712be3b97548bf2 SHA512 598b5b4925ab0fdf2fdb8d9edc446a3b4e4d7b591861ed5c4dda25f51ab950977c249f2539346b3825df7ee293e7568d67a48cf4350b983c2a2bed3e95c4d7e3
+EBUILD libreoffice-6.0.4.2.ebuild 17095 BLAKE2B c65591e04772b74260127a385f680c7dc73b3eff8b16c468d6a0de1b22dd71e455e2ce25e4b205567383c5e473248156c747358ef07742ff3d618ed1c42d88e5 SHA512 03992814583087c355e357f6d62d0dfcdbc769082c5e9d01693faa0e35325b6bd8516eb5050b8709fd55ce07a4ac717c34a861a25c26375b95fc9720ae2d65b6
diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch
new file mode 100644
index 0000000..2124c0e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch
@@ -0,0 +1,27 @@
+From 006997df0a39feee276dfcf11dad4140d8910167 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Tue, 19 Jun 2018 18:41:07 -0500
+Subject: [PATCH] disable mprotect on gengal for pax kernel
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ solenv/gbuild/Gallery.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
+index d08fe69ae..5082ca740 100644
+--- a/solenv/gbuild/Gallery.mk
++++ b/solenv/gbuild/Gallery.mk
+@@ -55,7 +55,8 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
+
+ $(call gb_Gallery_get_target,%) : \
+ $(call gb_Executable_get_runtime_dependencies,gengal)
+- $(call gb_Gallery__command,$@,$*)
++ paxctl-ng -m $(call gb_Executable_get_target_for_build,gengal) \
++ $(call gb_Gallery__command,$@,$*)
+
+ $(call gb_Gallery__get_final_target,%) :
+ touch $@
+--
+2.17.1
+
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index cc4db43..36551c1 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -259,6 +259,9 @@ PATCHES=(
"${FILESDIR}/fix-execinfo.patch"
"${FILESDIR}/fix-includes.patch"
+ # Only to be applied on pax enabled kernels
+ "${FILESDIR}/${PN}-6.0.4.2-paxkernel.patch"
+
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}
)