diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-04-25 21:08:05 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-04-25 21:08:05 +0000 |
| commit | fd4ebe70225d6e2f9993514553bac7aa9eb1df7e (patch) | |
| tree | 95190a341e6861d216bf45c2e45eb301f6c531da /debian | |
| parent | ccd3b00975f96a62835e02cd243f624d47812b56 (diff) | |
| parent | 85c435f23718e168345ea60270b24a57061b54f4 (diff) | |
Merge branch 'policy-as-of' into 'main'
Update Sequoia crypto policy, implement year-ahead warning
See merge request apt-team/apt!475
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/default-sequoia.config | 18 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 157ca079e..a3e4c45df 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: dpkg-dev (>= 1.22.5) <!pkg.apt.ci>, ninja-build, pkg-config, po4a (>= 0.34-2) <!nodoc>, - sqv [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hurd-amd64 hurd-i386 loong64 powerpc ppc64 sparc64] <!pkg.apt.nosqv> | gpgv, + sqv (>= 1.3.0) [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hurd-amd64 hurd-i386 loong64 powerpc ppc64 sparc64] <!pkg.apt.nosqv> | gpgv, triehash, xsltproc <!nodoc>, zlib1g-dev diff --git a/debian/default-sequoia.config b/debian/default-sequoia.config index b0abc90ee..0bb0b9c41 100644 --- a/debian/default-sequoia.config +++ b/debian/default-sequoia.config @@ -1,4 +1,18 @@ +# Default APT Sequoia configuration. To overwrite, consider copying this +# to /etc/crypto-policies/back-ends/apt-sequoia.config and modify the +# desired values. +[asymmetric_algorithms] +dsa2048 = 2024-02-01 +dsa3072 = 2024-02-01 +dsa4096 = 2024-02-01 +brainpoolp256 = 2028-02-01 +brainpoolp384 = 2028-02-01 +brainpoolp512 = 2028-02-01 +rsa2048 = 2030-02-01 + [hash_algorithms] -sha1.second_preimage_resistance = 2026-01-01 +sha1.second_preimage_resistance = 2026-02-01 # Extend the expiry for legacy repositories +sha224 = 2026-02-01 + [packets] -signature.v3 = 2026-01-01 +signature.v3 = 2026-02-01 # Extend the expiry diff --git a/debian/rules b/debian/rules index cd2370931..55d5e5eac 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ override_dh_install-arch: install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove override_dh_gencontrol: - dh_gencontrol -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" -Vopenpgp:Depends=$(shell test -e /usr/bin/sqv && echo sqv || echo gpgv) + dh_gencontrol -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" -Vopenpgp:Depends="$(shell test -e /usr/bin/sqv && echo "sqv (>= 1.3.0)" || echo gpgv)" override_dh_installcron: dh_installcron --name=apt-compat |