Merge remote-tracking branch 'origin/3.6' into 3.7-alpha0

2021-12-11 23:56:33 +01:00 · 2021-12-11 23:56:33 +01:00 · e95c562da0
commit e95c562da0
parent 62496dc0aa c5aed273be
832 changed files with 223060 additions and 107724 deletions
--- a/acorn/.signature
+++ b/acorn/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF394X/3/elNL7HXE8CR6T6moB56UDyc/QVi4cLUpK0BQxqYOwpiIKBxB234+/cyJs1qYseo964ZBoR2eS6In7vgo=
-SHA256 (Pkgfile) = c44684cceb869d5c2afd5cd88e2b39805053a6be1850f9a024f363171cad3268
+RWSagIOpLGJF3xKgDMTwQGcphxm5l9GqQVmZsuRFfefGLmhlPx0cJAt/PkzAFD2Zritz41kK/NbMSuQo1M+JzjTcgpxvzrdJqAs=
+SHA256 (Pkgfile) = d10386ce46158f4576a5fb167b708c2a1007db92748e3bfc9c47a28ede336f84
 SHA256 (.footprint) = ea773f577ad113d5aa033ed58795c038be8894fd60f5cc281a93f4886442a073
-SHA256 (acorn-8.5.0.tgz) = d8f9d40c4656537a60bf0c6daae6f0553f54df5ff2518f86464b7c785f20376b
+SHA256 (acorn-8.6.0.tgz) = 08fedb0c79cc704893b8971b622683877b99c164c11c7a618c3c2829105bb8e3
--- a/acorn/Pkgfile
+++ b/acorn/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: npm

 name=acorn
