From da299610525a0131bb13877ec2b82976cf0a27e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Wed, 11 Dec 2024 05:57:45 +0100 Subject: [PATCH 01/10] Revert "debian: do not conflict with gnupg1" This reverts commit 2f540a8026e2bb0901f8aa266ce9e21448c88c98. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 101dbcf1..b6c4d8de 100644 --- a/debian/control +++ b/debian/control @@ -90,6 +90,7 @@ Package: aptly Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, gpgv, gpg Suggests: graphviz +Conflicts: gnupg1, gpgv1 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using} Description: Swiss army knife for Debian repository management - main package It offers several features making it easy to manage Debian package From 846fe5e08a116a33e6570454565213be511e0bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Wed, 11 Dec 2024 06:10:33 +0100 Subject: [PATCH 02/10] update changelog --- debian/changelog | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47d58eb1..5d652c41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,29 @@ -aptly (1.6.0~rc1) stable; urgency=medium +aptly (1.6.0) stable; urgency=medium - * release candidate + * support reading filters from file or stdin + * fix mirroring source packages + * support yaml config per default + * provide swagger API documentation + * provide API for querying aptly storage usage + * provide snapshot pull via API + * support creating repos from snapshots + * fix mirroring flat remote repos + * support skeleton files for publishing + * use new azure sdk + * support updating the components of a published repo + * support publishing multiple distributions (-multi-dist) + * support etcd database + * allow slash (/) in distribution names + * support for storing the "local" pool on Azure + * provide copy package API + * fix publish concurrency and improve performance + * improved mirroring + * fix download throttling + * fix resuming package downloads + * fix ignoring signatures + * fix packages dependency resolution (Virtual Packages, version numbers in Provides) + * improved S3 support and performance + * fix race condition with goleveldb + * use go 1.22 -- André Roth Sat, 16 Nov 2024 12:44:06 +0100 From 9abbd74a9f7508fe59449973a0dc84dd019c3db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sat, 21 Dec 2024 20:23:52 +0100 Subject: [PATCH 03/10] improve doc do not set default value for FromSnapshot when creating a repo --- api/repos.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/repos.go b/api/repos.go index 43a19cc9..4cc04f69 100644 --- a/api/repos.go +++ b/api/repos.go @@ -94,7 +94,7 @@ type repoCreateParams struct { // Default component when publishing from this local repo DefaultComponent string ` json:"DefaultComponent" example:"main"` // Snapshot name to create repoitory from (optional) - FromSnapshot string ` json:"FromSnapshot" example:"snapshot1"` + FromSnapshot string ` json:"FromSnapshot" example:""` } // @Summary Create Repository From 29eccc922682c1b31df4295fe53146a95c8b9da8 Mon Sep 17 00:00:00 2001 From: Karol Swiderski Date: Sat, 21 Dec 2024 20:55:01 +0100 Subject: [PATCH 04/10] improve doc add instructions for macos users --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 780dbf5d..762cf8a4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,6 +91,12 @@ Install the following on your development machine: - make - git +##### Docker installation on macOS +1. Install [Docker Desktop on Mac](https://docs.docker.com/desktop/setup/install/mac-install/) (or via [Homebrew](https://brew.sh/)) +2. Allow directory sharing + - Open Docker Desktop + - Go to `Settings → Resources → File Sharing → Virtual File Shares` + - Add the aptly git repository path to the shared list (eg. /home/Users/john/aptly) #### Create docker container From f2f3196368a277275eedf86c5563a46a2a9756de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sat, 21 Dec 2024 21:34:46 +0100 Subject: [PATCH 05/10] fix AUTHORS for man page only US ASCII seems to be supported --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 69d479c3..d62f1573 100644 --- a/AUTHORS +++ b/AUTHORS @@ -67,4 +67,4 @@ List of contributors, in chronological order: * Christoph Fiehe (https://github.com/cfiehe) * Blake Kostner (https://github.com/btkostner) * Leigh London (https://github.com/leighlondon) -* Gordian Schönherr (https://github.com/schoenherrg) +* Gordian Schoenherr (https://github.com/schoenherrg) From f008f245dc859be4b4cead8fc6f4b53cb01d2cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sat, 21 Dec 2024 21:35:06 +0100 Subject: [PATCH 06/10] update man page --- man/aptly.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/aptly.1 b/man/aptly.1 index 5a323fb3..7b925da4 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -2672,7 +2672,7 @@ Blake Kostner (https://github\.com/btkostner) Leigh London (https://github\.com/leighlondon) . .IP "\[ci]" 4 -Gordian Schönherr (https://github\.com/schoenherrg) +Gordian Schoenherr (https://github\.com/schoenherrg) . .IP "" 0 From d523ca8186fdb37a9e806f028e5efd339a92c069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sat, 21 Dec 2024 22:13:26 +0100 Subject: [PATCH 07/10] update Makefile PHONY --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1794a6b2..d6a81da4 100644 --- a/Makefile +++ b/Makefile @@ -216,4 +216,4 @@ clean: ## remove local build and module cache rm -f unit.out aptly.test VERSION docs/docs.go docs/swagger.json docs/swagger.yaml docs/swagger.conf find system/ -type d -name __pycache__ -exec rm -rf {} \; 2>/dev/null || true -.PHONY: help man prepare swagger version binaries docker-release docker-system-test docker-unit-test docker-lint docker-build docker-image build docker-shell clean releasetype dpkg serve docker-serve flake8 +.PHONY: help man prepare swagger version binaries build docker-release docker-system-test docker-unit-test docker-lint docker-build docker-image docker-man docker-shell docker-serve clean releasetype dpkg serve flake8 From e028db585f937a900bcbff6fdfdc688e84999455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sat, 21 Dec 2024 22:32:50 +0100 Subject: [PATCH 08/10] fix man page --- cmd/repo_include.go | 2 +- man/aptly.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/repo_include.go b/cmd/repo_include.go index cba3fb30..4aa26d41 100644 --- a/cmd/repo_include.go +++ b/cmd/repo_include.go @@ -93,7 +93,7 @@ Command include looks for .changes files in list of arguments or specified direc .changes file is verified, parsed, referenced files are put into separate temporary directory and added into local repository. Successfully imported files are removed by default. -Additionally uploads could be restricted with file. Rules in this file control +Additionally uploads could be restricted with 'uploaders.json' file. Rules in this file control uploads based on GPG key ID of .changes file signature and queries on .changes file fields. Example: diff --git a/man/aptly.1 b/man/aptly.1 index 7b925da4..c4f753ec 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -1129,7 +1129,7 @@ include dependencies into search results Command include looks for \.changes files in list of arguments or specified directories\. Each \.changes file is verified, parsed, referenced files are put into separate temporary directory and added into local repository\. Successfully imported files are removed by default\. . .P -Additionally uploads could be restricted with +Additionally uploads could be restricted with \(cquploaders\.json\(cq file\. Rules in this file control uploads based on GPG key ID of \.changes file signature and queries on \.changes file fields\. . .P Example: From 2c3a107e0078fd6f7fc7f4ab47a072951a5fa45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Tue, 24 Dec 2024 18:57:40 +0100 Subject: [PATCH 09/10] update changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5d652c41..c5bdffa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,4 +26,4 @@ aptly (1.6.0) stable; urgency=medium * fix race condition with goleveldb * use go 1.22 - -- André Roth Sat, 16 Nov 2024 12:44:06 +0100 + -- André Roth Tue, 24 Dec 2024 17:44:35 +0100 From 65820cdf7ac88823d51a8e3c7118d9204ca359c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Tue, 24 Dec 2024 19:00:07 +0100 Subject: [PATCH 10/10] update man page --- man/aptly.1 | 2 +- man/aptly.1.ronn.tmpl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/man/aptly.1 b/man/aptly.1 index c4f753ec..bd6ad223 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -31,7 +31,7 @@ aptly looks for configuration file first in \fB~/\.aptly\.conf\fR then in \fB/us With aptly version 1\.6\.0, yaml configuration with inline documentation is supported and recommended (see \fBdebian/aptly\.conf\fR)\. . .P -The legacy json configuration is still supported: +The legacy json configuration is still supported (and also supports comments): . .IP "" 4 . diff --git a/man/aptly.1.ronn.tmpl b/man/aptly.1.ronn.tmpl index b948aaf4..203cc7fe 100644 --- a/man/aptly.1.ronn.tmpl +++ b/man/aptly.1.ronn.tmpl @@ -21,9 +21,10 @@ aptly has integrated help that matches contents of this manual page, to get help aptly looks for configuration file first in `~/.aptly.conf` then in `/usr/local/etc/aptly.conf` and `/etc/aptly.conf`. If no config file found (or they are not readable), a new one is created in the home directory. If `-config=` flag is specified, aptly would use config file at specified location. Also aptly needs root directory for database, package and published repository storage. If not specified, directory defaults to `~/.aptly/`, it will be created if missing. -With aptly version 1.6.0, yaml configuration with inline documentation is supported and recommended (see `debian/aptly.conf`). +With aptly version 1.6.0, yaml configuration with inline documentation is +supported and recommended (see `debian/aptly.conf`). -The legacy json configuration is still supported: +The legacy json configuration is still supported (and also supports comments): // vim: : filetype=json // json configuration file with comments