commit c7bef14771bcba19c4deb1109dfa70cb8bd7dc90 Author: MSVSphere Packaging Team Date: Tue Nov 26 17:21:12 2024 +0300 import libzfcphbaapi-2.2.0-24.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fe91b18 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/lib-zfcp-hbaapi-2.2.0.tar.gz diff --git a/.libzfcphbaapi.metadata b/.libzfcphbaapi.metadata new file mode 100644 index 0000000..eaa8d4a --- /dev/null +++ b/.libzfcphbaapi.metadata @@ -0,0 +1 @@ +b876346c88aefc3cec6e0f888820463b29fcff05 SOURCES/lib-zfcp-hbaapi-2.2.0.tar.gz diff --git a/SOURCES/lib-zfcp-hbaapi-2.1.1-fedora.patch b/SOURCES/lib-zfcp-hbaapi-2.1.1-fedora.patch new file mode 100644 index 0000000..42489b4 --- /dev/null +++ b/SOURCES/lib-zfcp-hbaapi-2.1.1-fedora.patch @@ -0,0 +1,41 @@ +From 0cc72f0d807a71e0fdc67d04e0b86b98282db644 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Wed, 29 Jan 2014 14:27:27 +0100 +Subject: [PATCH] build the library as a module + +--- + Makefile.am | 4 ++++ + Makefile.in | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index a9a040d..bddc86f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -69,6 +69,10 @@ libzfcphbaapi_la_LDFLAGS = \ + -Wl,-init,_initvlib,-fini,_finivlib \ + -export-symbols $(SYMFILE) + ++if VENDORLIB ++libzfcphbaapi_la_LDFLAGS += -module -avoid-version -release $(VERSION) ++endif ++ + bin_PROGRAMS = zfcp_ping zfcp_show + + zfcp_ping_SOURCES = fc_tools/zfcp_ping.c +diff --git a/Makefile.in b/Makefile.in +index f459693..b9c7712 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -407,6 +407,8 @@ libzfcphbaapi_la_LDFLAGS = \ + -Wl,-init,_initvlib,-fini,_finivlib \ + -export-symbols $(SYMFILE) + ++@VENDORLIB_TRUE@libzfcphbaapi_la_LDFLAGS += -module -avoid-version -release $(VERSION) ++ + zfcp_ping_SOURCES = fc_tools/zfcp_ping.c + zfcp_show_SOURCES = fc_tools/zfcp_show.c + @VENDORLIB_FALSE@zfcp_ping_LDADD = -lzfcphbaapi +-- +1.8.5.3 + diff --git a/SOURCES/libzfcphbaapi-c99.patch b/SOURCES/libzfcphbaapi-c99.patch new file mode 100644 index 0000000..f6afb12 --- /dev/null +++ b/SOURCES/libzfcphbaapi-c99.patch @@ -0,0 +1,46 @@ +Declare sysfs_getAdapterAttributes in vlib_sysfs.h, to avoid an +implicit function declaration in vlib.c. + +Include in fc_tools/zfcp_ping.c for gettimeofday. + +Include in vlib_sg.c, to avoid further +implicit function declarations. + +diff --git a/fc_tools/zfcp_ping.c b/fc_tools/zfcp_ping.c +index 3cf90d8981936c20..0fa34c4702f4cfd2 100644 +--- a/fc_tools/zfcp_ping.c ++++ b/fc_tools/zfcp_ping.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include "include/zfcp_util.h" + + #define FC_PNG_REV 0x00000001 +diff --git a/vlib_sg.c b/vlib_sg.c +index 78f0476378e23b2d..b60ffa6de6aea6db 100644 +--- a/vlib_sg.c ++++ b/vlib_sg.c +@@ -21,6 +21,8 @@ + + #include "vlib.h" + ++#include ++ + #define INTERVAL 10000000 + #define RETRIES 1500 + +diff --git a/vlib_sysfs.h b/vlib_sysfs.h +index 2da344e6d9f5f2ea..c8f9ead4f31c7c27 100644 +--- a/vlib_sysfs.h ++++ b/vlib_sysfs.h +@@ -35,6 +35,8 @@ HBA_STATUS sysfs_createAndReadConfigPorts(struct vlib_adapter *); + HBA_STATUS sysfs_createAndReadConfigAdapter(); + HBA_STATUS sysfs_getDiscoveredPortAttributes(HBA_PORTATTRIBUTES **, + struct vlib_port *); ++HBA_STATUS sysfs_getAdapterAttributes(HBA_ADAPTERATTRIBUTES **, ++ struct vlib_adapter *); + HBA_STATUS sysfs_getAdapterPortAttributes(HBA_PORTATTRIBUTES **, + struct vlib_adapter *); + HBA_STATUS sysfs_getPortStatistics(HBA_PORTSTATISTICS **, diff --git a/SPECS/libzfcphbaapi.spec b/SPECS/libzfcphbaapi.spec new file mode 100644 index 0000000..51f9832 --- /dev/null +++ b/SPECS/libzfcphbaapi.spec @@ -0,0 +1,210 @@ +%global srcname lib-zfcp-hbaapi + +Name: libzfcphbaapi +Summary: HBA API for the zFCP device driver +Version: 2.2.0 +Release: 24%{?dist} +License: CPL-1.0 +URL: http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html +# http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%%{hbaapiver}.html +Source0: http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/%{srcname}-%{version}.tar.gz +Patch1: %{srcname}-2.1.1-fedora.patch +Patch2: libzfcphbaapi-c99.patch + +ExclusiveArch: s390 s390x + +BuildRequires: gcc +BuildRequires: automake +BuildRequires: doxygen +BuildRequires: sg3_utils-devel +BuildRequires: make +Requires(post): grep sed + +%description +zFCP HBA API Library is an implementation of FC-HBA (see www.t11.org) for +the zFCP device driver. + + +%package devel +Summary: Development files for zFCP HBA API Library +Requires: %{name} = %{version}-%{release} +Conflicts: libhbaapi-devel + +%description devel +Development files for the zFCP HBA API Library. + +%package docs +Summary: Documentation for zFCP HBA API Library +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation in HTML format for the zFCP HBA API Library. + + +%prep +%setup -q -n %{srcname}-%{version} + +%patch 1 -p1 -b .fedora +%patch 2 -p1 + + +%build +%configure --disable-static +# manually disable rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make EXTRA_CFLAGS="-fno-strict-aliasing" + + +%install +%makeinstall docdir=%{buildroot}%{_docdir}/%{name} +# keep only html docs +rm -rf %{buildroot}%{_docdir}/%{name}/latex + + +%post +# remove old entry from hba.conf on upgrade +if [ $1 == 2 -a -f /etc/hba.conf ]; then + grep -q -e "^libzfcphbaapi" /etc/hba.conf && + sed -i.orig -e "/^libzfcphbaapi/d" /etc/hba.conf +fi +: + + +%files +%doc README COPYING ChangeLog AUTHORS LICENSE +%{_bindir}/zfcp_ping +%{_bindir}/zfcp_show +%{_libdir}/%{name}.so.* +%{_mandir}/man3/libzfcphbaapi.3* +%{_mandir}/man3/SupportedHBAAPIs.3* +%{_mandir}/man3/UnSupportedHBAAPIs.3* +%{_mandir}/man8/zfcp_ping.8* +%{_mandir}/man8/zfcp_show.8* + +%files devel +%{_mandir}/man3/hbaapi.h.3* +%{_libdir}/%{name}.so +%exclude %{_libdir}/%{name}.la +%{_includedir}/hbaapi.h + +%files docs +%{_docdir}/%{name}/html + + +%changelog +* Tue Jul 09 2024 Dan Horák - 2.2.0-24 +- rebuild +- Resolves: RHEL-24053 + +* Mon Jun 24 2024 Troy Dawson - 2.2.0-23 +- Bump release for June 2024 mass rebuild + +* Sun Feb 11 2024 Yaakov Selkowitz - 2.2.0-22 +- Rebuilt for sg3_utils 1.48 + +* Thu Jan 25 2024 Fedora Release Engineering - 2.2.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2.2.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 27 2023 Florian Weimer - 2.2.0-18 +- Fix C99 compatibility issues (#2165019) + +* Thu Jan 19 2023 Fedora Release Engineering - 2.2.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.2.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Apr 14 2022 Dan Horák - 2.2.0-15 +- add devel subpackage + +* Thu Jan 20 2022 Fedora Release Engineering - 2.2.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Apr 06 2021 Tomas Bzatek - 2.2.0-12 +- rebuilt for sg3_utils 1.46 + +* Mon Mar 01 2021 Dan Horák - 2.2.0-11 +- drop superfluous BR + +* Tue Feb 02 2021 Dan Horák - 2.2.0-10 +- build with libzfcphbaapi as standalone library to avoid dependency on obsolete libhbaapi (#1922413) + +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 12 2020 Florian Weimer - 2.2.0-8 +- Trigger rebuild to avoid DT_INIT/DT_FINI with zero values + +* Tue Jul 28 2020 Fedora Release Engineering - 2.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 20 2020 Dan Horák - 2.2.0-6 +- rebuilt for sg3_utils 1.45 (#1809392) + +* Wed Jan 29 2020 Fedora Release Engineering - 2.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 27 2019 Dan Horák - 2.2.0-4 +- fix scriptlets so they work correctly on upgrades + +* Thu Jul 25 2019 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Mar 8 2019 Tim Landscheidt - 2.2.0-2 +- Fix requirement for %%preun (instead of %%postun) scriptlet + +* Thu Feb 28 2019 Dan Horák - 2.2.0-1 +- updated to 2.2.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Nov 05 2014 Dan Horák - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 14 2014 Dan Horák - 2.1.1-1 +- updated to 2.1.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 29 2013 Dan Horák - 2.1-2 +- add missing compatibility Provides +- exclude plugin soname from Provides + +* Thu May 16 2013 Dan Horák - 2.1-1 +- move libzfcphbaapi to own package from s390utils