lisp/info.el | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 prefer /usr/share/info/emacs-24 over /usr/share/info.

Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info.

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.

lisp/startup.el | 21 19 + 2 - 0 !
1 file changed, 19 insertions(+), 2 deletions(-)

 run debian-startup and set debian-emacs-flavor.

Emacs runs debian-startup and sets debian-emacs-flavor.

* Emacs runs debian-startup during the startup process unless
  site-run-file is false.

* The global variable debian-emacs-flavor is bound to 'emacs24.

Makefile.in | 54 17 + 37 - 0 !
admin/update_autogen | 3 1 + 2 - 0 !
build-aux/make-info-dir | 3 1 + 2 - 0 !
configure.ac | 6 3 + 3 - 0 !
doc/misc/Makefile.in | 706 4 + 702 - 0 !
lisp/help.el | 10 9 + 1 - 0 !
6 files changed, 35 insertions(+), 747 deletions(-)

 remove files that appear to be incompatible with the dfsg

Files that appear to be incompatible with the DFSG have been removed.

A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.

In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.

The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.

etc/NEWS | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 adjust documentation references for debian.

Various documentation references have been adjusted for Debian.

References to /usr/local/... have been changed to /usr/... as
appropriate, etc.

lisp/version.el | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 modify the output of (version) to indicate debian modifications.

The output of (version) has been modified to indicate Debian modifications.

src/callproc.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 look for news in order to find etc/ rather than gnu.

Emacs will now look for NEWS in order to find etc/ rather than GNU.

Since Debian doesn't include GNU in the Debian packages (the common
licenses are in /usr/share/common-licenses), Emacs will now look for
NEWS to find the etc directory instead of GNU.

Provided-by: Sven Joachim <svenjoac@gmx.de>
Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
Date: Mon, 28 Apr 2008 11:20:23 +0200
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific

admin/unidata/Makefile.in | 8 1 + 7 - 0 !
1 file changed, 1 insertion(+), 7 deletions(-)

 don't try to build src/macuvs.h (via ivd_sequences.txt)

These are OS X specific, and were removed for now, due to uncertainty
over the licensing.

lisp/ChangeLog | 10 10 + 0 - 0 !
lisp/progmodes/grep.el | 21 11 + 10 - 0 !
2 files changed, 21 insertions(+), 10 deletions(-)

 emacs won't assume grep supports grep_options

This upstream patch has been added:

  Don't assume 'grep' supports GREP_OPTIONS.

  The GREP_OPTIONS environment variable is planned to be marked
  obsolescent in GNU grep, due to problems in its use, so stop
  relying on it.
  * progmodes/grep.el (grep-highlight-matches): Document this.
  (grep-process-setup): Do not set GREP_OPTIONS.
  (grep-compute-defaults): Use an explicit --color option if supported.

src/dispextern.h | 1 0 + 1 - 0 !
src/emacs.c | 1 0 + 1 - 0 !
src/keyboard.c | 4 2 + 2 - 0 !
src/sysdep.c | 9 0 + 9 - 0 !
4 files changed, 2 insertions(+), 13 deletions(-)

 emacs should no longer hang during large yanks

This upstream patch has been added:

  Fix hang with large yanks

  Backport of master commit 0592cefd03f1de2f04b721d07a16e6e0a9e48f73.
  This should fix the bug fixed by Mike Crowe's patch in:
  https://lists.gnu.org/archive/html/emacs-devel/2015-07/msg00106.html
  A problem in this area has been reported by several users; see
  Bug#16737, Bug#17101, Bug#17026, Bug#17172, Bug#19320, Bug#20283.

src/unexelf.c | 16 8 + 8 - 0 !
1 file changed, 8 insertions(+), 8 deletions(-)

 elf unexec: correct section header index

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [1/10]:

  ELF unexec: Correct section header index

  First a small fix.  The code incorrectly uses "NEW_SECTION_H (n)" when
  it should have been using "NEW_SECTION_H (nn)" to find the name of the
  section currently being processed.  Of course, before the bss
  sections, n and nn have the same value, so this doesn't matter except
  in the case of .sbss.  For .sbss this probably meant .bss (most likely
  the next section) was copied from memory.  A later patch removes the
  bogus .sbss handling anyway.

  * unexelf.c (unexec): Use correct index to look up names.

src/unexelf.c | 210 96 + 114 - 0 !
1 file changed, 96 insertions(+), 114 deletions(-)

 elf unexec: tidy code

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [2/10]:

  ELF unexec: Tidy code

  Separate out some of the more mechanical changes so following patches
  are smaller.

  * unexelf.c (unexec): Rearrange initialisation of program
  header vars.  Use pointer vars in loops rather than indexing
  section header array via macros.  Simplify _OBJC_ sym code
  and reloc handling code.

src/unexelf.c | 96 29 + 67 - 0 !
1 file changed, 29 insertions(+), 67 deletions(-)

 elf unexec: merge alpha and mips coff debug handling

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [3/10]:

  ELF unexec: Merge Alpha and MIPS COFF debug handling

  * unexelf.c (unexec): Merge Alpha and MIPS COFF debug handling.
  Don't find .mdebug section index, find the section in the loop.
  Allow for unlikely possibility that .mdebug is located at sh_offset

src/unexelf.c | 9 5 + 4 - 0 !
1 file changed, 5 insertions(+), 4 deletions(-)

 elf unexec: symbol table patching

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [4/10]:

  ELF unexec: Symbol table patching

  No st_shndx value larger than SHN_LORESERVE should be changed.
  * unexelf.c (unexec): Don't adjust any st_shndx larger than
  SHN_LORESERVE.  Error on SHN_XINDEX.

src/unexelf.c | 31 18 + 13 - 0 !
1 file changed, 18 insertions(+), 13 deletions(-)

 elf unexec: _objc_ symbols in bss sections

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [5/10]:

  ELF unexec: _OBJC_ symbols in bss sections

  This code assumed that there was only one bss section.  Rather than
  checking for a particular index, check the section type.  Also, handle
  the possibility that the section was SHT_NOBITS originally and is
  unchanged, in which case no clearing is needed (and sh_offset isn't
  necessarily valid, which can lead to a wild memset).

  * unexelf.c (unexec): Properly handle _OBJC_ symbols in bss sections.

src/unexelf.c | 14 7 + 7 - 0 !
1 file changed, 7 insertions(+), 7 deletions(-)

 elf unexec: r_*_none relocs

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [6/10]:

  ELF unexec: R_*_NONE relocs

  These should be ignored on all targets.

  * unexelf.c (unexec): Ignore R_*_NONE relocs for any target,
  not just Alpha.  Comment on reloc size assumption.

