Merge branch 'develop' into rtl8821ce

net-dns/bind/metadata.xml

@@ -15,6 +15,6 @@
         <flag name="gssapi">Enable gssapi support</flag>
         <flag name="json">Enable JSON statistics channel</flag>
         <flag name="lmdb">Enable LMDB support to store configuration for 'addzone' zones</flag>
-        <flag name=sdb-ldap>Use LDAP backend</flag>
+        <flag name="sdb-ldap">Use LDAP backend</flag>
     </use>
 </pkgmetadata>

profiles/templates/2_ac_install_merge/net-misc/openssh/include.conf

@@ -0,0 +1,2 @@
+# Calculate path=/etc/ssh name=sshd_config grep(/etc/ssh/sshd_config,/etc/ssh/sshd_config.d)== append=after
+Include "/etc/ssh/sshd_config.d/*.conf"

profiles/templates/6_ac_update_sync/remerge/0-ini

@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20230523
+remerge = 20230525

sys-apps/calculate-utils/Manifest

@@ -20,5 +20,6 @@ DIST calculate-lib-3.7.3.10.tar.bz2 1224832 BLAKE2B 52dd07c044f954dbf4b85ce89027
 DIST calculate-lib-3.7.3.17.tar.bz2 1224983 BLAKE2B 2ba63169e298d1b98a47feb083afe3c995ef247307200580bb5170b56ae334bc1225e7819ef66316181a1adf3c8e06e486b20091e515d4a9fba1e0d1faa9b4b8 SHA512 d301b2d8536c956b7053af0a6aba01dd8bed1effdc22c6ac7df142e55edb0ba8595d474fa21d98e5bcae904fb3b4c2aa2ae15f421344c92f7cc7959d6b00d261
 DIST calculate-lib-3.7.3.18.tar.bz2 1225609 BLAKE2B 8a33a451f3f681d86c68396cc9c19d4c6d9d292566009f5e0102ed477a59f9c198573386f08c6754d85e1568eed1cc610c6b9b8538c51157a3dfc9769a4f2765 SHA512 ea52aeb2aecca25adebe1ec09665a0f71e4081a0aafe8498faafccd3fa23ab047190881ce8cd02b0839e30117f4dd4e122f7e76ef21c95a753c0120e197cbf29
 DIST calculate-lib-3.7.3.19.tar.bz2 1225213 BLAKE2B 9fad57a286ed51469bc4a37bceb936b0bab7d57650ff258f84d181222e38b4c9b45cb696bfbaf26d45561259df8485aa5ba992de4fdcea8f5dc8d2dcdda8ce16 SHA512 595937c0b460ce404b72eb339f1b5f5fc6162899a797b78b537cdbb1e7e193360df22311a15462586c1ef1aee70074c01b3a1538c7aa79ca377d9da70b6697ed
+DIST calculate-lib-3.7.3.20.tar.bz2 1225522 BLAKE2B 9f560f908934e8167ff6377b16c611b9e79999e55d5c230acc95cd8f9b4d8fe79a33f55959311eebeb89576f750930a546192a602d80e0dcbd2669f746540aa8 SHA512 ba5fdc3f4a071aaba1ca9cf9fcca6ae6c51fab1b05859c7e64c3bc0175099a712c15947f1a8ddb6e7b13e2028ae58cd009145eb7e182edd8cbb28a1cd9572060
 DIST calculate-update-3.7.3.5.tar.bz2 43403 BLAKE2B 9b0aea2afc86bac065244e7838e6c3398a0d035dc12ebe17171d9d21d71d9c24871c5f7d43d550f4da14f1097d88069be6c5f691d0ffb6131a320e253d949440 SHA512 f0ce148131acdd474815f08dee253e8a86785012c4e0c40a03f693be0971b75c88e5b7c299e91e8344ebe6e7446a9486a0634e96b6d0c7b48ce1bb0ce0d02196
 DIST calculate-update-3.7.3.8.tar.bz2 43456 BLAKE2B 93b9358aae807b15ca368edf2f6aa9e39d0ba592a8d5801e3e171c59b311f69db080dac451c7f2b238155cde776d3ec6f2a364744a94b9a9e4daca29f83904b9 SHA512 30856fa79f61a379180d436d98c186b1a56638cf8e62740a613625d2a993df92a869545a81e7c8f13ff5744b3368f27de0fccb3089199b04a9a6b68ecc78db3f

sys-apps/calculate-utils/calculate-utils-3.7.4.1-r2.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="7"
+
+UTILS_PV="3.7.3"
+
+declare -A CALCULATE_MODULES=(
+	["lib"]="3.7.3.20"
+	["install"]="3.7.3.8"
+	["core"]="3.7.3.1"
+	["i18n"]="3.7.3.5"
+	["client"]="3.7.3.4"
+	["console"]="3.7.3"
+	["console-gui"]="3.7.3.1"
+	["update"]="3.7.3.8"
+	["builder"]="3.7.3.7"
+)
+
+inherit calculate-utils-r16
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64"
+

sys-kernel/calculate-sources/Manifest

