Compare commits
No commits in common. "5edcb35591bb678628b1dd179ede4d7e21f5bf6b" and "e2a78a1d86a31be65e42d42733f0a1231efe794b" have entirely different histories.
5edcb35591
...
e2a78a1d86
@ -1,48 +0,0 @@
|
||||
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
|
||||
@ -1,26 +0,0 @@
|
||||
--- bzip2-1.0.8/Makefile.orig 2024-08-11 20:50:17.297655600 +0800
|
||||
+++ bzip2-1.0.8/Makefile 2024-08-11 20:51:08.955480100 +0800
|
||||
@@ -15,9 +15,9 @@
|
||||
SHELL=/bin/sh
|
||||
|
||||
# To assist in cross-compiling
|
||||
-CC=gcc
|
||||
-AR=ar
|
||||
-RANLIB=ranlib
|
||||
+CC ?=gcc
|
||||
+AR ?= ar
|
||||
+RANLIB ?= ranlib
|
||||
|
||||
# Where you want it installed when you do 'make install'
|
||||
PREFIX=/usr/local
|
||||
--- bzip2-1.0.8/Makefile-libbz2_so.orig 2024-08-11 20:56:12.124391600 +0800
|
||||
+++ bzip2-1.0.8/Makefile-libbz2_so 2024-08-11 20:57:53.109240100 +0800
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
|
||||
SHELL=/bin/sh
|
||||
-CC=gcc
|
||||
+CC ?= gcc
|
||||
BIGFILES=-D_FILE_OFFSET_BITS=64
|
||||
|
||||
OBJS= blocksort.o \
|
||||
64
bzip2.spec
64
bzip2.spec
@ -1,22 +1,20 @@
|
||||
Name: bzip2
|
||||
Version: 1.0.8
|
||||
Release: 8
|
||||
Release: 3
|
||||
Summary: A high-quality data compressor
|
||||
|
||||
License: BSD-4-Clause
|
||||
License: BSD
|
||||
URL: https://www.sourceware.org/bzip2/
|
||||
Source0: https://sourceware.org/pub/bzip2/%{name}-%{version}.tar.gz
|
||||
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
|
||||
Patch3: bzip2-1.0.8-toolchain-variable.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc gdb
|
||||
|
||||
Provides: bzip2-libs = %{version}-%{release}
|
||||
Obsoletes: bzip2-libs < %{version}-%{release}
|
||||
Provides: bzip2-libs
|
||||
Obsoletes: bzip2-libs
|
||||
|
||||
%description
|
||||
bzip2 is a freely available, patent free, high-quality data compressor.
|
||||
@ -27,8 +25,8 @@ around twice as fast at compression and six times faster at decompression.
|
||||
%package devel
|
||||
Summary: header files for bzip2
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: bzip2-static = %{version}-%{release}
|
||||
Obsoletes: bzip2-static < %{version}-%{release}
|
||||
Provides: bzip2-static
|
||||
Obsoletes: bzip2-static
|
||||
|
||||
%description devel
|
||||
header files for bzip2
|
||||
@ -39,17 +37,11 @@ header files for bzip2
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%if "%toolchain" == "clang"
|
||||
export CC=clang
|
||||
export AR=llvm-ar
|
||||
export RANLIB=llvm-ranlib
|
||||
%endif
|
||||
export CFLAGS="%{build_cflags} -Winline -fpic -fPIC -D_FILE_OFFSET_BITS=64"
|
||||
%set_build_flags
|
||||
%make_build -f Makefile-libbz2_so
|
||||
%make_build
|
||||
%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
|
||||
rm -rf %RPM_BUILD_ROOT
|
||||
%make_install PREFIX=%{buildroot}%{_prefix}
|
||||
|
||||
# Default install path is /usr/bin lib man, change dest dirs here.
|
||||
@ -63,27 +55,31 @@ 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 libbz2.so.%{version} %{buildroot}%{_libdir}
|
||||
install -m 0755 *.so* %{buildroot}%{_libdir}
|
||||
ln -s libbz2.so.%{version} %{buildroot}%{_libdir}/libbz2.so.1
|
||||
ln -s libbz2.so.1 %{buildroot}%{_libdir}/libbz2.so
|
||||
cp %{S:1} .
|
||||
cp %{SOURCE1} .
|
||||
sed -i "s@^libdir=@libdir=%{_libdir}@" bzip2.pc
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||
install -m 0644 bzip2.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bunzip2.1
|
||||
ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bzcat.1
|
||||
ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bzip2recover.1
|
||||
ln -s bzip2.1.gz %{buildroot}%{_mandir}/man1/bunzip2.1.gz
|
||||
ln -s bzip2.1.gz %{buildroot}%{_mandir}/man1/bzcat.1.gz
|
||||
ln -s bzip2.1.gz %{buildroot}%{_mandir}/man1/bzip2recover.1.gz
|
||||
|
||||
%check
|
||||
%make_build check
|
||||
make check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%doc CHANGES README
|
||||
%defattr(-,root,root)
|
||||
%doc CHANGES LICENSE README
|
||||
%license LICENSE
|
||||
%{_bindir}/*
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/bzlib.h
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/
|
||||
@ -91,25 +87,9 @@ ln -s bzip2.1 %{buildroot}%{_mandir}/man1/bzip2recover.1
|
||||
|
||||
%files help
|
||||
%doc manual.html manual.pdf
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man1/b*.1.gz
|
||||
|
||||
%changelog
|
||||
* Sun Aug 11 2024 Funda Wang <fundawang@yeah.net> - 1.0.8-8
|
||||
- cleanup spec
|
||||
- merge clang and gcc declaration
|
||||
|
||||
* Fri Apr 19 2024 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.0.8-7
|
||||
- license and version print should output to stdout and exit with code
|
||||
|
||||
* Thu Apr 13 2023 Chenxi Mao <chenxi.mao@suse.com> - 1.0.8-6
|
||||
- Support build with clang.
|
||||
|
||||
* 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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user