.editorconfig

+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 8
+
+[.gitlab-ci.yml]
+indent_style = space
+indent_size = 2

.gitignore

 src/apk
-src/apk-test
 src/apk.static
 src/help.h
-test/*.got
-test/repos.out
-test/repos.stamp
-test/test*.out
-test/test*.ok
 libfetch/*err.h
 *.a
 *.o

.gitlab-ci.yml

 stages:
-    - test
-
-test:alpine:
-    image: alpine
-    stage: test
-    script:
-        - apk update
-        - apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.3-dev lua5.3-lzlib
-        - make -j$(nproc) check
-    tags:
-        - docker-alpine
-        - x86_64
+  - test
+  - build
+  - upload
+  - release
 
-test-meson:alpine:
-    image: alpine
-    stage: test
-    script:
-        - apk update
-        - apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.3-dev lua5.3-lzlib meson zlib-static openssl-libs-static
-        - meson build
-        - ninja -C build
-    tags:
-        - docker-alpine
-        - x86_64
+variables:
+  PACKAGE_ENDPOINT: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/"
+  ALPINE_DEPS: "make gcc git scdoc musl-dev linux-headers openssl-dev zlib-dev lua5.3-dev lua5.3-lzlib cmocka-dev python3-dev"
+  ALPINE_STATIC_DEPS: "zlib-static openssl-libs-static"
+
+.test:alpine:
+  stage: test
+  image:
+    name: alpine
+  script:
+    - apk add -u meson $ALPINE_DEPS $ALPINE_JOB_DEPS $ALPINE_STATIC_DEPS zstd-dev zstd-static
+    - meson setup --auto-features=enabled build
+    - ninja -C build
+    - meson setup build-static -Dc_link_args=-static -Ddefault_library=static -Dprefer_static=true
+    - ninja -C build-static src/apk
+    - meson test -C build
+  artifacts:
+    reports:
+      junit: build/**/*.junit.xml
+
+test:alpine:x86_64:
+  extends: .test:alpine
+  variables:
+    ALPINE_JOB_DEPS: "shellcheck"
+  tags:
+    - docker-alpine
+    - x86_64
+
+test:alpine:x86:
+  extends: .test:alpine
+  image:
+    entrypoint: ["linux32", "sh", "-c"]
+    docker:
+      platform: linux/i386
+  tags:
+    - docker-alpine
+    - x86
+
+test:alpine-alt-config:
+  image: alpine
+  stage: test
+  script:
+    - apk add -u meson $ALPINE_DEPS
+    - meson setup build -Durl_backend=wget -Dzstd=false
+    - ninja -C build
+  tags:
+    - docker-alpine
+    - x86_64
+
+test:alpine-muon:
+  image: alpine:edge
+  stage: test
+  script:
+    - echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
+    - apk add -u muon $ALPINE_DEPS $ALPINE_STATIC_DEPS zstd-dev zstd-static
+    - muon setup build
+    - ninja -C build
+    - muon setup -Dc_link_args="-static" -Dprefer_static=true -Ddefault_library=static build-static
+    - ninja -C build-static src/apk
+  tags:
+    - docker-alpine
+    - x86_64
+
+test:alpine-legacy:
+  stage: test
+  image:
+    name: alpine
+  script:
+    - apk add -u $ALPINE_DEPS zstd-dev
+    - make -j$(nproc) check
+  tags:
+    - docker-alpine
+    - x86_64
 
 test:debian:
