From nobody Tue Mar 21 22:38:48 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 4Ph62x14qXz40wCQ; Tue, 21 Mar 2023 22:38:49 +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 4Ph62x0fsdz4Dt7; Tue, 21 Mar 2023 22:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679438329; 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=lOTuAeoPjLxn9ObPa63nSMSeyryVjL0qSSLni8bBYBU=; b=ie0jvJnq108fVyCjyuqCntQ/dooss1b1v+7Nx8xVoa8H5cmKmEwp5d9kObP5izqsJ9Ozv3 t7j115R9WmhofnXdlIXKfiwqoK0a0w+y6sX8BT0snsu6B6l9hOnlb07S9PrLgjsy1TAwMO XDtB5YOQkBREExNqrBNmIswWrU9bHV4x4dYEjBu0KEi5Xdp18ndO0rv3vjFpKUeU0/q50W qGtqiiKIhXSbR7ahuy1ySy1WEp754dy/9HoYWamoOebd3yag8PzREPE7Xb2HoeUNnszJdu 78Yy5Zce51v3NXlChVJZJYAWBqErLOXeOkxLOGT8t+9FYomiEyqdM7DxwYfbMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679438329; 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=lOTuAeoPjLxn9ObPa63nSMSeyryVjL0qSSLni8bBYBU=; b=Y7awnCw01mCaR5eB3ZhQoeK9XmPWyVLw1c0xO2Ec0SdwmaPj1bpSrQdAs7NM1o3uE/yHlM TkdhH/LPybI512QzkC4iOcADOV4uHd6prExUtfAARXFKWlrpC9ooGSDh5wphsEbZvchKAF oGaEH+GjU9PIPpS00SBDptfmExoWgcQ1Pq/8Sf/MRDFnzpxehAD7BecbqoyVpw+lPsmJh8 PDf962lG87URoxJRR2dSLe0hwdDbad/kesqTtZcExSOnhwVBVERhSv3Q+pNM5lI7kE28rZ 7HqzR87oSl9Hdk2tqvzNPdgVAPFJ0HFnElMwbdsd8sVF7QMhXRqXlPcHY3rN0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679438329; a=rsa-sha256; cv=none; b=BFYXEtWgt7TxoIYqf/xxAmujlOTlO8JtZZYLACioUGgLnOyq49bW3M9vYIzxIe2/hF8Gec L04TscTz0x0Vj6FMl8bLogDcaL7Zcw4Ovu3Di4io5OWO+Uyr4Xlm5mZ3UO+Ad5MFMzlddk 4/6sfFSpgceb/ts9o5kGHfqyaKayYMW+Jo/RB26R+dQZVpF146AgwvSkY8Lb4cMKGBQ8rK fqY2B4tbWWuNO/oMgDbo6ZgVE9Stv0OT3c8ZiUfrkfhS5cjlUleEA1NNJ387kxj9uzqc2E xcyawx8rnwVsgdZluNffqwTwKMEwY3cZXkVxabTaT0ZCXmP1p05Mqf/RdES4lw== 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 4Ph62w6rWmzVTW; Tue, 21 Mar 2023 22:38:48 +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 32LMcmG1053527; Tue, 21 Mar 2023 22:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LMcm2N053526; Tue, 21 Mar 2023 22:38:48 GMT (envelope-from git) Date: Tue, 21 Mar 2023 22:38:48 GMT Message-Id: <202303212238.32LMcm2N053526@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 2b87700f1b06 - main - devel/p4: Update to r22.2.2407422 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: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b87700f1b0605c7fc5eefa6eccc1b044705c7a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b87700f1b0605c7fc5eefa6eccc1b044705c7a3 commit 2b87700f1b0605c7fc5eefa6eccc1b044705c7a3 Author: Craig Leres AuthorDate: 2023-03-21 22:38:20 +0000 Commit: Craig Leres CommitDate: 2023-03-21 22:38:20 +0000 devel/p4: Update to r22.2.2407422 Update MASTER_SITES including a backup site hosted by the maintainer. Remove BROKEN lines (this version is 7 years newer). While here, adjust the PR patchset to eliminate DIST_SUBDIR and embed the version string into the downloaded package. PR: 270387 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4/Makefile | 40 +++++++++++---------------- devel/p4/Makefile.inc | 7 ++--- devel/p4/distinfo | 6 ++-- devel/p4/files/patch-net_netsslcredentials.cc | 23 --------------- devel/p4/pkg-descr | 14 ++++++++-- 5 files changed, 34 insertions(+), 56 deletions(-) diff --git a/devel/p4/Makefile b/devel/p4/Makefile index 02c7f4570294..60de77148a3a 100644 --- a/devel/p4/Makefile +++ b/devel/p4/Makefile @@ -1,32 +1,26 @@ PORTNAME= p4 PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} -PORTREVISION= 3 CATEGORIES= devel # Perforce changes their distfiles when they patch, which changes the # zip file's checksum. This does not play well with FreeBSD's conventions. -# This version of the port 2016.1 is no longer available from Perforce's -# site. The new maintainer is backup hosting until the new port of 2022.2 -# is ready. -MASTER_SITES= LOCAL/asomers/perforce/p4 \ - https://hesiod.org/distfiles/ -DISTNAME= ${YEAR}-${MAJOR} -DISTFILES= ${ZIP_FILES} -DIST_SUBDIR= perforce/p4 +# maintainer is backup hosting +MASTER_SITES= https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/p4source${EXTRACT_SUFX}?dummy=/ \ + https://hesiod.org/distfiles/perforce-${MINOR}/p4source${EXTRACT_SUFX}?dummy=/ +DISTNAME= p4source-${MINOR} MAINTAINER= antonfb@hesiod.org -COMMENT= Perforce client -WWW= https://www.perforce.com/ +COMMENT= Perforce command line client +WWW= https://www.perforce.com/products/helix-core LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_mips64= fails to install: /wrkdirs/usr/ports/devel/p4/work/2016-1/p4-bin/p4: No such file or directory -BROKEN_FreeBSD_12_powerpc64= fails to build: /bin/sh: clang++: not found - BUILD_DEPENDS= ${JAM}:devel/jam # p4 links libssl and libcrypto statically, so specify :build -USES= ssl:build +USES= ssl:build tar:tgz + +WRKSRC= ${WRKDIR}/p4source-${PORTVERSION} PLIST_FILES= bin/p4 @@ -34,17 +28,15 @@ PLIST_FILES= bin/p4 .include "Makefile.inc" -# Sadly, Jam always returns 1 even on success. Ignore its return value and -# detect build errors during the install phase. do-build: cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \ - CCFLAGS="${CFLAGS}" \ - HDRS="${OPENSSLINC}" \ - LINKFLAGS="${LDFLAGS}" \ - OSVER=${OSVER} \ - SSL="yes" \ - SSLPREFIX=${OPENSSLLIB} \ - ${JAM} -dx -j${MAKE_JOBS_NUMBER} || true + CCFLAGS="${CFLAGS}" \ + HDRS="${OPENSSLINC}" \ + LINKFLAGS="${LDFLAGS}" \ + OSVER=${OSVER} \ + SSL="yes" \ + SSLPREFIX=${OPENSSLLIB} \ + ${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/p4-bin/p4 ${STAGEDIR}${PREFIX}/bin diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index 414895566676..cbf88951e949 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,8 +1,7 @@ -ZIP_FILES= ${DISTNAME}.zip P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -YEAR= 2016 -MAJOR= 1 -MINOR= 1492381 +YEAR= 2022 +MAJOR= 2 +MINOR= 2407422 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index 3995ddebd392..fb002e83d03d 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517864594 -SHA256 (perforce/p4/2016-1.zip) = af465c970b5892674089a917ffa3d38f9b878e1ceb32eb73c2e05bd462d5ba63 -SIZE (perforce/p4/2016-1.zip) = 2249015 +TIMESTAMP = 1679422608 +SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b +SIZE (p4source-2407422.tgz) = 6325949 diff --git a/devel/p4/files/patch-net_netsslcredentials.cc b/devel/p4/files/patch-net_netsslcredentials.cc deleted file mode 100644 index d18ba487c308..000000000000 --- a/devel/p4/files/patch-net_netsslcredentials.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000 -+++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000 -@@ -42,6 +42,7 @@ extern "C" - # include - # include - # include -+# include - } - # include - # include "netdebug.h" -@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) - privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL ); - SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError ); - // verify that RSA key -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (privateKey->type != EVP_PKEY_RSA) -+#else -+ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA) -+#endif - { - e->Set( MsgRpc::SslKeyNotRSA ); - goto fail; - diff --git a/devel/p4/pkg-descr b/devel/p4/pkg-descr index 4eca6934b456..286042394aca 100644 --- a/devel/p4/pkg-descr +++ b/devel/p4/pkg-descr @@ -1,2 +1,12 @@ -Perforce is a commercial revision control system that can be used -gratis for developing free software. (see the WWW page for details). +Perforce is a commercial revision control system. This is the command +line client which works with servers remotely or locally. +The clients and the api for Perforce is freely available. + +This build does not support the "Extensions" feature. + +The server is no longer available for FreeBSD but the Linux version +should work. There is a limited free use level and non-profit +organizations might qualify for free licencing. + +See "p4 -V" for more licensing and version information. +See https://ftp.perforce.com/perforce/r22.2/doc/user/ for release notes.