From cac37f0cdbd9fba64e2689059723dc5a3a7c233f Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 1 Mar 2022 20:09:49 +0100 Subject: [PATCH] updated to 7.3 --- .gitignore | 1 + drivedb.h | 173 ++++++++++++++++++++++-------- smartmontools-7.2-capnotify.patch | 32 ------ smartmontools-7.2-permsfix.patch | 38 ------- smartmontools.spec | 11 +- sources | 2 +- 6 files changed, 137 insertions(+), 120 deletions(-) delete mode 100644 smartmontools-7.2-capnotify.patch delete mode 100644 smartmontools-7.2-permsfix.patch diff --git a/.gitignore b/.gitignore index a5c4823..ae2c236 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ smartmontools-5.39.1.tar.gz /smartmontools-7.0.tar.gz /smartmontools-7.1.tar.gz /smartmontools-7.2.tar.gz +/smartmontools-7.3.tar.gz diff --git a/drivedb.h b/drivedb.h index 1c178d3..f22d5b1 100644 --- a/drivedb.h +++ b/drivedb.h @@ -4,7 +4,7 @@ * Home page of code is: https://www.smartmontools.org * * Copyright (C) 2003-11 Philip Williams, Bruce Allen - * Copyright (C) 2008-21 Christian Franke + * Copyright (C) 2008-22 Christian Franke * * SPDX-License-Identifier: GPL-2.0-or-later */ @@ -68,7 +68,7 @@ /* const drive_settings builtin_knowndrives[] = { */ - { "VERSION: 7.2/5236 2021-09-14 13:17:47 $Id$", + { "VERSION: 7.3/5319 2022-02-19 17:48:34 $Id$", "-", "-", "Version information", "" @@ -477,6 +477,36 @@ const drive_settings builtin_knowndrives[] = { "-v 253,raw48,Unkn_CrucialMicron_Attr " // M6CR030 "-v 254,raw48,Unkn_CrucialMicron_Attr" // M6CR030 }, + { "Lexar 128GB SSD", // for other Lexar drives see ticket #1529 + "Lexar 128GB SSD", // Lexar 128GB SSD/H190117D + "", "", + "-v 5,raw48,New_Bad_Blk_Cnt " + //"-v 9,raw24(raw8),Power_On_Hours " + //"-v 12,raw48,Power_Cycle_Count " + "-v 167,raw48,SSD_Protect_mode " + "-v 168,raw48,SATA_PHY_Error_Cnt " + "-v 169,raw48,Bad_Block_Cnt " + "-v 171,raw48,Program_Fail_Cnt " + "-v 172,raw48,Erase_Fail_Cnt " + "-v 173,raw48,Erase_Cnt " + "-v 175,raw48,Bad_Cluster_Cnt " + "-v 177,raw48,Read_Retry_Cnt " + "-v 180,raw48,Spare_Blk_Cnt_Left " + //"-v 187,raw48,Reported_Uncorrect " + //"-v 192,raw48,Power-Off_Retract_Count " + //"-v 194,tempminmax,Temperature_Celsius " + //"-v 199,raw48,UDMA_CRC_Error_Count " + "-v 206,raw48,Min_Erase_Cnt " + "-v 207,raw48,Max_Erase_Cnt " + "-v 208,raw48,Avg_Erase_Cnt " + "-v 209,raw48,SLC_Min_Erase_Cnt " + "-v 210,raw48,SLC_Max_Erase_Cnt " + "-v 211,raw48,SLC_Avg_Erase_Cnt " + "-v 231,raw48,SSD_Life_Left " + //"-v 241,raw48,Total_LBAs_Written " + //"-v 242,raw48,Total_LBAs_Read " + "-v 245,raw48,Bit_Error_Cnt " + }, // Reference: https://www.micron.com/resource-details/feec878a-265e-49a7-8086-15137c5f9011 // TN-FD-34: 5100 SSD SMART Implementation { "Micron 5100 Pro / 52x0 / 5300 SSDs", @@ -741,16 +771,15 @@ const drive_settings builtin_knowndrives[] = { // SSD Smartbuy 240GB/SBFM91.1, SSD Smartbuy 64GB/SBFM21.1 "SSD PHISON 256GB PS3110-S10C|" // tested with SSD PHISON 256GB PS3110-S10C/SAFM12.2 "SSDPR-CX400-(128|256|512|1024)|" // Goodram CX400, tested with SSDPR-CX400-512/SBFM61.3 + "TEAM L3 EVO SSD (120|240|480|960)GB|" // TEAM L3 EVO SSD 120GB/SBFM11.0 "SSM28(128|256|512)GPTCB3B-S11[24]61[123]", // tested with SSM28256GPTCB3B-S112612/SBFM61.2 "", "", //"-v 1,raw48,Raw_Read_Error_Rate " "-v 2,raw48,Not_In_Use " "-v 3,raw48,Not_In_Use " - "-v 5,raw48,Not_In_Use " + "-v 5,raw48,Retired_Block_Count " "-v 7,raw48,Not_In_Use " "-v 8,raw48,Not_In_Use " - //"-v 9,raw24(raw8),Power_On_Hours " - "-v 5,raw48,Retired_Block_Count " //"-v 9,raw24(raw8),Power_On_Hours " "-v 10,raw48,Not_In_Use " //"-v 12,raw48,Power_Cycle_Count " @@ -799,11 +828,9 @@ const drive_settings builtin_knowndrives[] = { //"-v 1,raw48,Raw_Read_Error_Rate " "-v 2,raw48,Not_In_Use " "-v 3,raw48,Not_In_Use " - "-v 5,raw48,Not_In_Use " + "-v 5,raw48,Retired_Block_Count " "-v 7,raw48,Not_In_Use " "-v 8,raw48,Not_In_Use " - //"-v 9,raw24(raw8),Power_On_Hours " - "-v 5,raw48,Retired_Block_Count " //"-v 9,raw24(raw8),Power_On_Hours " "-v 10,raw48,Not_In_Use " //"-v 12,raw48,Power_Cycle_Count " @@ -1418,7 +1445,8 @@ const drive_settings builtin_knowndrives[] = { }, { "Intel 545s Series SSDs", // tested with INTEL SSDSCKKW512G8, INTEL SSDSC2KW512G8/LHF002C // SSDSCKKW128G8X1, SSDSCKKW256G8X1, SSDSCKKW512G8X1, SSDSCKKW010T8X1 - "INTEL SSDSC[2K]KW(128G|256G|512G|010T)8.*", + // INTEL SSDSCKKF512G8 SATA 512GB/LHFD05N + "INTEL SSDSC[2K]K[WF](128G|256G|512G|010T)8.*", "", "", //"-v 5,raw16(raw16),Reallocated_Sector_Ct " //"-v 9,raw24(raw8),Power_On_Hours " @@ -1597,7 +1625,8 @@ const drive_settings builtin_knowndrives[] = { { "Intel S4510/S4610/S4500/S4600 Series SSDs", // INTEL SSDSC2KB480G7/SCV10100, // INTEL SSDSC2KB960G7/SCV10100, INTEL SSDSC2KB038T7/SCV10100, // INTEL SSDSC2KB038T7/SCV10121, INTEL SSDSC2KG240G7/SCV10100 - "INTEL SSDSC(2K|KK)(B|G)(240G|480G|960G|019T|038T)(7|8).?", + // INTEL SSDSC2KB480GZ/7CV10100 + "INTEL SSDSC(2K|KK)(B|G)(240G|480G|960G|019T|038T)(7|8|Z).?", "", "", //"-v 5,raw16(raw16),Reallocated_Sector_Ct " //"-v 9,raw24(raw8),Power_On_Hours " @@ -1687,11 +1716,11 @@ const drive_settings builtin_knowndrives[] = { "-v 171,raw48,Program_Fail_Count " "-v 172,raw48,Erase_Fail_Count " "-v 174,raw48,Unexpect_Power_Loss_Ct " - //"-v 175,raw48,Program_Fail_Count_Chip,SSD " - //"-v 176,raw48,Erase_Fail_Count_Chip,SSD " - //"-v 177,raw48,Wear_Leveling_Count,SSD " - //"-v 178,raw48,Used_Rsvd_Blk_Cnt_Chip,SSD " - //"-v 180,raw48,Unused_Rsvd_Blk_Cnt_Tot,SSD " + //"-v 175,raw48,Program_Fail_Count_Chip " + //"-v 176,raw48,Erase_Fail_Count_Chip " + //"-v 177,raw48,Wear_Leveling_Count " + //"-v 178,raw48,Used_Rsvd_Blk_Cnt_Chip " + //"-v 180,raw48,Unused_Rsvd_Blk_Cnt_Tot " //"-v 183,raw48,Runtime_Bad_Block " //"-v 187,raw48,Reported_Uncorrect " //"-v 194,tempminmax,Temperature_Celsius " @@ -1779,8 +1808,8 @@ const drive_settings builtin_knowndrives[] = { // PX-128M5M/1.05, PX-128M5S/1.05, PX-128M5Pro/1.05, PX-512M5Pro/1.06, PX-256M5P/1.01, PX-128M6S/1.03 // (1.04/5 Firmware self-test log lifetime unit is bogus, possibly 1/256 hours) // PLEXTOR PX-256M6S+/1.00, PLEXTOR PX-128M3/1.00, PLEXTOR PX-128M3/1.07, PLEXTOR PX-128M6V/1.04, - // PLEXTOR PX-128M6G-2242/1.01, PLEXTOR PX-512M7VC/1.05 - "PLEXTOR ?PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[GMSV]|7VC)(\\+|-.*)?", + // PLEXTOR PX-128M6G-2242/1.01, PLEXTOR PX-512M7VC/1.05, PLEXTOR PX-512M8VC +/1.00 + "PLEXTOR ?PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[GMSV]|[78]VC)(\\+|-.*| )?", "", "", //"-v 1,raw48,Raw_Read_Error_Rate " //"-v 5,raw16(raw16),Reallocated_Sector_Ct " @@ -1931,7 +1960,8 @@ const drive_settings builtin_knowndrives[] = { "SanDisk SD7S[BN]6S-?(128|256|512)G(1122|-1006)|" // X300 (88SS9189?), tested with // SanDisk SD7SB6S128G1122/X3310000, SanDisk SD7SN6S-512G-1006/X3511006 "SanDisk SD8S[BN]8U-?((128|256|512)G|1T00)(1122|-1006)|" // X400 (88SS1074), tested with SanDisk SD8SB8U128G1122/X4120000 - "SanDisk SD9S[BN]8W-?((128|256|512)G|[12]T00)1122|" // X600, tested with SanDisk SD9SB8W128G1122/X6107000 + "SanDisk SD9S[BN]8W-?((128|256|512)G|[12]T00)(1122|-1006)|" // X600, tested with SanDisk SD9SB8W128G1122/X6107000, SD9SB8W-512G-1006/X6103006 + // SanDisk SD9SB8W1T001122/X6107000, SD9SB8W256G1122/X6107000 "SanDisk SDSSDA-((120|240|480)G|[12]T00)|" // Plus, tested with SanDisk SDSSDA-2T00/411040RL "SanDisk SDSSDHP[0-9]*G|" // Ultra Plus (88SS9175), tested with SanDisk SDSSDHP128G/X23[01]6RL "SanDisk (SDSSDHII|Ultra II )[0-9]*GB?|" // Ultra II (88SS9190/88SS9189), tested with @@ -1943,8 +1973,9 @@ const drive_settings builtin_knowndrives[] = { "SanDisk SDSSDXPS?[0-9]*G|" // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311, // SanDisk SDSSDXPS480G/X21200RL "SanDisk SSD G5 BICS4|" // WD Blue SSD WDS100T2B0A (#1378), tested with SanDisk SSD G5 BICS4/415000WD - "SanDisk SSD PLUS (120|240|480|1000) ?GB|" // Plus (88SS1074), tested with SanDisk SSD PLUS 120 GB/UE3000RL, + "SanDisk SSD PLUS (120|240|480|[12]000) ?GB|" // Plus (88SS1074), tested with SanDisk SSD PLUS 120 GB/UE3000RL, // SanDisk SSD PLUS 120 GB/UE4500RL, SanDisk SSD PLUS 1000GB/UH4400RL + // SanDisk SSD PLUS 2000GB/UP4504RL "SSD SATAIII 16GB", // SSD SATAIII 16GB/i221100 (see #923) "", "", //"-v 5,raw16(raw16),Reallocated_Sector_Ct " @@ -2157,6 +2188,25 @@ const drive_settings builtin_knowndrives[] = { //"-v 250,raw48,Read_Error_Retry_Rate " // ADATA SU800/Q0913A "-v 251,raw48,Unkn_SiliconMotion_Attr" // ADATA SU800/Q0913A }, + // Supermicro SSD-DM032-SMCMVN1, tested with SuperMicro SSD/SOB20R, see (#1380) + { "Supermicro SATA DOM (SuperDOM)", + "SuperMicro SSD", + "", "", + "-v 1,raw48,Raw_Read_Error_Rate " + "-v 15,raw48,User_Cpcty_Sector_Cnt " + "-v 160,raw48,Not_In_Use " + "-v 161,raw48,Not_In_Use " + "-v 163,raw48,Not_In_Use " + "-v 164,raw48,Not_In_Use " + "-v 165,raw48,Not_In_Use " + "-v 166,raw48,Minimum_PE_Cycles_TLC " + "-v 167,raw48,Not_In_Use " + "-v 168,raw48,Maximum_PE_Cycles_TLC " + "-v 231,raw48,SSD_Life_Left " + "-v 233,raw48,NAND_Writes_1GiB " + "-v 241,raw48,Lifetime_Writes_GiB " + "-v 242,raw48,Lifetime_Reads_GiB " + }, { "Silicon Motion based OEM SSDs", // Like 'Silicon Motion based SSDs' but with FW detection "240GB|" // from Lenovo T430 Thinkpad, tested with 240GB/P0510E "Dogfish SSD (128|256|512)GB|" // tested with Dogfish SSD 128GB/S1211A0 @@ -2170,8 +2220,7 @@ const drive_settings builtin_knowndrives[] = { // SATA3 1TB SSD/S1230A0, // KingDian S370, tested with SATA3 128GB SSD/T0311A0, SATA3 256GB SSD/S1127B0 // KingDian S280, tested with SATA3 240GB SSD/T0519A0 - "SPCC M\\.2 SSD|" // Silicon Power 2280 M55, tested with SPCC M.2 SSD/Q0627A0 - "SuperMicro SSD", // Supermicro SSD-DM032-SMCMVN1, tested with SuperMicro SSD/SOB20R + "SPCC M\\.2 SSD", // Silicon Power 2280 M55, tested with SPCC M.2 SSD/Q0627A0 "KFS03005|P0510E|P0725A|Q(0627|1107)A0|R0817B0|S(0618|1211|1230)A0|S1127B0|SOB20R|T0(311|519)A0", "", "-v 148,raw48,Total_SLC_Erase_Ct " @@ -2784,6 +2833,11 @@ const drive_settings builtin_knowndrives[] = { "ST(1500|2000)LM00[58] HN-M[0-9]*AAD", "", "", "" }, + { "Seagate FreePlay", // tested with ST1500LM003-9YH148/CC94 + // from FreeAgent GoFlex Enclosure. + "ST(1500LM003|1000LM010|1000LM002)-.*", + "", "", "" + }, { "SAMSUNG SpinPoint MP5", // tested with HM250HJ/2AK10001 "SAMSUNG HM(250H|320H|500J|640J)J", "", "", "" @@ -2809,17 +2863,24 @@ const drive_settings builtin_knowndrives[] = { "", "", "" }, { "SK hynix SATA SSDs", - "SK ?hynix SC(210|300|308|311|313).*|" // tested with + "SK ?hynix (SC(210|300|308|311|313|401)|SH920) .*|" // tested with // SK hynix SC210 mSATA 256GB/20002L00, // SKhynix SC300 HFS256G32MND-3210A/20131P00, // SK hynix SC308 SATA 128GB/30001P10, // SK hynix SC311 SATA 512GB/70000P10, - // SK hynix SC313 HFS256G32TNF-N3A0A/70000P10 - "HFS(128|256|512)G3[29]MND-(2200|3[23]10)A|" // HFS128G32MND-2200A/20200L00, - // HFS512G32MND-3210A/20100P00, HFS512G39MND-3310A/20002P00 + // SK hynix SC313 HFS256G32TNF-N3A0A/70000P10, + // SK hynix SC401 SATA 512GB/90000121, + // SK hynix SH920 mSATA 256GB/1010BL00 + "HFS(128|256|512)G3[29A]MN[BD]-(2200|3[23]10)A|" // SC210, tested with + // HFS128G32MND-2200A/20200L00, HFS512G32MND-3210A/20100P00, + // HFS512G39MND-3310A/20002P00, HFS256G3AMNB-2200A/1010BL00 + "HFS(128|256|512)G3[29]MND-3(312|510)A|" // SC300, tested with HFS256G32MND-3312A/20001P00, + // HFS512G39MND-3510A/20400P00 + "HFS(128|256|512)G39TND-N210A|" // SC308, tested with HFS128G39TND-N210A/30001P10 "HFS(120|250|500)G32TND-N1A2A|" // SL308, tested with HFS500G32TND-N1A2A/30000P10 - "HFS(128|256|512)G39MND-3510A|" // SC300, tested with HFS512G39MND-3510A/20400P00 - "HFS(128|256|512)G39TND-N210A", // SC308, tested with HFS128G39TND-N210A/30001P10 + "HFS(128|256|512)G39TND-N210A|" // SC308, tested with HFS128G39TND-N210A/30001P10 + "HFS(128|256|512)G32TNF-N3A0A|" // SC313, tested with HFS256G32TNF-N3A0A/70000P10 + "SHGS31-(250|500|1000)GS-2", // S31, tested with SHGS31-1000GS-2/90000Q00 "", "", //"-v 1,raw48,Raw_Read_Error_Rate " "-v 5,raw48,Retired_Block_Count " @@ -2844,6 +2905,7 @@ const drive_settings builtin_knowndrives[] = { //"-v 184,raw48,End-to-End_Error " //"-v 187,raw48,Reported_Uncorrect " //"-v 188,raw48,Command_Timeout " + "-v 191,raw48,Unknown_SK_hynix_Attrib " // SC210 //"-v 194,tempminmax,Temperature_Celsius " //"-v 195,raw48,Hardware_ECC_Recovered " //"-v 196,raw16(raw16),Reallocated_Event_Count " @@ -2854,9 +2916,12 @@ const drive_settings builtin_knowndrives[] = { "-v 212,raw48,Phy_Error_Count " "-v 231,raw48,SSD_Life_Left " "-v 234,raw48,Unknown_SK_hynix_Attrib " - "-v 241,raw48,Total_Writes_GiB " - "-v 242,raw48,Total_Reads_GiB " + "-v 236,raw48,Unknown_SK_hynix_Attrib " // SC313 + "-v 238,raw48,Unknown_SK_hynix_Attrib " // SC401 + "-v 241,raw48,Total_Writes_GB " // SC31: ~GB, not GiB (#1517) + "-v 242,raw48,Total_Reads_GB " "-v 243,raw48,Total_Media_Writes " + "-v 249,raw48,Unknown_SK_hynix_Attrib " // SC313 "-v 250,raw48,Read_Retry_Count " }, { "SK hynix SATA SSDs", @@ -3544,14 +3609,27 @@ const drive_settings builtin_knowndrives[] = { "", "", "-v 22,raw48,Helium_Level" }, - { "Western Digital Ultrastar DC HC530", // tested with WDC WUH721414ALE6L4/LDGNW07G - "WDC ?WUH721414ALE6L4", + { "Western Digital Ultrastar DC HC530", // tested with + // WDC WUH721414ALE604/LDAZW110, WDC WUH721414ALE6L4/LDGNW07G + "WDC ?WUH721414ALE6[0L]4", "", "", "-v 22,raw48,Helium_Level" }, { "Western Digital Ultrastar DC HC550", // tested with WDC WUH721818ALE6L4/PCGNW110, - // WUH721818ALE6L4/PCGAW232 - "(WDC ?)?WUH72181[68]ALE6L[14]", + // WUH721818ALE6L4/PCGAW232, WDC WUH721818ALN6L4/PCGNW088 + "(WDC ?)?WUH72181[68]AL[EN]6[0L][0146]", + "", "", + "-v 22,raw48,Helium_Level" + }, + { "Western Digital Ultrastar DC HC560", // tested with WDC WUH722020ALN604/PQGNW108 + "(WDC ?)?WUH722020AL[EN]6[0L][014]", + "", "", + "-v 22,raw48,Helium_Level " + "-v 82,raw16,Head_Health_Score " + "-v 90,hex48,NAND_Master" + }, + { "Western Digital Ultrastar DC HC650", // tested with WDC WSH722020ALE6L0/PCGMT421 + "(WDC ?)?WSH7220(20|VC)AL[EN]6[0L][0146]", "", "", "-v 22,raw48,Helium_Level" }, @@ -4624,6 +4702,10 @@ const drive_settings builtin_knowndrives[] = { "WDC WD(12|16|25|32)00SB-.*", "", "", "" }, + { "Western Digital PiDrive Foundation Edition", // WDC WD3750LMCW-11D9GS3 + "WDC WD(3750|2500)LMCW-.*", + "", "", "" + }, { "Western Digital Caviar Serial ATA", "WDC WD(4|8|20|32)00BD-.*", "", "", "" @@ -4725,7 +4807,7 @@ const drive_settings builtin_knowndrives[] = { "WDC WD((500|640)1AAL|7501AA[EL]|1001FA[EL]|2001FAS)S-.*|" "WDC WD(2002|7502|1502|5003|1002|5002)(FAE|AAE|AZE|AAL)X-.*", // could be // WD2002FAEX, WD7502AAEX, WD1502FAEX, WD5003AZEX, WD1002FAEX, WD5002AALX - "", "", "" + "", "", "-F xerrorlba" // WDC WD6401AALS-00L3B2/01.03B01 (ticket #1558) }, { "Western Digital Black", // tested with // WDC WD1003FZEX-00MK2A0/01.01A01, WDC WD3001FAEX-00MJRA0/01.01L01, @@ -4825,10 +4907,11 @@ const drive_settings builtin_knowndrives[] = { "", "", "" }, { "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81, - // WDC WD6002FFWX-68TZ4N0/83.H0A83, WDC WD101KFBX-68R56N0/83.H0A03 - "WDC WD([2-68]00[123]FF[BSW]|101KFB)X-.*", + // WDC WD6002FFWX-68TZ4N0/83.H0A83, WDC WD101KFBX-68R56N0/83.H0A03, + // WDC WD102KFBX-68M95N0/83.00A83 + "WDC WD([2-68]00[123]FF[BSW]|10[12]KFB)X-.*", "", "", - "-v 22,raw48,Helium_Level" // WD101KFBX + "-v 22,raw48,Helium_Level" // WD101KFBX (but not WD102KFBX) }, { "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80, // WDC WD40PURZ-85TTDY0/80.00A80 @@ -4840,10 +4923,11 @@ const drive_settings builtin_knowndrives[] = { // WDC WD2005FBYZ-01YCBB2/RR07, WDC WD4002FYYZ-01B7CB0/01.01M02, // WDC WD4003FRYZ-01F0DB0/01.01H01, WDC WD6003FRYZ-01F0DB0/01.01H01, // WDC WD8003FRYZ-01JPDB1/01.01H02, WDC WD8004FRYZ-01VAEB0/01.01H01, - // WDC WD102KRYZ-01A5AB0/01.01H01, WDC WD121KRYZ-01W0RB0/01.01H01 - "WDC WD([12]005FB|4002FY|4003FR|600[23]FR|800[234]FR|(1[02]1|102)KR)YZ-.*", + // WDC WD102KRYZ-01A5AB0/01.01H01, WDC WD121KRYZ-01W0RB0/01.01H01, + // WDC WD141KRYZ-01C66B0/01.01H01 + "WDC WD([12]005FB|4002FY|4003FR|600[23]FR|800[234]FR|(1[024]1|102)KR)YZ-.*", "", "", - "-v 22,raw48,Helium_Level" // WD121KRYZ + "-v 22,raw48,Helium_Level" // WD121KRYZ, WD141KRYZ }, { "Western Digital Blue Mobile", // tested with WDC WD5000LPVX-08V0TT2/03.01A03, // WDC WD10JPVX-75JC3T0/0301A03, WDC WD10JPVX-22JC3T0/01.01A01, @@ -4888,8 +4972,11 @@ const drive_settings builtin_knowndrives[] = { // WDC WD20NMVW-59AV3S3/01.01A01 (0x1058:0x107d), // WDC WD30NMVW-11C3NS4/01.01A01, // WDC WD40NMZW-11GX6S1/01.01A01 (0x1058:0x2599/25e2/25fa) + // WDC WD50NDZW-11A8JS1/01.01A01 (0x1058:0x2627) // WDC WD50NDZW-11MR8S1/02.01A02 - "WDC WD((5000[LK]|7500[BK]|10[JST]|[234]0N)M|50ND)[VZ][VW]-.*", // *W-* = USB 3.0 + // WDC WD40NDZM-59A8KS1/01.01A01 + "WDC WD((5000[LK]|7500[BK]|10[JST]|[234]0N)M|50ND|40ND)[VZ][VWM]-.*", // *W-* = USB 3.0 + // Model numbers with "M" suffix denote the use of USB-C receptacles instead of Micro-B. "", "", "" }, { "Quantum Bigfoot", // tested with TS10.0A/A21.0G00, TS12.7A/A21.0F00 @@ -5811,7 +5898,7 @@ const drive_settings builtin_knowndrives[] = { }, { "USB: ; JMicron JMS578", // USB->SATA "0x152d:0x0578", - "", // 0x0100 + "", // 0x0100, 0x0204 "", "-d sat" }, @@ -5953,7 +6040,7 @@ const drive_settings builtin_knowndrives[] = { "0x174c:0x2362", "", "", - "" // smartmontools >= r5168: -d sntasmedia + "-d sntasmedia" }, { "USB: ; ASMedia", "0x174c:0x....", diff --git a/smartmontools-7.2-capnotify.patch b/smartmontools-7.2-capnotify.patch deleted file mode 100644 index 307165f..0000000 --- a/smartmontools-7.2-capnotify.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up smartmontools-7.2/smartd.cpp.capnotify smartmontools-7.2/smartd.cpp ---- smartmontools-7.2/smartd.cpp.capnotify 2020-11-23 19:25:16.000000000 +0100 -+++ smartmontools-7.2/smartd.cpp 2021-06-16 12:06:03.985526022 +0200 -@@ -1020,6 +1020,8 @@ static void capabilities_drop_now() - capng_clear(CAPNG_SELECT_BOTH); - capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED), - CAP_SYS_ADMIN, CAP_MKNOD, CAP_SYS_RAWIO, -1); -+ capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_BOUNDING_SET), -+ CAP_SETGID, CAP_SETUID, CAP_CHOWN, CAP_FOWNER, CAP_DAC_OVERRIDE, -1); - capng_apply(CAPNG_SELECT_BOTH); - } - -@@ -1030,9 +1032,8 @@ static void capabilities_check_config(de - for (unsigned i = 0; i < configs.size(); i++) { - dev_config & cfg = configs[i]; - if (!cfg.emailaddress.empty() || !cfg.emailcmdline.empty()) { -- PrintOut(LOG_INFO, "Device: %s, --capabilites is set, mail will be suppressed.\n", -+ PrintOut(LOG_INFO, "Device: %s, --capabilites is set, mail notification may not work.\n", - cfg.name.c_str()); -- cfg.emailaddress.clear(); cfg.emailcmdline.clear(); - } - } - } -@@ -1633,7 +1634,7 @@ static void Usage() - #ifdef HAVE_LIBCAP_NG - PrintOut(LOG_INFO," -C, --capabilities\n"); - PrintOut(LOG_INFO," Drop unneeded Linux process capabilities.\n" -- " Warning: Mail notification does not work when used.\n\n"); -+ " Warning: Mail notification may not work when used.\n\n"); - #endif - PrintOut(LOG_INFO," -d, --debug\n"); - PrintOut(LOG_INFO," Start smartd in debug mode\n\n"); diff --git a/smartmontools-7.2-permsfix.patch b/smartmontools-7.2-permsfix.patch deleted file mode 100644 index c3b7d76..0000000 --- a/smartmontools-7.2-permsfix.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up smartmontools-7.2/os_linux.cpp.permsfix smartmontools-7.2/os_linux.cpp ---- smartmontools-7.2/os_linux.cpp.permsfix 2021-11-02 22:08:51.956425716 +0100 -+++ smartmontools-7.2/os_linux.cpp 2021-11-02 22:09:55.928583584 +0100 -@@ -1022,7 +1022,7 @@ bool linux_aacraid_device::open() - return set_err(ENOENT, "aac entry not found in /proc/devices"); - - //Create misc device file in /dev/ used for communication with driver -- if(mknod(dev_name,S_IFCHR,makedev(mjr,aHost))) -+ if(mknod(dev_name,S_IFCHR|0600,makedev(mjr,aHost))) - return set_err(errno,"cannot create %s:%s",dev_name,strerror(errno)); - - afd = ::open(dev_name,O_RDWR); -@@ -1298,14 +1298,14 @@ bool linux_megaraid_device::open() - while (fgets(line, sizeof(line), fp) != NULL) { - int n1 = 0; - if (sscanf(line, "%d megaraid_sas_ioctl%n", &mjr, &n1) == 1 && n1 == 22) { -- n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR, makedev(mjr, 0)); -+ n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR|0600, makedev(mjr, 0)); - if(report > 0) - pout("Creating /dev/megaraid_sas_ioctl_node = %d\n", n1 >= 0 ? 0 : errno); - if (n1 >= 0 || errno == EEXIST) - break; - } - else if (sscanf(line, "%d megadev%n", &mjr, &n1) == 1 && n1 == 11) { -- n1=mknod("/dev/megadev0", S_IFCHR, makedev(mjr, 0)); -+ n1=mknod("/dev/megadev0", S_IFCHR|0600, makedev(mjr, 0)); - if(report > 0) - pout("Creating /dev/megadev0 = %d\n", n1 >= 0 ? 0 : errno); - if (n1 >= 0 || errno == EEXIST) -@@ -2970,7 +2970,7 @@ bool linux_smart_interface::get_dev_mega - n1=0; - if (sscanf(line, "%d megaraid_sas_ioctl%n", &mjr, &n1) == 1 && n1 == 22) { - scan_megasas = true; -- n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR, makedev(mjr, 0)); -+ n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR|0600, makedev(mjr, 0)); - if(scsi_debugmode > 0) - pout("Creating /dev/megaraid_sas_ioctl_node = %d\n", n1 >= 0 ? 0 : errno); - if (n1 >= 0 || errno == EEXIST) diff --git a/smartmontools.spec b/smartmontools.spec index a00d378..f6a5417 100644 --- a/smartmontools.spec +++ b/smartmontools.spec @@ -6,8 +6,8 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools -Version: 7.2 -Release: 12%{?dist} +Version: 7.3 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ URL: http://smartmontools.sourceforge.net/ @@ -24,8 +24,6 @@ Source9: %{modulename}.te.f33 #fedora/rhel specific Patch1: smartmontools-5.38-defaultconf.patch -Patch2: smartmontools-7.2-capnotify.patch -Patch3: smartmontools-7.2-permsfix.patch BuildRequires: make BuildRequires: gcc-c++ readline-devel ncurses-devel automake util-linux groff gettext @@ -61,8 +59,6 @@ Custom SELinux policy module for smartmontools %prep %setup -q %patch1 -p1 -b .defaultconf -%patch2 -p1 -b .capnotify -%patch3 -p1 -b .permsfix cp %{SOURCE5} . %if 0%{?with_selinux} mkdir selinux @@ -165,6 +161,9 @@ fi %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %changelog +* Tue Mar 01 2022 Michal Hlavinka - 1:7.3-1 +- updated to 7.3 + * Sat Jan 22 2022 Fedora Release Engineering - 1:7.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 4d04b0a..ac7def6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (smartmontools-7.2.tar.gz) = d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea +SHA512 (smartmontools-7.3.tar.gz) = 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0