Update version to 2.1.1.

Update README (with corrections by Jonathan Wakely).
Update RPM and Debian change logs.
Trim and update po files per Crowdin.

THANKS

@@ -44,6 +44,7 @@ Rodney Ruddock          <rodney*nowhite.cis.uoguelph*ca>
 Bradford C Smith        <bradford.smith*usermail*com>
 Mike Silbersack         <mike*FreeBSD.org>
 Jason R. Thorpe         <thorpej.NetBSD*org>
+Jonathan Wakely         <jwakely#redhat_com>
 Assar Westerlund        <assar.stacken*kth.se>
 Christos Zoulas         <christos.NetBSD*org>
 

configure.ac

@@ -7,7 +7,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([ed],[2.1.0],[https://github.com/slewsys/ed])
+AC_INIT([ed],[2.1.1],[https://github.com/slewsys/ed])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])

debian/README.Debian

@@ -1,3 +1,9 @@
-Nothing to see here.
+An SPDX License SBOM for ed can be generated from the top level of the source
+repository with the command sequence:
 
- -- Andrew L. Moore <>  Tue, 11 Jan 2022 03:28:08 -0500
+    ./autogen.sh
+    ./configure
+    pip install -U reuse
+    make spdx-sbom
+
+ -- Andrew L. Moore <slewsys@gmail.com>  Wed, 22 Jan 2025 06:04:48 UTC

debian/changelog

@@ -1,3 +1,139 @@
+ed (1:2.1.1-1) release; urgency=medium
+
+  * Update version to 2.1.1.
+
+  * Handle empty insert in empty buffer.
+
+  * Prepend scripts from stdin before command line.
+
+  * Allow embedded newlines on command line.
+
+  * Minor code clean up.
+
+  * POSIX substitute requires closing pattern delimiter.
+
+  * Allow macros to operate over a range of addresses.
+
+  * Update dot after moving lines to register.
+
+  * Rename per structure I/O flags.
+
+  * Restore global-command context after macro.
+
+  * Update clean/distclean targets per GNU Coding Standards.
+
+  * Add contrib Makefile.
+
+  * Update ed.spec.
+
+  * Add Makefile targets for RPM and Deb packages.
+
+  * Use system getopt_long if available.
+
+  * Switch to TOML syntax per REUSE Specification v3.3.
+
+  * Update Gnulib and lib/patch-Makefile.am.diff.
+
+  * Don't save deleted lines to (default) register.
+
+  * Enable compression of test suite data.
+
+  * Adjust testsuite for OmniOS.
+
+  * Rename environment variable ZSTD_CMD => ZSTD.
+
+  * Update shell-call-graph parsing regex.
+
+  * Fix some comments.
+
+  * Revert experimental global-command structure.
+
+  * CI: Update macOS actions.
+
+  * Fix Sun/BSD file-pointer assignment.
+
+  * Add NOP to avoid c2x-extension warning.
+
+  * Initial support for OpenBSD.
+
+  * Handle SIGPIPE.
+
+  * Don't use `which' - it may be an alias.
+
+  * Update test requirements to include zstd.
+
+  * Allow long searches to be interrupted.
+
+  * Fix compile error.
+
+  * call-graph: Loosen function syntax requirement.
+
+  * Add Crowdin translations to PO file fr.po.
+
+  * Fix a typo.
+
+  * Fix corrupted Spanish translation.
+
+  * If vfork not available, shell command reports error.
+
+ed (1:2.1.0-2) unstable; urgency=medium
+
+  * Don't ignore SIGCHLD.
+
+  * Fix uninitialized variables and remove unused ones.
+
+  * Add Fedora RPM spec.
+
+  * Add missing files to source distribution.
+
+  * Fail gracefully if missing makeinfo/texi2any and/or texi2dvi.
+
+  * Update s.tmac for generating tutorials.
+
+  * Add Makefile target spdx-sbom.
+
+  * When buffer empty, permit .! shell-cmd to append.
+
+  * License ID is CC0, not CCO.
+
+  * Replace deprecated mktemp.
+
+  * Fix testsuite for macOS (macOS awk != GNU awk).
+
+  * Merge branch 'main' into preorder-traversal
+
+  * Add testsuite for prdg.
+
+  * Adjust delimiters around regex.
+
+  * Refactor call-graph script; Add dependency prdg.
+
+  * Refactor call-graph script; Add dependency prdg.
+
+  * Switch to zstd.
+
+  * Switch to file-based registers.
+
+  * Add removal of clangd's .cache directory to distclean-local.
+
+  * Remove generated headers.
+
+  * Resolve more buffer overflows.
+
+  * Attempt to make WAITPID more resilient.
+
+  * Fix buffer overflows.
+
+  * Try to sanitize  Debian changelog.
+
+  * Sync with Gnulib.
+
+  * Sync ChangeLog with git log.
+
+  * Lower libtool prerequisite.
+
+  * Update Debian changelog
+
 ed (1:2.1.0-1) unstable; urgency=medium
 
   * Fix memory leaks flagged by valgrind.
@@ -56,8 +192,11 @@ ed (1:2.1.0-1) unstable; urgency=medium
 ed (1:2.0.13-2) unstable; urgency=medium
 
   * Allow ed to read output of process substitution.
+
   * Support GNU regex operators in extended regular expressions.
+
   * Handle edge case where backslash is used as pattern delimiter.
+
   * Support command-line address arguments.
 
  -- Andrew L. Moore <slewsys@gmail.com>  Fri, 08 Sep 2023 01:40:08 +0000

debian/rules

@@ -10,4 +10,4 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 override_dh_autoreconf:
 	dh_autoreconf -- ./autogen.sh
 override_dh_auto_configure:
-	dh_auto_configure -- --prefix=/usr --enable-all-extensions --with-included-regex
+	dh_auto_configure -- --prefix=/usr --enable-all-extensions

debian/upstream/signing-key.asc

@@ -1,52 +1,13 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-CXE0pbnoPXZOdU4LPbyjIL2wu/nLD5SX6fY=
-=UHyJ
+mDMEZfvqhBYJKwYBBAHaRw8BAQdApGSkvj5/Osi7p2dma+K+lPCr/suL2sY/KUrC
+EbtOB1C0I0FuZHJldyBMLiBNb29yZSA8c2xld3N5c0BnbWFpbC5jb20+iJMEExYK
+ADsWIQRxA6mpJOstymP5i3xWxxaOLWHhwgUCZfvqhAIbAwULCQgHAgIiAgYVCgkI
+CwIEFgIDAQIeBwIXgAAKCRBWxxaOLWHhwi0ZAP4jiTL1/hZLR5Yknbx0p0JgHNwG
+WG9C+heG7/spt480yAEAnCAdoYnLOH+vqif4xoTUm/B155Otor/+bqzI21w5BAa4
+OARl++qEEgorBgEEAZdVAQUBAQdAeABKS4ZLDG6ii6SZm5cku4fDkO675P+nJzZ+
+zmFBmgoDAQgHiHgEGBYKACAWIQRxA6mpJOstymP5i3xWxxaOLWHhwgUCZfvqhAIb
+DAAKCRBWxxaOLWHhwj1+AQCLUmYl5SJQPfXBAyV5YgU93ihhuOQsxhNCzRkrKzyi
+tQD/dFcLcJxJaevNNjzyEsw28Wgiaa/RBgdLJFAxh+ENDgE=
+=LLr7
 -----END PGP PUBLIC KEY BLOCK-----

ed.spec

@@ -1,7 +1,8 @@
+#!/usr/bin/env bash
 %define _fortify_level 3
 
 Name:           ed
-Version:        2.1.0
+Version:        2.1.1
 Release:        1%{?dist}
 Summary:        The standard Unix text editor
 License:        BSD-2-Clause OR GPL-2.0-or-later OR MIT
@@ -20,8 +21,9 @@ BuildRequires:  texinfo
 BuildRequires:  texinfo-tex
 
 %description
-Ed is a 100% POSIX compliant and 8-bit clean implementation of the
-Unix line editor with modern extensions.
+Ed is the standard Unix text editor. It is used create, display,
+modify and otherwise manipulate text files. When invoked as red, it is
+restricted to editing files in the working directory.
 
 %prep
 %autosetup
@@ -40,7 +42,7 @@ echo ====================TESTING END=====================
 %make_install
 
 # Adjust contrib sources to RPM specs.
-find %{_builddir} -name 'call-graph.in' -print | xargs sed -i -e '1{s|#!.*|#!/bin/bash|;q}'
+find %{_builddir} -name 'shell-call-graph.in' -print | xargs sed -i -e '1{s|#!.*|#!/bin/bash|;q}'
 find %{_builddir} -name 'generate-random-graph.in' -print | xargs sed -i -e '1{s|#!.*|#!/bin/bash|;q}'
 find %{_builddir} -name 'cats.ed' -print | xargs sed -i -e '1{s|#!.*|#!/bin/ed -f|;q}'
 find %{_builddir} -name 'import-gnulib.sh' -delete
@@ -63,14 +65,35 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 %license COPYING
 
 %changelog
-* Sat Feb 01 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.1-1
+* Fri Feb 07 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.1-1
 - Update version to 2.1.1.
 
-* Sat Feb 01 2025 Jonathan Wakely <jwakely@redhat.com> - 2.1.0-33
-- Update README.md
+* Mon Feb 10 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-40
+- Handle empty insert in empty buffer.
 
-* Sat Feb 01 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-32
-- Update README.
+* Mon Feb 10 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-39
+- Prepend scripts from stdin before command line.
+
+* Sun Feb 09 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-38
+- Allow embedded newlines on command line.
+
+* Sun Feb 09 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-37
+- Minor code clean up.
+
+* Sun Feb 09 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-36
+- POSIX substitute requires closing pattern delimiter.
+
+* Fri Feb 07 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-35
+- Allow macros to operate over a range of addresses.
+
+* Tue Feb 04 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-34
+- Update dot after moving lines to register.
+
+* Tue Feb 04 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-33
+- Rename per structure I/O flags.
+
+* Sun Feb 02 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-32
+- Restore global-command context after macro.
 
 * Sat Feb 01 2025 Andrew L. Moore <slewsys@gmail.com> - 2.1.0-31
 - Update clean/distclean targets per GNU Coding Standards.