diff --git a/6000-pciutils-2.2.1-idpath.patch b/0000-pciutils-2.2.1-idpath.patch similarity index 95% rename from 6000-pciutils-2.2.1-idpath.patch rename to 0000-pciutils-2.2.1-idpath.patch index edb58d7824a7ba36eb657eec1e9d2f7c864dd81f..fdd5f9c43efea1fb67bf37d722ddf98b57c3958a 100644 --- a/6000-pciutils-2.2.1-idpath.patch +++ b/0000-pciutils-2.2.1-idpath.patch @@ -2,7 +2,7 @@ diff -up pciutils-3.0.0/Makefile.idpath pciutils-3.0.0/Makefile --- pciutils-3.0.0/Makefile.idpath 2008-04-10 21:19:43.000000000 +0200 +++ pciutils-3.0.0/Makefile 2008-09-01 15:16:19.000000000 +0200 @@ -27,7 +27,7 @@ ABI_VERSION=.3 - PREFIX=/usr/local + BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin SHAREDIR=$(PREFIX)/share -IDSDIR=$(SHAREDIR) diff --git a/6001-pciutils-dir-d.patch b/0001-pciutils-dir-d.patch similarity index 96% rename from 6001-pciutils-dir-d.patch rename to 0001-pciutils-dir-d.patch index 27333ffdafca66dbe5c0bc432018e39b25d06e24..2fae8f18a93a5f83043a3e07226d438e0f2c2b53 100644 --- a/6001-pciutils-dir-d.patch +++ b/0001-pciutils-dir-d.patch @@ -4,7 +4,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c @@ -6,10 +6,13 @@ * Can be freely distributed and used under the terms of the GNU GPL. */ - + +#define _GNU_SOURCE #include #include @@ -63,12 +63,12 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c + char new_id_path[PATH_MAX+1] = {0,}; + DIR *pci_ids_dir; + struct dirent *dp; -+ ++ + strncpy(new_id_path, a->id_file_name, PATH_MAX); + new_id_path[PATH_MAX] = 0; + strncat(new_id_path, ".d/", PATH_MAX - strnlen(new_id_path, PATH_MAX)); + /* printf("new_id_path is %s\n", new_id_path); */ -+ pci_ids_dir = opendir(new_id_path); ++ pci_ids_dir = opendir(new_id_path); + if (pci_ids_dir == NULL) + return 0; + @@ -78,10 +78,10 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c + { + if (! strcmp(dp->d_name, "..") || ! strcmp(dp->d_name, ".")) + continue; -+ if (strstr(dp->d_name, ".ids")) ++ if (strstr(dp->d_name, ".ids")) + { + tempsize = strnlen(new_id_path, PATH_MAX) + dp->d_reclen + 1; -+ temp = malloc(tempsize); /* This malloced memory is freed in the function pci_set_name_list_path() */ ++ temp = malloc(tempsize); /* This malloced memory is freed in the function pci_set_name_list_path() */ + memset(temp, 0, tempsize); + strncpy(temp, new_id_path, (strnlen(new_id_path, PATH_MAX))+1); + strncat(temp, dp->d_name, PATH_MAX - strnlen(temp, PATH_MAX)); @@ -99,7 +99,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c + }while (dp != NULL); + closedir(pci_ids_dir); + return 1; -+} ++} diff -up pciutils-3.0.0/lib/pci.h.dird pciutils-3.0.0/lib/pci.h --- pciutils-3.0.0/lib/pci.h.dird 2008-04-10 21:23:05.000000000 +0200 +++ pciutils-3.0.0/lib/pci.h 2008-09-01 15:17:23.000000000 +0200 diff --git a/0002-avoid-addng-multiple-version-tags.patch b/0002-avoid-addng-multiple-version-tags.patch new file mode 100644 index 0000000000000000000000000000000000000000..74b5782881ac9d6da3b4ada217534bd3bd1c18c0 --- /dev/null +++ b/0002-avoid-addng-multiple-version-tags.patch @@ -0,0 +1,42 @@ +From 0478e1f3928bfaa34eb910ba2cbaf1dda8f84aab Mon Sep 17 00:00:00 2001 +From: Martin Mares +Date: Wed, 10 Aug 2022 13:34:28 +0700 +Subject: [PATCH] Avoid adding multiple version tags to the same symbol + +This is apparently forbidden in most versions of binutils. +--- + lib/filter.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +--- a/lib/filter.c ++++ b/lib/filter.c +@@ -303,21 +303,25 @@ pci_filter_match_v30(struct pci_filter_v + // (their positions in struct pci_filter were declared as RFU). + + STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f)); ++DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38); + SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); ++SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8); + + STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str)); ++DEFINE_ALIAS(char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str), pci_filter_parse_slot_v38); + SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3); ++SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8); + + STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str)); ++DEFINE_ALIAS(char *pci_filter_parse_id_v33(struct pci_filter *f, char *str), pci_filter_parse_id_v38); + SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3); ++SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8); + + STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d)); ++DEFINE_ALIAS(int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38); + SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3); ++SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8); diff --git a/pciutils-3.6.4.tar.gz b/pciutils-3.6.4.tar.gz deleted file mode 100644 index d2a539c8be0466aa88c8279e290eae3e9ebedcb5..0000000000000000000000000000000000000000 Binary files a/pciutils-3.6.4.tar.gz and /dev/null differ diff --git a/pciutils-3.8.0.tar.gz b/pciutils-3.8.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..69f0c95e8d9eb395c043a66df114ecbc85cf5ddb Binary files /dev/null and b/pciutils-3.8.0.tar.gz differ diff --git a/pciutils.spec b/pciutils.spec index bd5d44deefa3d0ba99c6c1e1acf0bf6c87c4cbba..98ab2f303dffe236a9f3e4db596b9c3a4c1aa68b 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,14 +1,20 @@ Name: pciutils -Version: 3.6.4 -Release: 4 +Version: 3.8.0 +Release: 1 Summary: PCI bus related utilities License: GPLv2+ URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Source0: https://mirrors.edge.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.gz +# patch0 is from fedora, change pci.ids directory from /usr/share to /usr/share/hwdata +Patch0: 0000-pciutils-2.2.1-idpath.patch +# patch1 is from fedora, rhbz#195327 +Patch1: 0001-pciutils-dir-d.patch +#https://github.com/openwrt/packages/pull/19215 +Patch2: 0002-avoid-addng-multiple-version-tags.patch ExclusiveOS: Linux -BuildRequires: gcc git sed kmod-devel pkgconfig zlib-devel +BuildRequires: gcc sed kmod-devel pkgconfig zlib-devel %ifarch i686 BuildRequires: which kmod-libs @@ -20,12 +26,6 @@ Obsoletes: %{name}-libs Provides: %{name}-libs-debuginfo Obsoletes: %{name}-libs-debuginfo -#change pci.ids directory to hwdata, fedora/rhel specific -Patch6000: 6000-pciutils-2.2.1-idpath.patch - -#add support for directory with another pci.ids, rejected by upstream, rhbz#195327 -Patch6001: 6001-pciutils-dir-d.patch - %description The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices, all based on a common portable library libpci which offers access to the PCI @@ -56,7 +56,7 @@ Requires: man This contains man files for the using of pciutils. %prep -%autosetup -Sgit -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 %build make SHARED="no" ZLIB="no" LIBKMOD=yes STRIP="" OPT="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" PREFIX="/usr" %{?_smp_mflags} @@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/hwdata/pci.ids* %files %defattr(-,root,root,-) %doc README ChangeLog pciutils.lsm COPYING -/sbin/lspci +/usr/bin/lspci /sbin/setpci /sbin/update-pciids /%{_lib}/libpci.so.* @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/hwdata/pci.ids* rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 7 2023 liyanan - 3.8.0-1 +- update to v3.8.0 + * Tue Feb 9 2021 Zhiqiang Liu - 3.6.4-4 - solve i686 dependency problem and set release num to 4 for CI