From owner-dev-commits-ports-all@freebsd.org Sun Sep 19 15:16:30 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5199F66CB70; Sun, 19 Sep 2021 15:16:30 +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 4HCB9V1ffjz4cXn; Sun, 19 Sep 2021 15:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1999C1F554; Sun, 19 Sep 2021 15:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18JFGUvR087355; Sun, 19 Sep 2021 15:16:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18JFGUNY087354; Sun, 19 Sep 2021 15:16:30 GMT (envelope-from git) Date: Sun, 19 Sep 2021 15:16:30 GMT Message-Id: <202109191516.18JFGUNY087354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 49ac41338630 - main - irc/soju: Import a patch from upstream MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49ac41338630ccecd96cefea744a582b2299beb7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Sep 2021 15:16:30 -0000 The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=49ac41338630ccecd96cefea744a582b2299beb7 commit 49ac41338630ccecd96cefea744a582b2299beb7 Author: Ashish SHUKLA AuthorDate: 2021-09-19 15:12:49 +0000 Commit: Ashish SHUKLA CommitDate: 2021-09-19 15:12:49 +0000 irc/soju: Import a patch from upstream This is bug fix related to using it over VPN, or behind a reverse proxy. See https://todo.sr.ht/~emersion/soju/134, and https://github.com/emersion/soju/pull/33. --- irc/soju/Makefile | 1 + irc/soju/files/patch-cmd_soju_main.go | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/irc/soju/Makefile b/irc/soju/Makefile index c6cb66b2ca10..d3cffb881a1f 100644 --- a/irc/soju/Makefile +++ b/irc/soju/Makefile @@ -1,6 +1,7 @@ PORTNAME= soju DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= https://git.sr.ht/~emersion/go-scfg/archive/:goscfg \ https://git.sr.ht/~sircmpwn/go-bare/archive/:gobare diff --git a/irc/soju/files/patch-cmd_soju_main.go b/irc/soju/files/patch-cmd_soju_main.go new file mode 100644 index 000000000000..f0a2a1f03f41 --- /dev/null +++ b/irc/soju/files/patch-cmd_soju_main.go @@ -0,0 +1,9 @@ +--- cmd/soju/main.go.orig 2021-09-13 12:23:33 UTC ++++ cmd/soju/main.go +@@ -253,5 +253,6 @@ func proxyProtoListener(ln net.Listener, srv *soju.Ser + } + return proxyproto.IGNORE, nil + }, ++ ReadHeaderTimeout: 5 * time.Second, + } + }