diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c983245..0000000 --- a/LICENSE +++ /dev/null @@ -1,65 +0,0 @@ -1) Project Source - - Source code for `entr` is licensed under an ISC-style license, to the - following copyright holders: - - Eric Radman - - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -2) Compatibility Libraries (MacOS and Linux only) - - Some code under the /missing subdirectory is licensed under a 2-term BSD - license, to the following copyright holders: - - Jonathan Lemon - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - - Some code under the /missing subdirectory is licensed under an ISC-style - license, to the following copyright holders: - - Todd C. Miller - Martin Pieuchot - Ted Unangst - - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE - * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/Update-copy-of-strlcpy.patch b/Update-copy-of-strlcpy.patch deleted file mode 100644 index 356fff4..0000000 --- a/Update-copy-of-strlcpy.patch +++ /dev/null @@ -1,88 +0,0 @@ -From e18faa9c700eb734fe156d336b0f5defa69b8d4e Mon Sep 17 00:00:00 2001 -From: Eric Radman -Date: Wed, 12 Jan 2022 13:27:32 -0500 -Subject: [PATCH] Update copy of strlcpy(3) for Linux - -Adjust strlcpy(3) signature to match implementation -Fixes compile warning with gcc -flto ---- - missing/compat.h | 2 +- - missing/strlcpy.c | 37 ++++++++++++++++++------------------- - 4 files changed, 24 insertions(+), 21 deletions(-) - -diff --git a/missing/compat.h b/missing/compat.h -index 79bd60f..184088c 100644 ---- a/missing/compat.h -+++ b/missing/compat.h -@@ -6,7 +6,7 @@ - - #if defined(_LINUX_PORT) && defined(__GLIBC__) - #include --size_t strlcpy(char *to, const char *from, int l); -+size_t strlcpy(char *dst, const char *src, size_t dsize); - #endif - - #if defined(_LINUX_PORT) -diff --git a/missing/strlcpy.c b/missing/strlcpy.c -index d32b659..2fa498c 100644 ---- a/missing/strlcpy.c -+++ b/missing/strlcpy.c -@@ -1,7 +1,7 @@ --/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ -+/* $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $ */ - - /* -- * Copyright (c) 1998 Todd C. Miller -+ * Copyright (c) 1998, 2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -20,32 +20,31 @@ - #include - - /* -- * Copy src to string dst of size siz. At most siz-1 characters -- * will be copied. Always NUL terminates (unless siz == 0). -- * Returns strlen(src); if retval >= siz, truncation occurred. -+ * Copy string src to buffer dst of size dsize. At most dsize-1 -+ * chars will be copied. Always NUL terminates (unless dsize == 0). -+ * Returns strlen(src); if retval >= dsize, truncation occurred. - */ - size_t --strlcpy(char *dst, const char *src, size_t siz) -+strlcpy(char *dst, const char *src, size_t dsize) - { -- char *d = dst; -- const char *s = src; -- size_t n = siz; -+ const char *osrc = src; -+ size_t nleft = dsize; - -- /* Copy as many bytes as will fit */ -- if (n != 0) { -- while (--n != 0) { -- if ((*d++ = *s++) == '\0') -+ /* Copy as many bytes as will fit. */ -+ if (nleft != 0) { -+ while (--nleft != 0) { -+ if ((*dst++ = *src++) == '\0') - break; - } - } - -- /* Not enough room in dst, add NUL and traverse rest of src */ -- if (n == 0) { -- if (siz != 0) -- *d = '\0'; /* NUL-terminate dst */ -- while (*s++) -+ /* Not enough room in dst, add NUL and traverse rest of src. */ -+ if (nleft == 0) { -+ if (dsize != 0) -+ *dst = '\0'; /* NUL-terminate dst */ -+ while (*src++) - ; - } - -- return(s - src - 1); /* count does not include NUL */ -+ return(src - osrc - 1); /* count does not include NUL */ - } diff --git a/entr-5.0.tar.gz b/entr-5.0.tar.gz deleted file mode 100644 index ecfb7bb..0000000 Binary files a/entr-5.0.tar.gz and /dev/null differ diff --git a/entr-5.4.tar.gz b/entr-5.4.tar.gz new file mode 100644 index 0000000..fd1a5fb Binary files /dev/null and b/entr-5.4.tar.gz differ diff --git a/entr.spec b/entr.spec index 6638b51..8533d32 100644 --- a/entr.spec +++ b/entr.spec @@ -1,14 +1,12 @@ Name: entr -Version: 5.0 -Release: 3 +Version: 5.4 +Release: 1 Summary: Run arbitrary commands when files change License: ISC URL: http://eradman.com/%{name}project/ Source0: http://eradman.com/%{name}project/code/%{name}-%{version}.tar.gz -Patch0: Update-copy-of-strlcpy.patch - BuildRequires: gcc BuildRequires: make @@ -19,33 +17,30 @@ when target files change. %prep %autosetup -n %{name}-%{version} -p1 +ln -s Makefile{.linux,} %build export CFLAGS="${RPM_OPT_FLAGS}" -./configure -make +export LDFLAGS="%{?__global_ldflags}" +%make_build %install -%make_install PREFIX=/usr -mkdir -p %{buildroot}/%{_docdir}/%{name} -cp LICENSE %{buildroot}/%{_docdir}/%{name}/ -cp README.md %{buildroot}/%{_docdir}/%{name}/ -cp NEWS %{buildroot}/%{_docdir}/%{name} - +export PREFIX=%{_prefix} +%make_install %check make test %files +%license LICENSE +%doc NEWS README.md %{_bindir}/entr -%{_mandir}/man1/entr.1.gz -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/LICENSE -%{_docdir}/%{name}/NEWS -%{_docdir}/%{name}/README.md - +%{_mandir}/man1/entr.1* %changelog +* Sun Oct 08 2023 yaoxin - 5.4-1 +- Upgrade to 5.4 + * Sat Jul 29 2023 xu_ping <707078654@qq.com> -5.0-3 - fix build error due to glibc upgrade diff --git a/entr.yaml b/entr.yaml new file mode 100644 index 0000000..00bbaf0 --- /dev/null +++ b/entr.yaml @@ -0,0 +1,4 @@ +version_control: NA +src_repo: NA +tag_prefix: NA +seperator: NA