Tue Apr 5 19:16:30 UTC 202220220405191630

a/hwdata-0.358-noarch-1.txz:  Upgraded.
ap/cups-filters-1.28.14-x86_64-1.txz:  Upgraded.
ap/ghostscript-9.56.1-x86_64-1.txz:  Upgraded.
d/mercurial-6.1.1-x86_64-1.txz:  Upgraded.
e/emacs-28.1-x86_64-1.txz:  Upgraded.
l/libqalculate-4.1.1-x86_64-1.txz:  Upgraded.
l/netpbm-10.98.00-x86_64-1.txz:  Upgraded.
n/ethtool-5.17-x86_64-1.txz:  Upgraded.
n/procmail-3.24-x86_64-1.txz:  Upgraded.
x/appres-1.0.6-x86_64-1.txz:  Upgraded.
x/editres-1.0.8-x86_64-1.txz:  Upgraded.
x/iceauth-1.0.9-x86_64-1.txz:  Upgraded.
x/listres-1.0.5-x86_64-1.txz:  Upgraded.
x/mkcomposecache-1.2.2-x86_64-1.txz:  Upgraded.
x/mkfontscale-1.2.2-x86_64-1.txz:  Upgraded.
x/setxkbmap-1.3.3-x86_64-1.txz:  Upgraded.
x/twm-1.0.12-x86_64-1.txz:  Upgraded.
x/xcalc-1.1.1-x86_64-1.txz:  Upgraded.
x/xclock-1.1.0-x86_64-1.txz:  Upgraded.
x/xedit-1.2.3-x86_64-1.txz:  Upgraded.
x/xload-1.1.4-x86_64-1.txz:  Upgraded.
x/xlsfonts-1.0.7-x86_64-1.txz:  Upgraded.
x/xorg-docs-1.7.2-noarch-1.txz:  Upgraded.
x/xorg-sgml-doctools-1.12-x86_64-1.txz:  Upgraded.
x/xsm-1.0.5-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-99.0-x86_64-1.txz:  Upgraded.
  This update contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/99.0/releasenotes/
    https://www.mozilla.org/security/advisories/mfsa2022-13/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1097
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28281
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28282
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28283
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28284
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28285
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28286
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28287
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24713
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28289
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28288
  (* Security fix *)

2 files changed, 1 insertions, 43 deletions

diff --git a/source/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild
index 33a31ceaa..0f96e352e 100755
--- a/source/e/emacs/emacs.SlackBuild
+++ b/source/e/emacs/emacs.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=emacs
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 # Determine version number the tarball is labeled with:
 TARBALLVER=${TARBALLVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # OK, now what's being used as the source directory version number...  account
@@ -99,8 +99,6 @@ find . \
 # memory given the amount available on modern systems:
 sed -i "s/#define SYSTEM_PURESIZE_EXTRA 0/#define SYSTEM_PURESIZE_EXTRA 100000/g" src/puresize.h
 
-zcat $CWD/emacs.glibc-2.34.patch.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/e/emacs/emacs.glibc-2.34.patch b/source/e/emacs/emacs.glibc-2.34.patch
deleted file mode 100644
index 6d764aa26..000000000
--- a/source/e/emacs/emacs.glibc-2.34.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Tue, 9 Mar 2021 11:22:59 -0800
-Subject: [PATCH] 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(-)
-
-diff --git a/src/sysdep.c b/src/sysdep.c
-index 941b4e2fa2..24d8832b2f 100644
---- a/src/sysdep.c
-+++ b/src/sysdep.c
-@@ -1785,7 +1785,15 @@ handle_arith_signal (int sig)
- 
- /* 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.  */
--- 
-2.29.2
-