-    image: debian
-    stage: test
-    script:
-        - apt-get update
-        - apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.3-dev lua5.2 lua-zlib-dev sudo
-        - unlink /bin/sh
-        - ln -s /bin/bash /bin/sh
-        - make -j$(nproc) check
-    tags:
-        - docker-alpine
+  image: debian
+  stage: test
+  script:
+    - apt-get update
+    - apt-get install -y make gcc git libssl-dev zlib1g-dev libzstd-dev lua5.3-dev lua5.2 lua-zlib-dev sudo meson
+    - unlink /bin/sh
+    - ln -s /bin/bash /bin/sh
+    - meson setup build
+    - ninja -C build
+  tags:
+    - docker-alpine
+    - x86_64
+
+build-static:
+  stage: build
+  image: alpinelinux/build-base:latest-$ARCH
+  script:
+    - abuild-apk add -u $ALPINE_DEPS $ALPINE_STATIC_DEPS zstd-dev zstd-static
+    - make -j$(nproc) static
+    - install -s -m0755 src/apk.static src/apk.static-$ARCH
+  parallel:
+    matrix:
+      - ARCH:
         - x86_64
+        - x86
+        - armv7
+        - armhf
+        - aarch64
+        - s390x
+        - ppc64le
+        - riscv64
+  artifacts:
+    paths:
+      - src/apk.static-*
+  tags:
+    - docker-alpine
+    - $ARCH
+
+make-release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  script:
+    - |-
+      apk add curl
+      for artifact in src/apk.static-*; do
+        ! [ -f "$artifact" ] && { echo "No artifacts found"; exit 1; }
+        ARCH=${artifact#*-}
+        echo "Uploading binary for $ARCH"
+        curl --fail -H "JOB-TOKEN: $CI_JOB_TOKEN" -T "$artifact" -o /dev/null ${PACKAGE_ENDPOINT}/$CI_COMMIT_TAG/$ARCH/apk.static
+        done
+    - echo "Making a release"
+  release:
+    name: $CI_COMMIT_TAG
+    description: "Release $CI_COMMIT_TAG"
+    tag_name: $CI_COMMIT_TAG
+    ref: $CI_COMMIT_TAG
+    assets:
+      links:
+        - name: apk.static (x86_64)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/x86_64/apk.static
+        - name: apk.static (x86)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/x86/apk.static
+        - name: apk.static (armv7)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/armv7/apk.static
+        - name: apk.static (armhf)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/armhf/apk.static
+        - name: apk.static (aarch64)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/aarch64/apk.static
+        - name: apk.static (s390x)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/s390x/apk.static
+        - name: apk.static (ppc64le)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/ppc64le/apk.static
+        - name: apk.static (riscv64)
+          url: $PACKAGE_ENDPOINT/$CI_COMMIT_TAG/riscv64/apk.static
+  rules:
+    - if: $CI_COMMIT_TAG
+  tags:
+    - docker-alpine
+    - x86_64

.mailmap

@@ -5,3 +5,4 @@ Natanael Copa <ncopa@alpinelinux.org> <natanael.copa@gmail.com>
 Natanael Copa <ncopa@alpinelinux.org> <ncopa@ncopa-laptop.localdomain>
 Natanael Copa <ncopa@alpinelinux.org> <ncopa@alpine-netbook.(none)>
 Timo Teräs <timo.teras@iki.fi>
+q66 <q66@chimera-linux.org> <daniel@octaforge.org>

Make.rules

@@ -35,7 +35,7 @@ else
   Q = @
 endif
 
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifneq ($(findstring -s,$(MAKEFLAGS)),)
   quiet=silent_
 endif
 
@@ -53,19 +53,6 @@ export srctree objtree
 
 TAGPREFIX	?= v
 
-ifneq ($(CI_COMMIT_TAG),)
-FULL_VERSION	:= $(CI_COMMIT_TAG)
-else ifneq ($(CI_COMMIT_REF_NAME),)
-# GitLab but no tag info, use the 'git describe' from environment variable
-# once https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1633
-# gets completed and merged upstream.
-FULL_VERSION	:= $(VERSION)
-else ifneq ($(wildcard .git),)
-FULL_VERSION	:= $(patsubst $(TAGPREFIX)%,%,$(shell git describe))
-else
-FULL_VERSION	:= $(VERSION)
-endif
-
 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
 
 export FULL_VERSION RCS_FIND_IGNORE
@@ -73,6 +60,7 @@ export FULL_VERSION RCS_FIND_IGNORE
 ##
 # Utilities and default flags for them.
 
+PKG_CONFIG	:= pkg-config
 CROSS_COMPILE	?=
 CC		:= $(CROSS_COMPILE)gcc
 AR		:= $(CROSS_COMPILE)ar
@@ -82,15 +70,16 @@ SCDOC		:= scdoc
 SED		:= sed
 INSTALL		:= install
 INSTALLDIR	:= $(INSTALL) -d
+LUA		:= $(firstword $(wildcard /usr/bin/lua5.3 /usr/bin/lua5.2))
 
 CFLAGS		?= -g -O2
-CFLAGS_ALL	:= -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
+CFLAGS_ALL	:= -Wall -Wstrict-prototypes -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -std=gnu11 -fPIC
 CFLAGS_ALL	+= $(CFLAGS)
 
 LDFLAGS		?= -g
 LDFLAGS_ALL	+= $(LDFLAGS)
 
-export CC AR LD LN SCDOC SED INSTALL INSTALLDIR CFLAGS_ALL LDFLAGS_ALL
+export PKG_CONFIG CC AR LD LN SCDOC SED INSTALL INSTALLDIR LUA CFLAGS_ALL LDFLAGS_ALL
 
 build		:=
 
@@ -127,7 +116,7 @@ endif
 
 PHONY += all compile install clean docs FORCE
 
-# Convinient variables
+# Convenient variables
 comma   := ,
 squote  := '
 empty   :=

Makefile

@@ -4,9 +4,10 @@
 -include config.mk
 
 PACKAGE := apk-tools
-VERSION := 2.12.0
+VERSION := $(shell ./get-version.sh "$(FULL_VERSION)" "$(VERSION)")
+SO_VERSION := $(shell cat VERSION | cut -d' ' -f1)
 
-export VERSION
+export PACKAGE VERSION SO_VERSION
 
 ##
 # Default directories
@@ -25,13 +26,22 @@ export DESTDIR SBINDIR LIBDIR CONFDIR MANDIR DOCDIR INCLUDEDIR PKGCONFIGDIR
 ##
 # Top-level subdirs
 
-subdirs		:= libfetch/ src/ doc/
+subdirs		:= libfetch/ src/ doc/ lua/
 
 ##
 # Include all rules and stuff
 
 include Make.rules
 
+##
+# Globals
+
+URL_BACKEND	?= libfetch
+CRYPTO		?= openssl
+export URL_BACKEND CRYPTO
+
+CFLAGS_ALL	+= -DCRYPTO_USE_$(shell echo $(CRYPTO) | tr '[:lower:]' '[:upper:]')
+
 ##
 # Top-level targets
 
@@ -39,15 +49,18 @@ install:
 	$(INSTALLDIR) $(DESTDIR)$(DOCDIR)
 	$(INSTALL) README.md $(DESTDIR)$(DOCDIR)
 
-check test: FORCE src/
-	$(Q)$(MAKE) TEST=y
+check test: FORCE
+	$(Q)$(MAKE) compile
 	$(Q)$(MAKE) -C test
 
 static:
 	$(Q)$(MAKE) STATIC=y
 
 tag: check
-	git commit . -m "apk-tools-$(VERSION)"
-	git tag -s v$(VERSION) -m "apk-tools-$(VERSION)"
+	TAG_VERSION=$$(cat VERSION); \
+	git commit . -m "apk-tools-$${TAG_VERSION}"; \
+	git tag -s v$${TAG_VERSION} -m "apk-tools-$${TAG_VERSION}"
 
 src/: libfetch/
+
+lua/: src/

README.md

-# Alpine Package Keeper
+# apk-tools
 
-Alpine Package Keeper (apk) is a package manager developed for Alpine Linux.
+Alpine Package Keeper (apk) is a package manager originally built for Alpine Linux,
+but now used by several other distributions as well.
+
+## Building
+
+The preferred build system for building apk-tools is Meson:
+
+```
+# meson setup -Dprefix=/ build
+# ninja -C build
+# meson install -C build
+```
+
+For bootstrapping without Python, muon is also compatible. All you have to do is replace `meson` with `muon` in the above example.
+
+To build a static apk, pass the right arguments to the above commands:
+
+```
+# meson setup -Dc_link_args="-static" -Dprefer_static=true -Ddefault_library=static build
+# ninja -C build src/apk
+```
+
+Which will give you a `./build/src/apk` that is statically linked.
+
+While there is a legacy Makefile-based system available, it only works for musl-linux
+targets, and will be dropped in the apk-tools 3.0 release.
+
+## Documentation
 
 Online documentation is available in the [doc/](doc/) directory in the form of man pages.
+
+The [apk(8)](doc/apk.8.scd) man page provides a basic overview of the package management
+system.

VERSION

+3.0.0_rc4

doc/Makefile

 scdocs-y += \
 	apk-cache.5 \
 	apk-keys.5 \
+	apk-package.5 \
 	apk-repositories.5 \
+	apk-v2.5 \
+	apk-v3.5 \
 	apk-world.5 \
 	apk.8 \
+	apk-adbdump.8 \
+	apk-adbgen.8 \
+	apk-adbsign.8 \
 	apk-add.8 \
 	apk-audit.8 \
 	apk-cache.8 \
+	apk-convndx.8 \
+	apk-convdb.8 \
 	apk-del.8 \
 	apk-dot.8 \
+	apk-extract.8 \
 	apk-fetch.8 \
 	apk-fix.8 \
 	apk-index.8 \
 	apk-info.8 \
 	apk-list.8 \
 	apk-manifest.8 \
+	apk-mkndx.8 \
+	apk-mkpkg.8 \
 	apk-policy.8 \
+	apk-protected_paths.5 \
+	apk-query.8 \
 	apk-stats.8 \
 	apk-update.8 \
 	apk-upgrade.8 \

doc/apk-adbdump.8.scd

+apk-adbdump(8)
+
+# NAME
+
+apk adbdump - dump v3 files in textual representation
+
+# SYNOPSIS
+
+*apk adbdump* [<_options_>...] _files_...
+
+# DESCRIPTION
+
+*apk adbdump* will dump the metadata portion of given _files_ (packages,
+indexes, installeddb) to its textual representation.
+
+The output can be:
+	- yaml with annotations as comment
+	- json data blob
+
+*apk-adbgen*(8) can convert the YAML textual representation back to
+the binary format with certain limitations (nested ADB and DATA blocks
+are not supported).
+
+# OPTIONS
+
+*--format* _FORMAT_
+	Specify the output format (options: *json*, *yaml*)
+
+# SEE ALSO
+
+*apk-adbgen*(8), *apk-package*(5), *apk-v3*(5)

doc/apk-adbgen.8.scd

+apk-adbgen(8)
+
+# NAME
+
+apk adbgen - generate v3 files from text representation
+
+# SYNOPSIS
+
+*apk adbgen* [<_options_>...]
+
+# DESCRIPTION
+
+*apk adbgen* takes in *apk-adbdump*(8) output and convert it back to the
+corresponding binary format.
+
+# SEE ALSO
+
+*apk-adbdump*(8), *apk-package*(5), *apk-v3*(5)

doc/apk-adbsign.8.scd

+apk-adbsign(8)
+
+# NAME
+
+apk adbsign - sign, resign or recompress apk v3 packages or indexes
+
+# SYNOPSIS
+
+*apk adbsign* [<_options_>...] _files_...
+
+# DESCRIPTION
+
+*apk adbsign* will process specified _files_ and add or replace
+the signatures in addition to recompressing it. The original compression
+algorithm and level is used unless specified.
+
+# OPTIONS
+
+See also *apk*(8) for additional package generation options.
+
+*--reset-signatures*
+	Remove all existing signatures.

doc/apk-add.8.scd

@@ -2,20 +2,21 @@ apk-add(8)
 
 # NAME
 
-apk add - add packages to _world_ and commit changes
+apk add - add or update constraints to _world_ and commit changes
 
 # SYNOPSIS
 
-*apk add* [<_options_>...] _packages_...
+*apk add* [<_options_>...] _constraints_...
 
 # DESCRIPTION
 
-*apk add* adds the requested packages to _world_ and installs (or upgrades)
-them if not already present, ensuring all dependencies are met.
+*apk add* adds or updates given constraints to _world_ (see *apk-world*(5))
+and commit changes to disk. This usually involves installing new packages,
+but may also cause other changes to the installed packages.
 
 To upgrade individual packages without modifying _world_ use *apk-fix*(8).
 
-By default *apk* tries to select a set of packages so that all dependencies
+By default *apk* tries to select a set of packages so that all constraints
 are satisfied. This means that some packages can be held back in an older
 version if there is direct or implicit dependencies to the older version.
 
@@ -33,28 +34,33 @@ following options:
 	the default heuristic and will cause an error to displayed if all
 	dependencies cannot be satisfied.
 
+*--no-chown*
+	Deperecated alias for --usermode.
+
 *-u, --upgrade*
-	Upgrade _packages_ and it's dependencies. Normally *apk add* will
+	Upgrade _packages_ and their dependencies. Normally *apk add* will
 	avoid changing installed package unless it is required by the newly
 	added _packages_ or their dependencies. This changes the default
 	preference to upgrading the package to the latest installable version.
 
+*--usermode*
+	Create usermode database with --initdb. In usermode, apk will operate
+	in such a way that root access is not required. Currently this implies:
+	- checking that we are running as non-root
+	- not changing file owner or group
+	- not setting system xattrs
+
+	This implies that the installation might not be fully functional.
+	However, this is useful mode for testing purposes or to create
+	chroot where some specific applications can run as non-root.
+
 *-t, --virtual* _NAME_
 	Create virtual package _NAME_ with given dependencies. This new package
 	will get the _packages_ as dependencies instead of _world_. Finally the
-	_NAME_ is added to _world_.
+	_NAME_ is added to _world_. An optional version specifier for the virtual
+	package can be given via syntax _NAME_=_VERSION_. The version defaults
+	to synthesized version based on time.
 
 	One can use this to ensure that selected set of packages are installed,
 	and later the temporary modification be undone with *apk-del*(8) _NAME_
 	without removing packages that were installed earlier.
-
-*--no-chown*
-	Do not change file owner or group. By default apk will manage the file
-	ownership when running as root. However, this option is turned on when
-	running as non-root user, as changing file ownership is not permitted
-	by the system then.
-
-# AUTHORS
-
-Natanael Copa <ncopa@alpinelinux.org>++
-Timo Teräs <timo.teras@iki.fi>

doc/apk-audit.8.scd

@@ -13,21 +13,27 @@ apk audit - audit directories for changes
 *apk audit* audits the system or specified directories for changes compared to
 the package database.
 
-The audit can be done against configuration files only (--backup) to generate
+The audit can be done against configuration files only (*--backup*) to generate
 list of files needed to be stored in the overlay in run-from-tmps configuration.
-Alternatively, it can audit all installed files (--system) to e.g. detect
-unauthorized modifications of system files.
+Alternatively, it can audit all installed files (*--system* or *--full*) to
+e.g. detect unauthorized modifications of system files.
 
 By default, the output format is one file per line, for each modified file.
-A character is printed indicating the change detected, followed by a space,
-then the affected path. The changes detected are:
-
-|[ A
-:< File added
+A character is printed indicating the line type, followed by a space,
+then the affected path or details. The changes detected are:
+
+|[ -
+:< Database detail record
+|  \+
+:  On-disk detail record
+|  A
+:  File added
 |  d
 :  Directory added
 |  D
 :  Directory added (with non-listed files/subdirs)
+|  e
+:  error occured during audit (e.g. no permissions to read file)
 |  M
 :  File metadata changed (uid, gid, or mode)
 |  m
@@ -49,6 +55,18 @@ then the affected path. The changes detected are:
 	Check file permissions too. Namely, the uid, gid and file mode will
 	be checked in addition to the file content.
 
+*--details*
+	Enable reporting of detail records.
+
+*--full*
+	Audit all system files. Same as *--system*, but in addition reports
+	all added directories and files. A built-in default override for
+	protected paths is used, unless a *--protected-paths* is explicitly
+	specified.
+
+*--ignore-busybox-symlinks*
+	Ignore symlinks whose target is the busybox binary.
+
 *--packages*
 	Print only the packages with changed files. Instead of the full output
 	each modification, the set of packages with at least one modified file
@@ -57,15 +75,19 @@ then the affected path. The changes detected are:
 	To repair all packages with modified files, one could use:
 		apk audit --packages -q | xargs apk fix
 
+*--protected-paths* _FILE_
+	Use given FILE for protected paths listings. This also makes apk ignore
+	the regular protected_paths.d directories.
+
 *--system*
 	Audit all system files. All files provided by packages are verified
 	for integrity with the exception of configuration files (listed in
 	protected_paths.d). This is useful detecting unauthorized file changes.
+	New files or directories are not reported.
 
 *-r, --recursive*
 	Descend into directories and audit them as well.
 
-# AUTHORS
+# SEE ALSO
 
-Natanael Copa <ncopa@alpinelinux.org>++
-Timo Teräs <timo.teras@iki.fi>
+*apk-protected_paths*(5)

doc/apk-cache.5.scd

@@ -6,8 +6,8 @@ apk-cache(5)
 
 # DESCRIPTION
 
-If */etc/apk/cache* is a symlink to a local directory, *apk*(8) will it as a
-local cache for downloaded package files and repository indicies. The cache
+If */etc/apk/cache* is a symlink to a local directory, *apk*(8) will use it as
+a local cache for downloaded package files and repository indicies. The cache
 must not reside on a tmpfs.
 
 To enable the apk cache, run the following commands as root:
@@ -16,8 +16,3 @@ mkdir -p /var/cache/apk++
 ln -s /var/cache/apk /etc/apk/cache
 
 For information on cache maintenance, see *apk-cache*(8).
-
-# AUTHORS
-
-Natanael Copa <ncopa@alpinelinux.org>++
-Timo Teräs <timo.teras@iki.fi>

doc/apk-cache.8.scd

@@ -8,9 +8,11 @@ apk cache - manage a local cache of package files
 
 *apk cache* [<_options_>...] clean
 
-*apk cache* [<_options_>...] download
+*apk cache* [<_options_>...] download [_dependency_...]
 
-*apk cache* [<_options_>...] sync
+*apk cache* [<_options_>...] purge
+
+*apk cache* [<_options_>...] sync [_dependency_...]
 
 # DESCRIPTION
 
@@ -18,16 +20,33 @@ Manage local package cache by removing obsolete packages, or downloading
 missing or newer packages from the repositories.
 
 *apk cache download* will fetch package files from the repositories and store
-them in the cache, which must be enabled upfront (see *apk-cache*(5)).
+them in the cache, which must be enabled upfront (see *apk-cache*(5)). By
+default _world_ dependencies are used to determine what to download. If
+_dependency_ arguments are given, they will by default replace the _world_.
+
+*apk cache clean* will remove package files which no longer exist in any
+repository index. Specifying the global option *--purge* will additionally
+remove all uninstalled package on tmpfs installations, and all packages on
+disk installations.
 
-*apk cache clean* will remove package files which are no longer necessary,
-having been made obsolete by new versions or no longer being transitively
-depended on by packages in _world_.
+*apk cache purge* is a synonym for *clean --purge*.
 
 *apk cache sync* performs both operations.
 
 # OPTIONS
 
+*--add-dependencies*
+	Add the argument dependencies to _world_ dependencies when determining
+	which packages to download.
+
+*-a, --available*
+	Selected packages to be downloaded from active repositories even if
+	it means replacing or downgrading the installed package.
+
+*--ignore-conflict*
+	Ignore conflicts when resolving dependencies. This can be useful when
+	pre-populating cache for creation of multiple images in one go.
+
 *-l, --latest*
 	Always choose the latest package by version. However, the versions
 	considered are based on the package pinning. Primarily this overrides
@@ -35,12 +54,9 @@ depended on by packages in _world_.
 	dependencies cannot be satisfied.
 
 *-u, --upgrade*
-	Upgrade _packages_ and it's dependencies. Normally *apk add* will
-	avoid changing installed package unless it is required by the newly
-	added _packages_ or their dependencies. This changes the default
-	preference to upgrading the package to the latest installable version.
-
-# AUTHORS
+	When caching packages which are already installed, prefer their upgrades
+	rather than considering the requirement fulfilled by the current
+	installation.
 
-Natanael Copa <ncopa@alpinelinux.org>++
-Timo Teräs <timo.teras@iki.fi>
+*-s, --simulate*
+	Simulate the requested operation without making any changes.

doc/apk-convdb.8.scd

+apk-convdb(8)
+
+# NAME
+
+apk convdb - convert v2 installed database to v3 format
+
+# SYNOPSIS
+
+*apk convdb*
+
+# DESCRIPTION
+
+*apk convdb* converts to current installed database to v3 format and
+outputs a corresponding *installed.adb* file.
+
+# OPTIONS
+
+*apk convdb* does not support any specific options. See *apk*(8) for global
+options.

doc/apk-convndx.8.scd

+apk-convndx(8)
+
+# NAME
+
+apk convndx - convert v2 indexes to v3 format
+
+# SYNOPSIS
+
+*apk convndx* _indexes_...
+
+# DESCRIPTION
+
+*apk convndx* reads the specifed _indexes_ and generates and merges them.
+The resulting data is written out to stdout in apkv3 index format.
+
+# OPTIONS
+
+*apk convndx* does not support any specific options. See *apk*(8) for global
+options.

doc/apk-del.8.scd

@@ -2,16 +2,17 @@ apk-del(8)
 
 # NAME
 
-apk del - remove packages from _world_ and commit changes
+apk del - remove constraints from _world_ and commit changes
 
 # SYNOPSIS
 
-*apk del* [<_options_>...] _packages_...
+*apk del* [<_options_>...] _constraints_...
 
 # DESCRIPTION
 
-*apk del* removes packages from _world_ and uninstalls them if no longer
-required by any other packages.
+*apk del* removes constraints from _world_ (see *apk-world*(5)) and
+commits changes to disk. This usually involves removing unneeded packages,
+but may also cause other changes to the installed packages.
 
 # OPTIONS
 
@@ -20,8 +21,3 @@ following options:
 
 *-r, --rdepends*
 	Recursively delete all top-level reverse dependencies, too.
-
-# AUTHORS
-
-Natanael Copa <ncopa@alpinelinux.org>++
-Timo Teräs <timo.teras@iki.fi>

doc/apk-dot.8.scd

@@ -23,8 +23,3 @@ known package if unspecified (this will generate a large and unwieldy graph).
 
 *--installed*
 	Consider only installed packages.
-
-# AUTHORS
-
-Natanael Copa <ncopa@alpinelinux.org>++
-Timo Teräs <timo.teras@iki.fi>