pop

diff --git a/meta b/meta
index 68d98165c7f22cbb8cb2370a3a975fea2b462bcd..554b87112763b5859dadaeb740745ef4c70994f7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,9 @@
 Version: 1
-Previous: ee90ce5cce73ab9e3265cf70b9447623da477874
-Head: feeb897b091dfc63f054e2f122ea4f36d552d876
+Previous: d6c0d14ac9d21fd6e100c8e5a60480342ce5427b
+Head: e3d3b848ce507224ecb5d72d9a6e02c2978a7d91
 Applied:
+  ibacm-security-fix-replace-spr: e3d3b848ce507224ecb5d72d9a6e02c2978a7d91
 Unapplied:
-  ibacm-security-fix-replace-spr: 8f8353a22ca408e1f4e4ca7ef1d29278816c5db3
   subnet-timeout: 38fd77602906466a2dfe7d35abe0d250ddb8c981
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/ibacm-security-fix-replace-spr b/patches/ibacm-security-fix-replace-spr
index 571139c6633916a3acae25d4871565486e74b5fa..79a4500ec4be3fcac0cbfae4a7c411865479095d 100644 (file)
--- a/patches/ibacm-security-fix-replace-spr
+++ b/patches/ibacm-security-fix-replace-spr
@@ -1,4 +1,4 @@
-Bottom: ed1daf3316e1e0c218b28245bc117c0bc1fd772f
+Bottom: 0a154427ec6f2d8d3bfc7b11d394a4d72b5adfc5
 Top:    a971239f22e61016c756021263852a291c5f5953
 Author: Dotan Barak <dotanb@dev.mellanox.co.il>
 Date:   2012-04-23 09:09:44 -0700
@@ -14,19 +14,6 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 138d2dc..b3b05ec 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -53,7 +53,7 @@ make %{?_smp_mflags}
- %install
- rm -rf $RPM_BUILD_ROOT
- make install DESTDIR=$RPM_BUILD_ROOT
--install -D -m 755 ibacm.init $RPM_BUILD_ROOT{_sysconfdir}/init.d/%{name}
-+install -D -m 755 ibacm.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
- %makeinstall
- 
- %clean
 diff --git a/linux/acme_linux.c b/linux/acme_linux.c
 index 9477d29..1039645 100644
 --- a/linux/acme_linux.c