Refreshed patches

debian/patches/52_remove-pragma.diff

@@ -1,7 +1,5 @@
-Index: smartmontools/atacmds.h
+--- a/atacmds.h
-===================================================================
++++ b/atacmds.h
---- smartmontools.orig/atacmds.h	2013-09-05 13:32:05.011972432 +0200
-+++ smartmontools/atacmds.h	2013-09-05 13:32:05.007972432 +0200
 @@ -125,7 +125,6 @@
  
  // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled

debian/patches/53_use-smartd-runner-by-default.diff

@@ -1,7 +1,5 @@
-Index: smartmontools/smartd.conf
+--- a/smartd.conf
-===================================================================
++++ b/smartd.conf
---- smartmontools.orig/smartd.conf	2013-09-05 13:32:11.471972451 +0200
-+++ smartmontools/smartd.conf	2013-09-05 13:32:11.467972451 +0200
 @@ -20,7 +20,7 @@
  # Directives listed below, which will be applied to all devices that
  # are found.  Most users should comment out DEVICESCAN and explicitly

debian/patches/54_remove-Id-from-smartd.conf.diff

@@ -1,7 +1,5 @@
-Index: smartmontools/smartd.conf
+--- a/smartd.conf
-===================================================================
++++ b/smartd.conf
---- smartmontools.orig/smartd.conf	2013-09-05 13:32:14.371972459 +0200
-+++ smartmontools/smartd.conf	2013-09-05 13:32:14.363972459 +0200
 @@ -2,8 +2,6 @@
  
  # Home page is: http://smartmontools.sourceforge.net

debian/patches/61_cciss-doc.patch

@@ -6,25 +6,8 @@ file and adds some more cciss documentation to the manpages. I think this
 patch gets things to parity with the 3ware documentation with a couple
 minor exceptions
 
-Index: smartmontools/smartd.8.in
+--- a/smartd.conf
-===================================================================
++++ b/smartd.conf
---- smartmontools.orig/smartd.8.in	2013-09-05 13:32:17.291972468 +0200
-+++ smartmontools/smartd.8.in	2013-09-05 13:32:17.283972468 +0200
-@@ -153,6 +153,10 @@
- .SH 
- OPTIONS
- 
-+.B If a cciss controller is used
-+then the corresponding block device (/dev/cciss/c?d?) must be listed,
-+along with the \'\-d cciss,N\' Directive (see below).
-+
- .TP
- .B \-A PREFIX, \-\-attributelog=PREFIX
- Writes \fBsmartd\fP attribute information (normalized and raw
-Index: smartmontools/smartd.conf
-===================================================================
---- smartmontools.orig/smartd.conf	2013-09-05 13:32:17.291972468 +0200
-+++ smartmontools/smartd.conf	2013-09-05 13:32:17.283972468 +0200
 @@ -92,6 +92,12 @@
  # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
  #/dev/hdc,0 -a -s L/../../2/01
@@ -38,11 +21,9 @@ Index: smartmontools/smartd.conf
  
  # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
  # self-tests Sundays between 1-2, 2-3, and 3-4 am. 
-Index: smartmontools/smartd.conf.5.in
+--- a/smartd.conf.5.in
-===================================================================
++++ b/smartd.conf.5.in
---- smartmontools.orig/smartd.conf.5.in	2013-09-05 13:32:17.291972468 +0200
+@@ -92,10 +92,11 @@
-+++ smartmontools/smartd.conf.5.in	2013-09-05 13:32:17.287972468 +0200
-@@ -97,10 +97,11 @@
  .B # This is an example smartd startup config file
  .B # /usr/local/etc/smartd.conf for monitoring three
  .B # ATA disks, three SCSI disks, six ATA disks
@@ -58,21 +39,20 @@ Index: smartmontools/smartd.conf.5.in
  .B # device, four SATA disks connected to an Areca
  .B # RAID controller, and one SATA disk.
  .B #
-@@ -178,6 +179,13 @@
+@@ -170,6 +171,12 @@
+ .B \ \ /dev/tws0 -d 3ware,1 -a -s L/../../7/02
  .\" %ENDIF OS FreeBSD
  .B #
- .nf
 +.B # Monitor 2 disks connected to the first HP SmartArray controller which
 +.B # uses the cciss driver. Start long tests on Sunday nights and short
 +.B # self-tests every night and send errors to root
 +.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
 +.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
 +.B #
-+.nf
  .B # Three SATA disks on a HighPoint RocketRAID controller.
  .B # Start short self-tests daily between 1-2, 2-3, and
  .B # 3-4 am.
-@@ -1497,6 +1505,9 @@
+@@ -1463,6 +1470,9 @@
  If you want more frequent information, use:
  .B -a.
  

debian/patches/63_removable.patch

@@ -1,10 +1,8 @@
 Added the removable option by default. This indicates to smartd that it should continue if the device does not appear to be present when smartd is started.
 
 Closes: #406130
-Index: smartmontools/smartd.conf
+--- a/smartd.conf
-===================================================================
++++ b/smartd.conf
---- smartmontools.orig/smartd.conf	2013-09-05 13:32:21.599972480 +0200
-+++ smartmontools/smartd.conf	2013-09-05 13:32:21.591972480 +0200
 @@ -18,7 +18,7 @@
  # Directives listed below, which will be applied to all devices that
  # are found.  Most users should comment out DEVICESCAN and explicitly

debian/patches/kfreebsd.patch

@@ -1,14 +1,3 @@
---- a/dev_areca.h
-+++ b/dev_areca.h
-@@ -58,7 +58,7 @@
- #define ARCMSR_IOCTL_CLEAR_RQBUFFER          (ARECA_SATA_RAID | FUNCTION_CLEAR_RQBUFFER)
- #define ARCMSR_IOCTL_CLEAR_WQBUFFER          (ARECA_SATA_RAID | FUNCTION_CLEAR_WQBUFFER)
- #define ARCMSR_IOCTL_RETURN_CODE_3F          (ARECA_SATA_RAID | FUNCTION_RETURN_CODE_3F)
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__)  || defined(__FreeBSD_kernel__)
- #include <sys/ioctl.h> // _IOWR
- 
- /*FunctionCode*/
 --- a/cciss.cpp
 +++ b/cciss.cpp
 @@ -18,18 +18,10 @@

debian/patches/manpage.diff

@@ -1,9 +1,7 @@
 Fixed example path in man pages
-Index: smartmontools/smartd.conf.5.in
+--- a/smartd.conf.5.in
-===================================================================
++++ b/smartd.conf.5.in
---- smartmontools.orig/smartd.conf.5.in	2013-09-05 13:32:24.783972489 +0200
+@@ -1568,7 +1568,7 @@
-+++ smartmontools/smartd.conf.5.in	2013-09-05 13:32:24.775972489 +0200
-@@ -1601,7 +1601,7 @@
  .fi
  
  Some example scripts are distributed with the smartmontools package,