diff -pruN 1:27.1+1-3/debian/changelog 1:27.1+1-3ubuntu5/debian/changelog --- 1:27.1+1-3/debian/changelog 2020-11-07 22:16:23.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/changelog 2022-01-24 15:35:51.000000000 +0000 @@ -1,3 +1,39 @@ +emacs (1:27.1+1-3ubuntu5) jammy; urgency=medium + + * debian/patches/glibc-2.34-signal-stack-fix.patch: cherry-pick fix from + upstream to fix the FTBFS with our Ubuntu glibc 2.34. + + -- Łukasz 'sil2100' Zemczak Mon, 24 Jan 2022 16:35:51 +0100 + +emacs (1:27.1+1-3ubuntu4) jammy; urgency=medium + + * No-change rebuild against latest libotf + + -- Jeremy Bicha Sun, 28 Nov 2021 11:08:38 -0500 + +emacs (1:27.1+1-3ubuntu3) hirsute; urgency=medium + + * Tag lscm test case as flakey. + + -- Dimitri John Ledkov Mon, 18 Jan 2021 10:55:28 +0000 + +emacs (1:27.1+1-3ubuntu2) hirsute; urgency=medium + + * Skip tests that require DNS lookups (LP: #1911209) + - debian/patches/skip-dns-lookup-tests.patch + + -- Olivier Tilloy Tue, 12 Jan 2021 16:17:22 +0100 + +emacs (1:27.1+1-3ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + - Run 'python3' as default Python command instead of 'python' + + -- Dimitri John Ledkov Sun, 08 Nov 2020 03:18:49 +0000 + emacs (1:27.1+1-3) unstable; urgency=medium * Strip parent path from package descriptions for reprodcibility. Add @@ -45,6 +81,21 @@ emacs (1:26.3+1-2) unstable; urgency=med -- Rob Browning Sat, 16 May 2020 19:25:51 -0500 +emacs (1:26.3+1-1ubuntu2) focal; urgency=medium + + * Run 'python3' as default Python command instead of 'python' + + -- Balint Reczey Wed, 25 Mar 2020 22:45:59 +0100 + +emacs (1:26.3+1-1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Mon, 23 Sep 2019 09:25:41 +0200 + emacs (1:26.3+1-1) unstable; urgency=medium * Merge upstream version 26.3. (Closes: 939737) @@ -58,6 +109,15 @@ emacs (1:26.3+1-1) unstable; urgency=med -- Rob Browning Mon, 09 Sep 2019 20:17:48 -0500 +emacs (1:26.1+1-4ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Mon, 09 Sep 2019 08:34:21 +0200 + emacs (1:26.1+1-4) unstable; urgency=high * Update the EPLA packaging key (previous key expires 2019-09-23) via @@ -68,6 +128,21 @@ emacs (1:26.1+1-4) unstable; urgency=hig -- Rob Browning Sun, 08 Sep 2019 15:02:23 -0500 +emacs (1:26.1+1-3.3ubuntu2) eoan; urgency=medium + + * No-change upload with strops.h and sys/strops.h removed in glibc. + + -- Matthias Klose Thu, 05 Sep 2019 10:47:57 +0000 + +emacs (1:26.1+1-3.3ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Tue, 23 Jul 2019 23:29:34 +0200 + emacs (1:26.1+1-3.3) unstable; urgency=medium * Non-maintainer upload. @@ -79,6 +154,20 @@ emacs (1:26.1+1-3.3) unstable; urgency=m -- Andreas Beckmann Fri, 12 Jul 2019 20:42:27 +0200 +emacs (1:26.1+1-3.2ubuntu2) disco; urgency=medium + + * debian/control: Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + + -- Adam Conrad Wed, 10 Apr 2019 14:53:21 -0600 + +emacs (1:26.1+1-3.2ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Tue, 05 Feb 2019 11:37:25 +0100 + emacs (1:26.1+1-3.2) unstable; urgency=medium * Non-maintainer upload. @@ -120,6 +209,14 @@ emacs (1:26.1+1-3.1) unstable; urgency=m -- Andreas Beckmann Mon, 28 Jan 2019 14:18:17 +0100 +emacs (1:26.1+1-3ubuntu1) disco; urgency=medium + + * Limit optimization on ppc64el to fix test failure. + * debian/patches/em-ls-tests-fix.patch: + - Fix testsuite with upstream patch (Closes: #918646) + + -- Gianfranco Costamagna Fri, 11 Jan 2019 16:46:11 +0100 + emacs (1:26.1+1-3) unstable; urgency=medium * Recommend mailutils instead of depending on it. @@ -2769,3 +2866,4 @@ emacs20 (20.2-1) unstable; urgency=low Local Variables: coding: utf-8 End: + diff -pruN 1:27.1+1-3/debian/control 1:27.1+1-3ubuntu5/debian/control --- 1:27.1+1-3/debian/control 2020-11-07 22:13:58.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/control 2020-11-08 03:17:54.000000000 +0000 @@ -1,7 +1,8 @@ Source: emacs Section: editors Priority: optional -Maintainer: Rob Browning +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Rob Browning Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, dbus-x11, git, @@ -102,7 +103,7 @@ Description: GNU Emacs editor (with GTK+ Package: emacs-bin-common Architecture: any Depends: emacs-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: mailutils +Suggests: mailutils Description: GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure diff -pruN 1:27.1+1-3/debian/patches/glibc-2.34-signal-stack-fix.patch 1:27.1+1-3ubuntu5/debian/patches/glibc-2.34-signal-stack-fix.patch --- 1:27.1+1-3/debian/patches/glibc-2.34-signal-stack-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/patches/glibc-2.34-signal-stack-fix.patch 2022-01-24 15:35:31.000000000 +0000 @@ -0,0 +1,37 @@ +From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 9 Mar 2021 11:22:59 -0800 +Subject: Port alternate signal stack to upcoming glibc 2.34 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* src/sysdep.c (sigsegv_stack): Increase size to 64 KiB and align +it to max_align_t. This copies from Gnulib’s c-stack.c, and works +around a portability bug in draft glibc 2.34, which no longer +defines SIGSTKSZ when _GNU_SOURCE is defined. +--- + src/sysdep.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +(limited to 'src/sysdep.c') + +--- a/src/sysdep.c ++++ b/src/sysdep.c +@@ -1816,7 +1816,15 @@ + + /* Alternate stack used by SIGSEGV handler below. */ + +-static unsigned char sigsegv_stack[SIGSTKSZ]; ++/* Storage for the alternate signal stack. ++ 64 KiB is not too large for Emacs, and is large enough ++ for all known platforms. Smaller sizes may run into trouble. ++ For example, libsigsegv 2.6 through 2.8 have a bug where some ++ architectures use more than the Linux default of an 8 KiB alternate ++ stack when deciding if a fault was caused by stack overflow. */ ++static max_align_t sigsegv_stack[(64 * 1024 ++ + sizeof (max_align_t) - 1) ++ / sizeof (max_align_t)]; + + + /* Return true if SIGINFO indicates a stack overflow. */ diff -pruN 1:27.1+1-3/debian/patches/python3-as-default.patch 1:27.1+1-3ubuntu5/debian/patches/python3-as-default.patch --- 1:27.1+1-3/debian/patches/python3-as-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/patches/python3-as-default.patch 2020-03-25 21:45:55.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Run python3 command as default instead of python +Author: Balint Reczey +Origin: vendor +Forwarded: no +Last-Update: 2020-03-25 + +--- a/lisp/ldefs-boot.el ++++ b/lisp/ldefs-boot.el +@@ -26699,7 +26699,7 @@ + + (add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode)) + +-(autoload 'run-python "python" "\ ++(autoload 'run-python "python3" "\ + Run an inferior Python process. + + Argument CMD defaults to `python-shell-calculate-command' return +--- a/lisp/progmodes/python.el ++++ b/lisp/progmodes/python.el +@@ -1909,7 +1909,7 @@ + :group 'python + :safe 'stringp) + +-(defcustom python-shell-interpreter "python" ++(defcustom python-shell-interpreter "python3" + "Default Python interpreter for shell." + :type 'string + :group 'python) diff -pruN 1:27.1+1-3/debian/patches/series 1:27.1+1-3ubuntu5/debian/patches/series --- 1:27.1+1-3/debian/patches/series 2020-11-07 22:14:00.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/patches/series 2022-01-24 15:35:21.000000000 +0000 @@ -11,3 +11,7 @@ 0011-emacs-module-tests-fix-VPATH-builds.patch 0012-Strip-parent-path-from-package-descriptions-for-repr.patch 0013-Recover-the-contents-of-the-schemas.xml-file.patch +python3-as-default.patch +skip-dns-lookup-tests.patch +unstable-lcms-tests-s390x.patch +glibc-2.34-signal-stack-fix.patch diff -pruN 1:27.1+1-3/debian/patches/skip-dns-lookup-tests.patch 1:27.1+1-3ubuntu5/debian/patches/skip-dns-lookup-tests.patch --- 1:27.1+1-3/debian/patches/skip-dns-lookup-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/patches/skip-dns-lookup-tests.patch 2021-01-12 15:16:39.000000000 +0000 @@ -0,0 +1,36 @@ +Description: skip unit tests that require DNS lookups + (not available in Launchpad's restricted build environment) +Author: Olivier Tilloy +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/emacs/+bug/1911209 + +--- a/test/src/process-tests.el ++++ b/test/src/process-tests.el +@@ -334,6 +334,7 @@ See Bug#30460." + + (ert-deftest lookup-family-specification () + "network-lookup-address-info should only accept valid family symbols." ++ (skip-unless nil) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (should-error (network-lookup-address-info "google.com" 'both)) + (should (network-lookup-address-info "google.com" 'ipv4)) +@@ -342,17 +343,20 @@ See Bug#30460." + + (ert-deftest lookup-unicode-domains () + "Unicode domains should fail" ++ (skip-unless nil) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (should-error (network-lookup-address-info "faß.de")) + (should (network-lookup-address-info (puny-encode-domain "faß.de")))) + + (ert-deftest unibyte-domain-name () + "Unibyte domain names should work" ++ (skip-unless nil) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (should (network-lookup-address-info (string-to-unibyte "google.com")))) + + (ert-deftest lookup-google () + "Check that we can look up google IP addresses" ++ (skip-unless nil) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (let ((addresses-both (network-lookup-address-info "google.com")) + (addresses-v4 (network-lookup-address-info "google.com" 'ipv4))) diff -pruN 1:27.1+1-3/debian/patches/unstable-lcms-tests-s390x.patch 1:27.1+1-3ubuntu5/debian/patches/unstable-lcms-tests-s390x.patch --- 1:27.1+1-3/debian/patches/unstable-lcms-tests-s390x.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/patches/unstable-lcms-tests-s390x.patch 2021-01-18 10:55:28.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Tag lscm test case as flakey. +Author: Dimitri John Ledkov + +--- emacs-27.1+1.orig/test/src/lcms-tests.el ++++ emacs-27.1+1/test/src/lcms-tests.el +@@ -57,6 +57,7 @@ B is considered the exact value." + (apply #'color-srgb-to-xyz rgb1))) + + (ert-deftest lcms-cri-cam02-ucs () ++ :tags '(:unstable) ;; This started to fail on s390x on Ubuntu + "Test use of `lcms-cam02-ucs'." + (skip-unless (featurep 'lcms2)) + (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error")) diff -pruN 1:27.1+1-3/debian/rules 1:27.1+1-3ubuntu5/debian/rules --- 1:27.1+1-3/debian/rules 2020-11-07 22:13:58.000000000 +0000 +++ 1:27.1+1-3ubuntu5/debian/rules 2021-01-12 10:31:59.000000000 +0000 @@ -102,6 +102,10 @@ ifeq ($(DEB_HOST_ARCH),arm64) export DEB_CFLAGS_MAINT_APPEND := -O0 endif +ifeq ($(DEB_HOST_ARCH),ppc64el) + export DEB_CFLAGS_MAINT_APPEND := -O2 +endif + CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)