From nobody Fri Dec 01 21:25:47 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 4ShmLz5sgNz53Dml; Fri, 1 Dec 2023 21:25:47 +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 4ShmLz3XjGz4Zqm; Fri, 1 Dec 2023 21:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701465947; 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=KU44Mmr4Z4qZ9lMBLfL9kNgKDHK69Z/04F3up5WE9x4=; b=r2nwh9eW2WTU2cgKg2eAUuSKXslFj5X21v2LA0qITbwZ7jMwOO1t6cT7QTdnMktdFEl6f6 D37Dd/L69XD2HsDEJ8RCQYx4hJYRt5SdLPxLV/qACEH7QI6c6B4fMwhAInZMtnTkCiLd52 90e18U5BOFHnDu/WsTk/ftj6wibGm0KCqGnzB05+ntsy+/83BulwsrsUQs/pWwIcgRzdtR QN+8DTB9uccUVTE7GVoUD38ahPvR/jR5QSHSTnkv8Vp9bHBFbAXAhrb8w59WdoKMLwaMNZ qtYgJUk2my+tCnQPRsuCdtrF0j+Ga+TaOnrohng/jf/xIflLg7YdsZeYwVYfAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701465947; 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=KU44Mmr4Z4qZ9lMBLfL9kNgKDHK69Z/04F3up5WE9x4=; b=CXnMOJs2xYi7lrAMkdX0gSYLDFnxhijfDf5O6Gz9pdD/Wvf701vnE+jECWCXupnLr1lDJF 5LzAPjMfI5utL1SJjxlPCpF8DAdXM2ciLNCuTfzRV3xDxbNZYCEtIjTkFkOPP1sx5szht4 jfw7B0zmuONF9qNVD+XfKGz2UaJXzB2hEnDCy780j6U9sTQtwN/niTpJFR0sk1zDYKxzt3 KCvI1nRbMLprgLBqpKhxQ1xPDtklYvtm+LParAhXvZx2qUU8ybEfpKAWmvl8QGLWLUmytE weLZ+aNrUoYO3uF7ibp0K59GWeu0CUeEg3OYzYSARL8NcLfd18tJJDQ3N8xdew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701465947; a=rsa-sha256; cv=none; b=jK47QiqUwvUNF1R6bOzW28rPf4d2YffUhX6YOXszhmboIYpYSizUvefH3N8sUY53ZSWOUY gcXJGr4Ghh+UgSgqijyaK+Nhw6VlJgwhhPiibI1o7CqePm4aqrL18dVAOW1niIQCYgtoYY OweiZxwSeg62HteMaqhUY+4dHbfEJvjqohUSNlqh3C88kbly/qtrMYWLcTjzZqOgGi2VXg bKzvuiHsHGcsDVOqN46u/RXvTEBvWu+JInFcpyx/ndM/xyogBUJuguIpCCYAJ0NtFTTFHz tY3RQDxA39UCpxnMIWBHuZDbvIkhL+lFECiXRnoyYdUZBZzV8cvIizIqRZlTrA== 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 4ShmLz2c6Vzpkk; Fri, 1 Dec 2023 21:25:47 +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 3B1LPlSf048949; Fri, 1 Dec 2023 21:25:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1LPlTh048946; Fri, 1 Dec 2023 21:25:47 GMT (envelope-from git) Date: Fri, 1 Dec 2023 21:25:47 GMT Message-Id: <202312012125.3B1LPlTh048946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 3f92c66f41ea - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3f92c66f41ea624538d2b21d983ac9e89a8f6992 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f92c66f41ea624538d2b21d983ac9e89a8f6992 commit 3f92c66f41ea624538d2b21d983ac9e89a8f6992 Author: Rodrigo Osorio AuthorDate: 2023-12-01 21:22:20 +0000 Commit: Rodrigo Osorio CommitDate: 2023-12-01 21:25:41 +0000 archivers/rpm4: Unbreak build for FreeBSD 14 --- 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 */