[packages/sysfsutils] - updated to 2.1.1 upstream version; lsi fix already applied, but keep 2.2.0 version bump to avoid u
qboosh
qboosh at pld-linux.org
Sun Dec 24 13:27:12 CET 2023
commit e732e9278f4137b2a49ea6684fc7d8f0f1503387
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 24 12:32:54 2023 +0100
- updated to 2.1.1 upstream version; lsi fix already applied, but keep 2.2.0 version bump to avoid using epoch
sysfsutils-lsi.patch | 114 ++++++---------------------------------------------
sysfsutils.spec | 26 ++++++------
2 files changed, 25 insertions(+), 115 deletions(-)
---
diff --git a/sysfsutils.spec b/sysfsutils.spec
index 360bbf2..15c4768 100644
--- a/sysfsutils.spec
+++ b/sysfsutils.spec
@@ -1,18 +1,19 @@
-%define org_version 2.1.0
+%define org_version 2.1.1
Summary: System utilities package
Summary(pl.UTF-8): Pakiet narzędzi systemowych
Name: sysfsutils
Version: 2.2.0
-Release: 4
+Release: 5
License: LGPL v2.1/GPL v2
Group: Applications/System
-Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{org_version}.tar.gz
-# Source0-md5: 14e7dcd0436d2f49aa403f67e1ef7ddc
+#Source0Download: https://github.com/linux-ras/sysfsutils/releases
+Source0: https://github.com/linux-ras/sysfsutils/archive/v%{org_version}/%{name}-%{org_version}.tar.gz
+# Source0-md5: 537c110be7244905997262854505c30f
Patch0: %{name}-lsi.patch
-URL: http://linux-diag.sourceforge.net/Sysfsutils.html
+URL: https://github.com/linux-ras/sysfsutils
BuildRequires: autoconf >= 2.50
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake >= 1:1.11
+BuildRequires: libtool >= 2:2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -78,7 +79,9 @@ Statyczna biblioteka sysfs.
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ --disable-silent-rules \
+ --with-pci.ids=/lib/hwdata/pci.ids
%{__make}
%install
@@ -96,11 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
# COPYING contains only note, not actual GPL/LGPL texts
-%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/dlist_test
-%attr(755,root,root) %{_bindir}/get_device
-%attr(755,root,root) %{_bindir}/get_driver
-%attr(755,root,root) %{_bindir}/get_module
+%doc AUTHORS COPYING CREDITS README TODO
%attr(755,root,root) %{_bindir}/systool
%attr(755,root,root) %{_libdir}/libsysfs.so.*.*.*
%ghost %{_libdir}/libsysfs.so.2
@@ -112,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libsysfs.so
%{_libdir}/libsysfs.la
%{_includedir}/sysfs
+%{_pkgconfigdir}/libsysfs.pc
%files static
%defattr(644,root,root,755)
diff --git a/sysfsutils-lsi.patch b/sysfsutils-lsi.patch
index 3a6d22e..d47f187 100644
--- a/sysfsutils-lsi.patch
+++ b/sysfsutils-lsi.patch
@@ -1,109 +1,19 @@
-diff -urN sysfsutils-2.1.0/ChangeLog sysfsutils-2.2.0/ChangeLog
---- sysfsutils-2.1.0/ChangeLog 2006-08-23 09:37:02.000000000 +0200
-+++ sysfsutils-2.2.0/ChangeLog 2010-03-17 08:14:50.000000000 +0100
-@@ -1,3 +1,8 @@
-+15/03/2010 - Sateesh Kumar Galla <sateesh.galla at lsi.com>
-+ * Fixed bug in cdev_name_equal() where
-+ /sys/class/scsi_host/host20 was a false positive hit for
-+ /sys/class/scsi_host/host2
-+
- 18/07/2006 - Mohan Kumar M <mohan at in.ibm.com>
- * Add subsystem in sysfs_device
-
-diff -urN sysfsutils-2.1.0/configure.ac sysfsutils-2.2.0/configure.ac
---- sysfsutils-2.1.0/configure.ac 2006-08-07 07:08:00.000000000 +0200
-+++ sysfsutils-2.2.0/configure.ac 2010-03-15 14:10:08.000000000 +0100
+--- sysfsutils-2.1.1/configure.ac.orig 2023-12-24 11:40:54.621123222 +0100
++++ sysfsutils-2.1.1/configure.ac 2023-12-24 11:41:22.687637839 +0100
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
--AC_INIT(sysfsutils, 2.1.0, linux-diag-devel at lists.sourceforge.net)
-+AC_INIT(sysfsutils, 2.2.0, linux-diag-devel at lists.sourceforge.net)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([config.h.in])
- AM_CONFIG_HEADER([config.h])
-diff -urN sysfsutils-2.1.0/lib/Makefile.am sysfsutils-2.2.0/lib/Makefile.am
---- sysfsutils-2.1.0/lib/Makefile.am 2006-08-07 07:08:01.000000000 +0200
-+++ sysfsutils-2.2.0/lib/Makefile.am 2010-03-17 08:43:24.000000000 +0100
-@@ -1,7 +1,32 @@
-+ #
-+ # Copyrigth (C) LSI Corp. 2010
-+ #
-+ # This library is free software;you can redistribute it and/or
-+ # modify it uder the terms of the GNU Lesser General Public
-+ # License as published by the Free Software Foundation; either
-+ # version 2.1 of the License, or (at your option) any later version.
-+ #
-+ # This library is distributed in the hope that it will be useful,
-+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ # Lesser General Public License for more details.
-+ #
-+ # You should have received a copy of the GNU Lesser General Public
-+ # License along with this library;if not, write to the Free Software
-+ # Foundation, Inc.,59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ #
-+ # NOTE: This file has been changed to increase the version to
-+ # libsysfs.2.0.2.
-+ # libsysfs.2.0.2 will fix the issue related to sysfs_get_class_devices()
-+ # not returning some scsi_host class entries under certain conditions.
-+ # Please check NOTE in sysfs_class.c file for more information.
-+ # <sateesh.galla at lsi.com>
-+ #
-+
- lib_LTLIBRARIES = libsysfs.la
+-AC_INIT([sysfsutils], [2.1.1], [https://github.com/linux-ras/sysfsutils/issues])
++AC_INIT([sysfsutils], [2.2.0], [https://github.com/linux-ras/sysfsutils/issues])
+ AC_CONFIG_SRCDIR([cmd/systool.c])
+ AC_CONFIG_MACRO_DIR([m4])
+
+--- sysfsutils-2.1.1/lib/Makefile.am.orig 2023-12-24 11:42:40.427216688 +0100
++++ sysfsutils-2.1.1/lib/Makefile.am 2023-12-24 11:43:52.083495160 +0100
+@@ -7,6 +7,6 @@ lib_LTLIBRARIES = libsysfs.la
libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \
sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h
- INCLUDES = -I../include
+ libsysfs_la_CPPFLAGS = -I$(top_srcdir)/include
-libsysfs_la_LDFLAGS = -version-info 2:1:0
+libsysfs_la_LDFLAGS = -version-info 2:2:0
EXTRA_CFLAGS = @EXTRA_CLFAGS@
- libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
-diff -urN sysfsutils-2.1.0/lib/sysfs_class.c sysfsutils-2.2.0/lib/sysfs_class.c
---- sysfsutils-2.1.0/lib/sysfs_class.c 2006-08-07 07:08:01.000000000 +0200
-+++ sysfsutils-2.2.0/lib/sysfs_class.c 2010-03-26 13:15:49.000000000 +0100
-@@ -18,8 +18,37 @@
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Fixed a bug in cdev_name_equal()
-+ *
-+ * Copyrigth (C) LSI Corp. 2010
- *
-+ * This library is free software;you can redistribute it and/or
-+ * modify it uder the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library;if not, write to the Free Software
-+ * Foundation, Inc.,59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * NOTE: This file has been changed to fix the following issue.
-+ * ISSUE: sysfs_get_class_devices() does not return all the scsi_host class
-+ * entries under certain conditions. Suppose if there are "host1", "host2"
-+ * "host3", "host10" and "host20" entries under /sys/class/scsi_host, then,
-+ * if user application calls sysfs_get_class_devices(), the returned dlist *
-+ * linked list dose not contain "host1" and "host2" entries.
-+ * The bug is identified and fixed in cdev_name_equal() function where
-+ * /sys/class/scsi_host/host20 was a false positive hit for
-+ * /sys/class/scsi_host/host2.
-+ * <sateesh.galla at lsi.com>
- */
-+
- #include "libsysfs.h"
- #include "sysfs.h"
-
-@@ -66,7 +95,7 @@
- return 0;
-
- if (strncmp((char *)a, ((struct sysfs_class_device *)b)->name,
-- strlen((char *)a)) == 0)
-+ SYSFS_NAME_LEN) == 0)
- return 1;
-
- return 0;
+ libsysfs_la_CFLAGS = -Wall -W -Wextra -Wstrict-prototypes $(EXTRA_CLFAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sysfsutils.git/commitdiff/e732e9278f4137b2a49ea6684fc7d8f0f1503387
More information about the pld-cvs-commit
mailing list