aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-02-28 02:11:39 +0100
committerUlrich Müller <ulm@gentoo.org>2013-02-28 02:11:39 +0100
commitd7c900dad5d624fca489d0b74da9b3a78472d5be (patch)
treecc3a4b0e33753f4686ce456c919a2ac7e8b5d48c /emacs
parentFix build failure with separate tinfo library, bug 459458. (diff)
downloademacs-patches-d7c900dad5d624fca489d0b74da9b3a78472d5be.tar.gz
emacs-patches-d7c900dad5d624fca489d0b74da9b3a78472d5be.tar.bz2
emacs-patches-d7c900dad5d624fca489d0b74da9b3a78472d5be.zip
Remove 24.1 patchset.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/24.1/01_all_ns-appdirs.patch41
-rw-r--r--emacs/24.1/02_all_paxctl.patch66
-rw-r--r--emacs/24.1/03_all_x32.patch21
-rw-r--r--emacs/24.1/04_all_gnulib-gets.patch105
-rw-r--r--emacs/24.1/05_all_freebsd.patch16
-rw-r--r--emacs/24.1/06_all_local-eval.patch28
-rw-r--r--emacs/24.1/07_all_ar.patch47
7 files changed, 0 insertions, 324 deletions
diff --git a/emacs/24.1/01_all_ns-appdirs.patch b/emacs/24.1/01_all_ns-appdirs.patch
deleted file mode 100644
index a8e3f82..0000000
--- a/emacs/24.1/01_all_ns-appdirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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}" != ""; then \
-- ( cd ${ns_appresdir} ; \
-- if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
-- if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
-- rm -fr share ) ; \
-- ( cd ${ns_appbindir} ; \
-- if cd libexec ; then dir=emacs/*/*/* ; $(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.
-
- ## 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}" != "" ]; then \
-- ( cd ${ns_appresdir} ; \
-- if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
-- rm -fr share ) ; \
-- else true ; fi
-
- clean mostlyclean:
- rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \
diff --git a/emacs/24.1/02_all_paxctl.patch b/emacs/24.1/02_all_paxctl.patch
deleted file mode 100644
index 1f659e6..0000000
--- a/emacs/24.1/02_all_paxctl.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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".
-https://bugs.gentoo.org/411439
-https://bugs.gentoo.org/426394
-http://debbugs.gnu.org/11398
-
---- emacs-24.1-orig/configure.in
-+++ emacs-24.1/configure.in
-@@ -757,6 +757,16 @@
- dnl Don't use GZIP, which is used by gzip for additional parameters.
- AC_PATH_PROG(GZIP_PROG, gzip)
-
-+if test $opsys = gnu-linux; then
-+ AC_PATH_PROG(PAXCTL, paxctl,,
-+ [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
-+ if test "X$PAXCTL" != X; then
-+ AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-+ [if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then AC_MSG_RESULT(yes)
-+ else AC_MSG_RESULT(no); PAXCTL=""; fi])
-+ fi
-+fi
-
- ## Need makeinfo >= 4.6 (?) to build the manuals.
- AC_PATH_PROG(MAKEINFO, makeinfo, no)
---- 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 = @TEMACS_LDFLAGS2@
-
-+## 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 = @PAXCTL@
-+
- ## Some systems define this to request special libraries.
- LIBS_SYSTEM=@LIBS_SYSTEM@
-
-@@ -406,6 +412,7 @@
- -f list-load-path-shadows || true; \
- else \
- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
-+ test "X$(PAXCTL)" = 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)" = "yes" || \
-+ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
-
- ## 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)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
- mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
- fi
- @: Compile some files earlier to speed up further compilation.
diff --git a/emacs/24.1/03_all_x32.patch b/emacs/24.1/03_all_x32.patch
deleted file mode 100644
index c3d68a4..0000000
--- a/emacs/24.1/03_all_x32.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix compilation with ABI=x32.
-https://bugs.gentoo.org/420257
-
---- emacs-24.1-orig/src/m/amdx86-64.h
-+++ emacs-24.1/src/m/amdx86-64.h
-@@ -17,6 +17,7 @@
- You should have received a copy of the GNU General Public License
- along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-+#ifndef __ILP32__ /* Don't define for x32 ABI. */
- #define BITS_PER_LONG 64
- #define BITS_PER_EMACS_INT 64
-
-@@ -30,6 +31,7 @@
- #define EMACS_INT long
- #define pI "l"
- #define EMACS_UINT unsigned long
-+#endif /* __ILP32__ */
-
- /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
- #undef DATA_SEG_BITS
diff --git a/emacs/24.1/04_all_gnulib-gets.patch b/emacs/24.1/04_all_gnulib-gets.patch
deleted file mode 100644
index 2fd685c..0000000
--- a/emacs/24.1/04_all_gnulib-gets.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Fix compilation with glibc-2.16.
-https://bugs.gentoo.org/424755
-
-Patch backported from gnulib upstream:
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH 1/1] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- emacs-24.1-orig/lib/gnulib.mk
-+++ emacs-24.1/lib/gnulib.mk
-@@ -599,7 +624,6 @@
- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-- -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
---- emacs-24.1-orig/lib/stdio.in.h
-+++ emacs-24.1/lib/stdio.in.h
-@@ -699,22 +699,11 @@
- # endif
- #endif
-
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--# undef gets
--# define gets rpl_gets
--# endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--# undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
-+ so any use of gets warrants an unconditional warning; besides, C11
-+ removed it. */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
-@@ -1054,9 +1043,9 @@
- # endif
- #endif
-
--/* Some people would argue that sprintf should be handled like gets
-- (for example, OpenBSD issues a link warning for both functions),
-- since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+ (for example, OpenBSD issues a link warning for it),
-+ since it can cause security holes due to buffer overruns.
- However, we believe that sprintf can be used safely, and is more
- efficient than snprintf in those safe cases; and as proof of our
- belief, we use sprintf in several gnulib modules. So this header
---- emacs-24.1-orig/m4/stdio_h.m4
-+++ emacs-24.1/m4/stdio_h.m4
-@@ -1,4 +1,4 @@
--# stdio_h.m4 serial 40
-+# stdio_h.m4 serial 41
- dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -18,7 +18,6 @@
- GNULIB_GETC=1
- GNULIB_GETCHAR=1
- GNULIB_FGETS=1
-- GNULIB_GETS=1
- GNULIB_FREAD=1
- dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
- dnl "expected source file, required through AC_LIBSOURCES, not found". It is
-@@ -72,10 +71,10 @@
-
- dnl Check for declarations of anything we want to poison if the
- dnl corresponding gnulib module is not in use, and which is not
-- dnl guaranteed by C89.
-+ dnl guaranteed by both C89 and C11.
- gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
-- ]], [dprintf fpurge fseeko ftello getdelim getline pclose popen renameat
-- snprintf tmpfile vdprintf vsnprintf])
-+ ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
-+ renameat snprintf tmpfile vdprintf vsnprintf])
- ])
-
- AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
-@@ -113,7 +112,6 @@
- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR])
- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM])
- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE])
-- GNULIB_GETS=0; AC_SUBST([GNULIB_GETS])
- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF])
- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE])
diff --git a/emacs/24.1/05_all_freebsd.patch b/emacs/24.1/05_all_freebsd.patch
deleted file mode 100644
index 7444c33..0000000
--- a/emacs/24.1/05_all_freebsd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix linking on FreeBSD.
-http://debbugs.gnu.org/12047
-
---- emacs-24.1-orig/configure.in
-+++ emacs-24.1/configure.in
-@@ -1009,8 +1009,8 @@
- START_FILES='pre-crt0.o'
- ;;
- freebsd )
-- LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
-- START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
-+ LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
-+ START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
- ;;
- gnu-linux | gnu-kfreebsd )
- LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
diff --git a/emacs/24.1/06_all_local-eval.patch b/emacs/24.1/06_all_local-eval.patch
deleted file mode 100644
index fdce50c..0000000
--- a/emacs/24.1/06_all_local-eval.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix security flaw in enable-local-eval.
-http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00396.html
-https://bugs.gentoo.org/431178
-
---- emacs-24.1-orig/lisp/files.el
-+++ emacs-24.1/lisp/files.el
-@@ -3107,11 +3107,16 @@
- ;; Obey `enable-local-eval'.
- ((eq var 'eval)
- (when enable-local-eval
-- (push elt all-vars)
-- (or (eq enable-local-eval t)
-- (hack-one-local-variable-eval-safep (eval (quote val)))
-- (safe-local-variable-p var val)
-- (push elt unsafe-vars))))
-+ (let ((safe (or (hack-one-local-variable-eval-safep
-+ (eval (quote val)))
-+ ;; In case previously marked safe (bug#5636).
-+ (safe-local-variable-p var val))))
-+ ;; If not safe and e-l-v = :safe, ignore totally.
-+ (when (or safe (not (eq enable-local-variables :safe)))
-+ (push elt all-vars)
-+ (or (eq enable-local-eval t)
-+ safe
-+ (push elt unsafe-vars))))))
- ;; Ignore duplicates (except `mode') in the present list.
- ((and (assq var all-vars) (not (eq var 'mode))) nil)
- ;; Accept known-safe variables.
diff --git a/emacs/24.1/07_all_ar.patch b/emacs/24.1/07_all_ar.patch
deleted file mode 100644
index 179a9da..0000000
--- a/emacs/24.1/07_all_ar.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Get AR and ARFLAGS from configure.
-https://bugs.gentoo.org/436758
-http://debbugs.gnu.org/12549
-
---- emacs-24.2-orig/lwlib/Makefile.in
-+++ emacs-24.2/lwlib/Makefile.in
-@@ -37,7 +37,8 @@
- CPPFLAGS=@CPPFLAGS@
- RANLIB=@RANLIB@
-
--AR = ar cq
-+AR = @AR@
-+ARFLAGS = @ARFLAGS@
-
- LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
- MOTIF_OBJS = lwlib-Xm.o
-@@ -65,7 +66,7 @@
-
- liblw.a: $(OBJS)
- rm -f $@
-- $(AR) $@ $(OBJS)
-+ $(AR) $(ARFLAGS) $@ $(OBJS)
- $(RANLIB) $@
-
- ## Generated files in ../src, non-generated in $(srcdir)/../src.
---- emacs-24.2-orig/oldXMenu/Makefile.in
-+++ emacs-24.2/oldXMenu/Makefile.in
-@@ -57,8 +57,8 @@
- TAGS = etags
- RM = rm -f
- RANLIB = @RANLIB@
--# Solaris 2.1 ar doesn't accept the 'l' option.
--AR = ar cq
-+AR = @AR@
-+ARFLAGS = @ARFLAGS@
-
- OBJS = Activate.o \
- AddPane.o \
-@@ -98,7 +98,7 @@
-
- libXMenu11.a: $(OBJS) $(EXTRA)
- $(RM) $@
-- $(AR) $@ $(OBJS) $(EXTRA)
-+ $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
- $(RANLIB) $@
-
- Activate.o: Activate.c XMenuInt.h XMenu.h X10.h