From nobody Tue Sep 24 01:12:14 2024 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 4XCMKB2dskz5Wp3T; Tue, 24 Sep 2024 01:12:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XCMKB1nLvz49Z0; Tue, 24 Sep 2024 01:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727140334; 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=Yzr8ZBYp+fDRHA7nKD03DJzzIiXpmR8Tb+i11Tr1HJ4=; b=hbgAFBMSv/IaGwjQIZkV3/Mbybe88ksxVcCPHT5PndYhSDJ3VuHv14z9mTGosy7Uot9Ujz 1bATwrTa2iLQTDPErqL27bOs9Y2E5zGtrSn8p2L1/8ov7pAtdPeycPaTmAtZioHg7In8NE 8dWE98kRqjleQVvYtNC+/DnkoCjdylifcnpy2/2M0ijnFtq5QEkKWvhp53sCMtHnXrvE2V 4xZeLIu8Rcx9LzHhPUnIZR7USGCbnbAiKFCDpj88J0OcFIrwb9aDoV0dK55aGk/NHzSiez Aa8oejo3zMHdMFu6T+z00ghtIpPITA9lvQltuzCa5kTVRUj9vLkUymcOKlOPbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727140334; a=rsa-sha256; cv=none; b=FKZFxp/0lKNomMWQrVMYr3nrMfR7EBDErZTnWRWqFoHdQFkmktl/ig+EBLhNhgnKbtxMuN uNTF6V4q0GjaWH/2LAXwilJDUHPEBkUq9tTmrfjC3kJtUXu2wFVtin+ddshn4hwalp0COC gBt7eH3y8/o3FmV1WssnLElD7Yk2cQGxa0n8tRbvyOafMEsHpmxiQwZB1Eqw66oq/grgKG IhPoInWsRoAyZydoO8sonMY/3CYlIzvTLkNHR56NNyMk1bIcqYPwKEgjDMwOih2gVP94hS fjeHdvYWpdxcwJJ6cR5P8PNkCItXDZOR/qPm0u4X9hbJChs1uafeNuGOw7x3MQ== 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=1727140334; 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=Yzr8ZBYp+fDRHA7nKD03DJzzIiXpmR8Tb+i11Tr1HJ4=; b=G4brgJFjPv4H+tQaACQsUGTfn49PNJLbUAmdeMcUZ2cPFDeo1xChpHJ+pyA0HwcqrKHd1V 6/O1EabDWpwPSjUpB9bEzN27PrpP3xHFN7+1S8WAHuYPuztD5t/9N05b0SUyGaDo4Za3B5 emIC4AoJbwIjzdG+e9IaibNCaD0sYMBXQzrmwfPgTB+OdSydOhxH+TgdcuSdFJ8BE4rEUo kBNmW/yZdoYvVrfC99axnPsQCStvT9fCYChcG6MpyoeRkslaQTte66CL9RdBQNlSZSU2+I MZ/44K7kax2Nnng8oDviGGZHYjd5OdNIumvq1X13qnEhNX5WVAk+AF9D3zl5Nw== 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 4XCMKB1Nfcz17hV; Tue, 24 Sep 2024 01:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48O1CEB5050495; Tue, 24 Sep 2024 01:12:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48O1CEaP050492; Tue, 24 Sep 2024 01:12:14 GMT (envelope-from git) Date: Tue, 24 Sep 2024 01:12:14 GMT Message-Id: <202409240112.48O1CEaP050492@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: 1dda54b6e6ce - main - devel/p4: Update to 2024.1 release patch 2 (2655224) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 1dda54b6e6ce255097449f65a76594f4f0ec0da5 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=1dda54b6e6ce255097449f65a76594f4f0ec0da5 commit 1dda54b6e6ce255097449f65a76594f4f0ec0da5 Author: Craig Leres AuthorDate: 2024-09-24 01:11:46 +0000 Commit: Craig Leres CommitDate: 2024-09-24 01:11:46 +0000 devel/p4: Update to 2024.1 release patch 2 (2655224) PR: 281679 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4/Makefile | 7 +++++-- devel/p4/Makefile.inc | 2 +- devel/p4/distinfo | 6 +++--- devel/p4/files/patch-Jamrules | 6 +++--- devel/p4/files/patch-sys_fileio.cc | 23 +++++++++++++++++++++++ devel/p4/files/patch-sys_stdhdrs.h | 11 +++++++++++ 6 files changed, 46 insertions(+), 9 deletions(-) diff --git a/devel/p4/Makefile b/devel/p4/Makefile index 60de77148a3a..8fdeb92b44ff 100644 --- a/devel/p4/Makefile +++ b/devel/p4/Makefile @@ -5,7 +5,7 @@ CATEGORIES= devel # zip file's checksum. This does not play well with FreeBSD's conventions. # 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=/ + https://hesiod.org/distfiles/perforce/ DISTNAME= p4source-${MINOR} MAINTAINER= antonfb@hesiod.org @@ -35,8 +35,11 @@ do-build: LINKFLAGS="${LDFLAGS}" \ OSVER=${OSVER} \ SSL="yes" \ + SSLVER="1.1.1" \ SSLPREFIX=${OPENSSLLIB} \ - ${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4 + USE_EXTENSIONS=0 \ + USE_OPTIMIZED_ZLIB=0 \ + ${JAM} -dx -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 69f4dffd192b..5ff5842ac290 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} YEAR= 2024 MAJOR= 1 -MINOR= 2596294 +MINOR= 2655224 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index 6b2a5913c060..840dc831073b 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715886503 -SHA256 (p4source-2596294.tgz) = ebe0ce24f795ccfe31d14b0df4c959440caeb1aa414c8097d01bb2bd5050042f -SIZE (p4source-2596294.tgz) = 6789770 +TIMESTAMP = 1727095903 +SHA256 (p4source-2655224.tgz) = f9fb71a0de4b9fdb8297c627a97ded99bc944d958e36c1b4887cfb22921ba1d4 +SIZE (p4source-2655224.tgz) = 6794469 diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules index d8d80e736493..466a1d46038f 100644 --- a/devel/p4/files/patch-Jamrules +++ b/devel/p4/files/patch-Jamrules @@ -1,6 +1,6 @@ ---- Jamrules.orig 2022-12-15 10:39:01 UTC +--- Jamrules.orig 2024-05-24 15:48:33 UTC +++ Jamrules -@@ -673,12 +673,11 @@ +@@ -690,12 +690,11 @@ # P4BIN is set to ../p4-bin (relative to P4) SubDir AllP4 p4 ; # where we are @@ -14,7 +14,7 @@ $(BUILD) $(TYPE:L) ; -@@ -1245,11 +1244,6 @@ +@@ -1301,11 +1300,6 @@ OPTIM += -Wno-parentheses -Wno-switch -fwrapv ; _mflags = ; diff --git a/devel/p4/files/patch-sys_fileio.cc b/devel/p4/files/patch-sys_fileio.cc new file mode 100644 index 000000000000..2b074034ecc5 --- /dev/null +++ b/devel/p4/files/patch-sys_fileio.cc @@ -0,0 +1,23 @@ +--- sys/fileio.cc.orig 2024-07-18 14:04:43 UTC ++++ sys/fileio.cc +@@ -595,7 +595,7 @@ FileIO::StatModTimeHP(DateTimeHighPrecision *modTime) + int nanosecs = 0; + + // nanosecond support for stat is a bit of a portability mess +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) + #if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) \ + || (__GLIBC_PREREQ(2, 12) \ +@@ -862,6 +862,11 @@ void + FileIO::GetExtendedAttribute( StrPtr *name, StrBuf *val, Error *e ) + { + val->Clear(); ++} ++ ++void ++FileIO::SetExtendedAttributes( StrDict *vals, Error *e ) ++{ + } + + void diff --git a/devel/p4/files/patch-sys_stdhdrs.h b/devel/p4/files/patch-sys_stdhdrs.h new file mode 100644 index 000000000000..31b6f9d87ef9 --- /dev/null +++ b/devel/p4/files/patch-sys_stdhdrs.h @@ -0,0 +1,11 @@ +--- sys/stdhdrs.h.orig 2024-09-23 13:23:02 UTC ++++ sys/stdhdrs.h +@@ -527,7 +527,7 @@ extern "C" int socketpair(int, int, int, int*); + # endif + + # if defined(NEED_TIME_HP) +-# if defined( OS_LINUX ) ++# if defined( OS_LINUX ) || defined( OS_FREEBSD ) + # define HAVE_CLOCK_GETTIME + #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) + # if ( __GLIBC_PREREQ( 2, 10 ) && \