Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui: Package attribution and copyright bumps (fixes #3861) #3863

Closed
wants to merge 6 commits into from
Closed

gui: Package attribution and copyright bumps (fixes #3861) #3863

wants to merge 6 commits into from

Conversation

ProactiveServices
Copy link
Member

No description provided.

Copy link
Member

@calmh calmh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for digging through this and updating the list! I noted a couple of packages (geoip2, ginkgo, etc) that are not used by Syncthing itself but by other commands in here. Ideally those commands should show the info somewhere, but currently Syncthing is only one with an about box.

@@ -20,15 +20,26 @@ <h1 class="text-center">
<p translate>Syncthing includes the following software or portions thereof:</p>
<ul class="list-unstyled two-columns">
<li><a href="https://golang.org">The Go Programming Language</a>, Copyright &copy; 2012 The Go Authors.</li>
<li><a href="https://github.com/sasha-s/go-deadlock">sasha-s/go-deadlock</a>, Copyright &copy; 2016 sasha-s</li>
<li><a href="https://github.com/rcrowley/go-metrics">rcrowley/go-metrics</a>, Copyright &copy; 2012 Richard Crowley.</li>
<li><a href="https://github.com/oschwald/geoip2-golang">oschwald/geoip2-golang</a>, <a href="https://github.com/oschwald/maxminddb-golang">oschwald/maxminddb-golang</a>, Copyright &copy; 2015 <a href="mailto:oschwald@gmail.com">Gregory J. Oschwald</a>.</li>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relay pool server only

<li><a href="https://github.com/sasha-s/go-deadlock">sasha-s/go-deadlock</a>, Copyright &copy; 2016 sasha-s</li>
<li><a href="https://github.com/rcrowley/go-metrics">rcrowley/go-metrics</a>, Copyright &copy; 2012 Richard Crowley.</li>
<li><a href="https://github.com/oschwald/geoip2-golang">oschwald/geoip2-golang</a>, <a href="https://github.com/oschwald/maxminddb-golang">oschwald/maxminddb-golang</a>, Copyright &copy; 2015 <a href="mailto:oschwald@gmail.com">Gregory J. Oschwald</a>.</li>
<li><a href="https://github.com/onsi/ginkgo/">onsi/ginkgo/</a>, <a href="https://github.com/onsi/gomega/">onsi/gomega/</a> Copyright &copy; 2013-2014 Onsi Fakhouri.</li>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests for some other package only

<li><a href="https://github.com/oschwald/geoip2-golang">oschwald/geoip2-golang</a>, <a href="https://github.com/oschwald/maxminddb-golang">oschwald/maxminddb-golang</a>, Copyright &copy; 2015 <a href="mailto:oschwald@gmail.com">Gregory J. Oschwald</a>.</li>
<li><a href="https://github.com/onsi/ginkgo/">onsi/ginkgo/</a>, <a href="https://github.com/onsi/gomega/">onsi/gomega/</a> Copyright &copy; 2013-2014 Onsi Fakhouri.</li>
<li><a href="https://github.com/minio/sha256-simd">minio/sha256-simd</a>, Copyright &copy; 2016 Minio, Inc.</li>
<li><a href="https://github.com/lib/pq">lib/pq</a>, Copyright &copy; 2011-2013 &apos;pq&apos; Contributors Portions Copyright &copy; 2011 Blake Mizerany.</li>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relay pool server only

<li><a href="https://github.com/jackpal/gateway">jackpal/gateway</a>, Copyright &copy; 2010 Jack Palevich.</li>
<li><a href="https://github.com/gogo/protobuf">gogo/protobuf</a>, Copyright &copy; 2013 The GoGo Authors.</li>
<li><a href="https://github.com/gobwas/glob">gobwas/glob</a>, Copyright &copy; 2016 Sergey Kamardin.</li>
<li><a href="https://github.com/cznic/lldb">cznic/lldb</a>, Copyright &copy; 2014 The lldb Authors.</li>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discovery server only

@ProactiveServices
Copy link
Member Author

ProactiveServices commented Jan 2, 2017

How about a "-version" command line argument which would print version number and 3rd-party attributions? I think I could stretch my programming expertise that far ;-)
Or to keep the CLI output tidy, a brief notice referring the reader to the core app About box for the attributions, and then adding in sections into the modal.

@calmh
Copy link
Member

calmh commented Jan 2, 2017

I think typically it's only included in READMEs in the package, which we don't really do for those other commands but could. A -version or -copyright flag would be fine as well although I can't find another CLI program right now that includes that output so I think it may be overkill.

@ProactiveServices ProactiveServices self-assigned this Jan 2, 2017

[oschwald/geoip2-golang](https://github.com/oschwald/geoip2-golang), [oschwald/maxminddb-golang](https://github.com/oschwald/maxminddb-golang), Copyright (C) 2015 [Gregory J. Oschwald](mailto:oschwald@gmail.com).

[lib/pq](https://github.com/lib/pq)</a>, Copyright (C) 2011-2013 'pq' Contributors Portions Copyright (C) 2011 Blake Mizerany.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is used here. It's probably in discovery server. Also zinc(or something like that)/ql is used for discovery server too. Which is in memory query language.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, I was wrong about this before:

jb@unu:~/s/g/s/syncthing $ git grep cznic/ql | grep cmd
cmd/stdiscosrv/ql.go:	"github.com/cznic/ql"
jb@unu:~/s/g/s/syncthing $ git grep lib/pq | grep cmd
cmd/stdiscosrv/psql.go:	_ "github.com/lib/pq"
jb@unu:~/s/g/s/syncthing $ 

cmd/syncthing: Clarify -no-restart (avoids FAQs such as issue #3866),
added STDEADLOCK envvars, minor grammatical tweaks.
cmd/strelaysrv: Tidy up language and formatting in README, add section
on specifying private relays in clients.
@calmh
Copy link
Member

calmh commented Jan 10, 2017

@st-review merge

@st-review
Copy link

👌 Merged as c953cdc. Thanks, @ProactiveServices!

@st-review st-review closed this Jan 10, 2017
st-review pushed a commit that referenced this pull request Jan 10, 2017
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Jan 10, 2018
@syncthing syncthing locked and limited conversation to collaborators Jan 10, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants