pciutils: update to 3.10.0

Manually refresh:
- 101-no-strip.patch

Remove upstreamed:
- 107-avoid-addng-multiple-version-tags.patch

ChangeLog:
https://github.com/pciutils/pciutils/blob/21407521fb62a65e39051561e16e4ce1a74362c1/ChangeLog

Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile
index 870ffae3ec3600df4fb672bfb209de4038512824..0eaea53423a6024e6b2111d79aa38cd75f7ad1ad 100644 (file)
--- a/utils/pciutils/Makefile
+++ b/utils/pciutils/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pciutils
-PKG_VERSION:=3.8.0
-PKG_RELEASE:=2
+PKG_VERSION:=3.10.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
-PKG_HASH:=91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05
+PKG_HASH:=238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9
 
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 PKG_LICENSE:=GPL-2.0

diff --git a/utils/pciutils/patches/101-no-strip.patch b/utils/pciutils/patches/101-no-strip.patch
index 827a4531cce392827643e34a03be1ec5bed6fe43..9fdfc7e5703edba52c22c7875d180d4f72832729 100644 (file)
--- a/utils/pciutils/patches/101-no-strip.patch
+++ b/utils/pciutils/patches/101-no-strip.patch
@@ -1,13 +1,13 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -131,8 +131,8 @@ distclean: clean
+@@ -149,8 +149,8 @@ distclean: clean
  install: all
  # -c is ignored on Linux, but required on FreeBSD
-       $(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5
+       $(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man5
 -      $(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR)
 -      $(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR)
 +      $(INSTALL) -c -m 755 lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR)
 +      $(INSTALL) -c -m 755 setpci$(EXEEXT) $(DESTDIR)$(SBINDIR)
        $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
+ ifneq ($(IDSDIR),)
        $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
-       $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8

diff --git a/utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch b/utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch
deleted file mode 100644 (file)
index 74b5782..0000000
--- a/utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0478e1f3928bfaa34eb910ba2cbaf1dda8f84aab Mon Sep 17 00:00:00 2001
-From: Martin Mares <mj@ucw.cz>
-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);