From 83dc76156be49573e122e31b9882191a0b32dc78 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:50:30 +0000 Subject: [PATCH] import UBI libpciaccess-0.16-16.el10 --- .gitignore | 2 +- .libpciaccess.metadata | 1 - 0001-vgaarb-Check-snprintf-return-value.patch | 69 ++++++++++++++++ ...-size.patch => libpciaccess-rom-size.patch | 0 SPECS/libpciaccess.spec => libpciaccess.spec | 78 ++++++++++++++++--- ...apshot.sh => make-libpciaccess-snapshot.sh | 0 sources | 1 + 7 files changed, 139 insertions(+), 12 deletions(-) delete mode 100644 .libpciaccess.metadata create mode 100644 0001-vgaarb-Check-snprintf-return-value.patch rename SOURCES/libpciaccess-rom-size.patch => libpciaccess-rom-size.patch (100%) rename SPECS/libpciaccess.spec => libpciaccess.spec (74%) rename SOURCES/make-libpciaccess-snapshot.sh => make-libpciaccess-snapshot.sh (100%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 090189d..474702c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libpciaccess-0.14.tar.bz2 +libpciaccess-0.16.tar.bz2 diff --git a/.libpciaccess.metadata b/.libpciaccess.metadata deleted file mode 100644 index 2ae45e9..0000000 --- a/.libpciaccess.metadata +++ /dev/null @@ -1 +0,0 @@ -f70a958bf4e744cb4ee93be64e9bc52ac05cdaeb SOURCES/libpciaccess-0.14.tar.bz2 diff --git a/0001-vgaarb-Check-snprintf-return-value.patch b/0001-vgaarb-Check-snprintf-return-value.patch new file mode 100644 index 0000000..43f3686 --- /dev/null +++ b/0001-vgaarb-Check-snprintf-return-value.patch @@ -0,0 +1,69 @@ +From c4af0f3ab992977d7fde65240a15481a1adc859c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= +Date: Tue, 19 Mar 2024 13:45:19 +0100 +Subject: [PATCH] vgaarb: Check snprintf return value +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +snprintf() might return a negative value if an error occurs. +Check its return value before using it in vgaarb_write(). + +Signed-off-by: José Expósito +--- + src/common_vgaarb.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/common_vgaarb.c b/src/common_vgaarb.c +index 515275f..a1edfab 100644 +--- a/src/common_vgaarb.c ++++ b/src/common_vgaarb.c +@@ -238,6 +238,8 @@ pci_device_vgaarb_set_target(struct pci_device *dev) + + len = snprintf(buf, BUFSIZE, "target PCI:%04x:%02x:%02x.%x", + dev->domain, dev->bus, dev->dev, dev->func); ++ if (len < 0 || len >= BUFSIZE) ++ return -1; + + ret = vgaarb_write(pci_sys->vgaarb_fd, buf, len); + if (ret) +@@ -268,6 +270,9 @@ pci_device_vgaarb_decodes(int new_vgaarb_rsrc) + return 0; + + len = snprintf(buf, BUFSIZE, "decodes %s", rsrc_to_str(new_vgaarb_rsrc)); ++ if (len < 0 || len >= BUFSIZE) ++ return -1; ++ + ret = vgaarb_write(pci_sys->vgaarb_fd, buf, len); + if (ret == 0) + dev->vgaarb_rsrc = new_vgaarb_rsrc; +@@ -297,6 +302,8 @@ pci_device_vgaarb_lock(void) + return 0; + + len = snprintf(buf, BUFSIZE, "lock %s", rsrc_to_str(dev->vgaarb_rsrc)); ++ if (len < 0 || len >= BUFSIZE) ++ return -1; + + return vgaarb_write(pci_sys->vgaarb_fd, buf, len); + } +@@ -315,6 +322,8 @@ pci_device_vgaarb_trylock(void) + return 0; + + len = snprintf(buf, BUFSIZE, "trylock %s", rsrc_to_str(dev->vgaarb_rsrc)); ++ if (len < 0 || len >= BUFSIZE) ++ return -1; + + return vgaarb_write(pci_sys->vgaarb_fd, buf, len); + } +@@ -333,6 +342,8 @@ pci_device_vgaarb_unlock(void) + return 0; + + len = snprintf(buf, BUFSIZE, "unlock %s", rsrc_to_str(dev->vgaarb_rsrc)); ++ if (len < 0 || len >= BUFSIZE) ++ return -1; + + return vgaarb_write(pci_sys->vgaarb_fd, buf, len); + } +-- +2.44.0 + diff --git a/SOURCES/libpciaccess-rom-size.patch b/libpciaccess-rom-size.patch similarity index 100% rename from SOURCES/libpciaccess-rom-size.patch rename to libpciaccess-rom-size.patch diff --git a/SPECS/libpciaccess.spec b/libpciaccess.spec similarity index 74% rename from SPECS/libpciaccess.spec rename to libpciaccess.spec index 4748206..a76742d 100644 --- a/SPECS/libpciaccess.spec +++ b/libpciaccess.spec @@ -1,13 +1,9 @@ -#define gitdate 20140411 -#define gitrev b9c068896914b4132a24839c9ef7f9fcd6282d88 - Name: libpciaccess -Version: 0.14 -Release: 1%{?dist} +Version: 0.16 +Release: 16%{?dist} Summary: PCI access library -Group: System Environment/Libraries -License: MIT +License: HPND AND MIT URL: https://www.x.org/ # git snapshot. To recreate, run @@ -17,8 +13,10 @@ Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source1: make-libpciaccess-snapshot.sh Patch2: libpciaccess-rom-size.patch +Patch3: 0001-vgaarb-Check-snprintf-return-value.patch BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros +BuildRequires: make Requires: hwdata %description @@ -27,7 +25,6 @@ operating systems. %package devel Summary: PCI access library development package -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -35,8 +32,7 @@ Requires: pkgconfig Development package for libpciaccess. %prep -%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch2 -p1 -b .rom-size +%autosetup -p1 %build autoreconf -v --install @@ -61,6 +57,68 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %{_libdir}/pkgconfig/pciaccess.pc %changelog +* Tue Oct 29 2024 Troy Dawson - 0.16-16 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.16-15 +- Bump release for June 2024 mass rebuild + +* Wed Mar 20 2024 José Expósito - 0.16-14 +- Add gating.yaml + +* Wed Mar 20 2024 José Expósito - 0.16-13 +- Fix findings from static application security testing (SAST) + Resolves: https://issues.redhat.com/browse/RHEL-29742 + +* Thu Jan 25 2024 Fedora Release Engineering - 0.16-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 15 2023 Dave Airlie - 0.16-10 +- migrate to SPDX license + +* Thu Jul 20 2023 Fedora Release Engineering - 0.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Oct 30 2019 Adam Jackson - 0.16-1 +- libpciaccess 0.16 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 11 2019 Adam Jackson - 0.15-1 +- libpciaccess 0.15 + +* Fri Feb 01 2019 Fedora Release Engineering - 0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 04 2018 Adam Jackson - 0.14-1 - libpciaccess 0.14 diff --git a/SOURCES/make-libpciaccess-snapshot.sh b/make-libpciaccess-snapshot.sh similarity index 100% rename from SOURCES/make-libpciaccess-snapshot.sh rename to make-libpciaccess-snapshot.sh diff --git a/sources b/sources new file mode 100644 index 0000000..74a50c6 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libpciaccess-0.16.tar.bz2) = 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1