From 1855d6340ce44908628a0f1e3d8b82ae169c600e Mon Sep 17 00:00:00 2001 From: Giuseppe Iuculano Date: Sun, 2 Jun 2013 08:46:33 +0200 Subject: [PATCH] Refreshed patches and removed patches applied upstream --- debian/patches/52_remove-pragma.diff | 30 +++++++++---------- .../54_remove-Id-from-smartd.conf.diff | 2 +- debian/patches/61_cciss-doc.patch | 14 ++++----- debian/patches/fix-generic.diff | 11 ------- debian/patches/kfreebsd.patch | 23 -------------- debian/patches/manpage.diff | 2 +- debian/patches/series | 2 -- 7 files changed, 24 insertions(+), 60 deletions(-) delete mode 100644 debian/patches/fix-generic.diff delete mode 100644 debian/patches/kfreebsd.patch diff --git a/debian/patches/52_remove-pragma.diff b/debian/patches/52_remove-pragma.diff index c8f9cf5..1b81bc1 100644 --- a/debian/patches/52_remove-pragma.diff +++ b/debian/patches/52_remove-pragma.diff @@ -1,6 +1,6 @@ --- a/atacmds.h +++ b/atacmds.h -@@ -134,7 +134,6 @@ enum { +@@ -125,7 +125,6 @@ typedef enum { // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled // word* are NOT used. @@ -8,7 +8,7 @@ struct ata_identify_device { unsigned short words000_009[10]; unsigned char serial_no[20]; -@@ -156,7 +155,6 @@ struct ata_identify_device { +@@ -147,7 +146,6 @@ struct ata_identify_device { ASSERT_SIZEOF_STRUCT(ata_identify_device, 512); /* ata_smart_attribute is the vendor specific in SFF-8035 spec */ @@ -16,7 +16,7 @@ struct ata_smart_attribute { unsigned char id; // meaning of flag bits: see MACROS just below -@@ -217,7 +215,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute +@@ -208,7 +206,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute // Format of data returned by SMART READ DATA // Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008 @@ -24,7 +24,7 @@ struct ata_smart_values { unsigned short int revnumber; struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES]; -@@ -250,7 +247,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5 +@@ -241,7 +238,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5 */ /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */ @@ -32,7 +32,7 @@ struct ata_smart_threshold_entry { unsigned char id; unsigned char threshold; -@@ -261,7 +257,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold +@@ -252,7 +248,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold /* Format of Read SMART THreshold Command */ /* Compare to ata_smart_values above */ @@ -40,7 +40,7 @@ struct ata_smart_thresholds_pvt { unsigned short int revnumber; struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES]; -@@ -273,7 +268,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold +@@ -264,7 +259,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold // Table 42 of T13/1321D Rev 1 spec (Error Data Structure) @@ -48,7 +48,7 @@ struct ata_smart_errorlog_error_struct { unsigned char reserved; unsigned char error_register; -@@ -292,7 +286,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_ +@@ -283,7 +277,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_ // Table 41 of T13/1321D Rev 1 spec (Command Data Structure) @@ -56,7 +56,7 @@ struct ata_smart_errorlog_command_struct { unsigned char devicecontrolreg; unsigned char featuresreg; -@@ -308,7 +301,6 @@ struct ata_smart_errorlog_command_struct +@@ -299,7 +292,6 @@ struct ata_smart_errorlog_command_struct ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12); // Table 40 of T13/1321D Rev 1 spec (Error log data structure) @@ -64,7 +64,7 @@ struct ata_smart_errorlog_struct { struct ata_smart_errorlog_command_struct commands[5]; struct ata_smart_errorlog_error_struct error_struct; -@@ -317,7 +309,6 @@ struct ata_smart_errorlog_struct { +@@ -308,7 +300,6 @@ struct ata_smart_errorlog_struct { ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90); // Table 39 of T13/1321D Rev 1 spec (SMART error log sector) @@ -72,7 +72,7 @@ struct ata_smart_errorlog { unsigned char revnumber; unsigned char error_log_pointer; -@@ -414,7 +405,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog +@@ -405,7 +396,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry) @@ -80,7 +80,7 @@ struct ata_smart_selftestlog_struct { unsigned char selftestnumber; // Sector number register unsigned char selfteststatus; -@@ -427,7 +417,6 @@ struct ata_smart_selftestlog_struct { +@@ -418,7 +408,6 @@ struct ata_smart_selftestlog_struct { ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24); // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure) @@ -88,7 +88,7 @@ struct ata_smart_selftestlog { unsigned short int revnumber; struct ata_smart_selftestlog_struct selftest_struct[21]; -@@ -476,7 +465,6 @@ struct ata_smart_extselftestlog +@@ -467,7 +456,6 @@ struct ata_smart_extselftestlog ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512); // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a @@ -96,7 +96,7 @@ struct ata_smart_log_entry { unsigned char numsectors; unsigned char reserved; -@@ -484,7 +472,6 @@ struct ata_smart_log_entry { +@@ -475,7 +463,6 @@ struct ata_smart_log_entry { #pragma pack() ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2); @@ -104,7 +104,7 @@ struct ata_smart_log_directory { unsigned short int logversion; struct ata_smart_log_entry entry[255]; -@@ -494,7 +481,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc +@@ -485,7 +472,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1 // Revision 3 @@ -112,7 +112,7 @@ struct test_span { uint64_t start; uint64_t end; -@@ -502,7 +488,6 @@ struct test_span { +@@ -493,7 +479,6 @@ struct test_span { #pragma pack() ASSERT_SIZEOF_STRUCT(test_span, 16); diff --git a/debian/patches/54_remove-Id-from-smartd.conf.diff b/debian/patches/54_remove-Id-from-smartd.conf.diff index 3e68e0b..0c69d75 100644 --- a/debian/patches/54_remove-Id-from-smartd.conf.diff +++ b/debian/patches/54_remove-Id-from-smartd.conf.diff @@ -4,7 +4,7 @@ # Home page is: http://smartmontools.sourceforge.net --# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ +-# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ - # smartd will re-read the configuration file if it receives a HUP # signal diff --git a/debian/patches/61_cciss-doc.patch b/debian/patches/61_cciss-doc.patch index fba4553..f2713d1 100644 --- a/debian/patches/61_cciss-doc.patch +++ b/debian/patches/61_cciss-doc.patch @@ -8,7 +8,7 @@ minor exceptions --- a/smartd.8.in +++ b/smartd.8.in -@@ -161,6 +161,10 @@ below). +@@ -153,6 +153,10 @@ Directive in the configuration file; see .SH OPTIONS @@ -18,10 +18,10 @@ minor exceptions + .TP .B \-A PREFIX, \-\-attributelog=PREFIX - [ATA only] Writes \fBsmartd\fP attribute information (normalized and raw + Writes \fBsmartd\fP attribute information (normalized and raw --- a/smartd.conf +++ b/smartd.conf -@@ -91,6 +91,12 @@ DEVICESCAN -n standby -m root -M exec /u +@@ -92,6 +92,12 @@ DEVICESCAN -n standby -m root -M exec /u # NOTE: On Windows, DEVICESCAN works also for 3ware controllers. #/dev/hdc,0 -a -s L/../../2/01 #/dev/hdc,1 -a -s L/../../2/03 @@ -36,7 +36,7 @@ minor exceptions # self-tests Sundays between 1-2, 2-3, and 3-4 am. --- a/smartd.conf.5.in +++ b/smartd.conf.5.in -@@ -132,10 +132,11 @@ Section below! +@@ -97,10 +97,11 @@ Section below! .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 @@ -52,8 +52,8 @@ minor exceptions .B # device, four SATA disks connected to an Areca .B # RAID controller, and one SATA disk. .B # -@@ -206,6 +207,13 @@ Section below! - .B \ \ /dev/twl0 -d 3ware,1 -a -s L/../../7/02 +@@ -178,6 +179,13 @@ Section below! + .\" %ENDIF OS FreeBSD .B # .nf +.B # Monitor 2 disks connected to the first HP SmartArray controller which @@ -66,7 +66,7 @@ minor exceptions .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. -@@ -1439,6 +1447,9 @@ configuration file Directives might be: +@@ -1497,6 +1505,9 @@ configuration file Directives might be: If you want more frequent information, use: .B -a. diff --git a/debian/patches/fix-generic.diff b/debian/patches/fix-generic.diff deleted file mode 100644 index 71aaa60..0000000 --- a/debian/patches/fix-generic.diff +++ /dev/null @@ -1,11 +0,0 @@ -missing #include in os_generic.cpp #619208 ---- a/os_generic.cpp -+++ b/os_generic.cpp -@@ -71,6 +71,7 @@ - - // These are needed to define prototypes and structures for the - // functions defined below -+#include "int64.h" - #include "atacmds.h" - #include "utility.h" - diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch deleted file mode 100644 index 437d347..0000000 --- a/debian/patches/kfreebsd.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/cciss.cpp -+++ b/cciss.cpp -@@ -24,6 +24,10 @@ - # define _HAVE_CCISS - #elif defined(__FreeBSD_kernel__) - # include -+# ifdef __GLIBC__ -+# include -+# include -+# 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. - }; - - diff --git a/debian/patches/manpage.diff b/debian/patches/manpage.diff index 769f8ab..9df1dd6 100644 --- a/debian/patches/manpage.diff +++ b/debian/patches/manpage.diff @@ -1,7 +1,7 @@ Fixed example path in man pages --- a/smartd.conf.5.in +++ b/smartd.conf.5.in -@@ -1532,7 +1532,7 @@ sleep 30 +@@ -1601,7 +1601,7 @@ sleep 30 .fi Some example scripts are distributed with the smartmontools package, diff --git a/debian/patches/series b/debian/patches/series index 396f0f0..d4ef71d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,3 @@ 61_cciss-doc.patch 63_removable.patch manpage.diff -fix-generic.diff -kfreebsd.patch -- 2.39.2