CVS commit: pkgsrc/editors

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors
From: "Joerg Sonnenberger" <joerg%netbsd.org@localhost>
Date: Sat, 17 Jun 2017 19:40:19 +0000

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Jun 17 19:40:19 UTC 2017

Modified Files:
        pkgsrc/editors/emacs20: distinfo
        pkgsrc/editors/emacs20/patches: patch-af
        pkgsrc/editors/emacs21: distinfo
        pkgsrc/editors/emacs21/patches: patch-src_Makefile.in
        pkgsrc/editors/emacs24: hacks.mk
        pkgsrc/editors/emacs25: hacks.mk

Log Message:
Remove now obsolete Emacs ASLR hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/editors/emacs20/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs20/patches/patch-af
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/emacs21/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs21/patches/patch-src_Makefile.in
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/emacs24/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs25/hacks.mk

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

Modified files:

Index: pkgsrc/editors/emacs20/distinfo
diff -u pkgsrc/editors/emacs20/distinfo:1.34 pkgsrc/editors/emacs20/distinfo:1.35
--- pkgsrc/editors/emacs20/distinfo:1.34        Sat Nov 26 06:38:06 2016
+++ pkgsrc/editors/emacs20/distinfo     Sat Jun 17 19:40:18 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2016/11/26 06:38:06 dholland Exp $
+$NetBSD: distinfo,v 1.35 2017/06/17 19:40:18 joerg 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) = 4f252a923a8164ee7523a338f1d1b5d87006ea72
+SHA1 (patch-af) = 4a5355139731264cbb2663b9117c6135179987a8
 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.3 pkgsrc/editors/emacs20/patches/patch-af:1.4
--- pkgsrc/editors/emacs20/patches/patch-af:1.3 Sat Nov 26 06:38:06 2016
+++ pkgsrc/editors/emacs20/patches/patch-af     Sat Jun 17 19:40:18 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2016/11/26 06:38:06 dholland Exp $
+$NetBSD: patch-af,v 1.4 2017/06/17 19:40:18 joerg Exp $
 
 --- src/Makefile.in.orig       2016-11-26 06:25:26.875919180 +0000
 +++ src/Makefile.in
@@ -36,19 +36,3 @@ $NetBSD: patch-af,v 1.3 2016/11/26 06:38
  
  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,

Index: pkgsrc/editors/emacs21/distinfo
diff -u pkgsrc/editors/emacs21/distinfo:1.22 pkgsrc/editors/emacs21/distinfo:1.23
--- pkgsrc/editors/emacs21/distinfo:1.22        Sat Nov 26 04:22:40 2016
+++ pkgsrc/editors/emacs21/distinfo     Sat Jun 17 19:40:18 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/11/26 04:22:40 dholland Exp $
+$NetBSD: distinfo,v 1.23 2017/06/17 19:40:18 joerg Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -33,7 +33,7 @@ SHA1 (patch-az) = 43753accb1b9ffc2c63e63
 SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25
 SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2
 SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
-SHA1 (patch-src_Makefile.in) = 2e7f689eb50b82847d1858b698db5cfb9e5c3c7f
+SHA1 (patch-src_Makefile.in) = cecef2516c4b9a4171926080a32826fad92ea077
 SHA1 (patch-src_alloc_c) = c9d2c7832b8b48835b81789f938540e3827f7cd8
 SHA1 (patch-src_gmalloc.c) = 3d10e1ae9f9d98495a8da47e6051a51ac18aed10
 SHA1 (patch-src_syntax.c) = c56c3b0d1e215cf56f29349bf7e9bf9cce8d0f02

Index: pkgsrc/editors/emacs21/patches/patch-src_Makefile.in
diff -u pkgsrc/editors/emacs21/patches/patch-src_Makefile.in:1.2 pkgsrc/editors/emacs21/patches/patch-src_Makefile.in:1.3
--- pkgsrc/editors/emacs21/patches/patch-src_Makefile.in:1.2    Tue May  3 09:41:20 2016
+++ pkgsrc/editors/emacs21/patches/patch-src_Makefile.in        Sat Jun 17 19:40:18 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2016/05/03 09:41:20 wiz Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2017/06/17 19:40:18 joerg Exp $
 
 * Use giflib 5.0.
 
@@ -13,29 +13,3 @@ $NetBSD: patch-src_Makefile.in,v 1.2 201
  #endif /* not defined LIBGIF */
  #else /* not HAVE_GIF */
  #define LIBGIF
-@@ -847,6 +847,7 @@ emacs: temacs ${etc}DOC ${lisp}
- #else /* ! defined (HAVE_SHM) */
-       LC_ALL=C ./temacs -batch -l loadup dump
- #endif /* ! defined (HAVE_SHM) */
-+      -/usr/sbin/paxctl +a emacs
- #endif /* ! defined (CANNOT_DUMP) */
-       -./emacs -q -batch -f list-load-path-shadows
- 
-@@ -875,6 +876,9 @@ temacs: MAKE_PARALLEL $(LOCALCPP) $(STAR
-       $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
-     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
-     OBJECTS_MACHINE ${LIBES}
-+#ifndef CANNOT_DUMP
-+      -/usr/sbin/paxctl +a temacs
-+#endif
- 
- /* 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,
-@@ -1241,6 +1245,7 @@ bootstrap-emacs: bootstrap-temacs bootst
-       ./temacs -nl -batch -l loadup bootstrap
- #else /* ! defined (HAVE_SHM) */
-       ./temacs --batch --load loadup bootstrap
-+      -/usr/sbin/paxctl +a emacs
- #endif /* ! defined (HAVE_SHM) */
- #endif /* ! defined (CANNOT_DUMP) */
-       mv -f emacs bootstrap-emacs

Index: pkgsrc/editors/emacs24/hacks.mk
diff -u pkgsrc/editors/emacs24/hacks.mk:1.6 pkgsrc/editors/emacs24/hacks.mk:1.7
--- pkgsrc/editors/emacs24/hacks.mk:1.6 Sat Aug 27 08:38:31 2016
+++ pkgsrc/editors/emacs24/hacks.mk     Sat Jun 17 19:40:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2016/08/27 08:38:31 maya Exp $
+# $NetBSD: hacks.mk,v 1.7 2017/06/17 19:40:19 joerg Exp $
 
 .if !defined(EMACS_HACKS_MK)
 EMACS_HACKS_MK=        defined
@@ -15,19 +15,4 @@ CFLAGS+=             -fno-optimize-strlen
 .    endif
 .  endif
 
-### PaX is enabled, bootstrap-emacs command dumps core with segfault.
-### emacs-24.5/src/Makefile.in does not support NetBSD paxctl(8) syntax.
-### http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23371
-###
-.  if !empty(MACHINE_PLATFORM:MNetBSD-*)
-.    if exists(/usr/sbin/paxctl)
-SUBST_CLASSES+=                        paxctl
-SUBST_STAGE.paxctl=            pre-configure
-SUBST_MESSAGE.paxctl=          Setting paxctl command
-SUBST_FILES.paxctl+=           src/Makefile.in
-SUBST_SED.paxctl+=             -e 's,test "X$$(PAXCTL)" = X || $$(PAXCTL) -zex,/usr/sbin/paxctl +a,g'
-SUBST_SED.paxctl+=             -e 's,test "X$$(PAXCTL)" = X || $$(PAXCTL) -r,/usr/sbin/paxctl +a,g'
-.    endif
-.  endif
-
 .endif  # EMACS_HACKS_MK

Index: pkgsrc/editors/emacs25/hacks.mk
diff -u pkgsrc/editors/emacs25/hacks.mk:1.1 pkgsrc/editors/emacs25/hacks.mk:1.2
--- pkgsrc/editors/emacs25/hacks.mk:1.1 Sun Sep 18 13:36:18 2016
+++ pkgsrc/editors/emacs25/hacks.mk     Sat Jun 17 19:40:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2016/09/18 13:36:18 ryoon Exp $
+# $NetBSD: hacks.mk,v 1.2 2017/06/17 19:40:19 joerg Exp $
 
 .if !defined(EMACS_HACKS_MK)
 EMACS_HACKS_MK=        defined
@@ -15,19 +15,4 @@ CFLAGS+=             -fno-optimize-strlen
 .  endif
 .endif
 
-### PaX is enabled, bootstrap-emacs command dumps core with segfault.
-### emacs-24.5/src/Makefile.in does not support NetBSD paxctl(8) syntax.
-### http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23371
-###
-.if !empty(MACHINE_PLATFORM:MNetBSD-*)
-.  if exists(/usr/sbin/paxctl)
-SUBST_CLASSES+=                        paxctl
-SUBST_STAGE.paxctl=            pre-configure
-SUBST_MESSAGE.paxctl=          Setting paxctl command
-SUBST_FILES.paxctl+=           src/Makefile.in
-SUBST_SED.paxctl+=             -e 's,test "X$$(PAXCTL)" = X || $$(PAXCTL) -zex,/usr/sbin/paxctl +a,g'
-SUBST_SED.paxctl+=             -e 's,test "X$$(PAXCTL)" = X || $$(PAXCTL) -r,/usr/sbin/paxctl +a,g'
-.  endif
-.endif
-
 .endif  # EMACS_HACKS_MK

Follow-Ups:
- Re: CVS commit: pkgsrc/editors
  - From: David Holland

Prev by Date: CVS commit: pkgsrc/devel/py-lazr.delegates
Next by Date: CVS commit: pkgsrc/emulators/libretro-mupen64plus
Previous by Thread: CVS commit: pkgsrc/devel/py-lazr.delegates
Next by Thread: Re: CVS commit: pkgsrc/editors
Indexes:

Home | Main Index | Thread Index | Old Index