src/unexelf.c | 290 77 + 213 - 0 !
1 file changed, 77 insertions(+), 213 deletions(-)

 elf unexec: drive from pt_load header rather than sections

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [7/10]:

  ELF unexec: Drive from PT_LOAD header rather than sections

  This rewrites bss handling in the ELF unexec code.  Finding bss
  sections by name results in complicated code that
  - does not account for all names of possible bss sections,
  - assumes specific ordering of bss sections,
  - can wrongly choose a SHT_NOBITS section not in the bss segment,
  - incorrectly calculates bss size (no accounting for alignment gaps),
  - assumes .data and .bss are in the same segment.

  All of these problems and more are solved by finding the bss segment
  in PT_LOAD headers, ie. the address range included in p_memsz but not
  p_filesz of the last PT_LOAD header, then matching SHT_NOBITS sections
  in that address range.

  * unexelf.c: Delete old ppc comment.
  (OLD_PROGRAM_H): Define.
  (round_up): Delete.
  (unexec): Don't search for bss style sections by name.  Instead,
  use the last PT_LOAD header address range covered by p_memsz
  but not p_filesz and match any SHT_NOBITS section in that
  address range.  Simplify initialisation of section header vars.
  Don't assume that section headers are above bss segment.  Move
  copying of bss area out of section loop.  Align .data2 section
  to 1, since it now covers the entire bss area.  For SHT_NOBITS
  sections in the bss segment, leave sh_addr and sh_addralign
  unchanged, but correct sh_offset.  Clear memory corresponding
  to SHT_NOBITS .plt section.  Delete comment and hacks for
  sections partly overlapping bss range now that the full range
  is properly calculated.  Delete now dead .sbss code.
  (Bug#20614)

src/unexelf.c | 524 50 + 474 - 0 !
1 file changed, 50 insertions(+), 474 deletions(-)

 elf unexec: don't insert a new section

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [8/10]:

  ELF unexec: Don't insert a new section

  Reuse the .bss section instead, making it SHT_PROGBITS.  This way we
  don't need to mess with symbol st_shndx, or section sh_link and
  sh_info.

  This does lead to eu-elflint complaints about symbols defined in .bss
  with a needed version, because normally it is undefined symbols that
  have needed versions;  Defined symbols have version definitions.
  The exception is symbols defined by the linker in .dynbss for
  variables copied from a shared library in order to avoid text
  relocations, with copy relocs to copy their initial values from the
  shared library.  These symbols are both defined and have needed
  versions, and eu-elflink only expects to see them in SHT_NOBITS
  sections.  Of course there is no real problem with having such symbols
  in SHT_PROGBITS sections.  glibc ld.so handles them fine.

  * unexelf.c: Delete outdated comments.
  (PATCH_INDEX): Delete.
  (find_section): Delete.
  (unexec): Don't add a new section.  Instead reuse the last bss
  section, extending it to cover dumped data.  Make bss sections
  SHT_PROGBITS.  Remove all patching of sh_link, sh_info and
  st_shndx.  Rename bss sections.

src/unexelf.c | 4 1 + 3 - 0 !
1 file changed, 1 insertion(+), 3 deletions(-)

 * src/unexelf.c (new_program_h): remove unused macro (bug#20614).

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [9/10]:

  * src/unexelf.c (NEW_PROGRAM_H): Remove unused macro (Bug#20614).

src/unexelf.c | 11 8 + 3 - 0 !
1 file changed, 8 insertions(+), 3 deletions(-)

 elf unexec: align section header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Emacs should build on ppc64el.  A problem with the bss has been fixed.

This upstream patch has been added [10/10]:

  ELF unexec: align section header

  This ports the recent unexelf.c changes to Fedora x86-64
  when configured with GCCs -fsanitize=undefined option.
  * src/unexelf.c (unexec): Align new_data2_size to a multiple
  of ElfW (Shdr)s alignment, so that NEW_SECTION_H returns a
  pointer aligned appropriately for its type.

lisp/ChangeLog | 6 6 + 0 - 0 !
lisp/term/x-win.el | 63 33 + 30 - 0 !
src/ChangeLog | 31 31 + 0 - 0 !
src/gtkutil.c | 421 85 + 336 - 0 !
src/gtkutil.h | 2 0 + 2 - 0 !
src/xmenu.c | 6 0 + 6 - 0 !
src/xterm.h | 4 0 + 4 - 0 !
7 files changed, 155 insertions(+), 378 deletions(-)

 emacs should show gtk+ icons again.

This upstream patch has been added:

  Handle deprecated Gtk+ stuff for version <= 3.10

  * lisp/term/x-win.el (x-gtk-stock-map): Add icon names suggested as
  replacements to stock names before stock names in a list.
  Cdr may be a list, each name is tried in turn until one is found.

  * src/gtkutil.c (XG_TEXT_CANCEL, XG_TEXT_OPEN, XG_TEXT_OK): New defines
  to handle Gtk versions.
  (xg_get_file_with_chooser): Use them.
  (xg_have_tear_offs, tearoff_remove, tearoff_activate): Remove
  (create_menus): Remove teroff argument and code.
  Remove call to gtk_menu_set_title.
  (xg_update_menubar, xg_update_submenu): Remove tearoff code.  Adjust
  args to create_menus.
  (xg_tool_bar_menu_proxy, xg_tool_bar_detach_callback)
  (xg_tool_bar_attach_callback, TOOLBAR_TOP_WIDGET): Remove.
  (xg_pack_tool_bar): Replace TOOLBAR_TOP_WIDGET, remove detach code.
  (xg_make_tool_item): Remove detach code.
  (xg_update_tool_bar_sizes): Replace TOOLBAR_TOP_WIDGET.
  (find_icon_from_name): New function.
  (update_frame_tool_bar): Remove GtkStockItem code, move to
  find_icon_from_name.  Let stock be a list of icon names to try.
  Only use gtk_image_new_from_stock on Gtk+ < 3.10.
  Replace TOOLBAR_TOP_WIDGET.
  (free_frame_tool_bar, xg_change_toolbar_position ): Replace
  TOOLBAR_TOP_WIDGET.
  (xg_initialize): Remove tearoff code.

  * src/gtkutil.h (xg_have_tear_offs): Remove declaration.

  * src/xmenu.c (set_frame_menubar): Remove GTK block that calls
  xg_have_tear_offs.

  * src/xterm.h (handlebox_widget): Remove.

src/gmalloc.c | 47 47 + 0 - 0 !
1 file changed, 47 insertions(+)

 emacs should work with gcc 5.2 and newer

This patch, backported from upstream by Aurelien Jarno
<aurel32@debian.org>, has been added:

  Always define gmalloc etc. in src/gmalloc.c

  This is a work-around to prevent the compiler from using semantic
  knowledge about malloc for optimization purposes.  E.g., gcc 5.2
  with -O2 replaces most of calloc's definition by a call to calloc;
  see Bug#22085.
  * src/gmalloc.c [!HYBRID_MALLOC] (malloc, realloc, calloc)
  (aligned_alloc, free): Do not undef.  Instead, define these as
  functions (perhaps renamed to gmalloc etc.) in terms of gmalloc etc.

admin/CPP-DEFINES | 2 1 + 1 - 0 !
configure.ac | 20 11 + 9 - 0 !
src/emacs.c | 30 14 + 16 - 0 !
3 files changed, 26 insertions(+), 26 deletions(-)

 emacs should work with glibc 2.24 on ppc64

This patch, backported from upstream by Aurelien Jarno
<aurel32@debian.org>, has been added:

  Port to glibc 2.24 (pre-release) + ppc64

  Inspired by a suggestion by Florian Weimer in:
  https://sourceware.org/ml/libc-alpha/2016-07/msg00425.html
  * configure.ac (HAVE_PERSONALITY_ADDR_NO_RANDOMIZE):
  Rename from HAVE_PERSONALITY_LINUX32, and check for
  ADDR_NO_RANDOMIZE (the crucial thing) instead of for LINUX32.
  All uses changed.
  * src/emacs.c (main) [HAVE_PERSONALITY_ADDR_NO_RANDOMIZE]:
  Use ADDR_NO_RANDOMIZE from personality.h rather than inventing the
  flag ourselves.  Just set that flag, rather than also setting the
  persona.  When doing it, avoid functions like putenv that may
  allocate memory.

lisp/net/tramp-adb.el | 2 2 + 0 - 0 !
lisp/net/tramp-gvfs.el | 2 2 + 0 - 0 !
lisp/net/tramp-sh.el | 81 74 + 7 - 0 !
lisp/net/tramp-smb.el | 6 6 + 0 - 0 !
lisp/net/tramp.el | 51 5 + 46 - 0 !
5 files changed, 89 insertions(+), 53 deletions(-)

 emacs should no longer hang when loading tramp

Patch adapted from upstream repository commits 28caedba and 508049aa by
Michael Albinus.

lisp/net/tls.el | 16 8 + 8 - 0 !
1 file changed, 8 insertions(+), 8 deletions(-)

 remove --insecure from gnutls-cli invocation

Emacs should now use secure TLS connections by default.

The following upstream patch has been added:

  Remove --insecure from gnutls-cli invocation

  * tls.el (tls-program): Default to using secure TLS
  connections (bug#19284).

lisp/net/gnutls.el | 15 9 + 6 - 0 !
1 file changed, 9 insertions(+), 6 deletions(-)

 refactor out gnutls-trustfiles

Emacs should now specify a TLS trustfile.

This upstream patch has been added [1/2]:

  Refactor out gnutls-trustfiles

  * lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by tls.el.

lisp/net/tls.el | 28 14 + 14 - 0 !
1 file changed, 14 insertions(+), 14 deletions(-)

 make tls.el use trustfiles by default

Emacs should now specify a TLS trustfile.

This upstream patch has been added [2/2]:

  Make tls.el use trustfiles by default

  * lisp/net/tls.el (tls-program): Add a certfile by default (bug#21227).
  (open-tls-stream): Insert the trustfile by looking at
  `gnutls-trustfiles'.

configure.ac | 25 25 + 0 - 0 !
1 file changed, 25 insertions(+)

 emacs shouldn't segfault when gcc expects -nopie

This upstream patch has been added:

  Port to Ubuntu 16.10, which needs gcc -nopie

  * configure.ac (emacs_cv_prog_cc_no_pie): Rename from
  emacs_cv_prog_cc_nopie.  All usages changed.  Check for -no-pie in
  preference to -nopie (Bug#24682).  Backport from master.

lisp/net/imap.el | 63 18 + 45 - 0 !
1 file changed, 18 insertions(+), 45 deletions(-)

 imap connections no longer use openssl s_client

`imap-ssl-program' has been removed, and imap.el uses the internal
GnuTLS encryption functions if possible.

Accomplished by incorporating this upstream patch:

  Use built-in encryption in imap.el

  * lisp/net/imap.el (imap-ssl-program): Remove (bug#21134).
  (imap-starttls-open): Use open-network-stream instead of starttls.el.
  (imap-tls-open): Use open-network-stream instead of tls.el.

lisp/net/tls.el | 15 5 + 10 - 0 !
1 file changed, 5 insertions(+), 10 deletions(-)

 openssl s_client is no longer a default for ssl connections

"s_client is a debug tool, it does not set up a secure connection, it
ignores all errors and just continues.  It also doesn't do checks it
should be doing.  This is all documented behaviour." -- Kurt Roeckx

Bug-Debian: https://bugs.debian.org/766397

src/emacs.c | 21 21 + 0 - 0 !
1 file changed, 21 insertions(+)

 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.lane@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.

lisp/gnus/mm-view.el | 4 0 + 4 - 0 !
lisp/textmodes/enriched.el | 32 0 + 32 - 0 !
2 files changed, 36 deletions(-)

 remove unsafe enriched mode translations

* lisp/gnus/mm-view.el (mm-inline-text):
Do not worry about enriched or richtext type.
* lisp/textmodes/enriched.el (enriched-translations):
Remove translations for FUNCTION, display (Bug#28350).
(enriched-handle-display-prop, enriched-decode-display-prop): Remove.