From nobody Mon Jan 30 13:05:43 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 4P57hm1G6sz3cYKl; Mon, 30 Jan 2023 13:05:44 +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 4P57hm0R2Xz4PXl; Mon, 30 Jan 2023 13:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083944; 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=Y4dcEQCElq8rVekxyNPcgRpan9cTVDNPguDXof92idU=; b=cjush+x8zhm0GNQeR6+vMTSHYrtDypN1OJWhe3MtgPbq9GnBd6O2jeIAhPBod5iF/cfXTz eApU97oeFlJv3xe7HlSQZKARceGOpw7ldPTxvqB+3HD531WmXGGQZZgrVBm0Kki3TNSFU9 M7pB0H3pTNMZjqf+myCcy5p/APAJp5sDYn7D3sEcWLbX3qgZfWZ+8nOMLP4rFVLueBMCJ6 Xp1QpfQ7BZbLlHZAPg5WRhbjoEMVD7AonrSZF5mKAfgmknVJO+Oa8QgGlW/N7lG+dnI0ev AEt8bbb8giUoa/1eyBSw/vsFc3ZJ6AE136WSEEKd5Y0zGXyQJRJwnZ3pZMMZqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083944; 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=Y4dcEQCElq8rVekxyNPcgRpan9cTVDNPguDXof92idU=; b=RIcE+W1HlERxkxIFZz6Zk2axDRxhCd28M+Q315DY5NRQdh1WSaj+rl82B9Lf/UBMwixzs3 YbhwYmu++2DGtoqQbkjNWvO5nnrGemeJzyTAJ/oG5St2+v+Ri5sMHUA4siOaHctuU/YcCB USeOc4ab5Et+4fH+ocSEnuymr4NBHn8XxXWhRlwopZiheLeqyc8maQgH0GgaAbs1d8n3AP iVyMXbCobaOqVDIup76lg7673w/ataFerP8rJwmWPEiwKcOt/63OF566aOWif583TREmxK S3LHyeyqVaIrnluVmY59jnNB6TOrZO1wUuFQuy1FQN9I3MuHHIhhpAUV0X4YiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675083944; a=rsa-sha256; cv=none; b=L1ePBtXT2ocoxpb2PehyqKwsTBpa6Oh2DDmuElRKSbDwtKpe91wHm9GoTArEx0gB5oIhCV YzTuSb6oWDTHq8E+U8QuA+LU+oQoKQpHFgOAxrOHm+IJ4Qq3cEa6q+FjKstvOW8yaMFJSe VARTS5ROg4eSZjrXq/+2cP2OwWZAxCoPXeFL8u6PCqGqjyxAiYLcZFsvzJkPmQjemgPy8y Nf+0qX8jBMvLLBqR0JfxEkpF/eO7G3sRLQLoD1b5Mus5lS+fhGel15gXTawSWb0TCofVcT fDXlTRn7kCZs9tEgsVAht+04PAo19F8FhYph9sIlMNkDkGP87/X3ozQVZYKtSg== 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 4P57hl6SgZz18JV; Mon, 30 Jan 2023 13:05:43 +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 30UD5hEh052558; Mon, 30 Jan 2023 13:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UD5hB6052557; Mon, 30 Jan 2023 13:05:43 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:05:43 GMT Message-Id: <202301301305.30UD5hB6052557@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 7c981661b355 - main - devel/libpci: Update to 3.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 7c981661b355e387300622d6c9ccd59b832a3edf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c981661b355e387300622d6c9ccd59b832a3edf commit 7c981661b355e387300622d6c9ccd59b832a3edf Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:27:21 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 12:59:02 +0000 devel/libpci: Update to 3.9.0 Changes: https://github.com/pciutils/pciutils/blob/master/ChangeLog --- devel/libpci/Makefile | 8 +++++++- devel/libpci/distinfo | 6 +++--- devel/libpci/files/extra-patch-freebsd12 | 11 +++++++++++ devel/libpci/files/patch-Makefile | 10 +++++----- devel/libpci/files/patch-lib-pci.h | 4 ++-- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile index 02ab68fb1d88..4437a5fd36c0 100644 --- a/devel/libpci/Makefile +++ b/devel/libpci/Makefile @@ -1,5 +1,5 @@ PORTNAME= libpci -PORTVERSION= 3.8.0 +PORTVERSION= 3.9.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/utils/pciutils \ LOCAL/sunpoet @@ -32,6 +32,12 @@ LIBPCI_FILES= include/pci/config.h \ lib/libpci.so.3 \ libdata/pkgconfig/libpci.pc +.include + +.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 f18f6c041041..bfcd4e97c95c 100644 --- a/devel/libpci/distinfo +++ b/devel/libpci/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650970037 -SHA256 (pciutils-3.8.0.tar.xz) = 91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05 -SIZE (pciutils-3.8.0.tar.xz) = 410144 +TIMESTAMP = 1674589494 +SHA256 (pciutils-3.9.0.tar.xz) = cdea7ae97239dee23249a09c68a19a287a3f109fbeb2c232ebb616cb38599012 +SIZE (pciutils-3.9.0.tar.xz) = 431624 diff --git a/devel/libpci/files/extra-patch-freebsd12 b/devel/libpci/files/extra-patch-freebsd12 new file mode 100644 index 000000000000..23421a6b0491 --- /dev/null +++ b/devel/libpci/files/extra-patch-freebsd12 @@ -0,0 +1,11 @@ +--- lib/mmio-ports.c.orig 2022-11-18 13:59:51 UTC ++++ lib/mmio-ports.c +@@ -298,7 +298,7 @@ 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 */ ++ a->fd = open(devmem, O_RDWR); /* O_DSYNC bypass CPU cache for mmap() on Linux */ + if (a->fd < 0) + a->error("Cannot open %s: %s.", devmem, strerror(errno)); + } diff --git a/devel/libpci/files/patch-Makefile b/devel/libpci/files/patch-Makefile index 93d0e7538725..b4ea1e23a3be 100644 --- a/devel/libpci/files/patch-Makefile +++ b/devel/libpci/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2022-04-18 16:47:28 UTC +--- Makefile.orig 2022-11-20 11:58:03 UTC +++ Makefile @@ -1,8 +1,8 @@ # Makefile for The PCI Utilities @@ -9,10 +9,10 @@ +#OPT=-O2 +CFLAGS+=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes - VERSION=3.8.0 - DATE=2022-04-18 + VERSION=3.9.0 + DATE=2022-11-20 @@ -32,11 +32,11 @@ HWDB= - ABI_VERSION=.3 + ABI_VERSION=3 # Installation directories -PREFIX=/usr/local @@ -41,4 +41,4 @@ +#endif AR=$(CROSS_COMPILE)ar RANLIB=$(CROSS_COMPILE)ranlib - + DLLTOOL=$(CROSS_COMPILE)dlltool diff --git a/devel/libpci/files/patch-lib-pci.h b/devel/libpci/files/patch-lib-pci.h index dd1434529b5a..addbf8787c7f 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 2020-05-30 22:17:41 UTC +--- lib/pci.h.orig 2022-11-20 11:58:19 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 0x030700 + #define PCI_LIB_VERSION 0x030900