deb-s3 24.6.0 → 25.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8168746478686586baf1221278e1b4d2f04ab35fb76dd367a5589f9efcf01799
-  data.tar.gz: 5e5ec07ff39c58e63c85cec95112ff48a9d5e5b21f1ef6f69c0c7513ccd1f583
+  metadata.gz: 010ae48788e7525b14525998e023a0fde376342a5d3bfa485473014cbf18c48e
+  data.tar.gz: e28bc799a04c73478e26ab48c3f95c59437e9f83056c7c9625703d21930877d2
 SHA512:
-  metadata.gz: 506ac0e022618aa6ff9243ff57b7ad4054841afb05efbe8f5d9a6df0024a6b3767bc269210d9f129b9d83adaf528b5744b68198f5895907af095c92eb7a9e98d
-  data.tar.gz: e823e0f34f912e8fd4ea9b3ddcbf1b0361e14c8f1b1273bc0c6e6da6871d175f8e589f75eb49dbcf72051fb906c342a5da491c706f6bfd40a30174917989a547
+  metadata.gz: 24620d6b574c6f2615a4609d669f21d45f453b9e5524d99f6cab5e9044b6e82aceb5919b726d7110e7d37064f39fdefd4ba1a3b91fdcc92b365a5afe450997a2
+  data.tar.gz: 1d4a3cc49db56eb60a460c740b1ea2f5f981d7fe69a1491be9a9ff8d2cbba7a06d5ef002d846151996f4e605c995c2bfbee733eaeadf7eb24bb54f0f237d324e

data/README.md

@@ -33,14 +33,14 @@ Install the package via gem
 $ gem install deb-s3
 ```
 
-or via APT (Debian 11 "Bullseye" and Ubuntu 22.04 "Jammy Jellyfish" and newer):
+or via APT:
 
 ```console
 # Add repository key
-$ sudo wget -O /etc/apt/trusted.gpg.d/deb-s3-archive-keyring.gpg https://raw.githubusercontent.com/deb-s3/deb-s3/master/deb-s3-archive-keyring.gpg
+$ sudo curl -sfLo /etc/apt/trusted.gpg.d/deb-s3-keyring.asc https://deb-s3.github.io/deb-s3/deb-s3/gpg.key
 
 # Add repository
-$ echo "deb http://deb-s3-repo.s3.us-east-2.amazonaws.com/$(lsb_release -is | tr A-Z a-z)/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list > /dev/null
+$ echo "deb https://deb-s3.github.io/deb-s3/deb-s3 deb-s3 main" | sudo tee /etc/apt/sources.list.d/deb-s3.list
 
 # Install package
 $ sudo apt-get update

data/lib/deb/s3/cli.rb

@@ -97,6 +97,11 @@ class Deb::S3::CLI < Thor
   :type    => :string,
   :desc    => "Additional command line options to pass to GPG when signing."
 
+  class_option :gpg_provider,
+  :default => "gpg",
+  :type    => :string,
+  :desc    => "GPG provider to use."
+
   class_option :encryption,
   :default  => false,
   :type     => :boolean,
@@ -194,15 +199,17 @@ class Deb::S3::CLI < Thor
 
         # validate we have them
         error("No architcture given and unable to determine one for #{file}. " +
-              "Please specify one with --arch [i386|amd64|armhf].") unless arch
+              "Please specify one with --arch [i386|amd64|armhf|arm64].") unless arch
 
         # If the arch is all and the list of existing manifests is none, then
         # throw an error. This is mainly the case when initializing a brand new
         # repository. With "all", we won't know which architectures they're using.
         if arch == "all" && manifests.count == 0
+          # The above comment isn't true any more, we "assume" that someonne wants all these architectures...
           manifests['amd64'] = Deb::S3::Manifest.retrieve(options[:codename], component,'amd64', options[:cache_control], options[:fail_if_exists], options[:skip_package_upload])
           manifests['i386'] = Deb::S3::Manifest.retrieve(options[:codename], component,'i386', options[:cache_control], options[:fail_if_exists], options[:skip_package_upload])
           manifests['armhf'] = Deb::S3::Manifest.retrieve(options[:codename], component,'armhf', options[:cache_control], options[:fail_if_exists], options[:skip_package_upload])
+          manifests['arm64'] = Deb::S3::Manifest.retrieve(options[:codename], component,'arm64', options[:cache_control], options[:fail_if_exists], options[:skip_package_upload])
 
          # error("Package #{File.basename(file)} had architecture \"all\", " +
          #       "however noexisting package lists exist. This can often happen " +
@@ -738,12 +745,13 @@ class Deb::S3::CLI < Thor
     settings[:endpoint] = options[:endpoint] if options[:endpoint]
     settings.merge!(provider)
 
