Merge branch '3.5' into 3.6

json-c/.footprint

@@ -2,7 +2,6 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/json-c/
 -rw-r--r--	root/root	usr/include/json-c/arraylist.h
--rw-r--r--	root/root	usr/include/json-c/config.h
 -rw-r--r--	root/root	usr/include/json-c/debug.h
 -rw-r--r--	root/root	usr/include/json-c/json.h
 -rw-r--r--	root/root	usr/include/json-c/json_c_version.h
@@ -25,7 +24,7 @@ drwxr-xr-x	root/root	usr/lib/cmake/json-c/
 -rw-r--r--	root/root	usr/lib/cmake/json-c/json-c-targets.cmake
 -rw-r--r--	root/root	usr/lib/libjson-c.a
 lrwxrwxrwx	root/root	usr/lib/libjson-c.so -> libjson-c.so.5
-lrwxrwxrwx	root/root	usr/lib/libjson-c.so.5 -> libjson-c.so.5.0.0
--rwxr-xr-x	root/root	usr/lib/libjson-c.so.5.0.0
+lrwxrwxrwx	root/root	usr/lib/libjson-c.so.5 -> libjson-c.so.5.1.0
+-rwxr-xr-x	root/root	usr/lib/libjson-c.so.5.1.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/json-c.pc

json-c/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cZ27CYjKF6/ygPtDGrjvmiwnsZJjSXgy3vRMd87s8yLUaLDIvmUfKgflsWFu8t2NKnPhF3SXrZ/mIqXtERqHAA=
-SHA256 (Pkgfile) = 87576584493fee031db9998b2e0a3e060b53ebd760788ace1bef40099749cfd3
-SHA256 (.footprint) = b3572aea47e4e6234917ece55e991b2d400cad5e917c15f62796bd69aed2602c
-SHA256 (json-c-0.14.tar.gz) = b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870
+RWSE3ohX2g5d/VVNhxG/o6ym4Q2cjw9O2x0GXwbCsAeaQeT/gpGmLA/xy6WHjEOc3iB0/3AMXPyAiWb9WV1eHmOQOyx6QPfg/gs=
+SHA256 (Pkgfile) = d4cb9acdcfa9f054a49a12c4550ef681180390adec4edc47bcf767bbd95e87bc
+SHA256 (.footprint) = fbeb5061184596a807a0355333b4b4ceb007a0cb5173ec7cabb2a5c527106754
+SHA256 (json-c-0.15.tar.gz) = b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6

json-c/Pkgfile

@@ -4,24 +4,16 @@
 # Depends on:  cmake
 
 name=json-c
-version=0.14
+version=0.15
 release=1
 source=(https://s3.amazonaws.com/json-c_releases/releases/$name-$version.tar.gz)
 
 build() {
-    cd $name-$version
-
-    cmake . \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_TESTING=OFF \
-        -DBUILD_SHARED_LIBS=ON
-    make
-    make DESTDIR=$PKG install
-
-    cmake . \
-        -DBUILD_SHARED_LIBS=OFF
-    make
-    make DESTDIR=$PKG install
+	cmake -S $name-$version -B build \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_INSTALL_LIBDIR=/usr/lib \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D BUILD_TESTING=OFF
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 }

qt5/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YeFcekTRUQNKhzBmScawE6HW67tSvLlirFDSL4VADEiIOS9SVNV1NQ5fhZzYgAq8xwidLX+LJEB8T9uxn+cCAY=
-SHA256 (Pkgfile) = 05cb26d6862d2e1fbe80a178bcae7c6abe5f7f42510a5e2d7bbf4949517eb133
+RWSE3ohX2g5d/T1XrDYTpbN2ZhIgQmhMfdRVTcAsM2qI3feD9bmvrsjhbaWDfNgpq8MuXFN6EylF9pK4ZZa2s5PhNEBLIy/c5gE=
+SHA256 (Pkgfile) = 3d3e869c5d35191eab4a3c6e7e38b833d58345c534e6e62e588b794c86f2b56f
 SHA256 (.footprint) = 8860b0f2e86d9d4f9630a7894af8d99f5fb4956ac931da9abe0f30a78d68ecd1
 SHA256 (qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
 SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e

qt5/Pkgfile

@@ -85,7 +85,7 @@ build() {
 
 	sed 's|/usr/bin/python|/usr/bin/python3|g' \
 		-i $PKG/usr/lib/qt5/mkspecs/features/uikit/devices.py
-	2to3-3.7 --write --nobackups $PKG/usr/lib/qt5/mkspecs/features/uikit/devices.py
+	2to3 --write --nobackups $PKG/usr/lib/qt5/mkspecs/features/uikit/devices.py
     
 	# Fix paths
 	find $PKG/usr/lib/ -type f -name '*.prl' \

unbound/.signature

@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/V7P7VI7gR5CpY3i6zXdk06YNOzdX291Xxx0lXHwcyNkevjRAc/XRz2FgI15DxW+IiKLKoFt28kEq8ckuXHcxAs=
-SHA256 (Pkgfile) = 27e109543dd581a9092103cfd1f4ff1904182e8642e8b4cdf40be776f608e266
+RWSE3ohX2g5d/Uy4u1kucuSbIB6ky0GgiiRqlimvEN/KjVUd25pXfDW86aTvjyas5vsvuoVBmCxYZF49cejM2vpNbaR/jk/2hQo=
+SHA256 (Pkgfile) = 8426d37b71ca22de3b9776a4b143cbe192fa8d20552312c6326c3929e70b3601
 SHA256 (.footprint) = 55dae6262dda05e002b80b843c0e57553a93a9e770d86630d104c04e3efaced7
-SHA256 (unbound-1.10.1.tar.gz) = b73677c21a71cf92f15cc8cfe76a3d875e40f65b6150081c39620b286582d536
+SHA256 (unbound-1.11.0.tar.gz) = 9f2f0798f76eb8f30feaeda7e442ceed479bc54db0e3ac19c052d68685e51ef7
 SHA256 (unbound) = 54c94f1813c00c7faac51bde904b879b73d043e87c49cf8aff63de565368a095
 SHA256 (README) = df6c339bdb1dcb173ec13cfdb37c28ea2d47a2700334aea3c503ef96f955f043
 SHA256 (pre-install) = ec1d006e0ec4dca5b83fb0364ae2a591a9ffad7c41bac0c45f22f32a9d55f2c5

unbound/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  openssl expat
 
 name=unbound
-version=1.10.1
+version=1.11.0
 release=1
 source=(https://unbound.net/downloads/$name-$version.tar.gz
         unbound