Refresh original patches with new upstream release

diff --git a/debian/changelog b/debian/changelog
index 935d110ed2cf11cf4e352379a703016554393fbf..909f9518bc04d25d7fe3e607d4db18c512df5485 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,24 @@
-smartmontools (6.6-2) UNRELEASED; urgency=medium
+smartmontools (6.6-1) UNRELEASED; urgency=medium
 
+  [ Jonathan Dowland ]
   * Update Vcs-* headers in control file: replace Alioth/anonscm URIs
     with salsa.debian.org.
   * new upstream version. Patches refreshed:
-    * 61_cciss-doc.patch
+    - 61_cciss-doc.patch
+    - 52_remove-pragma.diff
+    - 53_use-smartd-runner-by-default.diff
+    - 54_remove-Id-from-smartd.conf.diff
+    - 61_cciss-doc.patch
+    - 63_removable.patch
+    - kfreebsd.patch
+    - manpage.diff
+    - removesyslogtarget.patch
     Patches removed:
-    * 50_manpage_improvements.diff
-    * 3w-sas (merged by upstream)
-    * 60_remove-redhatism.diff (removed by upstream)
+    - 50_manpage_improvements.diff
+    - 3w-sas (merged by upstream)
+    - 60_remove-redhatism.diff (removed by upstream)
 
- -- Jonathan Dowland <jmtd@debian.org>  Thu, 09 Aug 2018 16:54:43 +0100
+ -- SZ Lin (林上智) <szlin@debian.org>  Thu, 27 Sep 2018 19:13:32 +0800
 
 smartmontools (6.5+svn4324-1) unstable; urgency=low
 

diff --git a/debian/patches/52_remove-pragma.diff b/debian/patches/52_remove-pragma.diff
index de70b273c8d28b2cde11e1338d8bb120602189f3..9b74aa7d779dc1ea3123f9c174afedbb78d6da02 100644 (file)
--- a/debian/patches/52_remove-pragma.diff
+++ b/debian/patches/52_remove-pragma.diff
@@ -1,6 +1,16 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: _remove-pragma
+
+---
+ atacmds.h | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/atacmds.h b/atacmds.h
+index cbb20b6..15e54d4 100644
 --- a/atacmds.h
 +++ b/atacmds.h