-    Deb::S3::Utils.s3          = Aws::S3::Client.new(settings)
-    Deb::S3::Utils.bucket      = options[:bucket]
-    Deb::S3::Utils.signing_key = options[:sign]
-    Deb::S3::Utils.gpg_options = options[:gpg_options]
-    Deb::S3::Utils.prefix      = options[:prefix]
-    Deb::S3::Utils.encryption  = options[:encryption]
+    Deb::S3::Utils.s3           = Aws::S3::Client.new(settings)
+    Deb::S3::Utils.bucket       = options[:bucket]
+    Deb::S3::Utils.signing_key  = options[:sign]
+    Deb::S3::Utils.gpg_provider = options[:gpg_provider]
+    Deb::S3::Utils.gpg_options  = options[:gpg_options]
+    Deb::S3::Utils.prefix       = options[:prefix]
+    Deb::S3::Utils.encryption   = options[:encryption]
 
     # make sure we have a valid visibility setting
     Deb::S3::Utils.access_policy =

data/lib/deb/s3/lock.rb

@@ -54,7 +54,7 @@ class Deb::S3::Lock
         if Deb::S3::Utils.s3_exists?(final_lockfile)
           lock = current(codename, component, architecture, cache_control)
           $stderr.puts("Repository is locked by another user: #{lock.user} at host #{lock.host} (phase-1)")
-          $stderr.puts("Attempting to obtain a lock after #{wait_interval} secound(s).")
+          $stderr.puts("Attempting to obtain a lock after #{wait_interval} second(s).")
           sleep(wait_interval)
         else
           # upload the file

data/lib/deb/s3/manifest.rb

@@ -123,7 +123,7 @@ class Deb::S3::Manifest
     # generate the Packages.gz file
     gztemp = Tempfile.new("Packages.gz")
     gztemp.close
-    Zlib::GzipWriter.open(gztemp.path) { |gz| gz.write manifest }
+    Zlib::GzipWriter.open(gztemp.path) { |gz| gz.mtime = 0; gz.write manifest }
     f = "dists/#{@codename}/#{@component}/binary-#{@architecture}/Packages.gz"
     yield f if block_given?
     s3_store(gztemp.path, f, 'application/x-gzip; charset=binary', self.cache_control)

data/lib/deb/s3/release.rb

@@ -103,7 +103,7 @@ class Deb::S3::Release
     # sign the file, if necessary
     if Deb::S3::Utils.signing_key
       key_param = Deb::S3::Utils.signing_key.any? ? "-u #{Deb::S3::Utils.signing_key.join(" -u ")}" : ""
-      if system("gpg -a #{key_param} --digest-algo SHA256 #{Deb::S3::Utils.gpg_options} -s --clearsign #{release_tmp.path}")
+      if system("#{Deb::S3::Utils.gpg_provider} -a #{key_param} --digest-algo SHA256 #{Deb::S3::Utils.gpg_options} -s --clearsign #{release_tmp.path}")
         local_file = release_tmp.path+".asc"
         remote_file = "dists/#{@codename}/InRelease"
         yield remote_file if block_given?
@@ -113,7 +113,7 @@ class Deb::S3::Release
       else
         raise "Signing the InRelease file failed."
       end
-      if system("gpg -a #{key_param} --digest-algo SHA256 #{Deb::S3::Utils.gpg_options} -b #{release_tmp.path}")
+      if system("#{Deb::S3::Utils.gpg_provider} -a #{key_param} --digest-algo SHA256 #{Deb::S3::Utils.gpg_options} -b #{release_tmp.path}")
         local_file = release_tmp.path+".asc"
         remote_file = self.filename+".gpg"
         yield remote_file if block_given?
@@ -140,8 +140,9 @@ class Deb::S3::Release
   def validate_others
     to_apply = []
     self.components.each do |comp|
-      %w(amd64 i386 armhf).each do |arch|
+      %w(amd64 i386 armhf arm64).each do |arch|
         next if self.files.has_key?("#{comp}/binary-#{arch}/Packages")
+        next unless self.architectures.include?(arch)
 
         m = Deb::S3::Manifest.new
         m.codename = self.codename

data/lib/deb/s3/utils.rb

@@ -12,6 +12,8 @@ module Deb::S3::Utils
   def access_policy= v; @access_policy = v end
   def signing_key; @signing_key end
   def signing_key= v; @signing_key = v end
+  def gpg_provider; @gpg_provider end
+  def gpg_provider= v; @gpg_provider = v end
   def gpg_options; @gpg_options end
   def gpg_options= v; @gpg_options = v end
   def prefix; @prefix end

data/lib/deb/s3.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Deb
   module S3
-    VERSION = "24.6.0"
+    VERSION = "25.3.0"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 24.6.0
+  version: 25.3.0
 platform: ruby
 authors:
-- Ken Robertson
-autorequire:
+- Stefan Heitmüller
 bindir: bin
 cert_chain: []
-date: 2024-06-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,16 +57,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 description: Easily create and manage an APT repository on S3.
-email: ken@invalidlogic.com
+email: stefan.heitmueller@gmx.com
 executables:
 - deb-s3
 extensions: []
@@ -84,11 +83,10 @@ files:
 - lib/deb/s3/templates/package.erb
 - lib/deb/s3/templates/release.erb
 - lib/deb/s3/utils.rb
-homepage: http://invalidlogic.com/
+homepage: https://github.com/deb-s3/deb-s3
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Easily create and manage an APT repository on S3.
 test_files: []