From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SdiU5-0004i9-Iy for garchives@archives.gentoo.org; Sun, 10 Jun 2012 13:47:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99490E049A; Sun, 10 Jun 2012 13:47:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5232AE049A for ; Sun, 10 Jun 2012 13:47:01 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5703A1B409D for ; Sun, 10 Jun 2012 13:47:00 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2178) id D44922004B; Sun, 10 Jun 2012 13:46:58 +0000 (UTC) From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo commit in src/patchsets/emacs/24.1: 01_all_ns-appdirs.patch 02_all_paxctl.patch X-VCS-Repository: gentoo X-VCS-Files: 01_all_ns-appdirs.patch 02_all_paxctl.patch X-VCS-Directories: src/patchsets/emacs/24.1 X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Message-Id: <20120610134658.D44922004B@flycatcher.gentoo.org> Date: Sun, 10 Jun 2012 13:46:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c1157419-8154-4f2f-a26b-94fb7b29c3c4 X-Archives-Hash: 6fdcbac339e55a825b9e7d01ec3d9ba1 ulm 12/06/10 13:46:58 Added: 01_all_ns-appdirs.patch 02_all_paxctl.patch Log: Initial patchset for Emacs 24.1 Revision Changes Path 1.1 src/patchsets/emacs/24.1/01_all_ns-appdirs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/24= .1/01_all_ns-appdirs.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/24= .1/01_all_ns-appdirs.patch?rev=3D1.1&content-type=3Dtext/plain Index: 01_all_ns-appdirs.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D https://bugs.gentoo.org/268793 https://bugs.gentoo.org/399059 --- emacs-24.1-orig/Makefile.in +++ emacs-24.1/Makefile.in @@ -476,21 +476,6 @@ -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) rm -f $(DESTDIR)${bindir}/$(EMACS) -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) - if test "${ns_appresdir}" !=3D ""; then \ - ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then dir=3Dshare/emacs/*/*; $(MV_DIRS); fi= ;\ - if test -d share/info ; then dir=3Dshare/info; $(MV_DIRS) ; fi ; \ - rm -fr share ) ; \ - ( cd ${ns_appbindir} ; \ - if cd libexec ; then dir=3Demacs/*/*/* ; $(MV_DIRS); \ - rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \ - ln -sf ../libexec/* . ; fi ; fi ) ; \ - else true ; fi - -## FIXME is the emacs-24* bit above really necessary and correct? -## What if I have 24.1 and 24.2 installed at the same time? -## In any case, it should use something like echo $version | sed 's/\..*= //' -## instead of hard-coding a version. =20 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html ## Needs to be the user running install, so configure can't set it. --- emacs-24.1-orig/leim/Makefile.in +++ emacs-24.1/leim/Makefile.in @@ -259,11 +259,6 @@ [ -n "$${installuser}" ] && break ; \ done ; \ find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' - if [ "${ns_appresdir}" !=3D "" ]; then \ - ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then dir=3Dshare/emacs/*/*; $(MV_DIRS); fi= ;\ - rm -fr share ) ; \ - else true ; fi =20 clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.elc=3D.el} \ 1.1 src/patchsets/emacs/24.1/02_all_paxctl.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/24= .1/02_all_paxctl.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/24= .1/02_all_paxctl.patch?rev=3D1.1&content-type=3Dtext/plain Index: 02_all_paxctl.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Disable memory randomization for the temacs binary via PaX flags if the paxctl utility is available. https://bugs.gentoo.org/411439 http://debbugs.gnu.org/11398 --- emacs-24.1-orig/configure.in +++ emacs-24.1/configure.in @@ -756,6 +756,8 @@ AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) dnl Don't use GZIP, which is used by gzip for additional parameters. AC_PATH_PROG(GZIP_PROG, gzip) +AC_PATH_PROG(PAXCTL, paxctl,, + [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) =20 =20 ## Need makeinfo >=3D 4.6 (?) to build the manuals. --- emacs-24.1-orig/src/Makefile.in +++ emacs-24.1/src/Makefile.in @@ -116,6 +116,12 @@ ## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason). TEMACS_LDFLAGS2 =3D @TEMACS_LDFLAGS2@ =20 +## If available, the full path to the paxctl program. +## On grsecurity/PaX systems, unexec will fail due to a gap between +## the bss section and the heap. This can be prevented by disabling +## memory randomization in temacs with "paxctl -r". See bug#11398. +PAXCTL =3D @PAXCTL@ + ## Some systems define this to request special libraries. LIBS_SYSTEM=3D@LIBS_SYSTEM@ =20 @@ -406,6 +412,7 @@ -f list-load-path-shadows || true; \ else \ LC_ALL=3DC $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ + test "X$(PAXCTL)" =3D X || $(PAXCTL) -zex emacs$(EXEEXT); \ ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ ./emacs -batch -f list-load-path-shadows || true; \ fi @@ -453,6 +460,8 @@ temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)= /libgnu.a $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2= ) \ -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) + test "$(CANNOT_DUMP)" =3D "yes" || \ + test "X$(PAXCTL)" =3D X || $(PAXCTL) -r temacs$(EXEEXT) =20 ## The following oldxmenu-related rules are only (possibly) used if ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them @@ -600,6 +609,7 @@ ln -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ else \ $(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \ + test "X$(PAXCTL)" =3D X || $(PAXCTL) -zex emacs$(EXEEXT); \ mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ fi @: Compile some files earlier to speed up further compilation.