.gitignore

@@ -1 +1 @@
-SOURCES/libedit-20210216-3.1.tar.gz
+SOURCES/libedit-20230828-3.1.tar.gz

.libedit.metadata

@@ -1 +1 @@
-343e3e0325b90c9be15f31734001c9dac5a1f179 SOURCES/libedit-20210216-3.1.tar.gz
+25b3d7f7570cf4c23322efc40865ee8e6d42ee6b SOURCES/libedit-20230828-3.1.tar.gz

SOURCES/libedit-editrc.patch

@@ -1,40 +0,0 @@
-diff -ur libedit-20210419-3.1/src/el.c libedit-20210522-3.1/src/el.c
---- libedit-20210419-3.1/src/el.c	2019-10-25 22:12:05.000000000 +0200
-+++ libedit-20210522-3.1/src/el.c	2021-05-22 20:55:00.000000000 +0200
-@@ -548,15 +548,15 @@
- 
- 	fp = NULL;
- 	if (fname == NULL) {
--#ifdef HAVE_ISSETUGID
--		if (issetugid())
--			return -1;
- 
--		if ((fname = getenv("EDITRC")) == NULL) {
-+		/* secure_getenv is guaranteed to be defined and do the right thing here */
-+		/* because of the defines above which take into account issetugid, */
-+		/* secure_getenv and __secure_getenv availability. */
-+		if ((fname = secure_getenv("EDITRC")) == NULL) {
- 			static const char elpath[] = "/.editrc";
- 			size_t plen = sizeof(elpath);
- 
--			if ((ptr = getenv("HOME")) == NULL)
-+			if ((ptr = secure_getenv("HOME")) == NULL)
- 				return -1;
- 			plen += strlen(ptr);
- 			if ((path = el_calloc(plen, sizeof(*path))) == NULL)
-@@ -565,14 +565,7 @@
- 				elpath + (*ptr == '\0'));
- 			fname = path;
- 		}
--#else
--		/*
--		 * If issetugid() is missing, always return an error, in order
--		 * to keep from inadvertently opening up the user to a security
--		 * hole.
--		 */
--		return -1;
--#endif
-+
- 	}
- 	if (fname[0] == '\0')
- 		return -1;

SPECS/libedit.spec

@@ -1,21 +1,39 @@
-%global snap 20210216
+%global snap 20230828
-%global dir_snap 20210216
+%global dir_snap 20230828
 
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	3.1
-Release:	38.%{snap}cvs%{?dist}
+Release:	52.%{snap}cvs%{?dist}
-License:	BSD
+
+# The project as a whole is BSD-3-Clause.
+# These files are BSD-2-Clause:
+# - doc/editline.3.roff
+# - doc/editrc.5.roff
+# - src/chartype.{c,h}
+# - src/editline/readline.h
+# - src/eln.c
+# - src/filecomplete.{c,h}
+# - src/getline.c [not linked into final library]
+# - src/literal.{c,h}
+# - src/read.h
+# - src/readline.c
+# - src/reallocarr.c
+# This file is both BSD-3-Clause and BSD-2-Clause:
+# - src/vis.c
+# These files are ISC:
+# - doc/editline.7.roff
+# - src/strlcat.c
+# - src/strlcpy.c
+License:	BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:		https://www.thrysoee.dk/editline/
 Source0:	https://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
+
 BuildRequires:	gcc
 BuildRequires:	groff-base
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 
-# Fix reading of $HOME/.editrc and $EDITRC
-Patch1:		libedit-editrc.patch
-
 %description
 Libedit is an autotool- and libtoolized port of the NetBSD Editline library.
 It provides generic line editing, history, and tokenization functions, similar
@@ -31,7 +49,7 @@ Requires:	ncurses-devel%{?_isa}
 This package contains development files for %{name}.
 
 %prep
-%autosetup -n %{name}-%{dir_snap}-%{version} -p1
+%autosetup -n %{name}-%{dir_snap}-%{version}
 
 # Fix unused direct shared library dependencies.
 sed -i "s/lncurses/ltinfo/" configure
@@ -47,8 +65,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 # See rhbz#1349671
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/history.3*
 
-%ldconfig_scriptlets
-
 %files
 %license COPYING
 %doc ChangeLog THANKS
@@ -58,8 +74,11 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/history.3*
 
 %files devel
 %doc examples/fileman.c examples/tc1.c examples/wtc1.c
-%{_mandir}/man3/*
+%{_mandir}/man3/editline.3*
-%{_mandir}/man7/*
+%{_mandir}/man3/el_*.3*
+%{_mandir}/man3/history_*.3*
+%{_mandir}/man3/tok_*.3*
+%{_mandir}/man7/editline.7*
 %{_includedir}/histedit.h
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -67,15 +86,59 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/history.3*
 %{_includedir}/editline/readline.h
 
 %changelog
-* Wed Jul 19 2023 Miroslav Lichvar <mlichvar@redhat.com> 3.1-38.20210216cvs
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.1-52.20230828cvs
-- Fix reading of $HOME/.editrc and $EDITRC (#2211207)
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.1-51.20230828cvs
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-50.20230828cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-49.20230828cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Aug 28 2023 Jerry James <loganjerry@gmail.com> - 3.1-48.20230828cvs
+- New version (20230828-3.1)
+
+* Wed Aug  2 2023 Jerry James <loganjerry@gmail.com> - 3.1-47.20221030cvs
+- Drop unneeded strlcat patch
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-46.20221030cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-45.20221030cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Nov 26 2022 Jerry James <loganjerry@gmail.com> - 3.1-44.20221030cvs
+- New version (20221030-3.1)
+
+* Mon Oct 10 2022 Jerry James <loganjerry@gmail.com> - 3.1-43.20221009cvs
+- New version (20221009-3.1)
+- Convert License tag to SPDX
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-42.20210910cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-41.20210910cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Sep 13 2021 Jerry James <loganjerry@gmail.com> - 3.1-40.20210910cvs
+- New version (20210910-3.1)
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-39.20210714cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 14 2021 Jerry James <loganjerry@gmail.com> - 3.1-38.20210714cvs
+- New version (20210714-3.1)
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.1-37.20210216cvs
+* Sat May 22 2021 Jerry James <loganjerry@gmail.com> - 3.1-37.20210522cvs
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- New version (20210522-3.1)
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1-36.20210216cvs
+* Tue Apr 20 2021 Jerry James <loganjerry@gmail.com> - 3.1-36.20210419cvs
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- New version (20210419-3.1)
+- Add -strlcat patch to avoid polluting the global namespace
 
 * Tue Feb 16 2021 Jerry James <loganjerry@gmail.com> - 3.1-35.20210216cvs
 - New version (20210216-3.1)