Commit Graph

43 Commits

Author SHA1 Message Date
mpl 951e9a45bf vendor: add golang.org/x/tools/go/buildutil
dep had computed it was needed, but apparently if I have it in my GOPATH
(and not in vendor), then building works (which seems weird?), which is
what made me miss it previously.

Change-Id: I979a107aea735e4f505882e4230a20c74eb5df04
2018-04-18 19:02:16 +02:00
Paul Lindner 3dfd895def vendor: update to dep v0.4.0 which allows for auto pruning, more legal files and no tests
Change-Id: I434887599e29664cb45440df3648207ae978c932
2018-02-06 06:56:32 -08:00
Paul Lindner fecf799c00 vendor: revert Camlistore->Perkeep change made in vendor
Change-Id: Ieeb91cb4fab9287fac19f0ce728c0773dfe1985e
2018-01-30 14:13:48 -08:00
Paul Lindner 459c75410e all: more renaming of Camlistore to Perkeep
Change-Id: I118e3cbcf20d80afeffc84f001388c4556f21628
2018-01-30 03:02:56 -08:00
mpl e9e9da4bf8 server/camlistored: use Let's Encrypt http-01 challenge
As the priority is to fix GCE instances, the port for the http-01
challenge is not configurable for now (80) even not on GCE, but it will
be in a follow-up change.

