diff --git a/common/shlibs b/common/shlibs index 645e96e38d1dd6..fc5fb6e1b0b344 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4036,58 +4036,137 @@ libevemu.so.3 evemu-2.7.0_1 libinih.so.0 inih-52_1 libINIReader.so.0 inih-57_1 libpcaudio.so.0 pcaudiolib-1.1_1 -libdcerpc-samr.so.0 samba-4.13.2_1 -libdcerpc-server-core.so.0 samba-4.13.2_1 -libnetapi.so.0 samba-4.13.2_1 -libnss_winbind.so.2 samba-4.13.2_1 -libnss_wins.so.2 samba-4.13.2_1 -libsamba-policy.so.0 samba-4.13.2_1 -libauth-unix-token-samba4.so samba-4.13.2_1 -libauth4-samba4.so samba-4.13.3_1 -libdcerpc-samba4.so samba-4.13.2_1 -libdsdb-module-samba4.so samba-4.13.2_1 -libgpext-samba4.so samba-4.13.2_1 -libnet-keytab-samba4.so samba-4.13.3_1 -libposix-eadb-samba4.so samba-4.13.2_1 -libprinting-migrate-samba4.so samba-4.13.2_1 -libsamba-net-samba4.so samba-4.13.2_1 -libsamba-python-samba4.so samba-4.13.3_1 -libshares-samba4.so samba-4.13.2_1 -libsmbd-base-samba4.so samba-4.13.2_1 -libsmbd-conn-samba4.so samba-4.13.2_1 -libsmbpasswordparser-samba4.so samba-4.13.3_1 -libxattr-tdb-samba4.so samba-4.13.2_1 -libdcerpc.so.0 samba-libs-4.13.2_1 -libdcerpc-binding.so.0 samba-libs-4.13.2_1 -libndr-krb5pac.so.0 samba-libs-4.13.2_1 -libndr-nbt.so.0 samba-libs-4.13.2_1 -libndr-standard.so.0 samba-libs-4.13.2_1 -libndr.so.1 samba-libs-4.13.2_1 -libsamba-credentials.so.1 samba-libs-4.13.2_1 -libsamba-errors.so.1 samba-libs-4.13.2_1 -libsamba-hostconfig.so.0 samba-libs-4.13.2_1 -libsamba-passdb.so.0 samba-libs-4.13.2_1 -libsamba-util.so.0 samba-libs-4.13.2_1 -libsamdb.so.0 samba-libs-4.13.2_1 -libsmbclient.so.0 samba-libs-4.13.2_1 -libsmbconf.so.0 samba-libs-4.13.2_1 -libsmbldap.so.2 samba-libs-4.13.2_1 -libwbclient.so.0 samba-libs-4.13.2_1 -libcli-ldap-samba4.so samba-libs-4.13.2_1 -libcliauth-samba4.so samba-libs-4.13.2_1 -libcluster-samba4.so samba-libs-4.13.3_1 -libcommon-auth-samba4.so samba-libs-4.13.2_1 -libdcerpc-samba-samba4.so samba-libs-4.13.2_1 -libflag-mapping-samba4.so samba-libs-4.13.3_1 -libgpo-samba4.so samba-libs-4.13.2_1 -libiov-buf-samba4.so samba-libs-4.13.3_1 -libndr-samba-samba4.so samba-libs-4.13.2_1 -libndr-samba4.so samba-libs-4.13.2_1 -libprinter-driver-samba4.so samba-libs-4.13.3_1 -libsmb-transport-samba4.so samba-libs-4.13.2_1 -libtdb-wrap-samba4.so samba-libs-4.13.3_1 -libutil-cmdline-samba4.so samba-libs-4.13.2_1 -libwinbind-client-samba4.so samba-libs-4.13.2_1 +libdcerpc.so.0 samba-libs-4.20.1_1 +libdcerpc-binding.so.0 samba-libs-4.20.1_1 +libdcerpc-samr.so.0 samba-libs-4.20.1_1 +libdcerpc-server.so.0 samba-libs-4.20.1_1 +libdcerpc-server-core.so.0 samba-libs-4.20.1_1 +libndr.so.4 samba-libs-4.20.1_1 +libndr-krb5pac.so.0 samba-libs-4.20.1_1 +libndr-nbt.so.0 samba-libs-4.20.1_1 +libndr-standard.so.0 samba-libs-4.20.1_1 +libnetapi.so.1 samba-libs-4.20.1_1 +libnss_winbind.so.2 samba-libs-4.20.1_1 +libnss_wins.so.2 samba-libs-4.20.1_1 +libsamba-credentials.so.1 samba-libs-4.20.1_1 +libsamba-errors.so.1 samba-libs-4.20.1_1 +libsamba-hostconfig.so.0 samba-libs-4.20.1_1 +libsamba-passdb.so.0 samba-libs-4.20.1_1 +libsamba-policy.so.0 samba-libs-4.20.1_1 +libsamba-util.so.0 samba-libs-4.20.1_1 +libsamdb.so.0 samba-libs-4.20.1_1 +libsmbclient.so.0 samba-libs-4.20.1_1 +libsmbconf.so.0 samba-libs-4.20.1_1 +libsmbldap.so.2 samba-libs-4.20.1_1 +libtevent-util.so.0 samba-libs-4.20.1_1 +libwbclient.so.0 samba-libs-4.20.1_1 +libCHARSET3-private-samba.so samba-libs-4.20.1_1 +libLIBWBCLIENT-OLD-private-samba.so samba-libs-4.20.1_1 +libMESSAGING-private-samba.so samba-libs-4.20.1_1 +libMESSAGING-SEND-private-samba.so samba-libs-4.20.1_1 +libREG-FULL-private-samba.so samba-libs-4.20.1_1 +libRPC-SERVER-LOOP-private-samba.so samba-libs-4.20.1_1 +libRPC-WORKER-private-samba.so samba-libs-4.20.1_1 +libad-claims-private-samba.so samba-libs-4.20.1_1 +libaddns-private-samba.so samba-libs-4.20.1_1 +libads-private-samba.so samba-libs-4.20.1_1 +libasn1util-private-samba.so samba-libs-4.20.1_1 +libauth-private-samba.so samba-libs-4.20.1_1 +libauth-unix-token-private-samba.so samba-libs-4.20.1_1 +libauth4-private-samba.so samba-libs-4.20.1_1 +libauthkrb5-private-samba.so samba-libs-4.20.1_1 +libauthn-policy-util-private-samba.so samba-libs-4.20.1_1 +libcli-cldap-private-samba.so samba-libs-4.20.1_1 +libcli-ldap-private-samba.so samba-libs-4.20.1_1 +libcli-ldap-common-private-samba.so samba-libs-4.20.1_1 +libcli-nbt-private-samba.so samba-libs-4.20.1_1 +libcli-smb-common-private-samba.so samba-libs-4.20.1_1 +libcli-spoolss-private-samba.so samba-libs-4.20.1_1 +libcliauth-private-samba.so samba-libs-4.20.1_1 +libclidns-private-samba.so samba-libs-4.20.1_1 +libcluster-private-samba.so samba-libs-4.20.1_1 +libcmdline-private-samba.so samba-libs-4.20.1_1 +libcmdline-contexts-private-samba.so samba-libs-4.20.1_1 +libcommon-auth-private-samba.so samba-libs-4.20.1_1 +libctdb-event-client-private-samba.so samba-libs-4.20.1_1 +libdb-glue-private-samba.so samba-libs-4.20.1_1 +libdbwrap-private-samba.so samba-libs-4.20.1_1 +libdcerpc-pkt-auth-private-samba.so samba-libs-4.20.1_1 +libdcerpc-samba-private-samba.so samba-libs-4.20.1_1 +libdcerpc-samba4-private-samba.so samba-libs-4.20.1_1 +libdfs-server-ad-private-samba.so samba-libs-4.20.1_1 +libdlz-bind9-for-torture-private-samba.so samba-libs-4.20.1_1 +libdnsserver-common-private-samba.so samba-libs-4.20.1_1 +libdsdb-garbage-collect-tombstones-private-samba.so samba-libs-4.20.1_1 +libdsdb-module-private-samba.so samba-libs-4.20.1_1 +libevents-private-samba.so samba-libs-4.20.1_1 +libflag-mapping-private-samba.so samba-libs-4.20.1_1 +libgenrand-private-samba.so samba-libs-4.20.1_1 +libgensec-private-samba.so samba-libs-4.20.1_1 +libgpext-private-samba.so samba-libs-4.20.1_1 +libgpo-private-samba.so samba-libs-4.20.1_1 +libgse-private-samba.so samba-libs-4.20.1_1 +libhttp-private-samba.so samba-libs-4.20.1_1 +libidmap-private-samba.so samba-libs-4.20.1_1 +libinterfaces-private-samba.so samba-libs-4.20.1_1 +libiov-buf-private-samba.so samba-libs-4.20.1_1 +libkrb5samba-private-samba.so samba-libs-4.20.1_1 +libldbsamba-private-samba.so samba-libs-4.20.1_1 +liblibcli-lsa3-private-samba.so samba-libs-4.20.1_1 +liblibcli-netlogon3-private-samba.so samba-libs-4.20.1_1 +liblibsmb-private-samba.so samba-libs-4.20.1_1 +libmessages-dgm-private-samba.so samba-libs-4.20.1_1 +libmessages-util-private-samba.so samba-libs-4.20.1_1 +libmscat-private-samba.so samba-libs-4.20.1_1 +libmsghdr-private-samba.so samba-libs-4.20.1_1 +libmsrpc3-private-samba.so samba-libs-4.20.1_1 +libndr-samba-private-samba.so samba-libs-4.20.1_1 +libndr-samba4-private-samba.so samba-libs-4.20.1_1 +libnet-keytab-private-samba.so samba-libs-4.20.1_1 +libnetif-private-samba.so samba-libs-4.20.1_1 +libnpa-tstream-private-samba.so samba-libs-4.20.1_1 +libnss-info-private-samba.so samba-libs-4.20.1_1 +libpac-private-samba.so samba-libs-4.20.1_1 +libposix-eadb-private-samba.so samba-libs-4.20.1_1 +libprinter-driver-private-samba.so samba-libs-4.20.1_1 +libprinting-migrate-private-samba.so samba-libs-4.20.1_1 +libprocess-model-private-samba.so samba-libs-4.20.1_1 +libregistry-private-samba.so samba-libs-4.20.1_1 +libreplace-private-samba.so samba-libs-4.20.1_1 +libsamba-cluster-support-private-samba.so samba-libs-4.20.1_1 +libsamba-debug-private-samba.so samba-libs-4.20.1_1 +libsamba-modules-private-samba.so samba-libs-4.20.1_1 +libsamba-net-private-samba.so samba-libs-4.20.1_1 +libsamba-python-private-samba.so samba-libs-4.20.1_1 +libsamba-security-private-samba.so samba-libs-4.20.1_1 +libsamba-sockets-private-samba.so samba-libs-4.20.1_1 +libsamba3-util-private-samba.so samba-libs-4.20.1_1 +libsamdb-common-private-samba.so samba-libs-4.20.1_1 +libscavenge-dns-records-private-samba.so samba-libs-4.20.1_1 +libsecrets3-private-samba.so samba-libs-4.20.1_1 +libserver-id-db-private-samba.so samba-libs-4.20.1_1 +libserver-role-private-samba.so samba-libs-4.20.1_1 +libservice-private-samba.so samba-libs-4.20.1_1 +libshares-private-samba.so samba-libs-4.20.1_1 +libsmb-transport-private-samba.so samba-libs-4.20.1_1 +libsmbclient-raw-private-samba.so samba-libs-4.20.1_1 +libsmbd-base-private-samba.so samba-libs-4.20.1_1 +libsmbd-shim-private-samba.so samba-libs-4.20.1_1 +libsmbldaphelper-private-samba.so samba-libs-4.20.1_1 +libsmbpasswdparser-private-samba.so samba-libs-4.20.1_1 +libsocket-blocking-private-samba.so samba-libs-4.20.1_1 +libstable-sort-private-samba.so samba-libs-4.20.1_1 +libsys-rw-private-samba.so samba-libs-4.20.1_1 +libtalloc-report-private-samba.so samba-libs-4.20.1_1 +libtalloc-report-printf-private-samba.so samba-libs-4.20.1_1 +libtdb-wrap-private-samba.so samba-libs-4.20.1_1 +libtime-basic-private-samba.so samba-libs-4.20.1_1 +libtorture-private-samba.so samba-libs-4.20.1_1 +libtrusts-util-private-samba.so samba-libs-4.20.1_1 +libutil-reg-private-samba.so samba-libs-4.20.1_1 +libutil-setid-private-samba.so samba-libs-4.20.1_1 +libutil-tdb-private-samba.so samba-libs-4.20.1_1 +libxattr-tdb-private-samba.so samba-libs-4.20.1_1 libsixel.so.1 libsixel-1.8.6_1 libpamtest.so.0 pam_wrapper-1.1.3_1 libopenaptx.so.0 libopenaptx-0.2.0_1 diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index d85a675a60a7ac..e4077eaab9eb37 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -2,10 +2,10 @@ # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421 pkgname=OpenRCT2 -version=0.4.10 +version=0.4.11 revision=1 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt -_objects_version=1.4.3 +_objects_version=1.4.4 _titles_version=0.4.6 _replays_version=0.0.79 _opensfx_version=1.0.5 @@ -35,22 +35,22 @@ homepage="https://openrct2.io" changelog="https://openrct2.org/changelog" # download objects and title sequences ourselves, instead of letting cmake do it distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz - https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip - https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${_opensfx_version}/opensound.zip - https://github.com/OpenRCT2/OpenMusic/releases/download/v${_openmsx_version}/openmusic.zip - https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip - https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip" -checksum="7889791f2a8f14e6a970d6f6e48b897f91c9c6345a745b0e07815a77d7ddbc36 - cc2c8304e35337fb7b4daffa9b0ad1afa9a9f3f8f895817671a71c665d372764 + https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip>objects-${_objects_version}.zip + https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${_opensfx_version}/opensound.zip>opensound-${_opensfx_version}.zip + https://github.com/OpenRCT2/OpenMusic/releases/download/v${_openmsx_version}/openmusic.zip>openmusic-${_openmsx_version}.zip + https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip>replays-${_replays_version}.zip + https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip>title-sequences-${_titles_version}.zip" +checksum="d6211dc9651b43315c5d22e30aa41e582bb861d2541b82bb65de8f4f95f0cdef + da017b90a3870649cb4ff22e14edfc746259af048967311d1133cf4c836ae5a0 a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18 c3fac4caa90398a2b4c5bb32e0dd0f44073086fe16121d3dc49b3ca120474068 045da1df8697e2d33ff33b34008f22e7698280aa4639afd1b1fc3c590d5e9956 24a189cdaf1f78fb6d6caede8f1ab3cedf8ab9f819cd2260a09b2cce4c710d98" -skip_extraction="objects.zip - opensound.zip - openmusic.zip - replays.zip - title-sequences.zip" +skip_extraction="objects-${_objects_version}.zip + opensound-${_opensfx_version}.zip + openmusic-${_openmsx_version}.zip + replays-${_replays_version}.zip + title-sequences-${_titles_version}.zip" replaces="OpenRCT2-data>=0" @@ -86,11 +86,11 @@ fi post_extract() { _builddir="${build_wrksrc:+$build_wrksrc/}${cmake_builddir:=build}" - vsrcextract --no-strip-components -C data/object objects.zip - vsrcextract --no-strip-components -C data/sequence title-sequences.zip - vsrcextract --no-strip-components -C data opensound.zip - vsrcextract --no-strip-components -C data openmusic.zip - vsrcextract --no-strip-components -C test/tests/testdata/replays replays.zip + vsrcextract --no-strip-components -C data/object objects-${_objects_version}.zip + vsrcextract --no-strip-components -C data/sequence title-sequences-${_titles_version}.zip + vsrcextract --no-strip-components -C data opensound-${_opensfx_version}.zip + vsrcextract --no-strip-components -C data openmusic-${_openmsx_version}.zip + vsrcextract --no-strip-components -C test/tests/testdata/replays replays-${_replays_version}.zip # CMakeLists seems to assume `install` is run before `check`, and so # doesn't actually make the `data`/`testdata` symlinks in time mkdir -p "${_builddir}" diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index 83a49d5b0b9415..af4cf5077214ea 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -1,6 +1,6 @@ # Template file for 'QMPlay2' pkgname=QMPlay2 -version=24.04.07 +version=24.05.23 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -14,7 +14,7 @@ license="LGPL-3.0-only" homepage="http://zaps166.sourceforge.net/?app=QMPlay2" changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog" distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz" -checksum=7c525c936ef9096a3a271865e42fee9f494bd18a3992e56505cac94d07145da7 +checksum=4dd650b1b6507207ffcfcb57a454b2150b0e48a8efe649233ea2d5a16209a2be QMPlay2-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index 627aceeb93d6a0..5df697ba5b7b69 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,13 +1,13 @@ # Template file for 'bmake' pkgname=bmake -version=20240508 +version=20240520 revision=1 short_desc="Portable version of the NetBSD make build tool" maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.crufty.net/help/sjg/bmake.html" distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=847a20f03e6f2ee26b9f7cf8db4a353120540686daa565e2ec6ff800317ddaab +checksum=2210ccd455b008df7951f6dbd347bfcc1837c46473014e4b8dd5ff3091ae2894 python_version=3 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 94a0e3166de162..0814f3a0baa23f 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=7.10.0 +version=7.11.0 revision=1 build_helper=python3 pycompile_dirs="/usr/lib/calibre/" @@ -33,7 +33,7 @@ license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=1afbefa2a2c1cdaa6f78a152aa5103e3bd695324632e862a53962337f2ff9c4b +checksum=25243c06965fed9bcb95ddc6339ff27cb4becd18851a2d2bed5ebb5dbebad8eb python_version=3 lib32disabled=yes nocross="python3 setup.py gui" diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template index 532c4a6456e821..b333d683d70482 100644 --- a/srcpkgs/cargo-auditable-bootstrap/template +++ b/srcpkgs/cargo-auditable-bootstrap/template @@ -1,10 +1,11 @@ # Template file for 'cargo-auditable-bootstrap' # Keep synced with cargo-auditable pkgname=cargo-auditable-bootstrap -version=0.6.2 +version=0.6.4 revision=1 build_wrksrc=cargo-auditable build_style=cargo +make_check_args="-- --skip test_wasm" # Required for bootstrapping purposes make_cmd=cargo short_desc="Bootstrap package for cargo-auditable" @@ -13,7 +14,7 @@ license="MIT,Apache-2.0" homepage="https://github.com/rust-secure-code/cargo-auditable" changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-auditable/master/cargo-auditable/CHANGELOG.md" distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz" -checksum=b1c1455b5917d57d4beb3f9bf845059c2d701a034a060b908c7127e29e9b94f3 +checksum=3e3f4134d81b47277d34c44bc1169c9b0356612977651f8e98e2ba1a470b69a2 repository=bootstrap post_install() { diff --git a/srcpkgs/cargo-auditable/template b/srcpkgs/cargo-auditable/template index 46471696df0660..d68f29aeb3135c 100644 --- a/srcpkgs/cargo-auditable/template +++ b/srcpkgs/cargo-auditable/template @@ -1,10 +1,11 @@ # Template file for 'cargo-auditable' # Keep synced with cargo-auditable-bootstrap pkgname=cargo-auditable -version=0.6.2 +version=0.6.4 revision=1 build_wrksrc=cargo-auditable build_style=cargo +make_check_args="-- --skip test_wasm" hostmakedepends="cargo-auditable-bootstrap" short_desc="Tool for embedding dependency information in rust binaries" maintainer="Marcin Puc " @@ -12,7 +13,7 @@ license="MIT,Apache-2.0" homepage="https://github.com/rust-secure-code/cargo-auditable" changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-auditable/master/cargo-auditable/CHANGELOG.md" distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz" -checksum=b1c1455b5917d57d4beb3f9bf845059c2d701a034a060b908c7127e29e9b94f3 +checksum=3e3f4134d81b47277d34c44bc1169c9b0356612977651f8e98e2ba1a470b69a2 conflicts=cargo-auditable-bootstrap post_install() { diff --git a/srcpkgs/curl/patches/install-curl-config-manpage.patch b/srcpkgs/curl/patches/install-curl-config-manpage.patch new file mode 100644 index 00000000000000..74b13f0bea2d0c --- /dev/null +++ b/srcpkgs/curl/patches/install-curl-config-manpage.patch @@ -0,0 +1,26 @@ +From 4cc5657247183a0bc3b0969beeaea9acddb09d22 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Wed, 22 May 2024 08:43:43 +0200 +Subject: [PATCH] docs/Makefile.am: make curl-config.1 install + +on "make install" like it should + +Follow-up to 60971d665b9b1df87082 + +Closes #13741 +--- + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 83f5b0c461cc0f..e9ef6284860555 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -28,6 +28,7 @@ if BUILD_DOCS + # if we disable man page building, ignore these + MK_CA_DOCS = mk-ca-bundle.1 + CURLCONF_DOCS = curl-config.1 ++man_MANS = curl-config.1 + endif + + CURLPAGES = curl-config.md mk-ca-bundle.md diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index d2ec8f6b1a5cb2..beb6fd367c7a89 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,6 @@ # Template file for 'curl' pkgname=curl -version=8.7.1 +version=8.8.0 revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 @@ -15,7 +15,7 @@ configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 make_check_args="TFLAGS=!1477" # Use mdocml instead of groff to generate builtin manual to avoid cyclic # dependencies. -hostmakedepends="perl pkg-config mdocml" +hostmakedepends="perl pkg-config mdocml libtool automake" makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel') $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel') $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel') @@ -30,7 +30,7 @@ license="MIT" homepage="https://curl.se" changelog="https://curl.se/changes.html" distfiles="https://curl.se/download/curl-${version}.tar.gz" -checksum=f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495 +checksum=77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d build_options="gnutls gssapi idn ldap psl rtmp ssh ssl zstd" build_options_default="idn psl ssh ssl zstd" vopt_conflict ssl gnutls @@ -43,6 +43,9 @@ pre_configure() { export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" export CFLAGS="${CFLAGS/-I${XBPS_CROSS_BASE}\/usr\/include/}" export CPPFLAGS="-D_FORTIFY_SOURCE=2" + + # reconfigure for patched changes + autoreconf -fi } pre_check() { diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template index a8048331724e2f..9494fe398a8149 100644 --- a/srcpkgs/dune/template +++ b/srcpkgs/dune/template @@ -1,6 +1,6 @@ # Template file for 'dune' pkgname=dune -version=3.15.2 +version=3.15.3 revision=1 makedepends="ocaml" depends="ocaml" @@ -10,7 +10,7 @@ license="MIT" homepage="https://dune.build/" changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md" distfiles="https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz" -checksum=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933 +checksum=3c27c7676414056f0368a71fdc670d2b0a59898090c78a1b68230984e5beb713 nocross="ocaml" _dune_release_pkgs="dune dune-build-info dune-configurator diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 37fe5240cb8ca6..ac423d5460ee87 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -1,6 +1,6 @@ # Template file for 'falkon' pkgname=falkon -version=24.02.2 +version=24.05.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" @@ -18,7 +18,7 @@ maintainer="Helmut Pozimski " license="GPL-3.0-or-later" homepage="https://www.falkon.org" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=f8607830d99759f55336ad7d8e8f3bf9df9696cb5632a4e308586e8920d7e9cb +checksum=9208313d88b0f5fba84e77e99f428d82bde3d38039b8f12620032c75e644919d LDFLAGS="-Wl,--no-fatal-warnings" diff --git a/srcpkgs/ferium/template b/srcpkgs/ferium/template index 8065aafd240777..addcb88d5146d4 100644 --- a/srcpkgs/ferium/template +++ b/srcpkgs/ferium/template @@ -1,6 +1,6 @@ # Template file for 'ferium' pkgname=ferium -version=4.5.0 +version=4.5.2 revision=1 build_style=cargo build_helper=qemu @@ -11,7 +11,7 @@ license="MPL-2.0" homepage="https://github.com/gorilla-devs/ferium" changelog="https://raw.githubusercontent.com/gorilla-devs/ferium/main/CHANGELOG.md" distfiles="https://github.com/gorilla-devs/ferium/archive/refs/tags/v${version}.tar.gz" -checksum=c9b54673a494cecabfc62a48d03d504b6fea00af1b749c3ccb210021f8528bf0 +checksum=5b4fde3eee2336c4874d8bf5c412e019843f9cef018f750bbb4c51c1fceb9484 post_install() { local ferium="${DESTDIR}/usr/bin/ferium" diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template index eb0a80db1bdffd..48246689850ad2 100644 --- a/srcpkgs/ghostwriter/template +++ b/srcpkgs/ghostwriter/template @@ -1,6 +1,6 @@ # Template file for 'ghostwriter' pkgname=ghostwriter -version=24.02.2 +version=24.05.0 revision=1 build_style=cmake hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools @@ -15,7 +15,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="http://kde.github.io/ghostwriter" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=0adf0ceff51636f5e73391fe3335e263c5a1770ebc8662f14a0346a66dba174e +checksum=ae1b826417dc50af1bdba8a03acb86ceaa630c4b3ed0bf6d3c8116d0d4f65c38 case "$XBPS_TARGET_MACHINE" in armv5tel*) broken="qtwebengine not built for this platform";; diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index ded5aac8d96934..269a7bbc9c315f 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -1,13 +1,13 @@ # Template file for 'golly' pkgname=golly -version=4.2 +version=4.3 revision=1 build_wrksrc="gui-wx" build_style=gnu-makefile make_build_args="-f makefile-gtk GOLLYDIR=/usr/share/golly LUALIB=-llua5.4 CXXC=\$(CXX) WX_CONFIG=wx-config-gtk3" make_install_args="${make_build_args}" -hostmakedepends="python3" +hostmakedepends="python3 python3-setuptools" makedepends="MesaLib-devel glu-devel lua54-devel python3-devel wxWidgets-gtk3-devel zlib-devel SDL2-devel" short_desc="Simulator for Conway's Game of Life and other cellular automata" @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://golly.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz" -checksum=569128a923da64c3ff0062186406e4e51fdff02aeabf1f292983753bd065e95d +checksum=51d2478063e7ec50cde2b61381f3c1028604e45182e374cff0e14199822a081d CXXFLAGS="-I../gollybase -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index 05cd4967ac2e3b..6d715b937f3835 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,6 +1,6 @@ # Template file for 'graphviz' pkgname=graphviz -version=10.0.1 +version=11.0.0 revision=1 build_style=gnu-configure configure_args="--with-gts --with-ann=no" @@ -16,7 +16,7 @@ license="EPL-1.0" homepage="https://www.graphviz.org" changelog="https://gitlab.com/graphviz/graphviz/-/raw/main/CHANGELOG.md" distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz" -checksum=28f452ef1cb12288c8758a62f8c3fcfefdb91b251f7aae61d0d703f851bde931 +checksum=d374f7d98a1ae985510a82dddd887e8058aa37e5f95b4ce0aa58416d2b22714b # `make check` is broken: # https://gitlab.com/graphviz/graphviz/-/issues/2112 diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index acb12449509501..e9b03509c08398 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,6 +1,6 @@ # Template file for 'justbuild' pkgname=justbuild -version=1.3.0 +version=1.3.1 revision=1 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf" @@ -13,7 +13,7 @@ license="Apache-2.0" homepage="https://github.com/just-buildsystem/justbuild/" changelog="https://github.com/just-buildsystem/justbuild/blob/master/CHANGELOG.md" distfiles="https://github.com/just-buildsystem/justbuild/archive/v${version}.tar.gz" -checksum=4f459ba5f88c2474c23bd3257a4a50653860c97fb5104750f2fdc3839f5c5d6f +checksum=71cf1a11d2a43da6eaa425cdc77a85c398574fbc0421ec8df8775bac5f7d8232 conflicts="just>=0" nocross="not supported by bootstrapping" diff --git a/srcpkgs/ldb/patches/strtoull.patch b/srcpkgs/ldb/patches/strtoull.patch new file mode 100644 index 00000000000000..2fcd928a3d143c --- /dev/null +++ b/srcpkgs/ldb/patches/strtoull.patch @@ -0,0 +1,89 @@ +diff --git a/lib/replace/replace.c b/lib/replace/replace.c +index 0652cb4..02b6ebf 100644 +--- a/lib/replace/replace.c ++++ b/lib/replace/replace.c +@@ -559,41 +559,6 @@ long long int rep_strtoll(const char *str, char **endptr, int base) + #endif /* HAVE_STRTOLL */ + + +-#ifndef HAVE_STRTOULL +-unsigned long long int rep_strtoull(const char *str, char **endptr, int base) +-{ +-#ifdef HAVE_STRTOUQ +- return strtouq(str, endptr, base); +-#elif defined(HAVE___STRTOULL) +- return __strtoull(str, endptr, base); +-#elif SIZEOF_LONG == SIZEOF_LONG_LONG +- return (unsigned long long int) strtoul(str, endptr, base); +-#else +-# error "You need a strtoull function" +-#endif +-} +-#else +-#ifdef HAVE_BSD_STRTOLL +-#undef strtoull +-unsigned long long int rep_strtoull(const char *str, char **endptr, int base) +-{ +- int saved_errno = errno; +- unsigned long long int nb = strtoull(str, endptr, base); +- /* With glibc EINVAL is only returned if base is not ok */ +- if (errno == EINVAL) { +- if (base == 0 || (base >1 && base <37)) { +- /* Base was ok so it's because we were not +- * able to make the conversion. +- * Let's reset errno. +- */ +- errno = saved_errno; +- } +- } +- return nb; +-} +-#endif /* HAVE_BSD_STRTOLL */ +-#endif /* HAVE_STRTOULL */ +- + #ifndef HAVE_SETENV + int rep_setenv(const char *name, const char *value, int overwrite) + { +diff --git a/lib/replace/replace.h b/lib/replace/replace.h +index a8910e2..854b1a7 100644 +--- a/lib/replace/replace.h ++++ b/lib/replace/replace.h +@@ -394,16 +394,6 @@ long long int rep_strtoll(const char *str, char **endptr, int base); + #endif + #endif + +-#ifndef HAVE_STRTOULL +-#define strtoull rep_strtoull +-unsigned long long int rep_strtoull(const char *str, char **endptr, int base); +-#else +-#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */ +-#define strtoull rep_strtoull +-unsigned long long int rep_strtoull(const char *str, char **endptr, int base); +-#endif +-#endif +- + #ifndef HAVE_FTRUNCATE + #define ftruncate rep_ftruncate + int rep_ftruncate(int,off_t); +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 4c774d9..a1dc6d0 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -411,7 +411,7 @@ def configure(conf): + conf.CHECK_FUNCS('initgroups pread pwrite strndup strcasestr strsep') + conf.CHECK_FUNCS('strtok_r mkdtemp dup2 dprintf vdprintf isatty chown lchown') + conf.CHECK_FUNCS('link readlink symlink realpath snprintf vsnprintf') +- conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen strtoull __strtoull') ++ conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen') + conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign') + conf.CHECK_FUNCS('fmemopen') + +@@ -866,7 +866,7 @@ REPLACEMENT_FUNCTIONS = { + 'memmove', 'strdup', 'setlinebuf', 'vsyslog', 'strnlen', + 'strndup', 'waitpid', 'seteuid', 'setegid', 'chroot', + 'mkstemp', 'mkdtemp', 'pread', 'pwrite', 'strcasestr', +- 'strsep', 'strtok_r', 'strtoll', 'strtoull', 'setenv', 'unsetenv', ++ 'strsep', 'strtok_r', 'strtoll', 'setenv', 'unsetenv', + 'utime', 'utimes', 'dup2', 'chown', 'link', 'readlink', + 'symlink', 'lchown', 'realpath', 'memmem', 'vdprintf', + 'dprintf', 'get_current_dir_name', 'copy_file_range', diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template index 964a2c33009da0..f3dcb95611ceb4 100644 --- a/srcpkgs/ldb/template +++ b/srcpkgs/ldb/template @@ -1,7 +1,7 @@ # Template file for 'ldb' pkgname=ldb -version=2.3.2 -revision=3 +version=2.9.0 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -9,28 +9,29 @@ configure_args="--sysconfdir=/etc --localstatedir=/var --disable-rpath --disable-rpath-install --without-gettext --builtin-libraries=replace --bundled-libraries=NONE --with-modulesdir=/usr/lib/ldb/modules" -hostmakedepends="pkg-config docbook2x tdb-python3 tevent-python3 python3-setuptools" -makedepends="python3-devel tdb-devel tevent-devel talloc-devel - popt-devel lmdb-devel libxslt gettext-devel cmocka-devel" +hostmakedepends="pkg-config docbook-xsl libxslt tdb-python3 tevent-python3" +makedepends="python3-devel tdb-devel tevent-devel talloc-devel popt-devel + lmdb-devel cmocka-devel" checkdepends="cmocka-devel" short_desc="LDAP-like database from samba" maintainer="Yuusha Spacewolf " license="LGPL-3.0-or-later" homepage="https://www.samba.org/ldb/" distfiles="https://download.samba.org/pub/ldb/ldb-${version}.tar.gz" -checksum=1416c949dc4326e41c0d8a5ecf8ef784f8c0b6e9d3dad8fa971e84ad56227603 - -# workaround for cmocka's broken uintptr_t definition on musl -if [ "$XBPS_TARGET_WORDSIZE" = "64" -a "$XBPS_TARGET_LIBC" = "musl" ]; then - CFLAGS+=" -D__WORDSIZE=64" -fi +checksum=105aaff71ad881a7faeb582fd416ae28221b6fde338fff82828065062c2507a5 +make_check=extended # testsuite takes a long time export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" +export PYTHONHASHSEED=1 post_patch() { - # Avoid Python shlib extension noise in libpyldb-util.so - vsed -e "/env.pyext_PATTERN/s/dct\['SO'\]/'.so'/" \ - -i third_party/waf/waflib/Tools/python.py + # Look for properly named python support libraries + vsed -i third_party/waf/waflib/Tools/python.py \ + -e "s|env.pyext_PATTERN = .*$|env.pyext_PATTERN = '%s.so'|" +} + +do_check() { + ${configure_script} test ${makejobs} } ldb-python3_package() { diff --git a/srcpkgs/lynis/template b/srcpkgs/lynis/template index 92e518e552079e..7da5eb093bfa2b 100644 --- a/srcpkgs/lynis/template +++ b/srcpkgs/lynis/template @@ -1,6 +1,6 @@ # Template file for 'lynis' pkgname=lynis -version=3.1.0 +version=3.1.1 revision=1 short_desc="System and security auditing tool" maintainer="Johannes Heimansberg " @@ -8,7 +8,7 @@ license="GPL-3.0-only" homepage="https://cisofy.com/lynis/" changelog="https://raw.githubusercontent.com/CISOfy/lynis/master/CHANGELOG.md" distfiles="https://github.com/CISOfy/lynis/archive/refs/tags/${version}.tar.gz" -checksum=bc197423b5767d42e8ae5fabc9eb40c494af9ff1543d3679cbfb97a3ba72f20e +checksum=ca38a27c9c92e78877be4ecffce25f3345a1d24bbcd68be66a3a600e2ff748d1 do_install() { vmkdir etc/lynis diff --git a/srcpkgs/nss_wrapper/patches/nss_wrapper-fix-for-cmocka-1.1.6.patch b/srcpkgs/nss_wrapper/patches/nss_wrapper-fix-for-cmocka-1.1.6.patch new file mode 100644 index 00000000000000..ba2589be2d0834 --- /dev/null +++ b/srcpkgs/nss_wrapper/patches/nss_wrapper-fix-for-cmocka-1.1.6.patch @@ -0,0 +1,31 @@ +From 2c879a0ffa70cee33329291d7576ec971d420da2 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 3b94076..733cc4e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + set(TESTSUITE_LIBRARIES nss_utils ${NWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY}) + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + +-- +2.39.2 + diff --git a/srcpkgs/nss_wrapper/template b/srcpkgs/nss_wrapper/template new file mode 100644 index 00000000000000..94fa88b333cda9 --- /dev/null +++ b/srcpkgs/nss_wrapper/template @@ -0,0 +1,27 @@ +# Template file for 'nss_wrapper' +pkgname=nss_wrapper +version=1.1.15 +revision=1 +archs="~*-musl" # complains about the getXXent_r functions missing +build_style=cmake +hostmakedepends="pkg-config" +short_desc="Wrapper for the user, group and hosts NSS API" +maintainer="Otto Modinos " +license="BSD-3-Clause" +homepage="http://cwrap.org/nss_wrapper.html" +distfiles="https://download.samba.org/pub/cwrap/${pkgname}-${version}.tar.gz" +checksum=36f874832a4f2158e04f69aa77e5515e16cf6e3bf81968d5dd8496db7d6906ad + +if [ "$XBPS_TARGET_LIBC" = glibc ]; then + makedepends+=" libxcrypt-devel" +fi + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DUNIT_TESTING=ON" + makedepends+=" cmocka-devel uid_wrapper" + checkdepends+=" cmocka" +fi + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template index 2f34978c8502fd..5c8db7415eb3b0 100644 --- a/srcpkgs/osinfo-db/template +++ b/srcpkgs/osinfo-db/template @@ -1,6 +1,6 @@ # Template file for 'osinfo-db' pkgname=osinfo-db -version=20240510 +version=20240523 revision=1 build_style=fetch hostmakedepends="osinfo-db-tools" @@ -9,7 +9,7 @@ maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://libosinfo.org" distfiles="https://releases.pagure.org/libosinfo/osinfo-db-${version}.tar.xz" -checksum=08a2d521c485687f6be39940d5b3f61bc0f583bb7e3655a131c658385eb7e5ca +checksum=9deff2dfd294b24cec9f0d62042f0443ad8fdc6606f8bea951e3e53170a906c5 skip_extraction="${pkgname}-${version}.tar.xz" do_install() { diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 9d49784e18e255..1488faea917cca 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20240422 +version=20240522 revision=1 build_style=gnu-configure hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/parallel/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=783888203ede2b92ced31eb3e809ca3a9d89f4508fdcb11830bfb35754882467 +checksum=67ed9fad31bf3e25f09d500e7e8ca7df9e3ac380fe4ebd16c6f014448a346928 pre_configure() { # no html and pdf doc diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template index 532298a8471fcf..aa22686efc3e57 100644 --- a/srcpkgs/python3-msoffcrypto-tool/template +++ b/srcpkgs/python3-msoffcrypto-tool/template @@ -1,6 +1,6 @@ # Template file for 'python3-msoffcrypto-tool' pkgname=python3-msoffcrypto-tool -version=5.4.0 +version=5.4.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/nolze/msoffcrypto-tool" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=4a491ae684752731000dcf65e5ec49c72a9231c29646c8611761a94c088bf903 +checksum=9e736c3de511f7bc47272b0e8cc29186ec1554a51768b8d4841b321575d8289f make_check=extended post_install() { diff --git a/srcpkgs/resolv_wrapper/patches/resolv_wrapper-fix-for-cmocka-1.1.6.patch b/srcpkgs/resolv_wrapper/patches/resolv_wrapper-fix-for-cmocka-1.1.6.patch new file mode 100644 index 00000000000000..5640be33053a8c --- /dev/null +++ b/srcpkgs/resolv_wrapper/patches/resolv_wrapper-fix-for-cmocka-1.1.6.patch @@ -0,0 +1,31 @@ +From f2e7f58025ecb4cf399494166abea01813b1d0f0 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1262bed..7f2f4ee 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + set(TORTURE_LIBRARY torture) + + # A simple DNS server for testing +-- +2.34.1 + diff --git a/srcpkgs/resolv_wrapper/template b/srcpkgs/resolv_wrapper/template new file mode 100644 index 00000000000000..4e1215c7b69867 --- /dev/null +++ b/srcpkgs/resolv_wrapper/template @@ -0,0 +1,23 @@ +# Template file for 'resolv_wrapper' +pkgname=resolv_wrapper +version=1.1.8 +revision=1 +archs="~*-musl" # missing res_ninit, res_nclose, etc +build_style=cmake +hostmakedepends="pkg-config" +short_desc="Wrapper for DNS name resolving or DNS faking" +maintainer="Otto Modinos " +license="BSD-3-Clause" +homepage="https://cwrap.org/resolv_wrapper.html" +distfiles="https://download.samba.org/pub/cwrap/${pkgname}-${version}.tar.gz" +checksum=fbc30f77da3e12ecd4ef66ccf5ab77e0b744930ccd89062404082f928a8ec2e0 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DUNIT_TESTING=ON" + makedepends+=" cmocka-devel socket_wrapper" + checkdepends+=" cmocka" +fi + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/rust-audit-info/template b/srcpkgs/rust-audit-info/template index ced93f677ed8f6..54018efde9cf93 100644 --- a/srcpkgs/rust-audit-info/template +++ b/srcpkgs/rust-audit-info/template @@ -1,6 +1,6 @@ # Template file for 'rust-audit-info' pkgname=rust-audit-info -version=0.5.2 +version=0.5.4 revision=1 build_wrksrc=rust-audit-info build_style=cargo @@ -9,7 +9,7 @@ maintainer="Marcin Puc " license="MIT, Apache-2.0" homepage="https://github.com/rust-secure-code/cargo-auditable" distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/${pkgname}/v${version}.tar.gz" -checksum=d9bf684d1954db44e2f254e2fff5d204cb12e652ae95941abed9e10812786046 +checksum=d9d53352b5f2dc34a93b1ae6408cdd50085f40e24d832af6938e0c3b7c906ff5 post_install() { vlicense ../LICENSE-MIT diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index f702f4b6cc9c4d..cd32fcd4a9fe86 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -1,6 +1,6 @@ # Template file for 'rustup' pkgname=rustup -version=1.27.0 +version=1.27.1 revision=1 # rustup doesn't recognize this target archs="~armv*-musl" @@ -16,7 +16,7 @@ license="Apache-2.0, MIT" homepage="https://www.rustup.rs" changelog="https://raw.githubusercontent.com/rust-lang/rustup/master/CHANGELOG.md" distfiles="https://github.com/rust-lang/rustup/archive/refs/tags/${version}.tar.gz" -checksum=3d331ab97d75b03a1cc2b36b2f26cd0a16d681b79677512603f2262991950ad1 +checksum=f5ba37f2ba68efec101198dca1585e6e7dd7640ca9c526441b729a79062d3b77 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*|arm*|aarch64*) diff --git a/srcpkgs/samba-dc b/srcpkgs/samba-dc new file mode 120000 index 00000000000000..cba1f39180b3aa --- /dev/null +++ b/srcpkgs/samba-dc @@ -0,0 +1 @@ +samba \ No newline at end of file diff --git a/srcpkgs/samba/patches/fix-glibc-2.36.patch b/srcpkgs/samba/patches/fix-glibc-2.36.patch deleted file mode 100644 index beb84ce6a8ded2..00000000000000 --- a/srcpkgs/samba/patches/fix-glibc-2.36.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 2 Aug 2022 07:55:46 +0200 -Subject: [PATCH] lib:replace: Only include on non-Linux systems -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Details at: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 - -Signed-off-by: Andreas Schneider -Reviewed-by: Ralph Boehme - -Autobuild-User(master): Ralph Böhme -Autobuild-Date(master): Tue Aug 2 11:05:14 UTC 2022 on sn-devel-184 ---- - lib/replace/system/filesys.h | 4 +++- - lib/replace/wscript | 3 +++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h -index 034e5d5886c..bb9482c69af 100644 ---- a/lib/replace/system/filesys.h -+++ b/lib/replace/system/filesys.h -@@ -36,7 +36,8 @@ - #include - #endif - --#ifdef HAVE_SYS_MOUNT_H -+/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */ -+#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H) - #include - #endif - -@@ -44,6 +45,7 @@ - #include - #endif - -+/* This include is required on Linux for statfs() */ - #ifdef HAVE_SYS_VFS_H - #include - #endif -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 4c774d9f0c3..dd9b19219a1 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -31,6 +31,9 @@ def configure(conf): - - conf.env.standalone_replace = conf.IN_LAUNCH_DIR() - -+ if sys.platform.rfind('linux') > -1: -+ conf.DEFINE('LINUX', '1') -+ - conf.DEFINE('BOOL_DEFINED', 1) - conf.DEFINE('HAVE_LIBREPLACE', 1) - conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) diff --git a/srcpkgs/samba/patches/missing-headers.patch b/srcpkgs/samba/patches/missing-headers.patch deleted file mode 100644 index 820d7ecd903fbc..00000000000000 --- a/srcpkgs/samba/patches/missing-headers.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git lib/param/loadparm.h lib/param/loadparm.h -index b5d79b9..3f4eae0 100644 ---- a/lib/param/loadparm.h -+++ b/lib/param/loadparm.h -@@ -31,6 +31,7 @@ - #define _LOADPARM_H - - #include -+#include - - struct parmlist_entry { - struct parmlist_entry *prev, *next; -diff --git source3/lib/system_smbd.c source3/lib/system_smbd.c -index 3b1ac9c..4044d75 100644 ---- a/source3/lib/system_smbd.c -+++ b/source3/lib/system_smbd.c -@@ -27,6 +27,8 @@ - #include "system/passwd.h" - #include "nsswitch/winbind_client.h" - #include "../lib/util/setid.h" -+#include -+#include - - #ifndef HAVE_GETGROUPLIST - -diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c -index 2cd6122..0c84ec2 100644 ---- a/source4/torture/local/nss_tests.c -+++ b/source4/torture/local/nss_tests.c -@@ -20,6 +20,8 @@ - */ - - #include "includes.h" -+#include -+#include - - #include "torture/torture.h" - #include "torture/local/proto.h" - -diff --git ctdb/tests/src/protocol_util_test.c ctdb/tests/src/protocol_util_test.c -index edd2a34..48ce96e 100644 ---- a/ctdb/tests/src/protocol_util_test.c -+++ b/ctdb/tests/src/protocol_util_test.c -@@ -20,6 +20,7 @@ - #include "replace.h" - #include "system/network.h" - -+#include - #include - - #include "protocol/protocol_basic.c" - diff --git a/srcpkgs/samba/patches/netdb-defines.patch b/srcpkgs/samba/patches/netdb-defines.patch deleted file mode 100644 index 15f79eebfb6ac1..00000000000000 --- a/srcpkgs/samba/patches/netdb-defines.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git nsswitch/wins.c nsswitch/wins.c -index dccb6dd..bb24acb 100644 ---- a/nsswitch/wins.c -+++ b/nsswitch/wins.c -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; - #define INADDRSZ 4 - #endif - -+#ifndef NETDB_INTERNAL -+#define NETDB_INTERNAL -1 -+#endif -+ -+#ifndef NETDB_SUCCESS -+#define NETDB_SUCCESS 0 -+#endif -+ - NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, - struct hostent *he, - char *buffer, diff --git a/srcpkgs/samba/patches/samba-bgqd-include-signal-h.patch b/srcpkgs/samba/patches/samba-bgqd-include-signal-h.patch new file mode 100644 index 00000000000000..10dc1278cdc769 --- /dev/null +++ b/srcpkgs/samba/patches/samba-bgqd-include-signal-h.patch @@ -0,0 +1,14 @@ +SIGTERM and SIGPIPE are used but undefined. +diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c +index 8ac6ec5..09a5d12 100644 +--- a/source3/printing/samba-bgqd.c ++++ b/source3/printing/samba-bgqd.c +@@ -40,6 +40,7 @@ + #include "source3/lib/util_procid.h" + #include "source3/auth/proto.h" + #include "source3/printing/queue_process.h" + #include "source3/lib/substitute.h" ++#include + + static void watch_handler(struct tevent_req *req) + { diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 20af96624fdc2b..2d37047927312b 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,69 +1,73 @@ # Template file for 'samba' pkgname=samba -version=4.14.12 -revision=5 +version=4.20.1 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" -_idmap_modules="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" -_pdb_modules="pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" -_auth_modules="auth_unix,auth_wbc,auth_server,auth_netlogind,autH_script,auth_samba4" -configure_args="--enable-fhs --sbindir=/usr/bin - --localstatedir=/var --sysconfdir=/etc --with-piddir=/run/samba +_idmap_modules="idmap_ad,idmap_rid,idmap_ldap,idmap_hash,idmap_tdb2" +_pdb_modules="pdb_tdbsam,pdb_ldap,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" +_auth_modules="auth_unix,auth_wbc,auth_server,auth_samba4,auth_skel" +_vfs_modules="vfs_io_uring" +configure_args="--enable-fhs --sysconfdir=/etc --localstatedir=/var + --sbindir=/usr/bin --with-privatelibdir=/usr/lib + --with-privatedir=/etc/samba/private --with-piddir=/run/samba --with-sockets-dir=/run/samba --with-lockdir=/run/lock/samba - --with-privatedir=/etc/samba/private --with-pammodulesdir=/usr/lib/security - --with-modulesdir=/usr/lib/samba --disable-rpath --disable-rpath-install - --without-systemd --without-gettext --bundled-libraries=NONE - --with-system-mitkrb5 --without-ad-dc --with-cluster-support - --with-shared-modules=${_idmap_modules},${_pdb_modules},${_auth_modules}" -hostmakedepends="pkg-config perl-Parse-Yapp rpcsvc-proto docbook2x - libtasn1-tools tdb-python3 tevent-python3 talloc-python3 python3-setuptools" + --disable-rpath --disable-rpath-install --nopyc --nopyo + --without-gettext --without-systemd --without-gpgme + --with-cluster-support --with-system-mitkrb5 --with-experimental-mit-ad-dc + --bundled-libraries=NONE --builtin-libraries=NONE + --with-shared-modules=${_idmap_modules},${_pdb_modules},${_auth_modules},${_vfs_modules}" +hostmakedepends="pkg-config perl-Parse-Yapp rpcsvc-proto docbook-xsl libxslt + libtasn1-tools tdb-python3 tevent-python3 talloc-python3 ldb-python3 flex + bison mit-krb5 python3-Markdown python3-dnspython" makedepends="python3-devel libtirpc-devel popt-devel e2fsprogs-devel mit-krb5-devel pam-devel acl-devel cups-devel avahi-libs-devel tdb-devel talloc-devel tevent-devel ldb-devel cmocka-devel gnutls-devel zlib-devel - ncurses-devel libldap-devel libarchive-devel jansson-devel" + ncurses-devel libldap-devel libarchive-devel jansson-devel liburing-devel" short_desc="SMB/CIFS file, print, and login server for Unix" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.samba.org" distfiles="https://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz" -checksum=155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d +checksum=f93c3af5295340d08106c7c0dcfb85e4f85057dfd14587aa8817beb31aff88f7 lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" make_dirs="/etc/samba/private 0750 root root" -subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3" +subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs + samba-python3 samba-dc" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat musl-nscd-devel" + makedepends+=" musl-legacy-compat musl-nscd-devel libexecinfo-devel" else makedepends+=" glusterfs-devel" subpackages+=" samba-glusterfs" -fi -# By default, samba wants to install a bunch of private "*-samba4.so" shared -# libraries that leak into shlib_requires dependencies. Most of these can be -# built into the public shared libraries, avoiding the mess of tracking shlibs -# that shouldn't be exposed locally. For those that cannot be built in, make -# sure to install them into /usr/lib so xbps-src picks them up. -_privlibs="CHARSET3 MESSAGING_SEND MESSAGING LIBWBCLIENT_OLD addns ads \ - asn1util auth authkrb5 cmdline_contexts cmdline-credentials cli_cldap \ - cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns common-auth \ - ctdb-event-client dbwrap dcerpc-pkt-auth events genrand gensec gse http \ - interfaces krb5samba ldbsamba libcli_lsa3 libcli_netlogon3 libsmb \ - messages_dgm messages_util mscat msghdr msrpc3 netif npa_tstream popt_samba3 \ - popt_samba3_cmdline registry replace samba-cluster-support samba-debug \ - samba-modules samba-security samba-sockets samba3-util samdb-common secrets3 \ - server_id_db server-role smbclient-raw smbd_shim socket-blocking sys_rw \ - talloc_report_printf talloc_report tevent-util time-basic trusts_util \ - util_reg util_setid util_tdb" -configure_args+=" --with-privatelibdir=/usr/lib --builtin-libraries=${_privlibs// /,}" + if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" --enable-selftest" + hostmakedepends+=" python3-cryptography python3-iso8601 + python3-pyasn1" + makedepends+=" nss_wrapper pam_wrapper resolv_wrapper + socket_wrapper uid_wrapper" + fi +fi export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" +export PYTHONHASHSEED=1 post_patch() { # Look for properly named python support libraries vsed -i third_party/waf/waflib/Tools/python.py \ - -e "/env.pyext_PATTERN/s/dct\['SO'\]/'.so'/" + -e "s|env.pyext_PATTERN = .*$|env.pyext_PATTERN = '%s.so'|g" + + # Fix for our `kdb` linking against the system `db` package which + # doesn't distribute a pkg-config file and the samba build scripts just + # can't handle that. + cat >>wscript_configure_system_mitkrb5 <<_EOF +if ("db" in conf.env["LIB_KDB5"] + and not conf.check_cfg(package="db", mandatory=False)): + krb5_define_syslib(conf, "db", []) +_EOF # Fix log and spool locations in conf file vsed -i examples/smb.conf.default \ @@ -90,6 +94,8 @@ post_install() { vmkdir usr/lib/cups/backend ln -fs /usr/bin/smbspool ${DESTDIR}/usr/lib/cups/backend/smb + vinstall packaging/printing/smbprint 744 usr/bin/ + # Do not ship sudo rule that grants nopasswd privileges by default rm -rf ${DESTDIR}/etc/sudoers.d @@ -110,10 +116,9 @@ smbclient_package() { local _t _tools # These utilities have man pages in section 1 - _tools="findsmb dbwrap_tool mdfind mvxattr nmblookup ntlm_auth - oLschema2ldif regdiff regpatch regshell regtree rpcclient - sharesec smbcacls smbclient smbcquotas smbget smbtar smbtree - wbinfo" + _tools="dbwrap_tool mdsearch mvxattr nmblookup oLschema2ldif + regdiff regpatch regshell rpcclient sharesec smbcacls smbclient + smbcquotas smbget smbtar smbtree wspsearch" for _t in ${_tools}; do vmove usr/bin/${_t} @@ -127,11 +132,9 @@ smbclient_package() { vmove usr/share/man/man8/${_t}.8 done - # No man page for this one + # No man page for these vmove usr/bin/dumpmscat - - # Extra man page for smbget - vmove usr/share/man/man5/smbgetrc.5 + vmove usr/bin/smbprint vmove usr/libexec/samba/smbspool_krb5_wrapper vmove usr/share/man/man8/smbspool_krb5_wrapper.8 @@ -171,19 +174,40 @@ samba-libs_package() { replaces="libsmbclient>=0" pkg_install() { local _libs _privlibs _lib - _libs="dcerpc dcerpc-binding ndr-krb5pac ndr-nbt ndr-standard ndr - samba-credentials samba-errors samba-hostconfig samba-passdb - samba-util samdb smbclient smbconf smbldap wbclient" - _privlibs="cli-ldap cliauth cluster common-auth dcerpc-samba - flag-mapping gpo iov-buf ndr-samba ndr printer-driver - smb-transport tdb-wrap util-cmdline winbind-client" + _libs="dcerpc dcerpc-binding dcerpc-samr dcerpc-server + dcerpc-server-core ndr ndr-krb5pac ndr-nbt ndr-standard netapi + nss_winbind nss_wins samba-credentials samba-errors + samba-hostconfig samba-passdb samba-policy samba-util samdb + smbclient smbconf smbldap tevent-util wbclient" + _privlibs="CHARSET3 LIBWBCLIENT-OLD MESSAGING MESSAGING-SEND + REG-FULL RPC-SERVER-LOOP RPC-WORKER ad-claims addns ads + asn1util auth auth-unix-token auth4 authkrb5 authn-policy-util + cli-cldap cli-ldap cli-ldap-common cli-nbt cli-smb-common + cli-spoolss cliauth clidns cluster cmdline cmdline-contexts + common-auth ctdb-event-client db-glue dbwrap dcerpc-pkt-auth + dcerpc-samba dcerpc-samba4 dfs-server-ad dlz-bind9-for-torture + dnsserver-common dsdb-garbage-collect-tombstones dsdb-module + events flag-mapping genrand gensec gpext gpo gse http idmap + interfaces iov-buf krb5samba ldbsamba libcli-lsa3 + libcli-netlogon3 libsmb messages-dgm messages-util mscat + msghdr msrpc3 ndr-samba ndr-samba4 net-keytab netif + npa-tstream nss-info pac posix-eadb printer-driver + printing-migrate process-model registry replace + samba-cluster-support samba-debug samba-modules samba-net + samba-python samba-security samba-sockets samba3-util + samdb-common scavenge-dns-records secrets3 server-id-db + server-role service shares smb-transport smbclient-raw + smbd-base smbd-shim smbldaphelper smbpasswdparser + socket-blocking stable-sort sys-rw talloc-report + talloc-report-printf tdb-wrap time-basic torture trusts-util + util-reg util-setid util-tdb xattr-tdb" for _lib in ${_libs}; do vmove "usr/lib/lib${_lib}.so.*" done for _lib in ${_privlibs}; do - vmove "usr/lib/lib${_lib}-samba4.so" + vmove "usr/lib/lib${_lib}-private-samba.so" done vmove usr/share/man/man7/libsmbclient.7 @@ -209,6 +233,9 @@ samba-devel_package() { } samba-python3_package() { + depends="ldb-python3 talloc-python3 tdb-python3 tevent-python3 + python3-cryptography python3-dnspython python3-Markdown + python3-requests" short_desc+=" - Python3 bindings" pkg_install() { vmove ${py3_lib} @@ -222,3 +249,12 @@ samba-glusterfs_package() { vmove usr/share/man/man8/vfs_glusterfs.8 } } + +samba-dc_package() { + depends="samba-python3>=${version}_${revision}" + short_desc+=" - AD Domain Controller" + pkg_install() { + vmove "usr/bin/samba*" + vmove usr/share/samba + } +} diff --git a/srcpkgs/schismtracker/template b/srcpkgs/schismtracker/template index 6630e5f1866daf..a0f034664a6e19 100644 --- a/srcpkgs/schismtracker/template +++ b/srcpkgs/schismtracker/template @@ -1,6 +1,6 @@ # Template file for 'schismtracker' pkgname=schismtracker -version=20240515 +version=20240523 revision=1 build_style=gnu-configure hostmakedepends="pkg-config autoconf-archive automake SDL2-devel python3 git libltdl-devel libflac-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://schismtracker.org" distfiles="https://github.com/schismtracker/schismtracker/archive/${version}.tar.gz" -checksum=34a016d85af2aff3d9cf250edfe543b06ff9b65b7e87c1d7d326238d6835a6de +checksum=956e844c0da6ff57a97ee27a173cb07c9c9c550f24bce23a3525f37936ee4fb2 pre_configure() { autoreconf -fi diff --git a/srcpkgs/socket_wrapper/template b/srcpkgs/socket_wrapper/template new file mode 100644 index 00000000000000..45d462668c5c4f --- /dev/null +++ b/srcpkgs/socket_wrapper/template @@ -0,0 +1,22 @@ +# Template file for 'socket_wrapper' +pkgname=socket_wrapper +version=1.4.2 +revision=1 +archs="~*-musl" # socket_wrapper redefines libc funcs, you can't do that on musl +build_style=cmake +hostmakedepends="pkg-config" +short_desc="Library for passing all socket communications through unix sockets" +maintainer="Otto Modinos " +license="BSD-3-Clause" +homepage="http://cwrap.org/socket_wrapper.html" +distfiles="https://download.samba.org/pub/cwrap/${pkgname}-${version}.tar.gz" +checksum=0a08ec249dd9ffbb3b16d577b352d573561f57beeec3596182ac6ec8e46b9ab6 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DUNIT_TESTING=ON" + makedepends+=" cmocka-devel" +fi + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 0134d2dcc2fb91..6d1c3039ed914f 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -1,21 +1,25 @@ # Template file for 'tdb' pkgname=tdb -version=1.4.9 -revision=2 +version=1.4.10 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" -configure_args="--prefix=/usr --libdir=/usr/lib --sysconfdir=/etc - --localstatedir=/var --disable-rpath --disable-rpath-install - --builtin-libraries=replace --bundled-libraries=NONE --without-gettext" -hostmakedepends="pkg-config docbook2x" -makedepends="python3-devel libxslt gettext-devel" +configure_args="--sysconfdir=/etc --localstatedir=/var + --disable-rpath --disable-rpath-install --without-gettext + --builtin-libraries=replace --bundled-libraries=NONE" +hostmakedepends="pkg-config docbook-xsl libxslt" +makedepends="python3-devel" short_desc="Trivial Database, similar to GDBM but allows simultaneous commits" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://tdb.samba.org/" distfiles="https://download.samba.org/pub/tdb/tdb-${version}.tar.gz" -checksum=0ac226073e3a2db8648da7af744cb95f50766a52feeb001d558b2b321b74a765 +checksum=02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf + +if [ "$XBPS_TARGET_LIBC" = glibc ]; then + makedepends+=" libxcrypt-devel" +fi export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" export PYTHONHASHSEED=1 diff --git a/srcpkgs/tevent/patches/fix-public-headers.patch b/srcpkgs/tevent/patches/fix-public-headers.patch deleted file mode 100644 index 1710226d4580c9..00000000000000 --- a/srcpkgs/tevent/patches/fix-public-headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -tevent.h needs sys/types.h for pid_t - ---- a/tevent.h 2018-07-12 05:51:30.000000000 +0000 -+++ b/tevent.h 2018-07-19 10:13:15.360128807 +0000 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - - struct tevent_context; - diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template index 7dadd564db0bf5..1a3f49d8bb8d0b 100644 --- a/srcpkgs/tevent/template +++ b/srcpkgs/tevent/template @@ -1,28 +1,37 @@ # Template file for 'tevent' pkgname=tevent -version=0.11.0 -revision=3 +version=0.16.1 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" configure_args="--sysconfdir=/etc --localstatedir=/var --disable-rpath --disable-rpath-install --without-gettext --builtin-libraries=replace --bundled-libraries=NONE" -hostmakedepends="pkg-config docbook2x python3-setuptools" -makedepends="python3-devel talloc-devel libxslt gettext-devel cmocka-devel" +hostmakedepends="pkg-config docbook-xsl libxslt" +makedepends="python3-devel talloc-devel cmocka-devel" short_desc="Event system based on the talloc memory management library" maintainer="Yuusha Spacewolf " license="GPL-3.0-or-later" homepage="https://tevent.samba.org" distfiles="https://download.samba.org/pub/tevent/tevent-${version}.tar.gz" -checksum=ee9a86c8e808aac2fe1e924eaa139ff7f0269d0e8e4fafa850ae5c7489bc82ba +checksum=362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e + +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" +export PYTHONHASHSEED=1 + +do_check() { + ${configure_script} test +} post_patch() { - # Avoid Python shlib extension noise in libpytallic-util.so - vsed -e "/env.pyext_PATTERN/s/dct\['SO'\]/'.so'/" \ - -i third_party/waf/waflib/Tools/python.py + # Look for properly named python support libraries + vsed -i third_party/waf/waflib/Tools/python.py \ + -e "s|env.pyext_PATTERN = .*$|env.pyext_PATTERN = '%s.so'|" } tevent-python3_package() { diff --git a/srcpkgs/uid_wrapper/patches/uid_wrapper-fix-for-cmocka-1.1.6.patch b/srcpkgs/uid_wrapper/patches/uid_wrapper-fix-for-cmocka-1.1.6.patch new file mode 100644 index 00000000000000..c99c3ad6bce663 --- /dev/null +++ b/srcpkgs/uid_wrapper/patches/uid_wrapper-fix-for-cmocka-1.1.6.patch @@ -0,0 +1,31 @@ +From 850f24c6366abda30bfd77734b90330b8809d306 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 635e86e..68e050e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + add_library(uwrap_fake_socket_wrapper SHARED uwrap_fake_socket_wrapper.c) + target_compile_options(uwrap_fake_socket_wrapper + PRIVATE +-- +2.34.1 + diff --git a/srcpkgs/uid_wrapper/template b/srcpkgs/uid_wrapper/template new file mode 100644 index 00000000000000..24a90e93767069 --- /dev/null +++ b/srcpkgs/uid_wrapper/template @@ -0,0 +1,22 @@ +# Template file for 'uid_wrapper' +pkgname=uid_wrapper +version=1.3.0 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +short_desc="Testing tool to fake privilege separation" +maintainer="Otto Modinos " +license="BSD-3-Clause" +homepage="https://cwrap.org/uid_wrapper.html" +distfiles="https://download.samba.org/pub/cwrap/${pkgname}-${version}.tar.gz" +checksum=f7e7c1bde533530051931414724453e14e02adbb614824b6fe27cbb98654b762 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DUNIT_TESTING=ON" + makedepends+=" cmocka-devel" + checkdepends+=" cmocka" +fi + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template index 39be569273ecef..5fd0db5899df50 100644 --- a/srcpkgs/xlockmore/template +++ b/srcpkgs/xlockmore/template @@ -1,6 +1,6 @@ # Template file for 'xlockmore' pkgname=xlockmore -version=5.77 +version=5.78 revision=1 build_style=gnu-configure configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')" @@ -13,7 +13,7 @@ license="MIT" homepage="http://sillycycle.com/xlockmore.html" changelog="http://sillycycle.com/xlock/xlockmore.README" distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz" -checksum=52b7c413e73784fc5815c73bf1238f5a205deebb7817a8c19e7abf3ef6fc2c36 +checksum=c0c9674221787a330558948e59ef4437dd483cc81b0285cd45e1e06a8bebfa91 CFLAGS="-D_DEFAULT_SOURCE" if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template index abda5138c9aead..71577f00021b7c 100644 --- a/srcpkgs/yambar/template +++ b/srcpkgs/yambar/template @@ -1,6 +1,6 @@ # Template file for 'yambar' pkgname=yambar -version=1.10.0 +version=1.11.0 revision=1 build_style=meson hostmakedepends="flex pkg-config scdoc wayland-devel" @@ -15,7 +15,7 @@ license="MIT" homepage="https://codeberg.org/dnkl/yambar" changelog="https://codeberg.org/dnkl/yambar/raw/branch/master/CHANGELOG.md" distfiles="https://codeberg.org/dnkl/yambar/archive/${version}.tar.gz" -checksum=ebf08a17b77053f16038c1538fe9d410d06289b8ea28ff5a5022aca8e9b84807 +checksum=3649878ae7282203b4ff2aa9f45afad32a6fc8c921d94b6abdac2a1d21045aaf do_check() { xvfb-run ninja -C build/ test