From nobody Wed Sep 25 06:30:22 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 4XD6Kq0SKwz5Wj1k; Wed, 25 Sep 2024 06:30:23 +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 4XD6Kp5h5wz49MJ; Wed, 25 Sep 2024 06:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727245822; 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=LcIRMe3Am1yg5fK7/Wu4Ld3fjUEd/9UiDoXhUWvZ0nM=; b=FTtJVA+dPgMe6r+Cv6NQ9aC/cTjZMd8PDOD3zruZBQPSsTisrRQjOBr6CBW8Ar6dJWSUra qCA0FXyRs1KJL9JX57Wv2IzhwekUNcoTE5LGj7M+Gn4hYSixTRVr5MKHqBGTq05opwzJ4H 0DBC2v9i381l/dV9+xUHbhI5sZTH3DJsBQbeS/nx3LrFRK+EpboQyLYsXhpsY+FY0pNBLb 8mp1Zgcdws8smIdHaRFUZD1iVPF3Iq8ECSofZsMTFLwc8WtcGxfXz9J2HUjsExHqY/vuz5 gqEIC5cMyFLkrA22SPFr3pEHeCX5QqW2vrZeIvqJeyrQeOFilVoa931H1/oa/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727245822; a=rsa-sha256; cv=none; b=wVnk8TLyzNqmucmzI3dt6AZGD0Ynu0fdSHbvcoJS0w2tiPkJFEXauH2kdwM6XPCKZhUSaB TW4duuNfZHdTOZK1bd3GGNdzxeqYBwWJZzxAPQl9VgWl954n3F5I+fzjMD4+u2RrDtlHe+ 5gZOoPkAZskQGellad3n09m/aySBaG3l72CoaeuG8hIo0l4MZC4pw2Ppk7x1i5QNKNE0dc dd+r/7cEQY8WALgfiAbd3/57M3cNFTJ1HlB1Jh6zu52tUGYS2evWGnx4JaA4b3tbzduyc5 J+Gq+BJeyVC5zNPb6687BTI3giU+0KyCCEpdOLn4hnYgmxcG2n73b/4ViB2mvg== 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=1727245822; 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=LcIRMe3Am1yg5fK7/Wu4Ld3fjUEd/9UiDoXhUWvZ0nM=; b=LMw8LgAOw7IRJZ35FI6zHwCIAYHxJ9kOlBzh4AkmMqk8dLpjfcl4ptpUYFCa4b+CQeTlI3 AT6gY5e81S2bGkcVxL7l4R2Tr1978HpPe9JSxFtGVP2kMqXh25o+IrhdZ/xIbfar2X1p1t ognQCPLy6cWLkgJs2LwUEVVcafOa3884AaFKfH5Z9M3G5sujjx5Cilx20pHq9VXUTYWJ6V S8rmeBuvbyElMwkeuDdbInNPK02db3s4kjnwk/UKB10LD2e5ce7v2DnhjvBZ8h00jEhCS6 XUkkuZWxcUk5cwX03IAtPp5iC4QHV/D9yplqkf2kaXPV25wbVKZb7FC34LHjJg== 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 4XD6Kp5Dptz11rQ; Wed, 25 Sep 2024 06:30:22 +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 48P6UMHW053020; Wed, 25 Sep 2024 06:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48P6UMUS053017; Wed, 25 Sep 2024 06:30:22 GMT (envelope-from git) Date: Wed, 25 Sep 2024 06:30:22 GMT Message-Id: <202409250630.48P6UMUS053017@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: cc46cd04bfbc - main - net/xapsd: rename supplemental patch so it is actually used 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc46cd04bfbca699af8dcbcfef2d8a34ea99430a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc46cd04bfbca699af8dcbcfef2d8a34ea99430a commit cc46cd04bfbca699af8dcbcfef2d8a34ea99430a Author: Henry AuthorDate: 2024-09-20 12:29:14 +0000 Commit: Robert Clausecker CommitDate: 2024-09-25 06:29:13 +0000 net/xapsd: rename supplemental patch so it is actually used Rename and regenerate, so it is actually built with the patch. Fixes: fd3628b9b43b151c4505fd54a6aea1e9d0a428ff PR: 281607 Event: EuroBSDcon 2024 --- net/xapsd/Makefile | 2 +- ...tch => patch-pkg_apple__xserver__certs_http.go} | 40 +++++++--------------- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/net/xapsd/Makefile b/net/xapsd/Makefile index b6783cb4ade8..8d6d16858aea 100644 --- a/net/xapsd/Makefile +++ b/net/xapsd/Makefile @@ -1,6 +1,6 @@ PORTNAME= xapsd DISTVERSION= g20240326 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= PopularMoment@protonmail.com diff --git a/net/xapsd/files/0001-fix-apple-ignore-malformed-HTTP-headers.patch b/net/xapsd/files/patch-pkg_apple__xserver__certs_http.go similarity index 65% rename from net/xapsd/files/0001-fix-apple-ignore-malformed-HTTP-headers.patch rename to net/xapsd/files/patch-pkg_apple__xserver__certs_http.go index 60ffc0dfb039..cc029df6316f 100644 --- a/net/xapsd/files/0001-fix-apple-ignore-malformed-HTTP-headers.patch +++ b/net/xapsd/files/patch-pkg_apple__xserver__certs_http.go @@ -1,20 +1,6 @@ -From 1c52af3a7cc168cec089a810c32e861ab988840c Mon Sep 17 00:00:00 2001 -From: Leon Klingele -Date: Wed, 13 Mar 2024 22:12:25 +0100 -Subject: [PATCH] fix(apple): ignore malformed HTTP headers - -See also https://github.com/golang/go/issues/21290. - -Fixes https://github.com/freswa/dovecot-xaps-daemon/issues/24. ---- - pkg/apple_xserver_certs/http.go | 51 ++++++++++++++++++++++++++++++--- - 1 file changed, 47 insertions(+), 4 deletions(-) - -diff --git a/pkg/apple_xserver_certs/http.go b/pkg/apple_xserver_certs/http.go -index d39a6fc..939fcf0 100644 ---- a/pkg/apple_xserver_certs/http.go -+++ b/pkg/apple_xserver_certs/http.go -@@ -1,11 +1,16 @@ +--- pkg/apple_xserver_certs/http.go.orig 2024-03-26 13:15:17 UTC ++++ pkg/apple_xserver_certs/http.go +@@ -1,11 +1,17 @@ package apple_xserver_certs import ( @@ -26,12 +12,13 @@ index d39a6fc..939fcf0 100644 + "io" "io/ioutil" "log" ++ "math" "net/http" + "time" ) func NewCerts(username string, passwordhash string) *Certificates { -@@ -50,7 +55,6 @@ func handleResponse(certs *Certificates, response []byte) *Certificates { +@@ -50,7 +56,6 @@ func handleResponse(certs *Certificates, response []by } func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) { @@ -39,7 +26,7 @@ index d39a6fc..939fcf0 100644 r := bytes.NewReader(reqBody) url := "https://identity.apple.com/pushcert/caservice/renew" if newCerts { -@@ -67,12 +71,51 @@ func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) { +@@ -67,12 +72,51 @@ func sendRequest(reqBody []byte, newCerts bool) (respB req.Header.Set("Accept", "*/*") req.Header.Set("Accept-Language", "en-us") @@ -57,16 +44,17 @@ index d39a6fc..939fcf0 100644 if err != nil { - log.Fatalln(err) + log.Fatalln(err) // TODO: Handle error properly -+ } + } + defer func() { + _ = conn.Close() //nolint:errcheck,gosec // Ignored on purpose + }() -+ + +- defer resp.Body.Close() + if err := req.Write(conn); err != nil { + log.Fatalln(err) // TODO: Handle error properly + } + -+ buf, err := io.ReadAll(io.LimitReader(conn, 1<<10)) ++ buf, err := io.ReadAll(io.LimitReader(conn, math.MaxInt64)) + if err != nil { + log.Fatalln(err) // TODO: Handle error properly + } @@ -85,15 +73,11 @@ index d39a6fc..939fcf0 100644 + resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(buf)), req) + if err != nil { + log.Fatalln(err) // TODO: Handle error properly - } ++ } + defer func() { + _ = resp.Body.Close() //nolint:errcheck,gosec // Ignored on purpose + }() - -- defer resp.Body.Close() ++ respBody, err = ioutil.ReadAll(resp.Body) if err != nil { log.Fatalln(err) --- -2.34.1 -