Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1501480603298080"
MIME-Version: 1.0
Date: Mon, 31 Jul 2017 05:56:43 +0000
From: "S.P.Zeidler" <spz@netbsd.org>
Subject: CVS commit: [pkgsrc-2017Q2] pkgsrc/editors/emacs20
To: pkgsrc-changes@NetBSD.org
Reply-To: spz@netbsd.org
Message-Id: <20170731055643.DE6E0FACD@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1501480603298080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	spz
Date:		Mon Jul 31 05:56:43 UTC 2017

Modified Files:
	pkgsrc/editors/emacs20 [pkgsrc-2017Q2]: Makefile distinfo
	pkgsrc/editors/emacs20/patches [pkgsrc-2017Q2]: patch-af

Log Message:
Pullup ticket #5522 - requested by dholland
editors/emacs20: functionality fix

Revisions pulled up:
- editors/emacs20/Makefile                                      1.58
- editors/emacs20/distinfo                                      1.36
- editors/emacs20/patches/patch-af                              1.5

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Jul 23 05:11:43 UTC 2017

   Modified Files:
   	pkgsrc/editors/emacs20: Makefile distinfo
   	pkgsrc/editors/emacs20/patches: patch-af

   Log Message:
   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.

   To generate a diff of this commit:
   cvs rdiff -u -r1.57 -r1.58 pkgsrc/editors/emacs20/Makefile
   cvs rdiff -u -r1.35 -r1.36 pkgsrc/editors/emacs20/distinfo
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs20/patches/patch-af


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.4.1 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.35 -r1.35.2.1 pkgsrc/editors/emacs20/distinfo
cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/editors/emacs20/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1501480603298080
Content-Disposition: inline
Content-Length: 3040
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.57 pkgsrc/editors/emacs20/Makefile:1.57.4.1
--- pkgsrc/editors/emacs20/Makefile:1.57	Thu Jan 19 18:52:08 2017
+++ pkgsrc/editors/emacs20/Makefile	Mon Jul 31 05:56:43 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:08 agc Exp $
+# $NetBSD: Makefile,v 1.57.4.1 2017/07/31 05:56:43 spz 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

Index: pkgsrc/editors/emacs20/distinfo
diff -u pkgsrc/editors/emacs20/distinfo:1.35 pkgsrc/editors/emacs20/distinfo:1.35.2.1
--- pkgsrc/editors/emacs20/distinfo:1.35	Sat Jun 17 19:40:18 2017
+++ pkgsrc/editors/emacs20/distinfo	Mon Jul 31 05:56:43 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2017/06/17 19:40:18 joerg Exp $
+$NetBSD: distinfo,v 1.35.2.1 2017/07/31 05:56:43 spz 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) = cf63cb6481eb5862855f06
 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

Index: pkgsrc/editors/emacs20/patches/patch-af
diff -u pkgsrc/editors/emacs20/patches/patch-af:1.4 pkgsrc/editors/emacs20/patches/patch-af:1.4.2.1
--- pkgsrc/editors/emacs20/patches/patch-af:1.4	Sat Jun 17 19:40:18 2017
+++ pkgsrc/editors/emacs20/patches/patch-af	Mon Jul 31 05:56:43 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2017/06/17 19:40:18 joerg Exp $
+$NetBSD: patch-af,v 1.4.2.1 2017/07/31 05:56:43 spz 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
  
  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,


--_----------=_1501480603298080--