From 32049ecbd7b649ea8fc8b1872ea01dafba00c3ca53aab8818691fb5293ddcabd Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 12:17:30 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/libatasmart?expand=0&rev=7 --- libatasmart-0.14.tar.bz2 | 3 +++ libatasmart-0.17.tar.bz2 | 3 --- libatasmart-jmicron.patch | 43 +++++++++++++++++++++++++++++++++++++++ libatasmart.changes | 17 ---------------- libatasmart.spec | 14 ++++++------- 5 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 libatasmart-0.14.tar.bz2 delete mode 100644 libatasmart-0.17.tar.bz2 create mode 100644 libatasmart-jmicron.patch diff --git a/libatasmart-0.14.tar.bz2 b/libatasmart-0.14.tar.bz2 new file mode 100644 index 0000000..9208499 --- /dev/null +++ b/libatasmart-0.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7cf001b963920f3662992b4e625407181759cbfe66580acd088e085f952f507 +size 298966 diff --git a/libatasmart-0.17.tar.bz2 b/libatasmart-0.17.tar.bz2 deleted file mode 100644 index bb55953..0000000 --- a/libatasmart-0.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f09f63c791a4b7f3b2891672e65af7b819847fa6bfbfc58a695ecf9cf579f88c -size 302192 diff --git a/libatasmart-jmicron.patch b/libatasmart-jmicron.patch new file mode 100644 index 0000000..b5351ec --- /dev/null +++ b/libatasmart-jmicron.patch @@ -0,0 +1,43 @@ +X-Git-Url: http://git.0pointer.de/?p=libatasmart.git;a=blobdiff_plain;f=atasmart.c;h=01d3cb2cca0817963b91f7f1c9cd72fde8b10b91;hp=b6bcb90b1662ca0a99fe89cf5c8aeb4cdbcc7e49;hb=HEAD;hpb=7e8f3350aea65ed203305c8e7e4fc1cfd4656393 + +diff --git a/atasmart.c b/atasmart.c +index b6bcb90..01d3cb2 100644 +--- a/atasmart.c ++++ b/atasmart.c +@@ -2474,15 +2474,30 @@ static int disk_find_type(SkDisk *d, dev_t devnum) { + goto finish; + } + +- if ((vid == 0x0c0b && pid == 0xb159) || +- (vid == 0x04fc && pid == 0x0c25) || +- (vid == 0x04fc && pid == 0x0c15)) +- d->type = SK_DISK_TYPE_SUNPLUS; +- else if ((vid == 0x152d && pid == 0x2329) || +- (vid == 0x152d && pid == 0x2336) || ++ if ((vid == 0x152d && pid == 0x2329) || + (vid == 0x152d && pid == 0x2338) || + (vid == 0x152d && pid == 0x2339)) ++ /* Some JMicron bridges seem to choke on SMART ++ * commands, so let's explicitly black list ++ * them here. ++ * ++ * https://bugzilla.redhat.com/show_bug.cgi?id=515881 ++ * ++ * At least some of the JMicron bridges with ++ * these vids/pids choke on the jmicron access ++ * mode. To make sure we don't break things ++ * for people we now disable this by ++ * default.*/ ++ d->type = SK_DISK_TYPE_NONE; ++ else if ((vid == 0x152d && pid == 0x2336)) ++ /* This JMicron bridge seems to always work ++ * with SMART commands send with the jmicron ++ * access mode. */ + d->type = SK_DISK_TYPE_JMICRON; ++ else if ((vid == 0x0c0b && pid == 0xb159) || ++ (vid == 0x04fc && pid == 0x0c25) || ++ (vid == 0x04fc && pid == 0x0c15)) ++ d->type = SK_DISK_TYPE_SUNPLUS; + else + d->type = SK_DISK_TYPE_ATA_PASSTHROUGH_12; + diff --git a/libatasmart.changes b/libatasmart.changes index a6391ab..086101c 100644 --- a/libatasmart.changes +++ b/libatasmart.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Fri Nov 13 12:54:33 CET 2009 - vuntz@opensuse.org - -- Update to version 0.17: - + Add various blobs - + Ignore attributes 5 and 190 on some Apple SSD - + Check the right boolean when calculating blob size - + Delay smart initialization until the first SMART call is done -- Changes from version 0.16: - + Disable jmicron access mode for some more jmicron bridges -- Changes from version 0.15: - + Support some ssd smart attrs - + Add various blobs. - + Blacklist 152d:2329 jmicron usb bridges - + Add vala vapi files. -- Drop libatasmart-jmicron.patch: fixed upstream. - ------------------------------------------------------------------- Fri Oct 2 15:08:43 CEST 2009 - vuntz@opensuse.org diff --git a/libatasmart.spec b/libatasmart.spec index 06babd6..3e222b9 100644 --- a/libatasmart.spec +++ b/libatasmart.spec @@ -1,5 +1,5 @@ # -# spec file for package libatasmart (Version 0.17) +# spec file for package libatasmart (Version 0.14) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,15 @@ Name: libatasmart -Version: 0.17 -Release: 1 +Version: 0.14 +Release: 2 License: LGPL v2.1 or later Summary: ATA S.M.A.R.T. Disk Health Monitoring Library Url: http://git.0pointer.de/?p=libatasmart.git;a=summary Group: System/Libraries Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libatasmart-jmicron.patch vuntz@opensuse.org -- Taken from git +Patch0: libatasmart-jmicron.patch BuildRequires: libudev-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,6 +67,7 @@ health monitoring. %prep %setup -q +%patch0 -p1 %build %configure --disable-static @@ -73,8 +76,6 @@ make %{?jobs:-j%jobs} %install %makeinstall rm -f %{buildroot}%{_libdir}/*.la -# We already package this -rm %{buildroot}%{_datadir}/doc/libatasmart/README %clean rm -rf %{buildroot} @@ -98,8 +99,5 @@ rm -rf %{buildroot} %{_includedir}/atasmart.h %{_libdir}/libatasmart.so %{_libdir}/pkgconfig/libatasmart.pc -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/*.vapi %changelog