Merge remote-tracking branch 'origin/3.7' into 3.8

This reverts commit e92d9c5d48feeb96680b80ea881d3c9a534fcfa2.

a2ps/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Rwkiepm7gfHEO0usv0SfSG2s1L+i5s8lnukPfn0ZULVCqeGgzSpoqptuMF7gTP2m2Du1sI2EMC2ycRLHYQpgwA=
-SHA256 (Pkgfile) = f9f0b78a9243565224fd41cb414b021125d9ffc3452b2e7d92567bf0dc931035
+RWSE3ohX2g5d/Rfx4t1zvL2qQvykzNNYeerxZf6yEUXKjz8EaX1KZcK8XsSwQ9Qk3Fo0IU4221ji8zByv1OoZ8lf9o2Zt41++Qs=
+SHA256 (Pkgfile) = 6067d445d86c2d12a748d0272e51cf6a1dc8e4f2110d9acbda66d95731c451bb
 SHA256 (.footprint) = 7704f2404ebd8f6a84caf4e81265275a5eedf95164f39e542e709a18ec86d16f
 SHA256 (a2ps-4.15.6.tar.gz) = 87ff9d801cb11969181d5b8cf8b65e65e5b24bb0c76a1b825e8098f2906fbdf4

a2ps/Pkgfile

@@ -9,12 +9,12 @@ release=1
 source=(https://ftp.gnu.org/gnu/a2ps/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	./configure --prefix=/usr --disable-nls
-	make
-	make DESTDIR=$PKG install
+    ./configure --prefix=/usr --disable-nls
+    make
+    make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/share/{info,emacs}
-	find $PKG -type f -name README -delete
+    rm -r $PKG/usr/share/{info,emacs}
+    find $PKG -type f -name README -delete
 }

adwaita-icon-theme/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RPAb2xEp6j0oxJIuklzaKuCZ6K85juzTxUEkW+v+b5gAp1DVMnqNPSv6B4kEKNBD6CPcI4sGoJsa5R/ilPI4gc=
-SHA256 (Pkgfile) = 778d32b47a91cc0c469b98163eb11b71971662e20ee23736954d66cdf6f2a170
+RWSE3ohX2g5d/Zx4f/Lmfot8i4fpLIjEsmGfPOjc2n+rph69ZGVrv3oovHVzIIIau1TE//68pTYtAWVy5ka2+QrbSR5SZRJKCww=
+SHA256 (Pkgfile) = 0ea7f99739b4942e7f90db9b400d6ba76698869931bf85346d4a89f764e462d9
 SHA256 (.footprint) = e7ac6178ae9800073cc9e4ea0b20738f12ec1891894b8f89bd34a8f236140801
 SHA256 (adwaita-icon-theme-47.0.tar.bz2) = 03aea506c39616b3adab0a731f95a688b29df9ac557a554fbcc33a2636e29d56

adwaita-icon-theme/Pkgfile

@@ -9,15 +9,15 @@ release=1
 source=(https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/$version/$name-$version.tar.bz2)
 
 build() {
-	meson setup $name-$version build \
-		--prefix=/usr \
-		--buildtype=plain \
-		--wrap-mode nodownload \
-		-D b_lto=true \
-		-D b_pie=true
+    meson setup $name-$version build \
+        --prefix=/usr \
+        --buildtype=plain \
+        --wrap-mode nodownload \
+        -D b_lto=true \
+        -D b_pie=true
 
-	meson compile -C build
-	DESTDIR=$PKG meson install -C build
+    meson compile -C build
+    DESTDIR=$PKG meson install -C build
 
-	rm -rf $PKG/usr/share/licenses
+    rm -rf $PKG/usr/share/licenses
 }

apache/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/USN+bOPzB9/a7EodRZLBjIFLwJ2ew7zipaGkn6gSLoUymkEGtAhFaOR/F++ZLPL2eZbiq1fVynx4nmQFfknJAI=
-SHA256 (Pkgfile) = 430084aab95c07f4c562193ac15016423d0327bcade151b7e5ec6b93380f42c3
+RWSE3ohX2g5d/dlb0ojU7IWmAcCteSBSl6PWztFXnAH3jtgva0ng3YM7Nf6czYJw2GsnTDJXw71rnJl2OfFtlyRNHHdP9LtQlQ8=
+SHA256 (Pkgfile) = 3fef87843b358bbe5c365b352af048849f0d3ad8a758e354b693d7a3efc9c8e7
 SHA256 (.footprint) = c74d5e2fd28b7400bca7988e0b21f4e2b12748a0a85f1d21a819069f0f9f6c9f
 SHA256 (httpd-2.4.62.tar.bz2) = 674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec
 SHA256 (crux.layout) = a72a0d72c47aa72df4378f4bf1ff291eb9cdfd29f6c827b9970b8775f38f4dd6

apache/Pkgfile

@@ -1,38 +1,38 @@
 # Description: Apache HTTP server version 2.4.x
 # Maintainer: Juergen Daubert, jue at crux dot nu
 # URL: https://httpd.apache.org/
