rubygems-update 2.0.0.preview2 → 2.0.0.preview2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: a26a66549f8615007323fcde8b0c56acbf3e832f
-  data.tar.gz: c354d5ff0f380f76bea776370eb8eb0a4d433198
+  metadata.gz: !binary |-
+    MDRiNTU5NDZhMmMyMjlmYzU1ZTc0NTcxODA3OTJmMTcwZjMyZThkZQ==
+  data.tar.gz: !binary |-
+    NTVhMmM4ZmM1ZTI3OTUwNzg2NzgzNjg3YmE5MjliZTE2MDRiMjMzMA==
 !binary "U0hBNTEy":
-  metadata.gz: c0470251c7fe5392a47a13eedb9ad9bbaf545cdc00e68af6689ebfebbd6fc5bc1caf8547f79dea5b8463581cbbaa01e594f51664e1a3887045cadeb4f0abff73
-  data.tar.gz: de7675e2d3a4a7f3d6e1ee9986423a5eb3fe3a3b98b2071383659e4123f54c2c9933c61636e0d157ce8d9145eb5ecb11012a89244a92c98caea2e144618f4122
+  metadata.gz: !binary |-
+    OGExMjMzYmQyNzUwZWI4ZWE5NDUzYWYwNTY0YzY2MjFlN2ZkNjBiOTBkZDUz
+    MDRiMTIxYjIzZmJlMjg4ZTM5YTBmOWMzYjliNjliMmEyMGVhY2MxNTIyZjYz
+    Nzc1MDM0MGM1YWRiNWRhN2UyY2M0MzJkMjE2YTg0ZGU4NjgyODM=
+  data.tar.gz: !binary |-
+    YTliNzhhYmQyMjc5YzIxM2NkYTY3ZjJkOWM2ZWYyODcwZjUxNzA5NTdiMTAw
+    ODM5MGRiNDdkMzhmYTM5MDY1N2MwYjQzNDVkNzZhOWRmYjc3MGIyMjVhMzFm
+    NWM2ZTdkMjM2YzM4ODlmYjQ4YWRlMGM3NDgzYzNlZjY1NzI5MjE=

data.tar.gz.sig

@@ -1,3 +1,2 @@
-W
-B�{�p2�o7�F�����/��G*MԻ,�	�v�s�	�	n����i�G����a��1=����"ܦ�L��䨼c��tb�Z���ܬb�9��m�K�,����q|�%HK�;<�
�k$V.��A\?r�,6��$zB�lR�� ��vh��\���	��ߐ��m'dL����Զ��E�J-_Ք�Z
-�w���b������c>��R����ێ�nn�+?G��*,�җ�8"D��~o�}�G�
+
+<�m
�K���:��1i�}�1/�
? ��ű�OH�g�Fd��z�Z������m�vz�#U���D\Lm���@��<���������ɂ�{H:��}��F<��,�a

data/History.txt

@@ -1,6 +1,6 @@
 # coding: UTF-8
 
-=== 2.0.0.preview2 / 2012-12-01
+=== 2.0.0.preview2.1
 
 As a preview release, please file bugs for any problems you have with RubyGems
 at https://github.com/rubygems/rubygems/issues.
@@ -13,6 +13,27 @@ maintainable and improve APIs for RubyGems users.
 If you are using bundler be sure to install version 1.3.0.pre.  Older versions
 of bundler will not work with RubyGems 2.0.
 
+* Minor enhancements:
+  * Gem::DependencyInstaller now passes build_args down to the installer.
+    Pull Request #412 by Sam Rawlins.
+  * RubyGems no longer defaults to uninstalling gems if a dependency would be
+    broken.  Now you must manually say "yes".  Pull Request #406 by Shannon
+    Skipper.
+
+* Bug fixes:
+  * RubyGems tests now run in FIPS mode.  Issue #365 by Vít Ondruch
+  * Fixed Gem::Specification#base_dir for default gems.  Ruby Bug #7469
+  * Only update the spec cache when we have permission.  Ruby Bug #7509
+  * Restored order of version marking.  Fixes an issue with bundler.  Thanks
+    to Aaron Patterson and Terence Lee.
+  * Gem cleanup now skips default gems.  Pull Request #409 by Kouhei Sutou
+  * gem list, search and query can now show remote gems again.  Bug #410 by
+    Henry Maddocks
+  * gem install now ignores directories that match the gem to install.  Bug
+    #407 by Santiago Pastorino.
+
+=== 2.0.0.preview2 / 2012-12-01
+
 This release contains two commits not present in Ruby 2.0.0.preview2.  One
 commit is for ruby 1.8.7 support, the second allows RubyGems to work under
 $SAFE=1.  There is no functional difference compared to Ruby 2.0.0.preview2

data/Manifest.txt

@@ -247,3 +247,4 @@ test/rubygems/test_require.rb
 test/rubygems/wrong_key_cert.pem
 test/rubygems/wrong_key_cert_32.pem
 util/CL2notes
+util/create_certs.rb

data/Rakefile

@@ -136,8 +136,16 @@ task :upload => [:upload_to_rubyforge, :upload_to_gemcutter]
 # RUBINIUS_PATH.
 
 def rsync_with dir
-  rsync_options = "-avP --exclude '*svn*' --exclude '*swp' --exclude '*rbc'" +
-    " --exclude '*.rej' --exclude '*.orig' --exclude 'lib/rubygems/defaults/*'"
+  rsync_options =
+    "-avP " +
+    "--exclude '*svn*' " +
+    "--exclude '*swp' " +
+    "--exclude '*rbc' " +
+    "--exclude '*.rej' " +
+    "--exclude '*.orig' " +
+    "--exclude 'lib/rubygems/defaults/*' " +
+    "--exclude gauntlet_rubygems.rb"
+
   sh "rsync #{rsync_options} bin/gem             #{dir}/bin/gem"
   sh "rsync #{rsync_options} lib/                #{dir}/lib"
   sh "rsync #{rsync_options} test/               #{dir}/test"

data/lib/rubygems.rb

@@ -98,7 +98,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.0.preview2'
+  VERSION = '2.0.0.preview2.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/command_manager.rb

@@ -176,8 +176,7 @@ class Gem::CommandManager
 
     if possibilities.size > 1 then
       raise Gem::CommandLineError,
-            "Ambiguous command #{cmd_name} " \
-            "matches [#{possibilities.join(', ')}]"
+            "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
     elsif possibilities.empty? then
       raise Gem::CommandLineError, "Unknown command #{cmd_name}"
     end

data/lib/rubygems/commands/cleanup_command.rb

@@ -47,16 +47,17 @@ are not removed.
       end
     end
 
-    gems_to_cleanup = unless options[:args].empty? then
-                        options[:args].map do |gem_name|
-                          Gem::Specification.find_all_by_name gem_name
-                        end.flatten
-                      else
-                        Gem::Specification.to_a
-                      end
-
-    gems_to_cleanup = gems_to_cleanup.select { |spec|
-      primary_gems[spec.name].version != spec.version
+    candidate_gems = unless options[:args].empty? then
+                       options[:args].map do |gem_name|
+                         Gem::Specification.find_all_by_name gem_name
+                       end.flatten
+                     else
+                       Gem::Specification.to_a
+                     end
+
+    gems_to_cleanup = candidate_gems.select { |spec|
+      !spec.default_gem? and
+        primary_gems[spec.name].version != spec.version
     }
 
     full = Gem::DependencyList.from_specs
@@ -102,6 +103,14 @@ are not removed.
     end
 
     say "Clean Up Complete"
+
+    if Gem.configuration.really_verbose then
+      skipped = candidate_gems.
+        select { |spec| spec.default_gem? }.
+        map { |spec| spec.full_name}
+
+      say "Skipped default gems: #{skipped.join ', '}"
+    end
   end
 
 end

data/lib/rubygems/commands/install_command.rb

@@ -48,7 +48,7 @@ class Gem::Commands::InstallCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--both --version '#{Gem::Requirement.default}' --document --no-force\n" \
+    "--both --version '#{Gem::Requirement.default}' --document --no-force\n" +
     "--install-dir #{Gem.dir}"
   end
 

data/lib/rubygems/commands/query_command.rb

@@ -132,8 +132,8 @@ class Gem::Commands::QueryCommand < Gem::Command
       if options[:name].source.empty?
         spec_tuples = fetcher.detect(type) { true }
       else
-        spec_tuples = fetcher.detect(type) do |gem_name, ver, plat|
-          options[:name] === gem_name
+        spec_tuples = fetcher.detect(type) do |name_tuple|
+          options[:name] === name_tuple.name
         end
       end
 

data/lib/rubygems/commands/uninstall_command.rb

@@ -76,8 +76,8 @@ class Gem::Commands::UninstallCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--version '#{Gem::Requirement.default}' --no-force " \
-    "--install-dir #{Gem.dir}\n" \
+    "--version '#{Gem::Requirement.default}' --no-force " +
+    "--install-dir #{Gem.dir}\n" +
     "--user-install"
   end
 
@@ -101,7 +101,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
         Gem::Uninstaller.new(gem_name, options).uninstall
       rescue Gem::GemNotInHomeException => e
         spec = e.spec
-        alert("In order to remove #{spec.name}, please execute:\n" \
+        alert("In order to remove #{spec.name}, please execute:\n" +
               "\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
       end
     end

data/lib/rubygems/dependency_installer.rb

@@ -33,6 +33,7 @@ class Gem::DependencyInstaller
     :prerelease          => false,
     :security_policy     => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
     :wrappers            => true,
+    :build_args          => nil,
     :build_docs_in_background => false,
   }.freeze
 
@@ -53,6 +54,7 @@ class Gem::DependencyInstaller
   # :security_policy:: See Gem::Installer::new and Gem::Security.
   # :user_install:: See Gem::Installer.new
   # :wrappers:: See Gem::Installer::new
+  # :build_args:: See Gem::Installer::new
 
   def initialize(options = {})
     if options[:install_dir] then
@@ -79,6 +81,7 @@ class Gem::DependencyInstaller
     @security_policy     = options[:security_policy]
     @user_install        = options[:user_install]
     @wrappers            = options[:wrappers]
+    @build_args          = options[:build_args]
     @build_docs_in_background = options[:build_docs_in_background]
 
     # Indicates that we should not try to update any deps unless
@@ -257,7 +260,7 @@ class Gem::DependencyInstaller
     set = Gem::AvailableSet.new
 
     if consider_local?
-      if File.exists? gem_name
+      if File.file? gem_name then
         src = Gem::Source::SpecificFile.new(gem_name)
         set.add src.spec, src
       else
@@ -353,7 +356,8 @@ class Gem::DependencyInstaller
                                 :install_dir         => @install_dir,
                                 :security_policy     => @security_policy,
                                 :user_install        => @user_install,
-                                :wrappers            => @wrappers
+                                :wrappers            => @wrappers,
+                                :build_args          => @build_args
 
       spec = inst.install
 

data/lib/rubygems/indexer.rb

@@ -54,8 +54,8 @@ class Gem::Indexer
     require 'zlib'
 
     unless defined?(Builder::XChar) then
-      raise "Gem::Indexer requires that the XML Builder library be installed:" \
-           "\n\tgem install builder"
+      raise "Gem::Indexer requires that the XML Builder library be installed:" +
+            "\n\tgem install builder"
     end
 
     options = { :build_modern => true }.merge options

data/lib/rubygems/package.rb

@@ -220,8 +220,8 @@ class Gem::Package
     Gem.load_yaml
     require 'rubygems/security'
 
-    @spec.validate unless skip_validation
     @spec.mark_version
+    @spec.validate unless skip_validation
 
     setup_signer
 

data/lib/rubygems/remote_fetcher.rb

@@ -294,7 +294,7 @@ class Gem::RemoteFetcher
   # Downloads +uri+ to +path+ if necessary. If no path is given, it just
   # passes the data.
 
-  def cache_update_path(uri, path = nil)
+  def cache_update_path uri, path = nil, update = true
     mtime = path && File.stat(path).mtime rescue nil
 
     if mtime && Net::HTTPNotModified === fetch_path(uri, mtime, true)
@@ -302,7 +302,7 @@ class Gem::RemoteFetcher
     else
       data = fetch_path(uri)
 
-      if path
+      if update and path then
         open(path, 'wb') do |io|
           io.write data
         end

data/lib/rubygems/security.rb

@@ -463,7 +463,7 @@ module Gem::Security
   def self.re_sign expired_certificate, private_key, age = ONE_YEAR,
                    extensions = EXTENSIONS
     raise Gem::Security::Exception,
-          "incorrect signing key for re-signing " \
+          "incorrect signing key for re-signing " +
           "#{expired_certificate.subject}" unless
       expired_certificate.public_key.to_pem == private_key.public_key.to_pem
 
@@ -473,7 +473,7 @@ module Gem::Security
       issuer  = alt_name_or_x509_entry expired_certificate, :issuer
 
       raise Gem::Security::Exception,
-            "#{subject} is not self-signed, contact #{issuer} " \
+            "#{subject} is not self-signed, contact #{issuer} " +
             "to obtain a valid certificate"
     end
 

data/lib/rubygems/security/policy.rb

@@ -112,7 +112,7 @@ class Gem::Security::Policy
     root = chain.first
 
     raise Gem::Security::Exception,
-          "root certificate #{root.subject} is not self-signed " \
+          "root certificate #{root.subject} is not self-signed " +
           "(issuer #{root.issuer})" if
       root.issuer.to_s != root.subject.to_s # HACK to_s is for ruby 1.8
 
@@ -144,7 +144,7 @@ class Gem::Security::Policy
     cert_dgst = digester.digest pkey_str
 
     raise Gem::Security::Exception,
-          "trusted root certificate #{root.subject} checksum " \
+          "trusted root certificate #{root.subject} checksum " +
           "does not match signing root certificate checksum" unless
       save_dgst == cert_dgst
 
@@ -152,7 +152,7 @@ class Gem::Security::Policy
   end
 
   def inspect # :nodoc:
-    "[Policy: %s - data: %p signer: %p chain: %p root: %p " \
+    "[Policy: %s - data: %p signer: %p chain: %p root: %p " +
       "signed-only: %p trusted-only: %p]" % [
       @name, @verify_chain, @verify_data, @verify_root, @verify_signer,
       @only_signed, @only_trusted,

data/lib/rubygems/source.rb

@@ -122,7 +122,7 @@ class Gem::Source
 
     FileUtils.mkdir_p cache_dir if update_cache?
 
-    spec_dump = fetcher.cache_update_path(spec_path, local_file)
+    spec_dump = fetcher.cache_update_path spec_path, local_file, update_cache?
 
     begin
       Gem::NameTuple.from_list Marshal.load(spec_dump)

data/lib/rubygems/specification.rb

@@ -1283,7 +1283,11 @@ class Gem::Specification
 
   def base_dir
     return Gem.dir unless loaded_from
-    @base_dir ||= File.dirname File.dirname loaded_from
+    @base_dir ||= if default_gem? then
+                    File.dirname File.dirname File.dirname loaded_from
+                  else
+                    File.dirname File.dirname loaded_from
+                  end
   end
 
   ##
@@ -2562,7 +2566,6 @@ class Gem::Specification
   # deprecate :has_rdoc=,           :none,       2011, 10
   # deprecate :default_executable,  :none,       2011, 10
   # deprecate :default_executable=, :none,       2011, 10
-  # deprecate :spec_name,           :spec_file,  2011, 10
   # deprecate :file_name,           :cache_file, 2011, 10
   # deprecate :full_gem_path,     :cache_file, 2011, 10
 end

data/lib/rubygems/test_utilities.rb

@@ -63,9 +63,9 @@ class Gem::FakeFetcher
     end
   end
 
-  def cache_update_path uri, path = nil
+  def cache_update_path uri, path = nil, update = true
     if data = fetch_path(uri)
-      open(path, 'wb') { |io| io.write data } if path
+      open(path, 'wb') { |io| io.write data } if path and update
       data
     else
       Gem.read_binary(path) if path

data/lib/rubygems/uninstaller.rb

@@ -178,8 +178,8 @@ class Gem::Uninstaller
     executables = executables.map { |exec| formatted_program_filename exec }
 
     remove = if @force_executables.nil? then
-               ask_yes_no("Remove executables:\n" \
-                          "\t#{executables.join ', '}\n\n" \
+               ask_yes_no("Remove executables:\n" +
+                          "\t#{executables.join ', '}\n\n" +
                           "in addition to the gem?",
                           true)
              else
@@ -296,7 +296,7 @@ class Gem::Uninstaller
 
     msg << 'If you remove this gem, these dependencies will not be met.'
     msg << 'Continue with Uninstall?'
-    return ask_yes_no(msg.join("\n"), true)
+    return ask_yes_no(msg.join("\n"), false)
   end
 
   def formatted_program_filename(filename)

data/test/rubygems/alternate_cert.pem

@@ -1,9 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIBSjCB9aADAgECAgEBMA0GCSqGSIb3DQEBBQUAMC0xEjAQBgNVBAMMCWFsdGVy
-bmF0ZTEXMBUGCgmSJomT8ixkARkWB2V4YW1wbGUwIBcNMTIwMTIzMjM0MzIzWhgP
-OTk5OTEyMzEyMzU5NTlaMC0xEjAQBgNVBAMMCWFsdGVybmF0ZTEXMBUGCgmSJomT
-8ixkARkWB2V4YW1wbGUwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA0lN/jShlFg0t
-+h1L2gkdi2UXFnfLnXNh+J3Jolh4/Pd8rdzKTdnCep2nqDIRimnlEjO1+I3u7aur
-Uc4b1AhX5QIDAQABMA0GCSqGSIb3DQEBBQUAA0EAidcjR8U5VFcds1Tv8bnz3Z+P
-w7lmN1HOmwnQht1ZTVbqmqKzxEXgf4AkZRoIT96gPRV87HwJ5PP/pDYmv3LR8g==
+MIIC9zCCAd+gAwIBAgIBADANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQDDAlhbHRl
+cm5hdGUxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMCAXDTEyMTIwODAwMDAwMFoY
+Dzk5OTkxMjMxMjM1OTU5WjAtMRIwEAYDVQQDDAlhbHRlcm5hdGUxFzAVBgoJkiaJ
+k/IsZAEZFgdleGFtcGxlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+vZQipBa1xH3M9OonkrUYhGZeX9UHAcJhe6jJbUr/uHXkh1Tu2ERWNnblm85upqBf
+jyZEnKer7uBcwwkkvmisVgC8uBECymsBxuEIw0rfiKYEnLu0B6SiWFYz3dYPS92b
+BK7Vks2/kNyXUmLLGoZ3id2K0eK5C/AJ0j+p84OqPnVhylsjrZmXfIZrh7lkHhgC
+IrzPefjE3pOloi/tz6fh2ktb0FYKQMfweT3Ba2TMeflG13PEOW80AD5w0THxDutG
+G0zPNCDyDEoT7UU1a3B3RMHYuUxEk1GUEYWq9L6a6SMpZISWTSpCp0Ww1QB55PON
+iCCn+o6vcIy46jI71dATAQIDAQABoyAwHjAcBgNVHREEFTATgRFhbHRlcm5hdGVA
+ZXhhbXBsZTANBgkqhkiG9w0BAQUFAAOCAQEAtiOe4Ws0hQdxlPCHcngMoWeWMg/d
+EtYHy1vD9oTOEGax6y319ShFNzCTG5Mk9dVXdVTrwml9+SrqmLbcckzr05TpSq3t
+JcNjx+qMwU31655DY+r2Le1mbrhhXilLJ++KjhaIzeqmA55MFLNBdMrApL0v2Tf9
+e9aiL8W8jXPX24uJd5eaFTsPV3NfcYV/iDyf1zv2Fe3NO8e0V1luQxJd3v+ILlRo
+YAkm2DK83G++YkvgsopRdOFfFsY3Gb6XtL87iGOWRbdNK90pThpfORcKoTus7QLx
+l7vsHsOJF5NZwLiBF9ufKH6fUV3Fy25JwB/z8kR8Bkplcl0F8jpJYrd6NQ==
 -----END CERTIFICATE-----

data/test/rubygems/alternate_cert_32.pem

@@ -1,9 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIBSDCB86ADAgECAgEBMA0GCSqGSIb3DQEBBQUAMC0xEjAQBgNVBAMMCWFsdGVy
-bmF0ZTEXMBUGCgmSJomT8ixkARkWB2V4YW1wbGUwHhcNMTIwMTEyMjMwODI5WhcN
-MzgwMTE5MDMxNDA3WjAtMRIwEAYDVQQDDAlhbHRlcm5hdGUxFzAVBgoJkiaJk/Is
-ZAEZFgdleGFtcGxlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJTf40oZRYNLfod
-S9oJHYtlFxZ3y51zYfidyaJYePz3fK3cyk3Zwnqdp6gyEYpp5RIztfiN7u2rq1HO
-G9QIV+UCAwEAATANBgkqhkiG9w0BAQUFAANBAH9YxSERfWdqipZbQGDmx2F8e5O2
-6zbDialEy+bD8juhzWa6nIPaoQzeSkD0lw98OXpVyE0vhnGS1rlVH3725Xw=
+MIIC9TCCAd2gAwIBAgIBATANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQDDAlhbHRl
+cm5hdGUxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMB4XDTEyMTIwODAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owLTESMBAGA1UEAwwJYWx0ZXJuYXRlMRcwFQYKCZImiZPy
+LGQBGRYHZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2U
+IqQWtcR9zPTqJ5K1GIRmXl/VBwHCYXuoyW1K/7h15IdU7thEVjZ25ZvObqagX48m
+RJynq+7gXMMJJL5orFYAvLgRAsprAcbhCMNK34imBJy7tAekolhWM93WD0vdmwSu
+1ZLNv5Dcl1JiyxqGd4nditHiuQvwCdI/qfODqj51YcpbI62Zl3yGa4e5ZB4YAiK8
+z3n4xN6TpaIv7c+n4dpLW9BWCkDH8Hk9wWtkzHn5RtdzxDlvNAA+cNEx8Q7rRhtM
+zzQg8gxKE+1FNWtwd0TB2LlMRJNRlBGFqvS+mukjKWSElk0qQqdFsNUAeeTzjYgg
+p/qOr3CMuOoyO9XQEwECAwEAAaMgMB4wHAYDVR0RBBUwE4ERYWx0ZXJuYXRlQGV4
+YW1wbGUwDQYJKoZIhvcNAQEFBQADggEBABB+jdfwANRtIQKCvv+1VnYm+3QSfshy
+TI5Kk50TphheDJ7VbYyTmOxPUTsFzn0cX8zD1jBOtdVdyy6u7qUHOw6ZrDKdgg4I
+95lJJibFrVXeazTByHhe31u08lMfp/6kdYwSornHUWmEHhAT60nvSbkLblW/jgPo
+i1pFY5hcGJAE6kFQLQpjgl8TbUTioA8wYOKJA5ITItBXO7fYMQKDS2jYR3JMiNLR
+FxgN8SzSUB0S7deI5O9fMLYL006zHP5u0qcZjVFvFJdtt3WsqDUu8E6O4QgVwvq1
+MPNUBfuNdMek1LnIUZgr7Jek+0wvbnZCGyEaVakcV74cq8fjEgWr3C0=
 -----END CERTIFICATE-----

data/test/rubygems/alternate_key.pem

@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----