databases/pg_tileserv: fix build on riscv64

Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) Differential Revision: https://reviews.freebsd.org/D39163
freebsd · Mar 21, 2023 · ef490e6 · ef490e6
1 parent aa7d199
commit ef490e6
Show file tree

Hide file tree

Showing 5 changed files with 296 additions and 2 deletions.
diff --git a/databases/pg_tileserv/Makefile b/databases/pg_tileserv/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pg_tileserv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
@@ -12,8 +12,14 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 GO_MODULE=	github.com/crunchydata/pg_tileserv
 
 PLIST_FILES=	bin/${PORTNAME}
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 .include <bsd.port.mk>
diff --git a/databases/pg_tileserv/distinfo b/databases/pg_tileserv/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1663752301
+TIMESTAMP = 1679154903
 SHA256 (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.mod) = 7e1507419e12c656b79df9d382b93cff41a3e07f2930dfa196af32d91ac5ac93
 SIZE (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.mod) = 570
 SHA256 (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.zip) = e957c97526178d3c28f35ba0009e0f48dd972bd1a2f089e84eaaf1d6cab51e19
 SIZE (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.zip) = 3066303
+SHA256 (go/databases_pg_tileserv/pg_tileserv-v1.0.9/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_pg_tileserv/pg_tileserv-v1.0.9/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/databases/pg_tileserv/files/patch-go.mod b/databases/pg_tileserv/files/patch-go.mod
@@ -0,0 +1,59 @@
+--- go.mod.orig	2023-03-18 16:09:32 UTC
++++ go.mod
+@@ -1,6 +1,6 @@
+ module github.com/CrunchyData/pg_tileserv
+
+-go 1.15
++go 1.17
+
+ require (
+ 	github.com/Masterminds/sprig/v3 v3.1.0
+@@ -16,4 +16,48 @@ require (
+ 	github.com/spf13/viper v1.7.1
+ 	github.com/stretchr/testify v1.6.1
+ 	github.com/theckman/httpforwarded v0.4.0
++)
++
++require (
++	github.com/Masterminds/goutils v1.1.0 // indirect
++	github.com/Masterminds/semver/v3 v3.1.0 // indirect
++	github.com/beorn7/perks v1.0.1 // indirect
++	github.com/cespare/xxhash/v2 v2.1.1 // indirect
++	github.com/davecgh/go-spew v1.1.1 // indirect
++	github.com/felixge/httpsnoop v1.0.1 // indirect
++	github.com/fsnotify/fsnotify v1.4.7 // indirect
++	github.com/golang/protobuf v1.4.3 // indirect
++	github.com/google/uuid v1.1.1 // indirect
++	github.com/hashicorp/hcl v1.0.0 // indirect
++	github.com/huandu/xstrings v1.3.1 // indirect
++	github.com/imdario/mergo v0.3.8 // indirect
++	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
++	github.com/jackc/pgio v1.0.0 // indirect
++	github.com/jackc/pgpassfile v1.0.0 // indirect
++	github.com/jackc/pgproto3/v2 v2.0.6 // indirect
++	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
++	github.com/jackc/puddle v1.1.2 // indirect
++	github.com/magiconair/properties v1.8.1 // indirect
++	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
++	github.com/mitchellh/copystructure v1.0.0 // indirect
++	github.com/mitchellh/mapstructure v1.1.2 // indirect
++	github.com/mitchellh/reflectwalk v1.0.0 // indirect
++	github.com/pelletier/go-toml v1.2.0 // indirect
++	github.com/pmezard/go-difflib v1.0.0 // indirect
++	github.com/prometheus/client_model v0.2.0 // indirect
++	github.com/prometheus/common v0.18.0 // indirect
++	github.com/prometheus/procfs v0.6.0 // indirect
++	github.com/spf13/afero v1.1.2 // indirect
++	github.com/spf13/cast v1.3.1 // indirect
++	github.com/spf13/jwalterweatherman v1.0.0 // indirect
++	github.com/spf13/pflag v1.0.3 // indirect
++	github.com/subosito/gotenv v1.2.0 // indirect
++	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
++	golang.org/x/sys v0.6.0 // indirect
++	golang.org/x/text v0.3.3 // indirect
++	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
++	google.golang.org/protobuf v1.23.0 // indirect
++	gopkg.in/ini.v1 v1.51.0 // indirect
++	gopkg.in/yaml.v2 v2.3.0 // indirect
++	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+ )
diff --git a/databases/pg_tileserv/files/patch-go.sum b/databases/pg_tileserv/files/patch-go.sum
@@ -0,0 +1,11 @@
+--- go.sum.orig	2023-03-18 16:09:35 UTC
++++ go.sum
+@@ -562,6 +562,8 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go
+ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
+ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/databases/pg_tileserv/files/patch-vendor_modules.txt b/databases/pg_tileserv/files/patch-vendor_modules.txt
@@ -0,0 +1,216 @@
+--- vendor/modules.txt.orig	2023-03-18 16:10:12 UTC
++++ vendor/modules.txt
+@@ -1,38 +1,48 @@
+ # github.com/Masterminds/goutils v1.1.0
++## explicit
+ github.com/Masterminds/goutils
+ # github.com/Masterminds/semver/v3 v3.1.0
++## explicit; go 1.12
+ github.com/Masterminds/semver/v3
+ # github.com/Masterminds/sprig/v3 v3.1.0
+-## explicit
++## explicit; go 1.13
+ github.com/Masterminds/sprig/v3
+ # github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220209173558-ad29539cd2e9
+-## explicit
++## explicit; go 1.16
+ github.com/antlr/antlr4/runtime/Go/antlr
+ # github.com/beorn7/perks v1.0.1
++## explicit; go 1.11
+ github.com/beorn7/perks/quantile
+ # github.com/cespare/xxhash/v2 v2.1.1
++## explicit; go 1.11
+ github.com/cespare/xxhash/v2
+ # github.com/davecgh/go-spew v1.1.1
++## explicit
+ github.com/davecgh/go-spew/spew
+ # github.com/felixge/httpsnoop v1.0.1
++## explicit; go 1.13
+ github.com/felixge/httpsnoop
+ # github.com/fsnotify/fsnotify v1.4.7
++## explicit
+ github.com/fsnotify/fsnotify
+ # github.com/golang/protobuf v1.4.3
++## explicit; go 1.9
+ github.com/golang/protobuf/proto
+ github.com/golang/protobuf/ptypes
+ github.com/golang/protobuf/ptypes/any
+ github.com/golang/protobuf/ptypes/duration
+ github.com/golang/protobuf/ptypes/timestamp
+ # github.com/google/uuid v1.1.1
++## explicit
+ github.com/google/uuid
+ # github.com/gorilla/handlers v1.5.1
+-## explicit
++## explicit; go 1.14
+ github.com/gorilla/handlers
+ # github.com/gorilla/mux v1.8.0
+-## explicit
++## explicit; go 1.12
+ github.com/gorilla/mux
+ # github.com/hashicorp/hcl v1.0.0
++## explicit
+ github.com/hashicorp/hcl
+ github.com/hashicorp/hcl/hcl/ast
+ github.com/hashicorp/hcl/hcl/parser
+@@ -44,101 +54,127 @@ github.com/hashicorp/hcl/json/parser
+ github.com/hashicorp/hcl/json/scanner
+ github.com/hashicorp/hcl/json/token
+ # github.com/huandu/xstrings v1.3.1
++## explicit; go 1.12
+ github.com/huandu/xstrings
+ # github.com/imdario/mergo v0.3.8
++## explicit
+ github.com/imdario/mergo
+ # github.com/jackc/chunkreader/v2 v2.0.1
++## explicit; go 1.12
+ github.com/jackc/chunkreader/v2
+ # github.com/jackc/pgconn v1.7.2
+-## explicit
++## explicit; go 1.12
+ github.com/jackc/pgconn
+ github.com/jackc/pgconn/internal/ctxwatch
+ github.com/jackc/pgconn/stmtcache
+ # github.com/jackc/pgio v1.0.0
++## explicit; go 1.12
+ github.com/jackc/pgio
+ # github.com/jackc/pgpassfile v1.0.0
++## explicit; go 1.12
+ github.com/jackc/pgpassfile
+ # github.com/jackc/pgproto3/v2 v2.0.6
++## explicit; go 1.12
+ github.com/jackc/pgproto3/v2
+ # github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b
++## explicit; go 1.14
+ github.com/jackc/pgservicefile
+ # github.com/jackc/pgtype v1.6.1
+-## explicit
++## explicit; go 1.12
+ github.com/jackc/pgtype
+ # github.com/jackc/pgx/v4 v4.9.2
+-## explicit
++## explicit; go 1.12
+ github.com/jackc/pgx/v4
+ github.com/jackc/pgx/v4/internal/sanitize
+ github.com/jackc/pgx/v4/log/logrusadapter
+ github.com/jackc/pgx/v4/pgxpool
+ # github.com/jackc/puddle v1.1.2
++## explicit; go 1.12
+ github.com/jackc/puddle
+ # github.com/magiconair/properties v1.8.1
++## explicit
+ github.com/magiconair/properties
+ # github.com/matttproud/golang_protobuf_extensions v1.0.1
++## explicit
+ github.com/matttproud/golang_protobuf_extensions/pbutil
+ # github.com/mitchellh/copystructure v1.0.0
++## explicit
+ github.com/mitchellh/copystructure
+ # github.com/mitchellh/mapstructure v1.1.2
++## explicit
+ github.com/mitchellh/mapstructure
+ # github.com/mitchellh/reflectwalk v1.0.0
++## explicit
+ github.com/mitchellh/reflectwalk
+ # github.com/pborman/getopt/v2 v2.1.0
+-## explicit
++## explicit; go 1.13
+ github.com/pborman/getopt/v2
+ # github.com/pelletier/go-toml v1.2.0
++## explicit
+ github.com/pelletier/go-toml
+ # github.com/pmezard/go-difflib v1.0.0
++## explicit
+ github.com/pmezard/go-difflib/difflib
+ # github.com/prometheus/client_golang v1.10.0
+-## explicit
++## explicit; go 1.13
+ github.com/prometheus/client_golang/prometheus
+ github.com/prometheus/client_golang/prometheus/internal
+ github.com/prometheus/client_golang/prometheus/promauto
+ github.com/prometheus/client_golang/prometheus/promhttp
+ # github.com/prometheus/client_model v0.2.0
++## explicit; go 1.9
+ github.com/prometheus/client_model/go
+ # github.com/prometheus/common v0.18.0
++## explicit; go 1.11
+ github.com/prometheus/common/expfmt
+ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
+ github.com/prometheus/common/model
+ # github.com/prometheus/procfs v0.6.0
++## explicit; go 1.13
+ github.com/prometheus/procfs
+ github.com/prometheus/procfs/internal/fs
+ github.com/prometheus/procfs/internal/util
+ # github.com/sirupsen/logrus v1.7.0
+-## explicit
++## explicit; go 1.13
+ github.com/sirupsen/logrus
+ # github.com/spf13/afero v1.1.2
++## explicit
+ github.com/spf13/afero
+ github.com/spf13/afero/mem
+ # github.com/spf13/cast v1.3.1
++## explicit
+ github.com/spf13/cast
+ # github.com/spf13/jwalterweatherman v1.0.0
++## explicit
+ github.com/spf13/jwalterweatherman
+ # github.com/spf13/pflag v1.0.3
++## explicit
+ github.com/spf13/pflag
+ # github.com/spf13/viper v1.7.1
+-## explicit
++## explicit; go 1.12
+ github.com/spf13/viper
+ # github.com/stretchr/testify v1.6.1
+-## explicit
++## explicit; go 1.13
+ github.com/stretchr/testify/assert
+ # github.com/subosito/gotenv v1.2.0
++## explicit
+ github.com/subosito/gotenv
+ # github.com/theckman/httpforwarded v0.4.0
+ ## explicit
+ github.com/theckman/httpforwarded
+ # golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
++## explicit; go 1.11
+ golang.org/x/crypto/bcrypt
+ golang.org/x/crypto/blowfish
+ golang.org/x/crypto/pbkdf2
+ golang.org/x/crypto/scrypt
+-# golang.org/x/sys v0.0.0-20210309074719-68d13333faf2
++# golang.org/x/sys v0.6.0
++## explicit; go 1.17
+ golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+ # golang.org/x/text v0.3.3
++## explicit; go 1.11
+ golang.org/x/text/cases
+ golang.org/x/text/internal
+ golang.org/x/text/internal/language
+@@ -153,9 +189,11 @@ golang.org/x/text/unicode/bidi
+ golang.org/x/text/unicode/norm
+ golang.org/x/text/width
+ # golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
++## explicit; go 1.11
+ golang.org/x/xerrors
+ golang.org/x/xerrors/internal
+ # google.golang.org/protobuf v1.23.0
++## explicit; go 1.9
+ google.golang.org/protobuf/encoding/prototext
+ google.golang.org/protobuf/encoding/protowire
+ google.golang.org/protobuf/internal/descfmt
+@@ -187,8 +225,11 @@ google.golang.org/protobuf/types/known/anypb
+ google.golang.org/protobuf/types/known/durationpb
+ google.golang.org/protobuf/types/known/timestamppb
+ # gopkg.in/ini.v1 v1.51.0
++## explicit
+ gopkg.in/ini.v1
+ # gopkg.in/yaml.v2 v2.3.0
++## explicit
+ gopkg.in/yaml.v2
+ # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
++## explicit
+ gopkg.in/yaml.v3