rpms / fish

Clone
Source Code
GIT

#1 Rebase to EPEL 10's 3.7.1-1
Closed a month ago by salimma. Opened a month ago by salimma.
rpms/ salimma/fish c9s-3.7.1  into  c9s-sig-hyperscale

Merge remote-tracking branch 'fedora/epel10' into c9s-sig-hyperscale
Michel Lind • a month ago  
ef745b
Convert to %autorelease and %autochangelog
Michel Lind • a month ago  
e23c3d
Revert "Make it build on el8"
Michel Lind • a month ago  
3b816e
New upstream release 3.7.1 (fixes rhbz#2270247)
ErrorNoInternet • 9 months ago  
d75003
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
Fedora Release Engineering • 9 months ago  
3ee3de
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Fedora Release Engineering • a year ago  
c7db77
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Fedora Release Engineering • a year ago  
670d2c
New upstream release 3.7.0 (Resolves: rhbz#2256375)
Neal Gompa • a year ago  
3f5fc3
Remove duplicate AND from License tag
Dan Čermák • a year ago  
f7bb21
New upstream release 3.6.4, fixes rhbz#2252773
Dan Čermák • a year ago  
fabd25
Switch license identifier to SPDX and add missing PSF-2.0
Dan Čermák • a year ago  
17af59
Use proper rpm comments to prevent macro expansion
Dan Čermák • a year ago  
370405
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Fedora Release Engineering • 2 years ago  
6bfe3e
Update to 3.6.1
Siteshwar Vashisht • 2 years ago  
bb4138
Merge #13 `Update to 3.6.0`
Siteshwar Vashisht • 2 years ago  
75a14f
Update to 3.6.0
Siteshwar Vashisht • 2 years ago  
71ff40
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Fedora Release Engineering • 2 years ago  
23ec4a
file modified
+52 
@@ -1,3 +1,55 @@ 
 

+ * Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.7.1-2
 

+ - [Facebook] Refresh syslog patch
 

+ - Always include all patches in src.rpm
 

+ 

+ * Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.7.1-1
 

+ - Rebase to 3.7.1-1 from EPEL 10
 

+ 

+ * Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.5.1-3
 

+ - Revert EL8 workaround, no longer needed
 

+ 

+ * Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
 

+ - Add missing disttag to Release
 

+ 

+ * Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
 

+ - Add Facebook internal patch to log history to syslog
 

+ 

+ * Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
 

+ - Make it build on el8
 

+ 

+ * Mon Aug 15 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.1-1
 

+ - Update to 3.5.1
 

+ 

+ * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> 3.5.0-2
 

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

+ 

+ * Fri Jun 17 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.0-1
 

+ - Update to 3.5.0
 

+ 

+ * Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> 3.4.1^120g1a0b1ae238e-1
 

+ - Update to 3.4.1-120-g1a0b1ae23
 

+ 

+ * Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> 3.4.1-1
 

+ - Update to 3.4.1
 

+ 

+ * Sun Mar 13 2022 Igor Raits <igor.raits@gmail.com> 3.4.0-1
 

+ - Update to 3.4.0
 

+ 

+ * Mon Feb 21 2022 Igor Raits <igor.raits@gmail.com> 3.3.1^1075ge0bc944d5c5-1
 

+ - Update to 3.3.1-1075-ge0bc944d5
 

+ 

+ * Sun Feb 06 2022 Igor Raits <igor.raits@gmail.com> 3.3.1^1034g964b7a729a7-1
 

+ - Update to 3.3.1-1034-g964b7a729
 

+ 

+ * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> 3.3.1^803g76a336d647e-3
 

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

+ 

+ * Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> 3.3.1^803g76a336d647e-2
 

+ - Add missing BuildRequires for tests
 

+ 

+ * Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> 3.3.1^803g76a336d647e-1
 

+ - Update to 3.3.1-803-g76a336d64
 

+ 

  * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-2
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

file modified
+16 -8 
@@ -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 @@ 
 

  #   - 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,6 +39,8 @@ 
 

  %else
 

  Source0:        https://github.com/fish-shell/fish-shell/archive/%{githash}/%{name}-%{githash}.tar.gz
 

  %endif
 

+ # Log history to syslog
 

+ Patch101:          log-history-to-syslog.patch
 

  

  BuildRequires:  cmake >= 3.5
 

  BuildRequires:  ninja-build
 
@@ -70,11 +75,14 @@ 
 

  %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

file added
+75 
@@ -0,0 +1,75 @@ 
 

+ --- a/CMakeLists.txt
 

+ +++ b/CMakeLists.txt
 

+ @@ -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
 

+ +    src/syslog.cpp
 

+  )
 

+  

+  # Header files are just globbed.
 

+ --- a/src/reader.cpp
 

+ +++ b/src/reader.cpp
 

+ @@ -76,6 +76,7 @@
 

+  #include "reader.h"
 

+  #include "screen.h"
 

+  #include "signal.h"
 

+ +#include "syslog.h"
 

+  #include "termsize.h"
 

+  #include "tokenizer.h"
 

+  #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 @@
 

+ +// Syslogging utilities.
 

+ +#include <stdlib.h>
 

+ +#include <unistd.h>
 

+ +
 

+ +#include "syslog.h"
 

+ +#include "wcstringutil.h"
 

+ +
 

+ +void fish_syslog_history(const wcstring &str) {
 

+ +    char cmd[SYSLOG_MAXLEN+1];
 

+ +    static int first = 1;
 

+ +
 

+ +    if (first) {
 

+ +        openlog(SYSLOG_SHELLNAME, OPENLOG_OPTS, SYSLOG_FACILITY);
 

+ +        first = 0;
 

+ +    }
 

+ +
 

+ +    int rc = wcstombs(cmd, str.c_str(), SYSLOG_MAXLEN);
 

+ +
 

+ +    if (rc < SYSLOG_MAXLEN) {
 

+ +        syslog(SYSLOG_FACILITY|SYSLOG_LEVEL, "HISTORY: PID=%d UID=%d %s", getpid(), getuid(), cmd);
 

+ +    } else {
 

+ +        syslog(SYSLOG_FACILITY|SYSLOG_LEVEL, "HISTORY (TRUNCATED): PID=%d UID=%d %s", getpid(), getuid(), cmd);
 

+ +    }
 

+ +}
 

+ --- /dev/null
 

+ +++ b/src/syslog.h
 

+ @@ -0,0 +1,17 @@
 

+ +// Syslogging utilities.
 

+ +#ifndef FISH_SYSLOG_H
 

+ +#define FISH_SYSLOG_H
 

+ +
 

+ +#include <syslog.h>
 

+ +
 

+ +#include "common.h"
 

+ +
 

+ +#define SYSLOG_SHELLNAME "fish"
 

+ +#define SYSLOG_MAXLEN 600
 

+ +#define SYSLOG_FACILITY LOG_AUTHPRIV
 

+ +#define SYSLOG_LEVEL LOG_INFO
 

+ +#define OPENLOG_OPTS LOG_PID
 

+ +
 

+ +void fish_syslog_history(const wcstring &str);
 

+ +
 

+ +#endif

file added
+1 
@@ -0,0 +1,1 @@ 
 

+ log-history-to-syslog.patch

file modified
+2 -2 
@@ -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

  • drop EL8 workarounds
  • convert back to rpmautospec
  • rebase patch - note: there is a separate add_to_history now so we're attaching there
  • rework patch application, so we can always ship all patches when building any src.rpm but apply the Facebook one only when built for that flavor

👍

Pagure is displaying this poorly, this is the diff for the log-history-to-syslog.patch

https://paste.centos.org/view/df2b451a

Pull-Request has been closed by salimma
a month ago
Metadata
None
No Tags
Changes Summary 5
+52 -0
file changed
changelog
+16 -8
file changed
fish.spec
+75
file added
log-history-to-syslog.patch
+1
file added
series
+2 -2
file changed
sources

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation