CVS commit: pkgsrc/www/caddy

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 17 11:38:37 UTC 2024

Modified Files:
        pkgsrc/www/caddy: distinfo
Added Files:
        pkgsrc/www/caddy/patches: patch-listen.go patch-listen__unix.go
            patch-listen__unix__setopt.go

Log Message:
caddy: Use upstream PR to fix SunOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/caddy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/caddy/patches/patch-listen.go \
    pkgsrc/www/caddy/patches/patch-listen__unix__setopt.go
cvs rdiff -u -r0 -r1.3 pkgsrc/www/caddy/patches/patch-listen__unix.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/caddy/distinfo
diff -u pkgsrc/www/caddy/distinfo:1.19 pkgsrc/www/caddy/distinfo:1.20
--- pkgsrc/www/caddy/distinfo:1.19      Sat Mar 16 17:09:44 2024
+++ pkgsrc/www/caddy/distinfo   Fri May 17 11:38:37 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2024/03/16 17:09:44 bsiegert Exp $
+$NetBSD: distinfo,v 1.20 2024/05/17 11:38:37 jperkin Exp $
 
 BLAKE2s (caddy-2.7.6.tar.gz) = aa6751bde04003847dc4e86459c9c70f60a9dbbbe4b860fd378bed5952c5ae63
 SHA512 (caddy-2.7.6.tar.gz) = ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
@@ -2439,3 +2439,6 @@ Size (sigs.k8s.io_yaml_@v_v1.1.0.mod) = 
 BLAKE2s (sourcegraph.com_sourcegraph_appdash_@v_v0.0.0-20190731080439-ebfcffb1b5c0.mod) = 540120cf9a874588188b78b9cb2cb50598bfffd4f144e5fb2315313375937a3c
 SHA512 (sourcegraph.com_sourcegraph_appdash_@v_v0.0.0-20190731080439-ebfcffb1b5c0.mod) = 
7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 Size (sourcegraph.com_sourcegraph_appdash_@v_v0.0.0-20190731080439-ebfcffb1b5c0.mod) = 43 bytes
+SHA1 (patch-listen.go) = 171d7e880d9ebb062a891a7baabf2722ee813111
+SHA1 (patch-listen__unix.go) = 2c49bc9b3ad8b45aa37bf2b20dc466efcbfc3a1f
+SHA1 (patch-listen__unix__setopt.go) = 6808e3bb54f0ea09350bea80f7a303bb7a2e0e77

Added files:

Index: pkgsrc/www/caddy/patches/patch-listen.go
diff -u /dev/null pkgsrc/www/caddy/patches/patch-listen.go:1.1
--- /dev/null   Fri May 17 11:38:37 2024
+++ pkgsrc/www/caddy/patches/patch-listen.go    Fri May 17 11:38:37 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-listen.go,v 1.1 2024/05/17 11:38:37 jperkin Exp $
+
+https://github.com/caddyserver/caddy/pull/6021
+
+--- listen.go.orig     2024-05-17 11:30:15.570928551 +0000
++++ listen.go
+@@ -12,7 +12,7 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
+-//go:build !unix
++//go:build !unix || solaris || illumos
+ 
+ package caddy
+ 
Index: pkgsrc/www/caddy/patches/patch-listen__unix__setopt.go
diff -u /dev/null pkgsrc/www/caddy/patches/patch-listen__unix__setopt.go:1.1
--- /dev/null   Fri May 17 11:38:37 2024
+++ pkgsrc/www/caddy/patches/patch-listen__unix__setopt.go      Fri May 17 11:38:37 2024
@@ -0,0 +1,12 @@
+$NetBSD: patch-listen__unix__setopt.go,v 1.1 2024/05/17 11:38:37 jperkin Exp $
+
+https://github.com/caddyserver/caddy/pull/6021
+
+--- listen_unix_setopt.go.orig 2024-05-17 11:31:03.073654054 +0000
++++ listen_unix_setopt.go
+@@ -1,4 +1,4 @@
+-//go:build unix && !freebsd
++//go:build unix && !freebsd && !solaris && !illumos
+ 
+ package caddy
+ 

Index: pkgsrc/www/caddy/patches/patch-listen__unix.go
diff -u /dev/null pkgsrc/www/caddy/patches/patch-listen__unix.go:1.3
--- /dev/null   Fri May 17 11:38:37 2024
+++ pkgsrc/www/caddy/patches/patch-listen__unix.go      Fri May 17 11:38:37 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-listen__unix.go,v 1.3 2024/05/17 11:38:37 jperkin Exp $
+
+https://github.com/caddyserver/caddy/pull/6021
+
+--- listen_unix.go.orig        2024-05-17 11:30:39.511852361 +0000
++++ listen_unix.go
+@@ -15,7 +15,7 @@
+ // Even though the filename ends in _unix.go, we still have to specify the
+ // build constraint here, because the filename convention only works for
+ // literal GOOS values, and "unix" is a shortcut unique to build tags.
+-//go:build unix
++//go:build unix && !solaris && !illumos
+ 
+ package caddy
+