From ef745b09c5844920e6d75f3db86297142362084c Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Feb 28 2025 18:33:35 +0000 Subject: Merge remote-tracking branch 'fedora/epel10' into c9s-sig-hyperscale Signed-off-by: Michel Lind --- diff --git a/changelog b/changelog index 38357cd..c771788 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +* Fri Feb 28 2025 Michel Lind 3.7.1-2 +- [Facebook] Refresh syslog patch +- Always include all patches in src.rpm + +* Fri Feb 28 2025 Michel Lind 3.7.1-1 +- Rebase to 3.7.1-1 from EPEL 10 + * Fri Feb 28 2025 Michel Lind 3.5.1-3 - Revert EL8 workaround, no longer needed diff --git a/fish.spec b/fish.spec index c716aad..974fbc9 100644 --- a/fish.spec +++ b/fish.spec @@ -1,17 +1,18 @@ -%global version_base 3.5.1 -#global gitnum 120 -#global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0 -#global githashshort #{lua:print(string.sub(rpm.expand('#{githash}'), 1, 11))} +%global version_base 3.7.1 +%dnl %global gitnum 120 +%dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0 +%dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))} Name: fish Version: %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}} Release: %autorelease Summary: Friendly interactive shell +# see also doc_src/license.rst # GPLv2 # - src/fish.cpp # and rest… # GPLv2+ -# - src/builtin_printf.cpp +# - src/builtins/printf.cpp # BSD # - src/fallback.cpp # - share/tools/create_manpage_completions.py @@ -27,7 +28,9 @@ Summary: Friendly interactive shell # - share/tools/web_config/js/angular-route.js # - share/tools/web_config/js/angular-sanitize.js # - share/tools/web_config/js/angular.js -License: GPLv2 and BSD and ISC and LGPLv2+ and MIT +# PSF-2.0 +# - doc_src/python_docs_theme/, +License: GPL-2.0-only AND BSD-3-Clause AND ISC AND LGPL-2.0-or-later AND MIT AND PSF-2.0 URL: https://fishshell.com %if %{undefined gitnum} Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -36,10 +39,8 @@ Source2: gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg %else Source0: https://github.com/fish-shell/fish-shell/archive/%{githash}/%{name}-%{githash}.tar.gz %endif -%if 0%{?facebook} # Log history to syslog -Patch: log-history-to-syslog.patch -%endif +Patch101: log-history-to-syslog.patch BuildRequires: cmake >= 3.5 BuildRequires: ninja-build @@ -74,11 +75,14 @@ nothing to learn or configure. %if %{undefined gitnum} %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %endif -%autosetup -p1 %{?gitnum:-n fish-shell-%{githash}} +%autosetup -N %{?gitnum:-n fish-shell-%{githash}} +%autopatch -p1 -M 100 +%if 0%{?facebook} +%autopatch -p1 -m 101 +%endif %if %{defined gitnum} echo "%{version_base}-%{gitnum}g%{githashshort}" > version %endif -rm -vr pcre2* # Change the bundled scripts to invoke the python binary directly. for f in $(find share/tools -type f -name '*.py'); do diff --git a/log-history-to-syslog.patch b/log-history-to-syslog.patch index ff9fd65..6cbc924 100644 --- a/log-history-to-syslog.patch +++ b/log-history-to-syslog.patch @@ -1,8 +1,6 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e90030..4394696 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -115,6 +115,7 @@ set(FISH_SRCS +@@ -121,6 +121,7 @@ set(FISH_SRCS src/tokenizer.cpp src/topic_monitor.cpp src/trace.cpp src/utf8.cpp src/util.cpp src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp src/fds.cpp @@ -10,30 +8,24 @@ index 2e90030..4394696 100644 ) # Header files are just globbed. -diff --git a/src/reader.cpp b/src/reader.cpp -index 785f680..16f55e2 100644 --- a/src/reader.cpp +++ b/src/reader.cpp -@@ -74,6 +74,7 @@ +@@ -76,6 +76,7 @@ #include "reader.h" #include "screen.h" #include "signal.h" +#include "syslog.h" #include "termsize.h" #include "tokenizer.h" - #include "wildcard.h" -@@ -3479,6 +3480,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat - break; - } - -+ fish_syslog_history(text); -+ - // Historical behavior is to trim trailing spaces. - // However, escaped spaces ('\ ') should not be trimmed (#7661) - // This can be done by counting pre-trailing '\' -diff --git a/src/syslog.cpp b/src/syslog.cpp -new file mode 100644 -index 0000000..c22c47b + #include "wcstringutil.h" +@@ -4355,6 +4356,7 @@ void reader_data_t::add_to_history() con + } else { + mode = history_persistence_mode_t::disk; + } ++ fish_syslog_history(text); + history_t::add_pending_with_file_detection(history, text, this->vars().snapshot(), mode); + } + } --- /dev/null +++ b/src/syslog.cpp @@ -0,0 +1,24 @@ @@ -61,9 +53,6 @@ index 0000000..c22c47b + syslog(SYSLOG_FACILITY|SYSLOG_LEVEL, "HISTORY (TRUNCATED): PID=%d UID=%d %s", getpid(), getuid(), cmd); + } +} -diff --git a/src/syslog.h b/src/syslog.h -new file mode 100644 -index 0000000..ce0ce25 --- /dev/null +++ b/src/syslog.h @@ -0,0 +1,17 @@ diff --git a/series b/series new file mode 100644 index 0000000..d2b8243 --- /dev/null +++ b/series @@ -0,0 +1 @@ +log-history-to-syslog.patch diff --git a/sources b/sources index e6e05bb..48d8062 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.5.1.tar.xz) = 328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235 -SHA512 (fish-3.5.1.tar.xz.asc) = 8d1768fa46b37d4664a4007a8e81b197d2039463b9a8a163a486bb433017b65d4b9c7e9eebb7038f4258046b2ba59208d9253cd7dd050104670e169c4da1a877 +SHA512 (fish-3.7.1.tar.xz) = f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe +SHA512 (fish-3.7.1.tar.xz.asc) = 924c51ead82ded38c6d2a91dae4ff568759cde30e023c2520d329d49ef163bc97e30274872b9325a9fdd591964106dd1e524fa429156d500338fe1d84d0739a6