git: cc46cd04bfbc - main - net/xapsd: rename supplemental patch so it is actually used

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc46cd04bfbca699af8dcbcfef2d8a34ea99430a

commit cc46cd04bfbca699af8dcbcfef2d8a34ea99430a
Author:     Henry <PopularMoment@protonmail.com>
AuthorDate: 2024-09-20 12:29:14 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
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 <git@leonklingele.de>
-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
-