packages/pciutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!4 update pciutils to 3.6.4

Browse Source 
Merge pull request !4 from lfl/master
This commit is contained in:
openeuler-ci-bot 2020-05-13 10:58:54 +08:00 committed by Gitee
commit 560a3990ad
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
0000-pciutils-2.2.1-idpath.patch → 6000-pciutils-2.2.1-idpath.patch
View File

12
0001-pciutils-dir-d.patch → 6001-pciutils-dir-d.patch
View File

@ -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 @@ @@ -6,10 +6,13 @@
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
*/ */
+#define _GNU_SOURCE +#define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -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,}; + char new_id_path[PATH_MAX+1] = {0,};
+ DIR *pci_ids_dir; + DIR *pci_ids_dir;
+ struct dirent *dp; + struct dirent *dp;
+ +
+ strncpy(new_id_path, a->id_file_name, PATH_MAX); + strncpy(new_id_path, a->id_file_name, PATH_MAX);
+ new_id_path[PATH_MAX] = 0; + new_id_path[PATH_MAX] = 0;
+ strncat(new_id_path, ".d/", PATH_MAX - strnlen(new_id_path, PATH_MAX)); + strncat(new_id_path, ".d/", PATH_MAX - strnlen(new_id_path, PATH_MAX));
+ /* printf("new_id_path is %s\n", new_id_path); */ + /* 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) + if (pci_ids_dir == NULL)
+ return 0; + 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, ".")) + if (! strcmp(dp->d_name, "..") || ! strcmp(dp->d_name, "."))
+ continue; + continue;
+ if (strstr(dp->d_name, ".ids")) + if (strstr(dp->d_name, ".ids"))
+ { + {
+ tempsize = strnlen(new_id_path, PATH_MAX) + dp->d_reclen + 1; + 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); + memset(temp, 0, tempsize);
+ strncpy(temp, new_id_path, (strnlen(new_id_path, PATH_MAX))+1); + strncpy(temp, new_id_path, (strnlen(new_id_path, PATH_MAX))+1);
+ strncat(temp, dp->d_name, PATH_MAX - strnlen(temp, PATH_MAX)); + 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); + }while (dp != NULL);
+ closedir(pci_ids_dir); + closedir(pci_ids_dir);
+ return 1; + return 1;
+} +}
diff -up pciutils-3.0.0/lib/pci.h.dird pciutils-3.0.0/lib/pci.h 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.dird 2008-04-10 21:23:05.000000000 +0200
+++ pciutils-3.0.0/lib/pci.h 2008-09-01 15:17:23.000000000 +0200 +++ pciutils-3.0.0/lib/pci.h 2008-09-01 15:17:23.000000000 +0200

BIN
pciutils-3.6.2.tar.gz
View File

Binary file not shown.

BIN
pciutils-3.6.4.tar.gz Normal file
View File

Binary file not shown.

21
pciutils.spec
View File

@ -1,15 +1,11 @@
Name: pciutils Name: pciutils
Version: 3.6.2 Version: 3.6.4
Release: 5 Release: 1
Summary: PCI bus related utilities Summary: PCI bus related utilities
License: GPLv2+ License: GPLv2+
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
Source0: https://mirrors.edge.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.gz 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
ExclusiveOS: Linux ExclusiveOS: Linux
BuildRequires: gcc git sed kmod-devel pkgconfig zlib-devel BuildRequires: gcc git sed kmod-devel pkgconfig zlib-devel
@ -19,6 +15,12 @@ Obsoletes: %{name}-libs
Provides: %{name}-libs-debuginfo Provides: %{name}-libs-debuginfo
Obsoletes: %{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 %description
The PCI Utilities are a collection of programs for inspecting and manipulating configuration 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 of PCI devices, all based on a common portable library libpci which offers access to the PCI
@ -97,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/hwdata/pci.ids*
%{_libdir}/libpci.a %{_libdir}/libpci.a
%files help %files help
%{_mandir}/man5/*
%{_mandir}/man7/* %{_mandir}/man7/*
%{_mandir}/man8/* %{_mandir}/man8/*
@ -104,6 +107,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/hwdata/pci.ids*
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Apr 14 2020 linfeilong<linfeilong@huawei.com> - 3.6.4-1
- Type:enhancemnet
- ID:NA
- SUG:NA
- DESC:update to 3.6.4
* Tue Mar 17 2020 hy-euler <eulerstoragemt@huawei.com> - 3.6.2-5 * Tue Mar 17 2020 hy-euler <eulerstoragemt@huawei.com> - 3.6.2-5
- Type:enhancemnet - Type:enhancemnet
- ID:NA - ID:NA