Refresh original patches with new upstream release

[mirror_smartmontools-debian.git] / debian / patches / kfreebsd.patch

diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index 437d347a060191d366ba1ffcb330e629d5d59c18..6869151db8bb830d96be9464dbf85b819c24ce8f 100644 (file)
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -1,23 +1,32 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: kfreebsd
+
+---
+ cciss.cpp | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/cciss.cpp b/cciss.cpp
+index f5871dd..62fcba7 100644
 --- a/cciss.cpp
 +++ b/cciss.cpp
-@@ -24,6 +24,10 @@
- #  define _HAVE_CCISS
- #elif defined(__FreeBSD_kernel__)
- #  include <endian.h>
-+#  ifdef __GLIBC__
-+#  include <bsd/sys/cdefs.h>
-+#  include <stdint.h>
-+#  endif
+@@ -18,18 +18,10 @@
+ #  ifndef be32toh
+ #    define be32toh __be32_to_cpu
+ #  endif
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #  include <sys/endian.h>
  #  include CISS_LOCATION
  #  define _HAVE_CCISS
+-#elif defined(__FreeBSD_kernel__)
+-#  include <endian.h>
+-#  ifdef __GLIBC__
+-#  include <bsd/sys/cdefs.h>
+-#  include <stdint.h>
+-#  endif
+-#  include CISS_LOCATION
+-#  define _HAVE_CCISS
  #endif
---- a/os_freebsd.cpp
-+++ b/os_freebsd.cpp
-@@ -1096,6 +1096,7 @@ protected:
- 
- private:
-   int m_disknum; ///< Disk number.
-+  int m_encnum;  ///< Enclosure number.
- };
- 
  
+ #ifdef _HAVE_CCISS