diff --git a/.gitignore b/.gitignore index a4401f6..b96f4a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pciutils-3.5.6.tar.gz +SOURCES/pciutils-3.6.4.tar.xz diff --git a/.pciutils.metadata b/.pciutils.metadata index fc5d441..7359466 100644 --- a/.pciutils.metadata +++ b/.pciutils.metadata @@ -1 +1 @@ -5e7add50fcebcbaf56846368fef568a0b6ebf730 SOURCES/pciutils-3.5.6.tar.gz +977b33f6beb8bbfd72a1ca4ac19ee50771b5924f SOURCES/pciutils-3.6.4.tar.xz diff --git a/SOURCES/pciutils-3.5.6-vafix.patch b/SOURCES/pciutils-3.5.6-vafix.patch deleted file mode 100644 index 6e4209c..0000000 --- a/SOURCES/pciutils-3.5.6-vafix.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -up pciutils-3.5.6/lib/init.c.vafix pciutils-3.5.6/lib/init.c ---- pciutils-3.5.6/lib/init.c.vafix 2018-08-21 15:44:16.245141888 +0200 -+++ pciutils-3.5.6/lib/init.c 2018-08-21 16:31:06.836445935 +0200 -@@ -98,6 +98,7 @@ pci_generic_error(char *msg, ...) - va_start(args, msg); - fputs("pcilib: ", stderr); - vfprintf(stderr, msg, args); -+ va_end(args); - fputc('\n', stderr); - exit(1); - } -@@ -110,6 +111,7 @@ pci_generic_warn(char *msg, ...) - va_start(args, msg); - fputs("pcilib: ", stderr); - vfprintf(stderr, msg, args); -+ va_end(args); - fputc('\n', stderr); - } - -diff -up pciutils-3.5.6/lib/names.c.vafix pciutils-3.5.6/lib/names.c ---- pciutils-3.5.6/lib/names.c.vafix 2018-08-21 16:32:35.268983348 +0200 -+++ pciutils-3.5.6/lib/names.c 2018-08-21 16:33:22.184737911 +0200 -@@ -148,11 +148,13 @@ pci_lookup_name(struct pci_access *a, ch - case PCI_LOOKUP_VENDOR: - iv = va_arg(args, int); - sprintf(numbuf, "%04x", iv); -+ va_end(args); - return format_name(buf, size, flags, id_lookup(a, flags, ID_VENDOR, iv, 0, 0, 0), numbuf, "Vendor"); - case PCI_LOOKUP_DEVICE: - iv = va_arg(args, int); - id = va_arg(args, int); - sprintf(numbuf, "%04x", id); -+ va_end(args); - return format_name(buf, size, flags, id_lookup(a, flags, ID_DEVICE, iv, id, 0, 0), numbuf, "Device"); - case PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE: - iv = va_arg(args, int); -@@ -160,11 +162,13 @@ pci_lookup_name(struct pci_access *a, ch - sprintf(numbuf, "%04x:%04x", iv, id); - v = id_lookup(a, flags, ID_VENDOR, iv, 0, 0, 0); - d = id_lookup(a, flags, ID_DEVICE, iv, id, 0, 0); -+ va_end(args); - return format_name_pair(buf, size, flags, v, d, numbuf); - case PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR: - isv = va_arg(args, int); - sprintf(numbuf, "%04x", isv); - v = id_lookup(a, flags, ID_VENDOR, isv, 0, 0, 0); -+ va_end(args); - return format_name(buf, size, flags, v, numbuf, "Unknown vendor"); - case PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE: - iv = va_arg(args, int); -@@ -172,6 +176,7 @@ pci_lookup_name(struct pci_access *a, ch - isv = va_arg(args, int); - isd = va_arg(args, int); - sprintf(numbuf, "%04x", isd); -+ va_end(args); - return format_name(buf, size, flags, id_lookup_subsys(a, flags, iv, id, isv, isd), numbuf, "Device"); - case PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM: - iv = va_arg(args, int); -@@ -181,6 +186,7 @@ pci_lookup_name(struct pci_access *a, ch - v = id_lookup(a, flags, ID_VENDOR, isv, 0, 0, 0); - d = id_lookup_subsys(a, flags, iv, id, isv, isd); - sprintf(numbuf, "%04x:%04x", isv, isd); -+ va_end(args); - return format_name_pair(buf, size, flags, v, d, numbuf); - case PCI_LOOKUP_CLASS: - icls = va_arg(args, int); -@@ -191,6 +197,7 @@ pci_lookup_name(struct pci_access *a, ch - if (!(flags & PCI_LOOKUP_NUMERIC)) /* Include full class number */ - flags |= PCI_LOOKUP_MIXED; - } -+ va_end(args); - return format_name(buf, size, flags, cls, numbuf, "Class"); - case PCI_LOOKUP_PROGIF: - icls = va_arg(args, int); -@@ -210,8 +217,10 @@ pci_lookup_name(struct pci_access *a, ch - if (*pif) - pif++; - } -+ va_end(args); - return format_name(buf, size, flags, pif, numbuf, "ProgIf"); - default: -+ va_end(args); - return ""; - } - } diff --git a/SPECS/pciutils.spec b/SPECS/pciutils.spec index e67f5f6..73772c7 100644 --- a/SPECS/pciutils.spec +++ b/SPECS/pciutils.spec @@ -1,7 +1,7 @@ Name: pciutils -Version: 3.5.6 -Release: 4%{?dist} -Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz +Version: 3.6.4 +Release: 2%{?dist} +Source: https://mirrors.edge.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.xz Source1: multilibconfigh #change pci.ids directory to hwdata, fedora/rhel specific @@ -9,7 +9,6 @@ Patch1: pciutils-2.2.1-idpath.patch #add support for directory with another pci.ids, rejected by upstream, rhbz#195327 Patch2: pciutils-dir-d.patch -Patch3: pciutils-3.5.6-vafix.patch Patch4: pciutils-3.5.6-freefix.patch License: GPLv2+ @@ -55,7 +54,6 @@ devices connected to the PCI bus. %setup -q -n pciutils-%{version} %patch1 -p1 -b .idpath %patch2 -p1 -b .dird -%patch3 -p1 -b .vafix %patch4 -p1 -b .freefix %build @@ -96,20 +94,17 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig %postun libs -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc README ChangeLog pciutils.lsm COPYING +%doc README ChangeLog pciutils.lsm /sbin/lspci /sbin/setpci %{_sbindir}/update-pciids %{_mandir}/man8/* %files libs -%doc COPYING -%defattr(-,root,root,-) +%license COPYING /%{_lib}/libpci.so.* %files devel-static -%defattr(-,root,root,-) %{_libdir}/libpci.a %files devel @@ -119,6 +114,13 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig %{_includedir}/pci %changelog +* Wed May 06 2020 Michal Hlavinka - 3.6.4-2 +- rebuild package + +* Mon May 04 2020 Michal Hlavinka - 3.6.4-1 +- pciutils updated to 3.6.4 +- some of the VPD data fields were displayed as unknown (#1828741) + * Tue Oct 16 2018 Michal Hlavinka - 3.5.6-4 - fix covscan found issues (#1607017)