!10 [sync] PR-9: 修复bunzip2 -L/-V和bzcat -L/-V查询信息打印异常且返回值不为0

From: @openeuler-sync-bot 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6

0003-license-and-version-print-should-output-to-stdout-and-exit-with-code-0.patch

@@ -0,0 +1,48 @@
+From 65179284ceddc43e6388bf4ed8c2d85cf16e1b2f Mon Sep 17 00:00:00 2001
+From: Rikard Gynnerstedt <rikard.gynnerstedt@gmail.com>
+Date: Thu, 24 Oct 2019 12:48:57 +0200
+Subject: [PATCH] license and version print should output to stdout and exit
+ with code 0
+Reference: https://gitlab.com/bzip2/bzip2/-/commit/65179284ceddc43e6388bf4ed8c2d85cf16e1b2f
+Conflict: NA
+---
+ bzip2.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+ 
+diff --git a/bzip2.c b/bzip2.c
+index ed1a33f..6da2905 100644
+--- a/bzip2.c
++++ b/bzip2.c
+@@ -1600,7 +1600,7 @@ void testf ( Char *name )
+ static 
+ void license ( void )
+ {
+-   fprintf ( stderr,
++   fprintf ( stdout,
+ 
+     "bzip2, a block-sorting file compressor.  "
+     "Version %s.\n"
+@@ -1890,7 +1890,9 @@ IntNative main ( IntNative argc, Char *argv[] )
+                case '8': blockSize100k    = 8; break;
+                case '9': blockSize100k    = 9; break;
+                case 'V':
+-               case 'L': license();            break;
++               case 'L': license();
++                         exit ( 0 );
++                         break;
+                case 'v': verbosity++; break;
+                case 'h': usage ( progName );
+                          exit ( 0 );
+@@ -1916,8 +1918,8 @@ IntNative main ( IntNative argc, Char *argv[] )
+       if (ISFLAG("--keep"))              keepInputFiles   = True;    else
+       if (ISFLAG("--small"))             smallMode        = True;    else
+       if (ISFLAG("--quiet"))             noisy            = False;   else
+-      if (ISFLAG("--version"))           license();                  else
+-      if (ISFLAG("--license"))           license();                  else
++      if (ISFLAG("--version"))           { license(); exit ( 0 ); }  else
++      if (ISFLAG("--license"))           { license(); exit ( 0 ); }  else
+       if (ISFLAG("--exponential"))       workFactor = 1;             else 
+       if (ISFLAG("--repetitive-best"))   redundant(aa->name);        else
+       if (ISFLAG("--repetitive-fast"))   redundant(aa->name);        else
+-- 
+GitLab

bzip2.spec

@@ -1,6 +1,6 @@
 Name:		bzip2
 Version:	1.0.8
-Release:	2
+Release:	6
 Summary:	A high-quality data compressor
 
 License:	BSD
@@ -10,8 +10,9 @@ Source1:	bzip2.pc
 
 Patch0:		0001-add-compile-option.patch
 Patch1:		0002-CVE-2019-12900.patch
+Patch2:		0003-license-and-version-print-should-output-to-stdout-and-exit-with-code-0.patch
 
-BuildRequires:	gcc
+BuildRequires:	gcc 
 
 Provides:       bzip2-libs
 Obsoletes:      bzip2-libs
@@ -37,7 +38,7 @@ header files for bzip2
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%make_build -f Makefile-libbz2_so "CFLAGS=%{optflags} -Winline -D_FILE_OFFSET_BITS=64"
+%make_build -f Makefile-libbz2_so "CFLAGS=%{optflags} -Winline -fpic -fPIC -D_FILE_OFFSET_BITS=64"
 %make_build "CFLAGS=%{optflags} -fpic -fPIC -Winline -D_FILE_OFFSET_BITS=64"
 
 %install
@@ -55,7 +56,7 @@ ln -fs bzdiff %{buildroot}%{_bindir}/bzcmp
 ln -fs bzgrep %{buildroot}%{_bindir}/bzegrep
 ln -fs bzgrep %{buildroot}%{_bindir}/bzfgrep
 ln -fs bzmore %{buildroot}%{_bindir}/bzless
-install -m 0755 *.so* %{buildroot}%{_libdir}
+install -m 0755 libbz2.so.%{version}  %{buildroot}%{_libdir}
 ln -s libbz2.so.%{version} %{buildroot}%{_libdir}/libbz2.so.1
 ln -s libbz2.so.1 %{buildroot}%{_libdir}/libbz2.so
 cp %{SOURCE1} .
@@ -90,6 +91,18 @@ make check
 %{_mandir}/man1/b*.1.gz
 
 %changelog
+* Mon Oct 31 2022 yanglongkang <yanglongkang@h-partners.com> - 1.0.8-6
+- license and version print should output to stdout and exit with code
+
+* Tue Sep 20 2022 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.0.8-5
+- Delete redundant .so files 
+
+* Thu Jul 22 2021 wuchaochao <wuchaochao4@huawei.com> - 1.0.8-4
+- Remove BuildRequires gdb
+
+* Sat Mar 21 2020 chengquan<chengquan3@huawei.com> - 1.0.8-3
+- Add fPIC option to make the self-compiled environment build normally
+
 * Wed Mar 11 2020 yangjian<yangjian79.huawei.com> - 1.0.8-2
 - Fix dependency
 

bzip2.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: git://sourceware.org/git/bzip2.git
+tag_prefix: ^bzip2- 
+seperator: .