New upstream version 1.5.0+ds1

man/Makefile

@@ -1,10 +1,12 @@
-all: prepare generate
+RUBYBINPATH=$(shell ruby -r rubygems -e 'puts Gem.user_dir')/bin
 
-prepare:
-	gem install specific_install
-	gem specific_install -l smira/ronn
+all: $(RUBYBINPATH)/ronn generate
+
+$(RUBYBINPATH)/ronn:
+	gem install --user-install specific_install
+	gem specific_install --user-install -l smira/ronn
 
 generate:
-	go run ../_man/gen.go
+	PATH=$(RUBYBINPATH):$(PATH) go run ../_man/gen.go
 
-.PHONY: prepare generate
+.PHONY: generate

man/aptly.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "APTLY" "1" "September 2018" "" ""
+.TH "APTLY" "1" "January 2022" "" ""
 .
 .SH "NAME"
 \fBaptly\fR \- Debian repository management tool
@@ -38,6 +38,9 @@ Configuration file is stored in JSON format (default values shown below):
   "rootDir": "$HOME/\.aptly",
   "downloadConcurrency": 4,
   "downloadSpeedLimit": 0,
+  "downloadRetries": 0,
+  "downloader": "default",
+  "databaseOpenAttempts": 10,
   "architectures": [],
   "dependencyFollowSuggests": false,
   "dependencyFollowRecommends": false,
@@ -94,6 +97,15 @@ Configuration file is stored in JSON format (default values shown below):
       "tenant": "",
       "tenantid": ""
     }
+  },
+  "AzurePublishEndpoints": {
+    "test": {
+      "accountName": "",
+      "accountKey": "",
+      "container": "repo",
+      "prefix": ""
+      "endpoint": "blob.core.windows.net"
+    }
   }
 }
 .
@@ -114,7 +126,15 @@ is a number of parallel download threads to use when downloading packages
 .
 .TP
 \fBdownloadSpeedLimit\fR
