aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-04-10 05:24:34 +0000
committerTimo Teräs <timo.teras@iki.fi>2015-04-10 05:24:34 +0000
commitd6f211ec868df4657c745b8ba2bae77b2a7fb7f6 (patch)
tree1f204c95cee33cf0f93b39610a3e6b32ab60256d
parentbcd74e3bc6400e2d63ccfc077f31b211f35e9a9b (diff)
downloadaports-d6f211ec868df4657c745b8ba2bae77b2a7fb7f6.tar.bz2
aports-d6f211ec868df4657c745b8ba2bae77b2a7fb7f6.tar.xz
testing/emacs: use paxmark
-rw-r--r--testing/emacs/APKBUILD10
-rw-r--r--testing/emacs/noaslr-dump.patch4
2 files changed, 7 insertions, 7 deletions
diff --git a/testing/emacs/APKBUILD b/testing/emacs/APKBUILD
index 5411c50c60..66c10ff509 100644
--- a/testing/emacs/APKBUILD
+++ b/testing/emacs/APKBUILD
@@ -3,14 +3,14 @@
pkgname=emacs
pkgver=24.99
-pkgrel=0
+pkgrel=1
gitver=7eb2077f9dd14ae9d70a12c621151afd50ea6e96
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch="x86_64"
url="http://www.gnu.org/software/emacs/emacs.html"
license="GPL3"
depends="hicolor-icon-theme desktop-file-utils"
-makedepends="paxctl autoconf automake ncurses-dev ncurses-libs gpm-dev"
+makedepends="paxmark autoconf automake ncurses-dev ncurses-libs gpm-dev"
#source="ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz
source="http://git.savannah.gnu.org/cgit/emacs.git/snapshot/$pkgname-$gitver.tar.xz
gamedir.patch
@@ -72,13 +72,13 @@ package() {
md5sums="d771a8c9163f2118de565e679838c907 emacs-7eb2077f9dd14ae9d70a12c621151afd50ea6e96.tar.xz
82a3275fba6535e129c08b6941caf028 gamedir.patch
-00a871b77cafce8d36823dc9da09f3b0 noaslr-dump.patch
+0decc074823fc66f155dd9559420be3d noaslr-dump.patch
d753f727439ba68ae848a72535b021a4 musl.patch"
sha256sums="0931fc1a4f5ab4baa73e18985781228f8ad7323b9bbcaf7eefe302d86f64f2c8 emacs-7eb2077f9dd14ae9d70a12c621151afd50ea6e96.tar.xz
38b3cdf3736b200d033d9e6e9188bcaaf819bf7b47b3231a533cca370f945ee3 gamedir.patch
-0352f487b703f5eaa285752ad0c1508157473075ab5547f753a34e835a0a5044 noaslr-dump.patch
+2af8d971caa73843fd1f6793dbc9b0fb701186dcb01845eac3c68373f4a570d1 noaslr-dump.patch
c6b6037fcc0abe3c973e9200ba6b9ad8e313b6bbd47a5d74a835892f0338c045 musl.patch"
sha512sums="59a2d7f947c79d59462dc9a0fcdd2ed992ae18ee284ece3508a009fe31a485ab276425d724a580023481318a88b81801660c17cb3bc118edc3b563a7c3a63dd7 emacs-7eb2077f9dd14ae9d70a12c621151afd50ea6e96.tar.xz
7bd0acd610c07cb0cee2ceec8770c51b97e05a69c8c32e771f6ced83c1906bd87af842939a294a16757a4ad24e052228068944efa5adfc47776ca28b8da3555a gamedir.patch
-c2c0d6120cb770616d9f715c1f2a8445ffc205be071fbe7bd66080c71c9cecb239eac1a5b3be26164e6211dd1721ebc1725fe47bdcbdb989678f2786146e7234 noaslr-dump.patch
+c04213a271008f7413677c95442188d744736abd28994aac616ac2e35924ca2a1c5cb55b95072e0011e891f1db054f07960b1753167f50c2e6d80d7c5b33e338 noaslr-dump.patch
c02bea143a221bc186e44f7eb12edb93d3d7564a39db656c888930ad69a6d40c86918bbe12acd2dbff19ff88a67a06a65e68467def8aa443e52d3b149d8ba2f2 musl.patch"
diff --git a/testing/emacs/noaslr-dump.patch b/testing/emacs/noaslr-dump.patch
index b3baa4e5a3..ccacb3c334 100644
--- a/testing/emacs/noaslr-dump.patch
+++ b/testing/emacs/noaslr-dump.patch
@@ -5,7 +5,7 @@ diff -urw orig/src/Makefile.in src/src/Makefile.in
ifeq ($(CANNOT_DUMP),yes)
ln -f temacs$(EXEEXT) $@
else
-+ paxctl -rC temacs$(EXEEXT)
++ paxmark -r temacs$(EXEEXT)
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
$(PAXCTL_if_present) -zex $@
ln -f $@ bootstrap-emacs$(EXEEXT)
@@ -13,7 +13,7 @@ diff -urw orig/src/Makefile.in src/src/Makefile.in
ifeq ($(CANNOT_DUMP),yes)
ln -f temacs$(EXEEXT) $@
else
-+ paxctl -rC temacs$(EXEEXT)
++ paxmark -r temacs$(EXEEXT)
$(RUN_TEMACS) --batch --load loadup bootstrap
$(PAXCTL_if_present) -zex emacs$(EXEEXT)
mv -f emacs$(EXEEXT) $@