@@ -5,8 +5,8 @@ DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST patch-5.10.103.xz 2806360 BLAKE2B b3563c60b89ba7d7d1d61576e0010f1258a254c7c10aa3072a6889e39e061f417c39ec4b5d723cba9d62e1c0a14ec2affbe7c7c0a6e71f0592e80c179c0d97e2 SHA512 d9f9c728109f099f4998bd2c016f18f3e63fd674f60afd4c308bf2f212ba1463d894ae5346b21842c0117131e577d315cdb067c1ad5c837f8b4a9ff44c524e16
 DIST patch-5.10.180.xz 4649100 BLAKE2B e8ef962a108298004c7fa654d54b11d12d86bb84c15d97d36bfd483b6f816e9923692257ebde3bc4983b87aaa780885ce9f3ac73860130c364ca3d4f0786369e SHA512 ce31e7e48d52258cd91a828251f05b8eec1d0c1c3193b61240b4f6952134d6b6b2e7c82935d07f95171afad6be8cc717968e86c569346e199238b1ca999e8e48
-DIST patch-5.15.112.xz 4056984 BLAKE2B 257ab82b08537e7503dd5ae8fc70cdd87e7c1d49b9c9695e82f4ae24ee8c59a5804ab8215ec2c8b226387385852baed5af4c0b803e15f0847c3d03f680212ddb SHA512 f21939ba51bbe5be3e2eb01e27ab32d7f39839e4a3bfdf4fb9a08c4c193e3a63b2ac84fec524486dfcf8c66b521c2bc85bac37714fc58121dc911ca75ea86c9e
+DIST patch-5.15.113.xz 4110072 BLAKE2B f973f4249e71e61760bc9a32cdea137d9c1326e2e78adc423d620e216a769f419267310bdfea5c374a2f3fd9cb761f998a27dc2ba43a42c6296e99723628764a SHA512 37c003d30ec72ba18c0eb3ddfc5245423942333edee51efa2a32c6eb0f1fdf26d75394f3ad5afcf8917b84648bdd4c50afa56bee0cb18c224030b42ecd9b91a3
 DIST patch-5.15.82.xz 3103060 BLAKE2B bede243695e218e2673d3f59f7c16d70976c485deb66725623fb08b3dab918acb756119b82ba385cf5e27806d71690075cd2c1360b9f6df321190be0e5badc16 SHA512 4e7e79fe31484311c9e25b1c69770f4ddddedb53ba566619adbf1b0eaf9443d6c3ba548500f77b8dd04f6e596fd4d4126998bd7ff8b4c2cbff2f33b2dd574920
-DIST patch-6.1.29.xz 1677256 BLAKE2B 90fac158666e894cc8c9f65820b60b7f9272ded08f7f9e492dfaee2c7316941370a8af9cfc8df252606646095abad8f6ed5a5148f7e5098a3ece22532a0c5cd8 SHA512 e9a060a82b25bd90aa2a752ba21b334b206c263a346d4e6975df4714c78494594b76a3f77e9a24f8c80cc1e330389ce94c7dbc8be9995ad8d0c64573155b9177
+DIST patch-6.1.30.xz 1768452 BLAKE2B a4b4d44ee200a08921aafdc0ff97d3d84b552be94f267eb4fcf6df425e5becbc0c8ad1c5cea87dd19ca03ac7d27b320b996f8430fa23a0ac67041c747b02b6fb SHA512 366a6a3029392559e35e2a7c14474b15dffaa5d517df9cda3bd2bb171fbcd6bf82d526ada2298945c87c9a7a0b87c8ac1ac7fe64969bf133e4b6f8cbf67b9bec
 DIST patch-6.2.16.xz 1047540 BLAKE2B 0caa2b99a921a3ff15fdc9c000fce8388e5bab077fc71cdb01dbb770d71466229b13fdda48e98726359dfdac1c83fc0f6635a99df6002bb660c665372bdfeae7 SHA512 7b9eb6ab132afcc2caf13a28bc730cb5dba9ce7148a5b892e0147b97ee059e6a82fdf5876246545a282d3fcca6d2898c5f2f0c308f9200d959fb2eecbf87bf3f
-DIST patch-6.3.3.xz 335468 BLAKE2B 1f1e1f006da1324533f8190d48f8209465034c3ca1765db3a1ee2695270d612845b25e034216ab4bcf85f49a2d1ebe451fcab9fec1f575b3b7ac48b11ce96b37 SHA512 0f5aeb2a0adb99faec961d93d421f67582f23459d2591c07a0152c042d8c87a2d2061ea4dc6a6be8a25da07b70a6bc2f83479f36cb14636c8dbf6b9fb9827e31
+DIST patch-6.3.4.xz 454372 BLAKE2B 4621cd1bac4a29669558a5c1d9e05db8db89e8151cdf75e8ffd59eafe113335aa2c16793e9004596c73fadf4b7a1ae30b66473814fc23ec517b0c4809d53f40f SHA512 4b50cdd6a16ab9df2b3044e88f1e2f7d37775bd28f1726aa90c66602555c27e474865f3b371a6fc376251a36a7222b17359de32a57a73ecc242bbc6137ff11a8