diff options
| author | dholland <dholland@pkgsrc.org> | 2017-07-23 05:11:42 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2017-07-23 05:11:42 +0000 |
| commit | 1c8b208daa509a05ebc3cb43cee3452620298dd7 (patch) | |
| tree | 0d1dd5dcccd3cffc1d786d5efec36b7856b5495a | |
| parent | d03945c4ae2c86d5b6c278374cf04b1563259e1f (diff) | |
| download | pkgsrc-1c8b208daa509a05ebc3cb43cee3452620298dd7.tar.gz | |
Revert Joerg's change "Remove now obsolete Emacs ASLR hacks" as it doesn't
work.
Bump PKGREVISION. Note that the reverted changeset itself should have
and didn't bump PKGREVISION.
| -rw-r--r-- | editors/emacs20/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs20/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs20/patches/patch-af | 18 |
3 files changed, 21 insertions, 5 deletions
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index cf5a0a9f203..19d475dc57d 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:08 agc Exp $ +# $NetBSD: Makefile,v 1.58 2017/07/23 05:11:42 dholland Exp $ DISTNAME= emacs-20.7 PKGNAME= ${DISTNAME:S/emacs/emacs20/} -PKGREVISION= 22 +PKGREVISION= 23 CATEGORIES= editors MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ MASTER_SITES+= ftp://ftp.gnu.org/pub/old-gnu/emacs diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo index b0dbcd0a088..e18a466db9e 100644 --- a/editors/emacs20/distinfo +++ b/editors/emacs20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2017/06/17 19:40:18 joerg Exp $ +$NetBSD: distinfo,v 1.36 2017/07/23 05:11:42 dholland Exp $ SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f @@ -25,7 +25,7 @@ SHA1 (patch-ab) = cf63cb6481eb5862855f066a358821cf57bb6aa1 SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6 SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34 -SHA1 (patch-af) = 4a5355139731264cbb2663b9117c6135179987a8 +SHA1 (patch-af) = 4f252a923a8164ee7523a338f1d1b5d87006ea72 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9 SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455 SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d diff --git a/editors/emacs20/patches/patch-af b/editors/emacs20/patches/patch-af index d7e46fa1439..6d67210ae2e 100644 --- a/editors/emacs20/patches/patch-af +++ b/editors/emacs20/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2017/06/17 19:40:18 joerg Exp $ +$NetBSD: patch-af,v 1.5 2017/07/23 05:11:42 dholland Exp $ --- src/Makefile.in.orig 2016-11-26 06:25:26.875919180 +0000 +++ src/Makefile.in @@ -36,3 +36,19 @@ $NetBSD: patch-af,v 1.4 2017/06/17 19:40:18 joerg Exp $ emacs: temacs ${etc}DOC ${lisp} #ifdef CANNOT_DUMP +@@ -823,6 +816,7 @@ emacs: temacs ${etc}DOC ${lisp} + #else /* ! defined (HAVE_SHM) */ + ./temacs -batch -l loadup dump + #endif /* ! defined (HAVE_SHM) */ ++ /usr/sbin/paxctl +a emacs || true + #endif /* ! defined (CANNOT_DUMP) */ + -./emacs -q -batch -f list-load-path-shadows + +@@ -851,6 +845,7 @@ temacs: MAKE_PARALLEL $(LOCALCPP) $(STAR + $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ + -o temacs ${STARTFILES} ${obj} ${otherobj} \ + OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} ++ /usr/sbin/paxctl +a temacs || true + + /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE + often contain options that have to do with using Emacs's crt0, |