summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-10-19 01:01:21 +0000
committerDaniel Bermond2020-10-19 01:01:21 +0000
commitd88bcbd2e4b57cdfd79300f46655bc371abe8b28 (patch)
tree3ad4a9d3a667de27e7173f457c13ccb1fac0a14c
parent4e60d82acd55c3a6277f8f769c72f0fab7a0b373 (diff)
downloadaur-d88bcbd2e4b57cdfd79300f46655bc371abe8b28.tar.gz
Add PIE to mupen64plus-gui (upstream now forces no-pie)
Upstream is now deliberately forcing no-pie to mupen64plus-gui, and this removes the important PIE security feature. Add PIE here downstream. References ---------- https://github.com/loganmc10/m64p/commit/4033a0446cf45b1c2dbf01fc6e88e611f1bbd142#diff-13cd3dc9606b27bdfcc0af94b0e2bc6c71990dda661c84e0b5a6715566eeec64
-rw-r--r--.SRCINFO4
-rw-r--r--040-m64p-add-pie.patch11
-rw-r--r--PKGBUILD5
3 files changed, 18 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f93a0ae8f1c..e5d4d35cdfa2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = m64p-git
pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI (git version)
- pkgver = 20201017.r1.g4033a04
+ pkgver = 20201018.r0.gc4a279b
pkgrel = 1
url = https://m64p.github.io/
arch = x86_64
@@ -33,11 +33,13 @@ pkgbase = m64p-git
source = 010-m64p-remove-build-jobs-limitation.patch
source = 020-m64p-enable-optimizations.patch
source = 030-m64p-fix-default-config-paths.patch
+ source = 040-m64p-add-pie.patch
source = m64p.desktop
sha256sums = SKIP
sha256sums = 28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04
sha256sums = d3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3
sha256sums = c3f932cfe90909bd2f69a352add4acdd4d67d1fb73559d651de3cec3acdc3737
+ sha256sums = 06915a74819512b423ce9c8b3717ce4132836d3b691500f0298810b92ba7ac2c
sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
pkgname = m64p-git
diff --git a/040-m64p-add-pie.patch b/040-m64p-add-pie.patch
new file mode 100644
index 000000000000..16aa3626d2e8
--- /dev/null
+++ b/040-m64p-add-pie.patch
@@ -0,0 +1,11 @@
+--- a/mupen64plus-gui/mupen64plus-gui.pro
++++ b/mupen64plus-gui/mupen64plus-gui.pro
+@@ -89,8 +89,6 @@ FORMS += mainwindow.ui
+
+ QMAKE_INCDIR += api interface
+
+-QMAKE_LFLAGS += -no-pie
+-
+ CONFIG += optimize_full
+
+ QMAKE_PROJECT_DEPTH = 0
diff --git a/PKGBUILD b/PKGBUILD
index 03c412b36eb7..dfa293f73cf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=m64p-git
-pkgver=20201017.r1.g4033a04
+pkgver=20201018.r0.gc4a279b
pkgrel=1
pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI (git version)'
arch=('x86_64')
@@ -17,11 +17,13 @@ source=('git+https://github.com/loganmc10/m64p.git'
'010-m64p-remove-build-jobs-limitation.patch'
'020-m64p-enable-optimizations.patch'
'030-m64p-fix-default-config-paths.patch'
+ '040-m64p-add-pie.patch'
'm64p.desktop')
sha256sums=('SKIP'
'28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04'
'd3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3'
'c3f932cfe90909bd2f69a352add4acdd4d67d1fb73559d651de3cec3acdc3737'
+ '06915a74819512b423ce9c8b3717ce4132836d3b691500f0298810b92ba7ac2c'
'8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
prepare() {
@@ -29,6 +31,7 @@ prepare() {
patch -d m64p -Np1 -i "${srcdir}/010-m64p-remove-build-jobs-limitation.patch"
patch -d m64p -Np1 -i "${srcdir}/020-m64p-enable-optimizations.patch"
patch -d m64p -Np1 -i "${srcdir}/030-m64p-fix-default-config-paths.patch"
+ patch -d m64p -Np1 -i "${srcdir}/040-m64p-add-pie.patch"
}
pkgver() {