From nobody Sun Dec 22 12:44:43 2024 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 4YGLT73sg8z5WwKG; Sun, 22 Dec 2024 12:44:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGLT73CPWz4Kl1; Sun, 22 Dec 2024 12:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734871483; 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=dW07mr7b+uuvdvcpFiC9pQrfJmsZYJNIB6Tk63Tc/6A=; b=uZceJeS9MBgIxRPBe3ogDLQbZUV1xikyI9+MjssePZxUvycbWIkK4sF/vEppoSex5wRGHv BbaI9Gqh+uvYjAvACInIBeLJ9FLVh/K9KnvmxWEez4X9j2KSDVUiF01O0VngaG4M4ucBFp uIjgsi0D7W0j8dIklhBqGFSPfIPi3CNOpG/ku6xE7834hWfDsyKX3/nyjThDwSLXJZaaIo B+TMDeua40BWdVtGGnHfZ6dR46HxfiKw9mN6VY+yyjMtgNXim6I8g26q4cUUBTFzqEs3Ed WaCG9WxeUvEzeHEQ67fTgw8SffN3aC4X2HZ7j9+5VLOQJVR4iJcbZQ7VKgKXzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734871483; 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=dW07mr7b+uuvdvcpFiC9pQrfJmsZYJNIB6Tk63Tc/6A=; b=PowmPfsIsOGkJWcSlLzMe4wzKcWoFhg+VqavSGkW10FmCZ9vQRPs/rXlgkfy12JrExHZTW anA6KryIQOQJaojEd/gB3dBduyVviuh/jf9svMWtOp4oUT8BRkyBWynn6oM8NCygJ4y+mS uCpUNkb8fcfEU5aSD40M90gdiVapzBRYRmL4WjrUKix2Df/X1cKzSAbWXccEd/QyQlRg6O HwvCK+Q39sjuFKCtobX7uOTxNo6tWJSmZoUFYb7E2XDXbZuqec34qkcqF67Q+1wwR/cOpp 4wOr/4uzKtabZIFo75mFjf/UcU3syhD7ECpTmjW0m7xd21sjG9r6QIfHu5KDHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734871483; a=rsa-sha256; cv=none; b=PzK8pAv5S3s4GkOYHm8s822iVBWLbbz7amsXvOvpSdfcZcqrENL91cS1AWu/cg7N2NUOe4 Ltk+1OLojUDH7fzDxLDH4utupD0L1sGmo29tl8XXliRjpkXFsYN7Br0Yte/fSAdZzFvd0e Rl4P9Vfvk2//eY/BPV5da4eGLf2G3pp7/KQB9Jz8Ycg05oFcbM95si5KRJxqVW7h6+S+ES uq8nG6IIAyfSF5ug6L8f2UQ+qS2z7vCs1e2Vc61QmWhpwzpfFxx0lAiCGLw9GOiGT65km6 MaqQVfQyVMxq80Ckq61vaw7AtKgL3+Moqfir0URPquCq7FkpcebqDCl2ajQIDg== 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 4YGLT72mhrz18RW; Sun, 22 Dec 2024 12:44:43 +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 4BMCihYR083777; Sun, 22 Dec 2024 12:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BMCihl2083774; Sun, 22 Dec 2024 12:44:43 GMT (envelope-from git) Date: Sun, 22 Dec 2024 12:44:43 GMT Message-Id: <202412221244.4BMCihl2083774@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: 051f1d77a957 - main - ftp/curl: Fix distinfo by adding the patch locally 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 051f1d77a9579ef4de5f408186fccbcb4fd75775 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=051f1d77a9579ef4de5f408186fccbcb4fd75775 commit 051f1d77a9579ef4de5f408186fccbcb4fd75775 Author: Po-Chuan Hsieh AuthorDate: 2024-12-22 12:44:21 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-12-22 12:44:21 +0000 ftp/curl: Fix distinfo by adding the patch locally Reported by: diizzy --- ftp/curl/Makefile | 3 --- ftp/curl/distinfo | 4 +--- ftp/curl/files/patch-lib-asyn-thread.c | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 26a1ee93cde6..f42934c00a88 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -4,9 +4,6 @@ CATEGORIES= ftp net www MASTER_SITES= https://curl.se/download/ \ https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/ -PATCH_SITES= https://github.com/curl/curl/commit/ -PATCHFILES= ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch:-p1 - MAINTAINER= sunpoet@FreeBSD.org COMMENT= Command line tool and library for transferring data with URLs WWW= https://curl.se/ \ diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 0122660f4409..4383b3edb1d0 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1734769461 +TIMESTAMP = 1734871121 SHA256 (curl-8.11.1.tar.xz) = c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 SIZE (curl-8.11.1.tar.xz) = 2751236 -SHA256 (ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch) = 297a61cc260f4bf9e60e5b939e559d5e50df8484328f92d06ffcc256e538d998 -SIZE (ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch) = 1074 diff --git a/ftp/curl/files/patch-lib-asyn-thread.c b/ftp/curl/files/patch-lib-asyn-thread.c new file mode 100644 index 000000000000..1c74a41daa42 --- /dev/null +++ b/ftp/curl/files/patch-lib-asyn-thread.c @@ -0,0 +1,16 @@ +Obtained from: https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2 + +--- lib/asyn-thread.c.orig 2024-12-11 07:08:12 UTC ++++ lib/asyn-thread.c +@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data + * close one end of the socket pair (may be done in resolver thread); + * the other end (for reading) is always closed in the parent thread. + */ ++#ifndef USE_EVENTFD + if(tsd->sock_pair[1] != CURL_SOCKET_BAD) { + wakeup_close(tsd->sock_pair[1]); + } ++#endif + #endif + memset(tsd, 0, sizeof(*tsd)); + }