Accepting request 1303125 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/1303125
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libblockdev?expand=0&rev=27

0001-dont-allow-suid-and-dev-set-on-fs-resize.patch

@@ -1,27 +0,0 @@
-From 8e072f794744bd17c57cceabb3884d3f0f6a1602 Mon Sep 17 00:00:00 2001
-From: Thomas Blume <Thomas.Blume@suse.com>
-Date: Fri, 16 May 2025 14:27:10 +0200
-Subject: [PATCH] dont allow suid and dev set on fs resize
-
----
- src/plugins/fs/generic.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/fs/generic.c b/src/plugins/fs/generic.c
-index 69333944..1a6dd960 100644
---- a/src/plugins/fs/generic.c
-+++ b/src/plugins/fs/generic.c
-@@ -683,7 +683,9 @@ static gchar* fs_mount (const gchar *device, gchar *fstype, gboolean read_only,
-                              "Failed to create temporary directory for mounting '%s'.", device);
-                 return NULL;
-             }
--            ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "ro" : NULL, NULL, &l_error);
-+
-+            ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "nosuid,nodev,ro" : "nosuid,nodev", NULL, &l_error);
-+
-             if (!ret) {
-                 g_propagate_prefixed_error (error, l_error, "Failed to mount '%s': ", device);
-                 g_rmdir (mountpoint);
--- 
-2.48.1
-

NEWS.rst

@@ -1,3 +1,230 @@
+Libblockdev 3.3.1
+------------------
+
+New bugfix release of libblockdev library fixing the LPE issue CVE-2025-6019.
+
+**Full list of changes**
+
+Thomas Blume (1):
+
+- Don't allow suid and dev set on fs resize
+
+
+Libblockdev 3.3.0
+------------------
+
+New minor release of the libblockdev library with multiple fixes. See below
+for details.
+
+**Full list of changes**
+
+Nikola Forró (1):
+
+- packit: Fix replacement of placeholders in post-upstream-clone
+
+Tomas Bzatek (4):
+
+- tests: Add KINGSTON SA400S37240G SSD skdump
+
+Vojtech Trefny (26):
+
+- tests: Enable LVM VDO tests on Debian
+- Skip tests for plugins disabled during compile time
+- fs: Add filesystem size limits to BDFSFeatures
+- Makefile: Fix generating RPM log during bumpver
+- New version - 3.2.1
+- tests: Add a simple test case for bd_crypto_device_seems_encrypted
+- lvm-dbus: Add support for repairing RAID LVs
+- tests: Skip lvm_dbus_tests.LvmTestPartialLVs for now
+- tests: Skip escrow tests in FIPS mode
+- misc: Separate Ansible tasks into a different file
+- misc: Add build and test dependecies for CentOS
+- ci: Manually download blivet playbooks for revdeps tests
+- ci: Remove amazon-ec2-utils if installed
+- ci: Manually download udisks playbooks for revdeps tests
+- misc: Do not use "with_items" when installing packages
+- lvm: Add support for reading lvm.conf
+- lvm: Require higher version of LVM for lvm.conf parsing
+- lvm: Fix check for BD_LVM_TECH_CONFIG availability in CLI plugin
+
+
+Libblockdev 3.2.1
+------------------
+
+New bugfix release of the libblockdev library with multiple fixes. See below
+for details.
+
+**Full list of changes**
+
+James Hilliard (1):
+
+- crypto: check that IOC_OPAL_GET_STATUS is defined
+
+Tomas Bzatek (3):
+
+- smart: Clarify use of ID_ATA_SMART_ACCESS udev property
+- smart: Clarify ID_ATA_SMART_ACCESS udev property values
+- nvme: Avoid element-type g-i annotations
+
+Vojtech Trefny (9):
+
+- README: Update supported technologies
+- dist: Fix source URL in spec
+- packit: Fix generating spec from template
+- dist: Sync spec with downstream
+- misc: Fix installing test dependencies on Debian/Ubuntu
+- ci: Do not try to install test dependencies for CodeQL analysis
+- lvm: Clarify the global config functionallity in libblockdev
+- ci: Install 'python3-libdnf5' for TMT test plans
+- Makefile: Fix generating RPM log during bumpver
+
+Libblockdev 3.2.0
+------------------
+
+This release brings new smart plugin with two actual plugin implementations:
+libatasmart (default) and smartmontools (experimental). Please check the smart
+plugin documentation for specifics and limitations.
+
+Note to distributors: the default smart plugin is based on libatasmart and
+requires no extra dependencies. The smartmontools plugin needs a runtime
+dependency on 'smartctl' executable besides a json-glib-1.0 build dep.
+A path to drivedb.h database can be specified with the --with-drivedb
+option. The latter two features are mostly provided for testing.
+
+**Full list of changes**
+
+Giulio Benetti (1):
+
+- Use glib2 G_GNUC_UNUSED in place of UNUSED locally defined
+
+Jelle van der Waa (3):
+
+- tests: split multi device tests into a new testcase class
+- tests: introduce setup_test_device helper function
+- btrfs: make btrfs subvolume listing consistent
+
+Michal Rostecki (1):
+
+- build: Fix linking with LLD
+
+Stepan Yakimovich (1):
+
+- crypto: Add support for conversion between different LUKS formats
+
+Tomas Bzatek (35):
+
+- Port to G_GNUC_INTERNAL for controlling symbols visibility
+- Fix some more occurrences of missing port to G_GNUC_UNUSED
+- dm_logging: Annotate redirect_dm_log() printf format
+- tests: Add NVMe persistent discovery controller tests
+- tests: Add NVMe controller type checks
+- New SMART plugin
+- smart: Add bd_smart_set_enabled()
+- smart: Add bd_smart_device_self_test()
+- tests: Add basic SMART tests
+- tests: Add SMART tests over supplied JSON dumps
+- tests: Add tests for bd_smart_set_enabled()
+- tests: Add tests for bd_smart_device_self_test()
+- smart: Add SCSI/SAS status retrieval
+- tests: Add SCSI SMART tests
+- smart: Remove the ATA low-power mode detection
+- smart: Introduce well-known attribute names, validation and pretty values
+- smart: Refactor and split into libbd_smartmontools
+- smart: Introduce new libatasmart plugin
+- smart: Implement bd_smart_ata_get_info_from_data()
+- smart: Use smartmontools drivedb.h for libatasmart validation
+- build: Install lvm.h when only lvm_dbus enabled
+- tests: Add SiliconPower SSD skdump reporting incorrect temp
+- smart: Rework libatasmart temperature reporting
+- tests: Split libatasmart and smartmontool tests
+- utils/exec: Refactor extra args append out
+- utils/exec: Add bd_utils_exec_and_capture_output_no_progress()
+- tests: Add bd_utils_exec_and_capture_output_no_progress() tests
+- smart: Add BDExtraArg arguments
+- tests: Adapt smart plugin tests for the added extra arguments
+- tests: Fix smartmontools plugin parsing of /dev/random
+- tests: Add more libatasmart skdump samples
+- nvme: Fix potential memory leak
+- smart: Mark drivedb integration as experimental
+- smart: Add documentation
+- NEWS: add preliminary release notes for the smart plugin
+
+Vojtech Trefny (60):
+
+- Makefile: Do not include release in the tag
+- Makefile: Fix bumpver to work with micro versions
+- tests: Manually remove removed PVs from LVM devices file
+- tests: Ignore LVM devices file for non-LVM tests
+- tests: Fix removing custom LVM devices file
+- nvme: Add bd_nvme_is_tech_avail to the API file
+- lvm-dbus: Fix passing size for pvresize over DBus
+- lvm-dbus: Fix potential segfault in bd_lvm_init
+- lvm-dbus: Fix leaking error in bd_lvm_init
+- crypto: Fix double free in bd_crypto_luks_remove_key
+- utils: Clarify usage of version in bd_utils_check_util_version
+- Bump version to 3.1.1
+- ci: Set custom release number for Packit
+- tests: Fix running tests without ntfsprogs
+- ci: Get version for packit from the SPEC file
+- ci: Fix bumping release for Packit builds
+- tests: Skip filesystem tests if kernel module is not available
+- misc: Vagrantfile update
+- misc: Remove CentOS 8 Stream from Vagrantfile and test dependencies
+- Fix pylint possibly-used-before-assignment warning in BlockDev.py
+- utils: Check also for aliases in bd_utils_have_kernel_module
+- tests: Skip ExFAT UUID tests with recent exfatprogs
+- fs: Ignore unused-parameter warning in the FS plugin
+- fs: Ignore shift-count-overflow warning in FS plugin
+- fs: Fix ignoring errors from libext2fs
+- ci: Use Ubuntu 24.04 in GitHub actions
+- misc: Fix enabling source repositories on latest Ubuntu
+- ci: Run Blivet reverse dependency tests on pull requests
+- ci: Add a simple tmt test and run it via packit
+- misc: Add kernel-modules-extra to test dependencies
+- ci: Run UDisks reverse dependency tests on pull requests
+- tests: Skip exFAT UUID tests also on Fedora 39
+- docs: Fix link to Python bindings documentation
+- part: Fix copy-paste bug in bd_part_spec_copy
+- infra: Add dependabot to automatically update GH actions
+- lvm: Check for dm-vdo instead of kvdo module for VDO support
+- lvm: Get VDO stats from device mapper instead of /sys/kvdo
+- misc: Add vdo to test dependencies on Fedora
+- tests: Temporarily skip LVM VDO tests on RHEL/CentOS 10
+- crypto: Show error when trying using an invalid DM name
+- part: Add human readable partition type to BDPartSpec
+- fs: Fix docstring for bd_fs_ext?_get_min_size functions
+- tests: No longer need to skip exfat UUID tests on Fedora
+- crypto: Add a function to check for OPAL support for a device
+- crypto: Add a function to wipe a LUKS HW-OPAL device
+- crypto: Add information about HW encryption to BDCryptoLUKSInfo
+- crypto: Add support for creating new LUKS HW-OPAL devices
+- tests: Add a simple test case for LUKS HW-OPAL support
+- crypto: Check for kernel SED OPAL support for OPAL operations
+- ci: Remove priority from Testing farm repositories
+- crypto: Add a function to run OPAL PSID reset
+- tests: Fix skipping VDO tests on Debian and CentOS 10
+- crypto: Fix name of bd_crypto_opal_wipe_device in crypto.h
+- crypto: Fixing missing quotation marks in some error messages
+- docs: Add BDCryptoLUKSHWEncryptionType to libblockdev-sections.txt
+- docs: Fix documentation for the SMART plugin
+- part: Document type_name in BDPartSpec docstring
+- misc: Fix typos
+- crypto: Fix GType macro for crypto context
+- ci: Add a simple GH action to run spelling tools on our code
+
+Vratislav Podzimek (1):
+
+- Add cache size ratio to the output of lvm-cache-stats
+
+dependabot[bot] (2):
+
+- infra: bump actions/upload-artifact from 3 to 4
+- infra: bump github/codeql-action from 2 to 3
+
+guazhang (1):
+
+- fixed md_create issue #1013
+
 Libblockdev 3.1.1
 ------------------
 

_service

@@ -0,0 +1,5 @@
+<services>
+<service name="download_files" mode="localonly">
+    <param name="enforceupstream">yes</param>
+  </service>
+</services>

libblockdev-3.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb
-size 1054326

libblockdev-3.3.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2e2e448a19d420480b8cce5e0752197482a65cb62a9ed55d88b237da36600d1
+size 1160139

libblockdev.changes

@@ -1,3 +1,132 @@
+-------------------------------------------------------------------
+Thu Sep  4 13:39:04 UTC 2025 - Thomas Blume <Thomas.Blume@suse.com>
+
+- update to 3.3.1
+  - added smart and smartmontools plugin
+
+  - Dropped merged upstream patches:
+    0001-dont-allow-suid-and-dev-set-on-fs-resize.patch
+
+  * Add cache size ratio to the output of lvm-cache-stats
+  * Don't allow suid and dev set on fs resize
+    (bsc#1243285)
+  * Fix pylint possibly-used-before-assignment warning in BlockDev.py
+  * Makefile: Fix generating RPM log during bumpver
+  * NEWS: add preliminary release notes for the smart plugin
+  * New SMART plugin
+  * README: Update supported technologies
+  * Skip tests for plugins disabled during compile time
+  * build: Fix linking with LLD
+  * build: Install lvm.h when only lvm_dbus enabled
+  * ci: Add a simple GH action to run spelling tools on our code
+  * ci: Add a simple tmt test and run it via packit
+  * ci: Do not try to install test dependencies for CodeQL analysis
+  * ci: Fix bumping release for Packit builds
+  * ci: Get version for packit from the SPEC file
+  * ci: Install 'python3-libdnf5' for TMT test plans
+  * ci: Manually download blivet playbooks for revdeps tests
+  * ci: Manually download udisks playbooks for revdeps tests
+  * ci: Remove amazon-ec2-utils if installed
+  * ci: Remove priority from Testing farm repositories
+  * ci: Run Blivet reverse dependency tests on pull requests
+  * ci: Run UDisks reverse dependency tests on pull requests
+  * ci: Set custom release number for Packit
+  * ci: Use Ubuntu 24.04 in GitHub actions
+  * crypto: Add a function to check for OPAL support for a device
+  * crypto: Add a function to run OPAL PSID reset
+  * crypto: Add a function to wipe a LUKS HW-OPAL device
+  * crypto: Add information about HW encryption to BDCryptoLUKSInfo
+  * crypto: Add support for creating new LUKS HW-OPAL devices
+  * crypto: Check for kernel SED OPAL support for OPAL operations
+  * crypto: Fix GType macro for crypto context
+  * crypto: Fix double free in bd_crypto_luks_remove_key
+  * crypto: Fix name of bd_crypto_opal_wipe_device in crypto.h
+  * crypto: Fixing missing quotation marks in some error messages
+  * crypto: Show error when trying using an invalid DM name
+  * crypto: check that IOC_OPAL_GET_STATUS is defined
+  * dist: Fix source URL in spec
+  * dist: Sync spec with downstream
+  * docs: Add BDCryptoLUKSHWEncryptionType to libblockdev-sections.txt
+  * docs: Fix documentation for the SMART plugin
+  * docs: Fix link to Python bindings documentation
+  * fixed md_create issue #1013
+  * fs: Add filesystem size limits to BDFSFeatures
+  * fs: Fix docstring for bd_fs_ext?_get_min_size functions
+  * fs: Fix ignoring errors from libext2fs
+  * fs: Ignore shift-count-overflow warning in FS plugin
+  * fs: Ignore unused-parameter warning in the FS plugin
+  * infra: Add dependabot to automatically update GH actions
+  * infra: bump actions/upload-artifact from 3 to 4
+  * lvm-dbus: Add support for repairing RAID LVs
+  * lvm-dbus: Fix leaking error in bd_lvm_init
+  * lvm-dbus: Fix potential segfault in bd_lvm_init
+  * lvm: Add support for reading lvm.conf
+  * lvm: Check for dm-vdo instead of kvdo module for VDO support
+  * lvm: Clarify the global config functionallity in libblockdev
+  * lvm: Fix check for BD_LVM_TECH_CONFIG availability in CLI plugin
+  * lvm: Get VDO stats from device mapper instead of /sys/kvdo
+  * lvm: Require higher version of LVM for lvm.conf parsing
+  * misc: Add build and test dependecies for CentOS
+  * misc: Add kernel-modules-extra to test dependencies
+  * misc: Add vdo to test dependencies on Fedora
+  * misc: Do not use "with_items" when installing packages
+  * misc: Fix enabling source repositories on latest Ubuntu
+  * misc: Fix installing test dependencies on Debian/Ubuntu
+  * misc: Fix typos
+  * misc: Remove CentOS 8 Stream from Vagrantfile and test dependencies
+  * misc: Separate Ansible tasks into a different file
+  * misc: Vagrantfile update
+  * nvme: Avoid element-type g-i annotations
+  * nvme: Fix potential memory leak
+  * packit: Fix generating spec from template
+  * packit: Fix replacement of placeholders in post-upstream-clone
+  * part: Add human readable partition type to BDPartSpec
+  * part: Document type_name in BDPartSpec docstring
+  * part: Fix copy-paste bug in bd_part_spec_copy
+  * smart: Add BDExtraArg arguments
+  * smart: Add SCSI/SAS status retrieval
+  * smart: Add bd_smart_device_self_test()
+  * smart: Add bd_smart_set_enabled()
+  * smart: Add documentation
+  * smart: Clarify ID_ATA_SMART_ACCESS udev property values
+  * smart: Clarify use of ID_ATA_SMART_ACCESS udev property
+  * smart: Implement bd_smart_ata_get_info_from_data()
+  * smart: Introduce new libatasmart plugin
+  * smart: Introduce well-known attribute names, validation and pretty values
+  * smart: Mark drivedb integration as experimental
+  * smart: Refactor and split into libbd_smartmontools
+  * smart: Remove the ATA low-power mode detection
+  * smart: Rework libatasmart temperature reporting
+  * smart: Use smartmontools drivedb.h for libatasmart validation
+  * tests: Adapt smart plugin tests for the added extra arguments
+  * tests: Add KINGSTON SA400S37240G SSD skdump
+  * tests: Add SCSI SMART tests
+  * tests: Add SMART tests over supplied JSON dumps
+  * tests: Add SiliconPower SSD skdump reporting incorrect temp
+  * tests: Add a simple test case for LUKS HW-OPAL support
+  * tests: Add a simple test case for bd_crypto_device_seems_encrypted
+  * tests: Add basic SMART tests
+  * tests: Add bd_utils_exec_and_capture_output_no_progress() tests
+  * tests: Add more libatasmart skdump samples
+  * tests: Add tests for bd_smart_device_self_test()
+  * tests: Add tests for bd_smart_set_enabled()
+  * tests: Enable LVM VDO tests on Debian
+  * tests: Fix running tests without ntfsprogs
+  * tests: Fix skipping VDO tests on Debian and CentOS 10
+  * tests: Fix smartmontools plugin parsing of /dev/random
+  * tests: No longer need to skip exfat UUID tests on Fedora
+  * tests: Skip ExFAT UUID tests with recent exfatprogs
+  * tests: Skip escrow tests in FIPS mode
+  * tests: Skip exFAT UUID tests also on Fedora 39
+  * tests: Skip filesystem tests if kernel module is not available
+  * tests: Skip lvm_dbus_tests.LvmTestPartialLVs for now
+  * tests: Split libatasmart and smartmontool tests
+  * tests: Temporarily skip LVM VDO tests on RHEL/CentOS 10
+  * utils/exec: Add bd_utils_exec_and_capture_output_no_progress()
+  * utils/exec: Refactor extra args append out
+  * utils: Check also for aliases in bd_utils_have_kernel_module
+  * utils: Clarify usage of version in bd_utils_check_util_version
+
 -------------------------------------------------------------------
 Mon Jun 23 13:50:50 UTC 2025 - Thomas Blume <Thomas.Blume@suse.com>
 

libblockdev.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libblockdev
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@
 %bcond_without  nvme_plugin
 %bcond_without  part_plugin
 %bcond_without  swap_plugin
+%bcond_without  smart_plugin
+%bcond_without  smartmontools_plugin
 ###
 %bcond_without  gi_bindings
 %bcond_without  gtk_doc
@@ -41,15 +43,14 @@
 %define         soversion  3
 
 Name:           libblockdev
-Version:        3.1.1
+Version:        3.3.1
 Release:        0
 Summary:        A library for low-level manipulation with block devices
 License:        LGPL-2.1-only
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/storaged-project/libblockdev
-Source0:        %{url}/releases/download/%{version}-1/libblockdev-%{version}.tar.gz
+Source0:        %{url}/releases/download/%{version}/libblockdev-%{version}.tar.gz
-Source1:        %{url}/raw/%{version}-1/NEWS.rst
+Source1:        %{url}/raw/%{version}/NEWS.rst
-Patch0:         0001-dont-allow-suid-and-dev-set-on-fs-resize.patch
 
 ###############################################################################
 #                          M A I N  P A C K A G E
@@ -605,6 +606,77 @@ with the libbd_part plugin/library.
 %dir %{_includedir}/blockdev
 %endif
 
+###############################################################################
+#                           S M A R T  P L U G I N S
+###############################################################################
+%if %{with smart_plugin}
+%package -n     libbd_smart%{soversion}
+Summary:        The smart plugin for the LibBlockDev library
+Group:          System/Libraries
+Requires:       libbd_utils%{soversion} >= %{version}
+Requires:       util-linux
+Provides:       libblockdev-smart = %{version}
+BuildRequires:  libatasmart-devel >= 0.17
+
+%description -n libbd_smart%{soversion}
+The libblockdev library plugin (and in the same time a standalone library)
+providing S.M.A.R.T. monitoring and testing functionality, based
+on libatasmart.
+
+%ldconfig_scriptlets -n libbd_smart%{soversion}
+
+%files -n libbd_smart%{soversion} -f smart-plugin.filelist
+
+%package -n     libbd_smart-devel
+Summary:        Development files for the libblockdev-smart plugin/library
+Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
+Requires:       libbd_smart%{soversion} = %{version}
+Requires:       libbd_utils-devel >= %{version}
+Provides:       libblockdev-smart-devel = %{version}
+
+%description -n libbd_smart-devel
+This package contains header files and pkg-config files needed for development
+with the libblockdev-smart plugin/library.
+
+%files -n libbd_smart-devel -f smart-plugin-devel.filelist
+%dir %{_includedir}/blockdev
+%endif
+
+%if %{with smartmontools_plugin}
+%package -n     libbd_smartmontools%{soversion}
+Summary:        The smartmontools plugin for the libblockdev library
+Group:          System/Libraries
+Requires:       libbd_utils%{soversion} >= %{version}
+Requires:       smartmontools >= 7.0
+Provides:       libblockdev-smartmontools = %{version}
+BuildRequires:  json-glib-devel
+
+%description -n libbd_smartmontools%{soversion}
+The libblockdev library plugin (and in the same time a standalone library)
+providing S.M.A.R.T. monitoring and testing functionality, based
+on smartmontools.
+
+%ldconfig_scriptlets -n libbd_smartmontools%{soversion}
+
+%files -n libbd_smartmontools%{soversion} -f smartmontools-plugin.filelist
+
+%package -n     libbd_smartmontools-devel
+Summary:        Development files for the libblockdev-smart plugin/library
+Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
+Requires:       libbd_smartmontools%{soversion} = %{version}
+Requires:       libbd_utils-devel >= %{version}
+Provides:       libblockdev-smartmontools-devel = %{version}
+
+%description -n libbd_smartmontools-devel
+This package contains header files and pkg-config files needed for development
+with the libblockdev-smart plugin/library.
+%endif
+
+%files -n libbd_smartmontools-devel -f smartmontools-plugin-devel.filelist
+%dir %{_includedir}/blockdev
+
 ###############################################################################
 #                            S W A P  P L U G I N
 ###############################################################################
@@ -709,6 +781,8 @@ fi
     --with%{!?with_mpath_plugin:out}-mpath \
     --with%{!?with_part_plugin:out}-part \
     --with%{!?with_swap_plugin:out}-swap \
+    --with%{!?with_smart_plugin:out}-smart \
+    --with%{!?with_smartmontools_plugin:out}-smartmontools \
     ;
 
 %make_build
@@ -731,6 +805,8 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %{?with_mpath_plugin:   %global plugins %{?plugins} mpath}
 %{?with_part_plugin:    %global plugins %{?plugins} part}
 %{?with_swap_plugin:    %global plugins %{?plugins} swap}
+%{?with_smart_plugin:   %global plugins %{?plugins} smart}
+%{?with_smartmontools_plugin:    %global plugins %{?plugins} smartmontools}
 %{?with_utils:          %global plugins %{?plugins} utils}
 
 echo %{?plugins}
@@ -743,13 +819,15 @@ for plugin in %{?plugins}; do
 
   test "${plugin}" = lvm-dbus && continue
 
-  ls -1 %{buildroot}%{_includedir}/blockdev/${plugin}.h \
-    >> ${plugin}-plugin-devel.filelist
-
   if [ "${plugin}" = fs ]; then
     ls -1 %{buildroot}%{_includedir}/blockdev/${plugin}/* \
       >> ${plugin}-plugin-devel.filelist
   fi
+
+  test "${plugin}" = smartmontools && continue
+
+  ls -1 %{buildroot}%{_includedir}/blockdev/${plugin}.h \
+    >> ${plugin}-plugin-devel.filelist
 done
 
 sed -i -r 's,%{buildroot}(.*),\1,' ./*.filelist