From 82e82572f32b261dd0206d538d4d07af7f44a92b Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Jun 10 2011 11:19:27 +0000
Subject: updated to 5.41


---

diff --git a/.gitignore b/.gitignore
index 4d52241..f5b62a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 smartmontools-5.39.1.tar.gz
 /smartmontools-r3169.tar.gz
 /smartmontools-5.40.tar.gz
+/smartmontools-5.41.tar.gz
diff --git a/smartmontools-5.40-megaraid.patch b/smartmontools-5.40-megaraid.patch
deleted file mode 100644
index 3c3f8bc..0000000
--- a/smartmontools-5.40-megaraid.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up smartmontools-5.39.1/os_linux.cpp.megaraid smartmontools-5.39.1/os_linux.cpp
---- smartmontools-5.39.1/os_linux.cpp.megaraid	2010-01-28 21:24:32.000000000 +0100
-+++ smartmontools-5.39.1/os_linux.cpp	2010-11-15 12:58:56.648181400 +0100
-@@ -1095,17 +1095,21 @@ bool linux_megaraid_device::megasas_cmd(
-   pthru->cdb_len = cdbLen;
-   pthru->timeout = 0;
-   pthru->flags = MFI_FRAME_DIR_READ;
--  pthru->sge_count = 1;
--  pthru->data_xfer_len = dataLen;
--  pthru->sgl.sge32[0].phys_addr = (intptr_t)data;
--  pthru->sgl.sge32[0].length = (uint32_t)dataLen;
-+  if (dataLen > 0) {
-+    pthru->sge_count = 1;
-+    pthru->data_xfer_len = dataLen;
-+    pthru->sgl.sge32[0].phys_addr = (intptr_t)data;
-+    pthru->sgl.sge32[0].length = (uint32_t)dataLen;
-+  }
-   memcpy(pthru->cdb, cdb, cdbLen);
- 
-   uio.host_no = m_hba;
--  uio.sge_count = 1;
--  uio.sgl_off = offsetof(struct megasas_pthru_frame, sgl);
--  uio.sgl[0].iov_base = data;
--  uio.sgl[0].iov_len = dataLen;
-+  if (dataLen > 0) {
-+    uio.sge_count = 1;
-+    uio.sgl_off = offsetof(struct megasas_pthru_frame, sgl);
-+    uio.sgl[0].iov_base = data;
-+    uio.sgl[0].iov_len = dataLen;
-+  }
- 
-   rc = 0;
-   errno = 0;
diff --git a/smartmontools.spec b/smartmontools.spec
index a66f461..9aa3bcb 100644
--- a/smartmontools.spec
+++ b/smartmontools.spec
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.40
-Release:	10%{?dist}
+Version:	5.41
+Release:	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -15,9 +15,6 @@ Source4:        smartdnotify
 #fedora/rhel specific
 Patch1:		smartmontools-5.38-defaultconf.patch
 
-#from upstream, for smartmontools <= 5.40
-Patch2:         smartmontools-5.40-megaraid.patch
-
 Patch3:         smartmontools-5.40-manfix.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -41,7 +38,6 @@ failure.
 %prep
 %setup -q 
 %patch1 -p1 -b .defaultconf
-%patch2 -p1 -b .megaraid
 %patch3 -p1 -b .manfix
 
 # fix encoding
@@ -117,6 +113,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jun 10 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:5.41-1
+- updated to 5.41
+
 * Mon May 16 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:5.40-10
 - fix path to notify script (#675778)
 
diff --git a/sources b/sources
index ec7f2fd..688f013 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f0be0239914ad87830a4fff594bda5b  smartmontools-5.40.tar.gz
+4577886bea79d4ff12bd9a7d323ce692  smartmontools-5.41.tar.gz