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

 prefer /usr/share/info/emacs/

Emacs prefers /usr/share/info/emacs to /usr/share/info.

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

lisp/startup.el | 13 12 + 1 - 0 !
1 file changed, 12 insertions(+), 1 deletion(-)

 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 'emacs.

Makefile.in | 44 17 + 27 - 0 !
admin/update_autogen | 3 1 + 2 - 0 !
configure.ac | 15 6 + 9 - 0 !
doc/misc/Makefile.in | 43 5 + 38 - 0 !
lisp/help.el | 8 8 + 0 - 0 !
5 files changed, 37 insertions(+), 76 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 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 modify the output of (version) to indicate debian modifications

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

admin/unidata/Makefile.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 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.

test/lisp/emacs-lisp/package-tests.el | 9 8 + 1 - 0 !
1 file changed, 8 insertions(+), 1 deletion(-)

 kill gpg agent in package-test.el to avoid a race

package-test.el should no longer fail during clean up.

* Previously a delete-directories call raced with the gpg agent's own
  cleanup process (presumably triggered by the first deletion of one of
  the agent's sockets).  As a result, it looks like the agent might
  delete one of its sockets after delete-directories had decided to
  delete the socket, but before it made the attempt, causing an
  exception.

* To fix the problem, explicitly ask gpg-connect-agent to kill the agent
  before attempting to delete the gnupg home directory, and then delete
  via "rm -rf" to ignore any vanishing files.

test/lisp/progmodes/elisp-mode-tests.el | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 don't downcase real xref in elisp-mode-tests

The elisp-mode-tests should no longer fail on case sensitive
filesystems when the build path contains uppercase characters.

Previously the code was downcasing the path for both comparison and
lookups.

test/lisp/vc/vc-bzr-tests.el | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now

Currently the test fails like this:

  Running 3 tests (2018-12-17 12:17:43-0600)
     passed  1/3  vc-bzr-test-bug9726
  Mark set
  Press C-c C-c when you are done editing.
  Enter a change comment.  Type C-c C-c when done
     passed  2/3  vc-bzr-test-bug9781
  Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate"))
  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''

  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''

  Test vc-bzr-test-faulty-bzr-autoloads backtrace:
    logand(nil 128)
    vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr)
    vc-refresh-state()
    run-hooks(find-file-hook)
    after-find-file(t t)
    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
    find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el")
    autoload-find-generated-file()
    update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/")
    (progn (update-directory-autoloads default-directory) t)
    (setq value-35 (progn (update-directory-autoloads default-directory)
    (unwind-protect (setq value-35 (progn (update-directory-autoloads de
    (if (unwind-protect (setq value-35 (progn (update-directory-autoload
    (let (form-description-36) (if (unwind-protect (setq value-35 (progn
    (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form
    (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp-
    (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini
    (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi
    (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc
    ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi
    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
    eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
    command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te
    command-line()
    normal-top-level()
  Test vc-bzr-test-faulty-bzr-autoloads condition:
      (wrong-type-argument number-or-marker-p nil)
     FAILED  3/3  vc-bzr-test-faulty-bzr-autoloads

  Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600)

  1 unexpected results:
     FAILED  vc-bzr-test-faulty-bzr-autoloads

test/lisp/net/network-stream-tests.el | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 mark echo-server-with-dns test as :unstable for now

It fails inside a Debian sbuild chroot.

test/Makefile.in | 2 1 + 1 - 0 !
test/src/emacs-module-tests.el | 11 6 + 5 - 0 !
2 files changed, 7 insertions(+), 6 deletions(-)

 emacs-module-tests: fix vpath builds

Add the actual srcdir to the MODULE_CFLAGS include path, and adjust
the module/describe-function-1 test to ignore the shared library path
prefix, which varies when building outside the source tree.

Bug: https://debbugs.gnu.org/37797
Status: new

lisp/emacs-lisp/package.el | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 strip parent path from package descriptions for reproducibility

Previously, the package description would include the full build tree
path which varies.  Instead, remove any duplicate slashes and any
components other than the immediate parent.

Thanks to Chris Lamb for reporting the problem and tracking down the
cause.

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

etc/schema/schemas.xml | 58 58 + 0 - 0 !
1 file changed, 58 insertions(+)

 recover the contents of the schemas.xml file

* etc/schema/schemas.xml: Recover the file, which was apparently
(mostly) removed by mistake by commit 165f738382 (bug#42851).

Copyright-paperwork-exempt: yes
Bug: https://debbugs.gnu.org/42851
Bug-Debian: https://bugs.debian.org/973633

test/lisp/net/network-stream-tests.el | 20 20 + 0 - 0 !
test/src/process-tests.el | 26 19 + 7 - 0 !
2 files changed, 39 insertions(+), 7 deletions(-)

 skip tests that require internet when there's no internet

Bug#46641

The network-stream-tests actually work fine when the local machine has
no IP at all, but cause a crash in the GnuTLS library when there is an
IP configured but the interface is down.

* test/lisp/net/network-stream-tests.el (internet-is-working): New
defvar, checks if we can resolve "google.com".
(connect-to-tls-ipv4-nowait, connect-to-tls-ipv6-nowait)
(open-network-stream-tls-nowait, open-gnutls-stream-new-api-nowait)
(open-gnutls-stream-old-api-nowait): Use it to check for working
Internet access.

* test/src/process-tests.el (internet-is-working): New defvar, checks
if we can resolve "google.com".
(lookup-family-specification, lookup-unicode-domains)
(unibyte-domain-name, lookup-google, non-existent-lookup-failure): Use
it to check for working Internet access.

XXX DEBIAN: This patch was adjusted to always consider that we don't
have internet available during tests.

lib-src/etags.c | 149 113 + 36 - 0 !
test/manual/etags/CTAGS.good_crlf | 4484 4484 + 0 - 0 !
test/manual/etags/CTAGS.good_update | 4483 4483 + 0 - 0 !
test/manual/etags/Makefile | 11 11 + 0 - 0 !
test/manual/etags/crlf | 2 2 + 0 - 0 !
5 files changed, 9093 insertions(+), 36 deletions(-)

 fixed ctags local command execute vulnerability

lib-src/etags.c | 63 58 + 5 - 0 !
1 file changed, 58 insertions(+), 5 deletions(-)

 fix etags local command injection vulnerability

* lib-src/etags.c: (escape_shell_arg_string): New function.
(process_file_name): Use it to quote file names passed to the
shell.  (Bug#59817)

lisp/progmodes/ruby-mode.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix ruby-mode.el local command injection vulnerability (bug#60268)

* lisp/progmodes/ruby-mode.el
(ruby-find-library-file): Fix local command injection vulnerability.

lisp/htmlfontify.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix htmlfontify.el command injection vulnerability.

* lisp/htmlfontify.el (hfy-text-p): Fix command injection
vulnerability.  (Bug#60295)

lisp/files.el | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 * lisp/files.el (untrusted-content): new variable.

The new variable is to be used when buffer contents comes from untrusted
source.

(cherry picked from commit ccc188fcf98ad9166ee551fac9d94b2603c3a51b)

lisp/gnus/mm-view.el | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 * lisp/gnus/mm-view.el (mm-display-inline-fontify): mark contents
 untrusted.

(cherry picked from commit 937b9042ad7426acdcca33e3d931d8f495bdd804)

lisp/org/org.el | 19 19 + 0 - 0 !
1 file changed, 19 insertions(+)

 org-latex-preview: add protection when `untrusted-content' is non-nil

* lisp/org/org.el (org--latex-preview-when-risky): New variable
controlling how to handle LaTeX previews in Org files from untrusted
origin.
(org-latex-preview): Consult `org--latex-preview-when-risky' before
generating previews.

This patch adds a layer of protection when LaTeX preview is requested
for an email attachment, where `untrusted-content' is set to non-nil.

(cherry picked from commit 6f9ea396f49cbe38c2173e0a72ba6af3e03b271c)

lisp/org/org-attach.el | 10 8 + 2 - 0 !
lisp/org/org.el | 128 114 + 14 - 0 !
2 files changed, 122 insertions(+), 16 deletions(-)

 org: add setting for remote file download policy

* lisp/org/org.el (org-resource-download-policy, org-safe-remote-resources):
Two new customisations to configure the policy for downloading remote
resources.
(org--should-fetch-remote-resource-p, org--safe-remote-resource-p,
org--confirm-resource-safe): Introduce the new function
`org--should-fetch-remote-resource-p' for internal use determining
whether a remote resource should be downloaded according to the download
policy.  This function makes use of two helper functions,
`org--safe-remote-resource-p' and `org--confirm-resource-safe'.
(org-file-contents): Apply `org--safe-remote-resource-p' to file
downloading.

* lisp/org/org-attach.el (org-attach-attach, org-attach-url): Apply
`org--safe-remote-resource-p' to url downloading.

(cherry picked from Org-mode commit 0583a0c5eaa955d4370558b980b3772bb91dd057)

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

 org: refactor rx to concat + regexp-opt

* lisp/org.el (org--confirm-resource-safe): Since Emacs 26 doesn't
support rx's (literal S) construct, use (concat (regexp-opt ...) ...)
instead.

(cherry picked from Org-mode commit 6de5431acc8b77548e89c61a6ae0ebc1b57540bb)

lisp/org/org.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 org: correct regexp escaping to use regexp-quote

* lisp/org.el (org--confirm-resource-safe): `regexp-opt' was
accidentally used instead of `regexp-quote'.

(cherry picked from Org-mode commit 6ad53fa22eab5830f85a401960dc1e7d00154a27)

lisp/org/org.el | 14 9 + 5 - 0 !
1 file changed, 9 insertions(+), 5 deletions(-)

 org: fix resource prompt in non-file buffers

* lisp/org.el (org--confirm-resource-safe): When `buffer-file-name' is
nil, skip over file-specific behaviour.

(cherry picked from Org-mode commit 4702a73031c77ba03b480b0848c137d5d8773e07)

lisp/org/org.el | 32 23 + 9 - 0 !
1 file changed, 23 insertions(+), 9 deletions(-)

 org: add "mark domain as safe" convenience action

* lisp/org.el (org--confirm-resource-safe): Pick out domains from URLs,
and provide an option of marking that domain as safe.

(cherry picked from Org-mode commit 1ae801e9c86d5b150fd085230722e4dac550df30)

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

 org: tweak styling of url in resource prompt

* lisp/org.el (org--confirm-resource-safe): Style domain with a link,
and url with an underline.

(cherry picked from Org-mode commit 1061db94acf785f4b8f1140649e3857d52693115)

lisp/org/org.el | 7 4 + 3 - 0 !
1 file changed, 4 insertions(+), 3 deletions(-)

 org: use buffer-base-buffer in safe resource fns

* lisp/org.el (org--confirm-resource-safe, org--safe-remote-resource-p):
Replace instances of buffer-file-name
with (buffer-file-name (buffer-base-buffer)) so these functions work in
indirect buffers.

(cherry picked from Org-mode commit 88329143c86b34195af68a8e5d5fd3d00a5dcae6)

lisp/org/org.el | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 org-file-contents: consider all remote files unsafe

* lisp/org/org.el (org-file-contents): When loading files, consider all
remote files (like TRAMP-fetched files) unsafe, in addition to URLs.

(cherry picked from commit 2bc865ace050ff118db43f01457f95f95112b877)

lisp/org/org.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 org--confirm-resource-safe: fix prompt when prompting in non-file org
 buffers

* lisp/org/org.el (org--confirm-resource-safe): When called from
non-file buffer, do not put stray "f" in the prompt.

(cherry picked from commit 7a5d7be52c5f0690ee47f30bfad973827261abf2)

lisp/org/org.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 org: fix security prompt for downloading remote resource

* lisp/org.el (org--confirm-resource-safe): Do not assume that
resource is safe when user replies "n" (do not download).

Reported-by: Max Nikulin <manikulin@gmail.com>
Link: https://orgmode.org/list/upj6uk$b7o$1@ciao.gmane.io
(cherry picked from commit e56f0ef51bfdd0e03e817670754bc813fb3702a2)

lib-src/etags.c | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 * lib-src/etags.c (process_file_name): free malloc'ed vars
 (bug#61819).

(cherry picked from commit 0fde314f6f6e6664cddab1b2f0fe20629cd39d14)

lisp/org/ol.el | 39 29 + 10 - 0 !
1 file changed, 29 insertions(+), 10 deletions(-)

 org-link-expand-abbrev: do not evaluate arbitrary unsafe elisp code