From e018e0568728b7af5830be6e0f92284672cd634a4360b02ab91edbbe803a6116 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 10 Aug 2018 23:20:19 +0000 Subject: [PATCH 1/4] - Upgraded to version 1.1.0 (Fates 325009 and 325168) Changes: * smcss: Add IPv6 support * preload: Add IPv6 support * smcss: Output format changed * preload: Rename preload library into libsmc-preload.so * Makefile: Improve distro compatibility * Makefile: Add SONAME to shared libraries * Makefile: Do not strip binaries on install * Makefile: Use LDFLAGS to allow addition of externally set link flags * libsmc..: Remove hardcoded reference to libc * Manpages: Formatting changes Bug fixes: * Makefile: Fix target 'install' dependencies * smcss: Fix "--version" output * smc_pnet: Fix "--version" output * smc_run: Append preload library to LD_PRELOAD instead of potentially overwriting pre-set values * preload: Set suid flag to work with suid executables - Updated the spec file to reference the new names for the shared library. OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=14 --- smc-tools-1.0.0.tar.gz | 3 --- smc-tools-1.1.0.tar.gz | 3 +++ smc-tools-rpmlintrc | 1 + smc-tools.changes | 25 ++++++++++++++++++++++--- smc-tools.spec | 28 ++++++++++++++++++---------- 5 files changed, 44 insertions(+), 16 deletions(-) delete mode 100644 smc-tools-1.0.0.tar.gz create mode 100644 smc-tools-1.1.0.tar.gz create mode 100644 smc-tools-rpmlintrc diff --git a/smc-tools-1.0.0.tar.gz b/smc-tools-1.0.0.tar.gz deleted file mode 100644 index 402544a..0000000 --- a/smc-tools-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5829cdcd75493772b5910689c85db6fdaaf9680c77fb61416b16fc02ec131089 -size 20256 diff --git a/smc-tools-1.1.0.tar.gz b/smc-tools-1.1.0.tar.gz new file mode 100644 index 0000000..887513d --- /dev/null +++ b/smc-tools-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62f1b287129fa41ad4664094033fbe7f8afc85cc9ec08805cb3be1ddd3233bb4 +size 20870 diff --git a/smc-tools-rpmlintrc b/smc-tools-rpmlintrc new file mode 100644 index 0000000..be4ee7e --- /dev/null +++ b/smc-tools-rpmlintrc @@ -0,0 +1 @@ +addFilter("shlib-policy-name-error") diff --git a/smc-tools.changes b/smc-tools.changes index be5f2f2..c812704 100644 --- a/smc-tools.changes +++ b/smc-tools.changes @@ -1,8 +1,27 @@ ------------------------------------------------------------------- -Fri Sep 29 20:16:24 UTC 2017 - mpost@suse.com +Fri Jul 27 20:40:30 UTC 2018 - mpost@suse.com -- Added an ExcludeArch for %{arm} so that we won't try to build - the package on armv7l. The build fails on that architecture. +- Upgraded to version 1.1.0 (Fates 325009 and 325168) + Changes: + * smcss: Add IPv6 support + * preload: Add IPv6 support + * smcss: Output format changed + * preload: Rename preload library into libsmc-preload.so + * Makefile: Improve distro compatibility + * Makefile: Add SONAME to shared libraries + * Makefile: Do not strip binaries on install + * Makefile: Use LDFLAGS to allow addition of externally set link flags + * libsmc..: Remove hardcoded reference to libc + * Manpages: Formatting changes + Bug fixes: + * Makefile: Fix target 'install' dependencies + * smcss: Fix "--version" output + * smc_pnet: Fix "--version" output + * smc_run: Append preload library to LD_PRELOAD instead of potentially + overwriting pre-set values + * preload: Set suid flag to work with suid executables +- Updated the spec file to reference the new names for the shared + library. ------------------------------------------------------------------- Mon Apr 3 13:45:31 UTC 2017 - jengelh@inai.de diff --git a/smc-tools.spec b/smc-tools.spec index a8db73b..6b0f37d 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -1,7 +1,7 @@ # # spec file for package smc-tools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ Name: smc-tools -Version: 1.0.0 +Version: 1.1.0 Release: 0 -Url: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html +Url: https://www.ibm.com/developerworks/linux/linux390/ Summary: Shared Memory Communication via RDMA License: EPL-1.0 Group: System/Kernel Source: %{name}-%{version}.tar.gz +Source1: smc-tools-rpmlintrc # aarch64 and ppc64le don't support 32bit applications, so there's no # gcc-32bit package that can be installed @@ -32,13 +33,12 @@ BuildRequires: gcc-32bit %define have_32bit 1 %endif BuildRequires: libnl3-devel - -ExcludeArch: %{arm} +PreReq: permissions # While repos other than Factory have 32bit for s390x, Factory does not %if 0%{?suse_version} == 1330 %ifarch s390x -%define have_32bit 0 +%define have_32bit 0 %endif %endif @@ -56,24 +56,32 @@ to use a RoCE network without needing to make changes in them. %build MYCFLAGS=$(grep ^CFLAGS Makefile | cut -f2 -d=) -make CFLAGS="${MYCFLAGS} %{optflags}" +make V=1 CFLAGS="${MYCFLAGS} %{optflags}" %install -%make_install +%make_install V=1 %ifarch s390 %{ix86} rm -Rf "%{buildroot}/usr/lib64" %endif +%verifyscript +%verify_permissions -e /usr/lib/libsmc-preload.so +%verify_permissions -e %{_libdir}/libsmc-preload.so + +%post +%set_permissions /usr/lib/libsmc-preload.so +%set_permissions %{_libdir}/libsmc-preload.so + %files %defattr(-,root,root) %doc README.smctools LICENSE %{_bindir}/smc_pnet %{_bindir}/smc_run %{_bindir}/smcss -%{_libdir}/ld_pre_smc.so +%{_libdir}/libsmc-preload.so %if 0%{?have_32bit} -/usr/lib/ld_pre_smc.so +/usr/lib/libsmc-preload.so %endif %{_mandir}/man7/af_smc.7%{ext_man} %{_mandir}/man8/smc_pnet.8%{ext_man} From 8f6b1e37bce854e2e8ee16b3fd6ecc08c9b831bf9a95f71d8e0f129aa77b3680 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 24 Aug 2018 21:38:59 +0000 Subject: [PATCH 2/4] - Removed the ExcludeArch for %{arm} since it now builds on that architecture. - Added an ExcludeArch for %{arm} so that we won't try to build the package on armv7l. The build fails on that architecture. OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=15 --- smc-tools.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/smc-tools.changes b/smc-tools.changes index c812704..c6a2bfb 100644 --- a/smc-tools.changes +++ b/smc-tools.changes @@ -22,6 +22,14 @@ Fri Jul 27 20:40:30 UTC 2018 - mpost@suse.com * preload: Set suid flag to work with suid executables - Updated the spec file to reference the new names for the shared library. +- Removed the ExcludeArch for %{arm} since it now builds on that + architecture. + +------------------------------------------------------------------- +Fri Sep 29 20:16:24 UTC 2017 - mpost@suse.com + +- Added an ExcludeArch for %{arm} so that we won't try to build + the package on armv7l. The build fails on that architecture. ------------------------------------------------------------------- Mon Apr 3 13:45:31 UTC 2017 - jengelh@inai.de From dd20b2b582c01440363970d46206a2014b38416b52b76151e7b9e153b44677c2 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 24 Aug 2018 21:44:36 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=16 --- smc-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smc-tools.spec b/smc-tools.spec index 6b0f37d..c96147d 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -56,10 +56,10 @@ to use a RoCE network without needing to make changes in them. %build MYCFLAGS=$(grep ^CFLAGS Makefile | cut -f2 -d=) -make V=1 CFLAGS="${MYCFLAGS} %{optflags}" +make CFLAGS="${MYCFLAGS} %{optflags}" %install -%make_install V=1 +%make_install %ifarch s390 %{ix86} rm -Rf "%{buildroot}/usr/lib64" From ed168c55dd2057c6002886be61c5b2800fecba19356f0265281d8afa427f7fc6 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 24 Aug 2018 21:46:28 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=17 --- smc-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smc-tools.spec b/smc-tools.spec index c96147d..b1cb12f 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -38,7 +38,7 @@ PreReq: permissions # While repos other than Factory have 32bit for s390x, Factory does not %if 0%{?suse_version} == 1330 %ifarch s390x -%define have_32bit 0 +%define have_32bit 0 %endif %endif