diff options
author | Russ Allbery <eagle@eyrie.org> | 2018-06-03 15:36:21 -0700 |
---|---|---|
committer | Russ Allbery <eagle@eyrie.org> | 2018-06-03 15:36:42 -0700 |
commit | 4a0b9e747c8abfca24f30b7ce1e9a725ce11474a (patch) | |
tree | 9ed741a1fcc25fe23a6231782769d975c76a81c1 /contrib | |
parent | 85f851653191bb9f0fc8435ada239f00f182d34a (diff) |
Add SPDX-License-Identifier headers
Add SPDX-License-Identifier headers to all substantial source files.
Collapse copyright years. Add some Emacs configuration for files
where the copyright notice is at the end. Add a test that every
file has SPDX-License-Identifier.
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/ad-keytab | 29 | ||||
-rwxr-xr-x | contrib/commerzbank/wallet-history | 3 | ||||
-rwxr-xr-x | contrib/convert-srvtab-db | 2 | ||||
-rwxr-xr-x | contrib/used-principals | 2 | ||||
-rwxr-xr-x | contrib/wallet-contacts | 2 | ||||
-rwxr-xr-x | contrib/wallet-rekey-periodic | 10 | ||||
-rwxr-xr-x | contrib/wallet-summary | 3 | ||||
-rwxr-xr-x | contrib/wallet-unknown-hosts | 8 |
8 files changed, 51 insertions, 8 deletions
diff --git a/contrib/ad-keytab b/contrib/ad-keytab index 836cda5..badcb8d 100755 --- a/contrib/ad-keytab +++ b/contrib/ad-keytab @@ -5,7 +5,7 @@ # Written by Bill MacAllister <whm@dropbox.com> # Copyright 2016 Dropbox, Inc. # -# See LICENSE for licensing terms. +# SPDX-License-Identifier: MIT ############################################################################## # Declarations @@ -537,7 +537,8 @@ exit; __END__ =for stopwords -KDC LDAP MacAllister keytab keytabs msktutil ldapsearch +KDC LDAP MacAllister keytab keytabs msktutil ldapsearch MERCHANTABILITY +NONINFRINGEMENT sublicense SPDX-License-Identifier MIT =head1 NAME @@ -664,4 +665,28 @@ perldoc Wallet::Config. Bill MacAllister <whm@dropbox.com> +=head1 COPYRIGHT AND LICENSE + +Copyright 2016 Dropbox, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +SPDX-License-Identifier: MIT + =cut diff --git a/contrib/commerzbank/wallet-history b/contrib/commerzbank/wallet-history index 9826057..0adc766 100755 --- a/contrib/commerzbank/wallet-history +++ b/contrib/commerzbank/wallet-history @@ -31,6 +31,9 @@ # perl wallet-history.pl ... (t.b.d.)... # #-------------------------------------------------------------------------------------------------------------- +# +# SPDX-License-Identifier: MIT + # Version. my $VERSION = "0.5"; diff --git a/contrib/convert-srvtab-db b/contrib/convert-srvtab-db index e05b394..2801767 100755 --- a/contrib/convert-srvtab-db +++ b/contrib/convert-srvtab-db @@ -6,7 +6,7 @@ # Copyright 2008 # The Board of Trustees of the Leland Stanford Junior University # -# See LICENSE for licensing terms. +# SPDX-License-Identifier: MIT ############################################################################## # Modules and site configuration diff --git a/contrib/used-principals b/contrib/used-principals index 7169f0b..c6cac9b 100755 --- a/contrib/used-principals +++ b/contrib/used-principals @@ -6,7 +6,7 @@ # Copyright 2008 # The Board of Trustees of the Leland Stanford Junior University # -# See LICENSE for licensing terms. +# SPDX-License-Identifier: MIT require 5.006; use strict; diff --git a/contrib/wallet-contacts b/contrib/wallet-contacts index 0c72c9c..6ad2292 100755 --- a/contrib/wallet-contacts +++ b/contrib/wallet-contacts @@ -6,7 +6,7 @@ # Copyright 2009, 2015 # The Board of Trustees of the Leland Stanford Junior University # -# See LICENSE for licensing terms. +# SPDX-License-Identifier: MIT ############################################################################## # Modules and declarations diff --git a/contrib/wallet-rekey-periodic b/contrib/wallet-rekey-periodic index c15d83f..1e22e1e 100755 --- a/contrib/wallet-rekey-periodic +++ b/contrib/wallet-rekey-periodic @@ -170,7 +170,7 @@ DOCS=<<__END_OF_DOCS__ =for stopwords Allbery DES Heimdal hostname keytab keytabs ktutil rekey rekeyable -rekeying wallet-rekey wallet-rekey-periodic +rekeying wallet-rekey wallet-rekey-periodic SPDX-License-Identifier MIT =head1 NAME @@ -232,7 +232,7 @@ Russ Allbery <eagle@eyrie.org> =head1 COPYRIGHT AND LICENSE -Copyright 2013, 2014 The Board of Trustees of the Leland Stanford Junior +Copyright 2013-2014 The Board of Trustees of the Leland Stanford Junior University Permission is hereby granted, free of charge, to any person obtaining a @@ -253,6 +253,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +SPDX-License-Identifier: MIT + =head1 SEE ALSO ktutil(8), wallet(1), wallet-rekey(1) @@ -260,3 +262,7 @@ ktutil(8), wallet(1), wallet-rekey(1) =cut __END_OF_DOCS__ + +# Local Variables: +# copyright-at-end-flag: t +# End: diff --git a/contrib/wallet-summary b/contrib/wallet-summary index ba224d0..8a12294 100755 --- a/contrib/wallet-summary +++ b/contrib/wallet-summary @@ -173,6 +173,7 @@ close REPORT; =for stopwords -hm keytab keytabs MERCHANTABILITY NONINFRINGEMENT sublicense Allbery +SPDX-License-Identifier MIT =head1 NAME @@ -260,4 +261,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +SPDX-License-Identifier: MIT + =cut diff --git a/contrib/wallet-unknown-hosts b/contrib/wallet-unknown-hosts index 50b5a04..adf7b27 100755 --- a/contrib/wallet-unknown-hosts +++ b/contrib/wallet-unknown-hosts @@ -190,7 +190,7 @@ if ($command eq 'check') { =for stopwords ACL API CNAME DNS IP env keytab keytabs timestamp MERCHANTABILITY -NONINFRINGEMENT sublicense Allbery +NONINFRINGEMENT sublicense Allbery SPDX-License-Identifier MIT =head1 NAME @@ -282,4 +282,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +SPDX-License-Identifier: MIT + =cut + +# Local Variables: +# copyright-at-end-flag: t +# End: |