Refreshed patches, removed install.diff applied upstream

diff --git a/debian/patches/52_remove-pragma.diff b/debian/patches/52_remove-pragma.diff
index 67b0dd59e7abeb12483e027938369b378b7cb2a5..8bf003cd17db686bfef5a65b0678bdad156ca5cb 100644 (file)
--- a/debian/patches/52_remove-pragma.diff
+++ b/debian/patches/52_remove-pragma.diff
@@ -16,7 +16,7 @@
  struct ata_smart_attribute {
    unsigned char id;
    // meaning of flag bits: see MACROS just below
  struct ata_smart_attribute {
    unsigned char id;
    // meaning of flag bits: see MACROS just below

-@@ -201,7 +199,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute
+@@ -202,7 +200,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute

  
  /* ata_smart_values is format of the read drive Attribute command */
  /* see Table 34 of T13/1321D Rev 1 spec (Device SMART data structure) for *some* info */
  
  /* ata_smart_values is format of the read drive Attribute command */
  /* see Table 34 of T13/1321D Rev 1 spec (Device SMART data structure) for *some* info */


@@ -24,7 +24,7 @@
  struct ata_smart_values {
    unsigned short int revnumber;
    struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
  struct ata_smart_values {
    unsigned short int revnumber;
    struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];

-@@ -233,7 +230,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5
+@@ -234,7 +231,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5

  */
  
  /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
  */
  
  /* 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;
  struct ata_smart_threshold_entry {
    unsigned char id;
    unsigned char threshold;

-@@ -244,7 +240,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
+@@ -245,7 +241,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold

  
  /* Format of Read SMART THreshold Command */
  /* Compare to ata_smart_values above */
  
  /* 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];
  struct ata_smart_thresholds_pvt {
    unsigned short int revnumber;
    struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];

-@@ -256,7 +251,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
+@@ -257,7 +252,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold

  
  
  // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
  
  
  // 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;
  struct ata_smart_errorlog_error_struct {
    unsigned char reserved;
    unsigned char error_register;

-@@ -275,7 +269,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_
+@@ -276,7 +270,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_

  
  
  // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
  
  
  // 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;
  struct ata_smart_errorlog_command_struct {
    unsigned char devicecontrolreg;
    unsigned char featuresreg;

-@@ -291,7 +284,6 @@ struct ata_smart_errorlog_command_struct
+@@ -292,7 +285,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)
  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;
  struct ata_smart_errorlog_struct {
    struct ata_smart_errorlog_command_struct commands[5];
    struct ata_smart_errorlog_error_struct error_struct;

-@@ -300,7 +292,6 @@ struct ata_smart_errorlog_struct {
+@@ -301,7 +293,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)
  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;
  struct ata_smart_errorlog {
    unsigned char revnumber;
    unsigned char error_log_pointer;

-@@ -397,7 +388,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog
+@@ -398,7 +389,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog

  
  
  // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
  
  
  // 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;
  struct ata_smart_selftestlog_struct {
    unsigned char selftestnumber; // Sector number register
    unsigned char selfteststatus;

-@@ -410,7 +400,6 @@ struct ata_smart_selftestlog_struct {
+@@ -411,7 +401,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)
  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];
  struct ata_smart_selftestlog {
    unsigned short int revnumber;
    struct ata_smart_selftestlog_struct selftest_struct[21];

-@@ -459,7 +448,6 @@ struct ata_smart_extselftestlog
+@@ -460,7 +449,6 @@ struct ata_smart_extselftestlog

  ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512);
  
  // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
  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;
  struct ata_smart_log_entry {
    unsigned char numsectors;
    unsigned char reserved;

-@@ -467,7 +455,6 @@ struct ata_smart_log_entry {
+@@ -468,7 +456,6 @@ struct ata_smart_log_entry {

  #pragma pack()
  ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
  
  #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];
  struct ata_smart_log_directory {
    unsigned short int logversion;
    struct ata_smart_log_entry entry[255];

-@@ -477,7 +464,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc
+@@ -478,7 +465,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc

  
  // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
  // Revision 3
  
  // 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;
  struct test_span {
    uint64_t start;
    uint64_t end;

-@@ -485,7 +471,6 @@ struct test_span {
+@@ -486,7 +472,6 @@ struct test_span {

  #pragma pack()
  ASSERT_SIZEOF_STRUCT(test_span, 16);
  
  #pragma pack()
  ASSERT_SIZEOF_STRUCT(test_span, 16);
  

diff --git a/debian/patches/install.diff b/debian/patches/install.diff
deleted file mode 100644 (file)
index 2c50dea..0000000
--- a/debian/patches/install.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Do not install CHANGELOG COPYING INSTALL initd files
-
-This patch should not be sent upstream
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -264,9 +264,6 @@ endif
- 
- docsdir=$(docdir)
- docs_DATA = AUTHORS     \
--            CHANGELOG   \
--            COPYING     \
--            INSTALL     \
-             NEWS        \
-             README      \
-             TODO        \
-@@ -464,7 +461,6 @@ initd_DATA_uninstall = uninstall-initdDA
- 
- install-initdDATA-generic: $(initd_DATA)
-       $(mkinstalldirs) $(DESTDIR)$(initddir)
--      $(INSTALL_SCRIPT) $(top_builddir)/smartd.initd $(DESTDIR)$(initddir)/smartd$(smartd_suffix)
- 
- 
- uninstall-initdDATA-generic:

diff --git a/debian/patches/series b/debian/patches/series
index 88dd4c91f7b307c3ce4e1f8aaccd8d542790e487..d4ef71d598c34079a6ab97540b9cee0544869d62 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 61_cciss-doc.patch
 63_removable.patch
 manpage.diff
 61_cciss-doc.patch
 63_removable.patch
 manpage.diff

-install.diff