diff options
Diffstat (limited to 'app-admin/metalog')
-rw-r--r-- | app-admin/metalog/Manifest | 5 | ||||
-rw-r--r-- | app-admin/metalog/files/consolelog.sh | 20 | ||||
-rw-r--r-- | app-admin/metalog/files/metalog-20230719-metalog-conf.patch | 13 | ||||
-rw-r--r-- | app-admin/metalog/files/metalog.initd | 41 | ||||
-rw-r--r-- | app-admin/metalog/metadata.xml | 3 | ||||
-rw-r--r-- | app-admin/metalog/metalog-20220214.ebuild (renamed from app-admin/metalog/metalog-20200113-r1.ebuild) | 21 | ||||
-rw-r--r-- | app-admin/metalog/metalog-20230719.ebuild (renamed from app-admin/metalog/metalog-20181125.ebuild) | 37 | ||||
-rw-r--r-- | app-admin/metalog/metalog-3-r2.ebuild | 56 |
8 files changed, 50 insertions, 146 deletions
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest index ba655692076b..24d3adf61687 100644 --- a/app-admin/metalog/Manifest +++ b/app-admin/metalog/Manifest @@ -1,3 +1,2 @@ -DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b -DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93 -DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289 +DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd +DIST metalog-20230719.tar.gz 42579 BLAKE2B 6088c86fad90185fcb22a96ff88686647eac1fb4216884f43c07dff23274efc748c908f6f98162f743d2528437748f79809dfe6911d8d47e6cf7e58c8f3ca3b4 SHA512 a717dca5e00e9e66b97a84c3dbb0cdda522cbe628fad4cfbcb5256ee69659c63149bbb1e8797028bbab55d97787661c1d7316c7c2cbfe3b65932f84d64af15f6 diff --git a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh deleted file mode 100644 index 90fb38e9921a..000000000000 --- a/app-admin/metalog/files/consolelog.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# consolelog.sh -# For metalog -- log to a console - -set -f - -. /etc/conf.d/metalog -if [ -z "${CONSOLE}" ] ; then - CONSOLE="/dev/console" -fi - -if [ -z "${FORMAT}" ] ; then - FORMAT='$1 [$2] $3' -fi - -for d in ${CONSOLE} ; do - eval echo ${FORMAT} > ${d} -done - -exit 0 diff --git a/app-admin/metalog/files/metalog-20230719-metalog-conf.patch b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch new file mode 100644 index 000000000000..504c2a28291f --- /dev/null +++ b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch @@ -0,0 +1,13 @@ +diff --git a/metalog.conf b/metalog.conf +index 8f53b87..54332c6 100644 +--- a/metalog.conf ++++ b/metalog.conf +@@ -44,6 +44,8 @@ maxfiles = 5 + # merely write $@ to some device (your console for messages): + # echo "$@" > /dev/tty10 + # ++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog ++# + #console logging: + # facility = "*" + # command = "/sbin/consolelog.sh" diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd deleted file mode 100644 index f81e9eec51ca..000000000000 --- a/app-admin/metalog/files/metalog.initd +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="buffer unbuffer" - -PIDFILE=/var/run/metalog.pid - -depend() { - need localmount - use clock hostname - after bootmisc - provide logger -} - -ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; } - -start() { - ebegin "Starting metalog" - ssd --start -- \ - --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS} - eend $? -} - -stop() { - ebegin "Stopping metalog" - ssd --stop - eend $? -} - -buffer() { - ebegin "Enabling log buffering" - ssd --signal USR2 - eend $? -} - -unbuffer() { - ebegin "Disabling log buffering" - ssd --signal USR1 - eend $? -} diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml index cf5328e7d009..61646ab7d054 100644 --- a/app-admin/metalog/metadata.xml +++ b/app-admin/metalog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">metalog</remote-id> + <remote-id type="github">hvisage/metalog</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/metalog/metalog-20200113-r1.ebuild b/app-admin/metalog/metalog-20220214.ebuild index c7915bf68936..4d63d0832473 100644 --- a/app-admin/metalog/metalog-20200113-r1.ebuild +++ b/app-admin/metalog/metalog-20220214.ebuild @@ -1,31 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools systemd DESCRIPTION="A highly configurable replacement for syslogd/klogd" HOMEPAGE="https://github.com/hvisage/metalog" SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="unicode" -RDEPEND=">=dev-libs/libpcre-3.4" -DEPEND="${RDEPEND} - sys-devel/autoconf-archive +RDEPEND="dev-libs/libpcre2" +DEPEND="${RDEPEND}" +BDEPEND="dev-build/autoconf-archive virtual/pkgconfig" -S="${WORKDIR}/${PN}-${P}" - PATCHES=( "${FILESDIR}"/${PN}-0.9-metalog-conf.patch ) src_prepare() { default + eautoreconf } @@ -42,7 +43,7 @@ src_install() { newinitd "${FILESDIR}"/metalog.initd-r1 metalog newconfd "${FILESDIR}"/metalog.confd metalog - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service } pkg_preinst() { @@ -58,8 +59,8 @@ pkg_preinst() { pkg_postinst() { if ${MOVED_METALOG_CONF} ; then ewarn "The default metalog.conf file has been moved" - ewarn "from /etc/metalog/metalog.conf to just" - ewarn "/etc/metalog.conf. If you had a standard" + ewarn "from ${EROOT}/etc/metalog/metalog.conf to just" + ewarn "${EROOT}/etc/metalog.conf. If you had a standard" ewarn "setup, the file has been moved for you." fi } diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20230719.ebuild index 879997f1e1cc..623f82164f01 100644 --- a/app-admin/metalog/metalog-20181125.ebuild +++ b/app-admin/metalog/metalog-20230719.ebuild @@ -1,31 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools systemd DESCRIPTION="A highly configurable replacement for syslogd/klogd" HOMEPAGE="https://github.com/hvisage/metalog" SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="unicode" -RDEPEND=">=dev-libs/libpcre-3.4" -DEPEND="${RDEPEND} - sys-devel/autoconf-archive - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${P}" +RDEPEND=" + dev-libs/libpcre2 +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" PATCHES=( - "${FILESDIR}"/${PN}-0.9-metalog-conf.patch + "${FILESDIR}"/metalog-20230719-metalog-conf.patch ) src_prepare() { default + eautoreconf } @@ -38,15 +45,15 @@ src_install() { dodoc AUTHORS ChangeLog README NEWS metalog.conf into / - dosbin "${FILESDIR}"/consolelog.sh + newsbin "${FILESDIR}"/consolelog.sh-r1 consolelog.sh newinitd "${FILESDIR}"/metalog.initd-r1 metalog newconfd "${FILESDIR}"/metalog.confd metalog - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service } pkg_preinst() { - if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then + if [[ -d "${ROOT}"/etc/metalog && ! -e "${ROOT}"/etc/metalog.conf ]] ; then mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf rmdir "${ROOT}"/etc/metalog export MOVED_METALOG_CONF=true @@ -58,8 +65,8 @@ pkg_preinst() { pkg_postinst() { if ${MOVED_METALOG_CONF} ; then ewarn "The default metalog.conf file has been moved" - ewarn "from /etc/metalog/metalog.conf to just" - ewarn "/etc/metalog.conf. If you had a standard" + ewarn "from ${EROOT}/etc/metalog/metalog.conf to just" + ewarn "${EROOT}/etc/metalog.conf. If you had a standard" ewarn "setup, the file has been moved for you." fi } diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild deleted file mode 100644 index 9c63681e4eee..000000000000 --- a/app-admin/metalog/metalog-3-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit eutils systemd - -DESCRIPTION="A highly configurable replacement for syslogd/klogd" -HOMEPAGE="http://metalog.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="unicode" - -RDEPEND=">=dev-libs/libpcre-3.4" -DEPEND="${RDEPEND} - virtual/pkgconfig - app-arch/xz-utils" - -PATCHES=( "${FILESDIR}"/${PN}-0.9-metalog-conf.patch ) - -src_configure() { - econf $(use_with unicode) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README NEWS metalog.conf - - into / - dosbin "${FILESDIR}"/consolelog.sh - - newinitd "${FILESDIR}"/metalog.initd metalog - newconfd "${FILESDIR}"/metalog.confd metalog - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" -} - -pkg_preinst() { - if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then - mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf - rmdir "${ROOT}"/etc/metalog - export MOVED_METALOG_CONF=true - else - export MOVED_METALOG_CONF=false - fi -} - -pkg_postinst() { - if ${MOVED_METALOG_CONF} ; then - ewarn "The default metalog.conf file has been moved" - ewarn "from /etc/metalog/metalog.conf to just" - ewarn "/etc/metalog.conf. If you had a standard" - ewarn "setup, the file has been moved for you." - fi -} |