summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch20
-rw-r--r--meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff182
2 files changed, 118 insertions, 84 deletions
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch
index 19f8380b47..1ec6a61b31 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch
+++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch
@@ -3,9 +3,10 @@ Auto-detect disks if none specified
3Refer to: 3Refer to:
4https://bugzilla.redhat.com/show_bug.cgi?id=717479 4https://bugzilla.redhat.com/show_bug.cgi?id=717479
5 5
6diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8 6Index: hddtemp-0.3-beta15/doc/hddtemp.8
7--- hddtemp-0.3-beta15/doc/hddtemp.8~ 2011-08-18 00:36:05.689001470 +0300 7===================================================================
8+++ hddtemp-0.3-beta15/doc/hddtemp.8 2011-08-18 00:44:46.753006253 +0300 8--- hddtemp-0.3-beta15.orig/doc/hddtemp.8
9+++ hddtemp-0.3-beta15/doc/hddtemp.8
9@@ -19,7 +19,7 @@ 10@@ -19,7 +19,7 @@
10 hddtemp \- Utility to monitor hard drive temperature 11 hddtemp \- Utility to monitor hard drive temperature
11 .SH SYNOPSIS 12 .SH SYNOPSIS
@@ -25,9 +26,10 @@ diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8
25 26
26 27
27 .SH "OPTIONS" 28 .SH "OPTIONS"
28diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c 29Index: hddtemp-0.3-beta15/src/hddtemp.c
29--- hddtemp-0.3-beta15/src/hddtemp.c~ 2011-08-18 00:36:05.638996861 +0300 30===================================================================
30+++ hddtemp-0.3-beta15/src/hddtemp.c 2011-08-18 00:35:55.485060798 +0300 31--- hddtemp-0.3-beta15.orig/src/hddtemp.c
32+++ hddtemp-0.3-beta15/src/hddtemp.c
31@@ -54,6 +54,7 @@ 33@@ -54,6 +54,7 @@
32 #include <linux/hdreg.h> 34 #include <linux/hdreg.h>
33 #include <ctype.h> 35 #include <ctype.h>
@@ -44,7 +46,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c
44 46
45 backtrace_sigsegv(); 47 backtrace_sigsegv();
46 backtrace_sigill(); 48 backtrace_sigill();
47@@ -419,11 +421,6 @@ int main(int argc, char* argv[]) { 49@@ -423,11 +425,6 @@ int main(int argc, char* argv[]) {
48 exit(0); 50 exit(0);
49 } 51 }
50 52
@@ -56,7 +58,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c
56 if(debug) { 58 if(debug) {
57 /* argc = optind + 1;*/ 59 /* argc = optind + 1;*/
58 quiet = 1; 60 quiet = 1;
59@@ -434,6 +431,23 @@ int main(int argc, char* argv[]) { 61@@ -438,6 +435,23 @@ int main(int argc, char* argv[]) {
60 exit(1); 62 exit(1);
61 } 63 }
62 64
@@ -80,7 +82,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c
80 init_bus_types(); 82 init_bus_types();
81 83
82 /* collect disks informations */ 84 /* collect disks informations */
83@@ -527,6 +541,7 @@ int main(int argc, char* argv[]) { 85@@ -531,6 +545,7 @@ int main(int argc, char* argv[]) {
84 else { 86 else {
85 do_direct_mode(ldisks); 87 do_direct_mode(ldisks);
86 } 88 }
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
index f61c1649a4..057b1fd1d3 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
+++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
@@ -8,9 +8,11 @@ Filtered with:
8 8
9Upstream-Status: unmaintained 9Upstream-Status: unmaintained
10 10
11Index: hddtemp-0.3-beta15/doc/hddtemp.8
12===================================================================
11--- hddtemp-0.3-beta15.orig/doc/hddtemp.8 13--- hddtemp-0.3-beta15.orig/doc/hddtemp.8
12+++ hddtemp-0.3-beta15/doc/hddtemp.8 14+++ hddtemp-0.3-beta15/doc/hddtemp.8
13@@ -58,6 +58,10 @@ 15@@ -58,6 +58,10 @@ Execute hddtemp in TCP/IP daemon mode (p
14 .B \-f, \-\-file=\fIfile\fI 16 .B \-f, \-\-file=\fIfile\fI
15 Specify the database file to use. 17 Specify the database file to use.
16 .TP 18 .TP
@@ -21,7 +23,7 @@ Upstream-Status: unmaintained
21 .B \-l, \-\-listen=\fIaddr\fR 23 .B \-l, \-\-listen=\fIaddr\fR
22 Listen on a specific address. \fIaddr\fR is a string containing a 24 Listen on a specific address. \fIaddr\fR is a string containing a
23 host name or a numeric host address string. The numeric host address 25 host name or a numeric host address string. The numeric host address
24@@ -80,6 +84,9 @@ 26@@ -80,6 +84,9 @@ seconds.
25 .B \-q, \-\-quiet 27 .B \-q, \-\-quiet
26 Don't check if the drive is supported. 28 Don't check if the drive is supported.
27 .TP 29 .TP
@@ -31,7 +33,7 @@ Upstream-Status: unmaintained
31 .B \-v, \-\-version 33 .B \-v, \-\-version
32 Display hddtemp version number. 34 Display hddtemp version number.
33 .TP 35 .TP
34@@ -96,7 +103,7 @@ 36@@ -96,7 +103,7 @@ Listen on IPv6 sockets only.
35 .SH "DRIVE DATABASE" 37 .SH "DRIVE DATABASE"
36 If you know your drive has a temperature sensor but it is being 38 If you know your drive has a temperature sensor but it is being
37 reported unsupported, tell me which model and which manufacturer it 39 reported unsupported, tell me which model and which manufacturer it
@@ -40,7 +42,7 @@ Upstream-Status: unmaintained
40 line of hddtemp.db is either a comment, a blank line or a line 42 line of hddtemp.db is either a comment, a blank line or a line
41 containing: 43 containing:
42 .TP 44 .TP
43@@ -112,7 +119,7 @@ 45@@ -112,7 +119,7 @@ set of drives from its model name or fro
44 Feedback is welcome (see the REPORT section below). 46 Feedback is welcome (see the REPORT section below).
45 47
46 .SH "TCP/IP DAEMON MODE" 48 .SH "TCP/IP DAEMON MODE"
@@ -49,7 +51,7 @@ Upstream-Status: unmaintained
49 .PP 51 .PP
50 # hddtemp SATA:/dev/sda PATA:/dev/hda 52 # hddtemp SATA:/dev/sda PATA:/dev/hda
51 .PP 53 .PP
52@@ -120,7 +127,7 @@ 54@@ -120,7 +127,7 @@ To test
53 .B hddtemp 55 .B hddtemp
54 in daemon mode, start it like this: 56 in daemon mode, start it like this:
55 .PP 57 .PP
@@ -58,7 +60,7 @@ Upstream-Status: unmaintained
58 .PP 60 .PP
59 .PP 61 .PP
60 and use 62 and use
61@@ -165,8 +172,8 @@ 63@@ -165,8 +172,8 @@ and 12 are often reported to match a tem
62 investigation they do not. But fields 194 (which is the standard 64 investigation they do not. But fields 194 (which is the standard
63 field for temperature) and 231 are good candidates. 65 field for temperature) and 231 are good candidates.
64 .PP 66 .PP
@@ -69,13 +71,15 @@ Upstream-Status: unmaintained
69 yourself. 71 yourself.
70 72
71 .SH "BUGS" 73 .SH "BUGS"
72@@ -183,5 +190,5 @@ 74@@ -183,5 +190,5 @@ supported on i386 architectures only.
73 .PP 75 .PP
74 Emmanuel Varagnat (hddtemp@guzu.net). 76 Emmanuel Varagnat (hddtemp@guzu.net).
75 .PP 77 .PP
76-This manual page was originaly written by Aurelien Jarno <aurel32@debian.org>, 78-This manual page was originaly written by Aurelien Jarno <aurel32@debian.org>,
77+This manual page was originally written by Aurelien Jarno <aurel32@debian.org>, 79+This manual page was originally written by Aurelien Jarno <aurel32@debian.org>,
78 for the Debian GNU/Linux system (but may be used by others). 80 for the Debian GNU/Linux system (but may be used by others).
81Index: hddtemp-0.3-beta15/po/fr.po
82===================================================================
79--- hddtemp-0.3-beta15.orig/po/fr.po 83--- hddtemp-0.3-beta15.orig/po/fr.po
80+++ hddtemp-0.3-beta15/po/fr.po 84+++ hddtemp-0.3-beta15/po/fr.po
81@@ -7,9 +7,9 @@ 85@@ -7,9 +7,9 @@
@@ -91,7 +95,7 @@ Upstream-Status: unmaintained
91 "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" 95 "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n"
92 "Language-Team: FRANCAIS <fr@li.org>\n" 96 "Language-Team: FRANCAIS <fr@li.org>\n"
93 "MIME-Version: 1.0\n" 97 "MIME-Version: 1.0\n"
94@@ -17,23 +17,7 @@ 98@@ -17,23 +17,7 @@ msgstr ""
95 "Content-Transfer-Encoding: 8bit\n" 99 "Content-Transfer-Encoding: 8bit\n"
96 "X-Generator: KBabel 1.0.1\n" 100 "X-Generator: KBabel 1.0.1\n"
97 101
@@ -116,7 +120,7 @@ Upstream-Status: unmaintained
116 #, c-format 120 #, c-format
117 msgid "" 121 msgid ""
118 "\n" 122 "\n"
119@@ -46,7 +30,7 @@ 123@@ -46,7 +30,7 @@ msgstr ""
120 "Modèle: %s\n" 124 "Modèle: %s\n"
121 "\n" 125 "\n"
122 126
@@ -125,7 +129,7 @@ Upstream-Status: unmaintained
125 #, c-format 129 #, c-format
126 msgid "" 130 msgid ""
127 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" 131 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n"
128@@ -60,75 +44,60 @@ 132@@ -60,75 +44,60 @@ msgstr ""
129 "net).\n" 133 "net).\n"
130 "ATTENTION : Voir les options --help, --debug et --drivebase.\n" 134 "ATTENTION : Voir les options --help, --debug et --drivebase.\n"
131 135
@@ -216,7 +220,7 @@ Upstream-Status: unmaintained
216 " -b --drivebase : display database file content that allow hddtemp to\n" 220 " -b --drivebase : display database file content that allow hddtemp to\n"
217 " recognize supported drives.\n" 221 " recognize supported drives.\n"
218 " -D --debug : display various S.M.A.R.T. fields and their values.\n" 222 " -D --debug : display various S.M.A.R.T. fields and their values.\n"
219@@ -138,6 +107,7 @@ 223@@ -138,6 +107,7 @@ msgid ""
220 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " 224 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by "
221 "default.)\n" 225 "default.)\n"
222 " -f --file=FILE : specify database file to use.\n" 226 " -f --file=FILE : specify database file to use.\n"
@@ -224,7 +228,7 @@ Upstream-Status: unmaintained
224 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " 228 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon "
225 "mode).\n" 229 "mode).\n"
226 " -n --numeric : print only the temperature.\n" 230 " -n --numeric : print only the temperature.\n"
227@@ -145,6 +115,8 @@ 231@@ -145,6 +115,8 @@ msgid ""
228 " -s --separator=C : separator to use between fields (in TCP/IP daemon " 232 " -s --separator=C : separator to use between fields (in TCP/IP daemon "
229 "mode).\n" 233 "mode).\n"
230 " -S --syslog=s : log temperature to syslog every s seconds.\n" 234 " -S --syslog=s : log temperature to syslog every s seconds.\n"
@@ -233,7 +237,7 @@ Upstream-Status: unmaintained
233 " -q --quiet : do not check if the drive is supported.\n" 237 " -q --quiet : do not check if the drive is supported.\n"
234 " -v --version : display hddtemp version number.\n" 238 " -v --version : display hddtemp version number.\n"
235 " -w --wake-up : wake-up the drive if need.\n" 239 " -w --wake-up : wake-up the drive if need.\n"
236@@ -153,11 +125,14 @@ 240@@ -153,11 +125,14 @@ msgid ""
237 "\n" 241 "\n"
238 "Report bugs or new drives to <hddtemp@guzu.net>.\n" 242 "Report bugs or new drives to <hddtemp@guzu.net>.\n"
239 msgstr "" 243 msgstr ""
@@ -249,7 +253,7 @@ Upstream-Status: unmaintained
249 " -b --drivebase : affiche le contenu du fichier de base de donnée " 253 " -b --drivebase : affiche le contenu du fichier de base de donnée "
250 "qui \n" 254 "qui \n"
251 " permet à hddtemp de reconnaître les lecteurs " 255 " permet à hddtemp de reconnaître les lecteurs "
252@@ -172,6 +147,7 @@ 256@@ -172,6 +147,7 @@ msgstr ""
253 "défaut).\n" 257 "défaut).\n"
254 " -f --file=FILE : specifie le fichier à utiliser comme base de " 258 " -f --file=FILE : specifie le fichier à utiliser comme base de "
255 "données.\n" 259 "données.\n"
@@ -257,7 +261,7 @@ Upstream-Status: unmaintained
257 " -l --listen=addr : écoute sur une interface spécifique (en mode démon " 261 " -l --listen=addr : écoute sur une interface spécifique (en mode démon "
258 "TCP/IP).\n" 262 "TCP/IP).\n"
259 " -n --numeric : affiche seulement la température.\n" 263 " -n --numeric : affiche seulement la température.\n"
260@@ -180,6 +156,8 @@ 264@@ -180,6 +156,8 @@ msgstr ""
261 "démon TCP/IP).\n" 265 "démon TCP/IP).\n"
262 " -S --syslog=s : enregistre la température dans syslog tous les s " 266 " -S --syslog=s : enregistre la température dans syslog tous les s "
263 "secondes.\n" 267 "secondes.\n"
@@ -266,7 +270,7 @@ Upstream-Status: unmaintained
266 " -q --quiet : ne vérifie pas si le lecteur est supporté.\n" 270 " -q --quiet : ne vérifie pas si le lecteur est supporté.\n"
267 " -v --version : affiche la version de hddtemp.\n" 271 " -v --version : affiche la version de hddtemp.\n"
268 " -w --wake-up : réveiller le lecteur si nécessaire.\n" 272 " -w --wake-up : réveiller le lecteur si nécessaire.\n"
269@@ -188,62 +166,95 @@ 273@@ -188,62 +166,95 @@ msgstr ""
270 "\n" 274 "\n"
271 "Report bugs or new drives to <hddtemp@guzu.net>.\n" 275 "Report bugs or new drives to <hddtemp@guzu.net>.\n"
272 276
@@ -377,6 +381,8 @@ Upstream-Status: unmaintained
377+ 381+
378+#~ msgid "field(%d)\t = %d\n" 382+#~ msgid "field(%d)\t = %d\n"
379+#~ msgstr "champ(%d)\t = %d\n" 383+#~ msgstr "champ(%d)\t = %d\n"
384Index: hddtemp-0.3-beta15/po/ru.po
385===================================================================
380--- hddtemp-0.3-beta15.orig/po/ru.po 386--- hddtemp-0.3-beta15.orig/po/ru.po
381+++ hddtemp-0.3-beta15/po/ru.po 387+++ hddtemp-0.3-beta15/po/ru.po
382@@ -6,8 +6,8 @@ 388@@ -6,8 +6,8 @@
@@ -390,7 +396,7 @@ Upstream-Status: unmaintained
390 "PO-Revision-Date: 2003-03-08 16:42+0300\n" 396 "PO-Revision-Date: 2003-03-08 16:42+0300\n"
391 "Last-Translator: Michael Shigorin <mike@altlinux.ru>\n" 397 "Last-Translator: Michael Shigorin <mike@altlinux.ru>\n"
392 "Language-Team: Russian <ru@li.org>\n" 398 "Language-Team: Russian <ru@li.org>\n"
393@@ -15,23 +15,7 @@ 399@@ -15,23 +15,7 @@ msgstr ""
394 "Content-Type: text/plain; charset=koi8-r\n" 400 "Content-Type: text/plain; charset=koi8-r\n"
395 "Content-Transfer-Encoding: 8bit\n" 401 "Content-Transfer-Encoding: 8bit\n"
396 402
@@ -415,7 +421,7 @@ Upstream-Status: unmaintained
415 #, c-format 421 #, c-format
416 msgid "" 422 msgid ""
417 "\n" 423 "\n"
418@@ -40,7 +24,7 @@ 424@@ -40,7 +24,7 @@ msgid ""
419 "\n" 425 "\n"
420 msgstr "" 426 msgstr ""
421 427
@@ -424,7 +430,7 @@ Upstream-Status: unmaintained
424 #, c-format 430 #, c-format
425 msgid "" 431 msgid ""
426 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" 432 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n"
427@@ -53,72 +37,59 @@ 433@@ -53,72 +37,59 @@ msgstr ""
428 "÷îéíáîéå: åÓÌÉ ×Ù ÔÏÞÎÏ ÚÎÁÅÔÅ, ÞÔÏ ÄÁÔÞÉË ÅÓÔØ, ÎÁÐÉÛÉÔÅ hddtemp@guzu.net\n" 434 "÷îéíáîéå: åÓÌÉ ×Ù ÔÏÞÎÏ ÚÎÁÅÔÅ, ÞÔÏ ÄÁÔÞÉË ÅÓÔØ, ÎÁÐÉÛÉÔÅ hddtemp@guzu.net\n"
429 "÷îéíáîéå: (ÓÍ. ÏÐÃÉÉ --help, --debug É --drivebase).\n" 435 "÷îéíáîéå: (ÓÍ. ÏÐÃÉÉ --help, --debug É --drivebase).\n"
430 436
@@ -512,7 +518,7 @@ Upstream-Status: unmaintained
512 " -b --drivebase : display database file content that allow hddtemp to\n" 518 " -b --drivebase : display database file content that allow hddtemp to\n"
513 " recognize supported drives.\n" 519 " recognize supported drives.\n"
514 " -D --debug : display various S.M.A.R.T. fields and their values.\n" 520 " -D --debug : display various S.M.A.R.T. fields and their values.\n"
515@@ -128,6 +99,7 @@ 521@@ -128,6 +99,7 @@ msgid ""
516 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " 522 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by "
517 "default.)\n" 523 "default.)\n"
518 " -f --file=FILE : specify database file to use.\n" 524 " -f --file=FILE : specify database file to use.\n"
@@ -520,7 +526,7 @@ Upstream-Status: unmaintained
520 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " 526 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon "
521 "mode).\n" 527 "mode).\n"
522 " -n --numeric : print only the temperature.\n" 528 " -n --numeric : print only the temperature.\n"
523@@ -135,6 +107,8 @@ 529@@ -135,6 +107,8 @@ msgid ""
524 " -s --separator=C : separator to use between fields (in TCP/IP daemon " 530 " -s --separator=C : separator to use between fields (in TCP/IP daemon "
525 "mode).\n" 531 "mode).\n"
526 " -S --syslog=s : log temperature to syslog every s seconds.\n" 532 " -S --syslog=s : log temperature to syslog every s seconds.\n"
@@ -529,7 +535,7 @@ Upstream-Status: unmaintained
529 " -q --quiet : do not check if the drive is supported.\n" 535 " -q --quiet : do not check if the drive is supported.\n"
530 " -v --version : display hddtemp version number.\n" 536 " -v --version : display hddtemp version number.\n"
531 " -w --wake-up : wake-up the drive if need.\n" 537 " -w --wake-up : wake-up the drive if need.\n"
532@@ -168,59 +142,90 @@ 538@@ -168,59 +142,90 @@ msgstr ""
533 "\n" 539 "\n"
534 "óÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ É ÄÁÎÎÙÅ ÄÌÑ ÄÉÓËÏ× ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ <hddtemp@guzu.net>.\n" 540 "óÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ É ÄÁÎÎÙÅ ÄÌÑ ÄÉÓËÏ× ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ <hddtemp@guzu.net>.\n"
535 541
@@ -636,6 +642,8 @@ Upstream-Status: unmaintained
636+ 642+
637+#~ msgid "field(%d)\t = %d\n" 643+#~ msgid "field(%d)\t = %d\n"
638+#~ msgstr "ÐÏÌÅ(%d)\t = %d\n" 644+#~ msgstr "ÐÏÌÅ(%d)\t = %d\n"
645Index: hddtemp-0.3-beta15/po/sv.po
646===================================================================
639--- hddtemp-0.3-beta15.orig/po/sv.po 647--- hddtemp-0.3-beta15.orig/po/sv.po
640+++ hddtemp-0.3-beta15/po/sv.po 648+++ hddtemp-0.3-beta15/po/sv.po
641@@ -6,8 +6,8 @@ 649@@ -6,8 +6,8 @@
@@ -649,7 +657,7 @@ Upstream-Status: unmaintained
649 "PO-Revision-Date: 2005-11-02 19:03+0100\n" 657 "PO-Revision-Date: 2005-11-02 19:03+0100\n"
650 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" 658 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
651 "Language-Team: Swedish <sv@li.org>\n" 659 "Language-Team: Swedish <sv@li.org>\n"
652@@ -17,23 +17,7 @@ 660@@ -17,23 +17,7 @@ msgstr ""
653 "X-Poedit-Language: swe\n" 661 "X-Poedit-Language: swe\n"
654 "X-Poedit-Country: swe\n" 662 "X-Poedit-Country: swe\n"
655 663
@@ -674,7 +682,7 @@ Upstream-Status: unmaintained
674 #, c-format 682 #, c-format
675 msgid "" 683 msgid ""
676 "\n" 684 "\n"
677@@ -46,7 +30,7 @@ 685@@ -46,7 +30,7 @@ msgstr ""
678 "Modell: %s\n" 686 "Modell: %s\n"
679 "\n" 687 "\n"
680 688
@@ -683,7 +691,7 @@ Upstream-Status: unmaintained
683 #, c-format 691 #, c-format
684 msgid "" 692 msgid ""
685 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" 693 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n"
686@@ -60,76 +44,63 @@ 694@@ -60,76 +44,63 @@ msgstr ""
687 "net).\n" 695 "net).\n"
688 "VARNING: Se --help, --debug och --drivebase flaggorna.\n" 696 "VARNING: Se --help, --debug och --drivebase flaggorna.\n"
689 697
@@ -777,7 +785,7 @@ Upstream-Status: unmaintained
777 " -b --drivebase : display database file content that allow hddtemp to\n" 785 " -b --drivebase : display database file content that allow hddtemp to\n"
778 " recognize supported drives.\n" 786 " recognize supported drives.\n"
779 " -D --debug : display various S.M.A.R.T. fields and their values.\n" 787 " -D --debug : display various S.M.A.R.T. fields and their values.\n"
780@@ -139,6 +110,7 @@ 788@@ -139,6 +110,7 @@ msgid ""
781 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " 789 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by "
782 "default.)\n" 790 "default.)\n"
783 " -f --file=FILE : specify database file to use.\n" 791 " -f --file=FILE : specify database file to use.\n"
@@ -785,7 +793,7 @@ Upstream-Status: unmaintained
785 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " 793 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon "
786 "mode).\n" 794 "mode).\n"
787 " -n --numeric : print only the temperature.\n" 795 " -n --numeric : print only the temperature.\n"
788@@ -146,6 +118,8 @@ 796@@ -146,6 +118,8 @@ msgid ""
789 " -s --separator=C : separator to use between fields (in TCP/IP daemon " 797 " -s --separator=C : separator to use between fields (in TCP/IP daemon "
790 "mode).\n" 798 "mode).\n"
791 " -S --syslog=s : log temperature to syslog every s seconds.\n" 799 " -S --syslog=s : log temperature to syslog every s seconds.\n"
@@ -794,7 +802,7 @@ Upstream-Status: unmaintained
794 " -q --quiet : do not check if the drive is supported.\n" 802 " -q --quiet : do not check if the drive is supported.\n"
795 " -v --version : display hddtemp version number.\n" 803 " -v --version : display hddtemp version number.\n"
796 " -w --wake-up : wake-up the drive if need.\n" 804 " -w --wake-up : wake-up the drive if need.\n"
797@@ -184,61 +158,91 @@ 805@@ -184,61 +158,91 @@ msgstr ""
798 "\n" 806 "\n"
799 "Rapportera buggar eller nya hårddiskar till <hddtemp@guzu.net>.\n" 807 "Rapportera buggar eller nya hårddiskar till <hddtemp@guzu.net>.\n"
800 808
@@ -901,9 +909,11 @@ Upstream-Status: unmaintained
901+ 909+
902+#~ msgid "field(%d)\t = %d\n" 910+#~ msgid "field(%d)\t = %d\n"
903+#~ msgstr "fält(%d)\t = %d\n" 911+#~ msgstr "fält(%d)\t = %d\n"
912Index: hddtemp-0.3-beta15/po/pt.po
913===================================================================
904--- hddtemp-0.3-beta15.orig/po/pt.po 914--- hddtemp-0.3-beta15.orig/po/pt.po
905+++ hddtemp-0.3-beta15/po/pt.po 915+++ hddtemp-0.3-beta15/po/pt.po
906@@ -7,7 +7,7 @@ 916@@ -7,7 +7,7 @@ msgid ""
907 msgstr "" 917 msgstr ""
908 "Project-Id-Version: hddtemp 0.3-beta14\n" 918 "Project-Id-Version: hddtemp 0.3-beta14\n"
909 "Report-Msgid-Bugs-To: \n" 919 "Report-Msgid-Bugs-To: \n"
@@ -912,7 +922,7 @@ Upstream-Status: unmaintained
912 "PO-Revision-Date: 2006-03-29 23:22+0000\n" 922 "PO-Revision-Date: 2006-03-29 23:22+0000\n"
913 "Last-Translator: Miguel Figueiredo <elmig@debianp.org>\n" 923 "Last-Translator: Miguel Figueiredo <elmig@debianp.org>\n"
914 "Language-Team: Portuguese <traduz@debianpt.org>\n" 924 "Language-Team: Portuguese <traduz@debianpt.org>\n"
915@@ -15,23 +15,7 @@ 925@@ -15,23 +15,7 @@ msgstr ""
916 "Content-Type: text/plain; charset=UTF-8\n" 926 "Content-Type: text/plain; charset=UTF-8\n"
917 "Content-Transfer-Encoding: 8bit\n" 927 "Content-Transfer-Encoding: 8bit\n"
918 928
@@ -937,7 +947,7 @@ Upstream-Status: unmaintained
937 #, c-format 947 #, c-format
938 msgid "" 948 msgid ""
939 "\n" 949 "\n"
940@@ -44,7 +28,7 @@ 950@@ -44,7 +28,7 @@ msgstr ""
941 "Modelo: %s\n" 951 "Modelo: %s\n"
942 "\n" 952 "\n"
943 953
@@ -946,7 +956,7 @@ Upstream-Status: unmaintained
946 #, c-format 956 #, c-format
947 msgid "" 957 msgid ""
948 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" 958 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n"
949@@ -54,79 +38,68 @@ 959@@ -54,79 +38,68 @@ msgid ""
950 msgstr "" 960 msgstr ""
951 "AVISO: O disco %s não parece ter um sensor de temperatura.\n" 961 "AVISO: O disco %s não parece ter um sensor de temperatura.\n"
952 "AVISO: Isto não significa que não tem nenhum.\n" 962 "AVISO: Isto não significa que não tem nenhum.\n"
@@ -1047,7 +1057,7 @@ Upstream-Status: unmaintained
1047 " -b --drivebase : display database file content that allow hddtemp to\n" 1057 " -b --drivebase : display database file content that allow hddtemp to\n"
1048 " recognize supported drives.\n" 1058 " recognize supported drives.\n"
1049 " -D --debug : display various S.M.A.R.T. fields and their values.\n" 1059 " -D --debug : display various S.M.A.R.T. fields and their values.\n"
1050@@ -136,6 +109,7 @@ 1060@@ -136,6 +109,7 @@ msgid ""
1051 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " 1061 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by "
1052 "default.)\n" 1062 "default.)\n"
1053 " -f --file=FILE : specify database file to use.\n" 1063 " -f --file=FILE : specify database file to use.\n"
@@ -1055,7 +1065,7 @@ Upstream-Status: unmaintained
1055 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " 1065 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon "
1056 "mode).\n" 1066 "mode).\n"
1057 " -n --numeric : print only the temperature.\n" 1067 " -n --numeric : print only the temperature.\n"
1058@@ -143,6 +117,8 @@ 1068@@ -143,6 +117,8 @@ msgid ""
1059 " -s --separator=C : separator to use between fields (in TCP/IP daemon " 1069 " -s --separator=C : separator to use between fields (in TCP/IP daemon "
1060 "mode).\n" 1070 "mode).\n"
1061 " -S --syslog=s : log temperature to syslog every s seconds.\n" 1071 " -S --syslog=s : log temperature to syslog every s seconds.\n"
@@ -1064,7 +1074,7 @@ Upstream-Status: unmaintained
1064 " -q --quiet : do not check if the drive is supported.\n" 1074 " -q --quiet : do not check if the drive is supported.\n"
1065 " -v --version : display hddtemp version number.\n" 1075 " -v --version : display hddtemp version number.\n"
1066 " -w --wake-up : wake-up the drive if need.\n" 1076 " -w --wake-up : wake-up the drive if need.\n"
1067@@ -156,19 +132,23 @@ 1077@@ -156,19 +132,23 @@ msgstr ""
1068 " hddtemp mostra a temperatura dos discos indicados no argumento.\n" 1078 " hddtemp mostra a temperatura dos discos indicados no argumento.\n"
1069 " Os discos têm de suportar S.M.A.R.T.\n" 1079 " Os discos têm de suportar S.M.A.R.T.\n"
1070 "\n" 1080 "\n"
@@ -1096,7 +1106,7 @@ Upstream-Status: unmaintained
1096 " -q --quiet : não verificar se o disco é suportado.\n" 1106 " -q --quiet : não verificar se o disco é suportado.\n"
1097 " -v --version : mostrar o número da versão do hddtemp.\n" 1107 " -v --version : mostrar o número da versão do hddtemp.\n"
1098 " -w --wake-up : acordar o disco se necessário.\n" 1108 " -w --wake-up : acordar o disco se necessário.\n"
1099@@ -177,58 +157,93 @@ 1109@@ -177,58 +157,93 @@ msgstr ""
1100 "\n" 1110 "\n"
1101 "Relatar bugs ou novos discos para <hddtemp@guzu.net>.\n" 1111 "Relatar bugs ou novos discos para <hddtemp@guzu.net>.\n"
1102 1112
@@ -1208,7 +1218,9 @@ Upstream-Status: unmaintained
1208+ 1218+
1209+#~ msgid "field(%d)\t = %d\n" 1219+#~ msgid "field(%d)\t = %d\n"
1210+#~ msgstr "campo(%d)\t = %d\n" 1220+#~ msgstr "campo(%d)\t = %d\n"
1211--- hddtemp-0.3-beta15.orig/po/de.po 1221Index: hddtemp-0.3-beta15/po/de.po
1222===================================================================
1223--- /dev/null
1212+++ hddtemp-0.3-beta15/po/de.po 1224+++ hddtemp-0.3-beta15/po/de.po
1213@@ -0,0 +1,250 @@ 1225@@ -0,0 +1,250 @@
1214+# German translation of hddtemp. 1226+# German translation of hddtemp.
@@ -1461,12 +1473,16 @@ Upstream-Status: unmaintained
1461+#, c-format 1473+#, c-format
1462+msgid "log sense failed : %s" 1474+msgid "log sense failed : %s"
1463+msgstr "Protokoll-Erkennung fehlgeschlagen : %s" 1475+msgstr "Protokoll-Erkennung fehlgeschlagen : %s"
1476Index: hddtemp-0.3-beta15/po/LINGUAS
1477===================================================================
1464--- hddtemp-0.3-beta15.orig/po/LINGUAS 1478--- hddtemp-0.3-beta15.orig/po/LINGUAS
1465+++ hddtemp-0.3-beta15/po/LINGUAS 1479+++ hddtemp-0.3-beta15/po/LINGUAS
1466@@ -1,2 +1,2 @@ 1480@@ -1,2 +1,2 @@
1467 # Set of available languages. 1481 # Set of available languages.
1468-fr pt ru sv 1482-fr pt ru sv
1469+de fr pt ru sv 1483+de fr pt ru sv
1484Index: hddtemp-0.3-beta15/po/hddtemp.pot
1485===================================================================
1470--- hddtemp-0.3-beta15.orig/po/hddtemp.pot 1486--- hddtemp-0.3-beta15.orig/po/hddtemp.pot
1471+++ hddtemp-0.3-beta15/po/hddtemp.pot 1487+++ hddtemp-0.3-beta15/po/hddtemp.pot
1472@@ -1,35 +1,22 @@ 1488@@ -1,35 +1,22 @@
@@ -1513,7 +1529,7 @@ Upstream-Status: unmaintained
1513 #, c-format 1529 #, c-format
1514 msgid "" 1530 msgid ""
1515 "\n" 1531 "\n"
1516@@ -38,7 +25,7 @@ 1532@@ -38,7 +25,7 @@ msgid ""
1517 "\n" 1533 "\n"
1518 msgstr "" 1534 msgstr ""
1519 1535
@@ -1522,7 +1538,7 @@ Upstream-Status: unmaintained
1522 #, c-format 1538 #, c-format
1523 msgid "" 1539 msgid ""
1524 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" 1540 "WARNING: Drive %s doesn't seem to have a temperature sensor.\n"
1525@@ -47,67 +34,59 @@ 1541@@ -47,67 +34,59 @@ msgid ""
1526 "WARNING: See --help, --debug and --drivebase options.\n" 1542 "WARNING: See --help, --debug and --drivebase options.\n"
1527 msgstr "" 1543 msgstr ""
1528 1544
@@ -1604,7 +1620,7 @@ Upstream-Status: unmaintained
1604 " -b --drivebase : display database file content that allow hddtemp to\n" 1620 " -b --drivebase : display database file content that allow hddtemp to\n"
1605 " recognize supported drives.\n" 1621 " recognize supported drives.\n"
1606 " -D --debug : display various S.M.A.R.T. fields and their values.\n" 1622 " -D --debug : display various S.M.A.R.T. fields and their values.\n"
1607@@ -117,6 +96,7 @@ 1623@@ -117,6 +96,7 @@ msgid ""
1608 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " 1624 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by "
1609 "default.)\n" 1625 "default.)\n"
1610 " -f --file=FILE : specify database file to use.\n" 1626 " -f --file=FILE : specify database file to use.\n"
@@ -1612,7 +1628,7 @@ Upstream-Status: unmaintained
1612 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " 1628 " -l --listen=addr : listen on a specific interface (in TCP/IP daemon "
1613 "mode).\n" 1629 "mode).\n"
1614 " -n --numeric : print only the temperature.\n" 1630 " -n --numeric : print only the temperature.\n"
1615@@ -124,6 +104,8 @@ 1631@@ -124,6 +104,8 @@ msgid ""
1616 " -s --separator=C : separator to use between fields (in TCP/IP daemon " 1632 " -s --separator=C : separator to use between fields (in TCP/IP daemon "
1617 "mode).\n" 1633 "mode).\n"
1618 " -S --syslog=s : log temperature to syslog every s seconds.\n" 1634 " -S --syslog=s : log temperature to syslog every s seconds.\n"
@@ -1621,7 +1637,7 @@ Upstream-Status: unmaintained
1621 " -q --quiet : do not check if the drive is supported.\n" 1637 " -q --quiet : do not check if the drive is supported.\n"
1622 " -v --version : display hddtemp version number.\n" 1638 " -v --version : display hddtemp version number.\n"
1623 " -w --wake-up : wake-up the drive if need.\n" 1639 " -w --wake-up : wake-up the drive if need.\n"
1624@@ -133,58 +115,69 @@ 1640@@ -133,58 +115,69 @@ msgid ""
1625 "Report bugs or new drives to <hddtemp@guzu.net>.\n" 1641 "Report bugs or new drives to <hddtemp@guzu.net>.\n"
1626 msgstr "" 1642 msgstr ""
1627 1643
@@ -1705,9 +1721,11 @@ Upstream-Status: unmaintained
1705 #, c-format 1721 #, c-format
1706 msgid "log sense failed : %s" 1722 msgid "log sense failed : %s"
1707 msgstr "" 1723 msgstr ""
1724Index: hddtemp-0.3-beta15/src/sata.c
1725===================================================================
1708--- hddtemp-0.3-beta15.orig/src/sata.c 1726--- hddtemp-0.3-beta15.orig/src/sata.c
1709+++ hddtemp-0.3-beta15/src/sata.c 1727+++ hddtemp-0.3-beta15/src/sata.c
1710@@ -118,11 +118,22 @@ 1728@@ -118,11 +118,22 @@ static enum e_gettemp sata_get_temperatu
1711 int i; 1729 int i;
1712 u16 * p; 1730 u16 * p;
1713 1731
@@ -1731,7 +1749,7 @@ Upstream-Status: unmaintained
1731 1749
1732 /* get SMART values */ 1750 /* get SMART values */
1733 if(sata_enable_smart(dsk->fd) != 0) { 1751 if(sata_enable_smart(dsk->fd) != 0) {
1734@@ -154,24 +165,15 @@ 1752@@ -154,24 +165,15 @@ static enum e_gettemp sata_get_temperatu
1735 } 1753 }
1736 1754
1737 /* temperature */ 1755 /* temperature */
@@ -1759,6 +1777,8 @@ Upstream-Status: unmaintained
1759 1777
1760 /* never reached */ 1778 /* never reached */
1761 } 1779 }
1780Index: hddtemp-0.3-beta15/src/satacmds.c
1781===================================================================
1762--- hddtemp-0.3-beta15.orig/src/satacmds.c 1782--- hddtemp-0.3-beta15.orig/src/satacmds.c
1763+++ hddtemp-0.3-beta15/src/satacmds.c 1783+++ hddtemp-0.3-beta15/src/satacmds.c
1764@@ -39,7 +39,7 @@ 1784@@ -39,7 +39,7 @@
@@ -1770,7 +1790,7 @@ Upstream-Status: unmaintained
1770 1790
1771 // Application specific includes 1791 // Application specific includes
1772 #include "satacmds.h" 1792 #include "satacmds.h"
1773@@ -80,8 +80,8 @@ 1793@@ -80,8 +80,8 @@ int sata_pass_thru(int device, unsigned
1774 1794
1775 ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); 1795 ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
1776 1796
@@ -1781,7 +1801,7 @@ Upstream-Status: unmaintained
1781 return 1; 1801 return 1;
1782 else 1802 else
1783 return ret; 1803 return ret;
1784@@ -95,10 +95,10 @@ 1804@@ -95,10 +95,10 @@ void sata_fixstring(unsigned char *s, in
1785 p = s; 1805 p = s;
1786 end = &s[bytecount & ~1]; /* bytecount must be even */ 1806 end = &s[bytecount & ~1]; /* bytecount must be even */
1787 1807
@@ -1794,6 +1814,8 @@ Upstream-Status: unmaintained
1794 } 1814 }
1795 1815
1796 /* strip leading blanks */ 1816 /* strip leading blanks */
1817Index: hddtemp-0.3-beta15/src/backtrace.c
1818===================================================================
1797--- hddtemp-0.3-beta15.orig/src/backtrace.c 1819--- hddtemp-0.3-beta15.orig/src/backtrace.c
1798+++ hddtemp-0.3-beta15/src/backtrace.c 1820+++ hddtemp-0.3-beta15/src/backtrace.c
1799@@ -16,9 +16,10 @@ 1821@@ -16,9 +16,10 @@
@@ -1822,7 +1844,7 @@ Upstream-Status: unmaintained
1822 1844
1823 #define MAX_BTSIZE 64 1845 #define MAX_BTSIZE 64
1824 1846
1825@@ -42,7 +47,6 @@ 1847@@ -42,7 +47,6 @@ void backtrace_handler(int n, siginfo_t
1826 static char **messages = NULL; 1848 static char **messages = NULL;
1827 static size_t btsize = 0; 1849 static size_t btsize = 0;
1828 static size_t i; 1850 static size_t i;
@@ -1830,7 +1852,7 @@ Upstream-Status: unmaintained
1830 static char *strerr = "???"; 1852 static char *strerr = "???";
1831 static FILE *fstrm; 1853 static FILE *fstrm;
1832 1854
1833@@ -61,10 +65,10 @@ 1855@@ -61,10 +65,10 @@ void backtrace_handler(int n, siginfo_t
1834 SIC_CASE(SEGV_MAPERR); 1856 SIC_CASE(SEGV_MAPERR);
1835 SIC_CASE(SEGV_ACCERR); 1857 SIC_CASE(SEGV_ACCERR);
1836 } 1858 }
@@ -1843,7 +1865,7 @@ Upstream-Status: unmaintained
1843 break; 1865 break;
1844 case SIGILL: 1866 case SIGILL:
1845 switch(ist->si_code) { 1867 switch(ist->si_code) {
1846@@ -77,10 +81,10 @@ 1868@@ -77,10 +81,10 @@ void backtrace_handler(int n, siginfo_t
1847 SIC_CASE(ILL_COPROC); 1869 SIC_CASE(ILL_COPROC);
1848 SIC_CASE(ILL_BADSTK); 1870 SIC_CASE(ILL_BADSTK);
1849 } 1871 }
@@ -1856,7 +1878,7 @@ Upstream-Status: unmaintained
1856 break; 1878 break;
1857 case SIGBUS: 1879 case SIGBUS:
1858 switch(ist->si_code) { 1880 switch(ist->si_code) {
1859@@ -88,10 +92,10 @@ 1881@@ -88,10 +92,10 @@ void backtrace_handler(int n, siginfo_t
1860 SIC_CASE(BUS_ADRERR); 1882 SIC_CASE(BUS_ADRERR);
1861 SIC_CASE(BUS_OBJERR); 1883 SIC_CASE(BUS_OBJERR);
1862 } 1884 }
@@ -1869,7 +1891,7 @@ Upstream-Status: unmaintained
1869 break; 1891 break;
1870 } 1892 }
1871 fflush(fstrm); 1893 fflush(fstrm);
1872@@ -101,7 +105,7 @@ 1894@@ -101,7 +105,7 @@ void backtrace_handler(int n, siginfo_t
1873 /* 1895 /*
1874 old_eip = *(unsigned int*)((void*)&n-4); 1896 old_eip = *(unsigned int*)((void*)&n-4);
1875 old_ebp = *(unsigned int*)((void*)&n-8); 1897 old_ebp = *(unsigned int*)((void*)&n-8);
@@ -1878,7 +1900,7 @@ Upstream-Status: unmaintained
1878 *(unsigned int*)((void*)&n-8) = puc->uc_mcontext.gregs[REG_EBP]; 1900 *(unsigned int*)((void*)&n-8) = puc->uc_mcontext.gregs[REG_EBP];
1879 1901
1880 btsize = backtrace(btinfo, MAX_BTSIZE); 1902 btsize = backtrace(btinfo, MAX_BTSIZE);
1881@@ -111,14 +115,14 @@ 1903@@ -111,14 +115,14 @@ void backtrace_handler(int n, siginfo_t
1882 */ 1904 */
1883 1905
1884 btsize = backtrace(btinfo, MAX_BTSIZE); 1906 btsize = backtrace(btinfo, MAX_BTSIZE);
@@ -1895,9 +1917,11 @@ Upstream-Status: unmaintained
1895 fflush(fstrm); 1917 fflush(fstrm);
1896 fclose(fstrm); 1918 fclose(fstrm);
1897 1919
1920Index: hddtemp-0.3-beta15/src/daemon.c
1921===================================================================
1898--- hddtemp-0.3-beta15.orig/src/daemon.c 1922--- hddtemp-0.3-beta15.orig/src/daemon.c
1899+++ hddtemp-0.3-beta15/src/daemon.c 1923+++ hddtemp-0.3-beta15/src/daemon.c
1900@@ -163,19 +163,16 @@ 1924@@ -163,19 +163,16 @@ void daemon_send_msg(struct disk *ldisks
1901 1925
1902 switch(dsk->ret) { 1926 switch(dsk->ret) {
1903 case GETTEMP_NOT_APPLICABLE: 1927 case GETTEMP_NOT_APPLICABLE:
@@ -1922,7 +1946,7 @@ Upstream-Status: unmaintained
1922 break; 1946 break;
1923 case GETTEMP_KNOWN: 1947 case GETTEMP_KNOWN:
1924 n = snprintf(msg, sizeof(msg), "%s%c%s%c%d%c%c", 1948 n = snprintf(msg, sizeof(msg), "%s%c%s%c%d%c%c",
1925@@ -185,26 +182,23 @@ 1949@@ -185,26 +182,23 @@ void daemon_send_msg(struct disk *ldisks
1926 get_unit(dsk)); 1950 get_unit(dsk));
1927 break; 1951 break;
1928 case GETTEMP_NOSENSOR: 1952 case GETTEMP_NOSENSOR:
@@ -1955,7 +1979,7 @@ Upstream-Status: unmaintained
1955 break; 1979 break;
1956 } 1980 }
1957 write(cfd,&separator, 1); 1981 write(cfd,&separator, 1);
1958@@ -222,14 +216,11 @@ 1982@@ -222,14 +216,11 @@ void daemon_syslog(struct disk *ldisks)
1959 for(dsk = ldisks; dsk; dsk = dsk->next) { 1983 for(dsk = ldisks; dsk; dsk = dsk->next) {
1960 switch(dsk->ret) { 1984 switch(dsk->ret) {
1961 case GETTEMP_KNOWN: 1985 case GETTEMP_KNOWN:
@@ -1972,7 +1996,7 @@ Upstream-Status: unmaintained
1972 break; 1996 break;
1973 case GETTEMP_DRIVE_SLEEP: 1997 case GETTEMP_DRIVE_SLEEP:
1974 syslog(LOG_WARNING, _("%s: %s: drive is sleeping"), 1998 syslog(LOG_WARNING, _("%s: %s: drive is sleeping"),
1975@@ -270,28 +261,30 @@ 1999@@ -270,28 +261,30 @@ void do_daemon_mode(struct disk *ldisks)
1976 fd_set deffds; 2000 fd_set deffds;
1977 time_t next_time; 2001 time_t next_time;
1978 2002
@@ -2025,9 +2049,11 @@ Upstream-Status: unmaintained
2025 } 2049 }
2026 chdir("/"); 2050 chdir("/");
2027 umask(0); 2051 umask(0);
2052Index: hddtemp-0.3-beta15/src/hddtemp.c
2053===================================================================
2028--- hddtemp-0.3-beta15.orig/src/hddtemp.c 2054--- hddtemp-0.3-beta15.orig/src/hddtemp.c
2029+++ hddtemp-0.3-beta15/src/hddtemp.c 2055+++ hddtemp-0.3-beta15/src/hddtemp.c
2030@@ -75,7 +75,7 @@ 2056@@ -75,7 +75,7 @@ char * listen_addr;
2031 char separator = SEPARATOR; 2057 char separator = SEPARATOR;
2032 2058
2033 struct bustype * bus[BUS_TYPE_MAX]; 2059 struct bustype * bus[BUS_TYPE_MAX];
@@ -2036,7 +2062,7 @@ Upstream-Status: unmaintained
2036 2062
2037 static enum { DEFAULT, CELSIUS, FAHRENHEIT } unit; 2063 static enum { DEFAULT, CELSIUS, FAHRENHEIT } unit;
2038 2064
2039@@ -194,23 +194,7 @@ 2065@@ -194,23 +194,7 @@ static void display_temperature(struct d
2040 if (numeric && quiet) 2066 if (numeric && quiet)
2041 printf("0\n"); 2067 printf("0\n");
2042 else 2068 else
@@ -2061,7 +2087,7 @@ Upstream-Status: unmaintained
2061 2087
2062 break; 2088 break;
2063 case GETTEMP_KNOWN: 2089 case GETTEMP_KNOWN:
2064@@ -232,14 +216,14 @@ 2090@@ -232,14 +216,14 @@ static void display_temperature(struct d
2065 if (numeric && quiet) 2091 if (numeric && quiet)
2066 printf("0\n"); 2092 printf("0\n");
2067 else 2093 else
@@ -2078,7 +2104,7 @@ Upstream-Status: unmaintained
2078 2104
2079 break; 2105 break;
2080 default: 2106 default:
2081@@ -268,8 +252,9 @@ 2107@@ -268,8 +252,9 @@ void do_direct_mode(struct disk *ldisks)
2082 2108
2083 int main(int argc, char* argv[]) { 2109 int main(int argc, char* argv[]) {
2084 int i, c, lindex = 0, db_loaded = 0; 2110 int i, c, lindex = 0, db_loaded = 0;
@@ -2089,16 +2115,16 @@ Upstream-Status: unmaintained
2089 2115
2090 backtrace_sigsegv(); 2116 backtrace_sigsegv();
2091 backtrace_sigill(); 2117 backtrace_sigill();
2092@@ -279,7 +264,7 @@ 2118@@ -283,7 +268,7 @@ int main(int argc, char* argv[]) {
2093 bindtextdomain (PACKAGE, LOCALEDIR);
2094 textdomain (PACKAGE); 2119 textdomain (PACKAGE);
2120 #endif
2095 2121
2096- show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0; 2122- show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0;
2097+ show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0; 2123+ show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0;
2098 unit = DEFAULT; 2124 unit = DEFAULT;
2099 portnum = PORT_NUMBER; 2125 portnum = PORT_NUMBER;
2100 listen_addr = NULL; 2126 listen_addr = NULL;
2101@@ -294,6 +279,7 @@ 2127@@ -298,6 +283,7 @@ int main(int argc, char* argv[]) {
2102 {"drivebase", 0, NULL, 'b'}, 2128 {"drivebase", 0, NULL, 'b'},
2103 {"debug", 0, NULL, 'D'}, 2129 {"debug", 0, NULL, 'D'},
2104 {"file", 1, NULL, 'f'}, 2130 {"file", 1, NULL, 'f'},
@@ -2106,7 +2132,7 @@ Upstream-Status: unmaintained
2106 {"listen", 1, NULL, 'l'}, 2132 {"listen", 1, NULL, 'l'},
2107 {"version", 0, NULL, 'v'}, 2133 {"version", 0, NULL, 'v'},
2108 {"port", 1, NULL, 'p'}, 2134 {"port", 1, NULL, 'p'},
2109@@ -305,7 +291,7 @@ 2135@@ -309,7 +295,7 @@ int main(int argc, char* argv[]) {
2110 {0, 0, 0, 0} 2136 {0, 0, 0, 0}
2111 }; 2137 };
2112 2138
@@ -2115,7 +2141,7 @@ Upstream-Status: unmaintained
2115 if (c == -1) 2141 if (c == -1)
2116 break; 2142 break;
2117 2143
2118@@ -382,12 +368,13 @@ 2144@@ -386,12 +372,13 @@ int main(int argc, char* argv[]) {
2119 " (done for every drive supplied).\n" 2145 " (done for every drive supplied).\n"
2120 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by default.)\n" 2146 " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by default.)\n"
2121 " -f --file=FILE : specify database file to use.\n" 2147 " -f --file=FILE : specify database file to use.\n"
@@ -2130,7 +2156,7 @@ Upstream-Status: unmaintained
2130 " -q --quiet : do not check if the drive is supported.\n" 2156 " -q --quiet : do not check if the drive is supported.\n"
2131 " -v --version : display hddtemp version number.\n" 2157 " -v --version : display hddtemp version number.\n"
2132 " -w --wake-up : wake-up the drive if need.\n" 2158 " -w --wake-up : wake-up the drive if need.\n"
2133@@ -418,6 +405,9 @@ 2159@@ -422,6 +409,9 @@ int main(int argc, char* argv[]) {
2134 } 2160 }
2135 } 2161 }
2136 break; 2162 break;
@@ -2140,7 +2166,7 @@ Upstream-Status: unmaintained
2140 default: 2166 default:
2141 exit(1); 2167 exit(1);
2142 } 2168 }
2143@@ -489,6 +479,7 @@ 2169@@ -493,6 +483,7 @@ int main(int argc, char* argv[]) {
2144 if( (dsk->fd = open(dsk->drive, O_RDONLY | O_NONBLOCK)) < 0) { 2170 if( (dsk->fd = open(dsk->drive, O_RDONLY | O_NONBLOCK)) < 0) {
2145 snprintf(dsk->errormsg, MAX_ERRORMSG_SIZE, "open: %s\n", strerror(errno)); 2171 snprintf(dsk->errormsg, MAX_ERRORMSG_SIZE, "open: %s\n", strerror(errno));
2146 dsk->type = ERROR; 2172 dsk->type = ERROR;
@@ -2148,7 +2174,7 @@ Upstream-Status: unmaintained
2148 continue; 2174 continue;
2149 } 2175 }
2150 2176
2151@@ -501,6 +492,7 @@ 2177@@ -505,6 +496,7 @@ int main(int argc, char* argv[]) {
2152 2178
2153 ldisks = dsk->next; 2179 ldisks = dsk->next;
2154 free(dsk); 2180 free(dsk);
@@ -2156,7 +2182,7 @@ Upstream-Status: unmaintained
2156 continue; 2182 continue;
2157 } 2183 }
2158 2184
2159@@ -514,11 +506,17 @@ 2185@@ -518,11 +510,17 @@ int main(int argc, char* argv[]) {
2160 db_loaded = 1; 2186 db_loaded = 1;
2161 } 2187 }
2162 2188
@@ -2177,16 +2203,18 @@ Upstream-Status: unmaintained
2177 } 2203 }
2178 } 2204 }
2179 2205
2180@@ -530,5 +528,5 @@ 2206@@ -534,5 +532,5 @@ int main(int argc, char* argv[]) {
2181 do_direct_mode(ldisks); 2207 do_direct_mode(ldisks);
2182 } 2208 }
2183 2209
2184- return 0; 2210- return 0;
2185+ return ret; 2211+ return ret;
2186 } 2212 }
2213Index: hddtemp-0.3-beta15/src/ata.c
2214===================================================================
2187--- hddtemp-0.3-beta15.orig/src/ata.c 2215--- hddtemp-0.3-beta15.orig/src/ata.c
2188+++ hddtemp-0.3-beta15/src/ata.c 2216+++ hddtemp-0.3-beta15/src/ata.c
2189@@ -75,7 +75,7 @@ 2217@@ -75,7 +75,7 @@ static enum e_gettemp ata_get_temperatur
2190 int i; 2218 int i;
2191 u16 * p; 2219 u16 * p;
2192 2220
@@ -2195,7 +2223,7 @@ Upstream-Status: unmaintained
2195 close(dsk->fd); 2223 close(dsk->fd);
2196 dsk->fd = -1; 2224 dsk->fd = -1;
2197 return GETTEMP_NOSENSOR; 2225 return GETTEMP_NOSENSOR;
2198@@ -140,24 +140,15 @@ 2226@@ -140,24 +140,15 @@ static enum e_gettemp ata_get_temperatur
2199 */ 2227 */
2200 2228
2201 /* temperature */ 2229 /* temperature */
@@ -2224,9 +2252,11 @@ Upstream-Status: unmaintained
2224 2252
2225 /* never reached */ 2253 /* never reached */
2226 } 2254 }
2255Index: hddtemp-0.3-beta15/src/hddtemp.h
2256===================================================================
2227--- hddtemp-0.3-beta15.orig/src/hddtemp.h 2257--- hddtemp-0.3-beta15.orig/src/hddtemp.h
2228+++ hddtemp-0.3-beta15/src/hddtemp.h 2258+++ hddtemp-0.3-beta15/src/hddtemp.h
2229@@ -39,8 +39,6 @@ 2259@@ -39,8 +39,6 @@ enum e_gettemp {
2230 GETTEMP_ERROR, /* Error */ 2260 GETTEMP_ERROR, /* Error */
2231 GETTEMP_NOT_APPLICABLE, /* */ 2261 GETTEMP_NOT_APPLICABLE, /* */
2232 GETTEMP_UNKNOWN, /* Drive is not in database */ 2262 GETTEMP_UNKNOWN, /* Drive is not in database */
@@ -2235,7 +2265,7 @@ Upstream-Status: unmaintained
2235 GETTEMP_KNOWN, /* Drive appear in database */ 2265 GETTEMP_KNOWN, /* Drive appear in database */
2236 GETTEMP_NOSENSOR, /* Drive appear in database but is known to have no sensor */ 2266 GETTEMP_NOSENSOR, /* Drive appear in database but is known to have no sensor */
2237 GETTEMP_DRIVE_SLEEP /* Drive is sleeping */ 2267 GETTEMP_DRIVE_SLEEP /* Drive is sleeping */
2238@@ -78,7 +76,7 @@ 2268@@ -78,7 +76,7 @@ struct bustype {
2239 2269
2240 extern struct bustype * bus[BUS_TYPE_MAX]; 2270 extern struct bustype * bus[BUS_TYPE_MAX];
2241 extern char errormsg[MAX_ERRORMSG_SIZE]; 2271 extern char errormsg[MAX_ERRORMSG_SIZE];
@@ -2244,9 +2274,11 @@ Upstream-Status: unmaintained
2244 extern char separator; 2274 extern char separator;
2245 extern long portnum, syslog_interval; 2275 extern long portnum, syslog_interval;
2246 extern char * listen_addr; 2276 extern char * listen_addr;
2277Index: hddtemp-0.3-beta15/src/scsicmds.c
2278===================================================================
2247--- hddtemp-0.3-beta15.orig/src/scsicmds.c 2279--- hddtemp-0.3-beta15.orig/src/scsicmds.c
2248+++ hddtemp-0.3-beta15/src/scsicmds.c 2280+++ hddtemp-0.3-beta15/src/scsicmds.c
2249@@ -147,6 +147,7 @@ 2281@@ -147,6 +147,7 @@ int scsi_inquiry(int device, unsigned ch
2250 return 1; 2282 return 1;
2251 else { 2283 else {
2252 scsi_fixstring(buffer + 8, 24); 2284 scsi_fixstring(buffer + 8, 24);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 06:17:07 +0000