diff --git a/.genwqe-tools.metadata b/.genwqe-tools.metadata new file mode 100644 index 0000000..bdb1aaf --- /dev/null +++ b/.genwqe-tools.metadata @@ -0,0 +1 @@ +4c12221340bcf13cdce65267d08bd9c1413ece2c SOURCES/v4.0.20.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9b793e5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/v4.0.20.tar.gz diff --git a/SOURCES/genwqe-user-4.0.18-install-gzFile_test.patch b/SOURCES/genwqe-user-4.0.18-install-gzFile_test.patch new file mode 100644 index 0000000..3047b5c --- /dev/null +++ b/SOURCES/genwqe-user-4.0.18-install-gzFile_test.patch @@ -0,0 +1,11 @@ +diff -up genwqe-user-4.0.18/tools/Makefile.than genwqe-user-4.0.18/tools/Makefile +--- genwqe-user-4.0.18/tools/Makefile.than 2017-02-13 15:26:30.887046956 +0100 ++++ genwqe-user-4.0.18/tools/Makefile 2017-02-13 15:27:01.084890726 +0100 +@@ -110,6 +110,7 @@ install_gzip_tools: all + install -D -m 755 zlib_mt_perf -T $(DESTDIR)/bin/zlib_mt_perf + install -D -m 755 genwqe_mt_perf -T $(DESTDIR)/bin/genwqe_mt_perf + install -D -m 755 genwqe_test_gz -T $(DESTDIR)/bin/genwqe_test_gz ++ install -D -m 755 gzFile_test -T $(DESTDIR)/bin/gzFile_test + + uninstall_gzip_tools: + $(RM) $(DESTDIR)/bin/genwqe_gzip \ diff --git a/SPECS/genwqe-tools.spec b/SPECS/genwqe-tools.spec new file mode 100644 index 0000000..a8184d1 --- /dev/null +++ b/SPECS/genwqe-tools.spec @@ -0,0 +1,180 @@ +# Copyright 2015, International Business Machines +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# zlib-devel 1.2.8 is better, but 1.2.7 should work too +# +# The following switch tries to take care that the distros libz.so is been taken: +# CONFIG_ZLIB_PATH=%%{_libdir}/libz.so +# No special libz build should be needed anymore, since we added the right +# dependency to the spec file. We want to have a zlib-devel installed. +# + +%global _hardened_build 1 + +Summary: GenWQE userspace tools +Name: genwqe-tools +Version: 4.0.20 +Release: 3%{?dist} +License: ASL 2.0 +URL: https://github.com/ibm-genwqe/genwqe-user/ +BuildRequires: zlib-devel >= 1.2.7 +BuildRequires: help2man +%ifarch %{power64} +BuildRequires: libcxl-devel +%endif +Source0: https://github.com/ibm-genwqe/genwqe-user/archive/v%{version}.tar.gz +Patch0: genwqe-user-4.0.18-install-gzFile_test.patch +Requires: genwqe-zlib = %{version}-%{release} + +%description +Provide a suite of utilities to manage and configure the IBM GenWQE card. + +%package -n genwqe-zlib +Summary: GenWQE hardware accelerated libz +%description -n genwqe-zlib +GenWQE hardware accelerated libz and test-utilities. + +%package -n genwqe-vpd +Summary: GenWQE adapter VPD tools +%description -n genwqe-vpd +The genwqe-vpd package contains GenWQE adapter VPD tools. + +%package -n genwqe-zlib-devel +Summary: Development files for %{name} +Requires: genwqe-zlib%{?_isa} = %{version}-%{release} + +%description -n genwqe-zlib-devel +The genwqe-zlib-devel package contains libraries and header files for +developing applications that use %{name}. + +%package -n genwqe-zlib-static +Summary: Static library files for %{name} +Requires: genwqe-zlib-devel%{?_isa} = %{version}-%{release} + +%description -n genwqe-zlib-static +The genwqe-zlib-static package contains static libraries for +developing applications that use %{name}. + +%prep +%autosetup -p1 -n genwqe-user-%{version} + +%build +LDFLAGS="%{__global_ldflags}" CFLAGS="%{optflags}" make %{?_smp_mflags} tools lib \ + VERSION=%{version} CONFIG_ZLIB_PATH=%{_libdir}/libz.so V=2 + +%install +make %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \ + SYSTEMD_UNIT_DIR=%{buildroot}/%{_unitdir} \ + LIB_INSTALL_PATH=%{buildroot}/%{_libdir}/genwqe \ + INCLUDE_INSTALL_PATH=%{buildroot}/%{_includedir}/genwqe + +# move genwqe_vpd.csv to expected location. +mkdir -p %{buildroot}/%{_sysconfdir}/ +install -m 0644 tools/genwqe_vpd.csv %{buildroot}/etc/ + +# remove libz stuff +rm %{buildroot}%{_libdir}/genwqe/libz.* +mv %{buildroot}%{_libdir}/genwqe/* %{buildroot}%{_libdir}/ +rmdir %{buildroot}%{_libdir}/genwqe/ + +%post -n genwqe-zlib -p /sbin/ldconfig +%postun -n genwqe-zlib -p /sbin/ldconfig + +%files -n genwqe-tools +%license LICENSE +%{_bindir}/genwqe_echo +%{_bindir}/genwqe_ffdc +%{_bindir}/genwqe_cksum +%{_bindir}/genwqe_memcopy +%{_bindir}/genwqe_peek +%{_bindir}/genwqe_poke +%{_bindir}/genwqe_update +%{_bindir}/gzFile_test +%{_bindir}/genwqe_gunzip +%{_bindir}/genwqe_gzip +%{_bindir}/genwqe_test_gz +%{_bindir}/genwqe_mt_perf +%{_bindir}/zlib_mt_perf + +%{_mandir}/man1/genwqe_echo.1* +%{_mandir}/man1/genwqe_ffdc.1* +%{_mandir}/man1/genwqe_gunzip.1* +%{_mandir}/man1/genwqe_gzip.1* +%{_mandir}/man1/genwqe_cksum.1* +%{_mandir}/man1/genwqe_memcopy.1* +%{_mandir}/man1/genwqe_peek.1* +%{_mandir}/man1/genwqe_poke.1* +%{_mandir}/man1/genwqe_update.1* +%{_mandir}/man1/zlib_mt_perf.1* +%{_mandir}/man1/genwqe_test_gz.1* +%{_mandir}/man1/genwqe_mt_perf.1* +%{_mandir}/man1/gzFile_test.1* + +%ifarch %{power64} +%{_bindir}/genwqe_maint +%{_bindir}/genwqe_loadtree +/%{_unitdir}/genwqe_maint.service +%{_mandir}/man1/genwqe_maint.1* +%{_mandir}/man1/genwqe_loadtree.1* +%endif + +%files -n genwqe-zlib +%license LICENSE +%{_libdir}/*.so.* + +%files -n genwqe-vpd +%license LICENSE +%config(noreplace) %{_sysconfdir}/genwqe_vpd.csv +%{_bindir}/genwqe_csv2vpd +%{_bindir}/genwqe_vpdconv +%{_bindir}/genwqe_vpdupdate +%{_mandir}/man1/genwqe_csv2vpd.1* +%{_mandir}/man1/genwqe_vpdconv.1* +%{_mandir}/man1/genwqe_vpdupdate.1* + +%files -n genwqe-zlib-devel +%dir %{_includedir}/genwqe +%{_includedir}/genwqe/* +%{_libdir}/*.so + +%files -n genwqe-zlib-static +%{_libdir}/*.a + +%changelog +* Wed May 23 2018 Than Ngo - 4.0.20-3 +- Related: bz#1521050, add explicit package version requirement + +* Fri May 18 2018 Than Ngo - 4.0.20-2 +- Related: bz#1521050, fix rpmdiff issue + +* Thu May 17 2018 Than Ngo - 4.0.20-1 +- Resolves: bz#1521050, update to 4.0.20 + +* Tue Jan 09 2018 Than Ngo - - 4.0.18-6 +- Related: bz#1532269, add -Wl,-z,relro to the linker flags in order to fix a rpmdiff + +* Mon Jan 08 2018 Than Ngo - 4.0.18-5 +- Resolves: bz#1532269, fixed genwqe_cksum when failed causes EEH + +* Fri Nov 17 2017 Than Ngo - 4.0.18-4 +- Resolves: bz#1513837, fixed potential arbitrary code execution bug + +* Thu Oct 12 2017 Than Ngo - 4.0.18-3 +- Resolves: bz#1456492, add backported patches from 4.0.19 branch + +* Tue Apr 04 2017 Rafael Fonseca - 4.0.18-2 +- Remove dynamically linked test binary. + +* Tue Mar 14 2017 Rafael Fonseca - 4.0.18-1 +- Import package from Fedora.