-version=8.5.0
+version=8.6.0
 release=1
 source=(https://registry.npmjs.org/$name/-/$name-$version.tgz)

--- a/ant/.signature
+++ b/ant/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF325Es1X0uS+j9b5yqVwCk+fx4c48cd2B//hK0zSn9VMUn0pPrC4RZbTk7cmWcFQrGAP/9O562Z3iL6OBBFfZlg4=
-SHA256 (Pkgfile) = 02bf47d26277db232c2724dcb5ab94491d94e51edb6b38c1616b53c65ae6d577
+RWSagIOpLGJF34eDaGllhD/CM/cmYwEcmrYrYG29eQYyXXS3bph/7lxzZpZli8t6HFUhoNQYjiY0cBkAogD2e5G078xCaINUqQw=
+SHA256 (Pkgfile) = 49a5bfa4ea389433058fc62e98f4df3464b1cb5f8a1aa8c3096067c90efad959
 SHA256 (.footprint) = 12c3d185e494867aafcde175bb3f702fa4ba9fd9c17753c8ba16def4a28290d0
-SHA256 (apache-ant-1.10.11-src.tar.xz) = a6b67dfc0d2ff3fa92a8670ac2d43bfb864e6776dcf679843ce596df10532caa
+SHA256 (apache-ant-1.10.12-src.tar.xz) = 7629bb10285c5de609df56ae9bc968332f3d34d6cd5c0a5dffe24078e09e98b3
 SHA256 (ant.conf) = df69b76897e52764ad65e2536ce73dc98f4df014c88551dcdfc802c10ec26ee6
--- a/ant/Pkgfile
+++ b/ant/Pkgfile
@ -1,11 +1,10 @@
 # Description: Ant is a Java-based build tool.
 # URL: http://ant.apache.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: openjdk16-jdk
-# Optional: python
+# Depends on: openjdk17-jdk

 name=ant
-version=1.10.11
+version=1.10.12
 release=1
 source=(https://www-eu.apache.org/dist/ant/source/apache-$name-$version-src.tar.xz
 	ant.conf)
@ -13,11 +12,11 @@ source=(https://www-eu.apache.org/dist/ant/source/apache-$name-$version-src.tar.
 build() {
 	cd apache-$name-$version

-	sed -i 's|/usr/bin/python|/usr/bin/python2|' \
+	sed -i 's|/usr/bin/python|/usr/bin/python3|' \
 		src/script/runant.py

 	unset JAVA_HOME
-	export JAVA_HOME='/usr/lib/java/openjdk16-jdk'
+	export JAVA_HOME='/usr/lib/java/openjdk17-jdk'

 	./bootstrap.sh
 	bootstrap/bin/ant -Ddest=optional -f fetch.xml
--- a/appstream-glib/.signature
+++ b/appstream-glib/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35nUo6ZCfa/XVGbBdND2WCs5987pA/sTXo3meS6HwbAS9SOPFF8N353EwjsY4opsGCsFddFagbVBCYAYiorN1As=
-SHA256 (Pkgfile) = 56d3b9450877f66079d8d7211e2aeabc46686348d694fc3163210eda4a9dfd77
+RWSagIOpLGJF3y+eKYARPCxho8eNEi5z1gXy3w3mrf9gLpQVbSYk6JyYX9441s7sx1kJkEMG0wUpTw/2vORg4by0v1qyAxZ/JAY=
+SHA256 (Pkgfile) = 27667f236ded881057c81b1cfa6a3df2ac483b27edd37efa3c108bcf91117734
 SHA256 (.footprint) = 7ff0e10838a5c518492d14ef9e24a24ba1be196a3de208f547d798b1e1fc76f9
 SHA256 (appstream-glib-0.7.18.tar.xz) = ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002
--- a/appstream-glib/Pkgfile
+++ b/appstream-glib/Pkgfile
@ -6,7 +6,7 @@

 name=appstream-glib
 version=0.7.18
-release=2
+release=3
 source=(https://people.freedesktop.org/~hughsient/appstream-glib/releases/$name-$version.tar.xz)

 build() {
--- a/arc-theme/.signature
+++ b/arc-theme/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37u0dsh4NDWA2JwKpTs3BkeQy9TyFFo81kV9Fa0/APbpeunbTdGPWBSHFDJ5tD3V/oP0LRg5vUk2tKoYhaefAQ4=
-SHA256 (Pkgfile) = d1b1ecb8af444e450f986c4bbada5affd9844d022eaa28eb3f8abb5a60fed8c1
+RWSagIOpLGJF3whvzdnw6qD2F1aayz3XZCmYuHdoiPW9QFJVr5VaGGYZgQ+x31UFzf1UeebhR2UMhT/Zy/Y3L4QC/fQ2sE3x3QQ=
+SHA256 (Pkgfile) = e44f89be82c50a1c257641bd6851e420406727940e505e4a7f72d0f015621f74
 SHA256 (.footprint) = dd9f638fd9a4b1e8681480bae677371e3e4b650b8572497128044ecae0b3f6ec
-SHA256 (arc-theme-20210412.tar.xz) = 3d0fadc9ccbf3a49c257388d56d6e15fb4acb39ce7f3cdfbeffa8326ec6770b7
+SHA256 (arc-theme-20211018.tar.xz) = 8258a9bc49df54d0ff0935fab68c3c00249e5f615c451b99ada4850dc8140e4d
--- a/arc-theme/Pkgfile
+++ b/arc-theme/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: gtk-engine-murrine inkscape sassc gnome-icon-theme gtk3 adwaita-icon-theme meson gtk-theme-adwaita

 name=arc-theme
-version=20210412
+version=20211018
 release=1
 source=(https://github.com/jnsh/$name/releases/download/$version/$name-$version.tar.xz)

--- a/assimp/.footprint
+++ b/assimp/.footprint
@ -3,42 +3,72 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/assimp
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/assimp/
+-rw-r--r--	root/root	usr/include/assimp/aabb.h
+-rw-r--r--	root/root	usr/include/assimp/ai_assert.h
+-rw-r--r--	root/root	usr/include/assimp/anim.h
 -rw-r--r--	root/root	usr/include/assimp/BaseImporter.h
 -rw-r--r--	root/root	usr/include/assimp/Bitmap.h
 -rw-r--r--	root/root	usr/include/assimp/BlobIOSystem.h
 -rw-r--r--	root/root	usr/include/assimp/ByteSwapper.h
+-rw-r--r--	root/root	usr/include/assimp/camera.h
+-rw-r--r--	root/root	usr/include/assimp/cexport.h
+-rw-r--r--	root/root	usr/include/assimp/cfileio.h
+-rw-r--r--	root/root	usr/include/assimp/cimport.h
+-rw-r--r--	root/root	usr/include/assimp/ColladaMetaData.h
+-rw-r--r--	root/root	usr/include/assimp/color4.h
+-rw-r--r--	root/root	usr/include/assimp/color4.inl
+-rw-r--r--	root/root	usr/include/assimp/commonMetaData.h
 drwxr-xr-x	root/root	usr/include/assimp/Compiler/
 -rw-r--r--	root/root	usr/include/assimp/Compiler/poppack1.h
 -rw-r--r--	root/root	usr/include/assimp/Compiler/pstdint.h
 -rw-r--r--	root/root	usr/include/assimp/Compiler/pushpack1.h
+-rw-r--r--	root/root	usr/include/assimp/config.h
 -rw-r--r--	root/root	usr/include/assimp/CreateAnimMesh.h
 -rw-r--r--	root/root	usr/include/assimp/DefaultIOStream.h
 -rw-r--r--	root/root	usr/include/assimp/DefaultIOSystem.h
 -rw-r--r--	root/root	usr/include/assimp/DefaultLogger.hpp
-rw-r--r--	root/root	usr/include/assimp/Defines.h
+-rw-r--r--	root/root	usr/include/assimp/defs.h
 -rw-r--r--	root/root	usr/include/assimp/Exceptional.h
 -rw-r--r--	root/root	usr/include/assimp/Exporter.hpp
+-rw-r--r--	root/root	usr/include/assimp/fast_atof.h
 -rw-r--r--	root/root	usr/include/assimp/GenericProperty.h
+-rw-r--r--	root/root	usr/include/assimp/GltfMaterial.h
 -rw-r--r--	root/root	usr/include/assimp/Hash.h
-rw-r--r--	root/root	usr/include/assimp/IOStream.hpp
-rw-r--r--	root/root	usr/include/assimp/IOStreamBuffer.h
-rw-r--r--	root/root	usr/include/assimp/IOSystem.hpp
+-rw-r--r--	root/root	usr/include/assimp/importerdesc.h
 -rw-r--r--	root/root	usr/include/assimp/Importer.hpp
+-rw-r--r--	root/root	usr/include/assimp/IOStreamBuffer.h
+-rw-r--r--	root/root	usr/include/assimp/IOStream.hpp
+-rw-r--r--	root/root	usr/include/assimp/IOSystem.hpp
+-rw-r--r--	root/root	usr/include/assimp/light.h
 -rw-r--r--	root/root	usr/include/assimp/LineSplitter.h
 -rw-r--r--	root/root	usr/include/assimp/LogAux.h
-rw-r--r--	root/root	usr/include/assimp/LogStream.hpp
 -rw-r--r--	root/root	usr/include/assimp/Logger.hpp
-rw-r--r--	root/root	usr/include/assimp/Macros.h
+-rw-r--r--	root/root	usr/include/assimp/LogStream.hpp
+-rw-r--r--	root/root	usr/include/assimp/material.h
+-rw-r--r--	root/root	usr/include/assimp/material.inl
 -rw-r--r--	root/root	usr/include/assimp/MathFunctions.h
+-rw-r--r--	root/root	usr/include/assimp/matrix3x3.h
+-rw-r--r--	root/root	usr/include/assimp/matrix3x3.inl
+-rw-r--r--	root/root	usr/include/assimp/matrix4x4.h
+-rw-r--r--	root/root	usr/include/assimp/matrix4x4.inl
 -rw-r--r--	root/root	usr/include/assimp/MemoryIOWrapper.h
+-rw-r--r--	root/root	usr/include/assimp/mesh.h
+-rw-r--r--	root/root	usr/include/assimp/metadata.h
 -rw-r--r--	root/root	usr/include/assimp/NullLogger.hpp
 -rw-r--r--	root/root	usr/include/assimp/ParsingUtils.h
+-rw-r--r--	root/root	usr/include/assimp/pbrmaterial.h
+-rw-r--r--	root/root	usr/include/assimp/postprocess.h
 -rw-r--r--	root/root	usr/include/assimp/Profiler.h
 -rw-r--r--	root/root	usr/include/assimp/ProgressHandler.hpp
+-rw-r--r--	root/root	usr/include/assimp/qnan.h
+-rw-r--r--	root/root	usr/include/assimp/quaternion.h
+-rw-r--r--	root/root	usr/include/assimp/quaternion.inl
 -rw-r--r--	root/root	usr/include/assimp/RemoveComments.h
-rw-r--r--	root/root	usr/include/assimp/SGSpatialSort.h
 -rw-r--r--	root/root	usr/include/assimp/SceneCombiner.h
+-rw-r--r--	root/root	usr/include/assimp/scene.h
+-rw-r--r--	root/root	usr/include/assimp/SGSpatialSort.h
 -rw-r--r--	root/root	usr/include/assimp/SkeletonMeshBuilder.h
+-rw-r--r--	root/root	usr/include/assimp/SmallVector.h
 -rw-r--r--	root/root	usr/include/assimp/SmoothingGroups.h
 -rw-r--r--	root/root	usr/include/assimp/SmoothingGroups.inl
 -rw-r--r--	root/root	usr/include/assimp/SpatialSort.h
@ -48,56 +78,27 @@ drwxr-xr-x	root/root	usr/include/assimp/Compiler/
 -rw-r--r--	root/root	usr/include/assimp/StringComparison.h
 -rw-r--r--	root/root	usr/include/assimp/StringUtils.h
 -rw-r--r--	root/root	usr/include/assimp/Subdivision.h
-rw-r--r--	root/root	usr/include/assimp/TinyFormatter.h
-rw-r--r--	root/root	usr/include/assimp/Vertex.h
-rw-r--r--	root/root	usr/include/assimp/XMLTools.h
-rw-r--r--	root/root	usr/include/assimp/ZipArchiveIOSystem.h
-rw-r--r--	root/root	usr/include/assimp/aabb.h
-rw-r--r--	root/root	usr/include/assimp/ai_assert.h
-rw-r--r--	root/root	usr/include/assimp/anim.h
-rw-r--r--	root/root	usr/include/assimp/camera.h
-rw-r--r--	root/root	usr/include/assimp/cexport.h
-rw-r--r--	root/root	usr/include/assimp/cfileio.h
-rw-r--r--	root/root	usr/include/assimp/cimport.h
-rw-r--r--	root/root	usr/include/assimp/color4.h
-rw-r--r--	root/root	usr/include/assimp/color4.inl
-rw-r--r--	root/root	usr/include/assimp/config.h
-rw-r--r--	root/root	usr/include/assimp/defs.h
-rw-r--r--	root/root	usr/include/assimp/fast_atof.h
-rw-r--r--	root/root	usr/include/assimp/importerdesc.h
-rw-r--r--	root/root	usr/include/assimp/irrXMLWrapper.h
-rw-r--r--	root/root	usr/include/assimp/light.h
-rw-r--r--	root/root	usr/include/assimp/material.h
-rw-r--r--	root/root	usr/include/assimp/material.inl
-rw-r--r--	root/root	usr/include/assimp/matrix3x3.h
-rw-r--r--	root/root	usr/include/assimp/matrix3x3.inl
-rw-r--r--	root/root	usr/include/assimp/matrix4x4.h
-rw-r--r--	root/root	usr/include/assimp/matrix4x4.inl
-rw-r--r--	root/root	usr/include/assimp/mesh.h
-rw-r--r--	root/root	usr/include/assimp/metadata.h
-rw-r--r--	root/root	usr/include/assimp/pbrmaterial.h
-rw-r--r--	root/root	usr/include/assimp/postprocess.h
-rw-r--r--	root/root	usr/include/assimp/qnan.h
-rw-r--r--	root/root	usr/include/assimp/quaternion.h
-rw-r--r--	root/root	usr/include/assimp/quaternion.inl
-rw-r--r--	root/root	usr/include/assimp/scene.h
 -rw-r--r--	root/root	usr/include/assimp/texture.h
+-rw-r--r--	root/root	usr/include/assimp/TinyFormatter.h
 -rw-r--r--	root/root	usr/include/assimp/types.h
 -rw-r--r--	root/root	usr/include/assimp/vector2.h
 -rw-r--r--	root/root	usr/include/assimp/vector2.inl
 -rw-r--r--	root/root	usr/include/assimp/vector3.h
 -rw-r--r--	root/root	usr/include/assimp/vector3.inl
 -rw-r--r--	root/root	usr/include/assimp/version.h
+-rw-r--r--	root/root	usr/include/assimp/Vertex.h
+-rw-r--r--	root/root	usr/include/assimp/XmlParser.h
+-rw-r--r--	root/root	usr/include/assimp/XMLTools.h
+-rw-r--r--	root/root	usr/include/assimp/ZipArchiveIOSystem.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cmake/
-drwxr-xr-x	root/root	usr/lib/cmake/assimp-5.0/
-rw-r--r--	root/root	usr/lib/cmake/assimp-5.0/assimp-config-version.cmake
-rw-r--r--	root/root	usr/lib/cmake/assimp-5.0/assimp-config.cmake
-rw-r--r--	root/root	usr/lib/cmake/assimp-5.0/assimpTargets-release.cmake
-rw-r--r--	root/root	usr/lib/cmake/assimp-5.0/assimpTargets.cmake
-rw-r--r--	root/root	usr/lib/libIrrXML.a
+drwxr-xr-x	root/root	usr/lib/cmake/assimp-5.1/
+-rw-r--r--	root/root	usr/lib/cmake/assimp-5.1/assimpConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/assimp-5.1/assimpConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib/cmake/assimp-5.1/assimpTargets.cmake
+-rw-r--r--	root/root	usr/lib/cmake/assimp-5.1/assimpTargets-release.cmake
+-rwxr-xr-x	root/root	usr/lib/libassimp.so.5.1.3
+lrwxrwxrwx	root/root	usr/lib/libassimp.so.5 -> libassimp.so.5.1.3
 lrwxrwxrwx	root/root	usr/lib/libassimp.so -> libassimp.so.5
-lrwxrwxrwx	root/root	usr/lib/libassimp.so.5 -> libassimp.so.5.0.0
-rwxr-xr-x	root/root	usr/lib/libassimp.so.5.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/assimp.pc
--- a/assimp/.signature
+++ b/assimp/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34vc3NqGNgvu6l8eaDZo6uswLMBeY1YkuXxon0FuAGkJt1a/NYa6zRTb2xws4em6SDm3ilcNhowmkOJHgeRoEgM=
-SHA256 (Pkgfile) = b744697a959742ca7d6d6c184d057945c347c54bd6b404a7b3f59ec6bbd485cd
-SHA256 (.footprint) = 006eb35ba7faf1ce46e788bb5a0bbad23c946882605be017713b918aff8d875b
-SHA256 (assimp-5.0.1.tar.gz) = 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
+RWSagIOpLGJF35KtbaC8MLNNdnPEhoLakl02J30k08Vs7Ay/2mxa2mVwY/eybyWde5cN0RP+8e38pNJFLnAhdRXMhb42W62CUwQ=
+SHA256 (Pkgfile) = 216b34cc0e056d2024c93dfc485624bcf9a08409d16ab65e2e435054836efadb
+SHA256 (.footprint) = fd4413d29c7febf3bdb02e637b32d20325c14daf052e8f2e091b11fff038fe6e
+SHA256 (assimp-5.1.3.tar.gz) = 50a7bd2c8009945e1833c591d16f4f7c491a3c6190f69d9d007167aadb175c35
--- a/assimp/Pkgfile
+++ b/assimp/Pkgfile
@ -4,14 +4,15 @@
 # Depends on: cmake

 name=assimp
-version=5.0.1
-release=2
+version=5.1.3
+release=1
 source=(https://github.com/assimp/assimp/archive/v$version/$name-$version.tar.gz)

 build() {
-  [[ -e /usr/bin/ninja ]] && PKGMK_ASSIMP+=' -G Ninja'
+  prt-get isinst ninja && PKGMK_ASSIMP+=' -G Ninja'
  cmake -S $name-$version -B build $PKGMK_ASSIMP_OPTIONS \
    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_INSTALL_LIBDIR=lib \
    -D CMAKE_BUILD_TYPE=Release \
    -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
    -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
--- a/atuin/.signature
+++ b/atuin/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32ZCPBNnP1atff3z1O5tQAQ1MSHoUaqra7qf83s4lgUNMimBPlfZj2AzTVMgRCpzZQYMVHWXkjE1cPkU62XLCAM=
-SHA256 (Pkgfile) = 776dfa6b0b6b4c0d57ea435bc74624d25d630b8211a1cea4d8afe5e54d647fb2
+RWSagIOpLGJF3zH4Fl7Y3OON6E+J/kXoW0rIjeqt1BS2OeE9PLicahtJWYreMy+ewdTqjRS279Ea2bAbaQkme9rD69zNE2pE2Qc=
+SHA256 (Pkgfile) = cc2c07e8364d81fbfeea34fe62991796c3cb162c08c6cbb426d1bdc4ac355c75
 SHA256 (.footprint) = e00a72cbae6f94bccf7b886a7ca68f035fb8c3afbbf35acb770cf3ecd413e7ce
-SHA256 (atuin-0.7.1.tar.gz) = 0e1cd2104c6fa4cd2d6f30ae9771ed3f22f78a4e0e7b5243e42abb753b792c38
+SHA256 (atuin-0.7.2.tar.gz) = e8618a56791a22f4ab93d61bd15e28a6983583769f97a3ee3dc1329729f2921f
--- a/atuin/Pkgfile
+++ b/atuin/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: rust

 name=atuin
-version=0.7.1
+version=0.7.2
 release=1
 source=(https://github.com/ellie/atuin/archive/v$version/$name-$version.tar.gz)

--- a/ceph/.footprint
+++ b/ceph/.footprint
--- a/ceph/.signature
+++ b/ceph/.signature
@ -0,0 +1,19 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF35w503rUdeLNFsqRDovXnhNDlNZZ7+AMcqkuACcBA1/7zeqMSeBfuqXvEgvs5U0GIShoQErQdPaZlN/UCh4/lg8=
+SHA256 (Pkgfile) = 649b0563541907483b41da35bbd29203aa9087dba49c8e86b39fe9a4e78db8fb
+SHA256 (.footprint) = d2079a7a35ef217a50a8bd4f328beb944b8113c387ede11221f40c5f332dc9c3
+SHA256 (ceph_16.2.5.orig.tar.gz) = b8206916fa7993e0394a0c31a09564b866fd13af6968aaecdea75ae51a6c46de
+SHA256 (ceph.confd) = 96e5e3c23764005622e94bbd69216bdf514b6674c6652bcf0843cec84970890e
+SHA256 (ceph.initd) = 0c6a68cf217531ee3e556a6da81d7f950c342cfdc219cd36d866928ec695538e
+SHA256 (0001-src-common-crc32c_intel_fast.patch) = 9d79caa39a217bad7d2356f5278e796a8f6548a2e8d12fcaafe7ded896ee8827
+SHA256 (0002-src-common-CMakeLists.txt.patch) = 9f71a7f2142c6e9b10713c665c137db816ac9e3661d7d5521331cb80addfef77
+SHA256 (0003-src-common-bitstr.h.patch) = a0f4eb6aa8039bfea51e0165822dc64ccd79088c63a86b646838accdd22ee0ac
+SHA256 (0006-src-blk-CMakeLists.txt.patch) = fcdb83016bc0dc9ad6e458f490a7642db0df28142b483e63ddaf8e4b42ab9091
+SHA256 (0007-src-test-neorados-CMakeLists.txt.patch) = c3fd1ee199134b2020fe8b0981d59e8f98550cc9df3869a8123370504bcae0d8
+SHA256 (0008-cmake-modules-Finduring.cmake.patch) = 3d4526c82d043803be0b7150a9740bd903f4c5c7c0498544ff9a0dd7ee934989
+SHA256 (0009-librgw-notifications-initialize-kafka-and-amqp.patch) = 0d750ebe1cb8e49006d3a546bd592c6a42cece6d910b8d07085bdd25c08061c4
+SHA256 (0011-src-test-rgw-amqp_mock.cc.patch) = 3c0f593d3d93a250dda373e38806274e37ca37c0f5b032ec6b03851514441efd
+SHA256 (0012-src-compressor-snappy-SnappyCompressor.h.patch) = c388504bb77e25124259e9e2a9e440404a67a4c747500acd4ca2a39319ee422c
+SHA256 (0013-src-common-Formatter.cc.patch) = 82abf19d94e35d26907467c5bc565fc4ffd91c7b28cc0bfff8836b104a6ff745
+SHA256 (0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch) = ee04208ed9ef90552b2ad40fd39a2e7829f03e80af2a4ab69b777a4809b26c93
+SHA256 (0015-src-kv-rocksdb_cache.patch) = bd8a80ee3ab7855225ef91431cd8b036e23c95074f469ffb999a0e52ca0bfa6d
--- a/ceph/0001-src-common-crc32c_intel_fast.patch
+++ b/ceph/0001-src-common-crc32c_intel_fast.patch
@ -0,0 +1,55 @@
+--- ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s.orig	2020-05-26 08:34:32.226201974 -0400
+++ ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s	2020-05-26 17:19:32.497201974 -0400
+@@ -1,5 +1,5 @@
+ ;
+-; Copyright 2012-2013 Intel Corporation All Rights Reserved.
+; Copyright 2012-2015 Intel Corporation All Rights Reserved.
+ ; All rights reserved.
+ ;
+ ; http://opensource.org/licenses/BSD-3-Clause
+@@ -59,6 +59,19 @@
+ 	xor     rbx, rbx                ;; rbx = crc1 = 0;
+ 	xor     r10, r10                ;; r10 = crc2 = 0;
+ 
+	cmp	len, %%bSize*3*2
+	jbe	%%non_prefetch
+
+ %assign i 0
+ %rep %%bSize/8 - 1
+	crc32   rax, bufptmp  ;; update crc0
+	crc32   rbx, bufptmp  ;; update crc1
+	crc32   r10, bufptmp  ;; update crc2
+	%assign i (i+8)
+ %endrep
+	jmp %%next %+ %1
+
+%%non_prefetch:
+  %assign i 0
+  %rep %%bSize/8 - 1
+ 	crc32   rax, bufptmp  ;; update crc0
+@@ -66,6 +79,8 @@
+ 	crc32   r10, bufptmp  ;; update crc2
+ 	%assign i (i+8)
+  %endrep
+
+%%next %+ %1:
+ 	crc32   rax, bufptmp  ;; update crc0
+ 	crc32   rbx, bufptmp  ;; update crc1
+ ; SKIP  ;crc32  r10, bufptmp  ;; update crc2
+@@ -180,12 +195,15 @@
+ %define crc_init_dw     r8d
+ %endif
+ 
+-
+	endbranch
+ 	push    rdi
+ 	push    rbx
+ 
+ 	mov     rax, crc_init           ;; rax = crc_init;
+ 
+	cmp	len, 8
+	jb	less_than_8
+
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
--- a/ceph/0002-src-common-CMakeLists.txt.patch
+++ b/ceph/0002-src-common-CMakeLists.txt.patch
@ -0,0 +1,13 @@
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 65ba10b0f1..eeedc29c37 100644
+--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
+@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
+     crc32c_aarch64.c)
+ endif(HAVE_INTEL)
+ 
+-add_library(crc32 ${crc32_srcs})
+add_library(crc32 STATIC ${crc32_srcs})
+ if(HAVE_ARMV8_CRC)
+   set_target_properties(crc32 PROPERTIES
+     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
--- a/ceph/0003-src-common-bitstr.h.patch
+++ b/ceph/0003-src-common-bitstr.h.patch
@ -0,0 +1,21 @@
+--- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
+++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
+@@ -17,6 +17,7 @@
+ #include <cstdint>
+ #include <iosfwd>
+ #include <functional>
+#include <ostream>
+ 
+ namespace ceph {
+   class Formatter;
+--- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
+++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
+@@ -16,6 +16,8 @@
+ #define CEPH_GLOBAL_SIGNAL_HANDLER_H
+
+ #include <signal.h>
+#include <string>
+
+ #include "acconfig.h"
+
+ typedef void (*signal_handler_t)(int);
--- a/ceph/0006-src-blk-CMakeLists.txt.patch
+++ b/ceph/0006-src-blk-CMakeLists.txt.patch
@ -0,0 +1,11 @@
+--- ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt.orig	2021-02-01 08:16:26.719517641 -0500
+++ ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt	2021-02-01 08:16:47.810092341 -0500
+@@ -25,7 +25,7 @@
+     zoned/HMSMRDevice.cc)
+ endif()
+ 
+-add_library(blk ${libblk_srcs})
+add_library(blk STATIC ${libblk_srcs})
+ target_include_directories(blk PRIVATE "./")
+ 
+ if(HAVE_LIBAIO)
--- a/ceph/0007-src-test-neorados-CMakeLists.txt.patch
+++ b/ceph/0007-src-test-neorados-CMakeLists.txt.patch
@ -0,0 +1,11 @@
+--- ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt.orig	2021-02-01 08:25:18.006965821 -0500
+++ ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt	2021-02-01 08:25:34.244407147 -0500
+@@ -19,7 +19,7 @@
+ target_link_libraries(ceph_test_neorados_op_speed
+   libneorados fmt::fmt ${unittest_libs})
+ 
+-add_library(neoradostest-support common_tests.cc)
+add_library(neoradostest-support STATIC common_tests.cc)
+ target_link_libraries(neoradostest-support
+   libneorados fmt::fmt)
+ 
--- a/ceph/0008-cmake-modules-Finduring.cmake.patch
+++ b/ceph/0008-cmake-modules-Finduring.cmake.patch
@ -0,0 +1,11 @@
+--- ceph-16.1.0-43-g6b74fb5c/cmake/modules/Finduring.cmake.orig	2021-02-01 08:45:39.316108287 -0500
+++ ceph-16.1.0-43-g6b74fb5c/cmake/modules/Finduring.cmake	2021-02-01 08:45:59.813665378 -0500
+@@ -5,7 +5,7 @@
+ # uring_FOUND - True if uring found.
+ 
+ find_path(URING_INCLUDE_DIR liburing.h)
+-find_library(URING_LIBRARIES liburing.a liburing)
+find_library(URING_LIBRARIES liburing.so liburing)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIR)
--- a/ceph/0009-librgw-notifications-initialize-kafka-and-amqp.patch
+++ b/ceph/0009-librgw-notifications-initialize-kafka-and-amqp.patch
@ -0,0 +1,63 @@
+From 178f6bdac97b57300bbe0956633cf686a7e3ccee Mon Sep 17 00:00:00 2001
+From: Yuval Lifshitz <ylifshit@redhat.com>
+Date: Fri, 12 Mar 2021 08:56:45 +0200
+Subject: [PATCH] librgw/notifications: initialize kafka and amqp
+
+Fixes: https://tracker.ceph.com/issues/49738
+
+Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
+---
+ src/rgw/librgw.cc | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
+index 012cc54c3b..a5351dbe7c 100644
+--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
+@@ -53,6 +53,12 @@
+ #include "rgw_http_client.h"
+ #include "rgw_http_client_curl.h"
+ #include "rgw_perf_counters.h"
+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
+#include "rgw_amqp.h"
+#endif
+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
+#include "rgw_kafka.h"
+#endif
+ 
+ #include "services/svc_zone.h"
+ 
+@@ -617,6 +623,17 @@ namespace rgw {
+       /* ignore error */
+     }
+ 
+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
+    if (!rgw::amqp::init(cct.get())) {
+      derr << "ERROR: failed to initialize AMQP manager" << dendl;
+    }
+#endif
+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
+    if (!rgw::kafka::init(cct.get())) {
+      derr << "ERROR: failed to initialize Kafka manager" << dendl;
+    }
+#endif
+
+     return 0;
+   } /* RGWLib::init() */
+ 
+@@ -645,6 +662,12 @@ namespace rgw {
+     rgw_shutdown_resolver();
+     rgw_http_client_cleanup();
+     rgw::curl::cleanup_curl();
+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
+    rgw::amqp::shutdown();
+#endif
+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
+    rgw::kafka::shutdown();
+#endif
+ 
+     rgw_perf_stop(g_ceph_context);
+ 
+-- 
+2.26.2
+
--- a/ceph/0011-src-test-rgw-amqp_mock.cc.patch
+++ b/ceph/0011-src-test-rgw-amqp_mock.cc.patch
@ -0,0 +1,23 @@
+--- a/src/test/rgw/amqp_mock.cc
+++ b/src/test/rgw/amqp_mock.cc
+@@ -291,7 +291,11 @@ amqp_confirm_select_ok_t* amqp_confirm_select(amqp_connection_state_t state, amq
+   return state->confirm;
+ }
+ 
+-int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *decoded_frame, struct timeval* tv) {
+extern "C" {
+
+int amqp_simple_wait_frame_noblock(amqp_connection_state_t state,
+                                   amqp_frame_t *decoded_frame,
+                                   const struct timeval* tv) {
+   if (state->socket && state->socket->open_called &&
+       state->login_called && state->channel1 && state->channel2 && state->exchange &&
+       state->queue && state->consume && state->confirm && !FAIL_NEXT_READ) {
+@@ -345,6 +349,7 @@ int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *
+   }
+   return AMQP_STATUS_CONNECTION_CLOSED;
+ }
+} // extern "C"
+ 
+ amqp_basic_consume_ok_t* amqp_basic_consume(
+     amqp_connection_state_t state, amqp_channel_t channel, amqp_bytes_t queue,
--- a/ceph/0012-src-compressor-snappy-SnappyCompressor.h.patch
+++ b/ceph/0012-src-compressor-snappy-SnappyCompressor.h.patch
@ -0,0 +1,11 @@
+--- ceph-16.2.4/src/compressor/snappy/SnappyCompressor.h.orig	2021-05-26 08:30:26.205447315 -0400
+++ ceph-16.2.4/src/compressor/snappy/SnappyCompressor.h	2021-05-26 08:31:22.570443033 -0400
+@@ -97,7 +97,7 @@
+     if (qat_enabled)
+       return qat_accel.decompress(p, compressed_len, dst, compressor_message);
+ #endif
+-    snappy::uint32 res_len = 0;
+    std::uint32_t res_len = 0;
+     BufferlistSource source_1(p, compressed_len);
+     if (!snappy::GetUncompressedLength(&source_1, &res_len)) {
+       return -1;
--- a/ceph/0013-src-common-Formatter.cc.patch
+++ b/ceph/0013-src-common-Formatter.cc.patch
@ -0,0 +1,10 @@
+--- ceph-16.2.4/src/common/Formatter.cc.orig	2021-07-07 09:32:25.513818420 -0400
+++ ceph-16.2.4/src/common/Formatter.cc	2021-07-07 09:44:42.007373294 -0400
+@@ -21,6 +21,7 @@
+ #include <fmt/format.h>
+ #include <set>
+ #include <limits>
+#include <algorithm>
+ 
+ // -----------------------
+ namespace ceph {
--- a/ceph/0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch
+++ b/ceph/0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch
@ -0,0 +1,13 @@
+diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h
+index 257daa9c1fe..90e64f98a25 100644
+--- a/src/rgw/rgw_string.h
+++ b/src/rgw/rgw_string.h
+@@ -8,6 +8,8 @@
+ #include <stdlib.h>
+ #include <limits.h>
+ #include <string_view>
+#include <string>
+#include <stdexcept>
+ 
+ #include <boost/container/small_vector.hpp>
+ 
--- a/ceph/0015-src-kv-rocksdb_cache.patch
+++ b/ceph/0015-src-kv-rocksdb_cache.patch
@ -0,0 +1,296 @@
+diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc
+index 0d657883e92de..47c56e2ddd769 100644
+--- a/src/kv/rocksdb_cache/BinnedLRUCache.cc
+++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc
+@@ -151,13 +151,20 @@ void BinnedLRUCacheShard::EraseUnRefEntries() {
+   }
+ }
+ 
+-void BinnedLRUCacheShard::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+-                                           bool thread_safe) {
+void BinnedLRUCacheShard::ApplyToAllCacheEntries(
+  const std::function<void(const rocksdb::Slice& key,
+                           void* value,
+                           size_t charge,
+                           DeleterFn)>& callback,
+  bool thread_safe)
+{
+   if (thread_safe) {
+     mutex_.lock();
+   }
+   table_.ApplyToAllCacheEntries(
+-      [callback](BinnedLRUHandle* h) { callback(h->value, h->charge); });
+    [callback](BinnedLRUHandle* h) {
+      callback(h->key(), h->value, h->charge, h->deleter);
+    });
+   if (thread_safe) {
+     mutex_.unlock();
+   }
+@@ -345,7 +352,7 @@ bool BinnedLRUCacheShard::Release(rocksdb::Cache::Handle* handle, bool force_era
+ 
+ rocksdb::Status BinnedLRUCacheShard::Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+                              size_t charge,
+-                             void (*deleter)(const rocksdb::Slice& key, void* value),
+                             DeleterFn deleter,
+                              rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) {
+   auto e = new BinnedLRUHandle();
+   rocksdb::Status s;
+@@ -464,6 +471,12 @@ std::string BinnedLRUCacheShard::GetPrintableOptions() const {
+   return std::string(buffer);
+ }
+ 
+DeleterFn BinnedLRUCacheShard::GetDeleter(rocksdb::Cache::Handle* h) const
+{
+  auto* handle = reinterpret_cast<BinnedLRUHandle*>(h);
+  return handle->deleter;
+}
+
+ BinnedLRUCache::BinnedLRUCache(CephContext *c, 
+                                size_t capacity, 
+                                int num_shard_bits,
+@@ -519,6 +532,13 @@ void BinnedLRUCache::DisownData() {
+ #endif  // !__SANITIZE_ADDRESS__
+ }
+ 
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+DeleterFn BinnedLRUCache::GetDeleter(Handle* handle) const
+{
+  return reinterpret_cast<const BinnedLRUHandle*>(handle)->deleter;
+}
+#endif
+
+ size_t BinnedLRUCache::TEST_GetLRUSize() {
+   size_t lru_size_of_all_shards = 0;
+   for (int i = 0; i < num_shards_; i++) {
+diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h
+index 85608be0e5734..88bf4502e8927 100644
+--- a/src/kv/rocksdb_cache/BinnedLRUCache.h
+++ b/src/kv/rocksdb_cache/BinnedLRUCache.h
+@@ -56,7 +56,7 @@ std::shared_ptr<rocksdb::Cache> NewBinnedLRUCache(
+ 
+ struct BinnedLRUHandle {
+   void* value;
+-  void (*deleter)(const rocksdb::Slice&, void* value);
+  DeleterFn deleter;
+   BinnedLRUHandle* next_hash;
+   BinnedLRUHandle* next;
+   BinnedLRUHandle* prev;
+@@ -189,7 +189,7 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
+   // Like Cache methods, but with an extra "hash" parameter.
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+                         size_t charge,
+-                        void (*deleter)(const rocksdb::Slice& key, void* value),
+                        DeleterFn deleter,
+                         rocksdb::Cache::Handle** handle,
+                         rocksdb::Cache::Priority priority) override;
+   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) override;
+@@ -205,13 +205,19 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
+   virtual size_t GetUsage() const override;
+   virtual size_t GetPinnedUsage() const override;
+ 
+-  virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+-                                      bool thread_safe) override;
+  virtual void ApplyToAllCacheEntries(
+    const std::function<void(const rocksdb::Slice& key,
+                             void* value,
+                             size_t charge,
+                             DeleterFn)>& callback,
+    bool thread_safe) override;
+ 
+   virtual void EraseUnRefEntries() override;
+ 
+   virtual std::string GetPrintableOptions() const override;
+ 
+  virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const override;
+
+   void TEST_GetLRUList(BinnedLRUHandle** lru, BinnedLRUHandle** lru_low_pri);
+ 
+   //  Retrieves number of elements in LRU, for unit test purpose only
+@@ -304,7 +310,9 @@ class BinnedLRUCache : public ShardedCache {
+   virtual size_t GetCharge(Handle* handle) const override;
+   virtual uint32_t GetHash(Handle* handle) const override;
+   virtual void DisownData() override;
+-
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+  virtual DeleterFn GetDeleter(Handle* handle) const override;
+#endif
+   //  Retrieves number of elements in LRU, for unit test purpose only
+   size_t TEST_GetLRUSize();
+   // Sets the high pri pool ratio
+diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
+index 367140a94d8be..6cbd89ad6472c 100644
+--- a/src/kv/rocksdb_cache/ShardedCache.cc
+++ b/src/kv/rocksdb_cache/ShardedCache.cc
+@@ -44,7 +44,7 @@ void ShardedCache::SetStrictCapacityLimit(bool strict_capacity_limit) {
+ }
+ 
+ rocksdb::Status ShardedCache::Insert(const rocksdb::Slice& key, void* value, size_t charge,
+-                            void (*deleter)(const rocksdb::Slice& key, void* value),
+                            DeleterFn deleter,
+                             rocksdb::Cache::Handle** handle, Priority priority) {
+   uint32_t hash = HashSlice(key);
+   return GetShard(Shard(hash))
+@@ -109,13 +109,36 @@ size_t ShardedCache::GetPinnedUsage() const {
+   return usage;
+ }
+ 
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+DeleterFn ShardedCache::GetDeleter(Handle* handle) const
+{
+  uint32_t hash = GetHash(handle);
+  return GetShard(Shard(hash))->GetDeleter(handle);
+}
+
+void ShardedCache::ApplyToAllEntries(
+    const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
+                             DeleterFn deleter)>& callback,
+    const ApplyToAllEntriesOptions& opts)
+{
+  int num_shards = 1 << num_shard_bits_;
+  for (int s = 0; s < num_shards; s++) {
+    GetShard(s)->ApplyToAllCacheEntries(callback, true /* thread_safe */);
+  }
+}
+#else
+ void ShardedCache::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+                                           bool thread_safe) {
+   int num_shards = 1 << num_shard_bits_;
+   for (int s = 0; s < num_shards; s++) {
+-    GetShard(s)->ApplyToAllCacheEntries(callback, thread_safe);
+    GetShard(s)->ApplyToAllCacheEntries(
+      [callback](const rocksdb::Slice&, void* value, size_t charge, DeleterFn) {
+        callback(value, charge);
+      },
+      thread_safe);
+   }
+ }
+#endif
+ 
+ void ShardedCache::EraseUnRefEntries() {
+   int num_shards = 1 << num_shard_bits_;
+@@ -131,7 +154,7 @@ std::string ShardedCache::GetPrintableOptions() const {
+   char buffer[kBufferSize];
+   {
+     std::lock_guard<std::mutex> l(capacity_mutex_);
+-    snprintf(buffer, kBufferSize, "    capacity : %" ROCKSDB_PRIszt "\n",
+    snprintf(buffer, kBufferSize, "    capacity : %zu\n",
+              capacity_);
+     ret.append(buffer);
+     snprintf(buffer, kBufferSize, "    num_shard_bits : %d\n", num_shard_bits_);
+diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
+index 4d64893ab1c7b..f98421a09a33a 100644
+--- a/src/kv/rocksdb_cache/ShardedCache.h
+++ b/src/kv/rocksdb_cache/ShardedCache.h
+@@ -14,6 +14,7 @@
+ #include <string>
+ #include <mutex>
+ 
+#include "rocksdb/version.h"
+ #include "rocksdb/cache.h"
+ #include "include/ceph_hash.h"
+ #include "common/PriorityCache.h"
+@@ -22,10 +23,11 @@
+ #ifndef CACHE_LINE_SIZE
+ #define CACHE_LINE_SIZE 64 // XXX arch-specific define 
+ #endif
+-#define ROCKSDB_PRIszt "zu"
+ 
+ namespace rocksdb_cache {
+ 
+using DeleterFn = void (*)(const rocksdb::Slice& key, void* value);
+
+ // Single cache shard interface.
+ class CacheShard {
+  public:
+@@ -34,7 +36,7 @@ class CacheShard {
+ 
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+                                  size_t charge,
+-                                 void (*deleter)(const rocksdb::Slice& key, void* value),
+                                 DeleterFn deleter,
+                                  rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) = 0;
+   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) = 0;
+   virtual bool Ref(rocksdb::Cache::Handle* handle) = 0;
+@@ -44,10 +46,15 @@ class CacheShard {
+   virtual void SetStrictCapacityLimit(bool strict_capacity_limit) = 0;
+   virtual size_t GetUsage() const = 0;
+   virtual size_t GetPinnedUsage() const = 0;
+-  virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+-                                      bool thread_safe) = 0;
+  virtual void ApplyToAllCacheEntries(
+    const std::function<void(const rocksdb::Slice& key,
+                             void* value,
+                             size_t charge,
+                             DeleterFn)>& callback,
+    bool thread_safe) = 0;
+   virtual void EraseUnRefEntries() = 0;
+   virtual std::string GetPrintableOptions() const { return ""; }
+  virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const = 0;
+ };
+ 
+ // Generic cache interface which shards cache by hash of keys. 2^num_shard_bits
+@@ -57,34 +64,43 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
+  public:
+   ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit);
+   virtual ~ShardedCache() = default;
+  // rocksdb::Cache
+   virtual const char* Name() const override = 0;
+-  virtual CacheShard* GetShard(int shard) = 0;
+-  virtual const CacheShard* GetShard(int shard) const = 0;
+-  virtual void* Value(Handle* handle) override = 0;
+-  virtual size_t GetCharge(Handle* handle) const = 0;
+-  virtual uint32_t GetHash(Handle* handle) const = 0;
+-  virtual void DisownData() override = 0;
+-
+-  virtual void SetCapacity(size_t capacity) override;
+-  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
+-
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
+-                                 void (*deleter)(const rocksdb::Slice& key, void* value),
+                                 DeleterFn,
+                                  rocksdb::Cache::Handle** handle, Priority priority) override;
+   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
+   virtual bool Ref(rocksdb::Cache::Handle* handle) override;
+   virtual bool Release(rocksdb::Cache::Handle* handle, bool force_erase = false) override;
+  virtual void* Value(Handle* handle) override = 0;
+   virtual void Erase(const rocksdb::Slice& key) override;
+   virtual uint64_t NewId() override;
+-  virtual size_t GetCapacity() const override;
+  virtual void SetCapacity(size_t capacity) override;
+  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
+   virtual bool HasStrictCapacityLimit() const override;
+  virtual size_t GetCapacity() const override;
+   virtual size_t GetUsage() const override;
+   virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
+   virtual size_t GetPinnedUsage() const override;
+  virtual size_t GetCharge(Handle* handle) const = 0;
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+  virtual DeleterFn GetDeleter(Handle* handle) const override;
+#endif
+  virtual void DisownData() override = 0;
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+  virtual void ApplyToAllEntries(
+      const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
+                               DeleterFn deleter)>& callback,
+      const ApplyToAllEntriesOptions& opts) override;
+#else
+   virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+                                       bool thread_safe) override;
+#endif
+   virtual void EraseUnRefEntries() override;
+   virtual std::string GetPrintableOptions() const override;
+  virtual CacheShard* GetShard(int shard) = 0;
+  virtual const CacheShard* GetShard(int shard) const = 0;
+  virtual uint32_t GetHash(Handle* handle) const = 0;
+ 
+   int GetNumShardBits() const { return num_shard_bits_; }
+ 
+@@ -120,7 +136,7 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
+ //    return Hash(s.data(), s.size(), 0);
+   }
+ 
+-  uint32_t Shard(uint32_t hash) {
+  uint32_t Shard(uint32_t hash) const {
+     // Note, hash >> 32 yields hash in gcc, not the zero we expect!
+     return (num_shard_bits_ > 0) ? (hash >> (32 - num_shard_bits_)) : 0;
+   }
--- a/ceph/Pkgfile
+++ b/ceph/Pkgfile
@ -0,0 +1,102 @@
+# Description: Ceph is a distributed object store and file system
+# URL: https://ceph.com/
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: curl libdevmapper libgmp npm
+
+name=ceph
+version=16.2.5
+release=1
+source=(https://download.ceph.com/tarballs/ceph_$version.orig.tar.gz
+	ceph.confd
+	ceph.initd
+
+	0001-src-common-crc32c_intel_fast.patch
+	0002-src-common-CMakeLists.txt.patch
+	0003-src-common-bitstr.h.patch
+	0006-src-blk-CMakeLists.txt.patch
+	0007-src-test-neorados-CMakeLists.txt.patch
+	0008-cmake-modules-Finduring.cmake.patch
+	0009-librgw-notifications-initialize-kafka-and-amqp.patch
+	0011-src-test-rgw-amqp_mock.cc.patch
+	0012-src-compressor-snappy-SnappyCompressor.h.patch
+	0013-src-common-Formatter.cc.patch
+	0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch
+	0015-src-kv-rocksdb_cache.patch)
+
+build() {
+	export NPM_CONFIG_USERCONFIG=$SRC/.npm
+	export NPM_CONFIG_CACHE=$SRC/.npm/cache
+	export GATSBY_TELEMETRY_DISABLED="1"
+
+	export CEPH_BUILD_VIRTUALENV="$name-$version/build"
+
+	[ ! -d "$PKGMK_SOURCE_DIR/yarn_cache" ] && mkdir "$PKGMK_SOURCE_DIR/yarn_cache"
+	export YARN_CACHE_FOLDER="$PKGMK_SOURCE_DIR/yarn_cache"
+	[ ! -d "$PKGMK_SOURCE_DIR/npm_cache" ] && mkdir "$PKGMK_SOURCE_DIR/npm_cache"
+	export npm_config_cache="$PKGMK_SOURCE_DIR/npm_cache"
+	[ ! -d "$PKGMK_SOURCE_DIR/rust" ] && mkdir "$PKGMK_SOURCE_DIR/rust"
+	export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
+
+	for p in *.patch; do
+		patch -d $name-$version -p1 -i $SRC/$p
+	done
+
+	# npm-fsevents-optional.patch
+	pushd $name-$version/src/pybind/mgr/dashboard/frontend
+		npm i fsevents@2.1.3 -f --save-optional
+	popd
+
+	# using system boost
+	rm -r $name-$version/src/boost
+
+	[[ -e $name-$version/usr/bin/ninja ]] && PKGMK_CEPH+=' -G Ninja'
+
+	cmake -S $name-$version -B build $PKGMK_CEPH \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_INSTALL_LIBDIR=/usr/lib \
+		-D CMAKE_INSTALL_LIBEXECDIR=lib/$name \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+		-D WITH_SYSTEM_BOOST=ON \
+		-D WITH_MANPAGE=ON \
+		-D WITH_SYSTEM_NPM=ON \
+		-D WITH_LIBURING=ON \
+		-D WITH_SYSTEM_LIBURING=ON \
+		-D WITH_SYSTEM_ROCKSDB:BOOL=ON \
+		-D WITH_PYTHON3=3 \
+		-D WITH_LTTNG=OFF \
+		-D WITH_RDMA=OFF \
+		-D WITH_SYSTEMD=OFF \
+		-D WITH_SPDK=OFF \
+		-D WITH_BABELTRACE=OFF \
+		-D WITH_RADOSGW_AMQP_ENDPOINT=OFF \
+		-D WITH_TESTS=OFF \
+		-D WITH_REENTRANT_STRSIGNAL:BOOL=ON \
+		-Wno-dev
+
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
+
+	find $PKG -name README.md -exec rm '{}' \+
+
+	# remove the upstream init file
+	rm -f $PKG/etc/init.d/ceph
+
+	rm -r $PKG/usr/share/ceph/mgr/dashboard/frontend/node_modules/.cache
+	rm -r $PKG/usr/share/ceph/mgr/dashboard/frontend/node_modules/.cli-ngcc
+
+	# move mount.* binaries to /sbin
+	install -d $PKG/sbin
+	mv $PKG/usr/sbin/mount.* $PKG/sbin
+
+	install -m 644 -D $name-$version/src/etc-rbdmap $PKG/etc/ceph/rbdmap
+	install -m 644 -D $name-$version/src/logrotate.conf $PKG/etc/logrotate.d/ceph
+	install -m 644 -D $name-$version/etc/sysctl/90-ceph-osd.conf $PKG/etc/sysctl.d/90-ceph-osd.conf
+
+	# udev rules
+	install -m 644 -D $name-$version/udev/50-rbd.rules $PKG/etc/udev/rules.d/50-rbd.rules
+
+	# sudoers.d
+	install -m 600 -D $name-$version/sudoers.d/ceph-osd-smartctl $PKG/etc/sudoers.d/ceph-osd-smartctl
+}
--- a/ceph/ceph.confd
+++ b/ceph/ceph.confd
@ -0,0 +1,17 @@
+# Original source: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-cluster/ceph/files/ceph.confd-r5
+
+# Example
+
+# default ceph conf file
+#ceph_conf="/etc/ceph/ceph.conf"
+
+# Set RADOSGW_WANT_NAME_PARAM=y in order to make the init script add
+# a --name=client.${RC_SVCNAME} parameter to command_args for radosgw.*
+# service instances. This will make the service use a key by the name
+# of client.${RC_SVCNAME} instead of the default client.admin key.
+# A setting like this in the ceph config file can be used to customize
+# the rgw_data and keyring paths used by radosgw instances:
+# [client]
+# rgw_data = /var/lib/ceph/radosgw/$cluster-$id
+# keyring = /var/lib/ceph/radosgw/$cluster-$id/keyring
+RADOSGW_WANT_NAME_PARAM=n
--- a/ceph/ceph.initd
+++ b/ceph/ceph.initd
@ -0,0 +1,118 @@
+#!/sbin/openrc-run
+
+# Original source: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-cluster/ceph/files/ceph.initd-r12
+
+# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
+_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
+if [ -r "${_CONFD_FILE}" ]; then
+	. "${_CONFD_FILE}" || exit 1
+fi
+
+: "${ceph_conf:=/etc/ceph/ceph.conf}"
+daemon_type="${RC_SVCNAME#ceph-}"
+daemon_type="${daemon_type%%.*}"
+daemon_id="${RC_SVCNAME#ceph-*.}"
+daemon_id="${daemon_id:-0}"
+: "${rundir:=/run/ceph}"
+: "${user:=ceph}"
+: "${group:=ceph}"
+: "${rc_ulimit:=-n 1048576 -u 1048576}"
+
+pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
+daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
+
+command="/usr/bin/${RC_SVCNAME%%.*}"
+command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
+extra_commands="${extra_commands} reload"
+command_args_foreground="--foreground"
+
+retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
+start_stop_daemon_args="--user ${user} --group ${group}"
+supervise_daemon_args="--user ${user} --group ${group}"
+
+: "${supervisor:=supervise-daemon}"
+: "${stdout:=/var/log/ceph/ceph}"
+: "${stderr:=/var/log/ceph/ceph}"
+: "${respawn_delay:=10}"
+: "${respawn_max:=5}"
+: "${respawn_period:=1800}"
+
+: "${osd_respawn_delay:=15}"
+: "{osd_respawn_max:=10}"
+
+: "{radosgw_respawn_max:=5}"
+: "${radosgw_respawn_period:=30}"
+
+depend() {
+	use dns logger
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${daemon_type} in
+		mon|mds|osd|mgr|radosgw) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+	local log_dir
+	export CEPH_CONF="${ceph_conf}"
+
+	checkpath -d -q -o "${user}:${group}" "${rundir}"
+
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+
+	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
+		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
+		return 1
+	fi
+
+	if [ -n "${bluestore_osd_fsid}" ]; then
+		einfo "Mounting Bluestore"
+		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
+	fi
+
+	if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
+		command_args="${command_args} --name client.${daemon_id}"
+	fi
+
+	local arg_name arg_val repl_arg_name
+	for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
+		eval arg_val="\${${daemon_type}_${arg_name}}"
+
+		if [ -z "${arg_val}" ]; then
+			eval arg_val="\${${arg_name}}"
+		else
+			eval "${arg_name}=\"${arg_val}\""
+		fi
+
+		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
+			local log_file log_postfix
+			log_postfix=".${daemon_id}-${arg_name}.log"
+			log_file="${arg_val}"
+
+			if [ "${log_file}" != /dev/null ]; then
+				log_file="${log_file}${log_postfix}"
+
+				log_dir="$(dirname "${log_file}")"
+				checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
+			fi
+
+			repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
+			supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
+	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
+	eend ${?}
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
+
--- a/clamav/.signature
+++ b/clamav/.signature
@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3w3RgcOGPrmFJSpV3riiAb4CP7d9PTtnSfTaeMtfJUmbuLSENiSRUBrY/ME5dfxHkSF+3GPWMMAFcPdKDXH5jA8=
-SHA256 (Pkgfile) = 8c9faa1613cceead8e74ccfc499a5f68603feacd9e176b21f3e990564610897e
+RWSagIOpLGJF3yyDF0Su7eRi6Ts4M8Dym2gVAXnxB4lxtobvNYGKV2hs4no9wFj6BuBJliSp8KyiFA65wfMrsOZWiBSmtSNUOAU=
+SHA256 (Pkgfile) = 98cf1947a73d235274cc93db5fe327a6e6e1ffdea5c428e3ea3204c7f3352024
 SHA256 (.footprint) = b375415ebe3958ea171d2362bfbd9194c7206b8f5db7f5ac1d9d5f695a3983f7
-SHA256 (clamav-0.104.0.tar.gz) = a079d64cd55d6184510adfe0f341b2f278f7fb1bcc080d28d374298160f19cb2
+SHA256 (clamav-0.104.1.tar.gz) = b7e6b709ab6c8a8eddb8c32b04c3e5df38adcae459b4ecd9bc1febaca9be57c0
 SHA256 (clamd.conf) = e8a57ed7c3110fdda708f0b3f2fbfc97f944bc5e1987c40a164d864d5570bea5
 SHA256 (freshclam.conf) = 1374ba1986a7320ded85dcf6136741dc9fc8da7316d393ce4b29bac26a8a897e
 SHA256 (clamd) = b5de1447901943ac057b531c0b40e8bf21c4eb0d771fa27d6a6c8835c35ea2a7
--- a/clamav/Pkgfile
+++ b/clamav/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: bzip2 libgmp curl cmake libxml2 libpcre2 json-c

 name=clamav
-version=0.104.0
+version=0.104.1
 release=1
 source=(http://www.clamav.net/downloads/production/$name-$version.tar.gz \
 	clamd.conf freshclam.conf clamd freshclam)
--- a/containerd/.signature
+++ b/containerd/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32XQM5CeDoAvyR9ZMjpLhTrBILCuHrn1uxCVTzYsBQvjdX3vHMzwYsDU/q9RSNfijwZVBe8wgCIGrQL1QyO4sww=
-SHA256 (Pkgfile) = 0a1ac0b6e6d29d6c88d533f734624faf288d949b88ff04b5db3f8551528b84c3
+RWSagIOpLGJF31q0LgcIBcggC4rf0JTfYn1QqsnFbIYHFPOsSmyb7DHELyNyctnfNiycWvYaGtwhr5XzIrG7DPi19ZXxBTFxJgE=
+SHA256 (Pkgfile) = 3524d541da5c5054ca8d9c197a94d7e87905e4e8dc36f3aa79e305de8d560b5f
 SHA256 (.footprint) = fcb21e77eaefae687cbea41bdacbe47a1191c052138040fc15368af8bf7b436c
-SHA256 (containerd-1.5.7.tar.xz) = 10961df7e0b16c59adb8cccb07690b87c9063971e891cfefda1bbb57fb405d3c
+SHA256 (containerd-1.5.8.tar.xz) = b95e17b4309f35e4a9749bd25ac730873d98c8f7fe03556424b730380baa1770
--- a/containerd/Pkgfile
+++ b/containerd/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: go btrfs-progs git libseccomp

 name=containerd
-version=1.5.7
+version=1.5.8
 release=1
 source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.xz)

@ -16,7 +16,7 @@ build() {
    cd $name
    export GOPATH=$SRC
    # use the long commit hash here
-    make GIT_COMMIT=8686ededfc90076914c5238eb96c883ea093a8ba
+    make GIT_COMMIT=1e5ef943eb76627a6d3b6de8cd1ef6537f393a71
    install -d -m 0755 $PKG/usr/bin
    install -m 0755 bin/* $PKG/usr/bin/
 }
--- a/cpuid/.signature
+++ b/cpuid/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33QUkciwgSlYUv/O0ik8fOo0HhAHLITkAwxSufIwNCR3TiHUor25gRAYUicQ6ue2JZklEHBZ/O0RZ7nKSDVWGQs=
-SHA256 (Pkgfile) = 0051dc9f9fe4f3e2831d08783d2fb21de26e39957f5974fd7c7abfeca971b56d
+RWSagIOpLGJF391OYC4ZqAGnHiaaM/KOJMP4ARRXj2q+v68AGl0X0lTG/onSRN6pwgfB26Y1goSf3sXVS69eqq95cK0JjAMJiA8=
+SHA256 (Pkgfile) = 62166efc8a4894e4a2d682d3748b0ed130952b3ca75002f3201cfd26f7dd574a
 SHA256 (.footprint) = f8be86678ea9776a11a0b018e1fe392746f26769391e1841ca0e1610d2622cf6
-SHA256 (cpuid-20201006.src.tar.gz) = 13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6
+SHA256 (cpuid-20211129.src.tar.gz) = 230772bb88c44732e68a42d2eff43bcff46d893bf4ea6e04151d4cb6e8c88e2f
--- a/cpuid/Pkgfile
+++ b/cpuid/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer: Danny Rawlins, crux at romster dot me

 name=cpuid
-version=20201006
+version=20211129
 release=1
 source=(http://www.etallen.com/cpuid/$name-$version.src.tar.gz)

--- a/cuda-fb/.footprint
+++ b/cuda-fb/.footprint
--- a/cuda-fb/.signature
+++ b/cuda-fb/.signature
@ -0,0 +1,37 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF37Q6NuhWkbpbZXU2QsKA61V1Ljj24T0fUjAKTw00jqggiTNnjY/N+YZj52HrVr410HgB6RRSNMqT2Lg8TYZXvwo=
+SHA256 (Pkgfile) = 26344022d0a18efdeb0121c05299d09eb97b8e777b82095b996d1545ee271ee8
+SHA256 (.footprint) = 9c2af621fdc5482717edb10ee769a67d393a35cbacb11b85f9c11d627cc844ea
+SHA256 (cuda_11.5.1_495.29.05_linux.run) = 60bea2fc0fac95574015f865355afbf599422ec2c85554f5f052b292711a4bca
+SHA256 (cuda.sh) = ab92658d9efa337f12da5b093d9a643c031c6067ffc30abd8e87bd7bedecf0c0
+SHA256 (cuda.conf) = a65f7d96e2447eb40b1be9586b90eb0bd776a8938c93d21f9606d2880b548b28
+SHA256 (cuda-fb.revdep) = b4beef4ac94f5fb418127b00cca7b011a6804d4e0d0a581986a5a028486aa349
+SHA256 (cuda-findgllib_mk.diff) = bf0cfaf0462ceb7cd76185a07a97731a9b887b2dc935ae903910bd8aad64c927
+SHA256 (accinj64.pc) = ec3d9bbf49dd9a0a549c6e44c3c2c6878ced2556e617f98c71745722c883586d
+SHA256 (cublas.pc) = 72d18c1cfc6849c89d3046f7573f887bac1e42d0efb862814471151b679d4716
+SHA256 (cuda.pc) = 1566130d367ae7ba253b54d7ab92f29d06053f7482382bee62aa03767d6fbabf
+SHA256 (cudart.pc) = 2fc2a5e27ee97dd1c0b448ff55a7758bd6b40dfc11db65f84368bf03bc5050c8
+SHA256 (cufft.pc) = bf59706874881b10a1e35105a9443096b48de39d536885d598ecc22b7b8fecad
+SHA256 (cufftw.pc) = 6e2f99f04a9c8105c74361ba435557f850e43358eb795785f11b3a0447912ec1
+SHA256 (cuinj64.pc) = 7f426be4770abb0a40c44a4a109d1dd828c1e0908ddf925d0333db51f8792fe1
+SHA256 (curand.pc) = 441a1acff474b7596994d6c84c4a136de150592a14ba542fd2ad8e8a84401cea
+SHA256 (cusolver.pc) = f49389689063f2c230f1bc404ebc12230d1de9bcf9b3e92c8a777f376ca183b4
+SHA256 (cusparse.pc) = 9d3fce3f8ef193b86139bd06e43eab47e397d31b4922e2b6a5f156af8862db49
+SHA256 (nppc.pc) = 2dfe7a9e9e0c2b638734d4decac5625884d0ecef9c5f1593bec9fcf5b9c4cbfd
+SHA256 (nppi.pc) = b189cec5bd997d5f9a77b3fc42bec4763d0b664cb1754fd6af60bd3c4f15bd46
+SHA256 (nppial.pc) = 99efd4f39b8f749dd50b523bc5763ab5891083abf31cc088313734dbb18983dc
+SHA256 (nppicc.pc) = 375502f3909d6537d886d484ec6b2478dd236a1a201e3ff4571033a625cb5ea8
+SHA256 (nppicom.pc) = 9ac2e62b3495b6c6daaff427e2c89561fb22af787b8d27d281d949ec3c2c73b8
+SHA256 (nppidei.pc) = 60f261c07afb2c7ed0b45ffe31a952622670a38feb3181095b0109ac6a194233
+SHA256 (nppif.pc) = 77bcf0799b11e963f97e3d625148450b2452ba679fbb54a2a03d5586955b1953
+SHA256 (nppig.pc) = 1ae3272baf769163a8968aa2687fefe0b57465770b42fe507b0d7268ede038db
+SHA256 (nppim.pc) = 72eaa766d8cf0f8f9316dcc031128f8d1064c9c3426da920d6eacbefccfbdccc
+SHA256 (nppist.pc) = e5b95699dd7e1326b9caa16e907fbf87570984575b487b4bdb8661b9b36c0f22
+SHA256 (nppisu.pc) = d51ac3afa0a2201a033c6938581241f5a9fd0d7fab80e9d91b72ccfef437b6ac
+SHA256 (nppitc.pc) = d65524836abfb506391a3f89b295b4b0b1b590140e603ada7d213dee0df61a00
+SHA256 (npps.pc) = d5dde50bc25a8042837182454af2807f0e6ea33733720584fe32ed18f207ffd5
+SHA256 (nvToolsExt.pc) = 3289161bb91a35bd5ca0e55f8992868f91011885240d47a01c5b83296a69379b
+SHA256 (nvgraph.pc) = 892e9006d9fbee3b0466776cd9db3440f232eab45d75190962b48ca5cb8bc05c
+SHA256 (nvidia-ml.pc) = ab4a9a6c5b911d8f4f0cda08fd73a7a20a65f923eb3c464c64c7da42fd0c57b0
+SHA256 (nvjpeg.pc) = 21c6add24633167f28cbdd8b3ff303e990a4312d9713ddbc489c8a77d6632e73
+SHA256 (nvrtc.pc) = c4c4bbf25f610160651586f8a7f311b9a48ea24cb5dfd97a489aeaf16ba474d3
--- a/cuda-fb/Pkgfile
+++ b/cuda-fb/Pkgfile
@ -0,0 +1,70 @@
+# Description: NVIDIA's GPU programming toolkit (feature branch)
+# URL: https://developer.nvidia.com/cuda-zone
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: nvidia lsb-release
+
+name=cuda-fb
+version=11.5.1
+_driverver=495.29.05
+release=1
+source=(http://developer.download.nvidia.com/compute/cuda/${version}/local_installers/cuda_${version}_${_driverver}_linux.run
+	cuda.sh cuda.conf $name.revdep
+	cuda-findgllib_mk.diff
+	*.pc)
+
+build() {
+	sh cuda_${version}_${_driverver}_linux.run --target "${SRC}" --noexec
+
+	# Fix up samples that use findgllib_mk
+	for f in builds/cuda_samples/*/*/findgllib.mk; do
+		patch $f cuda-findgllib_mk.diff
+	done
+
+	cd builds
+
+	rm -r NVIDIA*.run bin
+	mkdir -p "${PKG}/opt/cuda/extras"
+	mv cuda_samples "${PKG}/opt/cuda/samples"
+	mv integration nsight_compute nsight_systems EULA.txt "${PKG}/opt/cuda"
+	mv cuda_sanitizer_api/compute-sanitizer "${PKG}/opt/cuda/extras/compute-sanitizer"
+	rmdir cuda_sanitizer_api
+	for lib in *; do
+		if [[ "$lib" =~ .*"version.json".* ]]; then
+			continue
+		fi
+		cp -r $lib/* "${PKG}/opt/cuda/"
+	done
+
+	# Delete some unnecessary files
+	rm -r "${PKG}"/opt/cuda/{bin/cuda-uninstaller,samples/bin/cuda-uninstaller}
+
+	# Define compilers for CUDA to use.
+	# This allows us to use older versions of GCC if we have to.
+	ln -s /usr/bin/gcc "${PKG}/opt/cuda/bin/gcc"
+	ln -s /usr/bin/g++ "${PKG}/opt/cuda/bin/g++"
+
+	# Install profile and ld.so.config files
+	install -Dm755 "${SRC}/cuda.sh" "${PKG}/etc/profile.d/cuda.sh"
+	install -Dm644 "${SRC}/cuda.conf" "${PKG}/etc/ld.so.conf.d/cuda.conf"
+
+	# Install pkgconfig files
+	mkdir -p "$PKG"/usr/lib/pkgconfig
+	cp "${SRC}"/*.pc "${PKG}"/usr/lib/pkgconfig
+
+	# Allow newer compilers to work. This is not officially supported in the Arch package but
+	# if users want to try, let them try.
+	# See https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+	# for official requirements
+	sed -i "/.*unsupported GNU version.*/d" "${PKG}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
+	sed -i "/.*unsupported clang version.*/d" "${PKG}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
+
+	# Fix Makefile paths to CUDA
+	for f in $(find "$PKG"/opt/cuda -name Makefile); do
+		sed -i "s|/usr/local/cuda|/opt/cuda|g" "$f"
+	done
+
+	install -d $PKG/etc/revdep.d
+	install -m644 $SRC/$name.revdep $PKG/etc/revdep.d/$name
+
+	find $PKG -iname 'README' -iname 'README.txt' -exec rm '{}' \+
+}
--- a/cuda-fb/accinj64.pc
+++ b/cuda-fb/accinj64.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: accinj64
+Description: OpenACC 64-bit Injection Library
+Version: 11.0
+Libs: -L${libdir} -laccinj64
+Cflags: -I${includedir}
--- a/cuda-fb/cublas.pc
+++ b/cuda-fb/cublas.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cublas
+Description: CUDA BLAS Library
+Version: 11.0
+Libs: -L${libdir} -lcublas
+Cflags: -I${includedir}
--- a/cuda-fb/cuda-fb.revdep
+++ b/cuda-fb/cuda-fb.revdep
@ -0,0 +1,7 @@
+/opt/cuda/lib64
+/opt/cuda/nvvm/lib64
+/opt/cuda/extras/CUPTI/lib64
+/opt/cuda/extras/compute-sanitizer
+/opt/cuda/nsight_compute/host/linux-desktop-glibc_2_11_3-x64
+/opt/cuda/nsight_compute/target/linux-desktop-glibc_2_11_3-x86
+/opt/cuda/nsight_systems/host-linux-x64
--- a/cuda-fb/cuda-findgllib_mk.diff
+++ b/cuda-fb/cuda-findgllib_mk.diff
@ -0,0 +1,22 @@
+--- ./opt/cuda/samples/3_Imaging/bicubicTexture/findgllib.mk	2017-09-28 09:07:30.310563874 +0200
+++ findgllib.mk	2017-09-28 14:40:50.638930881 +0200
+@@ -60,6 +60,7 @@
+     RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel'  >/dev/null 2>&1; echo $$?)
+     CENTOS = $(shell echo $(DISTRO) | grep -i centos       >/dev/null 2>&1; echo $$?)
+     SUSE   = $(shell echo $(DISTRO) | grep -i 'suse\|sles' >/dev/null 2>&1; echo $$?)
+    CRUX = $(shell echo $(DISTRO)   | grep -i crux         >/dev/null 2>&1; echo $$?)
+     ifeq ("$(UBUNTU)","0")
+       ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
+         GLPATH := /usr/arm-linux-gnueabihf/lib
+@@ -100,6 +101,11 @@
+       GLPATH    ?= /usr/lib64/nvidia
+       GLLINK    ?= -L/usr/lib64/nvidia
+       DFLT_PATH ?= /usr/lib64
+    endif
+    ifeq ("$(CRUX)","0")
+      GLPATH    ?= /usr/lib/nvidia
+      GLLINK    ?= -L/usr/lib/nvidia
+      DFLT_PATH ?= /usr/lib
+     endif
+   
+   # find libGL, libGLU, libXi, 
--- a/cuda-fb/cuda.conf
+++ b/cuda-fb/cuda.conf
@ -0,0 +1,3 @@
+/opt/cuda/lib64
+/opt/cuda/nvvm/lib64
+/opt/cuda/extras/CUPTI/lib64
--- a/cuda-fb/cuda.pc
+++ b/cuda-fb/cuda.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cuda
+Description: CUDA Driver Library
+Version: 11.0
+Libs: -L${libdir} -lcuda
+Cflags: -I${includedir}
--- a/cuda-fb/cuda.sh
+++ b/cuda-fb/cuda.sh
@ -0,0 +1,2 @@
+export CUDA_PATH=/opt/cuda
+export PATH=$PATH:/opt/cuda/bin:/opt/cuda/integration/nsight-compute:/opt/cuda/integration/nsight-systems
--- a/cuda-fb/cudart.pc
+++ b/cuda-fb/cudart.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cudart
+Description: CUDA Runtime Library
+Version: 11.0
+Libs: -L${libdir} -lcudart
+Cflags: -I${includedir}
--- a/cuda-fb/cufft.pc
+++ b/cuda-fb/cufft.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cufft
+Description: CUDA Fast Fourier Transform
+Version: 11.0
+Libs: -L${libdir} -lcufft
+Cflags: -I${includedir}
--- a/cuda-fb/cufftw.pc
+++ b/cuda-fb/cufftw.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cufftw
+Description: CUDA Fast Fourier Transform Wide
+Version: 11.0
+Libs: -L${libdir} -lcufftw
+Cflags: -I${includedir}
--- a/cuda-fb/cuinj64.pc
+++ b/cuda-fb/cuinj64.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cuinj64
+Description: CUDA 64-bit Injection Library
+Version: 11.0
+Libs: -L${libdir} -lcuinj64
+Cflags: -I${includedir}
--- a/cuda-fb/curand.pc
+++ b/cuda-fb/curand.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: curand
+Description: CUDA Random Number Generation Library
+Version: 11.0
+Libs: -L${libdir} -lcurand
+Cflags: -I${includedir}
--- a/cuda-fb/cusolver.pc
+++ b/cuda-fb/cusolver.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cusolver
+Description: A LAPACK-like library on dense and sparse linear algebra
+Version: 11.0
+Libs: -L${libdir} -lcusolver
+Cflags: -I${includedir}
--- a/cuda-fb/cusparse.pc
+++ b/cuda-fb/cusparse.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: cusparse
+Description: CUDA Sparse Matrix Library
+Version: 11.0
+Libs: -L${libdir} -lcusparse
+Cflags: -I${includedir}
--- a/cuda-fb/nppc.pc
+++ b/cuda-fb/nppc.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppc
+Description: NVIDIA Performance Primitives - Core
+Version: 11.0
+Libs: -L${libdir} -lnppc
+Cflags: -I${includedir}
--- a/cuda-fb/nppi.pc
+++ b/cuda-fb/nppi.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppi
+Description: NVIDIA Performance Primitives - Image Processing
+Version: 11.0
+Libs: -L${libdir} -lnppi
+Cflags: -I${includedir}
--- a/cuda-fb/nppial.pc
+++ b/cuda-fb/nppial.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppial
+Description: NVIDIA Performance Primitives - Image Processing - Arithmetic and Logic
+Version: 11.0
+Libs: -L${libdir} -lnppial
+Cflags: -I${includedir}
--- a/cuda-fb/nppicc.pc
+++ b/cuda-fb/nppicc.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppicc
+Description: NVIDIA Performance Primitives - Image Processing - Color Conversion
+Version: 11.0
+Libs: -L${libdir} -lnppicc
+Cflags: -I${includedir}
--- a/cuda-fb/nppicom.pc
+++ b/cuda-fb/nppicom.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppicom
+Description: NVIDIA Performance Primitives - Image Processing - Compression
+Version: 11.0
+Libs: -L${libdir} -lnppicom
+Cflags: -I${includedir}
--- a/cuda-fb/nppidei.pc
+++ b/cuda-fb/nppidei.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppidei
+Description: NVIDIA Performance Primitives - Image Processing - DEI
+Version: 11.0
+Libs: -L${libdir} -lnppidei
+Cflags: -I${includedir}
--- a/cuda-fb/nppif.pc
+++ b/cuda-fb/nppif.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppif
+Description: NVIDIA Performance Primitives - Image Processing - Filters
+Version: 11.0
+Libs: -L${libdir} -lnppif
+Cflags: -I${includedir}
--- a/cuda-fb/nppig.pc
+++ b/cuda-fb/nppig.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppig
+Description: NVIDIA Performance Primitives - Image Processing - Geometry
+Version: 11.0
+Libs: -L${libdir} -lnppig
+Cflags: -I${includedir}
--- a/cuda-fb/nppim.pc
+++ b/cuda-fb/nppim.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppim
+Description: NVIDIA Performance Primitives - Image Processing - Morphological
+Version: 11.0
+Libs: -L${libdir} -lnppim
+Cflags: -I${includedir}
--- a/cuda-fb/nppist.pc
+++ b/cuda-fb/nppist.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppist
+Description: NVIDIA Performance Primitives - Image Processing - Statistic and Linear
+Version: 11.0
+Libs: -L${libdir} -lnppist
+Cflags: -I${includedir}
--- a/cuda-fb/nppisu.pc
+++ b/cuda-fb/nppisu.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppisu
+Description: NVIDIA Performance Primitives - Image Processing - Support and Data Exchange
+Version: 11.0
+Libs: -L${libdir} -lnppisu
+Cflags: -I${includedir}
--- a/cuda-fb/nppitc.pc
+++ b/cuda-fb/nppitc.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nppitc
+Description: NVIDIA Performance Primitives - Image Processing - Threshold and Compare
+Version: 11.0
+Libs: -L${libdir} -lnppitc
+Cflags: -I${includedir}
--- a/cuda-fb/npps.pc
+++ b/cuda-fb/npps.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: npps
+Description: NVIDIA Performance Primitives - Signal Processing
+Version: 11.0
+Libs: -L${libdir} -lnpps
+Cflags: -I${includedir}
--- a/cuda-fb/nvToolsExt.pc
+++ b/cuda-fb/nvToolsExt.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nvToolsExt
+Description: NVIDIA Tools Extension
+Version: 11.0
+Libs: -L${libdir} -lnvToolsExt
+Cflags: -I${includedir}
--- a/cuda-fb/nvgraph.pc
+++ b/cuda-fb/nvgraph.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nvgraph
+Description: NVIDIA Accelerated Graph Analytics
+Version: 11.0
+Libs: -L${libdir} -lnvgraph
+Cflags: -I${includedir}
--- a/cuda-fb/nvidia-ml.pc
+++ b/cuda-fb/nvidia-ml.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nvidia-ml
+Description: NVML
+Version: 11.0
+Libs: -L${libdir}/stubs -lnvidia-ml
+Cflags: -I${includedir}
--- a/cuda-fb/nvjpeg.pc
+++ b/cuda-fb/nvjpeg.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nvjpeg
+Description: NVIDIA JPEG Library
+Version: 11.0
+Libs: -L${libdir} -lnvjpeg
+Cflags: -I${includedir}
--- a/cuda-fb/nvrtc.pc
+++ b/cuda-fb/nvrtc.pc
@ -0,0 +1,9 @@
+cudaroot=/opt/cuda
+libdir=${cudaroot}/targets/x86_64-linux/lib
+includedir=${cudaroot}/targets/x86_64-linux/include
+
+Name: nvrtc
+Description: A runtime compilation library for CUDA C++
+Version: 11.0
+Libs: -L${libdir} -lnvrtc
+Cflags: -I${includedir}
--- a/cutemaze/.signature
+++ b/cutemaze/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30MR0pUCU3Bt6bwlrIl5e0O+Pl7dVGlY7Zdg4HoPHRBYYjOap4TZ7LsyoaSh2YZZ1+dGjHUIPZSMVgzSzHLE/gE=
-SHA256 (Pkgfile) = f21de2150ecf1497eab6c20e148db0c98403613e54b3d523ccb0543c5f782055
+RWSagIOpLGJF3159ysMaNGpagME89fk8qPaXCH21hK6b2k9aTQbocicMSMMLaKpkVidV+gEQ6+kAoL8Fd7NwK4SucNGm5zylyA4=
+SHA256 (Pkgfile) = 3cb81b83badd278a0eb4045bd0c5ba856e3141cc96f37f64c9f6b1ccc467ada1
 SHA256 (.footprint) = 8385f8726cd361d1fcdc65f253c9144da0bf7b84c11868991af6ebe17f451f3e
 SHA256 (cutemaze-1.3.0-src.tar.bz2) = 87bf87d84dfb6554a794f6ba203fa5344bc5b54e4f7dd3129418ea06e9a88e85
--- a/cutemaze/Pkgfile
+++ b/cutemaze/Pkgfile
@ -1,7 +1,7 @@
 # Description: Top-down maze game.
 # URL: https://gottcode.org/cutemaze
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: qt6
+# Depends on: qt6-base qt6-svg qt6-tools

 name=cutemaze
 version=1.3.0
--- a/czkawka/.footprint
+++ b/czkawka/.footprint
@ -0,0 +1,3 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/czkawka_cli
--- a/czkawka/.signature
+++ b/czkawka/.signature
@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3zNFaZTJFaFg8llnGzBu8Di5qvNW7LkD3q8OyerRniWbaRWM732t676CGsiDU4+/w/Ci5aZdTi4b4b/yj7TmmAY=
+SHA256 (Pkgfile) = d69ac04a770f6c8499544bb8939ef144719a75e7da4b8aff7132f372b29898e8
+SHA256 (.footprint) = fa6683f786d53a26ba307bdfc2a549abd515a3baac6afd9a4cf5ec148a196bef
+SHA256 (czkawka-3.3.1.tar.gz) = e9ef38ac52e1bd7fd2de14a0b34f105bb5b338a7374d3c529c1725415b4ebe26
--- a/czkawka/Pkgfile
+++ b/czkawka/Pkgfile
@ -0,0 +1,25 @@
+# Description: Multi functional app to find duplicates, empty folders, similar images etc
+# URL: https://github.com/qarmin/czkawka
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Depends on: rust
+# Optional: gtk3
+
+name=czkawka
+version=3.3.1
+release=1
+source=(https://github.com/qarmin/czkawka/archive/$version/$name-$version.tar.gz)
+
+build() {
+  prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
+  mkdir "$PKGMK_SOURCE_DIR/rust" || true
+  export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
+
+  cargo update --manifest-path $name-$version/Cargo.toml
+  cargo build --bin czkawka_cli --release --locked --manifest-path $name-$version/Cargo.toml
+  prt-get isinst gtk3 && cargo build --bin czkawka_gui --release --locked --manifest-path $name-$version/Cargo.toml
+
+  install -Dt $PKG/usr/bin $name-$version/target/release/${name}_cli
+  prt-get isinst gtk3 && install -Dt $PKG/usr/bin $name-$version/target/release/${name}_gui
+  prt-get isinst gtk3 && install -Dm644 $SRC/czkawka-$version/pkgs/com.github.qarmin.czkawka.desktop \
+    $PKG/usr/share/applications/com.github.qarmin.czkawka.desktop || true
+}
--- a/davfs2/.signature
+++ b/davfs2/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33R3dyQa6jEQ/Luk3sPpwurG6SoXiXrcOaxdY5DdidHlJMlg4xDLne+48lcgQA5+faW3Yy7E3r5F1a429/XkCAQ=
-SHA256 (Pkgfile) = 629bb718cee3b8e1e38ea88fb7120e71511810f81a12c68c41abd772e4c96dad
+RWSagIOpLGJF3z2E7AXtlsZPB5CMv7Vzj9PeB2BO0FAaHwinQFaCDzORwsNe64PViqo6vFui+PZv2BLS++pMKPvv/0spTwJI2QI=
+SHA256 (Pkgfile) = a3aae357e374caf277e4078c1d8df3999807c0fa714fa6c8bf64c2f2b96a2351
 SHA256 (.footprint) = e5fe013a18c9862c62f0bdd5d93b944ba45786f1b2e12317e92e02550ef75106
-SHA256 (davfs2-1.6.0.tar.gz) = 2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
+SHA256 (davfs2-1.6.1.tar.gz) = ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0
--- a/davfs2/Pkgfile
+++ b/davfs2/Pkgfile
@ -1,10 +1,10 @@
 # Description: File system driver that allows you to mount a WebDAV folder
-# URL: http://savannah.nongnu.org/projects/davfs2
+# URL: https://savannah.nongnu.org/projects/davfs2
 # Maintainer: Tim Biermann, tbier at posteo dot de
 # Depends on: neon

 name=davfs2
-version=1.6.0
+version=1.6.1
 release=1
 source=(http://mirror.easyname.at/nongnu/$name/$name-$version.tar.gz)

--- a/delta/.signature
+++ b/delta/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yFBIV/tkdecZVHKBGO2TRdKuIUXNL/RwBO/53x6mX9tuYR7/Vb95v0m9PSfU6VgvEeKan+HBSqID/+OucbHJwQ=
-SHA256 (Pkgfile) = 2189f563eab7127e9c880e7311f0cdb29959e269d87cbeb2d77e6e9445f07d9d
+RWSagIOpLGJF38Kse1Mcsfga1ipwRz4d4e2uSqHp3IwgZsTrcOExZh5i+ewSM7njncw1LuDbr2NAzhwaxXB/PMSbvDxhbZaS8gQ=
+SHA256 (Pkgfile) = 74275c4536458a3b4f9549059afce2f68f04b68dd05de808f498a72cd49676ea
 SHA256 (.footprint) = e4db9cceee1c1464b8c8f43b6b2129519b473b85c04c71cd7d667d8960e41396
-SHA256 (delta-0.8.3.tar.gz) = cf48d52d20a12e11a3a6afd436a75550e78fc39c358e85a75caa08b39e4e75c6
+SHA256 (delta-0.11.2.tar.gz) = 7dff2a7cc69277b757c08c7398931cb13372458891f1dd992beb2dae8ee42411
--- a/delta/Pkgfile
+++ b/delta/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: rust

 name=delta
-version=0.8.3
+version=0.11.2
 release=1
 source=(https://github.com/dandavison/delta/archive/$version/$name-$version.tar.gz)

@ -16,13 +16,14 @@ build() {
  cargo update --manifest-path $name-$version/Cargo.toml
  cargo build --release --locked --manifest-path $name-$version/Cargo.toml

-  install -Dt $PKG/usr/bin $name-$version/target/release/$name
-
  # install auto-completion files if the ports for it are installed
+
  prt-get isinst zsh &&
    install -Dm644 $name-$version/etc/completion/completion.zsh \
-      $PKG/usr/share/zsh/site-functions/_delta || true
+      $PKG/usr/share/zsh/site-functions/_delta
  prt-get isinst bash-completion &&
    install -Dm644 $name-$version/etc/completion/completion.bash \
-      $PKG/usr/share/bash-completion/completions/delta || true
+      $PKG/usr/share/bash-completion/completions/delta
+
+  install -Dt $PKG/usr/bin $name-$version/target/release/$name
 }
--- a/diagnostic-languageserver/.signature
+++ b/diagnostic-languageserver/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35WC5vhOeQIXBAyiG2JGNz5sp1K7dvlYzDJbQd73oUKVJ3fqAzxYsN2Z531pb7Y+wqCoHVyrU9Jctx6JoN6dyQM=
-SHA256 (Pkgfile) = 67c3ab82ef108c27919aa6db73ff1f0812cc175de7e543e58af53a725429b64c
+RWSagIOpLGJF35SmyfMzjeEjwFOdX8gnVEIe8NvXZhL/FQo2Kfd0hvLdGnD9DqVBKS3qd0y0e061ZMPjIHzo/74LGD6jOAzCRQ0=
+SHA256 (Pkgfile) = 813486fe9cc88637c617c1df17e5210596f1dd0884dbdc0712cb80bd096351ce
 SHA256 (.footprint) = 265888d1556241bf5893e62773db82c0dd15fe2edf5a43bd6277f3af9d1e29ff
-SHA256 (diagnostic-languageserver-1.11.0.tgz) = 9680a428589cd8d23fe799abe2402e0b697ddf1214da36c3d443a12ff62b32a2
+SHA256 (diagnostic-languageserver-1.13.0.tgz) = 0cd609a52d52cca1bce1cf09af702ea5634bf2ad54e97c7e9324ec258a730a66
--- a/diagnostic-languageserver/Pkgfile
+++ b/diagnostic-languageserver/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: npm yarn

 name=diagnostic-languageserver
-version=1.11.0
+version=1.13.0
 release=1
 source=(https://registry.npmjs.org/$name/-/$name-$version.tgz)

--- a/docker-compose/.footprint
+++ b/docker-compose/.footprint
@ -1,99 +1,3 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/docker-compose
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python3.9/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__init__.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__main__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/__init__.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/__main__.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/const.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/container.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/errors.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/network.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/parallel.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/progress_stream.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/project.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/service.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/timeparse.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/utils.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/version.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/__pycache__/volume.cpython-39.pyc
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/cli/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__init__.py (EMPTY)
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/__init__.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/colors.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/command.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/docker_client.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/docopt_command.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/errors.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/formatter.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/log_printer.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/main.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/signals.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/utils.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/__pycache__/verbose_proxy.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/colors.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/command.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/docker_client.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/docopt_command.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/errors.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/formatter.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/log_printer.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/main.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/signals.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/utils.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/cli/verbose_proxy.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/config/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/__init__.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/config.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/environment.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/errors.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/interpolation.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/serialize.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/sort_services.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/types.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/__pycache__/validation.cpython-39.pyc
-rw-rw-r--	root/root	usr/lib/python3.9/site-packages/compose/config/compose_spec.json
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/config.py
-rw-rw-r--	root/root	usr/lib/python3.9/site-packages/compose/config/config_schema_v1.json
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/environment.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/errors.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/interpolation.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/serialize.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/sort_services.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/types.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/config/validation.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/const.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/container.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/errors.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/metrics/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/metrics/__init__.py (EMPTY)
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/compose/metrics/__pycache__/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/metrics/__pycache__/__init__.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/metrics/__pycache__/client.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/metrics/__pycache__/decorator.cpython-39.pyc
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/metrics/client.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/metrics/decorator.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/network.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/parallel.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/progress_stream.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/project.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/service.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/timeparse.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/utils.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/version.py
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/compose/volume.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/PKG-INFO
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/SOURCES.txt
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/dependency_links.txt
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/entry_points.txt
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/requires.txt
-rw-r--r--	root/root	usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/top_level.txt
--- a/docker-compose/.signature
+++ b/docker-compose/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/tWLJBZf13Ncm22cVrnwDFnErBNjyg2ry9aEsobOHiB9mbwnMni5s4ZjvqJbA2e5WXUJv6p61UWcUPpQd2BfAc=
-SHA256 (Pkgfile) = 47cf3e48181fb24d7debaf5d8335c853e7bf6e56adca5c4f4eb55601fbebaf56
-SHA256 (.footprint) = 5c2124fca93b43748ded86fe097336505f142635b8e78acd24b7320f58560582
-SHA256 (docker-compose-1.29.2.tar.gz) = 99a9b91d476062d280c889ae4e9993d7dd6a186327bafb2bb39521f9351b96eb
+RWSagIOpLGJF3yXgnnE73sq7MUjvXSIO8B3+lqIRVAE8Fq/7IQjfD4dDSjls2zcOMgpKBv2lJvb4YMODskld6LUWMwRNPHz/6Qw=
+SHA256 (Pkgfile) = 39b5b6fed4e33b2a246b9048e6da910f1c63f5696914736ed2e421f72e873b98
+SHA256 (.footprint) = 7154d1f66d9f29102103d3d93b9968c5c01ab4baa58ef7acec084fab6b6c2cb9
+SHA256 (docker-compose-2.2.1.tar.gz) = 439dd5b7244b63d162e7a06e9ad84d63f9d7f357fae00582247ed0a41da7e35e
--- a/docker-compose/Pkgfile
+++ b/docker-compose/Pkgfile
@ -1,15 +1,18 @@
 # Description: Compose is a tool for defining and running multi-container Docker applications
 # URL: https://docs.docker.com/compose/
 # Maintainer: Matt Housh, jaeger at crux dot ninja
-# Depends on: python3-jsonschema python3-six python3-dockerpty python3-docker python3-websocket-client python3-texttable python3-requests python3-yaml python3-docopt python3-cached-property python3-importlib_metadata python3-pyrsistent python3-attrs python3-paramiko python3-zipp python3-pynacl python3-bcrypt python3-distro python3-dotenv
+# Depends on: go

 name=docker-compose
-version=1.29.2
+version=2.2.1
 release=1
-source=(https://github.com/docker/compose/archive/$version/$name-$version.tar.gz)
+source=(https://github.com/docker/compose/archive/v$version/$name-$version.tar.gz)

 build() {
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CXXFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
 	cd compose-$version
-	python3 setup.py build
-	python3 setup.py install --root=$PKG
+	go build -trimpath -o ${name} ./cmd
+	install -Dm0755 ${name} ${PKG}/usr/bin/${name}
 }
--- a/docker/.signature
+++ b/docker/.signature
@ -1,10 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37+khNXOIzDpcHyun2DR+J3E6jrBsySdPWgYUjTEnl7G+7IaPUGHzogcPWZAvPaSCdOp1unii76aW+8uMGrUfA0=
-SHA256 (Pkgfile) = f21f8b6d4d7bc8709a3b5f2c1e26aef397bde9618dbe65682de64fb595ff9b69
+RWSagIOpLGJF32Xfe/uhhq7xXAHg/Yzv3a5nSrm8iV1W5eMZIB569knXxf+RL2mdZkBdFfuSDNoC3bPFLyFr1lG0esHnYpsAJAY=
+SHA256 (Pkgfile) = 53d6ab553abd1025fc226ea779e87561bbee529e1af2d2dc96c171a7ac9a86c6
 SHA256 (.footprint) = ef891bf504df63f9b4413ecccd3a0ce6e4a71b1a42f22e9bb9c36a6a87a2c3fe
-SHA256 (moby-20.10.9.tar.gz) = 359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a
-SHA256 (cli-20.10.9.tar.gz) = d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba
-SHA256 (docker-man-pages-20.10.9.tar.xz) = d825d4785f3798de07b68865b1a4678eabaab262e9659412280df3020c7c3589
+SHA256 (moby-20.10.11.tar.gz) = 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495
+SHA256 (cli-20.10.11.tar.gz) = 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7
+SHA256 (docker-man-pages-20.10.11.tar.xz) = aa446802763d1ae3f5164bf96e4be75dc6d147c0a80a5e91235b108b953bebd2
 SHA256 (libnetwork-64b7a45.tar.xz) = 651e377825e8c0652678c10d7b8df10ab6adba8a43bf7fecce08203f7b0ed059
 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c
 SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@ -6,7 +6,7 @@
 # LIBNETWORK_COMMIT:=64b7a4574d1426139437d20e81c0b6d391130ec8

 name=docker
-version=20.10.9
+version=20.10.11
 release=1
 source=(https://github.com/moby/moby/archive/v${version}/moby-${version}.tar.gz \
    https://github.com/docker/cli/archive/v${version}/cli-${version}.tar.gz \
@ -17,7 +17,7 @@ source=(https://github.com/moby/moby/archive/v${version}/moby-${version}.tar.gz
 build() {
    export GO111MODULE=auto
    export GOPATH=$SRC
-    export DOCKER_GITCOMMIT=75249d8
+    export DOCKER_GITCOMMIT=847da18
    export DOCKER_BUILDTAGS='seccomp'
    export DISABLE_WARN_OUTSIDE_CONTAINER=1

--- a/dos2unix/.footprint
+++ b/dos2unix/.footprint
@ -1,13 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
-rwxr-xr-x	root/root	usr/bin/dos2unix
-lrwxrwxrwx	root/root	usr/bin/mac2unix -> dos2unix
-rwxr-xr-x	root/root	usr/bin/unix2dos
-lrwxrwxrwx	root/root	usr/bin/unix2mac -> unix2dos
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
-rw-r--r--	root/root	usr/share/man/man1/dos2unix.1.gz
-lrwxrwxrwx	root/root	usr/share/man/man1/mac2unix.1.gz -> dos2unix.1.gz
-lrwxrwxrwx	root/root	usr/share/man/man1/unix2dos.1.gz -> dos2unix.1.gz
-lrwxrwxrwx	root/root	usr/share/man/man1/unix2mac.1.gz -> dos2unix.1.gz
--- a/dos2unix/.signature
+++ b/dos2unix/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/vYQ+7tAp7iBOeVd3XrRr55BD4F6ZCHoXfsti++swgz2y7rdQkvHfcouKKuXoP57obQSacply+++NpuO69dHgw=
-SHA256 (Pkgfile) = 7634fd6dca81057dd6cb0b51e31a0e30313bf2de0489052ca9151d54ef1776b2
-SHA256 (.footprint) = 624ae5623dcfc7cfd7f465b5a2c9c344fba2bc9a71d13724199ece3975cfe8f2
-SHA256 (dos2unix-7.4.2.tar.gz) = 6035c58df6ea2832e868b599dfa0d60ad41ca3ecc8aa27822c4b7a9789d3ae01
--- a/dos2unix/Pkgfile
+++ b/dos2unix/Pkgfile
@ -1,15 +0,0 @@
-# Description: Dos2unix converts DOS or MAC text files to UNIX format
-# URL:         http://dos2unix.sourceforge.net
-# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-
-name=dos2unix
-version=7.4.2
-release=1
-source=(http://www.xs4all.nl/~waterlan/$name/$name-$version.tar.gz)
-
-build() {
-	cd $name-$version
-	make ENABLE_NLS= CFLAGS="$CFLAGS"
-	make ENABLE_NLS= DESTDIR=$PKG install-bin install-man
-}
-
--- a/dtach/.signature
+++ b/dtach/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31PmGC1w0UJLVjC0c1CtUAQ9kT7Bcrl71IDO7DjPRto6qBhFW16kVmQSTPAt1o7goyd/Wepgo45LBoxf76TOSQI=
-SHA256 (Pkgfile) = 3d09a84806260fbe075a510d7ddd0463b116ce59033c05533efccfc49449d5b4
+RWSagIOpLGJF358HSR+fRL51eP6F/l3eKiFskyjvRVL1/I6LmEjM4QnEIFHOwy67FLbQyJP0whgY1yjpwbX6NMx51ERCcZk7jwA=
+SHA256 (Pkgfile) = 936d7247a2655cad8bea4f112cdd8b402c56d9cb5f5c7062f7a11465e26b513b
 SHA256 (.footprint) = 12dd84eecfdce7dfc9fb7d046cebe6d703158aa054310a21b0825bf8afbaff32
-SHA256 (v0.9.tar.gz) = 5f7e8c835ee49a9e6dcf89f4e8ccbe724b061c0fc8565b504dd8b3e67ab79f82
+SHA256 (dtach-0.9.tar.gz) = 39ec9f8cd95d497caab81b934f85ef090611dedc9e315cde8d01f6324e36565a
--- a/dtach/Pkgfile
+++ b/dtach/Pkgfile
@ -4,11 +4,12 @@

 name=dtach
 version=0.9
-release=2
-source=(https://github.com/crigler/${name}/archive/v${version}.tar.gz)
+gitver=7acac922770597f5da5df7b290078770d20dac32
+release=3
+source=(https://github.com/crigler/${name}/archive/${gitver}/${name}-${version}.tar.gz)

 build() {
-   cd ${name}-${version}
+   cd ${name}-${gitver}

   ./configure

--- a/dua-cli/.signature
+++ b/dua-cli/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3whecHpo/VXJtju+N7rQo0+dFryamha2K+Azru6sItkspM/+4Zmk4y//7EvD8VAa0XzbS6Iaa/DLGnKmMdtl9wY=
-SHA256 (Pkgfile) = 5208dd3ce24e75e0d76c2f8cd04588516945aed8a61fd0c898486b156c13e700
+RWSagIOpLGJF391CumE12txo8gRqe64IXHPtQ9GjpuFYfVz9Mhex+p2CmisHfVCSqPkggHTd4vNkt+/RaSemAYVsnE/DIPGpbgU=
+SHA256 (Pkgfile) = 2929b14c4a6af41f9b14ff73f28bb3ee19d2dc209cffa38f381326bcf2bb656a
 SHA256 (.footprint) = 43495e19ba0c91be14d647b01c80d7b85a829206d275de5b35348405941aa05c
-SHA256 (dua-cli-2.14.7.tar.gz) = a7fe7710e2191ea41a77861fc8e0fccf24ef4b597c5531ffa189b17f6801dc9b
+SHA256 (dua-cli-2.14.11.tar.gz) = 31c95fc4e9e034f9ba892397dc3d3844635c6b03852983fcf3b0cc326b751c83
--- a/dua-cli/Pkgfile
+++ b/dua-cli/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: rust

 name=dua-cli
-version=2.14.7
+version=2.14.11
 release=1
 source=(https://github.com/Byron/dua-cli/archive/v$version/$name-$version.tar.gz)

--- a/dunst/.signature
+++ b/dunst/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34mwzWbQ2Kn00MvTyPjuhlOHt3cAPHDO6GzO7Ue0JL+yBsMDPqKZlUW5XxBwmzwjmpAkLiCjj4ZpCEfMH9SiywU=
-SHA256 (Pkgfile) = 7e956ee5e0d957fec01e3dad79da4d9712b9d0d687ddb163db07a1fd954b7eed
+RWSagIOpLGJF345KIcg3LyVklqzcLW5V27ExkiwyiqXgUa/PjsnNrDP2rT6Pv7NxbaCTuiV++opbPULGo0yKfEQXPZfdzmpbnww=
+SHA256 (Pkgfile) = 6d301628eadf3abecf438cb2bfe439b53db67d58758d25c6d68e02d4054126e3
 SHA256 (.footprint) = 103e94b9a75fb6883c283fcee27040e1f7676adbfdf8bb6c57f3e0692c6305a8
-SHA256 (dunst-1.6.1.tar.gz) = cc7d801575f75e92b18d46ee5d3df80aaf331c88b83ec6caabbecf8636310e13
+SHA256 (dunst-1.7.3.tar.gz) = 150c782690286e163663b0eb2605b733927240159738b8365808b851e0afbbee
--- a/dunst/Pkgfile
+++ b/dunst/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: dbus gdk-pixbuf pango xorg-libxinerama xorg-libxrandr xorg-libxscrnsaver libnotify

 name=dunst
-version=1.6.1
+version=1.7.3
 release=1
 source=(https://github.com/dunst-project/$name/archive/v$version/$name-$version.tar.gz)

@ -12,5 +12,5 @@ build() {
 	export WAYLAND=0
 	cd $name-$version
 	make
-	make PREFIX=/usr DESTDIR=$PKG install
+	make PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$PKG install
 }
--- a/dvtm/.footprint
+++ b/dvtm/.footprint
@ -1,8 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
-rwxr-xr-x	root/root	usr/bin/dvtm
-rwxr-xr-x	root/root	usr/bin/dvtm-status
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
-rw-r--r--	root/root	usr/share/man/man1/dvtm.1.gz
--- a/dvtm/.signature
+++ b/dvtm/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39gJw2WHNuT1q1KhtmZYAUh5OjdosD62Y7s6jOOv6WrL2blDDlWKuauyXakfhQYnvJw9wPjD4ZJUtgc8TU4Iiw4=
-SHA256 (Pkgfile) = 4a76e00df75de0b5a6145ca9c48077aab453432519846fba115f3fac83dc0791
-SHA256 (.footprint) = 5844e2099c90a39108885338f2e5aea59133601e10503ad7b7f171b9f83145de
-SHA256 (dvtm-0.15.tar.gz) = 8f2015c05e2ad82f12ae4cf12b363d34f527a4bbc8c369667f239e4542e1e510
--- a/dvtm/Pkgfile
+++ b/dvtm/Pkgfile
@ -1,23 +0,0 @@
-# Description: dynamic virtual terminal manager
-# URL:         http://www.brain-dump.org/projects/dvtm
-# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-# Depends on:  ncurses
-
-name=dvtm
-version=0.15
-release=2
-source=(http://www.brain-dump.org/projects/$name/$name-$version.tar.gz)
-
-build () {
-	cd "$name-$version"
-
-	if [ -f $PKGMK_ROOT/config.h ]; then
-		cp $SRC/config.h .
-	fi
-
-	make
-	make DESTDIR=$PKG PREFIX=/usr install
-
-	# remove redundant terminfo files that conflict with ncurses
-	rm -rf $PKG/usr/share/terminfo
-}
--- a/dvtm/README
+++ b/dvtm/README
@ -1,14 +0,0 @@
-The configuration of dvtm is done by creating a custom config.h
-and (re)compiling the source code. To create a custom config.h,
-unpack the tarball, copy the file dvtm-$version/config.def.h to
-dvtm's port directory, and edit to suit your preferences. Then,
-when you call pkgmk in the dvtm port directory, the custom
-config.h will be detected and copied into the source before
-compilation. I recommend that you save a copy your custom config.h
-some where other than the dvtm port directory, so that your changes
-won't get nuked when updating ports or performing a prtsweep or
-prtwash (see opt/prt-utils for more information about those two).
-
-Another solution for customizing dvtm is to create a custom and
-(preferably) private port that contains your custom config and also
-might include patches for added features.
--- a/Show More
+++ b/Show More