From 82c3fb62784f8399f07c40861984306de8b7c733 Mon Sep 17 00:00:00 2001 From: Vladis Dronov Date: Mon, 8 Aug 2022 16:35:11 +0200 Subject: [PATCH] Rebuild for qatzip v1.0.9 Also require qatlib-devel >= 22.07.0 due to soversion bump Signed-off-by: Vladis Dronov --- .gitignore | 2 +- 1-fix-snprintf-truncation.patch | 14 -------------- 2-add-strong-stack-prot.patch | 24 ------------------------ qatzip.spec | 26 +++++++++++++++----------- sources | 2 +- 5 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 1-fix-snprintf-truncation.patch delete mode 100644 2-add-strong-stack-prot.patch diff --git a/.gitignore b/.gitignore index 66f938b..9c475dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/qatzip-1.0.7.tar.gz +/qatzip-1.0.9.tar.gz diff --git a/1-fix-snprintf-truncation.patch b/1-fix-snprintf-truncation.patch deleted file mode 100644 index 4bad12c..0000000 --- a/1-fix-snprintf-truncation.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- utils/qzip.c.orig -+++ utils/qzip.c -@@ -469,9 +469,8 @@ int makeOutName(const char *in_name, const char *out_name, - * parent directory. */ - void mkPath(char *path, const char *dirpath, char *file) - { -- if (strlen(dirpath) + strlen(file) + 1 < MAX_PATH_LEN) { -- snprintf(path, MAX_PATH_LEN, "%s/%s", dirpath, file); -- } else { -+ if (snprintf(path, MAX_PATH_LEN, "%s/%s", dirpath, file) >= MAX_PATH_LEN) { -+ /* truncation occurred */ - assert(0); - } - } diff --git a/2-add-strong-stack-prot.patch b/2-add-strong-stack-prot.patch deleted file mode 100644 index cabdd87..0000000 --- a/2-add-strong-stack-prot.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig 2022-02-08 17:54:38.857757054 +0100 -+++ configure 2022-02-08 18:09:34.392172703 +0100 -@@ -142,15 +142,15 @@ includedir=${includedir:-$prefix/include - mandir=${mandir:-$prefix/share/man} - - # define CFLAGS and LDFLAGS if no environment variables defined --if test -z ${CFLAGS}; then -- CFLAGS='-Wall -Werror -std=gnu99 -pedantic -fstack-protector -fPIE -fPIC -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv' -+if test -z "${CFLAGS}"; then -+ CFLAGS="-Wall -Werror -std=gnu99 -pedantic -fstack-protector-strong -fPIE -fPIC -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv" - else -- CFLAGS+=" -Wall -Werror -std=gnu99 -pedantic -fstack-protector -fPIE -fPIC" -+ CFLAGS+=" -Wall -Werror -std=gnu99 -pedantic -fstack-protector-strong -fPIE -fPIC" - fi --if test -z ${LDFLAGS}; then -- LDFLAGS='-fstack-protector -fPIC -pie -z relro -z now -Wl,-z,noexecstack' -+if test -z "${LDFLAGS}"; then -+ LDFLAGS="-fstack-protector-strong -fPIC -pie -z relro -z now -Wl,-z,noexecstack" - else -- LDFLAGS+=" -fstack-protector -fPIC -pie -z relro -z now -Wl,-z,noexecstack" -+ LDFLAGS+=" -fstack-protector-strong -fPIC -pie -z relro -z now -Wl,-z,noexecstack" - fi - - # try to build 32 or 64 bit system binary diff --git a/qatzip.spec b/qatzip.spec index ec4b38e..2d8f49c 100644 --- a/qatzip.spec +++ b/qatzip.spec @@ -1,26 +1,24 @@ # SPDX-License-Identifier: MIT %global githubname QATzip -%global libqatzip_soversion 1 +%global libqatzip_soversion 3 Name: qatzip -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.0.9 +Release: 1%{?dist} Summary: Intel QuickAssist Technology (QAT) QATzip Library License: BSD URL: https://github.com/intel/%{githubname} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc >= 4.8.5 BuildRequires: zlib-devel >= 1.2.7 -BuildRequires: qatlib-devel >= 21.08.0 +BuildRequires: qatlib-devel >= 22.07.0 +BuildRequires: autoconf automake libtool make lz4-devel # The purpose of the package is to support hardware that only exists on x86_64 platforms # https://bugzilla.redhat.com/show_bug.cgi?id=1987280 ExclusiveArch: x86_64 -Patch0: 1-fix-snprintf-truncation.patch -Patch1: 2-add-strong-stack-prot.patch - %description QATzip is a user space library which builds on top of the Intel QuickAssist Technology user space library, to provide extended @@ -53,9 +51,10 @@ applications that use the QATzip APIs. %build %set_build_flags +autoreconf -vif ./configure \ --bindir=%{_bindir} \ - --sharedlib-dir=%{_libdir} \ + --libdir=%{_libdir} \ --includedir=%{_includedir} \ --mandir=%{_mandir} \ --prefix=%{_prefix} \ @@ -65,6 +64,8 @@ applications that use the QATzip APIs. %install %make_install +rm %{buildroot}/%{_libdir}/libqatzip.a +rm %{buildroot}/%{_libdir}/libqatzip.la rm -vf %{buildroot}%{_mandir}/*.pdf # Check section is not available for these functional and performance tests require special hardware. @@ -76,8 +77,7 @@ rm -vf %{buildroot}%{_mandir}/*.pdf %files libs %license LICENSE* -%{_libdir}/libqatzip.so.%{libqatzip_soversion} -%{_libdir}/libqatzip.so.%{version} +%{_libdir}/libqatzip.so.%{libqatzip_soversion}* %files devel %doc docs/QATzip-man.pdf @@ -85,6 +85,10 @@ rm -vf %{buildroot}%{_mandir}/*.pdf %{_libdir}/libqatzip.so %changelog +* Mon Aug 08 2022 Vladis Dronov - 1.0.9-1 +- Rebuild for qatzip v1.0.9 +- Update to require qatlib-devel >= 22.07.0 due to soversion bump + * Fri Jul 22 2022 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0d0a14c..82cd989 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qatzip-1.0.7.tar.gz) = d5e21aa0fc42d1fba439f7afecdb904e2ffa4960651ce003386988b5ebcff50b2e57d60ca379de7aa2285449a39f3314a1a82336ec0adfe3a4bec3bb8da613d3 +SHA512 (qatzip-1.0.9.tar.gz) = 96033af621c5e8f77162a21bb8def201f944e4ff6cfe68f11cf2b2a9a6bb8baff66c62eceba3d525064a612414f893228747dc78cc812ad3260e29de1b71f3ce