update golang.org/x/crypto/* (for acme) to rev
13931e22f9e72ea58bb73048bc752b48c6d4d4ac
update golang.org/x/sys/* to rev
fff93fa7cd278d84afc205751523809c464168ab (because unix is a dep of
crypto)

remove warning about Let's Encrypt security issue from pkg/deploy/gce

I had to manually exclude vendor/golang.org/x/crypto/acme/jws_test.go
for now because it contains a private key, and git whines about it, and
i could not override it.

Fixes #1033

Change-Id: Ie4f2049e97892dee9ab513300a5f12e64976aec8
2018-01-16 23:43:13 +01:00
Paul Lindner 020c6923ce vendor: fully switch to using the dep vendor tree management tool
Gopkg.toml / Gopkg.lock contain the full set of revisions used by
Perkeep now.  You can remove your entire vendor tree and

  dep ensure && dep prune

will restore you to a known good state.

This final change contains various files that were missing (like
LICENSE/README.md/tests) and also prunes a number of packages that
are transitively unused.

Fixes #889

Change-Id: I6ee6c4a4e14e2de6b6f33620eb7e2c44e97ce91b
2018-01-09 18:27:36 -08:00
Paul Lindner a0943ac69b vendor/golang.org/x/net: update to rev d866cfc389cec985d6fda2859936a575a55a3ab6
Using dep vendor in latest golang.org/x/net package.

Change-Id: I927467478a20316cbb3175b0da0c8b1abdcfedfa
2018-01-02 09:47:01 -08:00
Mathieu Lonjaret e2deb945a9 Merge "vendor/golang.org/x/text: include more x/text packages" 2018-01-02 16:05:49 +00:00
Paul Lindner 04c6794e12 vendor/golang.org/x/text: include more x/text packages
Various text packages were previously imported from
rev 88f656faf3f37f690df1a32515b479415e1a6769

This includes the dep included/pruned version of x/text so that
we can update golang.org/x/net to the latest revision.

Addresses: #889

Change-Id: I54e8b02aef70d16519801b8fafd6bfd5548af4cd
2018-01-02 06:37:24 -08:00
Paul Lindner 551deec74d vendor/golang.org/x/image: update to rev 12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7
This syncs golang.org/x/image using the dep tool to the most recent set of
changes from upstream.

Addresses: #889

Change-Id: I2bfde5a1c146656365062d73773ac2754df591b9
2018-01-02 05:49:29 -08:00
Brad Fitzpatrick 11e9c5567c Move some packages from perkeep.org/pkg to perkeep.org/internal
Notably: pkg/misc all moves.

And pkg/googlestorage is deleted, since it's not used. Only the
x/net/http2/h2demo code used to use it, but that ended in
https://go-review.googlesource.com/33230 (our vendored code is old).
So just nuke that dir for now. When it's refreshed, it'll either be
gone (dep prune) or new enough to not need googlestorage.

Also move pkg/pools, pkg/leak, and pkg/geocode to internal.

More remains.

Change-Id: I2640c4d18424062fdb8461ba451f1ce26719ae9d
2018-01-01 20:54:48 -08:00
Brad Fitzpatrick d6a0b05df0 Rename import paths from camlistore.org to perkeep.org.
Part of the project renaming, issue #981.

After this, users will need to mv their $GOPATH/src/camlistore.org to
$GOPATH/src/perkeep.org. Sorry.

This doesn't yet rename the tools like camlistored, camput, camget,
camtool, etc.

Also, this only moves the lru package to internal. More will move to
internal later.

Also, this doesn't yet remove the "/pkg/" directory. That'll likely
happen later.

This updates some docs, but not all.

devcam test now passes again, even with Go 1.10 (which requires vet
checks are clean too). So a bunch of vet tests are fixed in this CL
too, and a bunch of other broken tests are now fixed (introduced from
the past week of merging the CL backlog).

Change-Id: If580db1691b5b99f8ed6195070789b1f44877dd4
2018-01-01 16:03:34 -08:00
Paul Lindner bf4b74b5d6 vendor: remove more testdata from vendored packages
This is another step towards getting vendor managed by dep.

Addresses: #889

Change-Id: Ibdc3102eee25d6e873f4f418d17f0b4e46b38d9f
2018-01-01 01:48:48 -08:00
Paul Lindner 1d4d49ad7a vendor: update picago and oauth2 packages to latest version
Picago was very old and had local changes, update to latest release.
Also update to latest oauth2 as a transitive dependency.

Actual versions:

  github.com/tgulacsi/picago: 9e1ac2306c701ca7477a169b2b49902b7b4c58bf
  golang.org/x/oauth2: 197281d4e0ecd78c33865daf9c6e51626feefcb2

manually omit oauth2 testdata and tests that contain private keys to
make "devcam review" happy

This change was prepared using the forthcoming migration to the dep
tool.

Manually tested by setting up a new Picasa oauth config and importing
many photos.

Addresses: #889

Change-Id: I4d21941ccb4ade84ec658b5cfc8624e29f52be60
2017-12-31 15:23:15 -08:00
Paul Lindner 9b77475913 vendor: update golang.org/x/crypto to rev ede567c8e044a5913dad1d1af3696d9da953104c
This is the most recent committed vendoring of this directory introduced in
commit bace8b0d on Dec 9, 2016

f9cfd754 introduced the Apr 16, 2016 versions of a number of crypto packages
and this brings them up to date.

This change was prepared using the forthcoming migration to the dep tool.

Change-Id: Id29faa7fe57fe3fbb15208f615f951025ae0fbd9
2017-12-29 23:15:29 -08:00
Filippo Valsorda f9cfd754a2 blobserver/encrypt: rewrite encryption to use NaCl and a simpler meta
NaCl offers authenticated encryption, which means that the blobstore
can't tamper with the data.  Since SHA-1 were checked one could not
change a blob outright, but could add new blobs by tampering with the
meta blobs, too.  It's true that only signed blobs should cause actions
just by being present, but we are already far too deep in the chain of
assumptions, just not to spend a bit of CPU adding a MAC.  The new
scheme is much easier to prove secure.

Also simplified the meta by removing the IV (which is in the encrypted
blob anyway) and the encrypted size (which is plaintext size + overhead).

Finally, added tests (including a storagetest) and tried to make this
sort of production-ready.

Still to do are meta compaction and a way to regenerate the meta from
the blobs, in case of meta corruption (which now we can do securely
thanks to NaCl authentication).

golang.org/x/crypto/nacl/secretbox:
golang.org/x/crypto/poly1305:
golang.org/x/crypto/salsa20/salsa:
golang.org/x/crypto/scrypt:
golang.org/x/crypto/pbkdf2:
	1e61df8d9ea476e2e1504cd9a32b40280c7c6c7e

Change-Id: I095c6204ac093f6292c7943dbb77655d2c51aba6
2017-12-29 14:16:34 -08:00
Paul Lindner 38ae5fe6db vendor: avoid retaining irrelevant vendor files and enumerate existing removals
Previous vendoring removed a number of files manually.  This enumerates the
existing removals in .gitignore and makes it easier to transition to another
dependency management system. We also take this opportunity to add travis and
gitignore files to the list and remove those from the vendor tree.

Part of solving #889

Change-Id: Ia1b1b11ea5f2065de3a069022c2ee346e2befe78
2017-12-28 15:36:01 -08:00
Brad Fitzpatrick e996c47bd1 vendor: add golang.org/x/sync
Adds golang.org/x/sync to vendor at fd80eb99c

Change-Id: I4b24acff93f0ace5f2ff0ba3c40e8b4145e1f60d
2017-12-17 14:27:26 -08:00
Paul Lindner 3654a0f623 vendor: update go-charset, atom, html, text packages
to Rev 9dfe39835686865bff950a07b394c12a98ddc811 for golang.org/x/html
to Rev 88f656faf3f37f690df1a32515b479415e1a6769 for golang.org/x/text

These packages moved from code.google.com to their new home
in golang.org/x/html and golang.org/x/text

Change-Id: I4ee45ae1e18eb05ef7b0a8ec69e2f1f11d140340
2017-11-20 10:37:56 -08:00
Paul Lindner b24717a83f vendor: update xsrftoken
To rev 9dfe39835686865bff950a07b394c12a98ddc811

The xsrftoken package now lives in golang.org/x/net instead of code.google.com.

Change-Id: I4d98b1e50099dc7a1e1188f5c4311cd28c79f44a
2017-11-20 08:47:16 -08:00
Sterchele Nicolas 2e46fca5cc Update camlistore and gopherjs to go1.9
Vendoring:
- update gopherjs to rev: b40cd48c38f9a18eb3db20d163bad78de12cf0b7
- as usual, replace the fsnotify import statements with our dummy
  pkg/misc/fakefsnotify, as described in
https://camlistore-review.googlesource.com/c/9409
- add vendor/golang.org/x/tools/go/gcimporter15 dependency from
  rev: e531a2a1c15f94033f6fa87666caeb19a688175f

- make.go + .travis.yml: make go1.9 the required version
- Update comments on doc/environments-vars.md for CAMLI_GOPHERJS_GOROOT

Fixes #948
Fixes #949

Change-Id: I9285aebadad1502708d164a9dc69e044a325cb3a
2017-09-20 08:23:11 +02:00
mpl 2a2b3d4efd vendor: rm golang.org/x/crypto/openpgp/clearsign
Turns out we don't actually need it.

Change-Id: I309db82601245cb9d7ef3b8c79ca91bcedee8d5c
2016-12-10 01:21:10 +01:00
mpl bace8b0d44 vendor: add golang.org/x/crypto/openpgp/clearsign
at rev ede567c8e044a5913dad1d1af3696d9da953104c

used in upcoming https://camlistore-review.googlesource.com/8486

Change-Id: I72e71c51825b0679de414691714ab05be7507d2c
2016-12-09 15:36:20 +01:00
mpl 8b5b113d9f vendor: add golang.org/x/time/rate
at rev a4bde12657593d5e90d0533a3e4fd95e635124cb

used in upcoming https://camlistore-review.googlesource.com/8486

Change-Id: I6c761834c0f649ca12864d96bf201999d0c37339
2016-12-09 15:32:31 +01:00
mpl 3d048ca304 vendor: rm code.google.com/p/go.crypto/openpgp
And add golang.org/x/crypto/openpgp instead, at rev
ede567c8e044a5913dad1d1af3696d9da953104c
As well as golang.org/x/crypto/cast5 , as a dep.

Change-Id: I385fb0cd0eef438b43fa1dcd2a36e6a1442fd3b1
2016-11-28 19:34:32 +01:00
mpl 55d309838c vendor: add golang.org/x/crypto/acme
Something went wrong with 9bba338a79
where it should have been added.

Change-Id: Icbf83c1ea907811136a6cf59314a1940172f46d7
2016-10-14 01:26:01 +02:00
mpl 9bba338a79 website: use golang.org/x/crypto/acme for Lets Encrypt
vendor: add golang.org/x/crypto/acme/{autocert}
at 8e06e8ddd9629eb88639aba897641bff8031f1d3

remove rsc.io/letsencrypt and its deps.

Issue #859

Change-Id: I292543e88476bd4658846496f96a2a07bb25a186
2016-10-14 01:17:21 +02:00
mpl ab06dbd80d vendor: rename google.golang.org/cloud to cloud.google.com/go
rm google.golang.org/cloud
add cloud.google.com/go at a47b182e769f5e75f5fc927ff6ee2678f7f552cf
update google.golang.org/api to 63cb68f1e3834e44683ca062ddf06cb9a889380a
update google.golang.org/grpc to
0e6ec3a4501ee9ee2d023abe92e436fd04ed4081
update go4.org to f5283521d7365fb2875408726e9cbf349f173767

fix in cmd/ pkg/ server/

TODO(mpl): fix misc/docker tools as well. next CL.

Fixes #832

Change-Id: I842b968a0afea8a5822913bd614d67cdbe50ee63
2016-09-08 15:14:12 +02:00
Mathieu Lonjaret bae6855ade Merge "make.go: build and run gopherjs for publisher" 2016-07-13 13:31:34 +00:00
mpl 3b2ec3af0f make.go: build and run gopherjs for publisher
Run gopherjs to generate trivial javascript code that is used by the
publisher app.

Context:
https://github.com/camlistore/camlistore/issues/798#issuecomment-226902924

github.com/gopherjs vendored in at rev
f3c437955da554f2643747a598b0cc772a749f3f

PLEASE NOTE that this copy of gopherjs has been modified to avoid
depending on fsnotify. Hence the -w flag and the gopherjs serve command
are most likely broken.
Diff for that modification:
https://gist.github.com/mpl/ac9033bb28207401b7cedc3d74e6c096

Dependencies for building gopherjs:

kardianos/osext 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc
neelance/sourcemap 8c68805598ab8d5637b1a72b5f7d381ea0f39c31
spf13/cobra c678ff029ee250b65714e518f4f5c5cb934955de
spf13/pflag 7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7
golang.org/x/crypto/ssh/terminal
c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6
golang.org/x/tools/go/types/typeutil
ac02106e04bdb66a2db0413d931012bea165d7e0

github.com/gopherjs/jquery vendored in at
fbbfc4bbe29a29cb05788b66be44e0ac7f43cac7

jquery vendored in at 2.2.3

Change-Id: I7ff2d8e43e8a963f5ac1d13a2c936f263f7c53fc
2016-07-13 00:06:20 +02:00
mpl 1ab6ff4176 website: use Let's Encrypt
rsc.io/letsencrypt vendored at rev
a019c9e6fce0c7132679dea13bd8df7c86ffe26c

vendor/github.com/xenolf/lego was vendored within rsc.io/letsencrypt

vendor/gopkg.in/square/go-jose.v1/ was vendored within
rsc.io/letsencrypt

golang.org/x/crypto at rev 77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e for
github.com/xenolf/lego

golang.org/x/time/rate at rev a4bde12657593d5e90d0533a3e4fd95e635124cb
for rsc.io/letsencrypt

Fixes #805

Change-Id: I4ccdee328d8832e361fa5a39e5b94edc7c90ec34
2016-06-10 17:55:16 +02:00
mpl 135f0373d2 vendor: add golang.org/x/sys/unix
Needed by bazil.org/fuse , it should have been added with
e0a9699c63

rev 8fdfb00a6a1add0f7a145480e3729a5427a74375

Fixes #730

Change-Id: I2f9c7aa21a5ead82d7043392e4a55baf3cecffe6
2016-04-26 08:57:58 -07:00
Brad Fitzpatrick 75d60962f6 Move remaining stuff in third_party/* to vendor/*
Change-Id: Ifbcc02817083cba68d8c1acec3e6ec50e8f61149
2016-04-20 16:49:15 -07:00
mpl 749e693bd2 vendor: update golang.org/x/oauth2
rev 2897dcade18a126645f1368de827f1e613a60049

Change-Id: Iadfe929304564e2b6f0ff421a19295abd83ffd78
2016-03-25 18:25:26 +01:00
mpl f6c9604b1c vendor: update http2
rev 6acef71eb69611914f7a30939ea9f6e194c78172

Context: Issue #686

Change-Id: I6f0ccb5c64e647aae2893450a952c2abb7cfe0a4
2016-03-01 15:36:15 +01:00
mpl 3b91e403e4 vendor: update http2
From golang.org/x/net/http2 at 415f1917e1dbc946ec834288a8a1e5ff6eee2900

Change-Id: If03d7d2eb3080628fc04110f927d8c7b80612508
2016-01-08 15:45:30 +01:00
Brad Fitzpatrick 6abb512bae vendor: update golang.org/x/net/http2 to 5d0a0f8cd48
Change-Id: Ie7fe8c346ef23f9faeb46a41015bd964ff7d90ca
2015-12-28 17:21:14 -08:00
mpl 6af01f6c71 vendor: move pkg/images dependencies from third_party
This change is in anticipation of moving pkg/images to go4.org, where it
should not depend on packages in third_party.

So:
third_party/github.com/nf/cr2 -> vendor/github.com/nf/cr2
third_party/github.com/rwcarlsen/goexif -> vendor/github.com/rwcarlsen/goexif
third_party/golang.org/x/image/tiff -> vendor/golang.org/x/image/tiff

Note that third_party/go/pkg/image/jpeg was also a dependency of
pkg/images. We had vendored image/jpeg from tip at the time because it
offered advantages over the version from Go1.3
(https://github.com/camlistore/camlistore/issues/463).
Since we now depend on Go1.5, we can go back to depend on the stdlib
version, so we simply remove third_party/go/pkg/image/jpeg and adjust
the imports accordingly.

Change-Id: Ifc8ffae0551102e644a0a0c67f3ff89e04df15c7
2015-12-18 22:15:33 +01:00
mpl 1e2a306e8d vendor: add go4.org/cloud, update google.golang.org/api, and golang.org/x/net/context
Import go4.org/cloud/cloudlaunch and go4.org/cloud/gceutil, which were
previously in pkg/cloudlaunch, at rev
2c497a8c195996d6c48402c150da4919c1d99f33

Because the version on go4.org was updated to use the latest
google.golang.org/api/* , we also update our
vendor/google.golang.org/api/* to rev
030d584ade5f79aa2ed0ce067e8f7da50c9a10d5

This in turns requires to add vendor/golang.org/x/net/context/ctxhttp
(and update vendor/golang.org/x/net/context/) to rev
4f2fc6c1e69d41baf187332ee08fbd2b296f21ed

Also adding vendor/google.golang.org/api/gensupport for the same reason.

Change-Id: I9d6c3059626f7ecc0fbf2df0415043a464d27caa
2015-11-25 19:29:46 +01:00
mpl 2e34259de8 vendor: update http2
Replaced github.com/bradfitz/http2 with the latest golang.org/x/net/http2
and updated the following dependencies:

golang.org/x/net @ a179abb31d787abdb406d922dff79635a8d784a4
golang.org/x/oauth2 @ 038cb4adce85ed41e285c2e7cc6221a92bfa44aa
google.golang.org/grpc @ 1684e4a49ba8e6c88a8628b26395f310a1e3d99f

Change-Id: Ic8f294f22a4ec7f7ee513fd1eb29a0b72ac41886
2015-11-08 11:52:24 +01:00
Brad Fitzpatrick 5744b598d4 vendor: update Google Cloud Logging, gocloud, add grpc, move http2, etc
I just wanted to update the Google Cloud Logging code (still in review
at: https://code-review.googlesource.com/#/c/2650/) but that required
updating tons of things. For instance, gocloud now always depends on
grpc, which depends on http2, which we already had in third_party, so
that now moves into vendor.

I was unable to run the tests because of some error. The error message
was useless.

But "go run make.go" compiles everything at least.
2015-09-22 14:48:04 +02:00
mpl 45c77f8379 vendor: golang.org/x/image/draw
At rev b3d8467d91f6ab3c9240e1c1e98309baf9ba6343

For rescaling YCbCr images (next commits).

Change-Id: I5e6169ddd9cc2b1b933d9482adfbec08c7e378d9
2015-09-05 00:48:20 +02:00
Brad Fitzpatrick 6f58fc2426 Fix build, move more stuff from third_party to vendor. 2015-08-18 10:19:49 +02:00