From nobody Tue Jan 2 07:49:50 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 4T44kk6TFFz56Wy8; Tue, 2 Jan 2024 07:49:50 +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 4T44kk5tmNz3XhL; Tue, 2 Jan 2024 07:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704181790; 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=n1wNdfq8GAgXpirGchbidPyrAVQmRVrriZ1cgaU63uk=; b=l+HlovupGSDwUd0xaFGFiBa7qbR3+tre+Emu/4fNZJQKg2Pui0Vs18OzOaybjdDymOsnf1 JiuFECSz5xAYXN9Ok5a+P76MNWIfZVXyJdeJtaj6eM8yhGQ/yo8ylXDLo0JQ7QkIyhiB7z B5dVOYpRg7/clkNyMKgJf6os2FvZx15cuNwlPEuIe+u4Ln+QN+/Ql3mDKPuNAivdg6i1oa nJC1A5XJypJ9nziJw+onSiKmgfaqlwVoZ9T+K/rYHw3Rwt16meoW4lgta8zbc1GurMkmFj TH16sImfNcEgEU1xM7sOCZu6+8BECzHEYjMBWYiWVbL0bhRTwb1/YgCKYJtS1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704181790; a=rsa-sha256; cv=none; b=IeorBLIy0+irr1HFmSxr4Lky+aK6YFKnLK48eyxcnu4qUnDBb6VjyJW6s1Jz0vWbZTpu+E 8nOrQy5SjW7yHYYqqtzri70ObaM+MZxcnLfbwqd9vi4jwkSZ2iyrvkT14p7YOGeGW2Rcw5 YZxXui/LP5CoSYM7E98aWRvi9Rcy0CiRc7RY4sJiaht+Cge4SqYZojJNljF4Wpxd/fg2kj FhqinG6EtOc/vCer8ny2g7R3rnPOW56Esa2VbYpsnqfEoYLiuognUnr0BQe7xRrR53zLi8 BjJnGo+qZYDlWcjuOJ9a7foHMbBUS4Ap6JT/yE5DMV77yb2nH9qX3UG8OeyzHA== 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=1704181790; 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=n1wNdfq8GAgXpirGchbidPyrAVQmRVrriZ1cgaU63uk=; b=XeSAAv2tVWaLQA6z5BuVdrSuP8OCq5QMviZKjuiG7xAkswfNklYrVu1YxXouIKI2kv9xS5 OsaVEl86MAqsZHTYFNfChi4fE6aTXfFOkmy/Oqp8iONiAsGEIfhn4HXVM34KQsYtbId0em 5zkZjJuzrp9xtI5i5TI0sPkZU+umgo23gcJK1cNcYFGOVz1BipR2u1I0uDpAPNuffEvmOg bRuQn1y2Z4eSX/e6pYnZo0Y683xb7q5z7FidStv6e5fnVp1KWy+TRcLEvRoPyPl6BAfw16 aSwuB7XPthO/E6ZuOqOs5SqBYhd8diybke00BoyRHgQ5GM3IdnMW9f0D7sPAhQ== 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 4T44kk4dLqzsF5; Tue, 2 Jan 2024 07:49:50 +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 4027noL8011917; Tue, 2 Jan 2024 07:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4027nocR011914; Tue, 2 Jan 2024 07:49:50 GMT (envelope-from git) Date: Tue, 2 Jan 2024 07:49:50 GMT Message-Id: <202401020749.4027nocR011914@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 57f92b10c34c - main - net/netatalk3: fix parsing of macOS created AppleDouble files 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: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57f92b10c34cccaa7285d639707294c50daa8aa3 Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=57f92b10c34cccaa7285d639707294c50daa8aa3 commit 57f92b10c34cccaa7285d639707294c50daa8aa3 Author: Joe Marcus Clarke AuthorDate: 2024-01-02 07:48:52 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-01-02 07:48:52 +0000 net/netatalk3: fix parsing of macOS created AppleDouble files Obtained from: https://github.com/Netatalk/netatalk/commit/a0d2bb957ba097849748c0febcac7e9ef041c65a?diff=unified&w=0 --- net/netatalk3/Makefile | 1 + .../files/patch-libatalk_adouble_ad__open.c | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index acacf59363ea..a297d24722ee 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,5 +1,6 @@ PORTNAME= netatalk PORTVERSION= 3.1.18 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/./-/g} diff --git a/net/netatalk3/files/patch-libatalk_adouble_ad__open.c b/net/netatalk3/files/patch-libatalk_adouble_ad__open.c new file mode 100644 index 000000000000..05102b8d34df --- /dev/null +++ b/net/netatalk3/files/patch-libatalk_adouble_ad__open.c @@ -0,0 +1,43 @@ +--- libatalk/adouble/ad_open.c.orig 2024-01-02 07:44:09 UTC ++++ libatalk/adouble/ad_open.c +@@ -668,6 +668,11 @@ reread: + int retry_read = 0; + + reread: ++ if (hst == NULL) { ++ hst = &st; ++ EC_NEG1( fstat(ad_reso_fileno(ad), hst) ); ++ } ++ + LOG(log_debug, logtype_ad, "ad_header_read_osx: %s", path ? fullpathname(path) : ""); + ad_init_old(&adosx, AD_VERSION_EA, ad->ad_options); + buf = &adosx.ad_data[0]; +@@ -707,7 +712,7 @@ reread: + return -1; + } + +- if (parse_entries(&adosx, nentries, header_len) != 0) { ++ if (parse_entries(&adosx, nentries, hst->st_size) != 0) { + LOG(log_warning, logtype_ad, "ad_header_read(%s): malformed AppleDouble", + path ? fullpathname(path) : ""); + errno = EIO; +@@ -725,6 +730,7 @@ reread: + } + retry_read++; + if (ad_convert_osx(path, &adosx) == 1) { ++ hst = NULL; + goto reread; + } + errno = EIO; +@@ -738,11 +744,6 @@ reread: + LOG(log_error, logtype_ad, "ad_header_read_osx: problem with rfork entry offset."); + errno = EIO; + return -1; +- } +- +- if (hst == NULL) { +- hst = &st; +- EC_NEG1( fstat(ad_reso_fileno(ad), &st) ); + } + + ad_setentryoff(ad, ADEID_RFORK, ad_getentryoff(&adosx, ADEID_RFORK));