-# Depends on: apr-util libnghttp2 libpcre2 libxml2 openssl
+# Depends on: apr-util libnghttp2 libpcre2 libxml2
 
 name=apache
 version=2.4.62
 release=1
 source=(https://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \
-	crux.layout apache)
+    crux.layout apache)
 
 build(){
-	cd httpd-$version
+    cd httpd-$version
 
-	cat $SRC/crux.layout >> config.layout
-	sed -ri '/^(User|Group)/s/daemon/www/' docs/conf/httpd.conf.in
+    cat $SRC/crux.layout >> config.layout
+    sed -ri '/^(User|Group)/s/daemon/www/' docs/conf/httpd.conf.in
 
-	./configure \
-		--enable-layout=CRUX \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		--enable-so \
-		--enable-modules=all \
-		--enable-mods-shared=all \
-		--enable-mpms-shared=all \
-		--disable-lua
-	make 
-	make -j1 DESTDIR=$PKG install
+    ./configure \
+        --enable-layout=CRUX \
+        --with-apr=/usr \
+        --with-apr-util=/usr \
+        --with-pcre=/usr \
+        --enable-so \
+        --enable-modules=all \
+        --enable-mods-shared=all \
+        --enable-mpms-shared=all \
+        --disable-lua
+    make 
+    make -j1 DESTDIR=$PKG install
 
-	install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
+    install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
 
-	rm -r $PKG/var/www/htdocs/*
-	rm -r $PKG/run
-	rm $PKG/var/www/{error,icons}/README*
+    rm -r $PKG/var/www/htdocs/*
+    rm -r $PKG/run
+    rm $PKG/var/www/{error,icons}/README*
 
-	chmod -R g-s $PKG/var/www/
+    chmod -R g-s $PKG/var/www/
 }

apr-util/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SaMEkuhGuA0iu/KAn7ejPIsLj08BvpsJ+jLYNiOGH2hhJfIMECAUPyyLqPrlUAFGpnqzkA9we1ZuL81fdYW4Qc=
-SHA256 (Pkgfile) = 9305cfcd83ece6120c73ae9fe48b980e8ecf087ba9dc591c12e76a84fbe8f9e0
+RWSE3ohX2g5d/WqDbMC2trExPSAy8K38eDqmqYzO309BwuvAewruLfxzarF7CEfic440LG5xYPRWmqgguMDNdZzgIb8fflbPng8=
+SHA256 (Pkgfile) = 277e3c4ac6a84918800c2d7f060359cf570896e3fc0c86e110776e5c993e727f
 SHA256 (.footprint) = aa91ecaf9ff0afe84e72cec3736de2248ef6b027d761809e6256a610ae0f86a1
 SHA256 (apr-util-1.6.3.tar.bz2) = a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5

apr-util/Pkgfile

@@ -9,20 +9,21 @@ release=1
 source=(https://downloads.apache.org/apr/$name-$version.tar.bz2)
 
 build(){
-	cd $name-$version
+    cd $name-$version
 
-	./configure \
-		--prefix=/usr \
-		--with-apr=/usr \
-		--with-expat=/usr \
-		--with-berkeley-db=/usr \
-		--with-gdbm=/usr \
-		--with-sqlite3=/usr \
-		--with-openssl=/usr \
-		--with-crypto
-	make
-	make DESTDIR=$PKG install
+    CFLAGS="$CFLAGS -Wno-error=implicit-int" \
+    ./configure \
+        --prefix=/usr \
+        --with-apr=/usr \
+        --with-expat=/usr \
+        --with-berkeley-db=/usr \
+        --with-gdbm=/usr \
+        --with-sqlite3=/usr \
+        --with-openssl=/usr \
+        --with-crypto
+    make
+    make DESTDIR=$PKG install
 
-	sed -i -r "/^APU_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apu-1-config
-	rm -r $PKG/usr/lib/*.exp
+    sed -i -r "/^APU_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apu-1-config
+    rm -r $PKG/usr/lib/*.exp
 }

apr/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TyZwIrmA7GojfZi0LkoXbEurOsb3viSTw7fEvyzMDMEoi2DbEtFfOoiJKEff9q1NwLeBmwqd1jw77HJ+Ik1lgU=
-SHA256 (Pkgfile) = 82e3c5561a829664ef4c5509967ae9cdc90f2d6cdf2a4773b43ee0f708dbf9b0
+RWSE3ohX2g5d/d5rENHy0fXRPNN43ikqk2lYLWd07ugTEWINHEb/oac5mPFNEgRs5UowXyVMApHmxQrecBuFASsDiHkn/AEqQgI=
+SHA256 (Pkgfile) = 90f42093ef21421ab2a58ca33ac37452bbb1e87aad61fb3e008c8eab41b2392b
 SHA256 (.footprint) = 8af5316bcd789fff9e1893a3570961fc396fe4e44625e71b826a662a64ada166
 SHA256 (apr-1.7.5.tar.bz2) = cd0f5d52b9ab1704c72160c5ee3ed5d3d4ca2df4a7f8ab564e3cb352b67232f2

apr/Pkgfile

@@ -9,14 +9,14 @@ release=1
 source=(https://downloads.apache.org/$name/$name-$version.tar.bz2)
 
 build(){
-	cd $name-$version
+    cd $name-$version
 
-	./configure \
-		--prefix=/usr \
-		--with-installbuilddir=/usr/share/apr-1 
-	make
-	make DESTDIR=$PKG install
+    ./configure \
+        --prefix=/usr \
+        --with-installbuilddir=/usr/share/apr-1 
+    make
+    make DESTDIR=$PKG install
 
-	sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-1-config
-	rm -r $PKG/usr/lib/*.exp
+    sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-1-config
+    rm -r $PKG/usr/lib/*.exp
 }

aspell/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Wi+wpvnJOmQ7s7SjAq1R1BXXpDxR2wGpl+TwgEGQD79tFxq0BSy1LcsttxAy7GIYeM3ykCO/Bs/ZOGV2JNheQI=
-SHA256 (Pkgfile) = ed373df2d06760fa3f6ae5993864ab6d14ae90ee0fac926b63898087fcca22b2
+RWSE3ohX2g5d/cfCeK26EE02jPFebHEtIg8kIGqsa7t81nmZOGM2XA3GJdMGdxG2kV7192phz5tHK6F7BBnS+rrJm0dI+EVc1gg=
+SHA256 (Pkgfile) = cce4933c39d4c52258b00b94b7e98841e8b1ceb377a7df570333ff03ff47c33d
 SHA256 (.footprint) = 7a750467ef70fd0add5559ce6d21750f45d16d17f2f73cdf41d8f1b6829f10d6
 SHA256 (aspell-0.60.8.1.tar.gz) = d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b

aspell/Pkgfile

@@ -9,14 +9,14 @@ release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	./configure \
-		--prefix=/usr \
-		--disable-nls \
-		--enable-curses=ncursesw
-	make
-	make DESTDIR=$PKG install
+    ./configure \
+        --prefix=/usr \
+        --disable-nls \
+        --enable-curses=ncursesw
+    make
+    make DESTDIR=$PKG install
 
-	rm -R $PKG/usr/share/info
+    rm -R $PKG/usr/share/info
 }

at-spi2-core/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/b3sm5BB656O/RcwzM5qdU0olT54RjYIoXIJ/nmoAEMWeA1un1r5ouLxM6swxqFPCCE6m7McMoItAuNTO2KD2w4=
-SHA256 (Pkgfile) = 2e5854321057670cee260824e1a729fbed143aad2e1b94989910fccfc29288e6
+RWSE3ohX2g5d/eVDSpAx7J0C/r9dfMRYH+4y3/qgC89NxnzDpWv8alaunnf9nt0IzNicUmBf63QoGEAA40WCiq5bd250/sJFBAI=
+SHA256 (Pkgfile) = 78b01bb0fb42a17377d069eb220b6771b087279d03707c76be67e96b3f4b1f4f
 SHA256 (.footprint) = 5acc5d824c9a78c816e28ab76a680fa167b5543b4bb2781d00de9fde2cac2e70
 SHA256 (at-spi2-core-2.54.1.tar.xz) = f0729e5c8765feb1969bb6c1fba18afa2582126b0359aa75a173fda1acf93c4c

at-spi2-core/Pkgfile

@@ -1,7 +1,7 @@
 # Description: Protocol definitions and daemon for D-Bus at-spi
 # URL: https://gitlab.gnome.org/GNOME/at-spi2-core
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: dbus gobject-introspection intltool libxml2 xorg-libxtst
+# Depends on: dbus glib-introspection intltool xorg-libxtst
 
 name=at-spi2-core
 version=2.54.1
@@ -9,17 +9,17 @@ release=1
 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz)
 
 build() {
-	meson setup build $name-$version \
-		--prefix /usr \
-		--sysconfdir=/usr/etc \
-		--libexecdir=/usr/lib/at-spi2 \
-		--buildtype=plain \
-		--wrap-mode nodownload \
-		-D b_lto=true \
-		-D b_pie=true
+    meson setup build $name-$version \
+        --prefix /usr \
+        --sysconfdir=/usr/etc \
+        --libexecdir=/usr/lib/at-spi2 \
+        --buildtype=plain \
+        --wrap-mode nodownload \
+        -D b_lto=true \
+        -D b_pie=true
 
-	meson compile -C build -j ${JOBS:-1}
-	DESTDIR=$PKG meson install -C build
+    meson compile -C build -j ${JOBS:-1}
+    DESTDIR=$PKG meson install -C build
 
-	rm -r $PKG/usr/{share/locale,lib/systemd}
+    rm -r $PKG/usr/{share/locale,lib/systemd}
 }

bin86/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bbdOk0YH3xVNE59fFdCm94BzmBzyca8luByeVJkHao3wvxt5iqx97molBVm3xtI2g5J+s+IvR367WnCZzzMTwQ=
-SHA256 (Pkgfile) = a665957231fba1ea18ef65649f673a7032594fbc98376967d07748d514ce0d81
+RWSE3ohX2g5d/S3a9s0dnQNqGCbJdolGfD4gFV15H7vykB9ETncecWrbZkInMcF4WebyOBKewNJwx0/wSUeM9ehweVmn1v1hwAg=
+SHA256 (Pkgfile) = a03337aee0b139a62ba1d4d041a7a0584f261e59850448830a800fb32ecf8b52
 SHA256 (.footprint) = 2991bc460e6ed6ee8256816fde768cb9f463b0dbe8d10e016501c10820f3035f
 SHA256 (bin86-0.16.21-c83297b.tar.gz) = 5e95d86806df1adc091e9e067d82723d8d7f9fe48df5c3d9985b3bb7b2675e04
 SHA256 (bin86-x86_64.patch) = 3b41a07f6b31de8124d015f4526b9c1427771c3d7c9bd3bcbf888992f966bb47

bin86/Pkgfile

@@ -11,18 +11,17 @@ source=(https://codeberg.org/jbruchon/dev86/archive/$_commit.tar.gz
 renames=($name-$version-c83297b.tar.gz SKIP)
 
 build() {
-	cd dev86
+    cd dev86
 
-	patch -p1 -i $SRC/$name-x86_64.patch
+    patch -p1 -i $SRC/$name-x86_64.patch
+    sed -i '/#include "version.h"/d' as/as.c ld/io.c
 
-	sed -i '/#include "version.h"/d' as/as.c ld/io.c
+    cd bin86
+    for i in ld as man; do ln -s ../${i} .; done
+    make -j1 CFLAGS="$CFLAGS -D_POSIX_SOURCE" PREFIX=/usr
 
-	cd bin86
-	for i in ld as man; do ln -s ../${i} .; done
-	make -j1 CFLAGS="$CFLAGS -D_POSIX_SOURCE" PREFIX=/usr
+    install -d $PKG/usr/{bin,share/man/man1}
+    make PREFIX=$PKG/usr MANDIR=$PKG/usr/share/man/man1 install
 
-	install -d $PKG/usr/{bin,share/man/man1}
-	make PREFIX=$PKG/usr MANDIR=$PKG/usr/share/man/man1 install
-
-	rm -r $PKG/usr/share/man/man1/{bcc,elks,elksemu}.1
+    rm -r $PKG/usr/share/man/man1/{bcc,elks,elksemu}.1
 }

bindutils/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SWenA4S4T11pQUbsnEgnxDY5BpuCKNsUjUgu1vMWmkspMxmGQSDh618USfuMcXSxbwOLwIUd+xla1fCqUbiRwQ=
-SHA256 (Pkgfile) = 11aa5bbe70bf0370042f31dd8f39d3a3bf4c2e9d2b2d8749e8c87e56c438b34e
+RWSE3ohX2g5d/eTKaBcguJX/mBAmFZ346+ffRPO0+/c54Qy+UjeuflUuLee20m8YuGIMVK9MZ7NcfQOmNSJrCHPxWQRRUDN/Vg4=
+SHA256 (Pkgfile) = a7c60c35917703076df55550846d874d4ae391ce3d20b875c45a243fd04669e5
 SHA256 (.footprint) = fa4bf8c5c440495793c1b515f2ad10b1aa101aae2f231850f6297a60a314ef6f
 SHA256 (bind-9.20.4.tar.xz) = 3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b
 SHA256 (utils.patch) = 0aa2f4ce4aa69ebbe8f2ea3e7172bf8e486c40c7dce531921314da0b92198ea7

bindutils/Pkgfile

@@ -7,33 +7,33 @@ name=bindutils
 version=9.20.4
 release=1
 source=(https://ftp.isc.org/isc/bind9/$version/bind-$version.tar.xz
-	utils.patch)
+    utils.patch)
 
 build() {
-	cd bind-$version
+    cd bind-$version
 
-	patch -Np1 -i $SRC/utils.patch
+    patch -Np1 -i $SRC/utils.patch
 
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib/bindutils \
-		--includedir=/usr/include/bindutils \
-		--disable-linux-caps \
-		--disable-doh \
-		--with-libxml2=no \
-		--with-gssapi=no
+    ./configure \
+        --prefix=/usr \
+        --libdir=/usr/lib/bindutils \
+        --includedir=/usr/include/bindutils \
+        --disable-linux-caps \
+        --disable-doh \
+        --with-libxml2=no \
+        --with-gssapi=no
 
-	make -C lib
-	make bind.keys.h
-	make -C bin/dig
-	make -C bin/delv
-	make -C doc
-	make DESTDIR=$PKG -C lib install
-	make DESTDIR=$PKG -C bin/dig install
-	make DESTDIR=$PKG -C bin/delv install
+    make -C lib
+    make bind.keys.h
+    make -C bin/dig
+    make -C bin/delv
+    make -C doc
+    make DESTDIR=$PKG -C lib install
+    make DESTDIR=$PKG -C bin/dig install
+    make DESTDIR=$PKG -C bin/delv install
 
-	install -D -m 644 doc/man/delv.1 $PKG/usr/share/man/man1/delv.1
-	install -D -m 644 doc/man/dig.1 $PKG/usr/share/man/man1/dig.1
-	install -D -m 644 doc/man/host.1 $PKG/usr/share/man/man1/host.1
-	install -D -m 644 doc/man/nslookup.1 $PKG/usr/share/man/man1/nslookup.1
+    install -D -m 644 doc/man/delv.1 $PKG/usr/share/man/man1/delv.1
+    install -D -m 644 doc/man/dig.1 $PKG/usr/share/man/man1/dig.1
+    install -D -m 644 doc/man/host.1 $PKG/usr/share/man/man1/host.1
+    install -D -m 644 doc/man/nslookup.1 $PKG/usr/share/man/man1/nslookup.1
 }

brotli/.footprint

@@ -22,15 +22,15 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libbrotlicommon.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libbrotlidec.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libbrotlienc.pc
-drwxr-xr-x	root/root	usr/lib/python3.10/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/top_level.txt
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/__pycache__/brotli.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/__pycache__/brotli.cpython-310.pyc
--rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/_brotli.cpython-310-x86_64-linux-gnu.so
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/brotli.py
+drwxr-xr-x	root/root	usr/lib/python3.12/
+drwxr-xr-x	root/root	usr/lib/python3.12/site-packages/
+drwxr-xr-x	root/root	usr/lib/python3.12/site-packages/Brotli-1.1.0-py3.12.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/Brotli-1.1.0-py3.12.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/Brotli-1.1.0-py3.12.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/Brotli-1.1.0-py3.12.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/Brotli-1.1.0-py3.12.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.12/site-packages/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/__pycache__/brotli.cpython-312.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/__pycache__/brotli.cpython-312.pyc
+-rwxr-xr-x	root/root	usr/lib/python3.12/site-packages/_brotli.cpython-312-x86_64-linux-gnu.so
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/brotli.py

brotli/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/USgZsJHms6lToBb5GElZqt7wI4F+g9vXwUHQat7zQwx1kYrEo5sfYtiJ0CvIcFSQtmm6g7avSUYSgui3xaU9AI=
+RWSE3ohX2g5d/WUOSrviWqFjC86+E9Ffz4bUpN5boYk2UibZVoWbmaTz1o6fj/qNVA6OtPTzmJtvGZLzwL1ecWxEWRCmTLcA3w4=
 SHA256 (Pkgfile) = 0335d911c50ed2fecdcece611ffb578138fb27f657a233110dd2048f87bffabd
-SHA256 (.footprint) = cf3216778723e27bab2cee860739d312baf16805c542d39ce5624c473ad5c94b
+SHA256 (.footprint) = e6220715e992ad713900adb3334668458e462e05737c51c97b66ce6a37d8273d
 SHA256 (brotli-v1.1.0.tar.gz) = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff

btrfs-progs/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bH1vsOx+Crj/i+UgQnNLB9LbJIEXK0t1PW30hDjfQf+qq057/qRUe+gLfxF5fy/zHNr+Awhe7mrmtIoP1eYIAQ=
-SHA256 (Pkgfile) = adc885c25637374528241208aaf8922af314568b415a6e7b5688a3b831bcd1f2
+RWSE3ohX2g5d/fZ4P4yhti4q3q6fangSYULAQYioEdWclxoyST12VQ4K1Z0M+ME+V+I2DSSHkIA9qd66hABvkim3x2N7p+g3jAA=
+SHA256 (Pkgfile) = f745b83d4d093c37a0796c54ad11f39068cdd6b771191bd4bfa51bf574a4751d
 SHA256 (.footprint) = 759304c0693f7d41f45a4a5e92742fbad19bf31a0a47d6adb6d964bc92e8a4cb
 SHA256 (btrfs-progs-v6.12.tar.xz) = 9a7d9651ffd52fbe5212a8e4852a3cdb079e3d223fc5504e6a50b0ba96cd20a1

btrfs-progs/Pkgfile

@@ -9,18 +9,18 @@ release=1
 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz)
 
 build() {
-	cd $name-v$version
+    cd $name-v$version
 
-	./configure \
-		--prefix=/usr \
-		--bindir=/sbin \
-		--disable-convert \
-		--disable-zoned \
-		--disable-documentation
-	make
-	make DESTDIR=$PKG install
+    ./configure \
+        --prefix=/usr \
+        --bindir=/sbin \
+        --disable-convert \
+        --disable-zoned \
+        --disable-documentation
+    make
+    make DESTDIR=$PKG install
 
-	install -d $PKG/usr/share/man/man{5,8}
-	install -m 644 Documentation/*.5 $PKG/usr/share/man/man5
-	install -m 644 Documentation/*.8 $PKG/usr/share/man/man8
+    install -d $PKG/usr/share/man/man{5,8}
+    install -m 644 Documentation/*.5 $PKG/usr/share/man/man5
+    install -m 644 Documentation/*.8 $PKG/usr/share/man/man8
 }

cairo/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/XmceUKpLARWtXWI0cVe5nLWHsTtj43fNUqVJQozEPg9sPUUSSLY8GjwLLYtRXdVa4neRCpZXxsQ5mje75ZoTgs=
-SHA256 (Pkgfile) = 262457d33dc457c83c0ea051df53bbeec236b7acb7cab60e4459853efd5bb697
+RWSE3ohX2g5d/Yj5LkTJeAIhn7n8+ymwbafIkJ7uWafmIhVEUMXD7Sxy8QRESU+T/LmFS7I+ApYsfrZuzPdWjiIseWRVtOLUmg8=
+SHA256 (Pkgfile) = 75d3499fc7e55365374614ca50fcc3e94c7db80640be40d0a08ce28434554d73
 SHA256 (.footprint) = dcdc4e4e75897ac570aea51574bdcf81b4aab27c5eaa0d7b13b015cd14849688
 SHA256 (cairo-1.18.2.tar.bz2) = 0b895967abfae888ecad9ace4bce475a27e1b9aaeedaaf334b97c96f13ccc604

cairo/Pkgfile

@@ -9,18 +9,18 @@ release=1
 source=(https://gitlab.freedesktop.org/cairo/cairo/-/archive/$version/$name-$version.tar.bz2)
 
 build() {
-	meson setup build $name-$version $PKGMK_CAIRO \
-		--prefix=/usr \
-		--buildtype=plain \
-		--wrap-mode nodownload \
-		-D b_lto=true \
-		-D b_pie=true \
-		-D dwrite=disabled \
-		-D spectre=disabled \
-		-D symbol-lookup=disabled \
-		-D tests=disabled
-	meson compile -C build
-	DESTDIR=$PKG meson install -C build
+    meson setup build $name-$version $PKGMK_CAIRO \
+        --prefix=/usr \
+        --buildtype=plain \
+        --wrap-mode nodownload \
+        -D b_lto=true \
+        -D b_pie=true \
+        -D dwrite=disabled \
+        -D spectre=disabled \
+        -D symbol-lookup=disabled \
+        -D tests=disabled
+    meson compile -C build
+    DESTDIR=$PKG meson install -C build
 
-	chmod +x $PKG/usr/bin/cairo-trace
+    chmod +x $PKG/usr/bin/cairo-trace
 }

cdrkit/.footprint

@@ -14,6 +14,29 @@ lrwxrwxrwx	root/root	usr/bin/cdda2mp3 -> cdda2ogg
 -rwxr-xr-x	root/root	usr/bin/readmult
 -rwxr-xr-x	root/root	usr/bin/readom
 -rwxr-xr-x	root/root	usr/bin/wodim
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/usal/
+-rw-r--r--	root/root	usr/include/usal/aspi-dos.h
+-rw-r--r--	root/root	usr/include/usal/aspi-win32.h
+-rw-r--r--	root/root	usr/include/usal/pg.h
+-rw-r--r--	root/root	usr/include/usal/scsicdb.h
+-rw-r--r--	root/root	usr/include/usal/scsidefs.h
+-rw-r--r--	root/root	usr/include/usal/scsireg.h
+-rw-r--r--	root/root	usr/include/usal/scsisense.h
+-rw-r--r--	root/root	usr/include/usal/scsitransp.h
+-rw-r--r--	root/root	usr/include/usal/spti-wnt.h
+-rw-r--r--	root/root	usr/include/usal/srb_os2.h
+-rw-r--r--	root/root	usr/include/usal/usalcmd.h
+-rw-r--r--	root/root	usr/include/usal/usalio.h
+-rw-r--r--	root/root	usr/include/usal/usalops.h
+-rw-r--r--	root/root	usr/include/usal/usaltimes.h
+drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib/librols.so -> librols.so.0
+lrwxrwxrwx	root/root	usr/lib/librols.so.0 -> librols.so.0.0.1
+-rwxr-xr-x	root/root	usr/lib/librols.so.0.0.1
+lrwxrwxrwx	root/root	usr/lib/libusal.so -> libusal.so.0
+lrwxrwxrwx	root/root	usr/lib/libusal.so.0 -> libusal.so.0.0.1
+-rwxr-xr-x	root/root	usr/lib/libusal.so.0.0.1
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/netscsid
 drwxr-xr-x	root/root	usr/share/

cdrkit/.signature

@@ -1,6 +1,25 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Y74ifMv5QyHzCXcpLMmiN1Idgj8/OmqPZe199hMBPcQU4S7QE3rkRyKl+3AvuhGCjVBKMTwubmaxAIWhY28ZAc=
-SHA256 (Pkgfile) = 72b93913ad3fc4c4254705e76ca432fea91783f80c0d05775d95be8b4552dd67
-SHA256 (.footprint) = 77f6cea25dd7d94bc541f287b93642c327b67f24ac416f3f8b6eadc54918ca8f
+RWSE3ohX2g5d/WEliVAnz4ADSXzXuJGLrR8ig7Soq6tTa4BelVKX5KtQW5EDjjVtY1cisODHCNvFxY0N7KnJel40FkbdtddeaQo=
+SHA256 (Pkgfile) = 92151fb8783646d57601f284de87cf84248372b45cd1ae097aa2e32bc82cec97
+SHA256 (.footprint) = bf6c366c14222f6cccf8bf4fe588b4b0aef9e02ec22a3f3b6bb9c61b781c10d9
 SHA256 (cdrkit-1.1.11.tar.gz) = d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da
+SHA256 (cdrkit-1.1.8-werror.patch) = a8d50ab4546dd3e409e853aab4dca7167455cb437a87f6cd2aa5f4ae3d1d8d4b
 SHA256 (cdrkit-1.1.9-efi-boot.patch) = fc9b45bde484bd83c7d34fd22a1d9699a997852b482502195c9e9c72a7b4abc8
+SHA256 (cdrkit-1.1.9-no_mp3.patch) = f9419e7b7d07233781bc1a0af0ae829c075a7409b287f367c6d4414f5d7981ec
+SHA256 (cdrkit-1.1.9-buffer_overflow.patch) = 7424012ad3b9113c59a324e7584b4adc30701487189392fae16710ec2b2d48da
+SHA256 (cdrkit-1.1.10-build-fix.patch) = 0960aee8afcd06cbfa86e1b8201ef01c83f38d75133c890635c0c0b2bfa6f8af
+SHA256 (cdrkit-1.1.11-manpagefix.patch) = ca9f65a99045950febb17cd91ad542f048f3f4a780ce083c055ddeba74a4527c
+SHA256 (cdrkit-1.1.11-rootstat.patch) = d14b8c974e83e02c41db3bdd4dcf4d422b6680714ccf464ba6732a930d38a738
+SHA256 (cdrkit-1.1.11-usalinst.patch) = 9b0838e2914e037f0f00f0a58287623930f0c403206e38b55db42f243d619f8c
+SHA256 (cdrkit-1.1.11-readsegfault.patch) = ccbc9cd30c97c06987b18e52564eac57cc55d3c8bf91b4875af7f85bd30b8779
+SHA256 (cdrkit-1.1.11-format.patch) = 89621c9af359bc3442d55f878a056bc66a57eca08032890b6ebb28dfd6182031
+SHA256 (cdrkit-1.1.11-handler.patch) = b1abca782b1b54b3d65696a719f95ede0dcd0673c5b1a91e5bbc6f88ee34b7ee
+SHA256 (cdrkit-1.1.11-dvdman.patch) = 1c06b0e9eceaf319a66e4f95939737102c1058cb286ab42e6e7b4876af7777da
+SHA256 (cdrkit-1.1.11-utf8.patch) = 8d18a425a8162632e004e34eed2e608623d157c8c7b41c0ff786fedd5e8096ff
+SHA256 (cdrkit-1.1.11-cmakewarn.patch) = 0fd4a61fe52e32f7f41f6679d26ba3e8f7965dfc0237d13ceecfedb2dde4e1d3
+SHA256 (cdrkit-1.1.11-memset.patch) = 1c2fa4a95ecacfb8c20d8a8e9824798630a8d8bc102df551f3ee51a36d501c3d
+SHA256 (cdrkit-1.1.11-ppc64le_elfheader.patch) = e133bb00b37fba8439b6d2ae763f92b5cde7c1712f460957043d09ee8a329d8d
+SHA256 (cdrkit-1.1.11-werror_gcc5.patch) = 742a364293a1a157a05bbfd815552d9ecbaf68f62f5c46c9ca0a8a33c5994184
+SHA256 (cdrkit-1.1.11-devname.patch) = 26bf8154f64b103f9570643e3aa155e419e4e641e5d3cb9aff8c272968fbed9c
+SHA256 (cdrkit-1.1.11-sysmacros.patch) = 4fd61ea5ec98793b25b978be9be335445115ba51adea7c29e13f3eba9e7ed980
+SHA256 (cdrkit-1.1.11-gcc10.patch) = bf94f878b61e21391624a97a0b4dd4c8ec0314a6428e3a35f4f99632b0624b92

cdrkit/Pkgfile

@@ -7,16 +7,55 @@ name=cdrkit
 version=1.1.11
 release=5
 source=(http://pkgs.fedoraproject.org/repo/pkgs/cdrkit/cdrkit-1.1.11.tar.gz/efe08e2f3ca478486037b053acd512e9/cdrkit-1.1.11.tar.gz
-	cdrkit-1.1.9-efi-boot.patch)
+    cdrkit-1.1.8-werror.patch
+    cdrkit-1.1.9-efi-boot.patch
+    cdrkit-1.1.9-no_mp3.patch
+    cdrkit-1.1.9-buffer_overflow.patch
+    cdrkit-1.1.10-build-fix.patch
+    cdrkit-1.1.11-manpagefix.patch
+    cdrkit-1.1.11-rootstat.patch
+    cdrkit-1.1.11-usalinst.patch
+    cdrkit-1.1.11-readsegfault.patch
+    cdrkit-1.1.11-format.patch
+    cdrkit-1.1.11-handler.patch
+    cdrkit-1.1.11-dvdman.patch
+    cdrkit-1.1.11-utf8.patch
+    cdrkit-1.1.11-cmakewarn.patch
+    cdrkit-1.1.11-memset.patch
+    cdrkit-1.1.11-ppc64le_elfheader.patch
+    cdrkit-1.1.11-werror_gcc5.patch
+    cdrkit-1.1.11-devname.patch
+    cdrkit-1.1.11-sysmacros.patch
+    cdrkit-1.1.11-gcc10.patch)
 
 build () {
-	patch -d $name-$version -p1 -i $SRC/cdrkit-1.1.9-efi-boot.patch
-	cmake -S $name-$version -B build -G Ninja \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -fcommon" \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D MANSUBDIR=share/man \
-		-Wno-dev
-	cmake --build build
-	DESTDIR=$PKG cmake --install build
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.8-werror.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.9-efi-boot.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.9-no_mp3.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.9-buffer_overflow.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.10-build-fix.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-manpagefix.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-rootstat.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-usalinst.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-readsegfault.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-format.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-handler.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-dvdman.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-utf8.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-cmakewarn.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-memset.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-ppc64le_elfheader.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-werror_gcc5.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-devname.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-sysmacros.patch
+    patch -Np1 -d $name-$version -i $SRC/cdrkit-1.1.11-gcc10.patch
+
+    cmake -S $name-$version -B build -G Ninja \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -fcommon" \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D MANSUBDIR=share/man \
+        -Wno-dev
+    cmake --build build
+    DESTDIR=$PKG cmake --install build
 }

cdrkit/cdrkit-1.1.10-build-fix.patch

@@ -0,0 +1,11 @@
+diff -up cdrkit-1.1.10/genisoimage/genisoimage.c.build-fix cdrkit-1.1.10/genisoimage/genisoimage.c
+--- cdrkit-1.1.10/genisoimage/genisoimage.c.build-fix	2010-01-20 11:05:05.000000000 +0100
++++ cdrkit-1.1.10/genisoimage/genisoimage.c	2010-01-20 11:21:16.144098749 +0100
+@@ -47,6 +47,7 @@
+ 
+ #include <mconfig.h>
+ #include "genisoimage.h"
++#include "checksum.h"
+ #include "iso9660.h"
+ #include <errno.h>
+ #include <timedefs.h>

cdrkit/cdrkit-1.1.11-cmakewarn.patch

@@ -0,0 +1,9 @@
+diff -up cdrkit-1.1.11/CMakeLists.txt.cmakewarn cdrkit-1.1.11/CMakeLists.txt
+--- cdrkit-1.1.11/CMakeLists.txt.cmakewarn	2012-07-31 13:11:10.075500531 +0200
++++ cdrkit-1.1.11/CMakeLists.txt	2012-07-31 13:11:41.069108287 +0200
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.8)
++cmake_policy(SET CMP0015 OLD)
+ PROJECT (cdrkit C)
+ SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
+ 

cdrkit/cdrkit-1.1.11-devname.patch

@@ -0,0 +1,30 @@
+diff -up wrk/libusal/scsi-linux-sg.c.wrk wrk/libusal/scsi-linux-sg.c
+--- wrk/libusal/scsi-linux-sg.c.wrk	2015-05-29 13:30:41.088896572 +0200
++++ wrk/libusal/scsi-linux-sg.c	2015-05-29 13:38:25.776303388 +0200
+@@ -509,7 +509,9 @@ usalo_open(SCSI *usalp, char *device)
+ 		/* scan and maybe keep one open, sg_setup decides */
+ #define HDX 0
+ #define SCD 1
+-#define SG 2
++/* second scd option included because of Fedora naming convention /dev/srN */
++#define SCD2 2
++#define SG 3
+ 		int h;
+ /*
+ retry_scan_open:
+@@ -533,6 +535,15 @@ retry_scan_open:
+ 						first=0;
+ 						last=255;
+ 						break;
++					}
++				case(SCD2):
++					{
++						if(!check_linux_26())
++							continue;
++						pattern="/dev/sr%d";
++						first=0;
++						last=255;
++						break;
+ 					}
+ 				case(SG):
+ 					{

cdrkit/cdrkit-1.1.11-dvdman.patch

@@ -0,0 +1,70 @@
+diff -up cdrkit-1.1.11/wodim/wodim.1.dvdman cdrkit-1.1.11/wodim/wodim.1
+--- cdrkit-1.1.11/wodim/wodim.1.dvdman	2011-06-08 14:49:00.073093571 +0200
++++ cdrkit-1.1.11/wodim/wodim.1	2011-06-08 14:50:59.707093540 +0200
+@@ -835,49 +835,33 @@ newer ones) still implement the Sony pro
+ not yet become a problem to use this driver for all Sony drives. If you find
+ a newer Sony drive that does not work with this driver, please report.
+ .TP
+-.B mmc_dvd
++.B mmc_mdvd
+ The generic SCSI-3/mmc-2 DVD-R/DVD-RW driver is auto-selected whenever
+ .B wodim
+ finds a MMC-2 or MMC-3 compliant drive that supports to write DVDs and
+ an appropriate medium is loaded.
+-There is no Track At Once mode for DVD writers.
+-.TP
+-.B mmc_dvdplus
+-The generic SCSI-3/mmc-3 DVD+R/DVD+RW driver is auto-selected whenever
+-one of the DVD+ media types that are incompatible to each other is found.
+-It checks media and then 
+-branches to the driver that matches the current medium.
+-.TP
+-.B mmc_dvdplusr
+-The generic SCSI-3/mmc-3 DVD+R driver is auto-selected whenever
+-a DVD+R medium is found in an appropriate writer.
+ Note that for unknown reason, the DVD-Plus alliance does not
+-like that there is a simulation mode for DVD+R media.
+-The author of
+-.B wodim
+-tries to convince manufacturers to implement a simulation mode for DVD+R
+-and implement support.
+-DVD+R only supports one write mode that is somewhere between Track At Once
+-and Packet writing; this mode is selected in 
++like that there is a simulation mode for DVD+R and DVD+RW media nor a way 
++to erase DVD+RW media.
++DVD+R and DVD+RW only supports one write mode that is somewhere between 
++Track At Once and Packet writing; this mode is selected in 
+ .B wodim
+ via a the 
+ .BR \-dao / \-sao
+ option.
+-.TP
+-.B mmc_dvdplusrw
+-The generic SCSI-3/mmc-3 DVD+RW driver is auto-selected whenever
+-a DVD+RW medium is found in an appropriate writer.
+-As DVD+RW media needs to be formatted before its first use, wodim
+-auto-detects this media state and performs a format before it starts
+-to write.
+-Note that for unknown reason, the DVD-Plus alliance does not
+-like that there is a simulation mode nor a way to erase DVD+RW media.
+-DVD+RW only supports one write mode that is close to
+-Packet writing; this mode is selected in 
++As DVD+RW media needs to be formatted before its first use, 
+ .B wodim
+-via a the 
+-.BR \-dao / \-sao
+-option.
++auto-detects this media state and performs a format before it starts
++to write. 
++.sp
++Note: If you have any problems during burning DVDs using 
++.BR wodim , 
++please consider 
++.B growisofs 
++from package
++.BR dvd+rw-tools , 
++which often works better 
++in these cases.
+ .TP
+ .B cw_7501
+ The driver for Matsushita/Panasonic CW-7501 is auto-selected when

cdrkit/cdrkit-1.1.11-format.patch

@@ -0,0 +1,129 @@
+diff -up cdrkit-1.1.11/wodim/drv_mmc.c.format cdrkit-1.1.11/wodim/drv_mmc.c
+--- cdrkit-1.1.11/wodim/drv_mmc.c.format	2011-05-18 16:49:14.591822130 +0200
++++ cdrkit-1.1.11/wodim/drv_mmc.c	2011-05-18 16:49:14.596822130 +0200
+@@ -1507,6 +1507,11 @@ getdisktype_mdvd(SCSI *usalp, cdr_t *dp)
+ 	dstat_t	*dsp = dp->cdr_dstat;
+ 
+ 	struct track_info track_info;
++
++	extern char *buf;
++	struct disk_info *dip;
++	int profile;
++
+     if(lverbose)
+         printf("HINT: use dvd+rw-mediainfo from dvd+rw-tools for information extraction.\n");
+ 	/* if(getdisktype_mmc(usalp, dp)<0)
+@@ -1521,6 +1526,18 @@ getdisktype_mdvd(SCSI *usalp, cdr_t *dp)
+ 	dsp->ds_disktype&= ~DT_CD;
+ 	dsp->ds_disktype|= DT_DVD;
+ 
++	profile = get_curprofile(usalp);
++	if (profile == 0x1A) {
++		dip = (struct disk_info *)buf;
++		if (get_diskinfo(usalp, dip) < 0)
++			return (-1);
++		if (dip->disk_status == DS_EMPTY) {	/* Unformatted	    */
++			dsp->ds_flags |= DSF_NEED_FORMAT;
++			if(lverbose)
++				printf("The medium is empty, it will be auto formatted.\n");
++		}
++	}
++	
+ 	return (ret);
+ 
+ }
+diff -up cdrkit-1.1.11/wodim/scsi_cdr.c.format cdrkit-1.1.11/wodim/scsi_cdr.c
+--- cdrkit-1.1.11/wodim/scsi_cdr.c.format	2011-05-18 16:49:14.601822130 +0200
++++ cdrkit-1.1.11/wodim/scsi_cdr.c	2011-05-18 16:49:14.600822130 +0200
+@@ -1328,7 +1328,7 @@ scsi_format(SCSI *usalp, caddr_t addr, i
+ 	}
+ 	sleep(10);
+ 	printf("\rFormating in progress: 100.00 %% done.        \n");
+-	if (pid) exit (0);
++	if (pid > 0) exit (0);
+ 	return ret;
+ }
+ 
+diff -up cdrkit-1.1.11/wodim/wodim.c.format cdrkit-1.1.11/wodim/wodim.c
+--- cdrkit-1.1.11/wodim/wodim.c.format	2011-05-18 16:49:14.584822130 +0200
++++ cdrkit-1.1.11/wodim/wodim.c	2011-05-18 17:21:59.510821630 +0200
+@@ -946,6 +946,40 @@ int main(int argc, char *argv[])
+ 		print_toc(usalp, dp);
+ 		comexit(0);
+ 	}
++	
++	if ((flags & F_FORMAT) || (dp->cdr_dstat->ds_flags & DSF_NEED_FORMAT)) {
++		printf("wodim: media format asked\n");
++		/*
++		* Do not abort if OPC failes. Just give it a chance
++		* for better laser power calibration than without OPC.
++		*
++		* Ricoh drives return with a vendor unique sense code.
++		* This is most likely because they refuse to do OPC
++		* on a non blank media.
++		*/
++		usalp->silent++;
++		do_opc(usalp, dp, flags);
++		usalp->silent--;
++		wait_unit_ready(usalp, 120);
++		if (gettimeofday(&starttime, (struct timezone *)0) < 0)
++			errmsg("Cannot get start time\n");
++		
++		if ((*dp->cdr_format)(usalp, dp, formattype) < 0) {
++			errmsgno(EX_BAD, "Cannot format disk, aborting.\n");
++			comexit(EX_BAD);
++		}
++		if (gettimeofday(&fixtime, (struct timezone *)0) < 0)
++			errmsg("Cannot get format time\n");
++		if (lverbose)
++			prtimediff("Formatting time: ", &starttime, &fixtime);
++
++		if (!wait_unit_ready(usalp, 240) || tracks == 0) {
++			comexit(0);
++		}
++		if (gettimeofday(&starttime, (struct timezone *)0) < 0)
++			errmsg("Cannot get start time\n");
++	}
++	
+ #ifdef	XXX
+ 	if ((*dp->cdr_check_session)() < 0) {
+ 		comexit(EX_BAD);
+@@ -1230,38 +1264,6 @@ int main(int argc, char *argv[])
+ 			comexit(0);
+ 		}
+ 	}
+-	if (flags & F_FORMAT) {
+-		printf("wodim: media format asked\n");
+-		/*
+-		* Do not abort if OPC failes. Just give it a chance
+-		* for better laser power calibration than without OPC.
+-		*
+-		* Ricoh drives return with a vendor unique sense code.
+-		* This is most likely because they refuse to do OPC
+-		* on a non blank media.
+-		*/
+-		usalp->silent++;
+-		do_opc(usalp, dp, flags);
+-		usalp->silent--;
+-		wait_unit_ready(usalp, 120);
+-		if (gettimeofday(&starttime, (struct timezone *)0) < 0)
+-			errmsg("Cannot get start time\n");
+-
+-		if ((*dp->cdr_format)(usalp, dp, formattype) < 0) {
+-			errmsgno(EX_BAD, "Cannot format disk, aborting.\n");
+-			comexit(EX_BAD);
+-		}
+-		if (gettimeofday(&fixtime, (struct timezone *)0) < 0)
+-			errmsg("Cannot get format time\n");
+-		if (lverbose)
+-			prtimediff("Formatting time: ", &starttime, &fixtime);
+-
+-		if (!wait_unit_ready(usalp, 240) || tracks == 0) {
+-			comexit(0);
+-		}
+-		if (gettimeofday(&starttime, (struct timezone *)0) < 0)
+-			errmsg("Cannot get start time\n");
+-	}
+ 	/*
+ 	* Reset start time so we will not see blanking time and
+ 	* writing time counted together.

cdrkit/cdrkit-1.1.11-gcc10.patch

@@ -0,0 +1,12 @@
+diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h
+--- cdrkit-1.1.11/genisoimage/genisoimage.h.me	2020-02-24 15:10:35.542998992 +0100
++++ cdrkit-1.1.11/genisoimage/genisoimage.h	2020-02-24 15:10:50.011130450 +0100
+@@ -377,7 +377,7 @@ extern int	use_fileversion;
+ extern int	split_SL_component;
+ extern int	split_SL_field;
+ extern char	*trans_tbl;
+-char		*outfile;
++extern char	*outfile;
+ 
+ #define	JMAX		64	/* maximum Joliet file name length (spec) */
+ #define	JLONGMAX	103	/* out of spec Joliet file name length */

