head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.70 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.68 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.66 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.64 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.62 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.60 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.58 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.56 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.54 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.52 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.50 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.48 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.46 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.44 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.42 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.40 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.38 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.36 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.34 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.32 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.30 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.28 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.26 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.22 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.2 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.24 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.20 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.18 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.16 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.14 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.12 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.10 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.8 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.6 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.4 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.4.0.2 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.3.0.4 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.2 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.2.0.108 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.106 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.104 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.102 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.100 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.98 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.96 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.94 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.92 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.90 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.88 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.86 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.84 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.82 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.80 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.78 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.76 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.74 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.72 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.70 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.68 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.66 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.64 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.62 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.60 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.58 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.56 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.54 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.52 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.50 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.48 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.46 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.44 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.42 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.40 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.38 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2017.07.23.05.11.42; author dholland; state Exp; branches; next 1.4; commitid MtLA967mBq5Xnj0A; 1.4 date 2017.06.17.19.40.18; author joerg; state Exp; branches 1.4.2.1; next 1.3; commitid UqNvh36r3p4WlLVz; 1.3 date 2016.11.26.06.38.06; author dholland; state Exp; branches; next 1.2; commitid wSclouvwO08EwBvz; 1.2 date 2003.04.11.04.00.18; author uebayasi; state Exp; branches; next 1.1; 1.1 date 2003.04.11.00.31.45; author uebayasi; state Exp; branches 1.1.1.1; next ; 1.4.2.1 date 2017.07.31.05.56.43; author spz; state Exp; branches; next ; commitid lBdxG21X4x5Lnl1A; 1.1.1.1 date 2003.04.11.00.31.45; author uebayasi; state Exp; branches; next ; desc @@ 1.5 log @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. @ text @$NetBSD: patch-af,v 1.3 2016/11/26 06:38:06 dholland Exp $ --- src/Makefile.in.orig 2016-11-26 06:25:26.875919180 +0000 +++ src/Makefile.in @@@@ -329,7 +329,7 @@@@ LIBXMENU= #ifdef USE_X_TOOLKIT #define @@X_TOOLKIT_TYPE@@ #if defined (LUCID) || defined (ATHENA) -LIBW= -lXaw +LIBW= -lXaw @@LIBXPM@@ #endif #ifdef MOTIF #if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP) @@@@ -402,7 +402,7 @@@@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 ask GCC explicitly where to find libgcc.a. */ #ifndef LINKER -#define LINKER $(CC) -nostdlib +#define LINKER $(CC) -nostartfiles #endif #ifndef LIB_GCC @@@@ -804,14 +804,7 @@@@ LIBES = $(LOADLIBES) $(LDLIBS) $(LIBX) L #define OBJECTS_MACHINE #endif -all: emacs bytecomp OTHER_FILES - -bytecomp: emacs - ./emacs -batch -q -f batch-byte-compile \ - ${lispsource}ange-ftp.el ${lispsource}international/ccl.el \ - ${lispsource}international/mule-cmds.el \ - ${lispsource}international/mule.el \ - ${lispsource}international/titdic-cnv.el +all: emacs OTHER_FILES 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, @ 1.4 log @Remove now obsolete Emacs ASLR hacks. @ text @d39 16 @ 1.4.2.1 log @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 @ text @d1 1 a1 1 $NetBSD$ a38 16 @@@@ -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, @ 1.3 log @Use paxctl +a like in emacs21 to make the build work on -current. It seems that if you dump with a non-ASLR temacs you get a working emacs binary, and if you don't you don't, although I don't really see why -- perhaps it's something broken in crtstuff. Closes PR 51654. Note that pre-ASLR emacs20 binaries not dumped by an ASLR temacs also blow up in the same way, which doesn't make much sense either, but undoubtedly it's all connected. It's not particularly good that we apparently don't have backwards compatibility for old Emacs binaries because of this, but for the time being I'm more worried about it working at all. PKGREVISION++ again, to 22. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.2 2003/04/11 04:00:18 uebayasi Exp $ a38 16 @@@@ -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, @ 1.2 log @* Put back the 'EMACS_USE_X' option, which is needed since we don't have -nox11 for Emacs 20. * Buildlink2 clean up. Include xaw.buildlink2.mk when either Lucid or Athena is used. (Lucid uses Athena.) Included motif.buildlink2.mk when Motif is used. XXX While this, we need to link temacs against X libs, which may break Unexec stuffs on NetBSD/pmax, which was fixed around 1999/01 - 1999/02. I suppose this doesn't change the resulting binary packages. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ d3 1 a3 1 --- src/Makefile.in.orig Thu Mar 27 12:43:25 2003 d5 1 a5 1 @@@@ -329,7 +329,7 @@@@ d14 1 a14 1 @@@@ -402,7 +402,7 @@@@ d23 1 a23 1 @@@@ -804,14 +804,7 @@@@ d39 16 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.7 2003/03/01 06:18:22 uebayasi Exp $ d3 1 a3 1 --- src/Makefile.in.orig Thu Jan 16 19:08:48 2003 a22 9 @@@@ -457,7 +457,7 @@@@ #endif /* not ORDINARY_LINK */ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ - LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS) + LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE /* A macro which other sections of Makefile can redefine to munge the flags before they're passed to LD. This is helpful if you have @ 1.1.1.1 log @Re-import of Emacs 20, which has settled down in editors/emacs. @ text @@