From nobody Sun May 7 16:13:01 2023
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QDqG616ZTz49941;
Sun, 7 May 2023 16:13:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4QDqG53tyhz3lxh;
Sun, 7 May 2023 16:13:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683475981;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=LE8bX3cHzYcLrPcwhOgzbpu8U8uqES9p1djMuEs5boQ=;
b=rv45bNF5IVquD+N+EoTGaU1RhLAakLEAEcLaHtiJ/1uZOXi4NUYneef0GFwgrOKhm+2FbO
ora4uJquHZPF/tXT/GxX8aPZH0GFKQhrXYe0MxSctq7tKFrYyR/PIyGa7rJYw7rwRt4Y0I
qUM3j5QkjXa0sRHJe8J17eMDjfP1BJvgN7k807bwS2ailU4bNBx6sN0DHJJl5gnAd/4i5o
3TtuFG/rHzRCT5zOaDEGoKYlyOv7hbfIxYNBw7Z7kCf01mS8Ua8ylIjGV/zBIBTJEEeoBz
4eMLUC9YwCsxXIfJ4w/3cN96pdj1rO5qUu+NKuCjMpcvMJFPx7dlxDiueuUKxg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683475981;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=LE8bX3cHzYcLrPcwhOgzbpu8U8uqES9p1djMuEs5boQ=;
b=UMxIvQp0+hx3cE9BMKvGzPXVd7iMM29MJfZ3VKEe9DnMEwqqJcV/NTGexMeSQsCDak2g5f
0Qgt1+0aWBpFPCFtdagRbyMU+lkAe15pSlWnrTu1ZCM2RyFkU+6x7jvMk82ppHM/ETwte3
/gy7oEPMd9LeLYdBcpXAOqi+sAnMtwkv9zcYk1ZTthy1iGVn1RgXKJ+c+enhTq80UNLe9Y
RjFZsIB/K+Ltb1S77jngkXZ/fX6NTD9vve9KYCv/7W+XrwAzeczf9raPhoj3tSrpYNvxmJ
A1k78rXJlqNjUBhRWFabidElhO1/JlLUu5yEukVS0SuJu5EQLRu51fsj4L3Pvw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683475981; a=rsa-sha256; cv=none;
b=pLgPXFDv+J/EYMUdCaMgdoQzeNUXuRypvDLq6EFbLgZ9VXG6O7/yITYcYE11ZRDU3ClnD7
Gda862ncdHbSNQUZlEnQ984Cky4avaT2CUq3hpFoR+7wl/ZQwN7iFqN9amPcc/ef82pvqL
SstAmWMYj487eUwC4MqJVNZ2fFBZYeqfG6emn9htshJHYyH25iMxWpFiZBd6jq+XCLm29g
8eBS8XiMAzT17BY3wQNvB3EYdTwKAE2Ob6yQNUmVD6NkBBUQyadszb4KpPZ/A0v8KWaJ4n
uKqh4DfQL8vKPxu2PV3fBnjBldSUDAkQV4LEKd8jketkE8/1GWjgi+lAJdSmsg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QDqG52vfxzQB9;
Sun, 7 May 2023 16:13:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 347GD1m7039888;
Sun, 7 May 2023 16:13:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347GD1us039887;
Sun, 7 May 2023 16:13:01 GMT
(envelope-from git)
Date: Sun, 7 May 2023 16:13:01 GMT
Message-Id: <202305071613.347GD1us039887@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Subject: git: 4fd677b1f68d - main - devel/libpci: Update to 3.10.0
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: sunpoet
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4fd677b1f68ddf5fac449dbba35ff883f181ab4a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4fd677b1f68ddf5fac449dbba35ff883f181ab4a
commit 4fd677b1f68ddf5fac449dbba35ff883f181ab4a
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-05-07 16:03:11 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-05-07 16:03:11 +0000
devel/libpci: Update to 3.10.0
- Convert FreeBSD 12 extra patch to a normal patch
Changes: https://github.com/pciutils/pciutils/blob/master/ChangeLog
---
devel/libpci/Makefile | 8 +-------
devel/libpci/distinfo | 6 +++---
devel/libpci/files/patch-Makefile | 16 ++++++++++------
devel/libpci/files/patch-lib-ecam.c | 14 ++++++++++++++
.../{extra-patch-freebsd12 => patch-lib-mmio-ports.c} | 9 ++++++---
devel/libpci/files/patch-lib-pci.h | 4 ++--
6 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index 4437a5fd36c0..71ff576a9d7d 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -1,5 +1,5 @@
PORTNAME= libpci
-PORTVERSION= 3.9.0
+PORTVERSION= 3.10.0
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/utils/pciutils \
LOCAL/sunpoet
@@ -32,12 +32,6 @@ LIBPCI_FILES= include/pci/config.h \
lib/libpci.so.3 \
libdata/pkgconfig/libpci.pc
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 1300000
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-freebsd12
-.endif
-
post-patch:
@${LN} -s . ${WRKSRC}/lib/pci
diff --git a/devel/libpci/distinfo b/devel/libpci/distinfo
index bfcd4e97c95c..68aaca78013d 100644
--- a/devel/libpci/distinfo
+++ b/devel/libpci/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589494
-SHA256 (pciutils-3.9.0.tar.xz) = cdea7ae97239dee23249a09c68a19a287a3f109fbeb2c232ebb616cb38599012
-SIZE (pciutils-3.9.0.tar.xz) = 431624
+TIMESTAMP = 1683227581
+SHA256 (pciutils-3.10.0.tar.xz) = 238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9
+SIZE (pciutils-3.10.0.tar.xz) = 444080
diff --git a/devel/libpci/files/patch-Makefile b/devel/libpci/files/patch-Makefile
index b4ea1e23a3be..07189e5d7cc7 100644
--- a/devel/libpci/files/patch-Makefile
+++ b/devel/libpci/files/patch-Makefile
@@ -1,16 +1,16 @@
---- Makefile.orig 2022-11-20 11:58:03 UTC
+--- Makefile.orig 2023-05-01 12:59:54 UTC
+++ Makefile
@@ -1,8 +1,8 @@
# Makefile for The PCI Utilities
- # (c) 1998--2022 Martin Mares <mj@ucw.cz>
+ # (c) 1998--2023 Martin Mares <mj@ucw.cz>
-OPT=-O2
-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
+#OPT=-O2
+CFLAGS+=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
- VERSION=3.9.0
- DATE=2022-11-20
+ VERSION=3.10.0
+ DATE=2023-05-01
@@ -32,11 +32,11 @@ HWDB=
ABI_VERSION=3
@@ -25,18 +25,22 @@
MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
INCDIR=$(PREFIX)/include
LIBDIR=$(PREFIX)/lib
-@@ -46,11 +46,11 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
+@@ -45,13 +45,13 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
+ # Commands
INSTALL=install
DIRINSTALL=install -d
- STRIP=-s
-ifdef CROSS_COMPILE
+-STRIP=--strip-program $(CROSS_COMPILE)-strip
-CC=$(CROSS_COMPILE)gcc
-else
+-STRIP=-s
-CC=cc
-endif
+#ifdef CROSS_COMPILE
++#STRIP=--strip-program $(CROSS_COMPILE)-strip
+#CC=$(CROSS_COMPILE)gcc
+#else
++#STRIP=-s
+#CC=cc
+#endif
AR=$(CROSS_COMPILE)ar
diff --git a/devel/libpci/files/patch-lib-ecam.c b/devel/libpci/files/patch-lib-ecam.c
new file mode 100644
index 000000000000..0dab14c851c3
--- /dev/null
+++ b/devel/libpci/files/patch-lib-ecam.c
@@ -0,0 +1,14 @@
+--- lib/ecam.c.orig 2023-03-05 13:45:24 UTC
++++ lib/ecam.c
+@@ -924,7 +924,11 @@ ecam_init(struct pci_access *a)
+ if (!validate_addrs(addrs))
+ a->error("Option ecam.addrs has invalid address format \"%s\".", addrs);
+
++#if defined(O_DSYNC)
+ a->fd = open(devmem, (a->writeable ? O_RDWR : O_RDONLY) | O_DSYNC);
++#else
++ a->fd = open(devmem, (a->writeable ? O_RDWR : O_RDONLY));
++#endif
+ if (a->fd < 0)
+ a->error("Cannot open %s: %s.", devmem, strerror(errno));
+
diff --git a/devel/libpci/files/extra-patch-freebsd12 b/devel/libpci/files/patch-lib-mmio-ports.c
similarity index 62%
rename from devel/libpci/files/extra-patch-freebsd12
rename to devel/libpci/files/patch-lib-mmio-ports.c
index 23421a6b0491..a357cc2c1406 100644
--- a/devel/libpci/files/extra-patch-freebsd12
+++ b/devel/libpci/files/patch-lib-mmio-ports.c
@@ -1,11 +1,14 @@
---- lib/mmio-ports.c.orig 2022-11-18 13:59:51 UTC
+--- lib/mmio-ports.c.orig 2023-03-04 15:27:09 UTC
+++ lib/mmio-ports.c
-@@ -298,7 +298,7 @@ conf1_init(struct pci_access *a)
+@@ -298,7 +298,11 @@ conf1_init(struct pci_access *a)
if (!validate_addrs(addrs))
a->error("Option %s has invalid address format \"%s\".", addrs_param_name, addrs);
-- a->fd = open(devmem, O_RDWR | O_DSYNC); /* O_DSYNC bypass CPU cache for mmap() on Linux */
++#if defined(O_DSYNC)
+ a->fd = open(devmem, O_RDWR | O_DSYNC); /* O_DSYNC bypass CPU cache for mmap() on Linux */
++#else
+ a->fd = open(devmem, O_RDWR); /* O_DSYNC bypass CPU cache for mmap() on Linux */
++#endif
if (a->fd < 0)
a->error("Cannot open %s: %s.", devmem, strerror(errno));
}
diff --git a/devel/libpci/files/patch-lib-pci.h b/devel/libpci/files/patch-lib-pci.h
index addbf8787c7f..479459659a66 100644
--- a/devel/libpci/files/patch-lib-pci.h
+++ b/devel/libpci/files/patch-lib-pci.h
@@ -1,4 +1,4 @@
---- lib/pci.h.orig 2022-11-20 11:58:19 UTC
+--- lib/pci.h.orig 2023-05-01 13:00:07 UTC
+++ lib/pci.h
@@ -10,11 +10,11 @@
#define _PCI_LIB_H
@@ -13,5 +13,5 @@
+#include "pci/header.h"
+#include "pci/types.h"
- #define PCI_LIB_VERSION 0x030900
+ #define PCI_LIB_VERSION 0x030a00