From 32049ecbd7b649ea8fc8b1872ea01dafba00c3ca53aab8818691fb5293ddcabd Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 12:17:30 +0000 Subject: [PATCH 1/6] 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 From 33541474309f99ea7d454506adaa5a3eae4b29e4a0090da5a0c44e36be3b1b0d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 12 Feb 2010 06:58:31 +0000 Subject: [PATCH 2/6] converted link to branch OBS-URL: https://build.opensuse.org/package/show/Base:System/libatasmart?expand=0&rev=8 --- 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, 28 insertions(+), 52 deletions(-) delete mode 100644 libatasmart-0.14.tar.bz2 create mode 100644 libatasmart-0.17.tar.bz2 delete mode 100644 libatasmart-jmicron.patch diff --git a/libatasmart-0.14.tar.bz2 b/libatasmart-0.14.tar.bz2 deleted file mode 100644 index 9208499..0000000 --- a/libatasmart-0.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..bb55953 --- /dev/null +++ b/libatasmart-0.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f09f63c791a4b7f3b2891672e65af7b819847fa6bfbfc58a695ecf9cf579f88c +size 302192 diff --git a/libatasmart-jmicron.patch b/libatasmart-jmicron.patch deleted file mode 100644 index b5351ec..0000000 --- a/libatasmart-jmicron.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 086101c..a6391ab 100644 --- a/libatasmart.changes +++ b/libatasmart.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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 3e222b9..06babd6 100644 --- a/libatasmart.spec +++ b/libatasmart.spec @@ -1,5 +1,5 @@ # -# spec file for package libatasmart (Version 0.14) +# spec file for package libatasmart (Version 0.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,15 +19,13 @@ Name: libatasmart -Version: 0.14 -Release: 2 +Version: 0.17 +Release: 1 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 @@ -67,7 +65,6 @@ health monitoring. %prep %setup -q -%patch0 -p1 %build %configure --disable-static @@ -76,6 +73,8 @@ 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} @@ -99,5 +98,8 @@ 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 From a1886bc9d73be19c08b81a368d75522bb2ac4b0108943c22aeefe92d613d562a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 16 Mar 2010 14:51:19 +0000 Subject: [PATCH 3/6] Accepting request 34927 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/libatasmart via accept of submit request 34927 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34927 OBS-URL: https://build.opensuse.org/package/show/Base:System/libatasmart?expand=0&rev=9 --- libatasmart-initialize.patch | 10 ++++++++++ libatasmart.changes | 5 +++++ libatasmart.spec | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 libatasmart-initialize.patch diff --git a/libatasmart-initialize.patch b/libatasmart-initialize.patch new file mode 100644 index 0000000..9177567 --- /dev/null +++ b/libatasmart-initialize.patch @@ -0,0 +1,10 @@ +--- strpool.c ++++ strpool.c +@@ -435,6 +435,7 @@ + rl = 0; + + i->next = NULL; ++ i->suffix_of = NULL; + + if (last) + last->next = i; diff --git a/libatasmart.changes b/libatasmart.changes index a6391ab..826f0ca 100644 --- a/libatasmart.changes +++ b/libatasmart.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 16 10:35:41 CET 2010 - ro@suse.de + +- fix build by initializing member suffix_of in strpool.c + ------------------------------------------------------------------- Fri Nov 13 12:54:33 CET 2009 - vuntz@opensuse.org diff --git a/libatasmart.spec b/libatasmart.spec index 06babd6..c1aec21 100644 --- a/libatasmart.spec +++ b/libatasmart.spec @@ -26,6 +26,7 @@ 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 +Patch0: libatasmart-initialize.patch BuildRequires: libudev-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,6 +66,7 @@ health monitoring. %prep %setup -q +%patch0 %build %configure --disable-static From 1339efde832207c3ba6d668952adc2a96ff79e3266c4511f14446aa205ce7fef Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 17 Mar 2010 13:05:11 +0000 Subject: [PATCH 4/6] Accepting request 34952 from Base:System checked in (request 34952) OBS-URL: https://build.opensuse.org/request/show/34952 OBS-URL: https://build.opensuse.org/package/show/Base:System/libatasmart?expand=0&rev=10 --- libatasmart-initialize.patch | 10 ---------- libatasmart.changes | 5 ----- libatasmart.spec | 2 -- 3 files changed, 17 deletions(-) delete mode 100644 libatasmart-initialize.patch diff --git a/libatasmart-initialize.patch b/libatasmart-initialize.patch deleted file mode 100644 index 9177567..0000000 --- a/libatasmart-initialize.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- strpool.c -+++ strpool.c -@@ -435,6 +435,7 @@ - rl = 0; - - i->next = NULL; -+ i->suffix_of = NULL; - - if (last) - last->next = i; diff --git a/libatasmart.changes b/libatasmart.changes index 826f0ca..a6391ab 100644 --- a/libatasmart.changes +++ b/libatasmart.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Mar 16 10:35:41 CET 2010 - ro@suse.de - -- fix build by initializing member suffix_of in strpool.c - ------------------------------------------------------------------- Fri Nov 13 12:54:33 CET 2009 - vuntz@opensuse.org diff --git a/libatasmart.spec b/libatasmart.spec index c1aec21..06babd6 100644 --- a/libatasmart.spec +++ b/libatasmart.spec @@ -26,7 +26,6 @@ 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 -Patch0: libatasmart-initialize.patch BuildRequires: libudev-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,7 +65,6 @@ health monitoring. %prep %setup -q -%patch0 %build %configure --disable-static From 1ef994d052d1883be70af4b034e1591bb59e5552c3e01cb2b3eea241aec96dfa Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Sep 2010 10:22:13 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Base:System/libatasmart?expand=0&rev=11 --- libatasmart-initialize.patch | 10 ++++++++++ libatasmart.changes | 5 +++++ libatasmart.spec | 14 ++++++++------ ready | 0 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 libatasmart-initialize.patch delete mode 100644 ready diff --git a/libatasmart-initialize.patch b/libatasmart-initialize.patch new file mode 100644 index 0000000..9177567 --- /dev/null +++ b/libatasmart-initialize.patch @@ -0,0 +1,10 @@ +--- strpool.c ++++ strpool.c +@@ -435,6 +435,7 @@ + rl = 0; + + i->next = NULL; ++ i->suffix_of = NULL; + + if (last) + last->next = i; diff --git a/libatasmart.changes b/libatasmart.changes index a6391ab..826f0ca 100644 --- a/libatasmart.changes +++ b/libatasmart.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 16 10:35:41 CET 2010 - ro@suse.de + +- fix build by initializing member suffix_of in strpool.c + ------------------------------------------------------------------- Fri Nov 13 12:54:33 CET 2009 - vuntz@opensuse.org diff --git a/libatasmart.spec b/libatasmart.spec index 06babd6..17f7b8c 100644 --- a/libatasmart.spec +++ b/libatasmart.spec @@ -1,7 +1,7 @@ # # spec file for package libatasmart (Version 0.17) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,13 @@ Name: libatasmart Version: 0.17 -Release: 1 -License: LGPL v2.1 or later +Release: 2 +License: LGPLv2.1+ 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 +Patch0: libatasmart-initialize.patch BuildRequires: libudev-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +36,7 @@ A small and lightweight parser library for ATA S.M.A.R.T. hard disk health monitoring. %package -n libatasmart4 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: ATA S.M.A.R.T. Disk Health Monitoring Library Group: System/Libraries @@ -44,7 +45,7 @@ A small and lightweight parser library for ATA S.M.A.R.T. hard disk health monitoring. %package utils -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: ATA S.M.A.R.T. Disk Health Monitoring Library - Utilities Group: Hardware/Other Requires: libatasmart4 = %{version} @@ -54,7 +55,7 @@ A small and lightweight parser library for ATA S.M.A.R.T. hard disk health monitoring. %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: ATA S.M.A.R.T. Disk Health Monitoring Library - Development Files Group: Development/Libraries/C and C++ Requires: libatasmart4 = %{version} @@ -65,6 +66,7 @@ health monitoring. %prep %setup -q +%patch0 %build %configure --disable-static diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 6b566b4dab0c5e3c0c87fbcd5b543ff0709004f273d714d173c36cb61f26ac98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 31 Oct 2010 16:41:26 +0000 Subject: [PATCH 6/6] Accepting request 51726 from home:jengelh:smp OBS-URL: https://build.opensuse.org/request/show/51726 OBS-URL: https://build.opensuse.org/package/show/Base:System/libatasmart?expand=0&rev=12 --- libatasmart.changes | 5 +++++ libatasmart.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libatasmart.changes b/libatasmart.changes index 826f0ca..243fff7 100644 --- a/libatasmart.changes +++ b/libatasmart.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 31 10:41:33 UTC 2010 - jengelh@medozas.de + +- Use %_smp_mflags + ------------------------------------------------------------------- Tue Mar 16 10:35:41 CET 2010 - ro@suse.de diff --git a/libatasmart.spec b/libatasmart.spec index 17f7b8c..e374c30 100644 --- a/libatasmart.spec +++ b/libatasmart.spec @@ -70,7 +70,7 @@ health monitoring. %build %configure --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall