+smartmontools (5.37-2) unstable; urgency=low
+
+ * UNRELEASED
+ * switch from dpatch to quilt
+
+ -- Guido Guenther <agx@sigxcpu.org> Mon, 19 Mar 2007 22:08:40 +0100
+
smartmontools (5.37-1) unstable; urgency=low
* New Upstream Version
Section: utils
Priority: optional
Maintainer: Guido Guenther <agx@sigxcpu.org>
-Build-Depends: debhelper (>= 4), dpatch, libcam-dev [kfreebsd-i386 kfreebsd-amd64], automake1.9, autoconf
+Build-Depends: debhelper (>= 4), quilt, libcam-dev [kfreebsd-i386 kfreebsd-amd64], automake1.9, autoconf
Standards-Version: 3.7.2
Package: smartmontools
+++ /dev/null
-01_add-kfreebsd-support
-02_remove-pragma
-03_use-smartd-runner-by-default
-04_remove-Id-from-smartd.conf
-10_remove-redhatism
-#60_cciss
--- /dev/null
+Index: smartmontools/configure.in
+===================================================================
+--- smartmontools.orig/configure.in 2007-03-19 21:44:06.000000000 +0100
++++ smartmontools/configure.in 2007-03-19 21:55:37.000000000 +0100
+@@ -135,7 +135,7 @@
+ *-*-linux*)
+ AC_SUBST([os_deps], ['os_linux.o'])
+ AC_SUBST([os_libs], ['']) ;;
+- *-*-freebsd*)
++ *-*-freebsd* | *-*-kfreebsd*-gnu)
+ AC_SUBST([os_deps], ['os_freebsd.o'])
+ AC_SUBST([os_libs], ['-lcam']);;
+ sparc-*-solaris*)
--- /dev/null
+Index: smartmontools/atacmds.h
+===================================================================
+--- smartmontools.orig/atacmds.h 2007-03-19 21:44:06.000000000 +0100
++++ smartmontools/atacmds.h 2007-03-19 21:55:37.000000000 +0100
+@@ -105,7 +105,6 @@
+
+ // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
+ // word* are NOT used.
+-#pragma pack(1)
+ struct ata_identify_device {
+ unsigned short words000_009[10];
+ unsigned char serial_no[20];
+@@ -127,7 +126,6 @@
+ ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
+
+ /* ata_smart_attribute is the vendor specific in SFF-8035 spec */
+-#pragma pack(1)
+ struct ata_smart_attribute {
+ unsigned char id;
+ // meaning of flag bits: see MACROS just below
+@@ -187,7 +185,6 @@
+
+ /* 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 */
+-#pragma pack(1)
+ struct ata_smart_values {
+ unsigned short int revnumber;
+ struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
+@@ -219,7 +216,6 @@
+ */
+
+ /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
+-#pragma pack(1)
+ struct ata_smart_threshold_entry {
+ unsigned char id;
+ unsigned char threshold;
+@@ -230,7 +226,6 @@
+
+ /* Format of Read SMART THreshold Command */
+ /* Compare to ata_smart_values above */
+-#pragma pack(1)
+ struct ata_smart_thresholds_pvt {
+ unsigned short int revnumber;
+ struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
+@@ -242,7 +237,6 @@
+
+
+ // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
+-#pragma pack(1)
+ struct ata_smart_errorlog_error_struct {
+ unsigned char reserved;
+ unsigned char error_register;
+@@ -261,7 +255,6 @@
+
+
+ // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
+-#pragma pack(1)
+ struct ata_smart_errorlog_command_struct {
+ unsigned char devicecontrolreg;
+ unsigned char featuresreg;
+@@ -277,7 +270,6 @@
+ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
+
+ // Table 40 of T13/1321D Rev 1 spec (Error log data structure)
+-#pragma pack(1)
+ struct ata_smart_errorlog_struct {
+ struct ata_smart_errorlog_command_struct commands[5];
+ struct ata_smart_errorlog_error_struct error_struct;
+@@ -286,7 +278,6 @@
+ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
+
+ // Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
+-#pragma pack(1)
+ struct ata_smart_errorlog {
+ unsigned char revnumber;
+ unsigned char error_log_pointer;
+@@ -299,7 +290,6 @@
+ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog, 512);
+
+ // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
+-#pragma pack(1)
+ struct ata_smart_selftestlog_struct {
+ unsigned char selftestnumber; // Sector number register
+ unsigned char selfteststatus;
+@@ -312,7 +302,6 @@
+ ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
+
+ // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
+-#pragma pack(1)
+ struct ata_smart_selftestlog {
+ unsigned short int revnumber;
+ struct ata_smart_selftestlog_struct selftest_struct[21];
+@@ -325,7 +314,6 @@
+ ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog, 512);
+
+ // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
+-#pragma pack(1)
+ struct ata_smart_log_entry {
+ unsigned char numsectors;
+ unsigned char reserved;
+@@ -333,7 +321,6 @@
+ #pragma pack()
+ ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
+
+-#pragma pack(1)
+ struct ata_smart_log_directory {
+ unsigned short int logversion;
+ struct ata_smart_log_entry entry[255];
+@@ -343,7 +330,6 @@
+
+ // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
+ // Revision 3
+-#pragma pack(1)
+ struct test_span {
+ uint64_t start;
+ uint64_t end;
+@@ -351,7 +337,6 @@
+ #pragma pack()
+ ASSERT_SIZEOF_STRUCT(test_span, 16);
+
+-#pragma pack(1)
+ struct ata_selective_self_test_log {
+ unsigned short logversion;
+ struct test_span span[5];
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_remove-progma.dpatch by Guido Guenther <agx@sigxcpu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove #pragma since this causes trouble on arm
-
-@DPATCH@
-
-diff -u -Naur smartmontools-5.33+5.34cvs20050802.orig/atacmds.h smartmontools-5.33+5.34cvs20050802/atacmds.h
---- smartmontools-5.33+5.34cvs20050802.orig/atacmds.h 2005-05-10 21:15:47.000000000 +0200
-+++ smartmontools-5.33+5.34cvs20050802/atacmds.h 2006-02-28 17:38:26.000000000 +0100
-@@ -105,7 +105,6 @@
-
- // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
- // word* are NOT used.
--#pragma pack(1)
- struct ata_identify_device {
- unsigned short words000_009[10];
- unsigned char serial_no[20];
-@@ -127,7 +126,6 @@
- ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
-
- /* ata_smart_attribute is the vendor specific in SFF-8035 spec */
--#pragma pack(1)
- struct ata_smart_attribute {
- unsigned char id;
- // meaning of flag bits: see MACROS just below
-@@ -187,7 +185,6 @@
-
- /* 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 */
--#pragma pack(1)
- struct ata_smart_values {
- unsigned short int revnumber;
- struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
-@@ -219,7 +216,6 @@
- */
-
- /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
--#pragma pack(1)
- struct ata_smart_threshold_entry {
- unsigned char id;
- unsigned char threshold;
-@@ -230,7 +226,6 @@
-
- /* Format of Read SMART THreshold Command */
- /* Compare to ata_smart_values above */
--#pragma pack(1)
- struct ata_smart_thresholds_pvt {
- unsigned short int revnumber;
- struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
-@@ -242,7 +237,6 @@
-
-
- // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
--#pragma pack(1)
- struct ata_smart_errorlog_error_struct {
- unsigned char reserved;
- unsigned char error_register;
-@@ -261,7 +255,6 @@
-
-
- // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
--#pragma pack(1)
- struct ata_smart_errorlog_command_struct {
- unsigned char devicecontrolreg;
- unsigned char featuresreg;
-@@ -277,7 +270,6 @@
- ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
-
- // Table 40 of T13/1321D Rev 1 spec (Error log data structure)
--#pragma pack(1)
- struct ata_smart_errorlog_struct {
- struct ata_smart_errorlog_command_struct commands[5];
- struct ata_smart_errorlog_error_struct error_struct;
-@@ -286,7 +278,6 @@
- ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
-
- // Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
--#pragma pack(1)
- struct ata_smart_errorlog {
- unsigned char revnumber;
- unsigned char error_log_pointer;
-@@ -299,7 +290,6 @@
- ASSERT_SIZEOF_STRUCT(ata_smart_errorlog, 512);
-
- // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
--#pragma pack(1)
- struct ata_smart_selftestlog_struct {
- unsigned char selftestnumber; // Sector number register
- unsigned char selfteststatus;
-@@ -312,7 +302,6 @@
- ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
-
- // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
--#pragma pack(1)
- struct ata_smart_selftestlog {
- unsigned short int revnumber;
- struct ata_smart_selftestlog_struct selftest_struct[21];
-@@ -325,7 +314,6 @@
- ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog, 512);
-
- // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
--#pragma pack(1)
- struct ata_smart_log_entry {
- unsigned char numsectors;
- unsigned char reserved;
-@@ -333,7 +321,6 @@
- #pragma pack()
- ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
-
--#pragma pack(1)
- struct ata_smart_log_directory {
- unsigned short int logversion;
- struct ata_smart_log_entry entry[255];
-@@ -343,7 +330,6 @@
-
- // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
- // Revision 3
--#pragma pack(1)
- struct test_span {
- uint64_t start;
- uint64_t end;
-@@ -351,7 +337,6 @@
- #pragma pack()
- ASSERT_SIZEOF_STRUCT(test_span, 16);
-
--#pragma pack(1)
- struct ata_selective_self_test_log {
- unsigned short logversion;
- struct test_span span[5];
--- /dev/null
+Index: smartmontools/smartd.conf
+===================================================================
+--- smartmontools.orig/smartd.conf 2007-03-19 21:55:37.000000000 +0100
++++ smartmontools/smartd.conf 2007-03-19 21:55:37.000000000 +0100
+@@ -19,7 +19,7 @@
+ # Directives listed below, which will be applied to all devices that
+ # are found. Most users should comment out DEVICESCAN and explicitly
+ # list the devices that they wish to monitor.
+-DEVICESCAN
++DEVICESCAN -m root -M exec /usr/share/smartmontools/smartd-runner
+
+ # Alternative setting to ignore temperature and power-on hours reports
+ # in syslog.
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_use-smartd-runner.dpatch by Guido Guenther <agx@sigxcpu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use smartd-runner by default in smartd.conf
-
-@DPATCH@
-
-diff -u -Naur smartmontools-5.33+5.34cvs20050802.orig/smartd.conf smartmontools-5.33+5.34cvs20050802/smartd.conf
---- smartmontools-5.33+5.34cvs20050802.orig/smartd.conf 2004-09-14 18:57:49.000000000 +0200
-+++ smartmontools-5.33+5.34cvs20050802/smartd.conf 2006-04-10 17:35:05.000000000 +0200
-@@ -20,7 +19,7 @@
- # Directives listed below, which will be applied to all devices that
- # are found. Most users should comment out DEVICESCAN and explicitly
- # list the devices that they wish to monitor.
--DEVICESCAN
-+DEVICESCAN -m root -M exec /usr/share/smartmontools/smartd-runner
-
- # First (primary) ATA/IDE hard disk. Monitor all attributes, enable
- # automatic online data collection, automatic Attribute autosave, and
--- /dev/null
+Index: smartmontools/smartd.conf
+===================================================================
+--- smartmontools.orig/smartd.conf 2007-03-19 21:44:06.000000000 +0100
++++ smartmontools/smartd.conf 2007-03-19 21:57:47.000000000 +0100
+@@ -1,9 +1,8 @@
+-# Sample configuration file for smartd. See man smartd.conf.
++# /etc/smartd.conf
++# Configuration file for smartd. Use "man smartd.conf" for more information.
+
+ # Home page is: http://smartmontools.sourceforge.net
+
+-# $Id: smartd.conf,v 1.45 2006/11/12 23:39:04 dpgilbert Exp $
+-
+ # smartd will re-read the configuration file if it receives a HUP
+ # signal
+
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_use-smartd-runner.dpatch by Guido Guenther <agx@sigxcpu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove $Id from smartd.conf to ease upgrades when the user
-## DP: uses a RCS for /etc
-
-@DPATCH@
-
-diff -u -Naur smartmontools-5.33+5.34cvs20050802.orig/smartd.conf smartmontools-5.33+5.34cvs20050802/smartd.conf
---- smartmontools-5.33+5.34cvs20050802.orig/smartd.conf 2004-09-14 18:57:49.000000000 +0200
-+++ smartmontools-5.33+5.34cvs20050802/smartd.conf 2006-04-10 17:35:05.000000000 +0200
-@@ -1,9 +1,8 @@
--# Sample configuration file for smartd. See man smartd.conf.
-+# /etc/smartd.conf
-+# Configuration file for smartd. Use "man smartd.conf" for more information.
-
- # Home page is: http://smartmontools.sourceforge.net
-
--# $Id: smartd.conf,v 1.45 2006/11/12 23:39:04 dpgilbert Exp $
--
- # smartd will re-read the configuration file if it receives a HUP
- # signal
-
--- /dev/null
+Index: smartmontools/smartd.8.in
+===================================================================
+--- smartmontools.orig/smartd.8.in 2007-03-19 21:44:06.000000000 +0100
++++ smartmontools/smartd.8.in 2007-03-19 21:55:37.000000000 +0100
+@@ -405,15 +405,6 @@
+ .B /usr/local/etc/rc.d/init.d/smartd stop
+
+ .fi
+-If you want \fBsmartd\fP to start running whenever your machine is
+-booted, this can be enabled by using the command:
+-.nf
+-.B /sbin/chkconfig --add smartd
+-.fi
+-and disabled using the command:
+-.nf
+-.B /sbin/chkconfig --del smartd
+-.fi
+
+ .\" DO NOT MODIFY THIS OR THE FOLLOWING TWO LINES. THIS MATERIAL
+ .\" IS AUTOMATICALLY INCLUDED IN THE FILE smartd.conf.5
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_remove-redhadism.dpatch by Guido Guenther <agx@sigxcpu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove redhat specific parts from the documentation
-
-@DPATCH@
-
-diff -u -Naur smartmontools-5.33+5.34cvs20050802.orig/smartd.8.in smartmontools-5.33+5.34cvs20050802/smartd.8.in
---- smartmontools-5.33+5.34cvs20050802.orig/smartd.8.in 2005-04-08 21:17:53.000000000 +0200
-+++ smartmontools-5.33+5.34cvs20050802/smartd.8.in 2006-04-13 09:31:13.000000000 +0200
-@@ -376,15 +376,6 @@
- .B /usr/local/etc/rc.d/init.d/smartd stop
-
- .fi
--If you want \fBsmartd\fP to start running whenever your machine is
--booted, this can be enabled by using the command:
--.nf
--.B /sbin/chkconfig --add smartd
--.fi
--and disabled using the command:
--.nf
--.B /sbin/chkconfig --del smartd
--.fi
-
- .\" DO NOT MODIFY THIS OR THE FOLLOWING TWO LINES. THIS MATERIAL
- .\" IS AUTOMATICALLY INCLUDED IN THE FILE smartd.conf.5
--- /dev/null
+01_add-kfreebsd-support.diff
+02_remove-pragma.diff
+03_use-smartd-runner-by-default.diff
+04_remove-Id-from-smartd.conf.diff
+10_remove-redhatism.diff
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# for dpatch
-include /usr/share/dpatch/dpatch.make
+# for quilt
+include /usr/share/quilt/quilt.make
CFLAGS = -fsigned-char -Wall
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: debian/stamp-patched
dh_testdir
./autogen.sh
CFLAGS="${CFLAGS}" ./configure --prefix=/usr \
$(CURDIR)/debian/smartmontools/etc/smartmontools/run.d/10mail
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
projects / mirror_smartmontools-debian.git / commitdiff