From 509070a1b9400735000cc6d8a1a5032e15e48417 Mon Sep 17 00:00:00 2001 From: wangjiang Date: Fri, 23 Sep 2022 15:40:32 +0800 Subject: [PATCH] config color alias for xz*grep --- colorxzgrep.csh | 5 +++++ colorxzgrep.sh | 4 ++++ xz.spec | 18 +++++++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 colorxzgrep.csh create mode 100644 colorxzgrep.sh diff --git a/colorxzgrep.csh b/colorxzgrep.csh new file mode 100644 index 0000000..a3964dc --- /dev/null +++ b/colorxzgrep.csh @@ -0,0 +1,5 @@ +/usr/libexec/grepconf.sh -c +if ( $status == 1 ) exit +alias xzgrep 'xzgrep --color=auto' +alias xzfgrep 'xzfgrep --color=auto' +alias xzegrep 'xzegrep --color=auto' diff --git a/colorxzgrep.sh b/colorxzgrep.sh new file mode 100644 index 0000000..4a91d70 --- /dev/null +++ b/colorxzgrep.sh @@ -0,0 +1,4 @@ +/usr/libexec/grepconf.sh -c || return +alias xzgrep='xzgrep --color=auto' 2>/dev/null +alias xzegrep='xzegrep --color=auto' 2>/dev/null +alias xzfgrep='xzfgrep --color=auto' 2>/dev/null diff --git a/xz.spec b/xz.spec index 64dc2c6..8b04edd 100644 --- a/xz.spec +++ b/xz.spec @@ -1,10 +1,13 @@ Name: xz Version: 5.2.5 -Release: 2 +Release: 3 Summary: A free general-purpose data compreession software with LZMA2 algorithm License: Public Domain, LGPLv2.1 and GPLv2+ URL: http://tukaani.org/xz Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz +Source1: colorxzgrep.sh +Source2: colorxzgrep.csh + Patch6000: backport-CVE-2022-1271.patch BuildRequires: perl-interpreter gcc @@ -64,6 +67,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %install %make_install +# config color alias for xz*grep +%global profiledir %{_sysconfdir}/profile.d +mkdir -p %{buildroot}%{profiledir} +install -p -m 644 %{SOURCE1} %{buildroot}%{profiledir} +install -p -m 644 %{SOURCE2} %{buildroot}%{profiledir} + %find_lang %name %check @@ -74,6 +83,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %doc %{_pkgdocdir} %license %{_pkgdocdir}/COPYING* %{_bindir}/*xz* +%{profiledir}/* %exclude %_pkgdocdir/examples* %exclude %{_libdir}/*.la @@ -101,6 +111,12 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/de/man1/*xz* %changelog +* Fri Sep 23 2022 wangjiang - 5.2.5-3 +- Type:enhancement +- CVE:NA +- SUG:NA +- DESC:config color alias for xz*grep + * Fri Apr 15 2022 liudabo - 5.2.5-2 - Type:CVE - ID:CVE-2022-1271 -- Gitee