-@@ -125,7 +125,6 @@
+@@ -130,7 +130,6 @@ typedef enum {
  
  // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
  // word* are NOT used.
@@ -8,7 +18,7 @@
  struct ata_identify_device {
    unsigned short words000_009[10];
    unsigned char  serial_no[20];
-@@ -147,7 +146,6 @@
+@@ -152,7 +151,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 +26,7 @@
  struct ata_smart_attribute {
    unsigned char id;
    // meaning of flag bits: see MACROS just below
-@@ -208,7 +206,6 @@
+@@ -213,7 +211,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute, 12);
  
  // Format of data returned by SMART READ DATA
  // Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008
@@ -24,7 +34,7 @@
  struct ata_smart_values {
    unsigned short int revnumber;
    struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
-@@ -241,7 +238,6 @@
+@@ -246,7 +243,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 512);
  */
  
  /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
@@ -32,7 +42,7 @@
  struct ata_smart_threshold_entry {
    unsigned char id;
    unsigned char threshold;
-@@ -252,7 +248,6 @@
+@@ -257,7 +253,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold_entry, 12);
  
  /* Format of Read SMART THreshold Command */
  /* Compare to ata_smart_values above */
@@ -40,7 +50,7 @@
  struct ata_smart_thresholds_pvt {
    unsigned short int revnumber;
    struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
-@@ -264,7 +259,6 @@
+@@ -269,7 +264,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_thresholds_pvt, 512);
  
  
  // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
@@ -48,7 +58,7 @@
  struct ata_smart_errorlog_error_struct {
    unsigned char reserved;
    unsigned char error_register;
-@@ -283,7 +277,6 @@
+@@ -288,7 +282,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_error_struct, 30);
  
  
  // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
@@ -56,7 +66,7 @@
  struct ata_smart_errorlog_command_struct {
    unsigned char devicecontrolreg;
    unsigned char featuresreg;
-@@ -299,7 +292,6 @@
+@@ -304,7 +297,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 +74,7 @@
  struct ata_smart_errorlog_struct {
    struct ata_smart_errorlog_command_struct commands[5];
    struct ata_smart_errorlog_error_struct error_struct;
-@@ -308,7 +300,6 @@
+@@ -313,7 +305,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 +82,7 @@
  struct ata_smart_errorlog {
    unsigned char revnumber;
    unsigned char error_log_pointer;
-@@ -405,7 +396,6 @@
+@@ -410,7 +401,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog, 512);
  
  
  // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
@@ -80,7 +90,7 @@
  struct ata_smart_selftestlog_struct {
    unsigned char selftestnumber; // Sector number register
    unsigned char selfteststatus;
-@@ -418,7 +408,6 @@
+@@ -423,7 +413,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 +98,7 @@
  struct ata_smart_selftestlog {
    unsigned short int revnumber;
    struct ata_smart_selftestlog_struct selftest_struct[21];
-@@ -467,7 +456,6 @@
+@@ -472,7 +461,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 +106,7 @@
  struct ata_smart_log_entry {
    unsigned char numsectors;
    unsigned char reserved;
-@@ -475,7 +463,6 @@
+@@ -480,7 +468,6 @@ struct ata_smart_log_entry {
  #pragma pack()
  ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
  
@@ -104,7 +114,7 @@
  struct ata_smart_log_directory {
    unsigned short int logversion;
    struct ata_smart_log_entry entry[255];
-@@ -485,7 +472,6 @@
+@@ -490,7 +477,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_directory, 512);
  
  // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
  // Revision 3
@@ -112,7 +122,7 @@
  struct test_span {
    uint64_t start;
    uint64_t end;
-@@ -493,7 +479,6 @@
+@@ -498,7 +484,6 @@ struct test_span {
  #pragma pack()
  ASSERT_SIZEOF_STRUCT(test_span, 16);
  

diff --git a/debian/patches/53_use-smartd-runner-by-default.diff b/debian/patches/53_use-smartd-runner-by-default.diff
index 30cb1807a29c71ab5126ef69406b255286f37448..3bdfd503330a4b2dc68c36ff2a1344c90c1c1288 100644 (file)
--- a/debian/patches/53_use-smartd-runner-by-default.diff
+++ b/debian/patches/53_use-smartd-runner-by-default.diff
@@ -1,3 +1,13 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: _use-smartd-runner-by-default
+
+---
+ smartd.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/smartd.conf b/smartd.conf
+index d4a0d10..cd0bfcb 100644
 --- a/smartd.conf
 +++ b/smartd.conf
 @@ -20,7 +20,7 @@

diff --git a/debian/patches/54_remove-Id-from-smartd.conf.diff b/debian/patches/54_remove-Id-from-smartd.conf.diff
index 848a2ecb14ee827fc407d311231e13f92dcd9126..bb76a0311fb68fe05048c76469a49c4bc3234ae9 100644 (file)
--- a/debian/patches/54_remove-Id-from-smartd.conf.diff
+++ b/debian/patches/54_remove-Id-from-smartd.conf.diff
@@ -1,3 +1,13 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: _remove-Id-from-smartd.conf
+
+---
+ smartd.conf | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/smartd.conf b/smartd.conf
+index cd0bfcb..5490bde 100644
 --- a/smartd.conf
 +++ b/smartd.conf
 @@ -2,8 +2,6 @@

diff --git a/debian/patches/61_cciss-doc.patch b/debian/patches/61_cciss-doc.patch
index 115bcf283aa6b58116d4949ef5f2e2342c871d14..26e48e664b7c700fea3516a43ff131ff7b5c6f3e 100644 (file)
--- a/debian/patches/61_cciss-doc.patch
+++ b/debian/patches/61_cciss-doc.patch
@@ -1,4 +1,5 @@
-Author: Matt Taggart <taggart@debian.org>
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
 Subject: Update cciss examples/docs
 
 Here is a patch that adds examples for cciss to the default smartd.conf
@@ -7,6 +8,10 @@ patch gets things to parity with the 3ware documentation with a couple
 minor exceptions
 
 Refreshed by jmtd@debian.org 2018-08-10
+---
+ smartd.conf      |  6 ++++++
+ smartd.conf.5.in | 10 ++++++++++
+ 2 files changed, 16 insertions(+)
 
 diff --git a/smartd.conf b/smartd.conf
 index 5490bde..59addd4 100644

diff --git a/debian/patches/63_removable.patch b/debian/patches/63_removable.patch
index 20b2fc2f376342802e7a923ca6661620fca90389..b8c24549322fe530018d8ec8f98618166d03229f 100644 (file)
--- a/debian/patches/63_removable.patch
+++ b/debian/patches/63_removable.patch
@@ -1,6 +1,16 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: _removable
+
 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
+---
+ smartd.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/smartd.conf b/smartd.conf
+index 59addd4..4cdede7 100644
 --- a/smartd.conf
 +++ b/smartd.conf
 @@ -18,7 +18,7 @@

diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index 2c557660420072d3c1202d3ca80aebf6127736d9..6869151db8bb830d96be9464dbf85b819c24ce8f 100644 (file)
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -1,3 +1,13 @@
+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
 @@ -18,18 +18,10 @@

diff --git a/debian/patches/manpage.diff b/debian/patches/manpage.diff
index 07e1064b479bccbfe84b16ec07b819c33e53e534..2dfb26841d7f113cb6b9a9f0b57be6c9ee577a9d 100644 (file)
--- a/debian/patches/manpage.diff
+++ b/debian/patches/manpage.diff
@@ -1,13 +1,22 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: manpage
+
 Fixed example path in man pages
+---
+ smartd.conf.5.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/smartd.conf.5.in b/smartd.conf.5.in
+index 4c1f453..e2c2396 100644
 --- a/smartd.conf.5.in
 +++ b/smartd.conf.5.in
-@@ -1599,7 +1599,7 @@
- .fi
- 
+@@ -1671,7 +1671,7 @@ sleep 30
+ .Ve
+ .Sp
  Some example scripts are distributed with the smartmontools package,
 -in /usr/local/share/doc/smartmontools/examplescripts/.
 +in /usr/local/share/doc/smartmontools/examples/.
- 
+ .Sp
  Please note that these scripts typically run as root, so any files
  that they read/write should not be writable by ordinary users or

diff --git a/debian/patches/removesyslogtarget.patch b/debian/patches/removesyslogtarget.patch
index cc3f402d6c074f86683a67fc41bf6eab60089b44..e81cd0c72f26652665a7cd14b01faece3c27b4b6 100644 (file)
--- a/debian/patches/removesyslogtarget.patch
+++ b/debian/patches/removesyslogtarget.patch
@@ -1,5 +1,15 @@
+From: Giuseppe Iuculano <iuculano@debian.org>
+Date: Thu, 27 Sep 2018 19:03:07 +0800
+Subject: removesyslogtarget
+
 declaring After=syslog.target is unnecessary by now because
 syslog is socket-activated and will therefore be started when needed.
+---
+ smartd.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/smartd.service.in b/smartd.service.in
+index dc8b143..878a26c 100644
 --- a/smartd.service.in
 +++ b/smartd.service.in
 @@ -1,7 +1,6 @@