* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/, sys-power/apcupsd/files/
@ 2025-01-23 23:52 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2025-01-23 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 85f08b2beefc799a843a3c84f309cf44a3316a93
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 23:49:58 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 23:51:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f08b2b
sys-power/apcupsd: update EAPI 7 -> 8
Also changed:
* Sorted use flags
* Use generated apcupsd.conf
* Set NISIP via configure
* Remove runlevel check from apcupsd.powerfail
* Patch for LTO
* Dropped PAGER workaround
Closes: https://bugs.gentoo.org/418177
Closes: https://bugs.gentoo.org/832350
Closes: https://bugs.gentoo.org/941584
Closes: https://github.com/gentoo/gentoo/pull/40199
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-power/apcupsd/apcupsd-3.14.14-r4.ebuild | 160 ++++++++++++++++++++++
sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch | 29 ++++
sys-power/apcupsd/files/apcupsd.powerfail.init-r1 | 17 +++
3 files changed, 206 insertions(+)
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r4.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r4.ebuild
new file mode 100644
index 000000000000..c3bc2dbb2a36
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r4.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd udev tmpfiles
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="https://downloads.sourceforge.net/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+IUSE="cgi +modbus selinux snmp +usb"
+
+DEPEND="
+ sys-apps/util-linux[tty-helpers]
+ cgi? ( media-libs/gd:2= )
+ modbus? (
+ usb? ( virtual/libusb:0= )
+ )
+ snmp? ( net-analyzer/net-snmp )
+"
+
+RDEPEND="
+ virtual/mailx
+ selinux? ( sec-policy/selinux-apcupsd )
+ ${DEPEND}
+"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV: needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW: needed to access USB-attached UPSes"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.14.9-aliasing.patch
+ "${FILESDIR}"/${PN}-3.14.9-close-on-exec.patch
+ "${FILESDIR}"/${PN}-3.14.9-commfailure.patch
+ "${FILESDIR}"/${PN}-3.14.9-fix-nologin.patch
+ "${FILESDIR}"/${PN}-3.14.9-gapcmon.patch
+ "${FILESDIR}"/${PN}-3.14.9-wall-on-mounted-usr.patch
+ "${FILESDIR}"/${PN}-3.14.14-lto.patch
+)
+
+pkg_setup() {
+ if use kernel_linux && use usb && linux_config_exists ; then
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ default
+ # skip this specific doc step as produced files never installed
+ # this avoids calling the col command not available on musl based system.
+ sed -i "/^SUBDIRS/ s/doc//g" Makefile || die
+}
+
+src_configure() {
+ # We force the DISTNAME to gentoo so it will use gentoo's layout also
+ # when installed on non-linux systems.
+ local myeconfargs
+ myeconfargs=(
+ APCUPSD_MAIL="$(type -p mail)"
+ --disable-gapcmon
+ --enable-net
+ --enable-pcnet
+ --sbindir="/sbin"
+ --sysconfdir="${EPREFIX}/etc/apcupsd"
+ --with-distname="gentoo"
+ --with-pwrfail-dir="${EPREFIX}/etc/apcupsd"
+ --with-lock-dir="${EPREFIX}/run/apcupsd"
+ --with-log-dir="${EPREFIX}/var/log"
+ --with-nisip="127.0.0.1"
+ --with-nis-port="3551"
+ --with-pid-dir="${EPREFIX}/run/apcupsd"
+ --with-upscable="$(usex usb usb smart)"
+ --with-upstype="$(usex usb usb apcsmart)"
+ $(use_enable cgi)
+ $(use_enable modbus)
+ $(use_enable snmp)
+ $(use_enable usb)
+ $(use_with cgi cgi-bin "${EPREFIX}/usr/libexec/${PN}/cgi-bin")
+ $(usex modbus $(use_enable usb modbus-usb) "--disable-modbus-usb")
+ $(usex usb "--without-serial-dev" "--with-serial-dev=/dev/ttyS0")
+ $(usex usb "--with-dev=" "--with-dev=/dev/ttyS0")
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake VERBOSE="2"
+}
+
+src_install() {
+ emake DESTDIR="${D}" VERBOSE="2" install
+
+ rm "${ED}"/etc/init.d/apcupsd || die
+ rm "${ED}"/etc/init.d/halt || die
+ rm -r "${ED}"/usr/share/hal || die
+
+ insinto /etc/apcupsd
+ newins examples/safe.apccontrol safe.apccontrol
+
+ doman doc/*.8 doc/*.5
+
+ docinto html
+ dodoc -r doc/manual/.
+ einstalldocs
+
+ newinitd "${FILESDIR}"/apcupsd.init apcupsd
+ newinitd "${FILESDIR}"/apcupsd.powerfail.init-r1 apcupsd.powerfail
+
+ systemd_dounit "${FILESDIR}"/apcupsd.service
+ dotmpfiles "${FILESDIR}"/apcupsd-tmpfiles.conf
+
+ # replace it with our udev rules if we're in Linux
+ if use kernel_linux ; then
+ udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+ fi
+
+}
+
+pkg_postinst() {
+ use kernel_linux && udev_reload
+
+ tmpfiles_process ${PN}-tmpfiles.conf
+
+ if use cgi ; then
+ elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+ elog "Set up your ScriptAlias or symbolic links accordingly."
+ fi
+
+ elog ""
+ elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+ elog "control more than one UPS in a single box with openRC."
+ elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+ elog "/etc/init.d/apcupsd.something, and it will then load the"
+ elog "configuration file at /etc/apcupsd/something.conf."
+ elog ""
+
+ elog 'If you want apcupsd to power off your UPS when it'
+ elog 'shuts down your system in a power failure, you must'
+ elog 'add apcupsd.powerfail to your shutdown runlevel:'
+ elog ''
+ elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+ elog ''
+
+ if use kernel_linux; then
+ elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+ elog "for persistent device naming. If you have multiple UPS"
+ elog "connected to the machine, you can point them to the devices"
+ elog "in /dev/apcups/by-id directory."
+ fi
+}
+
+pkg_postrm() {
+ use kernel_linux && udev_reload
+}
diff --git a/sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch b/sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch
new file mode 100644
index 000000000000..54ad76b61a35
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch
@@ -0,0 +1,29 @@
+Fix extern symbol declarations to be consistent with the definition.
+
+Bug: https://bugs.gentoo.org/941584
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+diff -rup a/src/apcupsd.c a/src/apcupsd.c
+--- a/src/apcupsd.c
++++ b/src/apcupsd.c
+@@ -31,7 +31,7 @@ static void daemon_start(void);
+ int pidcreated = 0;
+ extern int kill_on_powerfail;
+ extern FILE *trace_fd;
+-extern char *pidfile;
++extern const char *pidfile;
+
+ /*
+ * The terminate function and trapping signals allows apcupsd
+diff -rup a/src/options.c b/src/options.c
+--- a/src/options.c
++++ b/src/options.c
+@@ -62,7 +62,7 @@ int terminate_on_powerfail = FALSE;
+ int kill_on_powerfail = FALSE;
+ int dumb_mode_test = FALSE; /* for testing dumb mode */
+ int go_background = TRUE;
+-extern char *pidfile;
++extern const char *pidfile;
+ extern bool trace;
+
+ static void print_usage(char *argv[])
diff --git a/sys-power/apcupsd/files/apcupsd.powerfail.init-r1 b/sys-power/apcupsd/files/apcupsd.powerfail.init-r1
new file mode 100644
index 000000000000..d582d9eb5b3a
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd.powerfail.init-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2009-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description='Signal the UPS to kill power in a power failure condition'
+
+depend() {
+ need mount-ro
+}
+
+start() {
+ if [ -f /etc/apcupsd/powerfail ] ; then
+ ebegin 'Signaling UPS to kill power'
+ /sbin/apcupsd --killpower
+ eend $?
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/, sys-power/apcupsd/files/
@ 2025-02-18 2:37 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2025-02-18 2:37 UTC (permalink / raw
To: gentoo-commits
commit: ff458e121b5a8093c1c63f0caa3f21478dc34854
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 02:37:27 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 02:37:42 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff458e12
sys-power/apcupsd: drop 3.14.14-r3
Closes: https://bugs.gentoo.org/948418
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 158 -------------------------
sys-power/apcupsd/files/apcupsd.powerfail.init | 17 ---
2 files changed, 175 deletions(-)
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
deleted file mode 100644
index ba2ab5506de5..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd udev tmpfiles
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="https://downloads.sourceforge.net/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
-IUSE="selinux snmp +usb +modbus cgi"
-
-DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
- cgi? ( >=media-libs/gd-1.8.4 )
- modbus? ( usb? ( virtual/libusb:0 ) )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )"
-
-RDEPEND="${DEPEND}
- virtual/mailx
- selinux? ( sec-policy/selinux-apcupsd )"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV: needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW: needed to access USB-attached UPSes"
-
-DOCS=( ChangeLog ReleaseNotes )
-HTML_DOCS=( doc/manual )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.14.9-aliasing.patch
- "${FILESDIR}"/${PN}-3.14.9-close-on-exec.patch
- "${FILESDIR}"/${PN}-3.14.9-commfailure.patch
- "${FILESDIR}"/${PN}-3.14.9-fix-nologin.patch
- "${FILESDIR}"/${PN}-3.14.9-gapcmon.patch
- "${FILESDIR}"/${PN}-3.14.9-wall-on-mounted-usr.patch
-)
-
-pkg_setup() {
- if use kernel_linux && use usb && linux_config_exists ; then
- check_extra_config
- fi
-}
-
-src_prepare() {
- default
- # skip this specific doc step as produced files never installed
- # this avoids calling the col command not available on musl based system.
- sed -i "/^SUBDIRS/ s/doc//g" Makefile || die
-}
-
-src_configure() {
- local myconf
-
- use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-
- if use usb ; then
- myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev="
- use modbus && myconf="${myconf} --enable-modbus-usb"
- else
- myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
- use modbus || myconf="${myconf} --disable-modbus"
- fi
-
- # We force the DISTNAME to gentoo so it will use gentoo's layout also
- # when installed on non-linux systems.
- econf \
- --sbindir=/sbin \
- --sysconfdir=/etc/apcupsd \
- --with-pwrfail-dir=/etc/apcupsd \
- --with-lock-dir=/run/apcupsd \
- --with-pid-dir=/run/apcupsd \
- --with-log-dir=/var/log \
- --with-nis-port=3551 \
- --enable-net --enable-pcnet \
- --with-distname=gentoo \
- $(use_enable snmp) \
- --disable-gapcmon \
- ${myconf} \
- APCUPSD_MAIL=$(type -p mail)
-}
-
-src_compile() {
- # Workaround for bug #280674; upstream should really just provide
- # the text files in the distribution, but I wouldn't count on them
- # doing that anytime soon.
- MANPAGER=$(type -p cat) \
- emake VERBOSE=2
-}
-
-src_install() {
- emake DESTDIR="${D}" VERBOSE=2 install
- rm "${ED}"/etc/init.d/halt || die
-
- insinto /etc/apcupsd
- newins examples/safe.apccontrol safe.apccontrol
- doins "${FILESDIR}"/apcupsd.conf
-
- doman doc/*.8 doc/*.5
-
- einstalldocs
-
- rm "${ED}"/etc/init.d/apcupsd || die
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
- newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf
-
- # remove hal settings, we don't really want to have it still around.
- rm -r "${D}"/usr/share/hal || die
-
- # replace it with our udev rules if we're in Linux
- if use kernel_linux ; then
- udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
- fi
-
-}
-
-pkg_postinst() {
- use kernel_linux && udev_reload
-
- tmpfiles_process ${PN}-tmpfiles.conf
-
- if use cgi ; then
- elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
- elog "Set up your ScriptAlias or symbolic links accordingly."
- fi
-
- elog ""
- elog "Since version 3.14.0 you can use multiple apcupsd instances to"
- elog "control more than one UPS in a single box with openRC."
- elog "To do this, create a link between /etc/init.d/apcupsd to a new"
- elog "/etc/init.d/apcupsd.something, and it will then load the"
- elog "configuration file at /etc/apcupsd/something.conf."
- elog ""
-
- elog 'If you want apcupsd to power off your UPS when it'
- elog 'shuts down your system in a power failure, you must'
- elog 'add apcupsd.powerfail to your shutdown runlevel:'
- elog ''
- elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
- elog ''
-
- if use kernel_linux; then
- elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
- elog "for persistent device naming. If you have multiple UPS"
- elog "connected to the machine, you can point them to the devices"
- elog "in /dev/apcups/by-id directory."
- fi
-}
-
-pkg_postrm() {
- use kernel_linux && udev_reload
-}
diff --git a/sys-power/apcupsd/files/apcupsd.powerfail.init b/sys-power/apcupsd/files/apcupsd.powerfail.init
deleted file mode 100644
index be591f86c185..000000000000
--- a/sys-power/apcupsd/files/apcupsd.powerfail.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='Signal the UPS to kill power in a power failure condition'
-
-depend() {
- need mount-ro
-}
-
-start() {
- if [ "$(runlevel | cut -d' ' -f2)" = "0" -a -f /etc/apcupsd/powerfail ] ; then
- ebegin 'Signaling UPS to kill power'
- /sbin/apcupsd --killpower
- eend $?
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/, sys-power/apcupsd/files/
@ 2021-05-13 22:11 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-05-13 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 6aa3d5ec033c67cf9f644e8b50c10b9179a0af80
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 22:10:36 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 13 22:10:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa3d5ec
sys-power/apcupsd: Remove old 3.14.14-r2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 137 ----------------------------
sys-power/apcupsd/files/apcupsd.init.4 | 48 ----------
2 files changed, 185 deletions(-)
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
deleted file mode 100644
index 85882863d8e..00000000000
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info flag-o-matic systemd udev tmpfiles
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="snmp +usb +modbus cgi gnome kernel_linux"
-
-DEPEND="
- >=sys-apps/util-linux-2.23[tty-helpers(-)]
- modbus? ( usb? ( virtual/libusb:0 ) )
- cgi? ( >=media-libs/gd-1.8.4 )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- gnome? ( >=x11-libs/gtk+-2.4.0:2
- dev-libs/glib:2
- >=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
- virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV: needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW: needed to access USB-attached UPSes"
-
-DOCS=( ChangeLog ReleaseNotes )
-HTML_DOCS=( doc/manual )
-PATCHES=( "${FILESDIR}/${PN}-3.14.9-aliasing.patch" )
-
-pkg_setup() {
- if use kernel_linux && use usb && linux_config_exists; then
- check_extra_config
- fi
-}
-
-src_configure() {
- local myconf
- use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
- if use usb; then
- myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
- use modbus && myconf="${myconf} --enable-modbus-usb"
- else
- myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
- use modbus || myconf="${myconf} --disable-modbus"
- fi
-
- # We force the DISTNAME to gentoo so it will use gentoo's layout also
- # when installed on non-linux systems.
- econf \
- --sbindir=/sbin \
- --sysconfdir=/etc/apcupsd \
- --with-pwrfail-dir=/etc/apcupsd \
- --with-lock-dir=/run/apcupsd \
- --with-pid-dir=/run/apcupsd \
- --with-log-dir=/var/log \
- --with-nis-port=3551 \
- --enable-net --enable-pcnet \
- --with-distname=gentoo \
- $(use_enable snmp) \
- $(use_enable gnome gapcmon) \
- ${myconf} \
- APCUPSD_MAIL=$(type -p mail)
-}
-
-src_compile() {
- # Workaround for bug #280674; upstream should really just provide
- # the text files in the distribution, but I wouldn't count on them
- # doing that anytime soon.
- MANPAGER=$(type -p cat) \
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -f "${D}"/etc/init.d/halt || die
-
- insinto /etc/apcupsd
- newins examples/safe.apccontrol safe.apccontrol
- doins "${FILESDIR}"/apcupsd.conf
-
- doman doc/*.8 doc/*.5
-
- einstalldocs
-
- rm "${D}"/etc/init.d/apcupsd || die
- newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
- newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf
-
- # remove hal settings, we don't really want to have it around still.
- rm -r "${D}"/usr/share/hal || die
-
- # replace it with our udev rules if we're in Linux
- if use kernel_linux; then
- udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
- fi
-
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}-tmpfiles.conf
-
- if use cgi; then
- elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
- elog "Set up your ScriptAlias or symbolic links accordingly."
- fi
-
- elog ""
- elog "Since version 3.14.0 you can use multiple apcupsd instances to"
- elog "control more than one UPS in a single box with openRC."
- elog "To do this, create a link between /etc/init.d/apcupsd to a new"
- elog "/etc/init.d/apcupsd.something, and it will then load the"
- elog "configuration file at /etc/apcupsd/something.conf."
- elog ""
-
- elog 'If you want apcupsd to power off your UPS when it'
- elog 'shuts down your system in a power failure, you must'
- elog 'add apcupsd.powerfail to your shutdown runlevel:'
- elog ''
- elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
- elog ''
-
- if use kernel_linux; then
- elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
- elog "for persistent device naming. If you have multiple UPS"
- elog "connected to the machine, you can point them to the devices"
- elog "in /dev/apcups/by-id directory."
- fi
-}
diff --git a/sys-power/apcupsd/files/apcupsd.init.4 b/sys-power/apcupsd/files/apcupsd.init.4
deleted file mode 100644
index ebd6b9755d4..00000000000
--- a/sys-power/apcupsd/files/apcupsd.init.4
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
- INSTANCE="apcupsd"
-fi
-
-dir="/run/apcupsd"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -m 0775 -o root:uucp ${dir}
-}
-
-start() {
- rm -f /etc/apcupsd/powerfail
-
- export SERVICE="${SVCNAME}"
-
- if [ ! -d "${dir}" ]; then
- einfo " Creating ${dir}"
- /bin/mkdir -p "${dir}"
- /bin/chown root:uucp "${dir}"
- fi
-
- ebegin "Starting APC UPS daemon"
- start-stop-daemon \
- --start --pidfile "${dir}/${SVCNAME}.pid" \
- --exec /sbin/apcupsd -- \
- -f "/etc/apcupsd/${INSTANCE}.conf" \
- -P "${dir}/${SVCNAME}.pid"
- eend $?
-}
-
-stop() {
- ebegin "Stopping APC UPS daemon"
- start-stop-daemon \
- --stop --pidfile "${dir}/${SVCNAME}.pid" \
- --retry TERM/5/TERM/5 \
- --exec /sbin/apcupsd
- eend $?
-}
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-18 2:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-23 23:52 [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/, sys-power/apcupsd/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2025-02-18 2:37 Conrad Kostecki
2021-05-13 22:11 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox