* [gentoo-commits] repo/gentoo:master commit in: sys-apps/epoch/files/, sys-apps/epoch/
@ 2017-01-26 17:53 Alice Ferrazzi
0 siblings, 0 replies; 2+ messages in thread
From: Alice Ferrazzi @ 2017-01-26 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 7fa79cf5834aecd6d6ba4b827cfe435e4d55fc0b
Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 17:52:12 2017 +0000
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 17:53:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa79cf5
sys-apps/epoch: fix #607214 missing default config file
Package-Manager: portage-2.3.3
sys-apps/epoch/epoch-1.2.1.ebuild | 4 +-
sys-apps/epoch/epoch-1.2.2.ebuild | 4 +-
sys-apps/epoch/epoch-1.3.0.ebuild | 4 +-
sys-apps/epoch/files/epoch-1.0-epoch.conf | 77 +++++++++++++++++++++++++++++++
4 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/sys-apps/epoch/epoch-1.2.1.ebuild b/sys-apps/epoch/epoch-1.2.1.ebuild
index af7b6bb..1978a71 100644
--- a/sys-apps/epoch/epoch-1.2.1.ebuild
+++ b/sys-apps/epoch/epoch-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -55,7 +55,7 @@ src_install() {
newepochins sbin
insinto /etc/epoch/
- newins "${FILESDIR}"/${PN}-1.0_rc1-epoch.conf epoch.conf
+ newins "${FILESDIR}"/${PN}-1.0-epoch.conf epoch.conf
}
pkg_postinst() {
diff --git a/sys-apps/epoch/epoch-1.2.2.ebuild b/sys-apps/epoch/epoch-1.2.2.ebuild
index 6057021..3485856 100644
--- a/sys-apps/epoch/epoch-1.2.2.ebuild
+++ b/sys-apps/epoch/epoch-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -55,7 +55,7 @@ src_install() {
newepochins sbin
insinto /etc/epoch/
- newins "${FILESDIR}"/${PN}-1.0_rc1-epoch.conf epoch.conf
+ newins "${FILESDIR}"/${PN}-1.0-epoch.conf epoch.conf
}
pkg_postinst() {
diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild
index 70f783d..e418402 100644
--- a/sys-apps/epoch/epoch-1.3.0.ebuild
+++ b/sys-apps/epoch/epoch-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -56,7 +56,7 @@ src_install() {
newepochins sbin
insinto /etc/epoch/
- newins "${FILESDIR}"/${PN}-1.0_rc1-epoch.conf epoch.conf
+ newins "${FILESDIR}"/${PN}-1.0-epoch.conf epoch.conf
}
pkg_postinst() {
diff --git a/sys-apps/epoch/files/epoch-1.0-epoch.conf b/sys-apps/epoch/files/epoch-1.0-epoch.conf
new file mode 100644
index 00000000..e0550d4
--- /dev/null
+++ b/sys-apps/epoch/files/epoch-1.0-epoch.conf
@@ -0,0 +1,77 @@
+BootBannerText=Welcome!
+BootBannerColor=RED
+
+Hostname=FILE /etc/hostname
+DefaultRunlevel=boot
+EnableLogging=true
+MountVirtual=procfs sysfs devpts+ devshm+
+
+ObjectID=mountrun
+ ObjectDescription=Mounting /run
+ ObjectStartCommand=mount /run
+ ObjectStartPriority=1
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=RAWDESCRIPTION
+ ObjectRunlevels=boot
+
+ObjectID=mounttmp
+ ObjectDescription=Mounting /tmp
+ ObjectStartCommand=mount /tmp
+ ObjectStartPriority=1
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=RAWDESCRIPTION
+ ObjectRunlevels=boot
+
+ObjectID=rwfs
+ ObjectDescription=read-write support on /
+ ObjectStartCommand=/bin/mount -o remount,rw /
+ ObjectStopCommand=/bin/mount -o remount,ro /
+ ObjectStartPriority=2
+ ObjectStopPriority=5
+ ObjectEnabled=true
+ ObjectRunlevels=boot
+
+ObjectID=getty1
+ ObjectDescription=agetty on /dev/tty1
+ ObjectStartCommand=agetty --noclear tty1 &
+ ObjectStopCommand=NONE
+ ObjectStartPriority=3
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot
+
+ObjectID=extrafs
+ ObjectDescription=extra filesystems and swaps
+ ObjectStartCommand=mount -a && swapon -a
+ ObjectStopCommand=swapoff -a && umount -a -r -t nodevtmpfs,notmpfs,nosysfs,noproc
+ ObjectStartPriority=4
+ ObjectStopPriority=4
+ ObjectEnabled=true
+ ObjectRunlevels=boot
+
+ObjectID=killall5_soft
+ ObjectDescription=Terminating all processes
+ ObjectStopCommand=killall5 -15 && sleep 1
+ ObjectStartPriority=0
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=HALTONLY RAWDESCRIPTION
+
+ObjectID=sync
+ ObjectDescription=Syncing
+ ObjectStopCommand=/bin/sync
+ ObjectStartPriority=0
+ ObjectStopPriority=2
+ ObjectEnabled=true
+ ObjectOptions=HALTONLY RAWDESCRIPTION
+
+ObjectID=killall5
+ ObjectDescription=Killing all processes
+ ObjectStopCommand=killall5 -9 && sleep 1
+ ObjectStartPriority=0
+ ObjectStopPriority=3
+ ObjectEnabled=true
+ ObjectOptions=HALTONLY RAWDESCRIPTION
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/epoch/files/, sys-apps/epoch/
@ 2022-01-09 17:56 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-01-09 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 34c87461e60d34f97cd40b297065dcf612929ae7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 16:34:09 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 9 17:55:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c87461
sys-apps/epoch: EAPI-8 bump, fix postinst contact info
Bug: https://bugs.gentoo.org/783738
Closes: https://bugs.gentoo.org/809224
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-apps/epoch/epoch-1.3.0.ebuild | 30 +++++++++++--------------
sys-apps/epoch/epoch-9999.ebuild | 26 +++++++++------------
sys-apps/epoch/files/epoch-1.3.0-fix-main.patch | 4 ++--
3 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild
index a37c2f912f6a..835ef3b7d1e0 100644
--- a/sys-apps/epoch/epoch-1.3.0.ebuild
+++ b/sys-apps/epoch/epoch-1.3.0.ebuild
@@ -1,33 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
-inherit epatch linux-info
+inherit linux-info
-MY_PV="${PV/rc/RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity"
-HOMEPAGE="http://universe2.us/epoch.html"
-SRC_URI="http://universe2.us/${PN}_${PV}.tar.gz"
+DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity"
+HOMEPAGE="https://universe2.us/epoch.html"
+SRC_URI="https://universe2.us/${PN}_${PV}.tar.gz"
+S="${WORKDIR}/${PN}_${PV/rc/RC}"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-S="${WORKDIR}/${PN}_${PV}"
-
pkg_pretend() {
local CONFIG_CHECK="~PROC_FS"
[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
- epatch "${FILESDIR}"/${PN}-1.3.0-fix-main.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.3.0-fix-main.patch
+)
src_compile() {
NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch."
@@ -68,7 +64,7 @@ pkg_postinst() {
elog ""
elog "Additional information about epoch is available at"
elog "${HOMEPAGE} and configuration documentation at"
- elog "http://universe2.us/epochconfig.html which is useful reading material."
+ elog "https://universe2.us/epochconfig.html which is useful reading material."
elog ""
- elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net."
+ elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat."
}
diff --git a/sys-apps/epoch/epoch-9999.ebuild b/sys-apps/epoch/epoch-9999.ebuild
index 007de0c5e28b..8022520e994c 100644
--- a/sys-apps/epoch/epoch-9999.ebuild
+++ b/sys-apps/epoch/epoch-9999.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
-inherit epatch linux-info git-r3
+inherit linux-info git-r3
-MY_PV="${PV/rc/RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity"
-HOMEPAGE="http://universe2.us/epoch.html"
+DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity"
+HOMEPAGE="https://universe2.us/epoch.html"
EGIT_REPO_URI="https://github.com/Subsentient/epoch.git"
+S="${WORKDIR}/${PN}-${PV/rc/RC}"
LICENSE="public-domain"
SLOT="0"
KEYWORDS=""
-S="${WORKDIR}/${MY_P}"
-
pkg_pretend() {
local CONFIG_CHECK="~PROC_FS"
[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
+)
src_compile() {
NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch."
@@ -67,7 +63,7 @@ pkg_postinst() {
elog ""
elog "Additional information about epoch is available at"
elog "${HOMEPAGE} and configuration documentation at"
- elog "http://universe2.us/epochconfig.html which is useful reading material."
+ elog "https://universe2.us/epochconfig.html which is useful reading material."
elog ""
- elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net."
+ elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat."
}
diff --git a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch
index b158ae2e3396..f6df7680ac29 100644
--- a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch
+++ b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch
@@ -1,5 +1,5 @@
---- src/main.c.orig 2016-11-13 15:11:58.511021203 +0000
-+++ src/main.c 2016-11-13 15:12:21.096021358 +0000
+--- a/src/main.c
++++ b/src/main.c
@@ -1142,8 +1142,9 @@ static ReturnCode HandleEpochCommand(int
ShutdownMemBus(false); //We're done with membus now.
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-09 18:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-26 17:53 [gentoo-commits] repo/gentoo:master commit in: sys-apps/epoch/files/, sys-apps/epoch/ Alice Ferrazzi
-- strict thread matches above, loose matches on Subject: below --
2022-01-09 17:56 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox