From nobody Fri Nov 01 14:16:38 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 4Xg2wl1WM3z5bqX8; Fri, 01 Nov 2024 14:16:39 +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 4Xg2wl0zK5z4gJV; Fri, 1 Nov 2024 14:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730470599; 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=YCC1+CYFotrKZGf4w7f2gmIw6Y18piqJ1S+wt9MZHg0=; b=tKdiQnzCtWONBnGLsoyyjj86xj9oNOxDCylnyCz9QWhnMZwMt2PUwwjMocuQRXFEiBRQSP xnOK1ufKwPronXlo27ZyXvDOBK0herMZb5LBNQBbuepsVlXGaOehq/5y+zCENzfBPYUUMC OEZZ5UWKIP/PJpn4w1rA8I6aUbqM7CsYUS5Yx2gPK0bw6OlS7mddM1c/FYGcJDLGS6V5Mw DILcHP/QtBsrIjq6ksIa/AUJNj5n5jeO/hvTKu25mVg/soYKJriOrWMHU9NnbgPUnvuR7I 8DWb7v3swO0K9yf/8AONBFTLpQo36LZFv8hSAJjdRrAqPSvFKKLzYAkW3YyCvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730470599; 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=YCC1+CYFotrKZGf4w7f2gmIw6Y18piqJ1S+wt9MZHg0=; b=v2D1kOAiSLKdm5oRW7yoptDasVsRwu5NbrdexL/BKo/+52IrJ0XHJGbGxf4C4FSt2LDkgp HGtfCAqAEVFaa+FZaLU45HfP+M1F0QWkpfVJ22mkm5jOXqHill5dvGlJ/y0z4QqfD8fhHI gZpBnbYHB3ZfCgkSWk80EHkwZSdM/MAtvLb75iIaJKMJEe9iqZjua8cBZ6EGPHDNvStZiO 2i1uKTO2SswQK6qLv+UL+Ed/27U4PMhkJSjw7yC5jBVNkVwmb8EfeGzxeiRcU4Yfp5NBas dsv0W7rfjrv9MKl9KYHUWMN5i+hNT6HTiGvKpLuz60r4em1Vg5RK8pNRhQ+/vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730470599; a=rsa-sha256; cv=none; b=c+PPL2Tn3vyKvAMhZxDRomykFBRoV98SvNfjqCe+qEUB2IfUvagTKMRfpLwL9nwRuGSnK6 eZOXYtwh+NrfNM5sIlw4MEy7FUvBF8cvWX5TnE+ujOmuj2y+c5OgeMPpPRue/5J2rupsir HKpZZVd4P8YSFmmC+1DXCmaGQDLAGTRY2CFbZ9n0EtWXo6Uff28X3ZUcAGZxsSCo35KoAz Aj6Ult3FDmQqi6Ms4yyB2S5JbobfeXSJZy/Y3bzlaA4yuH3VDzJzkcS3BB2+RDFg7paX2R SxW1veXi/Yng8wp7xEqPEXD/RaFHuxCsC6U0O8OrfE/cVN6NR3QQGCvztUVB8g== 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 4Xg2wk71p1zNln; Fri, 1 Nov 2024 14:16:38 +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 4A1EGcIZ061248; Fri, 1 Nov 2024 14:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A1EGcY7061245; Fri, 1 Nov 2024 14:16:38 GMT (envelope-from git) Date: Fri, 1 Nov 2024 14:16:38 GMT Message-Id: <202411011416.4A1EGcY7061245@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: 049f13bc6a60 - main - sysutils/fusefs-curlftpfs: Add debian patches 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 049f13bc6a60bd458d82a1aedebdcc4ebbaf1436 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=049f13bc6a60bd458d82a1aedebdcc4ebbaf1436 commit 049f13bc6a60bd458d82a1aedebdcc4ebbaf1436 Author: Rodrigo Osorio AuthorDate: 2024-11-01 13:24:13 +0000 Commit: Rodrigo Osorio CommitDate: 2024-11-01 14:14:38 +0000 sysutils/fusefs-curlftpfs: Add debian patches Update curlftpfs code by integration additional debian patches who provide multiple fixes. Major changes: * fix-CURLOPT_INFILESIZE : Fix an unsupported curl value (-1) for CURLOPT_INFILESIZE option. * free_ftpfs_file-memleak-fix: Fix a memory leak. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587250 * nocache-memleak-fix : Fix a memory leak when cache is disabled. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614347 * curlftpfs__no_verify_hostname : Fix no_verify_hostname option with recent versions of curl * consistent feature flag : ensure consistent use of _XOPEN_SOURCE * getpass prototype : add getpass() prototype * Fix a typo in one of our patches who does an urlencode of paths. Bump portrevision PR: 282358 Reported by: diizzy --- sysutils/fusefs-curlftpfs/Makefile | 11 ++++++++++- sysutils/fusefs-curlftpfs/distinfo | 15 +++++++++++++-- sysutils/fusefs-curlftpfs/files/patch-path__utils.c | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile index 50c771dca219..038e07337dfa 100644 --- a/sysutils/fusefs-curlftpfs/Makefile +++ b/sysutils/fusefs-curlftpfs/Makefile @@ -1,9 +1,18 @@ PORTNAME= curlftpfs PORTVERSION= 0.9.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMEPREFIX= fusefs- +DIST_SUBDIR= ${PORTNAME} + +PATCH_SITES= https://sources.debian.org/data/main/c/curlftpfs/0.9.2-9/debian/patches/ +PATCHFILES= fix-CURLOPT_INFILESIZE.patch \ + free_ftpfs_file-memleak-fix.patch \ + nocache-memleak-fix.patch \ + curlftpfs__no_verify_hostname.patch \ + consistent-feature-flag.patch +PATCH_DIST_STRIP= -p1 MAINTAINER= rodrigo@FreeBSD.org COMMENT= Mount remote FTP directories diff --git a/sysutils/fusefs-curlftpfs/distinfo b/sysutils/fusefs-curlftpfs/distinfo index 4e2622d3d992..822419798166 100644 --- a/sysutils/fusefs-curlftpfs/distinfo +++ b/sysutils/fusefs-curlftpfs/distinfo @@ -1,2 +1,13 @@ -SHA256 (curlftpfs-0.9.2.tar.gz) = 4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 -SIZE (curlftpfs-0.9.2.tar.gz) = 365503 +TIMESTAMP = 1730467218 +SHA256 (curlftpfs/curlftpfs-0.9.2.tar.gz) = 4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 +SIZE (curlftpfs/curlftpfs-0.9.2.tar.gz) = 365503 +SHA256 (curlftpfs/fix-CURLOPT_INFILESIZE.patch) = 19734139dfcd5252f5b8005343afba89e809bed6b476901c24dc6c3535e36501 +SIZE (curlftpfs/fix-CURLOPT_INFILESIZE.patch) = 644 +SHA256 (curlftpfs/free_ftpfs_file-memleak-fix.patch) = accd3b5a322bacbf4ccdc8433ce3fc97b6d6284a56ab29daa1579424e7e41f39 +SIZE (curlftpfs/free_ftpfs_file-memleak-fix.patch) = 425 +SHA256 (curlftpfs/nocache-memleak-fix.patch) = 75db4498ca4879078e25e87da4ef57d648f22aee692e3b5ae23030762f6b4ac2 +SIZE (curlftpfs/nocache-memleak-fix.patch) = 1864 +SHA256 (curlftpfs/curlftpfs__no_verify_hostname.patch) = f69d4537447acbb559a14efbd8f880cde2b20f06ca2b0edd2229f8bb319675db +SIZE (curlftpfs/curlftpfs__no_verify_hostname.patch) = 872 +SHA256 (curlftpfs/consistent-feature-flag.patch) = afd83c6640c281517e9aea548f760f911e4f5bf00485645e4368ffb0b90c9784 +SIZE (curlftpfs/consistent-feature-flag.patch) = 1724 diff --git a/sysutils/fusefs-curlftpfs/files/patch-path__utils.c b/sysutils/fusefs-curlftpfs/files/patch-path__utils.c index 9ce6c500dbab..7855c90e7043 100644 --- a/sysutils/fusefs-curlftpfs/files/patch-path__utils.c +++ b/sysutils/fusefs-curlftpfs/files/patch-path__utils.c @@ -12,7 +12,7 @@ +static inline int is_unreserved_rfc3986(char c) +{ + int is_locase_alpha = (c >= 'a' && c <= 'z'); -+ int is_upcase_alpha = (c >= 'a' && c <= 'z'); ++ int is_upcase_alpha = (c >= 'A' && c <= 'Z'); + int is_digit = (c >= '0' && c <= '9'); + int is_special = c == '-' + || c == '.'