Accepting request 391516 from OFED:Factory

1

OBS-URL: https://build.opensuse.org/request/show/391516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/infinipath-psm?expand=0&rev=6

infinipath-non_executable_stack.patch

@@ -1,31 +0,0 @@
----
- ipath/ipath_dwordcpy-i386.S        |    5 +++++
- ipath/ipath_dwordcpy-x86_64-fast.S |    5 +++++
- 2 files changed, 10 insertions(+)
-
-Index: ipath/ipath_dwordcpy-i386.S
-===================================================================
---- ipath/ipath_dwordcpy-i386.S.orig	2014-10-10 23:07:04.000000000 +0200
-+++ ipath/ipath_dwordcpy-i386.S	2015-08-19 07:41:52.628711854 +0200
-@@ -56,3 +56,8 @@ ipath_dwordcpy:
- 	mov %eax,%edi
- 	mov %edx,%esi
- 	ret
-+
-+// Mark stack unexecutable
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: ipath/ipath_dwordcpy-x86_64-fast.S
-===================================================================
---- ipath/ipath_dwordcpy-x86_64-fast.S.orig	2014-10-10 23:07:04.000000000 +0200
-+++ ipath/ipath_dwordcpy-x86_64-fast.S	2015-08-19 07:41:51.293742890 +0200
-@@ -49,3 +49,8 @@ ipath_dwordcpy:
- 	rep
- 	movsd
- 	ret
-+
-+// Mark stack unexecutable
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif

infinipath-psm-3.3-19_g67c0807_open.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d8ac295463ef895adb2343ccb06057a209ae2b12a319b5f689cf47e140a4d5a
+size 387122

infinipath-psm-3.3-2_g6f42cdb_open.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60e244f1594bd3b35d0c6dd9bf6594c4d2371ecef72822d84bfefe80997de533
-size 390708

infinipath-psm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 25 07:41:38 UTC 2016 - p.drouand@gmail.com
+
+- Update to version 3.3-19
+  * No Changelog available
+- Build against system libuuid
+- Split libraries into two separate subpackages
+- Remove infinipath-non_executable_stack.patch; fixed on upstream
+  release
+
 -------------------------------------------------------------------
 Mon Aug 31 07:40:43 CEST 2015 - pth@suse.de
 

infinipath-psm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package infinipath-psm
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,7 +16,7 @@
 #
 
 
-%define my_release -2_g6f42cdb
+%define my_release -19_g67c0807
 
 Name:           infinipath-psm
 Version:        3.3
@@ -32,14 +32,14 @@ Patch0:         infinipath-psm-cflags.patch
 Patch1:         infinipath-psm-no_werror.patch
 # PATCH-FIX-UPSTREAM infinipath-psm-executable_headers.patch pth@suse.de
 Patch3:         infinipath-psm-executable_headers.patch
-# PATCH-FIX-UPSTREAM infinipath-non_executable_stack.patch pth@suse.de
-Patch4:         infinipath-non_executable_stack.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  libuuid-devel
 Conflicts:      infinipath-libs
 ExclusiveArch:  %ix86 x86_64
 
-%define so_major 1
-%define lname libpsm_infinipath%{so_major}
+%define so_major 4
+%define psm_so_major 1
+%define lname libinfinipath%{so_major}
+%define lnamepsm libpsm_infinipath%{psm_so_major}
 
 %description
 The PSM Messaging API, or PSM API, is QLogic's low-level
@@ -52,17 +52,30 @@ interfaces in parallel environments.
 Summary:        Development files for QLogic PSM
 Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{version}
+Requires:       %{lnamepsm} = %{version}
+Requires:       libuuid-devel
 Conflicts:      infinipath-devel
 
 %description devel
 Development files for the libpsm_infinipath library
 
-%package     -n %{lname}
+%package     -n %{lnamepsm}
 Summary:        Development files for QLogic PSM
 Group:          System/Libraries
 Obsoletes:      infinipath-psm < %{version}
 Provides:       infinipath-psm = %{version}
 
+%description -n %{lnamepsm}
+The PSM Messaging API, or PSM API, is QLogic's low-level
+user-level communications interface for the Truescale
+family of products. PSM users are enabled with mechanisms
+necessary to implement higher level communications
+interfaces in parallel environments.
+
+%package     -n %{lname}
+Summary:        Development files for QLogic PSM
+Group:          System/Libraries
+
 %description -n %{lname}
 The PSM Messaging API, or PSM API, is QLogic's low-level
 user-level communications interface for the Truescale
@@ -75,25 +88,28 @@ interfaces in parallel environments.
 %patch0
 %patch1
 %patch3
-%patch4
 
 %build
-%if 0%{?suse_version} >= 1150
 export RPM_OPT_FLAGS="%{optflags} -Wno-unused-but-set-variable"
-%endif
-make USE_PSM_UUID=1 libdir=%{_libdir} %{?_smp_mflags} 
+#make USE_PSM_UUID=1 libdir=%{_libdir} %{?_smp_mflags} 
+make libdir=%{_libdir} %{?_smp_mflags} 
 
 %install
-make USE_PSM_UUID=1 libdir=%{_libdir} DESTDIR=%{buildroot} install
+make libdir=%{_libdir} DESTDIR=%{buildroot} install
 
 %post -n %{lname} -p /sbin/ldconfig
+%post -n %{lnamepsm} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
+%postun -n %{lnamepsm} -p /sbin/ldconfig
 
 %files -n %{lname}
 %defattr(-,root,root,-)
-%{_libdir}/libpsm_infinipath.so.*
 %{_libdir}/libinfinipath.so.*
 
+%files -n %{lnamepsm}
+%defattr(-,root,root,-)
+%{_libdir}/libpsm_infinipath.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libpsm_infinipath.so