mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-12 07:27:57 +00:00
www/gitlab-pages: upgrade to 1.10.0 which is required for gitlab-ce 12.3 upgrade.
Thanks to: swills for providing the upgrade
This commit is contained in:
Matthias Fechner
parent
a96ca6b5d3
commit
59ec7dbb51
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=513435
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= gitlab-pages
|
||||
PORTVERSION= 1.7.2
|
||||
PORTVERSION= 1.10.0
|
||||
CATEGORIES= www
|
||||
|
||||
MAINTAINER= swills@FreeBSD.org
|
||||
@ -10,12 +10,58 @@ COMMENT= Official GitLab Pages daemon
|
||||
LICENSE= MIT
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
USES= go
|
||||
USES= gmake go:modules
|
||||
|
||||
USE_GITLAB= yes
|
||||
USE_GITHUB= nodefault
|
||||
|
||||
GL_ACCOUNT= gitlab-org
|
||||
# Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
|
||||
GL_COMMIT= 520398c7154a50f7768ee52da71afd52efff85b1
|
||||
GL_COMMIT= 77c1fd80fe2e7e6e25b038b720a47df7d7c7f374
|
||||
|
||||
GH_TUPLE= kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
|
||||
beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
|
||||
certifi:gocertifi:a5e0173ced67:certifi_gocertifi/vendor/github.com/certifi/gocertifi \
|
||||
certifi:gocertifi:ee1a9a0726d2:certifi_gocertifi2/.GOPATH/pkg/mod/github.com/certifi/gocertifi@v0.0.0-20190905060710-a5e0173ced67 \
|
||||
client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \
|
||||
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
|
||||
fzipp:gocyclo:6acd4345c835:fzipp_gocyclo/vendor/github.com/fzipp/gocyclo \
|
||||
getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
|
||||
go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
|
||||
golang:crypto:227b76d455e7:golang_crypto/vendor/golang.org/x/crypto \
|
||||
golang:lint:414d861bb4ac:golang_lint/vendor/golang.org/x/lint \
|
||||
golang:mock:v1.3.1:golang_mock/vendor/github.com/golang/mock \
|
||||
golang:net:a7b16738d86b:golang_net/vendor/golang.org/x/net \
|
||||
golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
|
||||
golang:sys:bbd175535a8b:golang_sys/vendor/golang.org/x/sys \
|
||||
golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
|
||||
golang:tools:2dc213d980bc:golang_tools/vendor/golang.org/x/tools \
|
||||
google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
|
||||
gorilla:context:v1.1.1:gorilla_context/vendor/github.com/gorilla/context \
|
||||
gorilla:securecookie:v1.1.1:gorilla_securecookie/vendor/github.com/gorilla/securecookie \
|
||||
gorilla:sessions:v1.2.0:gorilla_sessions/vendor/github.com/gorilla/sessions \
|
||||
grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
|
||||
grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
|
||||
grpc:grpc-go:v1.19.1:grpc_grpc_go/vendor/google.golang.org/grpc \
|
||||
karrick:godirwalk:v1.10.12:karrick_godirwalk/vendor/github.com/karrick/godirwalk \
|
||||
konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
|
||||
matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
|
||||
namsral:flag:v1.7.4-pre:namsral_flag/vendor/github.com/namsral/flag \
|
||||
pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \
|
||||
pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
|
||||
prometheus:client_golang:v1.1.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
|
||||
prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \
|
||||
prometheus:common:v0.6.0:prometheus_common/vendor/github.com/prometheus/common \
|
||||
prometheus:procfs:v0.0.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
|
||||
rs:cors:v1.7.0:rs_cors/vendor/github.com/rs/cors \
|
||||
sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \
|
||||
sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
|
||||
stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
|
||||
wadey:gocovmerge:b5bfa59ec0ad:wadey_gocovmerge/vendor/github.com/wadey/gocovmerge
|
||||
|
||||
GL_TUPLE= gitlab-org:gitaly:c013d9f144d1d288fed054d0541241b4c6d3bdcc:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \
|
||||
gitlab-org:labkit:3253d7975ca73714779c0a1fc95a27fb678071b6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
|
||||
lupine:go-mimedb:e8af1d65987739a7ab277dedd9772c7398154ff3:lupine_go_mimedb/vendor/gitlab.com/lupine/go-mimedb
|
||||
|
||||
GO_BUILDFLAGS= -ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}"
|
||||
GO_PKGNAME= gitlab.com/gitlab-org/gitlab-pages
|
||||
@ -27,4 +73,9 @@ USE_RC_SUBR= gitlab_pages
|
||||
USERS= gitlab-pages
|
||||
GROUPS= gitlab-pages
|
||||
|
||||
GO_BUILDFLAGS+= --ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}"
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKDIR}/bin/gitlab-pages ${STAGEDIR}${PREFIX}/bin/gitlab-pages
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,87 @@
|
||||
TIMESTAMP = 1568490277
|
||||
SHA256 (gitlab-org-gitlab-pages-520398c7154a50f7768ee52da71afd52efff85b1_GL0.tar.gz) = fe75cabbc863ea1de90e9cdf12fe6a07f0f7bc4f77561e0de5b35110b1a63bcc
|
||||
SIZE (gitlab-org-gitlab-pages-520398c7154a50f7768ee52da71afd52efff85b1_GL0.tar.gz) = 1984367
|
||||
TIMESTAMP = 1569852795
|
||||
SHA256 (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = c032455620be4be434428bfe5b73679ccd7c01f402607c45204d233ce8923309
|
||||
SIZE (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = 4898
|
||||
SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
|
||||
SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
|
||||
SHA256 (certifi-gocertifi-a5e0173ced67_GH0.tar.gz) = f021fd5f62b221aac04e69b030ace59fd2a0912433fb6b938965a61f49410ba6
|
||||
SIZE (certifi-gocertifi-a5e0173ced67_GH0.tar.gz) = 155581
|
||||
SHA256 (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = b0b9ac422d6378c82be85f71f206757db24ecad314aca6155e9954363817fae1
|
||||
SIZE (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = 143846
|
||||
SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875
|
||||
SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283
|
||||
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
|
||||
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
|
||||
SHA256 (fzipp-gocyclo-6acd4345c835_GH0.tar.gz) = 2e77cf74e58aa3e567d8740386338dfa91409ea689fea0b0d26e7c3f7c10bba9
|
||||
SIZE (fzipp-gocyclo-6acd4345c835_GH0.tar.gz) = 3428
|
||||
SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5
|
||||
SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314
|
||||
SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
|
||||
SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
|
||||
SHA256 (golang-crypto-227b76d455e7_GH0.tar.gz) = f6eef37c7e4df60af1de2d018d396cb5e4901388cc43a2e5361dc4c4648cd8a6
|
||||
SIZE (golang-crypto-227b76d455e7_GH0.tar.gz) = 1692189
|
||||
SHA256 (golang-lint-414d861bb4ac_GH0.tar.gz) = b3a1608060184b8dfe04744271beedc5b8f42f65338ea4c4cfe192f5b5dbcd2c
|
||||
SIZE (golang-lint-414d861bb4ac_GH0.tar.gz) = 31432
|
||||
SHA256 (golang-mock-v1.3.1_GH0.tar.gz) = c70de449e2fe826047a87bf25a81517dd3ac0665cdbdfd94ded69b49fe1b0361
|
||||
SIZE (golang-mock-v1.3.1_GH0.tar.gz) = 48942
|
||||
SHA256 (golang-net-a7b16738d86b_GH0.tar.gz) = 77cc2a72affacce9d23ef787cc88852d69d52988b0d1cda7dded0d83b5b97722
|
||||
SIZE (golang-net-a7b16738d86b_GH0.tar.gz) = 1099935
|
||||
SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
|
||||
SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
|
||||
SHA256 (golang-sys-bbd175535a8b_GH0.tar.gz) = 2837b7e2bb23dd6492021b6e01b2dfb94aa0d7b0981c2b86027fdbad1df07f56
|
||||
SIZE (golang-sys-bbd175535a8b_GH0.tar.gz) = 1468385
|
||||
SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
|
||||
SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
|
||||
SHA256 (golang-tools-2dc213d980bc_GH0.tar.gz) = dc372f7b80fb4d12ba60445427b1e7e9138942183ae4353f3f894c04e507df2d
|
||||
SIZE (golang-tools-2dc213d980bc_GH0.tar.gz) = 2267969
|
||||
SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377
|
||||
SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775
|
||||
SHA256 (gorilla-context-v1.1.1_GH0.tar.gz) = 2dfdd051c238695bf9ebfed0bf6a8c533507ac0893bce23be5930e973736bb03
|
||||
SIZE (gorilla-context-v1.1.1_GH0.tar.gz) = 4574
|
||||
SHA256 (gorilla-securecookie-v1.1.1_GH0.tar.gz) = b7897b2243f0d43913aca318593c5c2586294fcd3265189d564ddda1b880fe95
|
||||
SIZE (gorilla-securecookie-v1.1.1_GH0.tar.gz) = 41240
|
||||
SHA256 (gorilla-sessions-v1.2.0_GH0.tar.gz) = 576d154ff12273d88d25864d14bd9b0fb1a864274d1fb3e224546529068c8968
|
||||
SIZE (gorilla-sessions-v1.2.0_GH0.tar.gz) = 13352
|
||||
SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b
|
||||
SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266
|
||||
SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
|
||||
SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
|
||||
SHA256 (grpc-grpc-go-v1.19.1_GH0.tar.gz) = 05faffafaadb6fdd4be7862aeb987cb2aa57f59cb0b695bcf673e6bd6182207f
|
||||
SIZE (grpc-grpc-go-v1.19.1_GH0.tar.gz) = 600232
|
||||
SHA256 (karrick-godirwalk-v1.10.12_GH0.tar.gz) = 738995006bf8412f17cbc2d8ef717f7568139548fdee311531ee68f90c39ac2d
|
||||
SIZE (karrick-godirwalk-v1.10.12_GH0.tar.gz) = 18450
|
||||
SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
|
||||
SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
|
||||
SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
|
||||
SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
|
||||
SHA256 (namsral-flag-v1.7.4-pre_GH0.tar.gz) = 6a1141e4d8a81b03715bb07bb6b750854b204c3c683bb71403f418ac6a5becd1
|
||||
SIZE (namsral-flag-v1.7.4-pre_GH0.tar.gz) = 14418
|
||||
SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5
|
||||
SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344
|
||||
SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
|
||||
SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
|
||||
SHA256 (prometheus-client_golang-v1.1.0_GH0.tar.gz) = 4fd80a210cc090db117d92d126d15cdb5108c84e3178ffc7bd26cb2fa4298343
|
||||
SIZE (prometheus-client_golang-v1.1.0_GH0.tar.gz) = 140006
|
||||
SHA256 (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 17571c708bab9a1ba18d9dd0c9bfe96dff3f1b84c63e7d8d4c3489ef5c34ee40
|
||||
SIZE (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 57491
|
||||
SHA256 (prometheus-common-v0.6.0_GH0.tar.gz) = 3b58d10c44520d8fd3817b45599a6229123ccf8967db528063143266405b7c4f
|
||||
SIZE (prometheus-common-v0.6.0_GH0.tar.gz) = 99696
|
||||
SHA256 (prometheus-procfs-v0.0.3_GH0.tar.gz) = 3af9b805166932b771dfa19a4c94eb83ceefd2eb54d1a314c3bf15a5f3154d0d
|
||||
SIZE (prometheus-procfs-v0.0.3_GH0.tar.gz) = 91880
|
||||
SHA256 (rs-cors-v1.7.0_GH0.tar.gz) = 7cd0991ab30502e3c442c0a8ec153c58a1d5cbdc2c74af022f8d2354d65af6b8
|
||||
SIZE (rs-cors-v1.7.0_GH0.tar.gz) = 12147
|
||||
SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e148324eff67b69524b0ef766d64050d9e3
|
||||
SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000
|
||||
SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
|
||||
SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
|
||||
SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
|
||||
SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
|
||||
SHA256 (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 0f865bd53c02e7d89115aaa60ce8b8147b1f71238f2cf33a6593465f845703cb
|
||||
SIZE (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 2309
|
||||
SHA256 (gitlab-org-gitlab-pages-77c1fd80fe2e7e6e25b038b720a47df7d7c7f374_GL0.tar.gz) = 8fc8af30147751708a14300f27f41d9a16397af37b464d3a33dc506fedcf4890
|
||||
SIZE (gitlab-org-gitlab-pages-77c1fd80fe2e7e6e25b038b720a47df7d7c7f374_GL0.tar.gz) = 103973
|
||||
SHA256 (gitlab-org-gitaly-c013d9f144d1d288fed054d0541241b4c6d3bdcc_GL0.tar.gz) = a1f406a9eaef26a2e39e4cf9adc417fdbce45c164de46bec6aa2e2d0cf1388df
|
||||
SIZE (gitlab-org-gitaly-c013d9f144d1d288fed054d0541241b4c6d3bdcc_GL0.tar.gz) = 2743550
|
||||
SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
|
||||
SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149
|
||||
SHA256 (lupine-go-mimedb-e8af1d65987739a7ab277dedd9772c7398154ff3_GL0.tar.gz) = 1312f727d2910acf56382c6dfc26eb4d504fb02d79d7fc731f514d051e275d91
|
||||
SIZE (lupine-go-mimedb-e8af1d65987739a7ab277dedd9772c7398154ff3_GL0.tar.gz) = 14727
|
||||
|
||||
11
www/gitlab-pages/files/patch-internal_jail_jail.go
Normal file
11
www/gitlab-pages/files/patch-internal_jail_jail.go
Normal file
@ -0,0 +1,11 @@
|
||||
--- internal/jail/jail.go.orig 2019-09-29 20:26:56 UTC
|
||||
+++ internal/jail/jail.go
|
||||
@@ -228,7 +228,7 @@ func handleFile(dest string, src pathAndMode) error {
|
||||
func createCharacterDevice(dest string, src pathAndMode) error {
|
||||
unixMode := uint32(src.mode.Perm() | syscall.S_IFCHR)
|
||||
|
||||
- return unix.Mknod(dest, unixMode, src.rdev)
|
||||
+ return unix.Mknod(dest, unixMode, uint64(src.rdev))
|
||||
}
|
||||
|
||||
func copyFile(dest, src string, perm os.FileMode) error {
|
||||
@ -1,46 +0,0 @@
|
||||
--- vendor/github.com/karrick/godirwalk/readdir.go.orig 2018-04-30 10:37:07 UTC
|
||||
+++ vendor/github.com/karrick/godirwalk/readdir.go
|
||||
@@ -2,6 +2,9 @@ package godirwalk
|
||||
|
||||
import (
|
||||
"os"
|
||||
+ "path/filepath"
|
||||
+
|
||||
+ "github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// Dirent stores the name and file system mode type of discovered file system
|
||||
@@ -11,6 +14,22 @@ type Dirent struct {
|
||||
modeType os.FileMode
|
||||
}
|
||||
|
||||
+// NewDirent returns a newly initialized Dirent structure, or an error. This
|
||||
+// function does not follow symbolic links.
|
||||
+//
|
||||
+// This function is rarely used, as Dirent structures are provided by other
|
||||
+// functions in this library that read and walk directories.
|
||||
+func NewDirent(osPathname string) (*Dirent, error) {
|
||||
+ fi, err := os.Lstat(osPathname)
|
||||
+ if err != nil {
|
||||
+ return nil, errors.Wrap(err, "cannot lstat")
|
||||
+ }
|
||||
+ return &Dirent{
|
||||
+ name: filepath.Base(osPathname),
|
||||
+ modeType: fi.Mode() & os.ModeType,
|
||||
+ }, nil
|
||||
+}
|
||||
+
|
||||
// Name returns the basename of the file system entry.
|
||||
func (de Dirent) Name() string { return de.name }
|
||||
|
||||
@@ -28,6 +47,10 @@ func (de Dirent) ModeType() os.FileMode { return de.mo
|
||||
// may be set for a node. For instance, on Windows, a symbolic link that points
|
||||
// to a directory will have both the directory and the symbolic link bits set.
|
||||
func (de Dirent) IsDir() bool { return de.modeType&os.ModeDir != 0 }
|
||||
+
|
||||
+// IsRegular returns true if and only if the Dirent represents a regular
|
||||
+// file. That is, it ensures that no mode type bits are set.
|
||||
+func (de Dirent) IsRegular() bool { return de.modeType&os.ModeType == 0 }
|
||||
|
||||
// IsSymlink returns true if and only if the Dirent represents a file system
|
||||
// symbolic link. Note that on some operating systems, more than one file mode
|
||||
@ -1,17 +0,0 @@
|
||||
--- vendor/github.com/karrick/godirwalk/readdir_unix.go.orig 2018-04-30 10:37:07 UTC
|
||||
+++ vendor/github.com/karrick/godirwalk/readdir_unix.go
|
||||
@@ -1,4 +1,4 @@
|
||||
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
|
||||
+// +build darwin freebsd linux netbsd openbsd
|
||||
|
||||
package godirwalk
|
||||
|
||||
@@ -49,7 +49,7 @@ func readdirents(osDirname string, scratchBuffer []byt
|
||||
de = (*syscall.Dirent)(unsafe.Pointer(&buf[0])) // point entry to first syscall.Dirent in buffer
|
||||
buf = buf[de.Reclen:] // advance buffer
|
||||
|
||||
- if de.Ino == 0 {
|
||||
+ if direntIno(de) == 0 {
|
||||
continue // this item has been deleted, but not yet removed from directory
|
||||
}
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
--- vendor/github.com/karrick/godirwalk/walk.go.orig 2018-04-30 10:37:07 UTC
|
||||
+++ vendor/github.com/karrick/godirwalk/walk.go
|
||||
@@ -188,6 +188,10 @@ func Walk(pathname string, options *Options) error {
|
||||
options.ErrorCallback = defaultErrorCallback
|
||||
}
|
||||
|
||||
+ if options.ScratchBuffer == nil {
|
||||
+ options.ScratchBuffer = make([]byte, 64*1024)
|
||||
+ }
|
||||
+
|
||||
err = walk(pathname, dirent, options)
|
||||
if err == filepath.SkipDir {
|
||||
return nil // silence SkipDir for top level
|
||||
Loading…
Reference in New Issue
Block a user