Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package emacs24
This upload is intended to fix two dependency problems and the ppc64(el)
memory exhaustion issue.
diff -Nru emacs24-24.5+1/debian/.git-dpm emacs24-24.5+1/debian/.git-dpm
--- emacs24-24.5+1/debian/.git-dpm 2017-04-22 12:32:14.000000000 -0500
+++ emacs24-24.5+1/debian/.git-dpm 2017-04-29 10:23:13.000000000 -0500
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-088b2e039897fcf9e2eea00f580a2c5d87eba781
-088b2e039897fcf9e2eea00f580a2c5d87eba781
+d1daaa0d464b4610e0f74553c5a91d1e5193c2ab
+d1daaa0d464b4610e0f74553c5a91d1e5193c2ab
62bc68f777c532a970566625e315d68bf0ab4eee
62bc68f777c532a970566625e315d68bf0ab4eee
emacs24_24.5+1.orig.tar.bz2
diff -Nru emacs24-24.5+1/debian/changelog emacs24-24.5+1/debian/changelog
--- emacs24-24.5+1/debian/changelog 2017-04-22 12:33:05.000000000 -0500
+++ emacs24-24.5+1/debian/changelog 2017-04-29 10:23:47.000000000 -0500
@@ -1,3 +1,24 @@
+emacs24 (24.5+1-11) unstable; urgency=medium
+
+ * emacs-common: add "Breaks: mell (<= 1.0.0-7)". Apparently it was
+ removed from the archive in 2011 and can no longer install.
+ Thanks to Andreas Beckmann for reporting the problem.
+ (Closes: 860858)
+
+ * emacs-common: add "Breaks: prom-mew (<= 2.00+3.2am01-1)".
+ Apparently it was removed from the archive in 2009 and can no
+ longer install. Thanks to Andreas Beckmann for reporting the
+ problem. (Closes: 851604)
+
+ * Add additional fix for memory exhaustion on ppc64el. Add
+ 0030-Emacs-should-really-work-with-glibc-2.24-on-ppc64.patch to
+ augment the previous fix for memory exhaustion on ppc64(el).
+ Thanks to Adrian Bunk and Iain Lane for reporting the problem and
+ Iain Lane for backporting and providing the fix.
+ (Closes: 854799, 861032)
+
+ -- Rob Browning <r...@defaultvalue.org> Sat, 29 Apr 2017 10:23:47 -0500
+
emacs24 (24.5+1-10) unstable; urgency=medium
* Don't segfault if gcc expects -nopie instead of -no-pie.
diff -Nru emacs24-24.5+1/debian/control emacs24-24.5+1/debian/control
--- emacs24-24.5+1/debian/control 2017-04-22 12:33:05.000000000 -0500
+++ emacs24-24.5+1/debian/control 2017-04-29 10:23:47.000000000 -0500
@@ -105,7 +105,9 @@
Suggests: emacs24-el, emacs24-common-non-dfsg, ncurses-term
Conflicts: emacs24-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
Breaks: apel (<< 10.8+0.20120427-4),
- oneliner-el (<= 0.3.6-7.1)
+ mell (<= 1.0.0-7),
+ oneliner-el (<= 0.3.6-7.1),
+ prom-mew (<= 2.00+3.2am01-1)
Description: GNU Emacs editor's shared, architecture independent infrastructure
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture independent infrastructure
diff -Nru emacs24-24.5+1/debian/control.in emacs24-24.5+1/debian/control.in
--- emacs24-24.5+1/debian/control.in 2017-04-22 12:32:11.000000000 -0500
+++ emacs24-24.5+1/debian/control.in 2017-04-29 10:23:13.000000000 -0500
@@ -105,7 +105,9 @@
Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg, ncurses-term
Conflicts: @DEB_FLAVOR@-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
Breaks: apel (<< 10.8+0.20120427-4),
- oneliner-el (<= 0.3.6-7.1)
+ mell (<= 1.0.0-7),
+ oneliner-el (<= 0.3.6-7.1),
+ prom-mew (<= 2.00+3.2am01-1)
Description: GNU Emacs editor's shared, architecture independent infrastructure
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture independent infrastructure
diff -Nru emacs24-24.5+1/debian/patches/0030-Emacs-should-really-work-with-glibc-2.24-on-ppc64.patch emacs24-24.5+1/debian/patches/0030-Emacs-should-really-work-with-glibc-2.24-on-ppc64.patch
--- emacs24-24.5+1/debian/patches/0030-Emacs-should-really-work-with-glibc-2.24-on-ppc64.patch 1969-12-31 18:00:00.000000000 -0600
+++ emacs24-24.5+1/debian/patches/0030-Emacs-should-really-work-with-glibc-2.24-on-ppc64.patch 2017-04-29 10:23:13.000000000 -0500
@@ -0,0 +1,59 @@
+From d1daaa0d464b4610e0f74553c5a91d1e5193c2ab Mon Sep 17 00:00:00 2001
+From: Paul Eggert <egg...@cs.ucla.edu>
+Date: Tue, 19 Jul 2016 15:23:14 +0200
+Subject: Emacs should (really) work with glibc 2.24 on ppc64
+
+Apparently the earlier fix in 3a838494fc769f1ae39adf20325869331f0c300d
+("Emacs should work with glibc 2.24 on ppc64") was incomplete.
+
+This patch, backported to Debian/Ubuntu by Iain Lane
+<iain.l...@canonical.com>, has been added to address a remaining
+memory exhaustion problem:
+
+ Backport from master (Bug#24033).
+ Inspired by a suggestion by Florian Weimer in:
+ https://sourceware.org/ml/libc-alpha/2016-07/msg00425.html
+ * src/emacs.c (main) [__PPC64__]:
+ Special case for __PPC64__, which needs ASLR disabled in
+ dumped Emacs too.
+
+Origin: backport, commit: ff3fc21e24edffccce0d42065833e852a6792bd2
+Bug-Debian: http://bugs.debian.org/861032
+Bug-Debian: http://bugs.debian.org/854799
+Added-by: Rob Browning <r...@defaultvalue.org>
+---
+ src/emacs.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/src/emacs.c b/src/emacs.c
+index eda439ac6b1..64d7e315c94 100644
+--- a/src/emacs.c
++++ b/src/emacs.c
+@@ -723,6 +723,27 @@ main (int argc, char **argv)
+ stack_base = &dummy;
+ #endif
+
++#if defined HAVE_PERSONALITY_ADDR_NO_RANDOMIZE && defined __PPC64__
++ /* This code partly duplicates the HAVE_PERSONALITY_LINUX32 code
++ below. This duplication is planned to be fixed in a later
++ Emacs release. */
++# define ADD_NO_RANDOMIZE 0x0040000
++ int pers = personality (0xffffffff);
++ if (! (pers & ADD_NO_RANDOMIZE)
++ && 0 <= personality (pers | ADD_NO_RANDOMIZE))
++ {
++ /* Address randomization was enabled, but is now disabled.
++ Re-execute Emacs to get a clean slate. */
++ execvp (argv[0], argv);
++
++ /* If the exec fails, warn the user and then try without a
++ clean slate. */
++ perror (argv[0]);
++ }
++# undef ADD_NO_RANDOMIZE
++#endif
++
++
+ #ifdef G_SLICE_ALWAYS_MALLOC
+ /* This is used by the Cygwin build. It's not needed starting with
+ cygwin-1.7.24, but it doesn't do any harm. */
diff -Nru emacs24-24.5+1/debian/patches/series emacs24-24.5+1/debian/patches/series
--- emacs24-24.5+1/debian/patches/series 2017-04-22 12:32:14.000000000 -0500
+++ emacs24-24.5+1/debian/patches/series 2017-04-29 10:23:13.000000000 -0500
@@ -27,3 +27,4 @@
0027-Emacs-shouldn-t-segfault-when-gcc-expects-nopie.patch
0028-IMAP-connections-no-longer-use-openssl-s_client.patch
0029-openssl-s_client-is-no-longer-a-default-for-ssl-conn.patch
+0030-Emacs-should-really-work-with-glibc-2.24-on-ppc64.patch
unblock emacs24/24.5+1-11
Thanks
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
