From nobody Sun Dec 10 06:02:12 2023 X-Original-To: dev-commits-ports-all@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 4SnvR86lntz539qF; Sun, 10 Dec 2023 06:02:12 +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 4SnvR83d0kz3Thl; Sun, 10 Dec 2023 06:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702188132; 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=s8SXCD2FjMTcshE6XtJn3uhkcD99mPkeB+xCTLPUPYI=; b=Aq1mtUEWFoocu1w4B4WEY8bL577vv94QM53KV9gJKtkIPqdmbap9AhwZg6ORzM0Ut+eChb OGmWihAV4Bx3zmYHpu1gvYsfDoiRYls+kaYU02xVsdufLURrsGJAjoSnuQnRS4eIkjNSmy 11sRIgmryKxxLRdKBTxpC0yTffFMMAoksaxTo0zksJb1w5kAmdbnT1d0msNJcvb2+wYLEE GsL6aMhdzqkZIsWjKOVKX7ODjPZObbmjEH7k2OqEeuiI8Kzqjsb27a0UwrZfgDC8HhmtKh Fcob8CGTlRG3GsogBn3FAmgYp5ZAtjHxzo2TibzMsbPgUHyFPbLiNA8TSHAY0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702188132; a=rsa-sha256; cv=none; b=Mptzlgf5xHBhVQMQsGMXyZissIwI6jSRDeVHYZuaGpDqwtHA69D9b/yjMy503uJK6H47F7 Ms0YjG6ysfvmuw0rXmW0MQcN0mmSlDhLQXvH/kOkJfuvqWhcx2L6L8p2GAVUtPNWrSHkI+ s3NabCScF3O5xYJxmelJ13n+6EKdTPKJx/5jicRQFFBjpf/I8hM8wLgTN84zsf+y34dXjy gNoYHTdJHpNk7D9t4uUkVli6FJpSedT/v00qxyYHPe5rwGrPsgFkG8ftEItCz94we0tT04 IW3Lmh1wbO2Rk7fiMD3oqWv2uEDzMN39cINrMuS2b9hzshm8d8l996JBsNnuHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702188132; 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=s8SXCD2FjMTcshE6XtJn3uhkcD99mPkeB+xCTLPUPYI=; b=P/A/LQyg14T0j7jCWAizODkFld+kOGV+IUBePqb60W4SevqJlzKedSrWO+FRPk0GxuFePe SXtY9JVWwDIDQunixYziAGiPiIKDldxduBvVh2x66N2UK0NvWYnN6ci87lSlQE4Y4u6MJM sdiCL0UlOq3ZIrfTXwuT1gY4022/0hv2yLD6E9uVR640b61mVtDChVMuhfK1nTdTBwDyI3 BJT04vAqHQHf+8inDuItctmrGMxxf9YTM1tIOXDE5xmg4sACJS+TRoU4Q59bzdZ2A4u0yF oX9SQc0ZihBs/+vow+u45Rr02Qvyj3/Yoe0ZVkqRC6svPCDSjU6ObbskG80flA== 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 4SnvR818N3zc13; Sun, 10 Dec 2023 06:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BA62CC2035479; Sun, 10 Dec 2023 06:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BA62CGN035476; Sun, 10 Dec 2023 06:02:12 GMT (envelope-from git) Date: Sun, 10 Dec 2023 06:02:12 GMT Message-Id: <202312100602.3BA62CGN035476@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: c55f600615d7 - 2023Q4 - archivers/rpm4: Unbreak build for FreeBSD 14 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: c55f600615d73a715dc13fd010e32095eb065e1e Auto-Submitted: auto-generated The branch 2023Q4 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=c55f600615d73a715dc13fd010e32095eb065e1e commit c55f600615d73a715dc13fd010e32095eb065e1e Author: Rodrigo Osorio AuthorDate: 2023-12-01 21:22:20 +0000 Commit: Rodrigo Osorio CommitDate: 2023-12-10 05:44:13 +0000 archivers/rpm4: Unbreak build for FreeBSD 14 (cherry picked from commit 3f92c66f41ea624538d2b21d983ac9e89a8f6992) --- archivers/rpm4/Makefile | 2 +- archivers/rpm4/files/patch-python_header-py.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index a3e8898b6bb6..d10ea97f6f2a 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -1,6 +1,6 @@ PORTNAME= rpm PORTVERSION= 4.18.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/ PKGNAMESUFFIX= 4 diff --git a/archivers/rpm4/files/patch-python_header-py.c b/archivers/rpm4/files/patch-python_header-py.c new file mode 100644 index 000000000000..828f441dddd8 --- /dev/null +++ b/archivers/rpm4/files/patch-python_header-py.c @@ -0,0 +1,11 @@ +--- python/header-py.c.orig 2023-11-30 19:45:23 UTC ++++ python/header-py.c +@@ -741,7 +741,7 @@ + 0, /* tp_as_number */ + &hdr_as_sequence, /* tp_as_sequence */ + &hdr_as_mapping, /* tp_as_mapping */ +- hdr_hash, /* tp_hash */ ++ (hashfunc)hdr_hash, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + (getattrofunc) hdr_getattro, /* tp_getattro */