cdrkit/cdrkit-1.1.11-handler.patch

@@ -0,0 +1,12 @@
+diff -up cdrkit-1.1.11/icedax/icedax.c.handler cdrkit-1.1.11/icedax/icedax.c
+--- cdrkit-1.1.11/icedax/icedax.c.handler	2011-06-02 16:37:02.446206285 +0200
++++ cdrkit-1.1.11/icedax/icedax.c	2011-06-02 16:37:25.444206279 +0200
+@@ -1054,7 +1054,7 @@ static void exit_wrapper(int status)
+ 
+ 	if (child_pid != 0) {
+ 		SCSI *usalp = get_scsi_p();
+-		if (usalp->running) {
++		if (usalp && usalp->running) {
+ 			usalp->cb_fun = on_exitscsi;
+ 			usalp->cb_arg = (void *) (uintptr_t) status;
+ 		} else {

cdrkit/cdrkit-1.1.11-manpagefix.patch

@@ -0,0 +1,201 @@
+diff -up wrk/genisoimage/genisoimage.1.wrk wrk/genisoimage/genisoimage.1
+--- wrk/genisoimage/genisoimage.1.wrk	2017-01-04 15:58:13.697936687 +0100
++++ wrk/genisoimage/genisoimage.1	2017-01-04 16:08:22.411801026 +0100
+@@ -115,7 +115,8 @@ is the path of the directory tree to be
+ Multiple paths can be specified, and
+ .B genisoimage
+ will merge the files found in all of the specified path components to
+-form the filesystem image.
++form the filesystem image. If an error is encountered while handling directory tree, 
++only error messages are produced and the process is aborted - incomplete image is not created.
+ .PP
+ If the option
+ .B \-graft\-points
+@@ -180,6 +181,8 @@ in the
+ file.
+ .TP
+ .BI \-A " application_id"
++.TP
++.BI \-appid " application_id"
+ Specifies a text string that will be written into the volume header.
+ This should describe the application that will be on the disc.  There
+ is space for 128 characters.  Equivalent to
+@@ -365,6 +368,8 @@ the Sun disk label will overlay the firs
+ boot image.
+ .TP
+ .BI \-b " eltorito_boot_image"
++.TP
++.BI \-eltorito\-boot " eltorito_boot_image"
+ Specifies the path and filename of the boot image to be used when making
+ an El Torito bootable CD for x86 PCs. The pathname must be relative to
+ the source path specified to
+@@ -427,6 +432,8 @@ See the
+ section for a description of this table.
+ .TP
+ .BI \-C " last_sess_start,next_sess_start"
++.TP
++.BI \-cdrecord\-params " last_sess_start,next_sess_start"
+ This option is needed to create a CD Extra or the image of a second
+ session or a higher-level session for a multisession disc.
+ .B \-C
+@@ -452,6 +459,8 @@ session on a CD Extra. This is a multise
+ in the first session and an ISO9660 filesystem in the second session.
+ .TP
+ .BI \-c " boot_catalog"
++.TP
++.BI \-eltorito\-catalog " boot_catalog"
+ Specifies the path and filename of the boot catalog, which is required
+ for an El Torito bootable CD. The pathname must be relative to the source
+ path specified to
+@@ -488,6 +497,12 @@ For the parameter
+ see the description of
+ .BR \-M .
+ .TP
++.BI \-checksum_algorithm_iso " alg1,alg2,..."
++Specify the checksum types desired for the output image.
++.TP
++.BI \-checksum_algorithm_template " alg1,alg2,..."
++Specify the checksum types desired for the output jigdo template.
++.TP
+ .BI \-copyright " file"
+ Specifies copyright information, typically a filename on the disc.
+ There is space for 37 characters.  Equivalent to
+@@ -497,12 +512,16 @@ in the
+ file.
+ .TP
+ .B \-d
++.TP
++.B \-omit\-period
+ Do not append a period to files that do not have one.
+ .br
+ This violates the ISO9660 standard, but it happens to work on many systems.
+ Use with caution.
+ .TP
+ .B \-D
++.TP
++.B \-disable\-deep\-relocation
+ Do not use deep directory relocation, and instead just pack them in the
+ way we see them.
+ .br
+@@ -510,6 +529,9 @@ If ISO9660:1999 has not been selected,
+ this violates the ISO9660 standard, but it happens to work on many systems.
+ Use with caution.
+ .TP
++.B \-debug
++Set debug flag.
++.TP
+ .BI \-dir\-mode " mode"
+ Overrides the mode of directories used to create the image to
+ .IR mode ,
+@@ -535,7 +557,14 @@ another directory
+ needs to include all needed files (filenames must be all caps) for a
+ compliant DVD-Video filesystem.
+ .TP
++.BI \-e " efi_boot_file"
++.TP
++.BI \-efi\-boot " efi_boot_file"
++Set EFI boot image name.
++.TP
+ .B \-f
++.TP
++.B \-follow\-links
+ Follow symbolic links when generating the filesystem.  When this option is not
+ in use, symbolic links will be entered using Rock Ridge if enabled, otherwise
+ they will be ignored.
+@@ -740,6 +769,8 @@ See the
+ section below for more details.
+ .TP
+ .B \-l
++.TP
++.B \-full\-iso9660\-filenames
+ Allow full 31-character filenames.  Normally the ISO9660 filename will be in an
+ 8.3 format which is compatible with MS-DOS, even though the ISO9660 standard
+ allows filenames of up to 31 characters.  If you use this option, the disc may
+@@ -870,6 +901,8 @@ with
+ .BR \-C .
+ .TP
+ .B \-N
++.TP
++.B \-omit\-version\-number
+ Omit version numbers from ISO9660 filenames.
+ .br
+ This violates the ISO9660 standard, but no one really uses the
+@@ -967,6 +1000,8 @@ in the
+ file.
+ .TP
+ .BI \-p " preparer_id"
++.TP
++.BI \-preparer " preparer_id"
+ Specifies a text string that will be written into the volume header.
+ This should describe the preparer of the CD-ROM, usually with a mailing
+ address and phone number.  There is space for 128 characters.
+@@ -1008,10 +1043,14 @@ This makes
+ even less verbose.  No progress output will be provided.
+ .TP
+ .B \-R
++.TP
++.B \-rock
+ Generate SUSP and RR records using the Rock Ridge protocol to further describe
+ the files on the ISO9660 filesystem.
+ .TP
+ .B \-r
++.TP
++.B \-rational\-rock
+ This is like the \-R option, but file ownership and modes are set to
+ more useful values.  The uid and gid are set to zero, because they are
+ usually only useful on the author's system, and not useful to the
+@@ -1092,6 +1131,11 @@ intentionally. Accessing several older v
+ support by the operating system to choose which sessions are to be
+ mounted.
+ .TP
++.BI \-s " sector type"
++.TP
++.BI \-sectype " sector type"
++Set output sector type to e.g. data/xa1/raw.
++ .TP
+ .BI \-sort " sort_file"
+ Sort file locations on the media. Sorting is controlled by a file that
+ contains pairs of filenames and sorting offset weighting.
+@@ -1213,6 +1257,8 @@ in the
+ file.
+ .TP
+ .B \-T
++.TP
++.B \-translation\-table
+ Generate a file
+ .I TRANS.TBL
+ in each directory on the CD-ROM, which can be used
+@@ -1262,6 +1308,8 @@ to
+ This option is the default on VMS. 
+ .TP
+ .B \-U
++.TP
++.B \-untranslated\-filenames
+ Allows "untranslated" filenames, completely violating the ISO9660 standards
+ described above.  Enables the following flags:
+ .B \-d \-l \-N \-allow\-leading\-dots \-relaxed\-filenames
+@@ -1333,6 +1381,8 @@ must be specified before
+ on each command line.
+ .TP
+ .B \-v
++.TP
++.B \-verbose
+ Verbose execution. If given twice on the command line, extra debug information
+ will be printed.
+ .TP
+@@ -1341,7 +1391,15 @@ Identical to
+ .B \-m
+ .IR glob .
+ .TP
++.B \-XA
++Generate XA directory attruibutes.
++.TP
++.B \-xa
++Generate rationalized XA directory attruibutes.
++.TP
+ .B \-z
++.TP
++.B \-transparent\-compression
+ Generate special
+ .I RRIP
+ records for transparently compressed files.

cdrkit/cdrkit-1.1.11-memset.patch

@@ -0,0 +1,37 @@
+diff -up wrk/genisoimage/jte.c.wrk wrk/genisoimage/jte.c
+--- wrk/genisoimage/jte.c.wrk	2013-02-22 13:24:47.722196877 +0100
++++ wrk/genisoimage/jte.c	2013-02-25 12:41:45.136653487 +0100
+@@ -280,7 +280,7 @@ extern int list_file_in_jigdo(char *file
+     if (!jtemplate_out)
+         return 0;
+ 
+-    memset(md5, 0, sizeof(md5));
++    memset(md5, 0, 16);
+ 
+     /* Cheaper to check file size first */
+     if (size < jte_min_size)
+diff -up wrk/genisoimage/md5.c.wrk wrk/genisoimage/md5.c
+--- wrk/genisoimage/md5.c.wrk	2013-02-22 13:15:18.210866321 +0100
++++ wrk/genisoimage/md5.c	2013-02-22 13:15:29.979935133 +0100
+@@ -183,7 +183,7 @@ mk_MD5Final (unsigned char digest[16], s
+ 	putu32(ctx->buf[1], digest + 4);
+ 	putu32(ctx->buf[2], digest + 8);
+ 	putu32(ctx->buf[3], digest + 12);
+-	memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
++	memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
+ }
+ 
+ /* The four core functions - F1 is optimized somewhat */
+diff -up wrk/libedc/edcspeed.c.wrk wrk/libedc/edcspeed.c
+--- wrk/libedc/edcspeed.c.wrk	2013-02-22 10:45:33.353219110 +0100
++++ wrk/libedc/edcspeed.c	2013-02-22 10:46:52.497686387 +0100
+@@ -35,7 +35,8 @@ static int encspeed()
+ 	secs = 10;
+ 	end = 75*1000000 * secs;
+ 
+-	memset(sect, 0, sizeof(sect));
++	//faulty and unneccessary, immediately rewritten again
++	//memset(sect, 0, sizeof(sect));
+ 	for (i=0; i < 2352; ) {
+ 		sect[i++] = 'J';
+ 		sect[i++] = 'S';

cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch

@@ -0,0 +1,13 @@
+diff -up wrk/include/glibc_elf.h.wrk wrk/include/glibc_elf.h
+--- wrk/include/glibc_elf.h.wrk	2014-09-19 16:04:45.546981432 +0200
++++ wrk/include/glibc_elf.h	2014-09-19 16:38:55.407991682 +0200
+@@ -2081,7 +2081,8 @@ typedef Elf32_Addr Elf32_Conflict;
+ #define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
+ 
+ /* Keep this the last entry.  */
+-#define R_PPC64_NUM		107
++//symbol conflicting with system headers on ppc64le and nowhere used
++//#define R_PPC64_NUM		107
+ 
+ /* PowerPC64 specific values for the Dyn d_tag field.  */
+ #define DT_PPC64_GLINK  (DT_LOPROC + 0)

cdrkit/cdrkit-1.1.11-readsegfault.patch

@@ -0,0 +1,12 @@
+diff -up cdrkit-1.1.11/readom/readom.c.readsegfault cdrkit-1.1.11/readom/readom.c
+--- cdrkit-1.1.11/readom/readom.c.readsegfault	2011-03-07 15:51:46.889441591 +0100
++++ cdrkit-1.1.11/readom/readom.c	2011-03-07 15:51:50.702938263 +0100
+@@ -906,7 +906,7 @@ read_ftoc(SCSI *usalp, parm_t *parmp, BO
+ 
+ 
+ 	strcpy(filename, "toc.dat");
+-	if (strcmp(parmp->name, "/dev/null") != 0) {
++	if (parmp != NULL && strcmp(parmp->name, "/dev/null") != 0) {
+ 
+ 		len = strlen(parmp->name);
+ 		if (len > (sizeof (filename)-5)) {

cdrkit/cdrkit-1.1.11-rootstat.patch

@@ -0,0 +1,31 @@
+diff -up cdrkit-1.1.11/genisoimage/tree.c.rootstat cdrkit-1.1.11/genisoimage/tree.c
+--- cdrkit-1.1.11/genisoimage/tree.c.rootstat	2011-01-25 14:15:36.766389403 +0100
++++ cdrkit-1.1.11/genisoimage/tree.c	2011-01-25 14:17:24.804643126 +0100
+@@ -48,6 +48,7 @@
+ #include <fctldefs.h>
+ #include <device.h>
+ #include <schily.h>
++#include <libgen.h>
+ 
+ extern int allow_limited_size;
+ 
+@@ -1421,12 +1422,16 @@ insert_file_entry(struct directory *this
+ 		return (0);
+ 	}
+ 	if (this_dir == root && strcmp(short_name, ".") == 0)
+-		root_statbuf = statbuf;	/* Save this for later on */
++		memcpy(&root_statbuf, &statbuf, sizeof(root_statbuf));  /* Save this for later on */
+ 
+ 	/* We do this to make sure that the root entries are consistent */
+ 	if (this_dir == root && strcmp(short_name, "..") == 0) {
+-		statbuf = root_statbuf;
+-		lstatbuf = root_statbuf;
++		/* for the case .. comes before . */
++		if (!root_statbuf.st_ctime) {
++			stat_filter(dirname(whole_path), &root_statbuf);
++		}
++		memcpy(&statbuf, &root_statbuf, sizeof(statbuf));
++		memcpy(&lstatbuf, &root_statbuf, sizeof(lstatbuf));
+ 	}
+ 	if (S_ISLNK(lstatbuf.st_mode)) {
+ 

cdrkit/cdrkit-1.1.11-sysmacros.patch

@@ -0,0 +1,60 @@
+diff -up wrk/genisoimage/rock.c.wrk wrk/genisoimage/rock.c
+--- wrk/genisoimage/rock.c.wrk	2017-01-04 14:25:54.879670532 +0100
++++ wrk/genisoimage/rock.c	2017-01-04 15:11:38.061228649 +0100
+@@ -39,6 +39,11 @@
+ #include <device.h>
+ #include <schily.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ #define	SU_VERSION 1
+ 
+ #define	SL_ROOT    8
+diff -up wrk/genisoimage/tree.c.wrk wrk/genisoimage/tree.c
+--- wrk/genisoimage/tree.c.wrk	2017-01-04 14:21:47.472189363 +0100
++++ wrk/genisoimage/tree.c	2017-01-04 15:13:32.989466729 +0100
+@@ -50,6 +50,11 @@
+ #include <schily.h>
+ #include <libgen.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ extern int allow_limited_size;
+ 
+ #ifdef VMS
+diff -up wrk/icedax/interface.c.wrk wrk/icedax/interface.c
+--- wrk/icedax/interface.c.wrk	2017-01-04 14:46:54.298203958 +0100
++++ wrk/icedax/interface.c	2017-01-04 15:14:06.333535804 +0100
+@@ -55,6 +55,11 @@
+ #include <sys/ioctl.h>
+ #include <statdefs.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ 
+ #include "mycdrom.h"
+ #include "lowlevel.h"
+diff -up wrk/icedax/ioctl.c.wrk wrk/icedax/ioctl.c
+--- wrk/icedax/ioctl.c.wrk	2017-01-04 14:49:45.834583930 +0100
++++ wrk/icedax/ioctl.c	2017-01-04 15:15:10.268668248 +0100
+@@ -36,6 +36,11 @@
+ #include <schily.h>
+ #include <device.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ #include <usal/scsitransp.h>
+ 
+ #include "mycdrom.h"

cdrkit/cdrkit-1.1.11-usalinst.patch

@@ -0,0 +1,33 @@
+diff -up cdrkit-1.1.11/librols/CMakeLists.txt.usalinst cdrkit-1.1.11/librols/CMakeLists.txt
+--- cdrkit-1.1.11/librols/CMakeLists.txt.usalinst	2012-07-31 10:51:30.270669381 +0200
++++ cdrkit-1.1.11/librols/CMakeLists.txt	2012-07-31 10:52:02.365378257 +0200
+@@ -3,5 +3,11 @@ INCLUDE_DIRECTORIES(../include ../libhfs
+ 
+ SET(LIBROLS_SRCS  astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c  stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/peekc.c default.c)
+ 
+-ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h  ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
++ADD_LIBRARY (rols SHARED ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h  ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
++SET_TARGET_PROPERTIES(rols PROPERTIES
++    VERSION 0.0.1
++    SOVERSION 0
++)
++
++INSTALL(TARGETS rols DESTINATION lib${LIB_SUFFIX})
+ 
+diff -up cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst cdrkit-1.1.11/libusal/CMakeLists.txt
+--- cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst	2012-07-31 10:51:30.302670085 +0200
++++ cdrkit-1.1.11/libusal/CMakeLists.txt	2012-07-31 10:52:09.190528942 +0200
+@@ -6,5 +6,12 @@ ADD_DEFINITIONS(-DUSE_RCMD_RSH)
+ #SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
+ SET(LIBSCG_SRCS usalsettarget.c usaltimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
+ LINK_DIRECTORIES(../librols)
+-ADD_LIBRARY (usal STATIC ${LIBSCG_SRCS})
++ADD_LIBRARY (usal SHARED ${LIBSCG_SRCS})
++
+ TARGET_LINK_LIBRARIES(usal ${SCG_SELF_LIBS})
++SET_TARGET_PROPERTIES(usal PROPERTIES
++    VERSION 0.0.1
++    SOVERSION 0
++)
++INSTALL(TARGETS usal DESTINATION lib${LIB_SUFFIX})
++INSTALL(FILES usal/scsicdb.h usal/aspi-dos.h usal/usalcmd.h usal/usalio.h usal/scsireg.h usal/usalops.h usal/scsidefs.h usal/spti-wnt.h usal/srb_os2.h usal/scsitransp.h usal/aspi-win32.h usal/scsisense.h usaltimes.h pg.h DESTINATION include/usal)

cdrkit/cdrkit-1.1.11-utf8.patch

@@ -0,0 +1,104 @@
+diff -up cdrkit-1.1.11/Changelog.utf8 cdrkit-1.1.11/Changelog
+--- cdrkit-1.1.11/Changelog.utf8	2012-07-31 12:38:50.207872763 +0200
++++ cdrkit-1.1.11/Changelog	2012-07-31 12:38:57.669026934 +0200
+@@ -519,7 +519,7 @@ cdrkit (2.01.01a08+X.12) UNRELEASED; urg
+ 
+ cdrkit (2.01.01a08+X.11) UNRELEASED; urgency=low
+ 
+-  * 26_author_locale (ASCII transliteration of Jörg in the standard credits
++  * 26_author_locale (ASCII transliteration of Jörg in the standard credits
+     message)
+   * 28_cdda2wav_interface (Linux friendly cdda2wav behaviour)
+   * 30_doc_typo_fixes (various documentation/message fixes)
+@@ -821,8 +821,8 @@ Sun May 16 01:37:11 2004 Joerg Schilling
+ 
+ Sun May 16 01:26:52 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+ 	* cdrecord.1 1.95
+-	  Eißfeldt -> Ei\*sfeldt
+-	  µsec -> \*msec
++	  Eißfeldt -> Ei\*sfeldt
++	  ľsec -> \*msec
+ 
+ Sat May 15 23:14:18 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+ 	* subchan.c 1.19
+@@ -1057,7 +1057,7 @@ Wed Jan 14 15:37:47 2004 Joerg Schilling
+ Wed Jan 14 01:14:27 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+ 	* scsi-mac-iokit.c 1.8
+ 	  ux_errno wird nun korrekt gesetzt wenn ein Kommando schiefgeht
+-	  Die Sense Daten werden nicht mehr gelöscht
++	  Die Sense Daten werden nicht mehr gelöscht
+ 	  Author ist nun "schily", denn das Modul kommt nun teilweise dirch scgcheck
+ 
+ Tue Jan 13 20:43:44 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+@@ -1074,7 +1074,7 @@ Mon Jan 12 00:33:39 2004 Joerg Schilling
+ 
+ Sun Jan 11 18:42:14 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+ 	* scsi-linux-sg.c 1.77
+-	  Versuch das /dev/hd* Interface von Linux-2.6 besser zu unterstützen.
++	  Versuch das /dev/hd* Interface von Linux-2.6 besser zu unterstützen.
+ 
+ Sun Jan 11 16:18:48 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+ 	* scsi-linux-sg.c 1.76
+@@ -6144,7 +6144,7 @@ Mon Oct 26 00:27:22 1998 Joerg Schilling
+ 	  New manufacturer: Xcitec Inc.
+ 			Doremi Media Co., Ltd.
+ 			Matsushita Electric Industrial Co.,Ltd.
+-			CDA Datenträger Albrechts GmbH.
++			CDA Datenträger Albrechts GmbH.
+ 
+ Sun Oct 25 13:00:22 1998 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
+ 	* cdrecord.c 1.71
+diff -up cdrkit-1.1.11/doc/icedax/README.utf8 cdrkit-1.1.11/doc/icedax/README
+--- cdrkit-1.1.11/doc/icedax/README.utf8	2012-07-31 12:38:18.903226517 +0200
++++ cdrkit-1.1.11/doc/icedax/README	2012-07-31 12:38:18.902226496 +0200
+@@ -387,7 +387,7 @@ and
+ 
+ <http://www.anime.net/~goemon/linux-cd/cdda-list.html>
+ 
+-From a news posting from Björn Wiberg
++From a news posting from Björn Wiberg
+ 
+ > The following table was generated using the CDROM.CFG file from Nero
+ > v3.0.4.2.
+diff -up cdrkit-1.1.11/doc/icedax/THANKS.utf8 cdrkit-1.1.11/doc/icedax/THANKS
+--- cdrkit-1.1.11/doc/icedax/THANKS.utf8	2012-07-31 12:38:18.901226475 +0200
++++ cdrkit-1.1.11/doc/icedax/THANKS	2012-07-31 12:38:18.901226475 +0200
+@@ -5,7 +5,7 @@ http://www.mode.net/
+ 
+ and 
+ 
+-Fraunhofer Institut für integrierte Schaltungen (FhG-IIS)
++Fraunhofer Institut für integrierte Schaltungen (FhG-IIS)
+ http://www.iis.fhg.de/
+ 
+ Code for extraction of ISRC and MCN codes as well as MD5 signatures
+@@ -33,4 +33,4 @@ Francesco Chemolli (getopt_long patches)
+ Thanks to all testers and finally Jim McLaughlin for supplying
+ the first cdda-reader source code (that got me started).
+ 
+-Heiko Eißfeldt
++Heiko Eißfeldt
+diff -up cdrkit-1.1.11/doc/READMEs/README.ATAPI.utf8 cdrkit-1.1.11/doc/READMEs/README.ATAPI
+--- cdrkit-1.1.11/doc/READMEs/README.ATAPI.utf8	2012-07-31 12:38:18.899226433 +0200
++++ cdrkit-1.1.11/doc/READMEs/README.ATAPI	2012-07-31 12:38:18.900226454 +0200
+@@ -279,7 +279,7 @@ selectively telling the kernel what to u
+ this would not be needed if the Linux SCSI CD-ROM driver would be more 
+ up to date and supports standard conforming drives.
+ 
+-Jörg Schilling <schilling@fokus.fhg.de>
++Jörg Schilling <schilling@fokus.fhg.de>
+ 
+ --------------------------------------------------
+ Here is a hint from Alan Brown <alanb@manawatu.gen.nz>:
+diff -up cdrkit-1.1.11/doc/READMEs/README.cdplus.utf8 cdrkit-1.1.11/doc/READMEs/README.cdplus
+--- cdrkit-1.1.11/doc/READMEs/README.cdplus.utf8	2012-07-31 12:38:18.900226454 +0200
++++ cdrkit-1.1.11/doc/READMEs/README.cdplus	2012-07-31 12:38:18.900226454 +0200
+@@ -63,7 +63,7 @@ Note: If you want to create an HFS hybri
+ use the '-part' option to genisoimage. Otherwise, the data track will be mounted
+ as an ISO9660/Joliet CD when used on a Mac.
+ 	
+-Jörg
++Jörg
+ 
+ Edited for cdrkit by Christian Fromme <kaner@strace.org> and Eduard Bloch
+ 

cdrkit/cdrkit-1.1.11-werror_gcc5.patch

@@ -0,0 +1,22 @@
+diff -up wrk/genisoimage/exclude.c.wrk wrk/genisoimage/exclude.c
+--- wrk/genisoimage/exclude.c.wrk	2015-02-25 13:16:28.054237196 +0100
++++ wrk/genisoimage/exclude.c	2015-02-25 13:33:06.761312002 +0100
+@@ -39,7 +39,7 @@ exclude(char *fn)
+ {
+ 	register int	i;
+ 
+-	for (i = 0; excl[i] && i < MAXEXCL; i++)
++	for (i = 0; i < MAXEXCL && excl[i]; i++)
+ 		;
+ 
+ 	if (i == MAXEXCL) {
+@@ -69,7 +69,7 @@ is_excluded(char *fn)
+ 	/*
+ 	 * very dumb search method ...
+ 	 */
+-	for (i = 0; excl[i] && i < MAXEXCL; i++) {
++	for (i = 0; i < MAXEXCL && excl[i]; i++) {
+ 		if (strcmp(excl[i], fn) == 0) {
+ 			return (1);	/* found -> excluded filenmae */
+ 		}
+diff -up wrk/icedax/toc.c.wrk wrk/icedax/toc.c

cdrkit/cdrkit-1.1.8-werror.patch

@@ -0,0 +1,206 @@
+diff -up cdrkit-1.1.8/wodim/wodim.c.werror cdrkit-1.1.8/wodim/wodim.c
+--- cdrkit-1.1.8/wodim/wodim.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/wodim/wodim.c	2008-05-27 15:36:22.000000000 +0200
+@@ -4089,7 +4089,7 @@ audioread(SCSI *usalp, cdr_t *dp, int fl
+ 
+ 	read_scsi(usalp, buf, 1000, 1);
+ 	printf("XXX:\n");
+-	write(1, buf, 512); /* FIXME: handle return value */
++	do{int ret;ret=write(1, buf, 512);}while(0); /* FIXME: handle return value */
+ 	unload_media(usalp, dp, flags);
+ 	comexit(0);
+ #endif
+diff -up cdrkit-1.1.8/wodim/isosize.c.werror cdrkit-1.1.8/wodim/isosize.c
+--- cdrkit-1.1.8/wodim/isosize.c.werror	2008-05-27 15:41:36.000000000 +0200
++++ cdrkit-1.1.8/wodim/isosize.c	2008-05-27 15:42:12.000000000 +0200
+@@ -69,7 +69,7 @@ isosize(int f)
+ 	vp = (struct iso9660_pr_voldesc *) &vd;
+ 
+ 	do {
+-		read(f, &vd, sizeof (vd)); /* FIXME: check return value */
++		do{int ret;ret=read(f, &vd, sizeof (vd));}while(0); /* FIXME: check return value */
+ 		if (GET_UBYTE(vd.vd_type) == VD_PRIMARY)
+ 			break;
+ 
+diff -up cdrkit-1.1.8/icedax/toc.c.werror cdrkit-1.1.8/icedax/toc.c
+--- cdrkit-1.1.8/icedax/toc.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/icedax/toc.c	2008-05-27 15:41:11.000000000 +0200
+@@ -1071,7 +1071,7 @@ static int handle_userchoice(char *p, un
+ 	/* get user response. */
+ 	do {
+ 		fprintf(stderr, "please choose one (0-%u): ", nr);
+-		scanf("%u", &user_choice); /* FIXME: check return value */
++		do{int ret;ret=scanf("%u", &user_choice);}while(0); /* FIXME: check return value */
+ 	} while (user_choice > nr);
+ 
+ 	if (user_choice == nr)
+diff -up cdrkit-1.1.8/genisoimage/diag/dump.c.werror cdrkit-1.1.8/genisoimage/diag/dump.c
+--- cdrkit-1.1.8/genisoimage/diag/dump.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/genisoimage/diag/dump.c	2008-05-27 15:34:03.000000000 +0200
+@@ -368,7 +368,7 @@ main(int argc, char *argv[])
+ 	do {
+ 		if (file_addr < (off_t)0) file_addr = (off_t)0;
+ 		showblock(1);
+-		read(STDIN_FILENO, &c, 1); /* FIXME: check return value */
++		do{int ret;ret=read(STDIN_FILENO, &c, 1);}while(0); /* FIXME: check return value */
+ 		if (c == 'a')
+ 			file_addr -= PAGE;
+ 		if (c == 'b')
+@@ -378,11 +378,11 @@ main(int argc, char *argv[])
+ 			printf("Enter new starting block (in hex):");
+ 			if (sizeof (file_addr) > sizeof (long)) {
+ 				Llong	ll;
+-				scanf("%llx", &ll); /* FIXME: check return value */
++				do{int ret;ret=scanf("%llx", &ll);}while(0); /* FIXME: check return value */
+ 				file_addr = (off_t)ll;
+ 			} else {
+ 				long	l;
+-				scanf("%lx", &l); /* FIXME: check return value */
++				do{int ret;ret=scanf("%lx", &l);}while(0); /* FIXME: check return value */
+ 				file_addr = (off_t)l;
+ 			}
+ 			file_addr = file_addr << 11;
+@@ -392,7 +392,7 @@ main(int argc, char *argv[])
+ 		if (c == 'f') {
+ 			crsr2(20, 1);
+ 			printf("Enter new search string:");
+-			fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */
++			do{char *ret;ret=fgets((char *)search, sizeof (search), stdin);}while(0); /* FIXME: check return value */
+ 			while (search[strlen((char *)search)-1] == '\n')
+ 				search[strlen((char *)search)-1] = 0;
+ 			crsr2(20, 1);
+diff -up cdrkit-1.1.8/genisoimage/diag/isoinfo.c.werror cdrkit-1.1.8/genisoimage/diag/isoinfo.c
+--- cdrkit-1.1.8/genisoimage/diag/isoinfo.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/genisoimage/diag/isoinfo.c	2008-05-27 15:34:03.000000000 +0200
+@@ -651,7 +651,7 @@ extract_file(struct iso_directory_record
+ #endif
+ 		len -= tlen;
+ 		extent++;
+-		write(STDOUT_FILENO, buff, tlen); /* FIXME: check return value */
++		do{int ret;ret=write(STDOUT_FILENO, buff, tlen);}while(0); /* FIXME: check return value */
+ 	}
+ }
+ 
+diff -up cdrkit-1.1.8/genisoimage/diag/isodump.c.werror cdrkit-1.1.8/genisoimage/diag/isodump.c
+--- cdrkit-1.1.8/genisoimage/diag/isodump.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/genisoimage/diag/isodump.c	2008-05-27 15:34:03.000000000 +0200
+@@ -655,7 +655,7 @@ main(int argc, char *argv[])
+ 		if (file_addr < 0)
+ 			file_addr = (off_t)0;
+ 		showblock(1);
+-		read(STDIN_FILENO, &c, 1); /* FIXME: check return value */
++		do{int ret;ret=read(STDIN_FILENO, &c, 1);}while(0); /* FIXME: check return value */
+ 		if (c == 'a')
+ 			file_addr -= blocksize;
+ 		if (c == 'b')
+@@ -665,11 +665,11 @@ main(int argc, char *argv[])
+ 			printf("Enter new starting block (in hex):");
+ 			if (sizeof (file_addr) > sizeof (long)) {
+ 				Llong	ll;
+-				scanf("%llx", &ll); /* FIXME: check return value */
++				do{int ret;ret=scanf("%llx", &ll);}while(0); /* FIXME: check return value */
+ 				file_addr = (off_t)ll;
+ 			} else {
+ 				long	l;
+-				scanf("%lx", &l); /* FIXME: check return value */
++				do{int ret;ret=scanf("%lx", &l);}while(0); /* FIXME: check return value */
+ 				file_addr = (off_t)l;
+ 			}
+ 			file_addr = file_addr * blocksize;
+@@ -679,7 +679,7 @@ main(int argc, char *argv[])
+ 		if (c == 'f') {
+ 			crsr2(20, 1);
+ 			printf("Enter new search string:");
+-			fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */
++			do{char *ret;ret=fgets((char *)search, sizeof (search), stdin);}while(0); /* FIXME: check return value */
+ 			while (search[strlen((char *)search)-1] == '\n')
+ 				search[strlen((char *)search)-1] = 0;
+ 			crsr2(20, 1);
+diff -up cdrkit-1.1.8/genisoimage/diag/isovfy.c.werror cdrkit-1.1.8/genisoimage/diag/isovfy.c
+--- cdrkit-1.1.8/genisoimage/diag/isovfy.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/genisoimage/diag/isovfy.c	2008-05-27 15:34:03.000000000 +0200
+@@ -591,11 +591,11 @@ check_path_tables(int typel_extent, int 
+ 	readsecs(typel_extent * blocksize / 2048, typel, ISO_BLOCKS(path_table_size));
+ #else
+ 	lseek(fileno(infile), (off_t)((off_t)typel_extent) * blocksize, SEEK_SET);
+-	read(fileno(infile), typel, path_table_size); /* FIXME: check return value */
++	do{int ret;ret=read(fileno(infile), typel, path_table_size);}while(0); /* FIXME: check return value */
+ #endif
+ 	typem = (char *) malloc(path_table_size);
+ 	lseek(fileno(infile), (off_t)((off_t)typem_extent) * blocksize, SEEK_SET);
+-	read(fileno(infile), typem, path_table_size); /* FIXME: check return value */
++	do{int ret;ret=read(fileno(infile), typem, path_table_size);}while(0); /* FIXME: check return value */
+ 
+ 	j = path_table_size;
+ 	pnt = typel;
+diff -up cdrkit-1.1.8/genisoimage/jte.c.werror cdrkit-1.1.8/genisoimage/jte.c
+--- cdrkit-1.1.8/genisoimage/jte.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/genisoimage/jte.c	2008-05-27 15:34:03.000000000 +0200
+@@ -36,6 +36,8 @@
+ #include "vms.h"
+ #endif
+ 
++#include "md5.h"
++
+ /* Different types used in building our state list below */
+ #define JTET_FILE_MATCH 1
+ #define JTET_NOMATCH    2
+@@ -643,7 +645,7 @@ static void flush_bz2_chunk(void *buffer
+ 
+     err = BZ2_bzCompressInit(&c_stream, 9, 0, 0);
+     comp_buf = malloc(2 * size); /* Worst case */
+-    c_stream.next_out = comp_buf;
++    c_stream.next_out = (char *)comp_buf;
+     c_stream.avail_out = 2 * size;
+     c_stream.next_in = buffer;
+     c_stream.avail_in = size;
+@@ -691,7 +693,7 @@ static void write_compressed_chunk(unsig
+ 		if (!uncomp_buf)
+ 		{
+ #ifdef	USE_LIBSCHILY
+-            comerr("failed to allocate %d bytes for template compression buffer\n", uncomp_size);
++            comerr("failed to allocate %d bytes for template compression buffer\n", (int)uncomp_size);
+ #else
+             fprintf(stderr, "failed to allocate %d bytes for template compression buffer\n", uncomp_size);
+             exit(1);
+@@ -1019,8 +1021,8 @@ void write_jt_match_record(char *filenam
+ #endif
+ 		}
+         if (first_block)
+-            rsync64_sum = rsync64(buf, MIN_JIGDO_FILE_SIZE);
+-        checksum_update(iso_context, buf, use);
++            rsync64_sum = rsync64((unsigned char *)buf, MIN_JIGDO_FILE_SIZE);
++        checksum_update(iso_context, (unsigned char *)buf, use);
+ //        mk_MD5Update(&iso_context, buf, use);
+         remain -= use;
+         first_block = 0;
+@@ -1033,7 +1035,7 @@ void write_jt_match_record(char *filenam
+     {
+         int pad_size = sector_size - (size % sector_size);
+         memset(buf, 0, pad_size);
+-        checksum_update(iso_context, buf, pad_size);
++        checksum_update(iso_context, (unsigned char *)buf, pad_size);
+ //        mk_MD5Update(&iso_context, buf, pad_size);
+     }
+ 
+@@ -1041,7 +1043,7 @@ void write_jt_match_record(char *filenam
+     if (size % sector_size)
+     {
+         int pad_size = sector_size - (size % sector_size);
+-        write_compressed_chunk(buf, pad_size);
++        write_compressed_chunk((unsigned char *)buf, pad_size);
+         add_unmatched_entry(pad_size);
+     }        
+ }
+diff -up cdrkit-1.1.8/genisoimage/eltorito.c.werror cdrkit-1.1.8/genisoimage/eltorito.c
+--- cdrkit-1.1.8/genisoimage/eltorito.c.werror	2008-05-27 15:34:03.000000000 +0200
++++ cdrkit-1.1.8/genisoimage/eltorito.c	2008-05-27 15:34:03.000000000 +0200
+@@ -660,7 +660,7 @@ fill_boot_desc(struct eltorito_defaultbo
+ 		set_731(bi_table.bi_length, de->size);
+ 		set_731(bi_table.bi_csum, bi_checksum);
+ 
+-		write(bootimage, &bi_table, sizeof (bi_table)); /* FIXME: check return value */
++		do{int ret;ret=write(bootimage, &bi_table, sizeof (bi_table));}while(0); /* FIXME: check return value */
+ 		close(bootimage);
+ 	}
+ }/* fill_boot_desc(... */

cdrkit/cdrkit-1.1.9-buffer_overflow.patch

@@ -0,0 +1,66 @@
+diff -ru origin-1.1.9/wodim/scsi_cdr.c master-1.1.9/wodim/scsi_cdr.c
+--- origin-1.1.9/wodim/scsi_cdr.c	2008-02-25 12:14:07.000000000 +0100
++++ master-1.1.9/wodim/scsi_cdr.c	2009-07-16 12:01:29.000000000 +0200
+@@ -2181,26 +2181,30 @@
+ 		if (inq->add_len == 0) {
+ 			if (usalp->dev == DEV_UNKNOWN && got_inquiry) {
+ 				usalp->dev = DEV_ACB5500;
+-				strcpy(inq->vendor_info,
+-					"ADAPTEC ACB-5500        FAKE");
++				strncpy(inq->vendor_info, "ADAPTEC ", 8);
++				strncpy(inq->prod_ident,"ACB-5500        ", 16);
++				strncpy(inq->prod_revision, "FAKE", 4);
+ 
+ 			} else switch (usalp->dev) {
+-
+ 				case DEV_ACB40X0:
+-					strcpy(inq->vendor_info,
+-							"ADAPTEC ACB-40X0        FAKE");
++					strncpy(inq->vendor_info, "ADAPTEC ", 8);
++					strncpy(inq->prod_ident, "ACB-40X0        ",16);
++					strncpy(inq->prod_revision, "FAKE", 4);
+ 					break;
+ 				case DEV_ACB4000:
+-					strcpy(inq->vendor_info,
+-							"ADAPTEC ACB-4000        FAKE");
++					strncpy(inq->vendor_info, "ADAPTEC ",8);
++					strncpy(inq->prod_ident, "ACB-4000        ",16);
++					strncpy(inq->prod_revision, "FAKE",4);
+ 					break;
+ 				case DEV_ACB4010:
+-					strcpy(inq->vendor_info,
+-							"ADAPTEC ACB-4010        FAKE");
++					strncpy(inq->vendor_info, "ADAPTEC ",8);
++					strncpy(inq->prod_ident, "ACB-4010        ",16);
++					strncpy(inq->prod_revision, "FAKE",4);
+ 					break;
+ 				case DEV_ACB4070:
+-					strcpy(inq->vendor_info,
+-							"ADAPTEC ACB-4070        FAKE");
++					strncpy(inq->vendor_info,"ADAPTEC ",8);
++					strncpy(inq->prod_ident, "ACB-4070        ", 16);
++					strncpy(inq->prod_revision, "FAKE",4 );
+ 					break;
+ 			}
+ 		} else if (inq->add_len < 31) {
+@@ -2230,14 +2234,16 @@
+ 
+ 	case INQ_SEQD:
+ 		if (usalp->dev == DEV_SC4000) {
+-			strcpy(inq->vendor_info,
+-				"SYSGEN  SC4000          FAKE");
++			strncpy(inq->vendor_info,"SYSGEN  ",8);
++			strncpy(inq->prod_ident, "SC4000          ",16);
++			strncpy(inq->prod_revision, "FAKE",4);
+ 		} else if (inq->add_len == 0 &&
+ 					inq->removable &&
+ 						inq->ansi_version == 1) {
+ 			usalp->dev = DEV_MT02;
+-			strcpy(inq->vendor_info,
+-				"EMULEX  MT02            FAKE");
++			strncpy(inq->vendor_info,"EMULEX  ",8);
++			strncpy(inq->prod_ident, "MT02            ",16);
++			strncpy(inq->prod_revision, "FAKE",4);
+ 		}
+ 		break;
+ 

cdrkit/cdrkit-1.1.9-no_mp3.patch

@@ -0,0 +1,50 @@
+diff -up cdrkit-1.1.9/icedax/cdda2ogg.1.no_mp3 cdrkit-1.1.9/icedax/cdda2ogg.1
+--- cdrkit-1.1.9/icedax/cdda2ogg.1.no_mp3	2009-06-15 14:48:44.930637082 +0200
++++ cdrkit-1.1.9/icedax/cdda2ogg.1	2009-06-15 14:50:35.596769274 +0200
+@@ -1,12 +1,11 @@
+ '\"
+ .TH "cdda2ogg" "1"
+ .SH "NAME"
+-cdda2ogg, cdda2mp3 \(em extract audio CD audio tracks and encode them
++cdda2ogg \(em extract audio CD audio tracks and encode them
+ .SH "SYNOPSIS"
+ .PP
+ .B cdda2ogg
+ .PP
+-.B cdda2mp3
+ .SH "DESCRIPTION"
+ .PP
+ .B cdda2ogg is a simple script that uses the
+@@ -15,9 +14,6 @@ command to extract all audio tracks with
+ .B icedax <fileprefix>
+ command and encode them using the
+ .B ogg123
+-respective
+-.I <censored>
+-MP3
+ encoder. The scripts are not intended to be full-featured music archiving
+ programs, but only for quick storing of few audio data.
+ It does not use databases like CDDB or have any extra features. You may look
+@@ -36,8 +32,6 @@ for more information.
+ .SH "CONFIGURATION"
+ .PP
+ .B cdda2ogg
+-and
+-.B cdda2mp3
+ have predefined values for reading and labeling of the target files.
+ You can overwrite them with following environment variables:
+ 
+@@ -65,11 +59,11 @@ Additional options passed to
+ The base part of the filename of resulting audio files. This can also be specified as the first argument to the script.
+ 
+ .PP
+-See cdda2ogg (cdda2mp3) script file to get the default values
++See cdda2ogg script file to get the default values
+ .PP
+ System administrator can also set default values by creating of a shell
+ include file, defining the variables for the POSIX shell, and storing them as
+-/etc/default/cdda2ogg (resp. cdda2mp3).
++/etc/default/cdda2ogg.
+ .SH "EXAMPLES"
+ .PP
+ .B CDDA_DEVICE=/dev/cdrom1 cdda2ogg

chrony/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Znih5jCzme9NY42X9SAG2p8RIVx37ozW4jmW/FuwjP7MvNhS1r8dKodX1ZPL1ZQ1Ok5pbpiPpUvLEYkKlAHMwQ=
-SHA256 (Pkgfile) = fea1f66bc476cf600eee5215b7e4a2966cf69d17fb6d599525771af0b2de64df
+RWSE3ohX2g5d/Rd51wplBglcV74qQ2EWnVfaJz7AwKwXSkn1Uj3WTeHFTtfRe7gFHFkb9+t6cVNcKP2osAQ02CSdnIJY0q0+PA4=
+SHA256 (Pkgfile) = 34f7c0282ce16734c964e174950b52502aa658ee433b32a6a3f7adcb9e9b1183
 SHA256 (.footprint) = 6f403b2e0972da49318c0d041091125760ac3ce9b64a4ce746fd153343488fd5
 SHA256 (chrony-4.6.1.tar.gz) = 571ff73fbf0ae3097f0604eca2e00b1d8bb2e91affe1a3494785ff21d6199c5c
 SHA256 (chronyd) = 5ae5109312f1d3d28385aad84e086a45cf2ef71d0f39c3c06777b55d069bfdcf

chrony/Pkgfile

@@ -8,21 +8,21 @@ name=chrony
 version=4.6.1
 release=1
 source=(https://chrony-project.org/releases/$name-$version.tar.gz
-	chronyd)
+    chronyd)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	./configure \
-		--prefix=/usr \
-		--chronyrundir=/run/chrony \
-		--with-pidfile=/run/chrony/chronyd.pid \
-		--with-user=chrony
+    ./configure \
+        --prefix=/usr \
+        --chronyrundir=/run/chrony \
+        --with-pidfile=/run/chrony/chronyd.pid \
+        --with-user=chrony
 
-	make
-	make DESTDIR=$PKG install
+    make
+    make DESTDIR=$PKG install
 
-	install -d -o chrony -g chrony -m 0750 $PKG/var/{lib,log}/chrony
-	install -D -m 0755 $SRC/chronyd $PKG/etc/rc.d/chronyd
-	install examples/chrony.conf.example1 $PKG/etc/chrony.conf
+    install -d -o chrony -g chrony -m 0750 $PKG/var/{lib,log}/chrony
+    install -D -m 0755 $SRC/chronyd $PKG/etc/rc.d/chronyd
+    install examples/chrony.conf.example1 $PKG/etc/chrony.conf
 }

chrpath/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QDUPIvo8gjTPsOeD1iIe6P5K1d4XaWRPhAHXcPg1Ej/2heWmUkCSy9eqsX8Lkdzs6hEmfMjEr+5XWhILm7YSQc=
-SHA256 (Pkgfile) = 14bf84466633ad473465173d98485163e3774f5d2b7ddaab8af83c04c5bffddd
+RWSE3ohX2g5d/VZxbn9fAXjcRSWN8swFnHFo6r+0CD+oDrrPGCGIAxCe98Vlgjc8S4WLPB1h8Ad7sTG8pw5AfiWONiAXgjyaJQo=
+SHA256 (Pkgfile) = f2714d1b9d3e41a00dcd3f95890656d34cfe9efd462065c392281dd024736d61
 SHA256 (.footprint) = 63bf775cb82da089e4f0bd8e323b033d906ac04eab1858e2a603855d440ea955
 SHA256 (chrpath-0.18.tar.gz) = f09c49f0618660ca11fc6d9580ddde904c7224d4c6d0f6f2d1f9bcdc9102c9aa

chrpath/Pkgfile

@@ -9,12 +9,12 @@ source=(https://codeberg.org/pere/chrpath/archive/release-$version.tar.gz)
 renames=($name-$version.tar.gz)
 
 build() {
-	cd $name
+    cd $name
 
-	./bootstrap
-	./configure --prefix=/usr
-	make
-	make DESTDIR=$PKG install
+    ./bootstrap
+    ./configure --prefix=/usr
+    make
+    make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/doc
+    rm -r $PKG/usr/doc
 }

cifs-utils/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VFZXg0iQlroNWM8EjsJt5TMkcotCDE54+7paE2qpXqN4ogcDWX5k97puB5gLqbM1QKJ18bzffyk4TF1IHG9Vw0=
-SHA256 (Pkgfile) = d7b41719e842840291a3b2a5c00f83749ce9dce23d161cf1b8287eb8ff3dd1c0
+RWSE3ohX2g5d/RouaRYVDhxYZJgucVFSAQLx0gGSnoJpAk9DzKHleRJOhT8cdquyOIsRM3dslo6RBOsatM7LkB4JVjrv9uUJNgU=
+SHA256 (Pkgfile) = fca3db9cd4988bc43a8cfa792f752c020f8488638b6ff49353f450d583bb1599
 SHA256 (.footprint) = f0201b274178c7686f0eef640bcf47e9897334babf971b17a7eff9ba988cd700
 SHA256 (cifs-utils-7.1.tar.bz2) = a21123f76a4a6a36c9653189ba4918ebdf3cfcd3f9092730a47ff3450b5b5b2a
 SHA256 (cifs) = 6dc576a4b23722cc9b7fd630275f3ba721a0e659a8a9642cd0f7c37df09c9e79

cifs-utils/Pkgfile

@@ -8,14 +8,14 @@ name=cifs-utils
 version=7.1
 release=1
 source=(https://download.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2
-	cifs)
+    cifs)
 
 build () {
-	cd $name-$version
+    cd $name-$version
 
-	./configure --prefix=/usr --with-pamdir=/lib/security
-	make
-	make DESTDIR=$PKG install
+    ./configure --prefix=/usr --with-pamdir=/lib/security
+    make
+    make DESTDIR=$PKG install
 
-	install -D -m 0755 $SRC/cifs $PKG/etc/rc.d/cifs
+    install -D -m 0755 $SRC/cifs $PKG/etc/rc.d/cifs
 }

ck4up/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/aI7mQ9nS07NifvXn4cSMGaq4N/4kzIVRXjJF1NbNEF3nLVyaTIJg5ZFjlgm1gflxEIKPQcRQA++CuTVl1ZpfAQ=
-SHA256 (Pkgfile) = 693432fe8a382fd95772e03c8cef798079ff5c15899c6217eeee073eb6cf0c01
+RWSE3ohX2g5d/TlBI43KVbnVbduwODlfdZvymgScWZpP3EFmkrF2TFXae/C7+MPnJya59JIm7qi13264xUn8aAkTlc6ADRQl1Q8=
+SHA256 (Pkgfile) = 3de300ffc3ec6d1d5fd867411c5b72b08e8532602d585982876f153acddabda4
 SHA256 (.footprint) = 5ee30ac97a3a1006d3156c6d4e025003526ccb35968cf962eede0c1eb82b0f08
 SHA256 (ck4up-1.4.tar.gz) = 37f2f981cfdb6811a906e5520cb27203cb5ecb725d2180aaac59d377c1ac9fbf

ck4up/Pkgfile

@@ -9,6 +9,6 @@ release=2
 source=(http://jue.li/crux/$name/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
-	make MANDIR=/usr/share/man/man1 DESTDIR=$PKG install
+    cd $name-$version
+    make MANDIR=/usr/share/man/man1 DESTDIR=$PKG install
 }

clang/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TmnMs09W1mJHOBDqraeSzc5H0gK9SUCuK/HwRsJAPOgXzRYyXk09YHTiGZ2Sb4EbcfQPzh4n6YzLwBWl3M0FAo=
-SHA256 (Pkgfile) = d75f0cc855e38169183d964123fa5b1bcf766915cb37e25b175663675ded6566
+RWSE3ohX2g5d/aKEOcmrbtQpMNnOpewgUOwSRaOyijYI5ROUabLiedU7JEnFXy+ptdSOJx1dC8gbJytdTdF/ItnuTMmMwmY7eQ4=
+SHA256 (Pkgfile) = 18acf9d75a62aad76aab5f05c2be5416af219ae0cbd17bbe8b2757f201273d0e
 SHA256 (.footprint) = 5e8478b62ba51f8b76c41765c55ba3b9d2c3c18dfd64bd3dffb67420edaa358e
 SHA256 (clang-19.1.7.src.tar.xz) = 11e5e4ecab5338b9914de3b83a4622cb200de466b7c56ba675afb72fa7d64675
 SHA256 (clang-tools-extra-19.1.7.src.tar.xz) = 430b088bf820550090a6cf0eec67183d045273c18b3f1d6c5207e46d93391be7

clang/Pkgfile

@@ -7,37 +7,38 @@ name=clang
 version=19.1.7
 release=1
 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/clang-$version.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/clang-tools-extra-$version.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz
-	)
+    https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/clang-tools-extra-$version.src.tar.xz
+    https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
+    https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz
+    )
 
 build() {
-	llvm_version=$(prt-get current llvm)
-	if [ ! "$llvm_version" == "$version-$release" ]; then
-		printf '\e[31m%s\e[m\n' "llvm out-of-sync error!
+    llvm_version=$(prt-get current llvm)
+    if [ ! "$llvm_version" == "$version-$release" ]; then
+        printf '\e[31m%s\e[m\n' "llvm out-of-sync error!
 Your current llvm version is $llvm_version, while this Pkgfile currently
 provides $version-$release.
 
 The build may not fail but produce problems later on. To save your time the
 build will exit here. Please update llvm and compiler-rt first."
-		exit 1
-	fi
-	mv clang-tools-extra-$version.src clang-$version.src/tools/extra
-	prt-get isinst ccache && PKGMK_CLANG+=' -D LLVM_CCACHE_BUILD=ON'
+        exit 1
+    fi
 
-	mv cmake-$version.src cmake
+    mv clang-tools-extra-$version.src clang-$version.src/tools/extra
+    prt-get isinst ccache && PKGMK_CLANG+=' -D LLVM_CCACHE_BUILD=ON'
 
-	cmake -S $name-$version.src -B build -G Ninja $PKGMK_CLANG \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_INSTALL_LIBEXECDIR=lib/clang \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-D LLVM_MAIN_SRC_DIR="$SRC/llvm-$version.src" \
-		-D LLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
-		-D LLVM_INCLUDE_TESTS=OFF \
-		-Wno-dev
-	cmake --build build
-	DESTDIR=$PKG cmake --install build
+    mv cmake-$version.src cmake
+
+    cmake -S $name-$version.src -B build -G Ninja $PKGMK_CLANG \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D CMAKE_INSTALL_LIBEXECDIR=lib/clang \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+        -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+        -D LLVM_MAIN_SRC_DIR="$SRC/llvm-$version.src" \
+        -D LLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
+        -D LLVM_INCLUDE_TESTS=OFF \
+        -Wno-dev
+    cmake --build build
+    DESTDIR=$PKG cmake --install build
 }

clex/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/R8q+uTa6bhHqWfkSWvTvKRica4aLp5VOJeqXaRyndxD/YEmuX8FwUsURB43492YzEV5IDuBTEWZmVWYs1HE7gs=
-SHA256 (Pkgfile) = 80d8c79fd45672e0f3e390c7dda8875809dbe318f9de9c8d6add991b488236a6
+RWSE3ohX2g5d/asjoDtHdGOhqNQ6ZIjuwkoQXgky87PmeiWjvppgC9tZ7VDXoTSKeDAngXxR2vUwA7VukqJaH1FU9aQDv0A6mQ0=
+SHA256 (Pkgfile) = 7d272fe734e029b4df7508058bfe3cd1128bcce6206c832fc934471c9e8caa12
 SHA256 (.footprint) = c000c5c6ba683a0b545ae2b3f805dcec534dfdf3d55b482115495cab26d2e356
 SHA256 (clex-4.7.tar.gz) = dd8ddac89132f691cb4d449e5d879e91355da29c0a2d9f2f55c55aacb2059e93

clex/Pkgfile

@@ -9,8 +9,8 @@ release=1
 source=(https://github.com/xitop/clex/releases/download/v$version//$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
-	./configure --prefix=/usr
-	make
-	make DESTDIR=$PKG install
+    cd $name-$version
+    ./configure --prefix=/usr
+    make
+    make DESTDIR=$PKG install
 }

cmocka/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cZMNnQEXWN78UFeWg6kkOnXKliJBCX3feAV4B8YKtmmb00TJh78bRyBxbmNQhV+Ed+4Abve0WFX6fqMybX9oQE=
-SHA256 (Pkgfile) = 1105f5384a4dc6681dc74b8c1989fd28fa8142df9e240cc27cd18da6678f2245
+RWSE3ohX2g5d/VmtMARTUMcDndxVJPnT02GKUC4/9PF2HadYCD/TICM2sOVu67Kh+WzF7uMXdSXnsrkBh173VQd3mfNuVPLmQQ8=
+SHA256 (Pkgfile) = ab0b54e4763ff45cdc4e6ce06521763b0e07ac68ab03f2b2fe9db19c2c2d0b36
 SHA256 (.footprint) = 627aa77bd9b9998ea06e9a5315612a672df68593f13f8ee43cf054375e907409
 SHA256 (cmocka-1.1.7.tar.xz) = 810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82

cmocka/Pkgfile

@@ -8,12 +8,12 @@ release=1
 source=(https://cmocka.org/files/1.1/$name-$version.tar.xz)
 
 build() {
-	cmake -S $name-$version -B build -G Ninja \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_INSTALL_LIBDIR=lib \
-		-D UNIT_TESTING=On
-	cmake --build build -j ${JOBS:-1}
-	DESTDIR=$PKG cmake --install build
+    cmake -S $name-$version -B build -G Ninja \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D CMAKE_INSTALL_LIBDIR=lib \
+        -D UNIT_TESTING=On
+    cmake --build build -j ${JOBS:-1}
+    DESTDIR=$PKG cmake --install build
 }

compiler-rt/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dG+3JkdYMBJ/HoMPxI2+AF8I6jVh1T2wtN9G430Rr8Lx6u/clsAcJ+OhFmuzblio28Id6wdy3LL+h8QbwNLDwY=
-SHA256 (Pkgfile) = 36e44d2e8e72116920597df102e70738c8add5e1aaf95c3f0a5fe20c9399d5df
+RWSE3ohX2g5d/abSGBSInfGhAZxDm2BPshIujx2oNfypZ3TC39xNDv9fpdMeiwuDJg2zyW3eHVmt/CkuCYrtruPYasrTBxWXrg0=
+SHA256 (Pkgfile) = 715d75ea14136b3070a1437c13829c760516dc37db7c0a7f342f079601a9dad4
 SHA256 (.footprint) = 116ce2fdcc516cd99042fad9de856aa87566733a09bfdb57c30b244279b75301
 SHA256 (compiler-rt-19.1.7.src.tar.xz) = c12b6e764202c615c1a3af9a13d477846878757ae0e29e5f8979215a6958fffc
 SHA256 (llvm-19.1.7.src.tar.xz) = 96f833c6ad99a3e8e1d9aca5f439b8fd2c7efdcf83b664e0af1c0712c5315910

compiler-rt/Pkgfile

@@ -8,29 +8,29 @@ name=compiler-rt
 version=19.1.7
 release=1
 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/compiler-rt-$version.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
+    https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
     https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz)
 
 build() {
-	mv llvm-$version.src llvm
-	mv cmake-$version.src cmake
+    mv llvm-$version.src llvm
+    mv cmake-$version.src cmake
 
-	if prt-get isinst clang; then
-		if ! /usr/bin/ldd /usr/bin/clang | grep -q -E '.*not found'; then
-			export CC=clang
-			export CXX=clang++
-		fi
-	fi
+    if prt-get isinst clang; then
+        if ! /usr/bin/ldd /usr/bin/clang | grep -q -E '.*not found'; then
+            export CC=clang
+            export CXX=clang++
+        fi
+    fi
 
-	cmake -S $name-$version.src -B build -G Ninja \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-D COMPILER_RT_INSTALL_PATH=/usr/lib/clang/${version:0:2} \
-		-D Python3_EXECUTABLE=/usr/bin/python3 \
-		-D COMPILER_RT_INCLUDE_TESTS=OFF \
+    cmake -S $name-$version.src -B build -G Ninja \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+        -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+        -D COMPILER_RT_INSTALL_PATH=/usr/lib/clang/${version:0:2} \
+        -D Python3_EXECUTABLE=/usr/bin/python3 \
+        -D COMPILER_RT_INCLUDE_TESTS=OFF \
         -Wno-dev
-	cmake --build build -j ${JOBS:-1}
-	DESTDIR=$PKG cmake --install build
+    cmake --build build -j ${JOBS:-1}
+    DESTDIR=$PKG cmake --install build
 }

conky/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dSP3WJ+JyIFxN5v5Qs5CZU1kvfvgqYBXAmm0ACl1ZNf7usOCGUIcNAzK6thHvFcx2iS7VRGfsB4CXJdSgVJnAQ=
-SHA256 (Pkgfile) = 4244d85f3b32de827326b0795564594fafe36fb10af94de28d1b812f0ccc5377
+RWSE3ohX2g5d/UVvFBlWPX35aez7Mo5NEhZ3QAyD6vpD9Y8Bx2/ik/0eKdMILVIXOE2ZtpGQrk6dIK4TeVS7aN4qSdYWwZCq9Qo=
+SHA256 (Pkgfile) = 253b73003ad90c222052935f7e77c5579e0decdc19e8509358538ffadf82be54
 SHA256 (.footprint) = b1befb365db806952cf7726c732e89b6ce20f20bb46e5c7a2529cd011de490c6
 SHA256 (conky-1.22.0.tar.gz) = 8633b78e6c0c9e7128efc9fe54b48df75a3860928e3fb101bcf71f6fb3844959

conky/Pkgfile

@@ -1,7 +1,7 @@
 # Description: Light-weight system monitor
 # URL: https://github.com/brndnmtthws/conky
 # Maintainer: Juergen Daubert, jue at crux dot nu
-# Depends on: cmake curl imlib2 libxml2 lua xorg-libxdamage xorg-libxft xorg-libxi xorg-libxinerama
+# Depends on: imlib2 lua xorg-libxdamage xorg-libxft xorg-libxi xorg-libxinerama
 
 name=conky
 version=1.22.0
@@ -9,21 +9,21 @@ release=1
 source=(https://github.com/brndnmtthws/conky/archive/v$version/$name-$version.tar.gz)
 
 build() {
-	prt-get isinst wayland && PKGMK_CONKY+=' -D BUILD_WAYLAND=ON'
+    prt-get isinst wayland && PKGMK_CONKY+=' -D BUILD_WAYLAND=ON'
 
-	cmake -S $name-$version -B build -G Ninja $PKGMK_CONKY \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D SYSTEM_CONFIG_FILE=/usr/etc/conky.conf \
-		-D BUILD_DOCS=OFF \
-		-D BUILD_I18N=OFF \
-		-D BUILD_CURL=ON \
-		-D BUILD_RSS=ON \
-		-D RELEASE=TRUE
+    cmake -S $name-$version -B build -G Ninja $PKGMK_CONKY \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D SYSTEM_CONFIG_FILE=/usr/etc/conky.conf \
+        -D BUILD_DOCS=OFF \
+        -D BUILD_I18N=OFF \
+        -D BUILD_CURL=ON \
+        -D BUILD_RSS=ON \
+        -D RELEASE=TRUE
 
-	cmake --build build -j ${JOBS:-1}
-	DESTDIR=$PKG cmake --install build
+    cmake --build build -j ${JOBS:-1}
+    DESTDIR=$PKG cmake --install build
 
-	rm -r $PKG/usr/share/doc
+    rm -r $PKG/usr/share/doc
 }

consolekit/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RymeHZCNuglC5vKi+Wk+yojXPFAphC4P/dF2VeIWjGvcoE6q7tYplSnAwl4w76bb4YYhX3Eh3JUmBPilsjrRAE=
-SHA256 (Pkgfile) = 55b28f01ec4ce2c8333a3a9e236342f3918f7cc9dbe187b3ec629cf1caaf4e6e
+RWSE3ohX2g5d/cldq1eUSchIeN31SVCSW1XD7kGAPlyLvKHJwAjdq1s0qdHalOz5oOaolQ7qpuje2dheCe2AW897bwFz45tLoQY=
+SHA256 (Pkgfile) = 869b09ae5b09360f2618842bd69e38b9e67be0e4986d6aa938b6db4b6e739092
 SHA256 (.footprint) = 230c778b6aa3d90a776f6deb7122b4076d0e066d3aefcf01c7d359bf8ebadd6e
 SHA256 (ConsoleKit2-1.2.6.tar.gz) = d41224129c5a689469ebd8fe87e34c4a76afdb7b2f6201eb246320262ea5a942
 SHA256 (system-session) = 599613516a16ac997a4121b4f20dd3a9c8480403614848f1aa97a0a0f1c6a236

consolekit/Pkgfile

@@ -1,7 +1,7 @@
 # Description: Framework for defining and tracking users, login sessions, and seats
 # URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: dbus gobject-introspection linux-pam xorg-libx11
+# Depends on: dbus glib-introspection linux-pam xorg-libx11
 # Optional: polkit
 
 name=consolekit

courier-unicode/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/aDs3h86TkJIOfmjO+mf9OzbE2FBdqD33IFn0MW1L+8nH8e1JjV8HGEvUPjxjwztrAD+kJJNQWpLu2Lv6qxjlwI=
-SHA256 (Pkgfile) = 9e4e75f971281071370dc2627a73ace9e6242e31673fd1f0e1e939c2681f0c56
+RWSE3ohX2g5d/ZC7OP5UvBlxhQU1MXmp9+10mwWYJ0aRDpOxaPLZZRq7czRoGy9xrDDIwtCrKEKkFmCnXD1GG3pPLUe2MB05WwI=
+SHA256 (Pkgfile) = 2ac41823c23255b8ba95ad9398b101a11ec3f32021c39af83726b7258a2d648d
 SHA256 (.footprint) = e8e5ed2a5fa85c51d910e1c8dc4423e98fa9bbaebb21d54fd8d91ddb00fd01c7
 SHA256 (courier-unicode-2.3.1.tar.bz2) = b83ee646a47c2a9d692fb6efb938564668c32ec179d4fac0c07eace8a1b8fc91

courier-unicode/Pkgfile

@@ -8,8 +8,8 @@ release=1
 source=(http://download.sourceforge.net/project/courier/$name/$version/$name-$version.tar.bz2)
 
 build() {
-	cd $name-$version
-	./configure --prefix=/usr
-	make
-	make DESTDIR=$PKG install
+    cd $name-$version
+    ./configure --prefix=/usr
+    make
+    make DESTDIR=$PKG install
 }

cryptsetup/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dnwhyl+t0luwha2v7eeNESGZUt03S/tVTq7t6JaG7POWvdSt+B+mguYrE3LzjuZKb1NFFH41TGt3Qe2l7cxLgQ=
-SHA256 (Pkgfile) = 2c166b1790cf344e635dc7182b66ad14a81dd659ea99d89e51ff45daa9e94c68
+RWSE3ohX2g5d/fR56/qiHbnRALgtcusOJFkGY0aIa8U+2FTPbfPH8cD0NHNPUTvsxz6LMRbCdYwiuRKBFn4tY4f/9E8vjOx9MwU=
+SHA256 (Pkgfile) = 1f5e9dcf6b94b036ab557bbb2b62a3f650037ce320267eea1ffd4cbd3cf1a207
 SHA256 (.footprint) = bf0b2af4b3b4bebce8d1ffba30175c378efe612246bd8105d25ee0843b557ad4
 SHA256 (cryptsetup-2.7.5.tar.xz) = d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522

cryptsetup/Pkgfile

@@ -9,18 +9,18 @@ release=1
 source=(https://www.kernel.org/pub/linux/utils/$name/v${version%.*}/$name-$version.tar.xz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	prt-get isinst asciidoctor || PKGMK_CRYPTSETUP+=' --disable-asciidoc'
+    prt-get isinst asciidoctor || PKGMK_CRYPTSETUP+=' --disable-asciidoc'
 
-	./configure $PKGMK_CRYPTSETUP \
-		--prefix=/usr \
-		--disable-nls \
-		--enable-static-cryptsetup \
-		--disable-ssh-token
-	make
-	make DESTDIR=$PKG install
+    ./configure $PKGMK_CRYPTSETUP \
+        --prefix=/usr \
+        --disable-nls \
+        --enable-static-cryptsetup \
+        --disable-ssh-token
+    make
+    make DESTDIR=$PKG install
 
-	install -d $PKG/sbin
-	mv $PKG/{usr/sbin,sbin}/cryptsetup.static
+    install -d $PKG/sbin
+    mv $PKG/{usr/sbin,sbin}/cryptsetup.static
 }

cups-browsed/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cDavA/S08jzNp+SMo6bD40TnZRAq/CcEgldrQASXZXdds8/J/J6auj1bz4TTv+K68uUzvdbz4K9TspNiLrdxww=
-SHA256 (Pkgfile) = 64e1ae40c8f71dfd330ecda7d4f5c36b13e3ebb0f7125fc625a0b0a9806f667b
+RWSE3ohX2g5d/djcqM51WRxxeBqf4yZ/MOmAMOrijF4KedDudyU1A0T195jjibRlcfinLzT9VNEExm1UAQN9EzIpr7A3Y9XOPAs=
+SHA256 (Pkgfile) = 4bd10681ab1a10c0fb497957da99a12062b354ff9c96c8b5c987b61666616ae8
 SHA256 (.footprint) = 0126cf808cf479a51e79e8d66093ef985df834da70f524894fb2b7e7e85401c8
 SHA256 (cups-browsed-2.1.1.tar.xz) = d185169a74e6a5731b6bd74cba8d269f34e5c71cb71ef1841f2fa91637ba1d58
 SHA256 (cups-browsed) = 48e0ee7f0e3060912f9d0e510789b6cfe9a3b28349f5e24be971978f75ba4327

cups-browsed/Pkgfile

@@ -1,31 +1,31 @@
 # Description: Helper daemon to browse the network for remote CUPS queues and IPP network printers
 # URL: https://github.com/OpenPrinting/cups-browsed
 # Maintainer: Juergen Daubert, jue at crux dot nu
-# Depends on: glib libcupsfilters libppd
+# Depends on: glib libppd
 # Optional: avahi
 
 name=cups-browsed
 version=2.1.1
 release=1
 source=(https://github.com/OpenPrinting/$name/releases/download/$version/$name-$version.tar.xz
-	cups-browsed)
+    cups-browsed)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	prt-get isinst avahi || PKGMK_CUPSBROWSED+=' --disable-avahi'
+    prt-get isinst avahi || PKGMK_CUPSBROWSED+=' --disable-avahi'
 
-	./configure $PKGMK_CUPSBROWSED \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--runstatedir=/run \
-		--with-cups-rundir=/run/cups \
-		--without-rcdir
+    ./configure $PKGMK_CUPSBROWSED \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --runstatedir=/run \
+        --with-cups-rundir=/run/cups \
+        --without-rcdir
 
-	make
-	make DESTDIR=$PKG install
+    make
+    make DESTDIR=$PKG install
 
-	install -D -m 0755 $SRC/cups-browsed $PKG/etc/rc.d/cups-browsed
+    install -D -m 0755 $SRC/cups-browsed $PKG/etc/rc.d/cups-browsed
 
-	rm -r $PKG/usr/share/doc
+    rm -r $PKG/usr/share/doc
 }

cups-filters/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Zxztn5iKpuqXe6exOhn1NO4TxyK8DdrFiYmwsotcTqrGZ5gg6VC+sKV9ZyybqykKeO26QqV0bUvAoguw2q9WAk=
-SHA256 (Pkgfile) = 320735e3d5a5711c826f2573f24fb67de1f4fa542af3ff53382292651c919f86
+RWSE3ohX2g5d/QDzaoz5dYNwxYykeKgJW9+ykhAquG258tvGopijpIZu3PgL1ip1D04hCnOp7Pq0FkSsV9Fl7lbx4q2n7v/Wvgo=
+SHA256 (Pkgfile) = ca48a665dc3006c63982e8eb443f329467ba5974ae6277fee0d4cfb6baf09ef8
 SHA256 (.footprint) = 89df0ab035324ce79797722686cdb9124022eb8e0b0a582a81f282c2b28a6372
 SHA256 (cups-filters-2.0.1.tar.xz) = 39e71de3ce06762b342749f1dc7cba6817738f7bf4d322c1bb9ab10b8569ab80

cups-filters/Pkgfile

@@ -10,14 +10,14 @@ release=1
 source=(https://github.com/OpenPrinting/cups-filters/releases/download/$version/$name-$version.tar.xz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	prt-get isinst mupdf || PKGMK_CUPSFILTERS+=' --disable-mutool'
-	prt-get isinst poppler || PKGMK_CUPSFILTERS+=' --disable-poppler'
+    prt-get isinst mupdf || PKGMK_CUPSFILTERS+=' --disable-mutool'
+    prt-get isinst poppler || PKGMK_CUPSFILTERS+=' --disable-poppler'
 
-	./configure $PKGMK_CUPSFILTERS --prefix=/usr
-	make
-	make DESTDIR=$PKG install
+    ./configure $PKGMK_CUPSFILTERS --prefix=/usr
+    make
+    make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/share/doc
+    rm -r $PKG/usr/share/doc
 }

cups/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/amrS4biIEqANn34ObPvNpcLhNUDc+cZBKiQ2CZGfjbTX8gl2RjGvpaOBIDHwGZH6SB3sFeBDQZHbeFPrShufwA=
-SHA256 (Pkgfile) = 963e5cea7c5723599ee09fbbdd3e1043200aecac44704cdc8735d9abfd337095
+RWSE3ohX2g5d/WUk7AXNeEIUYmyZFu7bEZKGf32fItuTjD0g3YMJsnqcOXn+EbJBcC4OtSaVxF4CT6m5ViqQtp7L8PJ2D0hmAwk=
+SHA256 (Pkgfile) = 6a2bb066d9f6add27e67169644474eefc41a882362def1eb914f114307953b8c
 SHA256 (.footprint) = dd3f14cab90e760795330704596f4eae51f16d72e5fa08dc344c5ffe54cccfb4
 SHA256 (cups-2.4.11-source.tar.gz) = 9a88fe1da3a29a917c3fc67ce6eb3178399d68e1a548c6d86c70d9b13651fd71
 SHA256 (cups.rc) = 050ec2210c1d05bb0a1b659705c9cf2a6967a7eabb9f71100309f15124e49e9f

cups/Pkgfile

@@ -8,48 +8,48 @@ name=cups
 version=2.4.11
 release=1
 source=(https://github.com/OpenPrinting/cups/releases/download/v$version/$name-$version-source.tar.gz
-	cups.rc cups.pam)
+    cups.rc cups.pam)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	PKGMK_CUPS=' --with-tls=openssl'
-	prt-get isinst gnutls && PKGMK_CUPS=' --with-tls=gnutls'
+    PKGMK_CUPS=' --with-tls=openssl'
+    prt-get isinst gnutls && PKGMK_CUPS=' --with-tls=gnutls'
 
-	CC=cc CXX=c++ \
-	./configure $PKGMK_CUPS \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libdir=/usr/lib \
-		--localstatedir=/var \
-		--with-rundir=/run/cups \
-		--with-docdir=/usr/share/cups/doc \
-		--with-logdir=/var/log/cups \
-		--with-cups-user=daemon \
-		--with-cups-group=lp \
-		--with-languages="" \
-		--without-rcdir \
-		--with-optim="$CFLAGS" \
-		--enable-acl \
-		--without-systemd
+    CC=cc CXX=c++ \
+    ./configure $PKGMK_CUPS \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libdir=/usr/lib \
+        --localstatedir=/var \
+        --with-rundir=/run/cups \
+        --with-docdir=/usr/share/cups/doc \
+        --with-logdir=/var/log/cups \
+        --with-cups-user=daemon \
+        --with-cups-group=lp \
+        --with-languages="" \
+        --without-rcdir \
+        --with-optim="$CFLAGS" \
+        --enable-acl \
+        --without-systemd
 
-	make
-	make BUILDROOT=$PKG install
+    make
+    make BUILDROOT=$PKG install
 
-	# conflict with cups-filters
-	rm -r $PKG/usr/share/cups/{banners,data}
+    # conflict with cups-filters
+    rm -r $PKG/usr/share/cups/{banners,data}
 
-	# cleanup
-	rm -r $PKG/usr/share/{applications,icons}
-	rm -r $PKG/run
-	chmod 0755 $PKG/var/{cache,spool}   
-	chmod -R +w $PKG
+    # cleanup
+    rm -r $PKG/usr/share/{applications,icons}
+    rm -r $PKG/run
+    chmod 0755 $PKG/var/{cache,spool}   
+    chmod -R +w $PKG
 
-	# start script and pam module
-	install -D -m 755 $SRC/cups.rc $PKG/etc/rc.d/cups
-	install -D -m 644 $SRC/cups.pam $PKG/etc/pam.d/cups
+    # start script and pam module
+    install -D -m 755 $SRC/cups.rc $PKG/etc/rc.d/cups
+    install -D -m 644 $SRC/cups.pam $PKG/etc/pam.d/cups
 
-	# blacklist usblp kernel module
-	install -d $PKG/etc/modprobe.d
-	echo 'blacklist usblp' > $PKG/etc/modprobe.d/cups.conf
+    # blacklist usblp kernel module
+    install -d $PKG/etc/modprobe.d
+    echo 'blacklist usblp' > $PKG/etc/modprobe.d/cups.conf
 }

cyrus-sasl/.signature

@@ -1,9 +1,10 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YmC91GeP88oLLOkyWA54/ejhPfSHQD9FmxcxsDepp6VOIaQ1Lar5krSpARc2Ej1b2DpRGlBngsnVO3HZFzGdwA=
-SHA256 (Pkgfile) = 1071d1e586969c47f2be99e2fe4e0813c7a2a4b71865f55e97b4f3847e106735
+RWSE3ohX2g5d/UZum2f9qPwBxXqjaYgYLcl0/pU9uJ6IOh39VFK+TOcCJY+ZsfaPSPMzx0ld74RT7u7yH5n0SDtbjnSXMeivoQs=
+SHA256 (Pkgfile) = 6e2e66310b4ff0c17d427cbeae784fbcfa6b8e359c43a7f69f9e34a793d44c9b
 SHA256 (.footprint) = 3bc9d6a85a4a09db8e0b6fe41e56074265457b8470f5d26db1d7edf3957d4a6a
 SHA256 (cyrus-sasl-2.1.28.tar.gz) = 7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
 SHA256 (0013-Don-t-use-la-files-for-opening-plugins.patch) = bbee401c01dc6942710e0c1285091fcd98588bf636b52f24ed0e3b04039b748b
 SHA256 (0022-Fix-keytab-option-for-MIT-Kerberos.patch) = 1a0ae7bd722d57feb6fab12c05eb1922982c68bd9be1c165d405954012e6634f
 SHA256 (0032-Add-with_pgsql-include-postgresql-to-include-path.patch) = 069a731f90617cb75fd7029876b714078b1c4187c217f90d7dc8d896e2445aa4
+SHA256 (time-include.patch) = 071f880f1887715e14328e1033eaa36487bac910a1cd9bad051c92518d95ce5d
 SHA256 (saslauthd) = 2a96dca868261d5275087ed8e1eef59946f47c6d35797368710c3037f46e61bd

cyrus-sasl/Pkgfile

@@ -1,7 +1,7 @@
 # Description: Simple Authentication and Security Layer
 # URL: https://www.cyrusimap.org/sasl/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: db openssl linux-pam
+# Depends on: openssl linux-pam
 # Optional: krb5 mariadb openldap postgresql
 
 name=cyrus-sasl
@@ -11,6 +11,7 @@ source=(https://github.com/cyrusimap/$name/releases/download/$name-$version/$nam
   0013-Don-t-use-la-files-for-opening-plugins.patch
   0022-Fix-keytab-option-for-MIT-Kerberos.patch
   0032-Add-with_pgsql-include-postgresql-to-include-path.patch
+  time-include.patch
   saslauthd)
 
 build() {
@@ -20,6 +21,7 @@ build() {
   patch -p1 -i $SRC/0022-Fix-keytab-option-for-MIT-Kerberos.patch
   prt-get isinst postgresql && \
     patch -p1 -i $SRC/0032-Add-with_pgsql-include-postgresql-to-include-path.patch
+  patch -p1 -i $SRC/time-include.patch
 
   CPPFLAGS="$CFLAGS"
 
@@ -44,26 +46,23 @@ build() {
   autoconf
 
   ./configure $PKGMK_CYRUSSASL \
-      --prefix=/usr \
-      --sysconfdir=/etc/sasl \
-      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-      --with-plugindir=/usr/lib/sasl2 \
-      --with-saslauthd=/var/sasl/saslauthd \
-      --with-dbpath=/var/sasl/sasldb2 \
-      --with-dblib=berkeley \
-      --with-bdb-incdir=/usr/include \
-      --with-bdb-libdir=/usr/lib \
-      --with-openssl=/usr \
-      --with-devrandom=/dev/urandom \
-      --with-sqlite3=/usr/lib \
-      --enable-login \
-      --enable-cram \
-      --enable-digest \
-      --enable-shared \
-      --enable-auth-sasldb \
-      --enable-plain \
-      --enable-login \
-      --enable-ntlm
+    --prefix=/usr \
+    --sysconfdir=/etc/sasl \
+    --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
+    --with-plugindir=/usr/lib/sasl2 \
+    --with-saslauthd=/var/sasl/saslauthd \
+    --with-dbpath=/var/sasl/sasldb2 \
+    --with-openssl=/usr \
+    --with-devrandom=/dev/urandom \
+    --with-sqlite3=/usr/lib \
+    --enable-login \
+    --enable-cram \
+    --enable-digest \
+    --enable-shared \
+    --enable-auth-sasldb \
+    --enable-plain \
+    --enable-login \
+    --enable-ntlm
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
   make CFLAGS="$CFLAGS -fPIC"

cyrus-sasl/time-include.patch

@@ -0,0 +1,24 @@
+diff -Naur cyrus-sasl-2.1.28.old/lib/saslutil.c cyrus-sasl-2.1.28/lib/saslutil.c
+--- cyrus-sasl-2.1.28.old/lib/saslutil.c	2024-05-13 23:13:13.373438223 +0200
++++ cyrus-sasl-2.1.28/lib/saslutil.c	2024-05-13 23:13:35.936370004 +0200
+@@ -59,9 +59,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+-#ifdef HAVE_TIME_H
+ #include <time.h>
+-#endif
+ #include "saslint.h"
+ #include <saslutil.h>
+ 
+diff -Naur cyrus-sasl-2.1.28.old/plugins/cram.c cyrus-sasl-2.1.28/plugins/cram.c
+--- cyrus-sasl-2.1.28.old/plugins/cram.c	2024-05-13 23:13:13.378438205 +0200
++++ cyrus-sasl-2.1.28/plugins/cram.c	2024-05-13 23:13:56.700323193 +0200
+@@ -56,6 +56,7 @@
+ #include <sasl.h>
+ #include <saslplug.h>
+ #include <saslutil.h>
++#include <time.h>
+ 
+ #include "plugin_common.h"
+ 

dar/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YMY/nYQzyMrN1w7NyVnqb+Y5XGAbJfhE6OJ8sEYjMbGBzNL+FnmuHPATDtcFjOvPKHubaBv2StzJYpwMqpbEwQ=
-SHA256 (Pkgfile) = a3ebe6e389ffb47d77cdd5f05f0e54667ef8867e79cc9f940d4175d55c60494a
+RWSE3ohX2g5d/SH6wDpb3Q1EB1gYOys62tfstopGu1qOfuwEaqtixGjeiKlclLXZJdqfiV4c/uDrD4WzPevwQOW8GWViaF0TXgw=
+SHA256 (Pkgfile) = 78105c5ec0a1b16d8133472a787baae58012a07dd5bf9bd6120bda4f84ed51fd
 SHA256 (.footprint) = 60f964a1107c8bf8dd0ce6ef29dd90a10c0bb5792d5e35c0fdfbf881ca809367
 SHA256 (dar-2.7.16.tar.gz) = 1aac0eab03602ccfa3696c2e1817c09665deee124da6c319d77f1ee1d641804d

dar/Pkgfile

@@ -1,7 +1,7 @@
 # Description: Disk ARchive - a sophisticated backup utility for Linux
 # URL: http://dar.linux.free.fr/
 # Maintainer: Juergen Daubert, jue at crux dot nu
-# Depends on: attr bzip2 curl lzo xz zlib zstd
+# Depends on: attr bzip2 curl lzo
 # Optional: argon2 gpgme libgcrypt lz4
 
 name=dar
@@ -10,19 +10,19 @@ release=1
 source=(http://downloads.sourceforge.net/project/dar/dar/$version/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	prt-get isinst gpgme || PKGMK_DAR+=' --disable-gpgme-linking'
+    prt-get isinst gpgme || PKGMK_DAR+=' --disable-gpgme-linking'
 
-	CONFIG_SHELL=/bin/bash \
-	./configure $PKGMK_DAR \
-		--prefix=/usr \
-		--disable-nls \
-		--enable-mode=64 \
-		--disable-build-html
+    CONFIG_SHELL=/bin/bash \
+    ./configure $PKGMK_DAR \
+        --prefix=/usr \
+        --disable-nls \
+        --enable-mode=64 \
+        --disable-build-html
 
-	make V=0
-	make DESTDIR=$PKG install
+    make V=0
+    make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/share/dar
+    rm -r $PKG/usr/share/dar
 }

dbus-glib/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ayOLybOtbTLr7Lp0I6Nt+tToH6pFPhLM0Iqct1qhERSCB86Vcq3+HR1mLGGCtKfvw+CerTqSHbNFb757qgI+AU=
-SHA256 (Pkgfile) = 2126993637c6666f8c5911f0ec5a54b8c1e269e99f965b0f4911cdf7c70b208a
+RWSE3ohX2g5d/d3LqEjJhRo5yaMag74JXOPJyUS721vfgkbS++r+IzGVPAOfkjFn9OX3CioXrnuKpQY7bGTEftyTUH8ke4+zKAU=
+SHA256 (Pkgfile) = 0e63c0efd069bd4159d43c5bf5fe72becdce48611f8a45f21e80cb11fb08abec
 SHA256 (.footprint) = ed21101f6ec01240f8881bbaf3293534d314e52ad3fd237d16f6dc6ec8ef3b4b
 SHA256 (dbus-glib-0.112.tar.gz) = 7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a

dbus-glib/Pkgfile

@@ -9,16 +9,16 @@ release=2
 source=(https://dbus.freedesktop.org/releases/$name/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	prt-get isinst bash-completion || PKGMK_DBUSGLIB+=' --enable-bash-completion=no'
+    prt-get isinst bash-completion || PKGMK_DBUSGLIB+=' --enable-bash-completion=no'
 
-	./configure $PKGMK_DBUSGLIB \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/dbus-glib \
-		--disable-static
-	make
-	make DESTDIR=$PKG install
+    ./configure $PKGMK_DBUSGLIB \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/dbus-glib \
+        --disable-static
+    make
+    make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/share/gtk-doc
+    rm -r $PKG/usr/share/gtk-doc
 }

dbus/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/a3I42BMKnMSjNxjkk5Gb42Sf1bTC6tLeCRD//2boLMeCzzPAzE9WEGSWWtLaPXIacPJSqInjwK7xT3IUelWpwM=
-SHA256 (Pkgfile) = ad03d6867615efe65eb130dd8e5a7561e39517bf98369dcfe963dccc4be5b6ef
+RWSE3ohX2g5d/cVQgbKTaHuIeW8F0EPnJuogFtH8h4Z8Ey4Ckx9pfmixAxwHD5cYp6wPICnwHBJTk1fKfVmlkmstA+dXtlFkwAw=
+SHA256 (Pkgfile) = 08764e73832f4e23387a088597fae6c6358432b5f8d0318a03527d9d8208ac50
 SHA256 (.footprint) = 74d5078939250998c0a0e5db60cbac68cf67980f6cbdb8bc9c791ec8a3dc994d
 SHA256 (dbus-1.16.0.tar.xz) = 9f8ca5eb51cbe09951aec8624b86c292990ae2428b41b856e2bed17ec65c8849
 SHA256 (fix-daemon-location.patch) = 32862e56777619a479ebefc45589cb76207c836de24a8bca14aecb4552e42528

dbus/Pkgfile

@@ -26,7 +26,6 @@ build() {
         -D runtime_dir=/run \
         -D system_pid_file=/run/dbus/pid \
         -D system_socket=/run/dbus/system_bus_socket
-
     meson compile -C build
     DESTDIR=$PKG meson install -C build
 

dialog/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/boJTh8Wc9JZja8IaM+mIVthh4sY+CDaAXoJFY4/0PO1gEmw/iIV4ugGBJeMrYAm5RBcOJkzTlqgWOxWKvMcpQQ=
-SHA256 (Pkgfile) = c5021a188ecfce199e317ad06ae53d3ff156095b91d8758b341d7e142855554d
+RWSE3ohX2g5d/b+SsOPYYUEyiAdF7fIMi27dl329BikR8X70Ju84pgD/MA61TNVCq9qYUi9u5EbR422Mzldb1pC7dziCoHu4BwY=
+SHA256 (Pkgfile) = 59bb7f6c643d140791f7e0a4bd146fdbc2ce1018c80754726d976d72004e7cc7
 SHA256 (.footprint) = f0120269ef1cd244a1f1e263249bb22e28cad98b4dcae44048d538b9fa3d71e8
 SHA256 (dialog-1.3-20250116.tgz) = 68406329827b783d0a8959cc20a94c6e1791ac861a27f854e06e9020541816dd

dialog/Pkgfile

@@ -9,8 +9,8 @@ release=1
 source=(https://invisible-mirror.net/archives/$name/$name-$version.tgz)
 
 build () {
-	cd $name-$version
-	./configure --prefix=/usr --with-ncursesw
-	make
-	make DESTDIR=$PKG install
+    cd $name-$version
+    ./configure --prefix=/usr --with-ncursesw
+    make
+    make DESTDIR=$PKG install
 }

dnsmasq/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Wb2T3BMk9bjNDjfk/i/1V+hQnmhz9r/RGTdCVrjJfyjpmag5nBww0zd9Wd190Ib/PzEs073sPdDMsLWVLXymAE=
-SHA256 (Pkgfile) = 51f90f5e344869664772703cd5042c31331fb6a7e947aa05a7d5469e0266318e
+RWSE3ohX2g5d/eKZ0bP+flWQ5cu3kbPkASgQTX7AYoUmJVKoe1p1s+B7O7+YS1Fi193Q1rUUKhG8X0sIM6hTmAP0ungzvyhf8Ak=
+SHA256 (Pkgfile) = c97902c0a9853c1c4b54e41e402a4ebd1bce8161c85a0c17f7f52b07bc770d64
 SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
 SHA256 (dnsmasq-2.90.tar.xz) = 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4
 SHA256 (dnsmasq-config.patch) = da7d99b46a2b86e405000a6f9f1412bf5264deb186364849a9986d44efb42450

dnsmasq/Pkgfile

@@ -7,19 +7,19 @@ name=dnsmasq
 version=2.90
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
-	$name-config.patch dnsmasq)
+    $name-config.patch dnsmasq)
 
 build () {
-	cd $name-$version
+    cd $name-$version
 
-	patch -p1 -i $SRC/$name-config.patch
+    patch -p1 -i $SRC/$name-config.patch
 
-	make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -W -Wall"
-	make PREFIX=$PKG/usr install-common
+    make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -W -Wall"
+    make PREFIX=$PKG/usr install-common
 
-	install -d  $PKG/{var/lib/dhcp,etc/rc.d,usr/share/dnsmasq}
+    install -d  $PKG/{var/lib/dhcp,etc/rc.d,usr/share/dnsmasq}
 
-	install -m 755 $SRC/dnsmasq $PKG/etc/rc.d/
-	install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf
-	install -m 644 trust-anchors.conf $PKG/usr/share/dnsmasq
+    install -m 755 $SRC/dnsmasq $PKG/etc/rc.d/
+    install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf
+    install -m 644 trust-anchors.conf $PKG/usr/share/dnsmasq
 }

dovecot/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UOhF3l0G2rajUfFthQq+Is04ZyJkumROehAp+xtSjGbZW/AjS+ZI585JoISNY1TY/9Y+qd3EeWbKMRb+xqYzwo=
-SHA256 (Pkgfile) = d1ec3621ee1e117ea19e3d137312448edd6cb06005335a99c723f9f3552c6fc4
+RWSE3ohX2g5d/ZcU5s6BH+n1v3D06suetiTGfKhUXkV7R1JdqRYl7+YWHCBORvkEg4j1LUMYIqXAb3jp5Josf/Q+RYr67Rngzgc=
+SHA256 (Pkgfile) = e0c0336a83c30c146fe2611735a77eb160bb35872c6d2dcebb7d98ea6d0ebb18
 SHA256 (.footprint) = 9ce92920e115b45f8344dfe4a614d3d5ffaf44b0bedcd80ec11dc110e15c78ec
 SHA256 (dovecot-2.3.21.1.tar.gz) = 2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e
 SHA256 (dovecot-2.3.21-openssl3_fixes-1.patch) = 1742462cf50be084d9b7972fd1aaf2d8180a6fda6c7fb103e1df6ff68e8b7633

dovecot/Pkgfile

@@ -8,64 +8,63 @@ name=dovecot
 version=2.3.21.1
 release=1
 source=(https://dovecot.org/releases/2.3/$name-$version.tar.gz
-	dovecot-2.3.21-openssl3_fixes-1.patch
-	dovecot-2.3.21-security_fix-1.patch
-	dovecot.rc dovecot.pam)
+    dovecot-2.3.21-openssl3_fixes-1.patch
+    dovecot-2.3.21-security_fix-1.patch
+    dovecot.rc dovecot.pam)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	patch -Np1 -i $SRC/dovecot-2.3.21-openssl3_fixes-1.patch
-	patch -Np1 -i $SRC/dovecot-2.3.21-security_fix-1.patch
-	autoreconf -fvi
+    patch -Np1 -i $SRC/dovecot-2.3.21-openssl3_fixes-1.patch
+    patch -Np1 -i $SRC/dovecot-2.3.21-security_fix-1.patch
+    autoreconf -fvi
 
-	prt-get isinst clucene && PKGMK_DOVECOT+=' --with-lucene'
-	prt-get isinst icu && PKGMK_DOVECOT+=' --with-icu'
-	prt-get isinst krb5 && PKGMK_DOVECOT+=' --with-gssapi'
-	prt-get isinst libsodium && PKGMK_DOVECOT+=' --with-sodium'
-	prt-get isinst lua53 && PKGMK_DOVECOT+=' --with-lua=plugin'
-	prt-get isinst mariadb && PKGMK_DOVECOT+=' --with-mysql'
-	prt-get isinst nss && PKGMK_DOVECOT+=' --with-nss'
-	prt-get isinst openldap && PKGMK_DOVECOT+=' --with-ldap=plugin'
-	prt-get isinst postgresql && PKGMK_DOVECOT+=' --with-pgsql'
+    prt-get isinst clucene && PKGMK_DOVECOT+=' --with-lucene'
+    prt-get isinst icu && PKGMK_DOVECOT+=' --with-icu'
+    prt-get isinst krb5 && PKGMK_DOVECOT+=' --with-gssapi'
+    prt-get isinst libsodium && PKGMK_DOVECOT+=' --with-sodium'
+    prt-get isinst lua53 && PKGMK_DOVECOT+=' --with-lua=plugin'
+    prt-get isinst mariadb && PKGMK_DOVECOT+=' --with-mysql'
+    prt-get isinst nss && PKGMK_DOVECOT+=' --with-nss'
+    prt-get isinst openldap && PKGMK_DOVECOT+=' --with-ldap=plugin'
+    prt-get isinst postgresql && PKGMK_DOVECOT+=' --with-pgsql'
 
-	CPPFLAGS="-I/usr/include/tirpc" \
-	LDFLAGS+=" -ltirpc" \
-	./configure $PKGMK_DOVECOT \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-rundir=/run/dovecot \
-		--with-moduledir=/usr/lib/dovecot/modules \
-		--with-rundir=/run/dovecot \
-		--with-sql \
-		--with-sqlite \
-		--with-libcap \
-		--with-pam \
-		--with-ssl=openssl
+    CPPFLAGS="-I/usr/include/tirpc" \
+    LDFLAGS+=" -ltirpc" \
+    ./configure $PKGMK_DOVECOT \
+        --prefix=/usr \
+        --libexecdir=/usr/lib \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-rundir=/run/dovecot \
+        --with-moduledir=/usr/lib/dovecot/modules \
+        --with-sql \
+        --with-sqlite \
+        --with-libcap \
+        --with-pam \
+        --with-ssl=openssl
 
-	make
-	make DESTDIR=$PKG install
+    make
+    make DESTDIR=$PKG install
 
-	cp -r $PKG/usr/share/doc/dovecot/example-config/* $PKG/etc/dovecot
+    cp -r $PKG/usr/share/doc/dovecot/example-config/* $PKG/etc/dovecot
 
-	# RC script
-	install -D -m 755 $SRC/dovecot.rc $PKG/etc/rc.d/dovecot
+    # RC script
+    install -D -m 755 $SRC/dovecot.rc $PKG/etc/rc.d/dovecot
 
-	# PAM
-	install -D -m 644 $SRC/dovecot.pam $PKG/etc/pam.d/dovecot
+    # PAM
+    install -D -m 644 $SRC/dovecot.pam $PKG/etc/pam.d/dovecot
 
-	# SSL
-	install -d $PKG/etc/ssl/{certs,private}
-	touch $PKG/etc/ssl/certs/dovecot.pem
-	touch $PKG/etc/ssl/private/dovecot.pem
-	chmod 0600 $PKG/etc/ssl/{certs/dovecot.pem,private/dovecot.pem}
+    # SSL
+    install -d $PKG/etc/ssl/{certs,private}
+    touch $PKG/etc/ssl/certs/dovecot.pem
+    touch $PKG/etc/ssl/private/dovecot.pem
+    chmod 0600 $PKG/etc/ssl/{certs/dovecot.pem,private/dovecot.pem}
 
-	# directories
-	install -d -m 0750 $PKG/var/lib/dovecot
+    # directories
+    install -d -m 0750 $PKG/var/lib/dovecot
 
-	# cleanup
-	rm -r $PKG/usr/share/doc
-	rm $PKG/etc/dovecot/README
+    # cleanup
+    rm -r $PKG/usr/share/doc
+    rm $PKG/etc/dovecot/README
 }

dropbear/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RIFgvLQibvJGcW9YzkIU+idsUrXM1o3zRZWOh2WvR0hlR0Q7wYEtEvuHZ2CgRlIgHcrDlz3tappkS1khdv2rAk=
-SHA256 (Pkgfile) = d0294124cec29d3e3867cb5ba5b2329a7f323a89ecf16b3489d885449e549afa
+RWSE3ohX2g5d/awDzX/5yrzf4KYXz3fwwlUwzv2pr2EuzU908RA+bG2ZtE6rE0vEEWQxAbu26naTHG3Qw0IBAm2ym5LA8ICRKwk=
+SHA256 (Pkgfile) = 57b8ca7e8668a87e1ef5df3b25fcda96cc144676bebcb699a143bd7994eca0eb
 SHA256 (.footprint) = 5d47799d69d21b860be70eb9e767298617679bcee2140d245cbc74f4a2a4502e
 SHA256 (dropbear-2024.86.tar.bz2) = e78936dffc395f2e0db099321d6be659190966b99712b55c530dd0a1822e0a5e
 SHA256 (dropbear.rc) = 81c63263e036a042d1c72a594f1f836e9fc861f6e7c2ae8434db80952595acf1

dropbear/Pkgfile

@@ -7,23 +7,23 @@ name=dropbear
 version=2024.86
 release=1
 source=(https://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \
-	dropbear.rc dropbear.pam)
+    dropbear.rc dropbear.pam)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	sed '/pam_start/s/sshd/dropbear/' -i src/svr-authpam.c
+    sed '/pam_start/s/sshd/dropbear/' -i src/svr-authpam.c
 
-	echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h
-	echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h
-	echo '#define DROPBEAR_SVR_PAM_AUTH 1' >> localoptions.h
-	echo '#define DROPBEAR_PIDFILE "/run/dropbear.pid"' >> localoptions.h
+    echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h
+    echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h
+    echo '#define DROPBEAR_SVR_PAM_AUTH 1' >> localoptions.h
+    echo '#define DROPBEAR_PIDFILE "/run/dropbear.pid"' >> localoptions.h
 
-	./configure --prefix=/usr --enable-pam
-	make
-	make DESTDIR=$PKG install
+    ./configure --prefix=/usr --enable-pam
+    make
+    make DESTDIR=$PKG install
 
-	install -d $PKG/etc/{rc.d,pam.d,dropbear}
-	install -m 755 $SRC/dropbear.rc $PKG/etc/rc.d/dropbear
-	install -m 644 $SRC/dropbear.pam $PKG/etc/pam.d/dropbear
+    install -d $PKG/etc/{rc.d,pam.d,dropbear}
+    install -m 755 $SRC/dropbear.rc $PKG/etc/rc.d/dropbear
+    install -m 644 $SRC/dropbear.pam $PKG/etc/pam.d/dropbear
 }

dtc/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eku4rdrRVHzuWqeY1Y/mhONk9yKigbZ6nSYu1K27kJSSmZ2mrwNED0ZR+iThbKHAEb4etI3pA4s83XsW7gmrwc=
-SHA256 (Pkgfile) = 5a9320da5ed1268d2b655fc22492f3dee37c6d6d15272800a45dc86667a2488b
+RWSE3ohX2g5d/cZu/uz+uNdDnitaT3t+qcJFds15GI+2w6yYLXLj+ATPgKMQXJ0GAcNo8IvDmLUIPB+C+pYkwyp5IU916WT4KA4=
+SHA256 (Pkgfile) = f62f78d6088d8af8a25dae5da9540dcdcabb145bf3537f845feb26915dbe4140
 SHA256 (.footprint) = bdaaa037643d239d3505630f90aa81183fda328505b263e1692c042d634f0050
 SHA256 (dtc-1.7.2.tar.xz) = 92d8ca769805ae1f176204230438fe52808f4e1c7944053c9eec0e649b237539

dtc/Pkgfile

@@ -8,15 +8,15 @@ release=1
 source=(https://www.kernel.org/pub/software/utils/$name/$name-$version.tar.xz)
 
 build() {
-	CFLAGS+=" -ffat-lto-objects"
+    CFLAGS+=" -ffat-lto-objects"
 
-	meson setup build $name-$version \
-		--prefix=/usr \
-		--buildtype=plain \
-		--wrap-mode nodownload \
-		-D b_lto=true \
-		-D b_pie=true
+    meson setup build $name-$version \
+        --prefix=/usr \
+        --buildtype=plain \
+        --wrap-mode nodownload \
+        -D b_lto=true \
+        -D b_pie=true
 
-	meson compile -C build -j ${JOBS:-1}
-	DESTDIR=$PKG meson install -C build
+    meson compile -C build -j ${JOBS:-1}
+    DESTDIR=$PKG meson install -C build
 }

efibootmgr/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fAJPAvncvz4pCBXg1a31D8FVKTapf1PxCGDIl2AT3eMT/m9IRSvVxSTxm661TQWDi/YAUWyZcZTIYSTZdEngQ8=
-SHA256 (Pkgfile) = 25cad8463d2f1cb4824845d2f72a3901302dd70ef2bafbecfa51aae7b726e7f7
+RWSE3ohX2g5d/aNNy6uFUjOf9vJLPKgARNDcQXoJPaP8XfPEkljYGXi8J9CQT4Ny0bv8AW2JZrxZpO6SRvlWQ8NHrajN6YZANAk=
+SHA256 (Pkgfile) = 6209c7a66475b82b6ba8444622e4c476eac5cf91ce8574bc87578c188e88f7f5
 SHA256 (.footprint) = e34f18fd1083f800387ab49d04767d3d41735415249dcd80b13acf5c78108282
 SHA256 (efibootmgr-18.tar.gz) = 442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874

efibootmgr/Pkgfile

@@ -9,13 +9,13 @@ release=1
 source=(https://github.com/rhboot/efibootmgr/archive/$version/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
+    cd $name-$version
 
-	export CFLAGS="${CFLAGS} -Wno-error=pointer-sign"
-	sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
+    export CFLAGS="${CFLAGS} -Wno-error=pointer-sign"
+    sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
 
-	EFIDIR=/boot/efi make
+    EFIDIR=/boot/efi make
 
-	install -D src/efibootmgr $PKG/usr/sbin/efibootmgr
-	install -D src/efibootmgr.8 $PKG/usr/share/man/man8/efibootmgr.8
+    install -D src/efibootmgr $PKG/usr/sbin/efibootmgr
+    install -D src/efibootmgr.8 $PKG/usr/share/man/man8/efibootmgr.8
 }

efivar/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/esyKcnGs6RhNlS08X6++/nhN1cZtZJDa9ROCVT8hC+gqw7UwHnQeRk4Pd6UhmpEloqVLUQiNjPk6UW4A7tXpAk=
-SHA256 (Pkgfile) = bf53db9214a950671cb945d759306a73a49152da0ec2cb7bb3bc84a2e7669a05
+RWSE3ohX2g5d/b9Z9b5N40CosHMf5yCOV+D4Wrvus6Arx09twQuZdiuZ6/6PKVyAFoUKCe0Fssz/aztwg1RHWMDgCUnzv2A/UAc=
+SHA256 (Pkgfile) = a602c52cf9e1b3bd42c2bf95afae00ef9d4c46c5daca6cc49ebfcc89f354a727
 SHA256 (.footprint) = cda25328607e977632487a52459e8c0627171d2d565cf152bbf429bf1acd095e
 SHA256 (efivar-39.tar.gz) = c9edd15f2eeeea63232f3e669a48e992c7be9aff57ee22672ac31f5eca1609a6

efivar/Pkgfile

@@ -10,8 +10,8 @@ source=(https://github.com/rhboot/efivar/archive/refs/tags/$version.tar.gz)
 renames=($name-$version.tar.gz)
 
 build() {
-	cd $name-$version
-	sed 's/docs//' -i Makefile
-	make -j1
-	make libdir=/usr/lib DESTDIR=$PKG install
+    cd $name-$version
+    sed 's/docs//' -i Makefile
+    make -j1
+    make libdir=/usr/lib DESTDIR=$PKG install
 }

evilwm/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZMVw0s5IiEopfbqWP8+9gzfmJsmlKi/JUSmkLampuOs/y0uZZl94ST4bmnRLAOSn2g9nkse+tSF8xomXrd2dg8=
-SHA256 (Pkgfile) = b4bdda5e4e9f41243790d9b1a289d7d56b7d51864d192b7ae0b5a7da514ecd76
+RWSE3ohX2g5d/WmnS9QjIenKTbO+4fn9M0Ig4XU0AL4mQr9/zyNbVpvJyujDmM53+SekZ5yTAdW9deZqoLZVk/MlTSBTUEgDaAg=
+SHA256 (Pkgfile) = f168d87d3d909c52666f3256aa98a07fe7186dbec3427b82fbb7adbc776474a9
 SHA256 (.footprint) = bff62d7952f34e12cc944cb6a62b6ef238682ec8bbc73d2c51a88149f99d23a5
 SHA256 (evilwm-1.4.3.tar.gz) = d5945b20b12c91db2412fac0dbda3fb9c3ec8debb8e1b109838992b2b1bbe5d4