ruby-changes:38270
From: hsbt <ko1@a...>
Date: Mon, 20 Apr 2015 12:55:48 +0900 (JST)
Subject: [ruby-changes:38270] hsbt:r50351 (trunk): * ext/openssl/*: use license instead of licence.
hsbt 2015-04-20 12:55:09 +0900 (Mon, 20 Apr 2015) New Revision: 50351 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50351 Log: * ext/openssl/*: use license instead of licence. [fix GH-876][ci skip] Patch by @davydovanton * lib/net/https.rb: ditto. Modified files: trunk/ChangeLog trunk/ext/openssl/extconf.rb trunk/ext/openssl/lib/openssl/bn.rb trunk/ext/openssl/lib/openssl/buffering.rb trunk/ext/openssl/lib/openssl/cipher.rb trunk/ext/openssl/lib/openssl/config.rb trunk/ext/openssl/lib/openssl/digest.rb trunk/ext/openssl/lib/openssl/ssl.rb trunk/ext/openssl/lib/openssl/x509.rb trunk/ext/openssl/lib/openssl.rb trunk/ext/openssl/openssl_missing.c trunk/ext/openssl/openssl_missing.h trunk/ext/openssl/ossl.c trunk/ext/openssl/ossl.h trunk/ext/openssl/ossl_asn1.c trunk/ext/openssl/ossl_asn1.h trunk/ext/openssl/ossl_bio.c trunk/ext/openssl/ossl_bio.h trunk/ext/openssl/ossl_bn.c trunk/ext/openssl/ossl_bn.h trunk/ext/openssl/ossl_cipher.c trunk/ext/openssl/ossl_cipher.h trunk/ext/openssl/ossl_config.c trunk/ext/openssl/ossl_config.h trunk/ext/openssl/ossl_digest.c trunk/ext/openssl/ossl_digest.h trunk/ext/openssl/ossl_engine.c trunk/ext/openssl/ossl_engine.h trunk/ext/openssl/ossl_hmac.c trunk/ext/openssl/ossl_hmac.h trunk/ext/openssl/ossl_ns_spki.c trunk/ext/openssl/ossl_ns_spki.h trunk/ext/openssl/ossl_ocsp.c trunk/ext/openssl/ossl_ocsp.h trunk/ext/openssl/ossl_pkcs12.c trunk/ext/openssl/ossl_pkcs12.h trunk/ext/openssl/ossl_pkcs7.c trunk/ext/openssl/ossl_pkcs7.h trunk/ext/openssl/ossl_pkey.c trunk/ext/openssl/ossl_pkey.h trunk/ext/openssl/ossl_pkey_dh.c trunk/ext/openssl/ossl_pkey_dsa.c trunk/ext/openssl/ossl_pkey_rsa.c trunk/ext/openssl/ossl_rand.c trunk/ext/openssl/ossl_rand.h trunk/ext/openssl/ossl_ssl.c trunk/ext/openssl/ossl_ssl.h trunk/ext/openssl/ossl_version.h trunk/ext/openssl/ossl_x509.c trunk/ext/openssl/ossl_x509.h trunk/ext/openssl/ossl_x509attr.c trunk/ext/openssl/ossl_x509cert.c trunk/ext/openssl/ossl_x509crl.c trunk/ext/openssl/ossl_x509ext.c trunk/ext/openssl/ossl_x509name.c trunk/ext/openssl/ossl_x509req.c trunk/ext/openssl/ossl_x509revoked.c trunk/ext/openssl/ossl_x509store.c trunk/ext/openssl/ruby_missing.h trunk/lib/net/https.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 50350) +++ ChangeLog (revision 50351) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon Apr 20 12:54:56 2015 SHIBATA Hiroshi <hsbt@r...> + + * ext/openssl/*: use license instead of licence. + [fix GH-876][ci skip] Patch by @davydovanton + * lib/net/https.rb: ditto. + Mon Apr 20 12:42:40 2015 SHIBATA Hiroshi <hsbt@r...> * benchmark/bm_so_meteor_contest.rb: fix a typo. Index: lib/net/https.rb =================================================================== --- lib/net/https.rb (revision 50350) +++ lib/net/https.rb (revision 50351) @@ -13,7 +13,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/net/https.rb#L13 All rights reserved. == Licence - This program is licenced under the same licence as Ruby. + This program is licensed under the same licence as Ruby. (See the file 'LICENCE'.) =end Index: ext/openssl/ossl_pkey_dsa.c =================================================================== --- ext/openssl/ossl_pkey_dsa.c (revision 50350) +++ ext/openssl/ossl_pkey_dsa.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey_dsa.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(OPENSSL_NO_DSA) Index: ext/openssl/ossl_x509attr.c =================================================================== --- ext/openssl/ossl_x509attr.c (revision 50350) +++ ext/openssl/ossl_x509attr.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509attr.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_ssl.c =================================================================== --- ext/openssl/ossl_ssl.c (revision 50350) +++ ext/openssl/ossl_ssl.c (revision 50351) @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L7 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_ocsp.c =================================================================== --- ext/openssl/ossl_ocsp.c (revision 50350) +++ ext/openssl/ossl_ocsp.c (revision 50351) @@ -6,7 +6,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ocsp.c#L6 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_engine.c =================================================================== --- ext/openssl/ossl_engine.c (revision 50350) +++ ext/openssl/ossl_engine.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_engine.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_config.c =================================================================== --- ext/openssl/ossl_config.c (revision 50350) +++ ext/openssl/ossl_config.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_config.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_ssl.h =================================================================== --- ext/openssl/ossl_ssl.h (revision 50350) +++ ext/openssl/ossl_ssl.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_SSL_H_) Index: ext/openssl/ossl_hmac.c =================================================================== --- ext/openssl/ossl_hmac.c (revision 50350) +++ ext/openssl/ossl_hmac.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_hmac.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(OPENSSL_NO_HMAC) Index: ext/openssl/ossl_ocsp.h =================================================================== --- ext/openssl/ossl_ocsp.h (revision 50350) +++ ext/openssl/ossl_ocsp.h (revision 50351) @@ -6,7 +6,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ocsp.h#L6 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_OCSP_H_) Index: ext/openssl/ossl_engine.h =================================================================== --- ext/openssl/ossl_engine.h (revision 50350) +++ ext/openssl/ossl_engine.h (revision 50351) @@ -6,7 +6,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_engine.h#L6 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(OSSL_ENGINE_H) Index: ext/openssl/ossl_config.h =================================================================== --- ext/openssl/ossl_config.h (revision 50350) +++ ext/openssl/ossl_config.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_config.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_CONFIG_H_) Index: ext/openssl/ossl_cipher.c =================================================================== --- ext/openssl/ossl_cipher.c (revision 50350) +++ ext/openssl/ossl_cipher.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_cipher.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_hmac.h =================================================================== --- ext/openssl/ossl_hmac.h (revision 50350) +++ ext/openssl/ossl_hmac.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_hmac.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_HMAC_H_) Index: ext/openssl/ossl_pkey_rsa.c =================================================================== --- ext/openssl/ossl_pkey_rsa.c (revision 50350) +++ ext/openssl/ossl_pkey_rsa.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey_rsa.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(OPENSSL_NO_RSA) Index: ext/openssl/ossl_x509req.c =================================================================== --- ext/openssl/ossl_x509req.c (revision 50350) +++ ext/openssl/ossl_x509req.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509req.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ruby_missing.h =================================================================== --- ext/openssl/ruby_missing.h (revision 50350) +++ ext/openssl/ruby_missing.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ruby_missing.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_RUBY_MISSING_H_) Index: ext/openssl/ossl_cipher.h =================================================================== --- ext/openssl/ossl_cipher.h (revision 50350) +++ ext/openssl/ossl_cipher.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_cipher.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_CIPHER_H_) Index: ext/openssl/ossl_digest.c =================================================================== --- ext/openssl/ossl_digest.c (revision 50350) +++ ext/openssl/ossl_digest.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_digest.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl.c =================================================================== --- ext/openssl/ossl.c (revision 50350) +++ ext/openssl/ossl.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_x509store.c =================================================================== --- ext/openssl/ossl_x509store.c (revision 50350) +++ ext/openssl/ossl_x509store.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509store.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_digest.h =================================================================== --- ext/openssl/ossl_digest.h (revision 50350) +++ ext/openssl/ossl_digest.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_digest.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_DIGEST_H_) Index: ext/openssl/ossl.h =================================================================== --- ext/openssl/ossl.h (revision 50350) +++ ext/openssl/ossl.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_H_) Index: ext/openssl/lib/openssl/bn.rb =================================================================== --- ext/openssl/lib/openssl/bn.rb (revision 50350) +++ ext/openssl/lib/openssl/bn.rb (revision 50351) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/bn.rb#L10 # All rights reserved. # # = Licence -# This program is licenced under the same licence as Ruby. +# This program is licensed under the same licence as Ruby. # (See the file 'LICENCE'.) # # = Version Index: ext/openssl/lib/openssl/digest.rb =================================================================== --- ext/openssl/lib/openssl/digest.rb (revision 50350) +++ ext/openssl/lib/openssl/digest.rb (revision 50351) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/digest.rb#L10 # All rights reserved. # # = Licence -# This program is licenced under the same licence as Ruby. +# This program is licensed under the same licence as Ruby. # (See the file 'LICENCE'.) # # = Version Index: ext/openssl/lib/openssl/ssl.rb =================================================================== --- ext/openssl/lib/openssl/ssl.rb (revision 50350) +++ ext/openssl/lib/openssl/ssl.rb (revision 50351) @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/ssl.rb#L7 All rights reserved. = Licence - This program is licenced under the same licence as Ruby. + This program is licensed under the same licence as Ruby. (See the file 'LICENCE'.) = Version Index: ext/openssl/lib/openssl/config.rb =================================================================== --- ext/openssl/lib/openssl/config.rb (revision 50350) +++ ext/openssl/lib/openssl/config.rb (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/config.rb#L5 Copyright (C) 2010 Hiroshi Nakamura <nahi@r...> = Licence - This program is licenced under the same licence as Ruby. + This program is licensed under the same licence as Ruby. (See the file 'LICENCE'.) =end Index: ext/openssl/lib/openssl/x509.rb =================================================================== --- ext/openssl/lib/openssl/x509.rb (revision 50350) +++ ext/openssl/lib/openssl/x509.rb (revision 50351) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/x509.rb#L10 # All rights reserved. # # = Licence -# This program is licenced under the same licence as Ruby. +# This program is licensed under the same licence as Ruby. # (See the file 'LICENCE'.) # # = Version Index: ext/openssl/lib/openssl/buffering.rb =================================================================== --- ext/openssl/lib/openssl/buffering.rb (revision 50350) +++ ext/openssl/lib/openssl/buffering.rb (revision 50351) @@ -8,7 +8,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/buffering.rb#L8 # All rights reserved. # #= Licence -# This program is licenced under the same licence as Ruby. +# This program is licensed under the same licence as Ruby. # (See the file 'LICENCE'.) # #= Version Index: ext/openssl/lib/openssl/cipher.rb =================================================================== --- ext/openssl/lib/openssl/cipher.rb (revision 50350) +++ ext/openssl/lib/openssl/cipher.rb (revision 50351) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl/cipher.rb#L10 # All rights reserved. # # = Licence -# This program is licenced under the same licence as Ruby. +# This program is licensed under the same licence as Ruby. # (See the file 'LICENCE'.) # # = Version Index: ext/openssl/lib/openssl.rb =================================================================== --- ext/openssl/lib/openssl.rb (revision 50350) +++ ext/openssl/lib/openssl.rb (revision 50351) @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/lib/openssl.rb#L7 All rights reserved. = Licence - This program is licenced under the same licence as Ruby. + This program is licensed under the same licence as Ruby. (See the file 'LICENCE'.) = Version Index: ext/openssl/ossl_bn.c =================================================================== --- ext/openssl/ossl_bn.c (revision 50350) +++ ext/openssl/ossl_bn.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_bn.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ /* modified by Michal Rokos <m.rokos@s...> */ Index: ext/openssl/ossl_asn1.c =================================================================== --- ext/openssl/ossl_asn1.c (revision 50350) +++ ext/openssl/ossl_asn1.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_pkcs12.c =================================================================== --- ext/openssl/ossl_pkcs12.c (revision 50350) +++ ext/openssl/ossl_pkcs12.c (revision 50351) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkcs12.c#L1 /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) * $Id$ */ Index: ext/openssl/ossl_bn.h =================================================================== --- ext/openssl/ossl_bn.h (revision 50350) +++ ext/openssl/ossl_bn.h (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_bn.h#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #if !defined(_OSSL_BN_H_) Index: ext/openssl/ossl_x509.c =================================================================== --- ext/openssl/ossl_x509.c (revision 50350) +++ ext/openssl/ossl_x509.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_x509crl.c =================================================================== --- ext/openssl/ossl_x509crl.c (revision 50350) +++ ext/openssl/ossl_x509crl.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509crl.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_ns_spki.c =================================================================== --- ext/openssl/ossl_ns_spki.c (revision 50350) +++ ext/openssl/ossl_ns_spki.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ns_spki.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_x509name.c =================================================================== --- ext/openssl/ossl_x509name.c (revision 50350) +++ ext/openssl/ossl_x509name.c (revision 50351) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_x509name.c#L5 * All rights reserved. */ /* - * This program is licenced under the same licence as Ruby. + * This program is licensed under the same licence as Ruby. * (See the file 'LICENCE'.) */ #include "ossl.h" Index: ext/openssl/ossl_asn1.h =================================================================== --- ext/openssl/ossl_asn1.h (revision 50350) +++ ext/openssl/ossl_asn1.h (revisio (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/