-limit in kbytes/sec on download speed while mirroring remote repositieis
+limit in kbytes/sec on download speed while mirroring remote repositories
+.
+.TP
+\fBdownloadRetries\fR
+number of retries for download attempts
+.
+.TP
+\fBdatabaseOpenAttempts\fR
+number of attempts to open DB if it\(cqs locked by other instance; could be overridden with option \fB\-db\-open\-attempts\fR
 .
 .TP
 \fBarchitectures\fR
@@ -218,7 +238,7 @@ bucket name
 .
 .TP
 \fBacl\fR
-(optional) assign ACL to published files (one of the canned ACLs in Amazon terminology)\. Useful values: \fBprivate\fR (default) or \fBpublic\-read\fR (public repository)\. Public repositories could be consumed by \fBapt\fR using HTTP endpoint (Amazon bucket should be configured for "website hosting"), for private repositories special apt S3 transport is required\.
+(optional) assign ACL to published files (one of the canned ACLs in Amazon terminology)\. Useful values: \fBprivate\fR (default), \fBpublic\-read\fR (public repository) or \fBnone\fR (don\(cqt set ACL)\. Public repositories could be consumed by \fBapt\fR using HTTP endpoint (Amazon bucket should be configured for "website hosting"), for private repositories special apt S3 transport is required\.
 .
 .TP
 \fBawsAccessKeyID\fR, \fBawsSecretAccessKey\fR
@@ -509,6 +529,10 @@ $ aptly mirror list
 Options:
 .
 .TP
+\-\fBjson\fR
+display list in JSON format
+.
+.TP
 \-\fBraw\fR
 display list in machine\-readable format
 .
@@ -528,6 +552,10 @@ $ aptly mirror show wheezy\-main
 Options:
 .
 .TP
+\-\fBjson\fR
+display record in JSON format
+.
+.TP
 \-\fBwith\-packages\fR
 show detailed list of packages and versions stored in the mirror
 .
@@ -570,6 +598,10 @@ Options:
 limit download speed (kbytes/sec)
 .
 .TP
+\-\fBdownloader\fR=default
+downloader to use (e\.g\. grab)
+.
+.TP
 \-\fBforce\fR
 force update mirror even if it is locked by another process
 .
@@ -857,6 +889,10 @@ $ aptly repo list
 Options:
 .
 .TP
+\-\fBjson\fR
+display list in JSON format
+.
+.TP
 \-\fBraw\fR
 display list in machine\-readable format
 .
@@ -915,6 +951,10 @@ ex: $ aptly repo show testing
 Options:
 .
 .TP
+\-\fBjson\fR
+display record in JSON format
+.
+.TP
 \-\fBwith\-packages\fR
 show list of packages
 .
@@ -1043,6 +1083,10 @@ $ aptly snapshot list
 Options:
 .
 .TP
+\-\fBjson\fR
+display list in JSON format
+.
+.TP
 \-\fBraw\fR
 display list in machine\-readable format
 .
@@ -1073,6 +1117,10 @@ $ aptly snapshot show wheezy\-main
 Options:
 .
 .TP
+\-\fBjson\fR
+display record in JSON format
+.
+.TP
 \-\fBwith\-packages\fR
 show list of packages
 .
@@ -1273,7 +1321,7 @@ Example:
 .
 .nf
 
-$ aptly snapshot filter wheezy\-main wheezy\-required \(cqPriorioty (required)\(cq
+$ aptly snapshot filter wheezy\-main wheezy\-required \(cqPriority (required)\(cq
 .
 .fi
 .
@@ -1339,6 +1387,10 @@ $ aptly publish list
 Options:
 .
 .TP
+\-\fBjson\fR
+display list in JSON format
+.
+.TP
 \-\fBraw\fR
 display list in machine\-readable format
 .
@@ -1426,11 +1478,11 @@ origin name to publish
 .
 .TP
 \-\fBpassphrase\fR=
-GPG passhprase for the key (warning: could be insecure)
+GPG passphrase for the key (warning: could be insecure)
 .
 .TP
 \-\fBpassphrase\-file\fR=
-GPG passhprase\-file for the key (warning: could be insecure)
+GPG passphrase\-file for the key (warning: could be insecure)
 .
 .TP
 \-\fBsecret\-keyring\fR=
@@ -1444,6 +1496,10 @@ don\(cqt generate Contents indexes
 \-\fBskip\-signing\fR
 don\(cqt sign Release files with GPG
 .
+.TP
+\-\fBsuite\fR=
+suite to publish (defaults to distribution)
+.
 .SH "PUBLISH SNAPSHOT"
 \fBaptly\fR \fBpublish\fR \fBsnapshot\fR \fIname\fR [[\fIendpoint\fR:]\fIprefix\fR]
 .
@@ -1525,11 +1581,11 @@ overwrite origin name to publish
 .
 .TP
 \-\fBpassphrase\fR=
-GPG passhprase for the key (warning: could be insecure)
+GPG passphrase for the key (warning: could be insecure)
 .
 .TP
 \-\fBpassphrase\-file\fR=
-GPG passhprase\-file for the key (warning: could be insecure)
+GPG passphrase\-file for the key (warning: could be insecure)
 .
 .TP
 \-\fBsecret\-keyring\fR=
@@ -1543,6 +1599,10 @@ don\(cqt generate Contents indexes
 \-\fBskip\-signing\fR
 don\(cqt sign Release files with GPG
 .
+.TP
+\-\fBsuite\fR=
+suite to publish (defaults to distribution)
+.
 .SH "UPDATE PUBLISHED REPOSITORY BY SWITCHING TO NEW SNAPSHOT"
 \fBaptly\fR \fBpublish\fR \fBswitch\fR \fIdistribution\fR [[\fIendpoint\fR:]\fIprefix\fR] \fInew\-snapshot\fR
 .
@@ -1603,11 +1663,11 @@ GPG keyring to use (instead of default)
 .
 .TP
 \-\fBpassphrase\fR=
-GPG passhprase for the key (warning: could be insecure)
+GPG passphrase for the key (warning: could be insecure)
 .
 .TP
 \-\fBpassphrase\-file\fR=
-GPG passhprase\-file for the key (warning: could be insecure)
+GPG passphrase\-file for the key (warning: could be insecure)
 .
 .TP
 \-\fBsecret\-keyring\fR=
@@ -1668,11 +1728,11 @@ GPG keyring to use (instead of default)
 .
 .TP
 \-\fBpassphrase\fR=
-GPG passhprase for the key (warning: could be insecure)
+GPG passphrase for the key (warning: could be insecure)
 .
 .TP
 \-\fBpassphrase\-file\fR=
-GPG passhprase\-file for the key (warning: could be insecure)
+GPG passphrase\-file for the key (warning: could be insecure)
 .
 .TP
 \-\fBsecret\-keyring\fR=
@@ -1709,6 +1769,13 @@ $ aptly publish show wheezy
 .
 .IP "" 0
 .
+.P
+Options:
+.
+.TP
+\-\fBjson\fR
+display record in JSON format
+.
 .SH "SEARCH FOR PACKAGES MATCHING QUERY"
 \fBaptly\fR \fBpackage\fR \fBsearch\fR [\fIpackage\-query\fR]
 .
@@ -2050,5 +2117,35 @@ Strajan Sebastian (https://github\.com/strajansebastian)
 .IP "\[ci]" 4
 Artem Smirnov (https://github\.com/urpylka)
 .
+.IP "\[ci]" 4
+William Manley (https://github\.com/wmanley)
+.
+.IP "\[ci]" 4
+Shengjing Zhu (https://github\.com/zhsj)
+.
+.IP "\[ci]" 4
+Nabil Bendafi (https://github\.com/nabilbendafi)
+.
+.IP "\[ci]" 4
+Raphael Medaer (https://github\.com/rmedaer)
+.
+.IP "\[ci]" 4
+Raul Benencia (https://github\.com/rul)
+.
+.IP "\[ci]" 4
+Don Kuntz (https://github\.com/dkuntz2)
+.
+.IP "\[ci]" 4
+Joshua Colson (https://github\.com/freakinhippie)
+.
+.IP "\[ci]" 4
+Andre Roth (https://github\.com/neolynx)
+.
+.IP "\[ci]" 4
+Lorenzo Bolla (https://github\.com/lbolla)
+.
+.IP "\[ci]" 4
+Benj Fassbind (https://github\.com/randombenj)
+.
 .IP "" 0
 

man/aptly.1.ronn.tmpl

@@ -30,6 +30,9 @@ Configuration file is stored in JSON format (default values shown below):
       "rootDir": "$HOME/.aptly",
       "downloadConcurrency": 4,
       "downloadSpeedLimit": 0,
+      "downloadRetries": 0,
+      "downloader": "default",
+      "databaseOpenAttempts": 10,
       "architectures": [],
       "dependencyFollowSuggests": false,
       "dependencyFollowRecommends": false,
@@ -86,6 +89,15 @@ Configuration file is stored in JSON format (default values shown below):
           "tenant": "",
           "tenantid": ""
         }
+      },
+      "AzurePublishEndpoints": {
+        "test": {
+          "accountName": "",
+          "accountKey": "",
+          "container": "repo",
+          "prefix": ""
+          "endpoint": "blob.core.windows.net"
+        }
       }
     }
 
@@ -99,7 +111,14 @@ Options:
     is a number of parallel download threads to use when downloading packages
 
   * `downloadSpeedLimit`:
-    limit in kbytes/sec on download speed while mirroring remote repositieis
+    limit in kbytes/sec on download speed while mirroring remote repositories
+
+  * `downloadRetries`:
+    number of retries for download attempts
+
+  * `databaseOpenAttempts`:
+    number of attempts to open DB if it's locked by other instance; could be overridden with option
+    `-db-open-attempts`
 
   * `architectures`:
     is a list of architectures to process; if left empty defaults to all available architectures; could be
@@ -204,8 +223,8 @@ and associated settings:
      no prefix (bucket root)
    * `acl`:
      (optional) assign ACL to published files (one of the canned ACLs in Amazon
-     terminology). Useful values: `private` (default) or `public-read` (public
-     repository). Public repositories could be consumed by `apt` using
+     terminology). Useful values: `private` (default), `public-read` (public
+     repository) or `none` (don't set ACL). Public repositories could be consumed by `apt` using
      HTTP endpoint (Amazon bucket should be configured for "website hosting"),
      for private repositories special apt S3 transport is required.
    * `awsAccessKeyID`, `awsSecretAccessKey`:
@@ -428,7 +447,7 @@ to proxy all HTTP requests.
 
 {{.Long}}
 
-{{if (allFlags .Flag | len) gt 0}}
+{{if allFlags .Flag | len}}
 Options:
 
 {{template "options" .}}