From 612e6f7b23b08630492da1a052cc4d8f8a3130f8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 2 Aug 2023 08:29:15 -0600 Subject: [PATCH] Drop unneeded strlcat patch --- libedit-strlcat.patch | 17 ----------------- libedit.spec | 14 ++++---------- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 libedit-strlcat.patch diff --git a/libedit-strlcat.patch b/libedit-strlcat.patch deleted file mode 100644 index 71670fd..0000000 --- a/libedit-strlcat.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/sys.h.orig 2021-04-19 15:19:17.000000000 -0600 -+++ src/sys.h 2021-04-20 08:26:19.950621433 -0600 -@@ -83,12 +83,12 @@ typedef void *ioctl_t; - #include - - #ifndef HAVE_STRLCAT --//#define strlcat libedit_strlcat -+#define strlcat libedit_strlcat - size_t strlcat(char *dst, const char *src, size_t size); - #endif - - #ifndef HAVE_STRLCPY --//#define strlcpy libedit_strlcpy -+#define strlcpy libedit_strlcpy - size_t strlcpy(char *dst, const char *src, size_t size); - #endif - diff --git a/libedit.spec b/libedit.spec index 98b7f58..23910a0 100644 --- a/libedit.spec +++ b/libedit.spec @@ -4,7 +4,7 @@ Summary: The NetBSD Editline library Name: libedit Version: 3.1 -Release: 46.%{snap}cvs%{?dist} +Release: 47.%{snap}cvs%{?dist} # The project as a whole is BSD-3-Clause. # These files are BSD-2-Clause: @@ -28,13 +28,6 @@ Release: 46.%{snap}cvs%{?dist} 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 -# Version 20210419 changes internal symbols named libedit_strlcat and -# libedit_strlcpy to plain strlcat and strlcpy. None of those symbols are -# mentioned in the public header files. Many projects check for the existence -# of functions named strlcat and strlcpy. I am not prepared to deal with the -# possible fallout of those functions suddenly existing in a low-level Fedora -# library, so restore the old names for now. -Patch0: %{name}-strlcat.patch BuildRequires: gcc BuildRequires: groff-base @@ -72,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 @@ -95,6 +86,9 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/history.3* %{_includedir}/editline/readline.h %changelog +* Wed Aug 2 2023 Jerry James - 3.1-47.20221030cvs +- Drop unneeded strlcat patch + * Thu Jul 20 2023 Fedora Release Engineering - 3.1-46.20221030cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild