[gentoo-commits] repo/gentoo:master commit in: sys-apps/mlocate/files/, sys-apps/mlocate/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/mlocate/files/, sys-apps/mlocate/

[Lars Wendler]

commit:     97a0d0ae0af66fc9dbe869678ddd2ff763329ea5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 08:52:36 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 08:52:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a0d0ae

sys-apps/mlocate: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/mlocate/files/mlocate.cron-r2  | 48 -------------------------
 sys-apps/mlocate/mlocate-0.26-r1.ebuild | 63 ---------------------------------
 2 files changed, 111 deletions(-)

diff --git a/sys-apps/mlocate/files/mlocate.cron-r2 b/sys-apps/mlocate/files/mlocate.cron-r2
deleted file mode 100644
index cf42104..00000000
--- a/sys-apps/mlocate/files/mlocate.cron-r2
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-set -e
-
-# check if we run on battery and if so then don't run
-if which on_ac_power >/dev/null 2>&1; then
-	ON_BATTERY=0
-	on_ac_power >/dev/null 2>&1 || ON_BATTERY=$?
-	if [ "${ON_BATTERY}" -eq 1 ]; then
-			exit 0
-	fi
-fi
-
-# check if we are already running (lockfile)
-LOCKFILE="/var/lock/mlocate.daily.lock"
-if [ -e "${LOCKFILE}" ]; then
-	echo >&2 "Warning: \"${LOCKFILE}\" already present, not running updatedb."
-	exit 1
-fi
-touch "${LOCKFILE}"
-# trap the lockfile only if we really run the updatedb
-trap "rm -f ${LOCKFILE}" EXIT
-
-# source the user specified variables
-if [ -f /etc/mlocate-cron.conf ]; then
-	. /etc/mlocate-cron.conf
-fi
-
-# check the config file
-NODEVS=""
-if [ ! -f /etc/updatedb.conf ]; then
-	NODEVS=$(awk '$1 == "nodev" && $2 != "rootfs" { print $2 }' /proc/filesystems)
-fi
-
-# alter the priority of the updatedb process
-if [ -x /usr/bin/renice ]; then
-	/usr/bin/renice +${NICE:-19} -p $$ > /dev/null 2>&1
-fi
-if [ -x /usr/bin/ionice ] && /usr/bin/ionice -c3 true 2>/dev/null; then
-	/usr/bin/ionice -c${IONICE_CLASS:-2} -n${IONICE_PRIORITY:-7} -p $$ > /dev/null 2>&1
-fi
-
-# run the updatedb if possible
-if [ -x /usr/bin/updatedb ]; then
-	/usr/bin/updatedb -f "${NODEVS}"
-else
-	echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb."
-	exit 0
-fi

