[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#979749: marked as done (buster-pu: package emacs/1:26.1+1-3.2+deb10u1)

Your message dated Sat, 06 Feb 2021 10:39:26 +0000
with message-id <6425525e38201ecf9a2d3e0f1e63c0d3b08e0fc0.camel@adam-barratt.org.uk>
and subject line Closing p-u bugs for updates in 10.8
has caused the Debian Bug report #979749,
regarding buster-pu: package emacs/1:26.1+1-3.2+deb10u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
979749: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=979749
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

dkg has requested that we consider fixing this bug in buster:

  Debian: https://bugs.debian.org/919642
  Upstream: https://debbugs.gnu.org/34121

which is fairly straightforward (just the new patch at the end,
cherry-picked directly from the upstream fix):


diff -Nru emacs-26.1+1/debian/.git-dpm emacs-26.1+1/debian/.git-dpm
--- emacs-26.1+1/debian/.git-dpm	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/.git-dpm	2021-01-10 19:22:48.000000000 -0600
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-face2676a9d5a13b40eaeecfb09a16e81364e916
-face2676a9d5a13b40eaeecfb09a16e81364e916
+7812b00398e73156c07be2ea2abe1dbf0153ccfe
+7812b00398e73156c07be2ea2abe1dbf0153ccfe
 511a2cebd6df0f71ec24b5939564fb58726ead84
 511a2cebd6df0f71ec24b5939564fb58726ead84
 emacs_26.1+1.orig.tar.xz
diff -Nru emacs-26.1+1/debian/changelog emacs-26.1+1/debian/changelog
--- emacs-26.1+1/debian/changelog	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/changelog	2021-01-10 19:22:48.000000000 -0600
@@ -1,3 +1,11 @@
+emacs (1:26.1+1-3.2+deb10u2~1.gbp7c5887) UNRELEASED; urgency=medium
+
+  ** SNAPSHOT build @7c5887c8ae064398fafa38b8fea4c5d500830d5f **
+
+  * UNRELEASED
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 10 Jan 2021 19:22:48 -0600
+
 emacs (1:26.1+1-3.2+deb10u1) buster; urgency=high
 
   * Update the EPLA packaging key (previous key expires 2019-09-23) via
diff -Nru emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch
--- emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch	2021-01-10 19:22:48.000000000 -0600
@@ -15,7 +15,7 @@
 index 8743b449976..14d62f7f1cb 100644
 --- a/lisp/info.el
 +++ b/lisp/info.el
-@@ -213,7 +213,8 @@ A header-line does not scroll with the rest of the buffer."
+@@ -213,7 +213,8 @@ Info-default-directory-list
  	      (nconc standard-info-dirs (list config-dir))
  	    (cons config-dir standard-info-dirs))))
      (if (not (eq system-type 'windows-nt))
diff -Nru emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
--- emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch	2021-01-10 19:22:48.000000000 -0600
@@ -19,7 +19,7 @@
 index 9d16b59defd..d20431492a7 100644
 --- a/lisp/startup.el
 +++ b/lisp/startup.el
-@@ -434,6 +434,10 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
+@@ -434,6 +434,10 @@ tutorial-directory
    :type 'directory
    :initialize #'custom-initialize-delay)
  
@@ -30,7 +30,7 @@
  (defun normal-top-level-add-subdirs-to-load-path ()
    "Recursively add all subdirectories of `default-directory' to `load-path'.
  More precisely, this uses only the subdirectories whose names
-@@ -1121,8 +1125,21 @@ please check its value")
+@@ -1121,8 +1125,21 @@ command-line
      ;; be loaded from site-run-file and wants to test if -q was given
      ;; should check init-file-user instead, since that is already set.
      ;; See cus-edit.el for an example.
diff -Nru emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
--- emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch	2021-01-10 19:22:48.000000000 -0600
@@ -253,7 +253,7 @@
 index 77e32848318..22516310692 100644
 --- a/lisp/help.el
 +++ b/lisp/help.el
-@@ -292,6 +292,14 @@ If that doesn't give a function, return nil."
+@@ -292,6 +292,14 @@ view-help-file
    (goto-address-mode 1)
    (goto-char (point-min)))
  
diff -Nru emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
--- emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch	2021-01-10 19:22:48.000000000 -0600
@@ -15,7 +15,7 @@
 index 3a38b1d83c8..5d1248ac581 100644
 --- a/lisp/version.el
 +++ b/lisp/version.el
-@@ -62,7 +62,7 @@ Don't use this function in programs to choose actions according
+@@ -62,7 +62,7 @@ emacs-version
  to the system configuration; look at `system-configuration' instead."
    (interactive "P")
    (let ((version-string
diff -Nru emacs-26.1+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch emacs-26.1+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
--- emacs-26.1+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch	2021-01-10 19:22:48.000000000 -0600
@@ -23,7 +23,7 @@
 index 62fba58919f..e4aa519a4c6 100644
 --- a/test/lisp/emacs-lisp/package-tests.el
 +++ b/test/lisp/emacs-lisp/package-tests.el
-@@ -150,7 +150,14 @@
+@@ -150,7 +150,14 @@ package-test-fake-contents-file
                 ,@body)))
  
         (when (file-directory-p package-test-user-dir)
diff -Nru emacs-26.1+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch emacs-26.1+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
--- emacs-26.1+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch	2021-01-10 19:22:48.000000000 -0600
@@ -16,7 +16,7 @@
 index 941e85bc890..faf45b88ff7 100644
 --- a/test/lisp/progmodes/elisp-mode-tests.el
 +++ b/test/lisp/progmodes/elisp-mode-tests.el
-@@ -301,11 +301,15 @@
+@@ -301,11 +301,15 @@ xref-elisp-test-descr-to-target
  (defun xref-elisp-test-run (xrefs expected-xrefs)
    (should (= (length xrefs) (length expected-xrefs)))
    (while xrefs
@@ -33,7 +33,7 @@
        ;; Downcase the filenames for case-insensitive file systems.
        (setf (xref-elisp-location-file (oref xref location))
              (downcase (xref-elisp-location-file (oref xref location))))
-@@ -315,7 +319,7 @@
+@@ -315,7 +319,7 @@ xref-elisp-test-run
  
        (should (equal xref expected-xref))
  
diff -Nru emacs-26.1+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch emacs-26.1+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
--- emacs-26.1+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch	2021-01-10 19:22:48.000000000 -0600
@@ -22,7 +22,7 @@
 index 0fe15017dd0..f2cc351d70b 100644
 --- a/test/lisp/epg-tests.el
 +++ b/test/lisp/epg-tests.el
-@@ -87,6 +87,8 @@
+@@ -87,6 +87,8 @@ epg-tests-passphrase-callback
  (ert-deftest epg-decrypt-1 ()
    (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase))
    (with-epg-tests (:require-passphrase t)
diff -Nru emacs-26.1+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch emacs-26.1+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch
--- emacs-26.1+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch	2021-01-10 19:22:48.000000000 -0600
@@ -13,7 +13,7 @@
 index 996a31d375f..60f2aaf034b 100644
 --- a/test/lisp/net/tramp-tests.el
 +++ b/test/lisp/net/tramp-tests.el
-@@ -4702,8 +4702,9 @@ process sentinels.  They shall not disturb each other."
+@@ -4702,8 +4702,9 @@ tramp--test-timeout-handler
       (string-match
        (format
         "Loading %s"
diff -Nru emacs-26.1+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch emacs-26.1+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch
--- emacs-26.1+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch	2021-01-10 19:22:48.000000000 -0600
@@ -13,7 +13,7 @@
 index ff5162fefa5..c1d9ed9fc3b 100644
 --- a/test/lisp/ibuffer-tests.el
 +++ b/test/lisp/ibuffer-tests.el
-@@ -312,8 +312,8 @@
+@@ -312,8 +312,8 @@ ibuffer-saved-filters
                  (funcall create-non-file-buffer "ibuf-test-3.b" :size 50
                           :mode #'text-mode
                           :include-content "...but a multitude of drops?\n"))
diff -Nru emacs-26.1+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch emacs-26.1+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
--- emacs-26.1+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch	2021-01-10 19:22:48.000000000 -0600
@@ -12,7 +12,7 @@
 index ddb8f9ea6f5..42515025df8 100644
 --- a/test/lisp/net/network-stream-tests.el
 +++ b/test/lisp/net/network-stream-tests.el
-@@ -100,6 +100,7 @@
+@@ -100,6 +100,7 @@ server-process-filter
        ))))
  
  (ert-deftest echo-server-with-dns ()
diff -Nru emacs-26.1+1/debian/patches/0015-Avoid-elisp-crash-for-OpenPGP-User-IDs-with-no-e-mai.patch emacs-26.1+1/debian/patches/0015-Avoid-elisp-crash-for-OpenPGP-User-IDs-with-no-e-mai.patch
--- emacs-26.1+1/debian/patches/0015-Avoid-elisp-crash-for-OpenPGP-User-IDs-with-no-e-mai.patch	1969-12-31 18:00:00.000000000 -0600
+++ emacs-26.1+1/debian/patches/0015-Avoid-elisp-crash-for-OpenPGP-User-IDs-with-no-e-mai.patch	2021-01-10 19:22:48.000000000 -0600
@@ -0,0 +1,31 @@
+From 7812b00398e73156c07be2ea2abe1dbf0153ccfe Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 18 Jan 2019 03:12:07 -0500
+Subject: Avoid elisp crash for OpenPGP User IDs with no e-mail address
+
+* lisp/gnus/mml-sec.el (mml-secure-check-user-id): Verify that
+there is an e-mail address in the current User ID before trying
+to downcase it.  (Bug#34121)
+
+Copyright-paperwork-exempt: yes
+
+Origin: backport, commit: 90177d7f12d25e403abc6f1bdf242aed308a7bb8)
+Bug: https://debbugs.gnu.org/34121
+Bug-Debian: https://bugs.debian.org/919642
+---
+ lisp/gnus/mml-sec.el | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
+index 099e5372b48..fcca8113561 100644
+--- a/lisp/gnus/mml-sec.el
++++ b/lisp/gnus/mml-sec.el
+@@ -658,6 +658,8 @@ mml-secure-check-user-id
+     (catch 'break
+       (dolist (uid uids nil)
+ 	(if (and (stringp (epg-user-id-string uid))
++                 (car (mail-header-parse-address
++                       (epg-user-id-string uid)))
+ 		 (equal (downcase (car (mail-header-parse-address
+ 					(epg-user-id-string uid))))
+ 			(downcase (car (mail-header-parse-address
diff -Nru emacs-26.1+1/debian/patches/series emacs-26.1+1/debian/patches/series
--- emacs-26.1+1/debian/patches/series	2019-09-04 21:35:24.000000000 -0500
+++ emacs-26.1+1/debian/patches/series	2021-01-10 19:22:48.000000000 -0600
@@ -12,3 +12,4 @@
 0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch
 0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
 0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch
+0015-Avoid-elisp-crash-for-OpenPGP-User-IDs-with-no-e-mai.patch

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

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 10.8

Hi,

Each of the updates referenced by these bugs was included in today's
10.8 point release.

Regards,

Adam

--- End Message ---
Reply to: