开源软件构建与测试

_service:extract_file:emacs.spec Deleted

@@ -1,458 +0,0 @@
-%global _hardened_build 1
-%bcond_with bootstrap
-
-Name: emacs
-Epoch: 1
-Version: 27.2
-Release: 4
-Summary: An extensible GNU text editor
-License: GPLv3+ and CC0-1.0
-URL: http://www.gnu.org/software/emacs
-Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
-Source1: site-start.el
-Source2: default.el
-Source3: dotemacs.el
-Source4: emacs-terminal.sh
-Source5: emacs.service
-Source6: emacs.desktop
-Source7: emacs-terminal.desktop
-Source8: %{name}.appdata.xml
-
-Patch6001: emacs-spellchecker.patch
-Patch6002: emacs-system-crypto-policies.patch
-Patch6003: backport-emacs-glibc-2.34.patch
-Patch9000: emacs-deal-taboo-words.patch
-
-BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel
-BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel
-BuildRequires: libxml2-devel bzip2 cairo texinfo gzip desktop-file-utils libacl-devel libtiff-devel
-BuildRequires: libpng-devel libjpeg-turbo-devel libjpeg-turbo ncurses-devel gpm-devel libX11-devel
-BuildRequires: libXau-devel libXdmcp-devel libXrender-devel libXt-devel libXpm-devel gtk3-devel
-BuildRequires: xorg-x11-proto-devel webkit2gtk3-devel librsvg2-devel
-BuildRequires: autoconf harfbuzz-devel jansson-devel systemd-devel gnupg2
-BuildRequires: libotf-devel m17n-lib-devel liblockfile-devel
-
-# For lucid
-BuildRequires: Xaw3d-devel
-
-%ifarch %{ix86}
-BuildRequires: util-linux
-%endif
-
-Requires: desktop-file-utils dejavu-sans-mono-fonts
-Requires: emacs-common = %{epoch}:%{version}-%{release}
-Requires(preun): %{_sbindir}/alternatives
-Requires(posttrans): %{_sbindir}/alternatives
-
-Provides: emacs(bin) = %{epoch}:%{version}-%{release}
-
-%define site_lisp %{_datadir}/emacs/site-lisp
-%define site_start_d %{site_lisp}/site-start.d
-%define bytecompargs -batch --no-init-file --no-site-file -f batch-byte-compile
-%define pkgconfig %{_datadir}/pkgconfig
-%define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}
-
-%description
-Emacs is the extensible, customizable, self-documenting real-time display editor.
-At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
-with extensions to support text editing. And it is an entire ecosystem of functionality beyond text editing,
-including a project planner, mail and news reader, debugger interface, calendar, and more.
-
-%package devel
-Summary: Development header files for emacs
-
-%description devel
-Development header files for emacs.
-
-%if !%{with bootstrap}
-%package lucid
-Summary: GNU Emacs text editor with LUCID toolkit X support
-Requires: emacs-common = %{epoch}:%{version}-%{release}
-Requires(preun): %{_sbindir}/alternatives
-Requires(posttrans): %{_sbindir}/alternatives
-Provides: emacs(bin) = %{epoch}:%{version}-%{release}
-
-%description lucid
-This package provides an emacs binary with support for X windows
-using LUCID toolkit.
-%endif
-
-%package nox
-Summary: GNU Emacs text editor without X support
-Requires: emacs-common = %{epoch}:%{version}-%{release}
-Requires(preun): %{_sbindir}/alternatives
-Requires(posttrans): %{_sbindir}/alternatives
-Provides: emacs(bin) = %{epoch}:%{version}-%{release}
-
-%description nox
-This package provides an emacs binary with no X windows support for running
-on a terminal
-
-%package common
-Summary: Emacs common files
-License: GPLv3+ and GFDL and BSD
-Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
-Requires(preun): /sbin/install-info
-Requires(preun): %{_sbindir}/alternatives
-Requires(posttrans): %{_sbindir}/alternatives
-Requires(post): /sbin/install-info
-Provides: %{name}-el = %{epoch}:%{version}-%{release}
-Obsoletes: emacs-el < 1:24.3-29
-
-%description common
-This package contains all the common files needed by emacs, emacs-lucid
-or emacs-nox.
-
-%package terminal
-Summary: A desktop menu for GNU Emacs terminal.
-Requires: emacs = %{epoch}:%{version}-%{release}
-BuildArch: noarch
-
-%description terminal
-Install emacs-terminal if you need a terminal with Malayalam support.
-
-%package filesystem
-Summary: Emacs filesystem layout
-BuildArch: noarch
-
-%description filesystem
-Emacs filesystem layout
-
-%package_help
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-autoconf
-
-egrep -v "tetris.elc|pong.elc" lisp/Makefile.in > lisp/Makefile.in.new && mv lisp/Makefile.in.new lisp/Makefile.in
-
-rm -f lisp/play/tetris.el* lisp/play/pong.el*
-
-%define info_files ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq-w32 efaq eieio eintr elisp emacs-gnutls emacs-mime emacs epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
-
-cd info
-fs=( $(ls *.info) )
-is=( %info_files )
-files=$(echo ${fs*} | sed 's/\.info//'g | sort | tr -d '\n')
-for i in $(seq 0 $(( ${#fs*} - 1 ))); do
- if test "${fs$i}" != "${is$i}.info"; then
- echo Please update %%info_files: ${fs$i} != ${is$i}.info >&2
- break
- fi
-done
-cd ..
-
-%ifarch %{ix86}
-%define setarch setarch %{_arch} -R
-%else
-%define setarch %{nil}
-%endif
-
-ln -s ../../%{name}/%{version}/etc/COPYING doc
-ln -s ../../%{name}/%{version}/etc/NEWS doc
-
-%build
-export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fPIE"
-
-%if !%{with bootstrap}
-# Build GTK+ binary
-mkdir build-gtk && cd build-gtk
-ln -s ../configure .
-
-LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS;
-
-%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
- --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
- --with-harfbuzz --with-cairo --with-json \
- --with-xwidgets --with-modules --without-libotf --without-m17n-flt --without-imagemagick
-%make_build bootstrap
-%{setarch} %make_build
-cd ..
-
-# Build Lucid binary
-mkdir build-lucid && cd build-lucid
-ln -s ../configure .
-
-LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS;
-
-%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
- --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
- --with-harfbuzz --with-cairo --with-json \
- --with-modules --without-libotf --without-m17n-flt --without-imagemagick
-%make_build bootstrap
-%{setarch} %make_build
-cd ..
-%endif
-
-# Build binary without X support
-mkdir build-nox && cd build-nox
-ln -s ../configure .
-
-LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS;
-
-%configure --with-x=no --with-modules --with-json
-%{setarch} %make_build
-cd ../
-
-# Generate pkgconfig file
-cat > emacs.pc << EOF

_service:tar_scm:emacs.spec Added

@@ -0,0 +1,479 @@
+%global _hardened_build 1
+%bcond_with bootstrap
+
+%if "0%{?product_family}" != "0"
+%bcond_without bootstrap
+%endif
+
+Name: emacs
+Epoch: 1
+Version: 27.2
+Release: 8
+Summary: An extensible GNU text editor
+License: GPLv3+ and CC0-1.0
+URL: http://www.gnu.org/software/emacs
+Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+Source1: site-start.el
+Source2: default.el
+Source3: dotemacs.el
+Source4: emacs-terminal.sh
+Source5: emacs.service
+Source6: emacs.desktop
+Source7: emacs-terminal.desktop
+Source8: %{name}.appdata.xml
+
+Patch6001: emacs-spellchecker.patch
+Patch6002: emacs-system-crypto-policies.patch
+Patch6003: backport-emacs-glibc-2.34.patch
+Patch6004: backport-CVE-2022-45939.patch
+Patch9000: emacs-deal-taboo-words.patch
+
+BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel
+BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel
+BuildRequires: libxml2-devel bzip2 cairo texinfo gzip desktop-file-utils libacl-devel libtiff-devel
+BuildRequires: libpng-devel libjpeg-turbo-devel libjpeg-turbo ncurses-devel gpm-devel libX11-devel
+BuildRequires: libXau-devel libXdmcp-devel libXrender-devel libXt-devel libXpm-devel gtk3-devel
+BuildRequires: xorg-x11-proto-devel webkit2gtk3-devel librsvg2-devel
+BuildRequires: autoconf harfbuzz-devel jansson-devel systemd-devel gnupg2
+BuildRequires: libotf-devel m17n-lib-devel liblockfile-devel
+
+# For lucid
+BuildRequires: Xaw3d-devel
+
+%ifarch %{ix86}
+BuildRequires: util-linux
+%endif
+
+Requires: desktop-file-utils dejavu-sans-mono-fonts
+Requires: emacs-common = %{epoch}:%{version}-%{release}
+Requires(preun): %{_sbindir}/alternatives
+Requires(posttrans): %{_sbindir}/alternatives
+
+Provides: emacs(bin) = %{epoch}:%{version}-%{release}
+
+%define site_lisp %{_datadir}/emacs/site-lisp
+%define site_start_d %{site_lisp}/site-start.d
+%define bytecompargs -batch --no-init-file --no-site-file -f batch-byte-compile
+%define pkgconfig %{_datadir}/pkgconfig
+%define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}
+
+%description
+Emacs is the extensible, customizable, self-documenting real-time display editor.
+At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
+with extensions to support text editing. And it is an entire ecosystem of functionality beyond text editing,
+including a project planner, mail and news reader, debugger interface, calendar, and more.
+
+%package devel
+Summary: Development header files for emacs
+
+%description devel
+Development header files for emacs.
+
+%if !%{with bootstrap}
+%package lucid
+Summary: GNU Emacs text editor with LUCID toolkit X support
+Requires: emacs-common = %{epoch}:%{version}-%{release}
+Requires(preun): %{_sbindir}/alternatives
+Requires(posttrans): %{_sbindir}/alternatives
+Provides: emacs(bin) = %{epoch}:%{version}-%{release}
+
+%description lucid
+This package provides an emacs binary with support for X windows
+using LUCID toolkit.
+%endif
+
+%package nox
+Summary: GNU Emacs text editor without X support
+Requires: emacs-common = %{epoch}:%{version}-%{release}
+Requires(preun): %{_sbindir}/alternatives
+Requires(posttrans): %{_sbindir}/alternatives
+Provides: emacs(bin) = %{epoch}:%{version}-%{release}
+
+%description nox
+This package provides an emacs binary with no X windows support for running
+on a terminal
+
+%package common
+Summary: Emacs common files
+License: GPLv3+ and GFDL and BSD
+Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
+Requires(preun): /sbin/install-info
+Requires(preun): %{_sbindir}/alternatives
+Requires(posttrans): %{_sbindir}/alternatives
+Requires(post): /sbin/install-info
+Provides: %{name}-el = %{epoch}:%{version}-%{release}
+Obsoletes: emacs-el < 1:24.3-29
+
+%description common
+This package contains all the common files needed by emacs, emacs-lucid
+or emacs-nox.
+
+%package terminal
+Summary: A desktop menu for GNU Emacs terminal.
+Requires: emacs = %{epoch}:%{version}-%{release}
+BuildArch: noarch
+
+%description terminal
+Install emacs-terminal if you need a terminal with Malayalam support.
+
+%package filesystem
+Summary: Emacs filesystem layout
+BuildArch: noarch
+
+%description filesystem
+Emacs filesystem layout
+
+%package_help
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+autoconf
+
+egrep -v "tetris.elc|pong.elc" lisp/Makefile.in > lisp/Makefile.in.new && mv lisp/Makefile.in.new lisp/Makefile.in
+
+rm -f lisp/play/tetris.el* lisp/play/pong.el*
+
+%define info_files ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq-w32 efaq eieio eintr elisp emacs-gnutls emacs-mime emacs epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
+
+cd info
+fs=( $(ls *.info) )
+is=( %info_files )
+files=$(echo ${fs*} | sed 's/\.info//'g | sort | tr -d '\n')
+for i in $(seq 0 $(( ${#fs*} - 1 ))); do
+ if test "${fs$i}" != "${is$i}.info"; then
+ echo Please update %%info_files: ${fs$i} != ${is$i}.info >&2
+ break
+ fi
+done
+cd ..
+
+%ifarch %{ix86}
+%define setarch setarch %{_arch} -R
+%else
+%define setarch %{nil}
+%endif
+
+ln -s ../../%{name}/%{version}/etc/COPYING doc
+ln -s ../../%{name}/%{version}/etc/NEWS doc
+
+%build
+%ifarch loongarch64
+%_update_config_guess
+%_update_config_sub
+%endif
+export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fPIE"
+
+# Build GTK+ binary
+mkdir build-gtk && cd build-gtk
+ln -s ../configure .
+
+LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS;
+
+%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+ --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
+ --with-harfbuzz --with-cairo --with-json \
+ --with-xwidgets --with-modules --without-libotf --without-m17n-flt --without-imagemagick
+%make_build bootstrap
+%{setarch} %make_build
+cd ..
+
+# Build Lucid binary
+%if !%{with bootstrap}
+mkdir build-lucid && cd build-lucid
+ln -s ../configure .
+
+LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS;
+
+%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+ --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
+ --with-harfbuzz --with-cairo --with-json \
+ --with-modules --without-libotf --without-m17n-flt --without-imagemagick
+%make_build bootstrap
+%{setarch} %make_build
+cd ..
+%endif
+
+# Build binary without X support
+mkdir build-nox && cd build-nox
+ln -s ../configure .

_service:extract_file:backport-emacs-glibc-2.34.patch Deleted

@@ -1,39 +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_stackSIGSTKSZ;
-+/* 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
\ No newline at end of file

_service:extract_file:emacs-deal-taboo-words.patch Deleted

@@ -1,39 +0,0 @@
-From 2b98d49b72e801109de870672bc071361a9b6a1b Mon Sep 17 00:00:00 2001
-From: yeah_wang <wangye70@huawei.com>
-Date: Thu, 8 Apr 2021 16:07:05 +0800
-Subject: PATCH emacs-deal-taboo-words
-
----
- etc/publicsuffix.txt | 2 --
- lisp/mail/mail-extr.el | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt
-index 1ede2b9..c38649f 100644
---- a/etc/publicsuffix.txt
-+++ b/etc/publicsuffix.txt
-@@ -6259,9 +6259,7 @@ tel.tr
- tsk.tr
- tv.tr
- web.tr
--// Used by Northern Cyprus
- nc.tr
--// Used by government agencies of Northern Cyprus
- gov.nc.tr
- 
- // tt : http://www.nic.tt/
-diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
-index 11918aa..f2d7fae 100644
---- a/lisp/mail/mail-extr.el
-+++ b/lisp/mail/mail-extr.el
-@@ -1932,7 +1932,6 @@ place. It affects how `mail-extract-address-components' works."
- ("ec" "Ecuador"		"The Republic of %s")
- ("ee" "Estonia")
- ("eg" "Egypt"		"The Arab Republic of %s")
-- ("eh" "Western Sahara")
- ("er" "Eritrea")
- ("es" "Spain"		"The Kingdom of %s")
- ("et" "Ethiopia")
--- 
-2.23.0
-

_service:extract_file:emacs-spellchecker.patch Deleted

_service:extract_file:emacs-system-crypto-policies.patch Deleted

_service:tar_scm:backport-CVE-2022-45939.patch Added

@@ -0,0 +1,272 @@
+From d48bb4874bc6cd3e69c7a15fc3c91cc141025c51 Mon Sep 17 00:00:00 2001
+From: lu4nx <lx@shellcodes.org>
+Date: Fri, 25 Nov 2022 14:38:29 +0800
+Subject: Fixed ctags local command execute vulnerability
+
+* lib-src/etags.c:
+
+(clean_matched_file_tag): New function
+(do_move_file): New function
+(readline_internal):
+Add `leave_cr` parameter, if true, include the \r character
+
+* test/manual/etags/CTAGS.good_crlf: New file
+* test/manual/etags/CTAGS.good_update: New file
+* test/manual/etags/crlf: New file
+* test/manual/etags/Makefile: Add `ctags -u` test cases
+
+Conflict:Removed test case related code, so the patch is over 9000 lines, it's too big
+Reference:https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51
+---
+ lib-src/etags.c | 149 +-
+ 1 files changed, 113 insertions(+), 36 deletions(-)
+
+diff --git a/lib-src/etags.c b/lib-src/etags.c
+index 3107c7b..b6f51df 100644
+--- a/lib-src/etags.c
++++ b/lib-src/etags.c
+@@ -375,7 +375,7 @@ static void just_read_file (FILE *);
+ 
+ static language *get_language_from_langname (const char *);
+ static void readline (linebuffer *, FILE *);
+-static ptrdiff_t readline_internal (linebuffer *, FILE *, char const *);
++static ptrdiff_t readline_internal (linebuffer *, FILE *, char const *, const bool);
+ static bool nocase_tail (const char *);
+ static void get_tag (char *, char **);
+ static void get_lispy_tag (char *);
+@@ -399,7 +399,9 @@ static void free_fdesc (fdesc *);
+ static void pfnote (char *, bool, char *, ptrdiff_t, intmax_t, intmax_t);
+ static void invalidate_nodes (fdesc *, node **);
+ static void put_entries (node *);
++static void clean_matched_file_tag (char const * const, char const * const);
+ 
++static void do_move_file (const char *, const char *);
+ static char *concat (const char *, const char *, const char *);
+ static char *skip_spaces (char *);
+ static char *skip_non_spaces (char *);
+@@ -1332,7 +1334,7 @@ main (int argc, char **argv)
+ 		 if (parsing_stdin)
+ 		 fatal ("cannot parse standard input "
+ 			 "AND read file names from it");
+-		 while (readline_internal (&filename_lb, stdin, "-") > 0)
++		 while (readline_internal (&filename_lb, stdin, "-", false) > 0)
+ 		 process_file_name (filename_lb.buffer, lang);
+ 		}
+ 	 else
+@@ -1380,9 +1382,6 @@ main (int argc, char **argv)
+ /* From here on, we are in (CTAGS && !cxref_style) */
+ if (update)
+ {
+- char *cmd =
+-	xmalloc (strlen (tagfile) + whatlen_max +
+-		 sizeof "mv..OTAGS;grep -Fv '\t\t' OTAGS >;rm OTAGS");
+ for (i = 0; i < current_arg; ++i)
+ 	{
+ 	 switch (argbufferi.arg_type)
+@@ -1393,17 +1392,8 @@ main (int argc, char **argv)
+ 	 default:
+ 	 continue;		/* the for loop */
+ 	 }
+-	 char *z = stpcpy (cmd, "mv ");
+-	 z = stpcpy (z, tagfile);
+-	 z = stpcpy (z, " OTAGS;grep -Fv '\t");
+-	 z = stpcpy (z, argbufferi.what);
+-	 z = stpcpy (z, "\t' OTAGS >");
+-	 z = stpcpy (z, tagfile);
+-	 strcpy (z, ";rm OTAGS");
+-	 if (system (cmd) != EXIT_SUCCESS)
+-	 fatal ("failed to execute shell command");
++ clean_matched_file_tag (tagfile, argbufferi.what);
+ 	}
+- free (cmd);
+ append_to_tagfile = true;
+ }
+ 
+@@ -1448,6 +1438,51 @@ main (int argc, char **argv)
+ return EXIT_SUCCESS;
+ }
+ 
++/*
++ * Equivalent to: mv tags OTAGS;grep -Fv ' filename ' OTAGS >tags;rm OTAGS
++ */
++static void
++clean_matched_file_tag (const char* tagfile, const char* match_file_name)
++{
++ FILE *otags_f = fopen ("OTAGS", "wb");
++ FILE *tag_f = fopen (tagfile, "rb");
++
++ if (otags_f == NULL)
++ pfatal ("OTAGS");
++
++ if (tag_f == NULL)
++ pfatal (tagfile);
++
++ int buf_len = strlen (match_file_name) + sizeof ("\t\t ") + 1;
++ char *buf = xmalloc (buf_len);
++ snprintf (buf, buf_len, "\t%s\t", match_file_name);
++
++ linebuffer line;
++ linebuffer_init (&line);
++ while (readline_internal (&line, tag_f, tagfile, true) > 0)
++ {
++ if (ferror (tag_f))
++ pfatal (tagfile);
++
++ if (strstr (line.buffer, buf) == NULL)
++ {
++ fprintf (otags_f, "%s\n", line.buffer);
++ if (ferror (tag_f))
++ pfatal (tagfile);
++ }
++ }
++ free (buf);
++ free (line.buffer);
++
++ if (fclose (otags_f) == EOF)
++ pfatal ("OTAGS");
++
++ if (fclose (tag_f) == EOF)
++ pfatal (tagfile);
++
++ do_move_file ("OTAGS", tagfile);
++ return;
++}
+ 
+ /*
+ * Return a compressor given the file name. If EXTPTR is non-zero,
+@@ -1831,7 +1866,7 @@ find_entries (FILE *inf)
+ 
+ /* Else look for sharp-bang as the first two characters. */
+ if (parser == NULL
+- && readline_internal (&lb, inf, infilename) > 0
++ && readline_internal (&lb, inf, infilename, false) > 0
+ && lb.len >= 2
+ && lb.buffer0 == '#'
+ && lb.buffer1 == '!')
+@@ -6878,7 +6913,7 @@ analyze_regex (char *regex_arg)
+ 	if (regexfp == NULL)
+ 	 pfatal (regexfile);
+ 	linebuffer_init (&regexbuf);
+-	while (readline_internal (&regexbuf, regexfp, regexfile) > 0)
++	while (readline_internal (&regexbuf, regexfp, regexfile, false) > 0)
+ 	 analyze_regex (regexbuf.buffer);
+ 	free (regexbuf.buffer);
+ 	if (fclose (regexfp) != 0)
+@@ -7226,11 +7261,13 @@ get_lispy_tag (register char *bp)
+ 
+ /*
+ * Read a line of text from `stream' into `lbp', excluding the
+- * newline or CR-NL, if any. Return the number of characters read from
+- * `stream', which is the length of the line including the newline.
++ * newline or CR-NL (if `leave_cr` is false), if any. Return the
++ * number of characters read from `stream', which is the length
++ * of the line including the newline.
+ *
+- * On DOS or Windows we do not count the CR character, if any before the
+- * NL, in the returned length; this mirrors the behavior of Emacs on those
++ * On DOS or Windows, if `leave_cr` is false, we do not count the
++ * CR character, if any before the NL, in the returned length;
++ * this mirrors the behavior of Emacs on those
+ * platforms (for text files, it translates CR-NL to NL as it reads in the
+ * file).
+ *
+@@ -7238,7 +7275,7 @@ get_lispy_tag (register char *bp)
+ * appended to `filebuf'.
+ */
+ static ptrdiff_t
+-readline_internal (linebuffer *lbp, FILE *stream, char const *filename)
++readline_internal (linebuffer *lbp, FILE *stream, char const *filename, const bool leave_cr)
+ {
+ char *buffer = lbp->buffer;
+ char *p = lbp->buffer;
+@@ -7268,19 +7305,19 @@ readline_internal (linebuffer *lbp, FILE *stream, char const *filename)
+ 	 break;
+ 	}
+ if (c == '\n')
+-	{
+-	 if (p > buffer && p-1 == '\r')
+-	 {
+-	 p -= 1;
+-	 chars_deleted = 2;
+-	 }
+-	 else
+-	 {
+-	 chars_deleted = 1;
+-	 }
+-	 *p = '\0';
+-	 break;
+-	}
++ {

_service:tar_scm:backport-emacs-glibc-2.34.patch Added

@@ -0,0 +1,39 @@
+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_stackSIGSTKSZ;
++/* 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
\ No newline at end of file

_service:tar_scm:emacs-deal-taboo-words.patch Added

@@ -0,0 +1,39 @@
+From 2b98d49b72e801109de870672bc071361a9b6a1b Mon Sep 17 00:00:00 2001
+From: yeah_wang <wangye70@huawei.com>
+Date: Thu, 8 Apr 2021 16:07:05 +0800
+Subject: PATCH emacs-deal-taboo-words
+
+---
+ etc/publicsuffix.txt | 2 --
+ lisp/mail/mail-extr.el | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt
+index 1ede2b9..c38649f 100644
+--- a/etc/publicsuffix.txt
++++ b/etc/publicsuffix.txt
+@@ -6259,9 +6259,7 @@ tel.tr
+ tsk.tr
+ tv.tr
+ web.tr
+-// Used by Northern Cyprus
+ nc.tr
+-// Used by government agencies of Northern Cyprus
+ gov.nc.tr
+ 
+ // tt : http://www.nic.tt/
+diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
+index 11918aa..f2d7fae 100644
+--- a/lisp/mail/mail-extr.el
++++ b/lisp/mail/mail-extr.el
+@@ -1932,7 +1932,6 @@ place. It affects how `mail-extract-address-components' works."
+ ("ec" "Ecuador"		"The Republic of %s")
+ ("ee" "Estonia")
+ ("eg" "Egypt"		"The Arab Republic of %s")
+- ("eh" "Western Sahara")
+ ("er" "Eritrea")
+ ("es" "Spain"		"The Kingdom of %s")
+ ("et" "Ethiopia")
+-- 
+2.23.0
+

_service:tar_scm:emacs-spellchecker.patch Added

_service:tar_scm:emacs-system-crypto-policies.patch Added

_service Changed

_service:extract_file:default.el Deleted

_service:extract_file:dotemacs.el Deleted

_service:extract_file:emacs-27.2.tar.xz Deleted

_service:extract_file:emacs-terminal.desktop Deleted

_service:extract_file:emacs-terminal.sh Deleted

_service:extract_file:emacs.appdata.xml Deleted

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop">
- <id>emacs.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-3.0+</project_license>
- <name>GNU Emacs</name>
- <summary>Edit text files, view pictures and binary files</summary>
- <description>
- 
- Emacs is a powerful, customizable, self-documenting, modeless
- editor. It is used primarely to edit text, including text
- documents, source code of programs, web pages and XML documents,
- but can also be used to display and edit binary files.
- 
- 
- Emacs allows efficient editing of text with shortcuts which
- allow operating on letters, words, sentences, and paragraphs as
- single units. This includes both moving around and operations
- like copying, deleting, transposing, and pasting. Macros can be
- conveniently defined to repeat sequences of commands. In
- addition, Emacs is (partially) built in a scripting language
- (elisp) which can also be used to define further functions
- extending existing capabilities.
- 
- 
- Emacs has extensive support for editing source code, including
- programmable syntax highlighting, automatic indentation, source
- code indexing, overview modes, and navigation based on language
- specific units like functions and blocks. It is also possible to
- invoke the compiler from within Emacs and easily move between
- compiler output and corresponding positions in the source.
- 
- 
- Emacs has multiple modules which provide further functionality.
- This provides the capability to read mail, news, browse
- pictures, read man and info pages, browse the web, execute
- arbitrary programs, and more, without leaving the editor.
- 
- </description>
- <screenshots>
- <screenshot type="default" height="888" width="1595">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png</image>
- </screenshot>
- <screenshot height="667" width="1199">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png</image>
- </screenshot>
- <screenshot height="572" width="1019">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png</image>
- </screenshot>
- <screenshot height="667" width="1199">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png</image>
- </screenshot>
- <screenshot height="439" width="794">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png</image>
- </screenshot>
- </screenshots>
- <url type="homepage">http://www.gnu.org/software/emacs/</url>
- <url type="bugtracker">https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html</url>
- <url type="donation">https://my.fsf.org/donate/</url>
- <url type="help">https://www.gnu.org/software/emacs/manual/</url>
- <update_contact>zbyszek@in.waw.pl</update_contact>
- <translation/>
-</component>

_service:extract_file:emacs.desktop Deleted

_service:extract_file:emacs.service Deleted

_service:extract_file:emacs.yaml Deleted

_service:extract_file:site-start.el Deleted

_service:tar_scm:default.el Added

_service:tar_scm:dotemacs.el Added

_service:tar_scm:emacs-1648610503.71ffea3.tar -> _service:tar_scm:emacs-27.2.tar.xz Changed

_service:tar_scm:emacs-terminal.desktop Added

_service:tar_scm:emacs-terminal.sh Added

_service:tar_scm:emacs.appdata.xml Added

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+ <id>emacs.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0+</project_license>
+ <name>GNU Emacs</name>
+ <summary>Edit text files, view pictures and binary files</summary>
+ <description>
+ 
+ Emacs is a powerful, customizable, self-documenting, modeless
+ editor. It is used primarely to edit text, including text
+ documents, source code of programs, web pages and XML documents,
+ but can also be used to display and edit binary files.
+ 
+ 
+ Emacs allows efficient editing of text with shortcuts which
+ allow operating on letters, words, sentences, and paragraphs as
+ single units. This includes both moving around and operations
+ like copying, deleting, transposing, and pasting. Macros can be
+ conveniently defined to repeat sequences of commands. In
+ addition, Emacs is (partially) built in a scripting language
+ (elisp) which can also be used to define further functions
+ extending existing capabilities.
+ 
+ 
+ Emacs has extensive support for editing source code, including
+ programmable syntax highlighting, automatic indentation, source
+ code indexing, overview modes, and navigation based on language
+ specific units like functions and blocks. It is also possible to
+ invoke the compiler from within Emacs and easily move between
+ compiler output and corresponding positions in the source.
+ 
+ 
+ Emacs has multiple modules which provide further functionality.
+ This provides the capability to read mail, news, browse
+ pictures, read man and info pages, browse the web, execute
+ arbitrary programs, and more, without leaving the editor.
+ 
+ </description>
+ <screenshots>
+ <screenshot type="default" height="888" width="1595">
+ <image>http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png</image>
+ </screenshot>
+ <screenshot height="667" width="1199">
+ <image>http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png</image>
+ </screenshot>
+ <screenshot height="572" width="1019">
+ <image>http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png</image>
+ </screenshot>
+ <screenshot height="667" width="1199">
+ <image>http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png</image>
+ </screenshot>
+ <screenshot height="439" width="794">
+ <image>http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://www.gnu.org/software/emacs/</url>
+ <url type="bugtracker">https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html</url>
+ <url type="donation">https://my.fsf.org/donate/</url>
+ <url type="help">https://www.gnu.org/software/emacs/manual/</url>
+ <update_contact>zbyszek@in.waw.pl</update_contact>
+ <translation/>
+</component>

_service:tar_scm:emacs.desktop Added

_service:tar_scm:emacs.service Added

_service:tar_scm:emacs.yaml Added

_service:tar_scm:site-start.el Added

Changes of Revision 2