diff --git a/sys-apps/mlocate/mlocate-0.26-r1.ebuild b/sys-apps/mlocate/mlocate-0.26-r1.ebuild
deleted file mode 100644
index a0895671..00000000
--- a/sys-apps/mlocate/mlocate-0.26-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils user toolchain-funcs
-
-DESCRIPTION="Merging locate is an utility to index and quickly search for files"
-HOMEPAGE="https://fedorahosted.org/mlocate/"
-SRC_URI="https://fedorahosted.org/releases/m/l/mlocate/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls selinux"
-
-RDEPEND="!sys-apps/slocate
-	!sys-apps/rlocate
-	selinux? ( sec-policy/selinux-slocate )"
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	enewgroup locate
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_compile() {
-	emake groupname=locate AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake groupname=locate DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README NEWS
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/mlocate-cron.conf
-	fperms 0644 /etc/{updatedb,mlocate-cron}.conf
-
-	insinto /etc/cron.daily
-	newins "${FILESDIR}"/mlocate.cron-r2 mlocate
-	fperms 0755 /etc/cron.daily/mlocate
-
-	fowners 0:locate /usr/bin/locate
-	fperms go-r,g+s /usr/bin/locate
-
-	keepdir /var/lib/mlocate
-	chown -R 0:locate "${ED}"/var/lib/mlocate
-	fperms 0750 /var/lib/mlocate
-}
-
-pkg_postinst() {
-	elog "The database for the locate command is generated daily by a cron job,"
-	elog "if you install for the first time you can run the updatedb command manually now."
-	elog
-	elog "Note that the /etc/updatedb.conf file is generic,"
-	elog "please customize it to your system requirements."
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/mlocate/files/, sys-apps/mlocate/

[Lars Wendler]

commit:     79fc4caa544234246e9040e0610137070618e4c0
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Dec 12 06:50:37 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 08:46:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fc4caa

sys-apps/mlocate: Revbump - cleanup temporary files at cron.daily job

During updating database mlocate creates tmp-file. If daily cron job has failed
(for example, after reboot), tmp-files are left in disk.

Added rm command before updatedb to delete these orphained files.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3096

 sys-apps/mlocate/files/mlocate.cron-r3  | 51 ++++++++++++++++++++++++++
 sys-apps/mlocate/mlocate-0.26-r2.ebuild | 63 +++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/sys-apps/mlocate/files/mlocate.cron-r3 b/sys-apps/mlocate/files/mlocate.cron-r3
new file mode 100644
index 00000000..7f3252e
--- /dev/null
+++ b/sys-apps/mlocate/files/mlocate.cron-r3
@@ -0,0 +1,51 @@
+#! /bin/sh
+set -e
+
+# check if we run on battery and if so then don't run
+if which on_ac_power >/dev/null 2>&1; then
+	ON_BATTERY=0
+	on_ac_power >/dev/null 2>&1 || ON_BATTERY=$?
+	if [ "${ON_BATTERY}" -eq 1 ]; then
+			exit 0
+	fi
+fi
+
+# check if we are already running (lockfile)
+LOCKFILE="/var/lock/mlocate.daily.lock"
+if [ -e "${LOCKFILE}" ]; then
+	echo >&2 "Warning: \"${LOCKFILE}\" already present, not running updatedb."
+	exit 1
+fi
+touch "${LOCKFILE}"
+# trap the lockfile only if we really run the updatedb
+trap "rm -f ${LOCKFILE}" EXIT
+
+# source the user specified variables
+if [ -f /etc/mlocate-cron.conf ]; then
+	. /etc/mlocate-cron.conf
+fi
+
+# check the config file
+NODEVS=""
+if [ ! -f /etc/updatedb.conf ]; then
+	NODEVS=$(awk '$1 == "nodev" && $2 != "rootfs" { print $2 }' /proc/filesystems)
+fi
+
+# alter the priority of the updatedb process
+if [ -x /usr/bin/renice ]; then
+	/usr/bin/renice +${NICE:-19} -p $$ > /dev/null 2>&1
+fi
+if [ -x /usr/bin/ionice ] && /usr/bin/ionice -c3 true 2>/dev/null; then
+	/usr/bin/ionice -c${IONICE_CLASS:-2} -n${IONICE_PRIORITY:-7} -p $$ > /dev/null 2>&1
+fi
+
+# Cleanup old temp files from previous unsuccessful runs
+rm -f /var/lib/mlocate/mlocate.db.*
+
+# run the updatedb if possible
+if [ -x /usr/bin/updatedb ]; then
+	/usr/bin/updatedb -f "${NODEVS}"
+else
+	echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb."
+	exit 0
+fi

diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
new file mode 100644
index 00000000..efb764b
--- /dev/null
+++ b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user toolchain-funcs
+
+DESCRIPTION="Merging locate is an utility to index and quickly search for files"
+HOMEPAGE="https://fedorahosted.org/mlocate/"
+SRC_URI="https://fedorahosted.org/releases/m/l/mlocate/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls selinux"
+
+RDEPEND="!sys-apps/slocate
+	!sys-apps/rlocate
+	selinux? ( sec-policy/selinux-slocate )"
+DEPEND="app-arch/xz-utils
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	enewgroup locate
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	emake groupname=locate AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake groupname=locate DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README NEWS
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/mlocate-cron.conf
+	fperms 0644 /etc/{updatedb,mlocate-cron}.conf
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}"/mlocate.cron-r3 mlocate
+	fperms 0755 /etc/cron.daily/mlocate
+
+	fowners 0:locate /usr/bin/locate
+	fperms go-r,g+s /usr/bin/locate
+
+	keepdir /var/lib/mlocate
+	chown -R 0:locate "${ED}"/var/lib/mlocate
+	fperms 0750 /var/lib/mlocate
+}
+
+pkg_postinst() {
+	elog "The database for the locate command is generated daily by a cron job,"
+	elog "if you install for the first time you can run the updatedb command manually now."
+	elog
+	elog "Note that the /etc/updatedb.conf file is generic,"
+	elog "please customize it to your system requirements."
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/mlocate/files/, sys-apps/mlocate/

[Mike Gilbert]

commit:     0af088b41c694fbfd94e1db51a9df836eda0f7fd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 16:06:19 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 16:17:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af088b4

sys-apps/mlocate: modernize ebuild

- EAPI=7
- Depend on acct-group/locate
- Install systemd service/timer
- Remove unneeded fperms/chown
- Display postinst message on initial install only

Closes: https://bugs.gentoo.org/622236
Closes: https://bugs.gentoo.org/509994
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/mlocate/files/updatedb.service |  7 ++++
 sys-apps/mlocate/files/updatedb.timer   | 10 ++++++
 sys-apps/mlocate/mlocate-0.26-r3.ebuild | 63 +++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+)

diff --git a/sys-apps/mlocate/files/updatedb.service b/sys-apps/mlocate/files/updatedb.service
new file mode 100644
index 00000000000..b1eef0b3c4f
--- /dev/null
+++ b/sys-apps/mlocate/files/updatedb.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Update locate database
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/updatedb
+IOSchedulingClass=idle

diff --git a/sys-apps/mlocate/files/updatedb.timer b/sys-apps/mlocate/files/updatedb.timer
new file mode 100644
index 00000000000..9418d244cd7
--- /dev/null
+++ b/sys-apps/mlocate/files/updatedb.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daily locate database update
+
+[Timer]
+OnCalendar=daily
+AccuracySec=12h
+Persistent=true
+
+[Install]
+WantedBy=timers.target

diff --git a/sys-apps/mlocate/mlocate-0.26-r3.ebuild b/sys-apps/mlocate/mlocate-0.26-r3.ebuild
new file mode 100644
index 00000000000..cc1d33e6583
--- /dev/null
+++ b/sys-apps/mlocate/mlocate-0.26-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Merging locate is an utility to index and quickly search for files"
+HOMEPAGE="https://pagure.io/mlocate"
+SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls selinux"
+
+BDEPEND="
+	acct-group/locate
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	acct-group/locate
+	!sys-apps/slocate
+	!sys-apps/rlocate
+	selinux? ( sec-policy/selinux-slocate )
+"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	emake groupname=locate AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake groupname=locate DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README NEWS
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/mlocate-cron.conf
+	fperms 0644 /etc/{updatedb,mlocate-cron}.conf
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}"/mlocate.cron-r3 mlocate
+	fperms 0755 /etc/cron.daily/mlocate
+
+	keepdir /var/lib/mlocate
+	fowners 0:locate /var/lib/mlocate
+	fperms 0750 /var/lib/mlocate
+
+	systemd_dounit "${FILESDIR}"/updatedb.{service,timer}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the /etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}