diff --git a/srcpkgs/plocate/files/plocate.cron-daily b/srcpkgs/plocate/files/plocate.cron-daily index 099ba5ce69a..a616d55d280 100644 --- a/srcpkgs/plocate/files/plocate.cron-daily +++ b/srcpkgs/plocate/files/plocate.cron-daily @@ -1,5 +1,3 @@ #!/bin/sh -set -e -plocate-build /var/lib/mlocate/mlocate.db /var/lib/mlocate/plocate.db.new -chgrp _plocate /var/lib/mlocate/plocate.db.new -mv /var/lib/mlocate/plocate.db.new /var/lib/mlocate/plocate.db +ulimit -n 131072 +exec pupdatedb diff --git a/srcpkgs/plocate/files/pupdatedb b/srcpkgs/plocate/files/pupdatedb deleted file mode 100644 index 08fdbd0748a..00000000000 --- a/srcpkgs/plocate/files/pupdatedb +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# pupdatedb [database directory] - update a database for plocate -set -e -dbdir=${1:-${DBDIR:-/var/lib/mlocate}} -mupdatedb -o "${dbdir}/mlocate.db" -plocate-build "${dbdir}/mlocate.db" "${dbdir}/plocate.db.new" -chgrp _plocate "${dbdir}/plocate.db.new" -mv "${dbdir}/plocate.db.new" "${dbdir}/plocate.db" diff --git a/srcpkgs/plocate/patches/musl.patch b/srcpkgs/plocate/patches/musl.patch new file mode 100644 index 00000000000..c75020f99b3 --- /dev/null +++ b/srcpkgs/plocate/patches/musl.patch @@ -0,0 +1,21 @@ +--- conf.cpp ++++ conf.cpp +@@ -479,7 +479,7 @@ + if (conf_scan_root != NULL) + error(EXIT_FAILURE, 0, _("--%s specified twice"), + "database-root"); +- conf_scan_root = canonicalize_file_name(optarg); ++ conf_scan_root = realpath(optarg, NULL); + if (conf_scan_root == NULL) + error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg, + "database-root"); +--- database-builder.h ++++ database-builder.h +@@ -3,6 +3,7 @@ + + #include "db.h" + ++#include + #include + #include + #include diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template index 590edee47e8..8fbece07640 100644 --- a/srcpkgs/plocate/template +++ b/srcpkgs/plocate/template @@ -1,24 +1,32 @@ # Template file for 'plocate' pkgname=plocate -version=1.0.7 +version=1.1.6 revision=1 build_style=meson +configure_args=" + -Dupdatedb_progname=pupdatedb + -Dlocategroup=_plocate" hostmakedepends="pkg-config" makedepends="libzstd-devel" -depends="mlocate" short_desc="Much faster locate based on posting lists" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://plocate.sesse.net/" +changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD" distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz" -checksum=528541eede06170aa16488b2c24abad2e527a12053a62a4a49d0eac3a41e21d3 +checksum=bff5d80874639003ffba34a37778081ca0a75f89ea0ca3d1bee9309332bfdbd3 system_accounts="_plocate" alternatives=" locate:locate:/usr/bin/plocate locate:locate.1:/usr/share/man/man1/plocate.1 - locate:updatedb:/usr/bin/pupdatedb" + locate:updatedb:/usr/bin/pupdatedb + locate:updatedb.conf.5:/usr/share/man/man5/pupdatedb.conf.5" + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -26,8 +34,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi post_install() { - # replace daily cronjob with our own version - rm ${DESTDIR}/etc/cron.daily/plocate vinstall ${FILESDIR}/plocate.cron-daily 744 etc/cron.daily plocate-build - vbin ${FILESDIR}/pupdatedb + mv ${DESTDIR}/usr/share/man/man5/{,p}updatedb.conf.5 }