Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (520018e7fb5d1b16ceca88da6a245d05c1792d01)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (520018e7fb5d1b16ceca88da6a245d05c1792d01)
  • Date: Wed, 3 Oct 2018 03:09:12 +0000

GIT changes to master z-rejected grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 3 +
dev/null |binary
z-utils/daemontools/BUILD | 6 --
z-utils/daemontools/CONFIGURE | 16 ------
z-utils/daemontools/DETAILS | 30 ------------
z-utils/daemontools/FINAL | 19 -------
z-utils/daemontools/HISTORY | 63 --------------------------
z-utils/daemontools/INSTALL | 18 -------
z-utils/daemontools/POST_REMOVE | 4 -
z-utils/daemontools/POST_RESURRECT | 1
z-utils/daemontools/PRE_BUILD | 9 ---
z-utils/daemontools/init.d/svscan | 88
-------------------------------------
12 files changed, 3 insertions(+), 254 deletions(-)

New commits:
commit 520018e7fb5d1b16ceca88da6a245d05c1792d01
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

daemontools: removed, as it's been migrated to main grimoire

diff --git a/ChangeLog b/ChangeLog
index 6a2b7db..c802acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-10-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * z-utils/daemontools: removed, as it's been migrated to main grimoire
+
2018-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* z-net/discord: new spell, all-in-one voice and text chat for gamers

diff --git a/z-utils/daemontools/BUILD b/z-utils/daemontools/BUILD
deleted file mode 100755
index 5ce2285..0000000
--- a/z-utils/daemontools/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-cd "${SPELL}-${VERSION}" &&
-
-echo "gcc ${CFLAGS} -include /usr/include/errno.h" >src/conf-cc &&
-echo "gcc ${LDFLAGS}" >src/conf-ld &&
-
-package/compile
diff --git a/z-utils/daemontools/CONFIGURE b/z-utils/daemontools/CONFIGURE
deleted file mode 100755
index d642b3f..0000000
--- a/z-utils/daemontools/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-config_query DAEMONTOOLS_CHANGE_INITTAB \
- "Start svscan from inittab?" \
- ${CHANGE_INITTAB:-y} &&
-
-persistent_remove CHANGE_INITTAB &&
-
-config_query_list DAEMONTOOLS_INSTALL_PATHS \
- "Use DJB (/command, /service) or FHS (/sbin,
/etc/service) install paths?"\
- "djb" \
- "fhs" &&
-
-if [ "${DAEMONTOOLS_INSTALL_PATHS}" == "djb" ]; then
- config_query DAEMONTOOLS_SYMLINKS \
- "Create /command symlinks in /usr/local/bin?" \
- y
-fi
diff --git a/z-utils/daemontools/DETAILS b/z-utils/daemontools/DETAILS
deleted file mode 100755
index 3798a5f..0000000
--- a/z-utils/daemontools/DETAILS
+++ /dev/null
@@ -1,30 +0,0 @@
- SPELL=daemontools
- VERSION=0.76
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/admin
- SOURCE_URL[0]=http://cr.yp.to/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
- WEB_SITE=http://cr.yp.to/daemontools.html
- ENTERED=20040202
- UPDATED=20041030
- LICENSE[0]="http://cr.yp.to/distributors.html";
- LICENSE[1]="http://cr.yp.to/softwarelaw.html";
- DOCS="${DOCS} *.html"
- SHORT="A collection of tools for managing UNIX services"
-cat << EOF
-daemontools is a collection of tools for managing UNIX services.
-
-supervise monitors a service. It starts the service and restarts the
-service if it dies. Setting up a new service is easy: all supervise
-needs is a directory with a run script that runs the service.
-
-multilog saves error messages to one or more logs. It optionally
-timestamps each line and, for each log, includes or excludes lines
-matching specified patterns. It automatically rotates logs to limit the
-amount of disk space used. If the disk fills up, it pauses and tries
-again, without losing any data.
-
-This spell by default builds an "official" package, using DJB's required
-installation paths and behaviors. Options are provided to install to
-FHS-compliant paths as well.
-EOF
diff --git a/z-utils/daemontools/FINAL b/z-utils/daemontools/FINAL
deleted file mode 100755
index d93ae70..0000000
--- a/z-utils/daemontools/FINAL
+++ /dev/null
@@ -1,19 +0,0 @@
-# The inittab needs to be modified here so that it doesn't get removed on
-# dispel.
-
-if [ "${DAEMONTOOLS_CHANGE_INITTAB}" == "y" ] && \
- ! grep -q svscanboot /etc/inittab
-then
- if [ "${DAEMONTOOLS_INSTALL_PATHS}" == "fhs" ]; then
- sedit '1,/^tty/{; /^tty/i \
-supervise:dumb:/sbin/svscanboot
- }' /etc/inittab
- else
- sedit '1,/^tty/{; /^tty/i \
-supervise:dumb:/command/svscanboot
- }' /etc/inittab
- fi &&
- message "svscanboot has been added to /etc/inittab. 'kill -1 1' to reload
init."
-else
- message "svscanboot is already in /etc/inittab."
-fi
diff --git a/z-utils/daemontools/HISTORY b/z-utils/daemontools/HISTORY
deleted file mode 100644
index f370b52..0000000
--- a/z-utils/daemontools/HISTORY
+++ /dev/null
@@ -1,63 +0,0 @@
-2007-04-01 Jeremy Blosser <jblosser-smgl AT firinn.org>
- * 0.76-errno.patch: Deleted in favor of -include /usr/include/errno.h
- * BUILD: Add -include /usr/include/errno.h, remove patching, switch
- from make to package/compile
- * CONFIGURE: Apply spell namespace to variables, query about install
- paths, drop supervise-scripts dependencies/queries.
- * DEPENDS, TRIGGERS: Deleted; drop unnecessary supervise-scripts.
- * DETAILS: Add more license info, add to DOCS.
- * FINAL: Improve inittab handling.
- * INSTALL: Account for different install paths.
- * init.d/svscan: General improvements, remove supervise-scripts,
- account for different install paths.
- * POST_REMOVE, POST_RESURRECT: Added.
- * PRE_BUILD, daemontools-docs.tar.bz2: Added for more docs.
-
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
-2005-12-01 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-07-25 Maurizio Boriani <baux AT sourcemage.org>
- * FINAL: inittab modifyed after ask.
- * CONFIGURE: New, ask for supervise scripts support.
- * DEPENDS: New, supervise-scripts optional depends.
- * init.d/svscan: Fixed.
-
-2005-07-19 Maurizio Boriani <baux AT sourcemage.org>
- * FINAL: svscan-start does not exists. Use svscanboot.
- * init.d/svscan: Likewise.
-
-2005-02-18 Eric Sandall <eric AT sandall.us>
- * Applied Jeremy's patch (Bug #8027)
- * Moved from net/daemontools to z-rejected/z-utils/daemontools (Bug
- #8027)
- * DEPENDS: Removed circular dependency on supervise-scripts (for now)
- * BUILD,INSTALL: Cleaned up spacing
- Added "&&"s
- * FINAL: Cleaned up spacing
- Added "&&"s
- Use `return 1` instead of `exit 1`
- * HISTORY: Formatted to Guru Handbook
-
-2005-01-18 Jeremy Blosser <jblosser AT firinn.org>
- * Modified spell to be more consistant with other spells in the
- djb/qmail suite
- * FINAL: run svscan from /etc/inittab
- * BUILD/INSTALL: use internal configure instead of sedit to set
install
- locations
- * DEPENDS: supervise-scripts
- * daemontools-errno.patch,init.d/daemontools: Removed
-
-2004-12-03 Robert Helgesson <rycee AT home.se>
- * DETAILS: Added LICENSE field.
-
-2004-11-09 Rafael George <rgeorge AT yatusabes.com>
- * HISTORY: addition
- * DETAILS: build api 2
- * DETAILS: md5 fix
-
-2004-02-02 shivaken <shivaken AT jcom.home.ne.jp>
- * Created spell
-
diff --git a/z-utils/daemontools/INSTALL b/z-utils/daemontools/INSTALL
deleted file mode 100755
index c590ac1..0000000
--- a/z-utils/daemontools/INSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-cd command &&
-
-if [ "${DAEMONTOOLS_INSTALL_PATHS}" == "fhs" ]; then
- /usr/bin/install -d "/etc/service"
&&
- /usr/bin/install -m 755 `cat ../package/commands` "${INSTALL_ROOT}/sbin"
-else
- /usr/bin/install -d "/service" &&
- /usr/bin/install -d "${INSTALL_ROOT}/command" &&
- /usr/bin/install -m 755 `cat ../package/commands` \
- "${INSTALL_ROOT}/command" &&
- if [ "${DAEMONTOOLS_SYMLINKS}" == "y" ]; then
- while read i; do
- ln -sf /command/$i /usr/local/bin/$i
- done <../package/commands
- fi
-fi &&
-
-cd ..
diff --git a/z-utils/daemontools/POST_REMOVE b/z-utils/daemontools/POST_REMOVE
deleted file mode 100755
index a395b00..0000000
--- a/z-utils/daemontools/POST_REMOVE
+++ /dev/null
@@ -1,4 +0,0 @@
-if grep -q svscan /etc/inittab; then
- sedit "/svscan/d" /etc/inittab &&
- message "svscanboot has been removed from /etc/inittab. 'kill -1 1' to
reload init."
-fi
diff --git a/z-utils/daemontools/POST_RESURRECT
b/z-utils/daemontools/POST_RESURRECT
deleted file mode 100755
index e3c42e9..0000000
--- a/z-utils/daemontools/POST_RESURRECT
+++ /dev/null
@@ -1 +0,0 @@
-. "${SCRIPT_DIRECTORY}/FINAL"
diff --git a/z-utils/daemontools/PRE_BUILD b/z-utils/daemontools/PRE_BUILD
deleted file mode 100755
index 77ab2de..0000000
--- a/z-utils/daemontools/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}/${SPELL}-${VERSION}" &&
-
-if [ "${DAEMONTOOLS_INSTALL_PATHS}" == "fhs" ]; then
- sedit 's@/service@/etc/service@; s@/command@/sbin@' src/svscanboot.sh
-fi &&
-
-tar -xjvf "${SCRIPT_DIRECTORY}/daemontools-docs.tar.bz2" &&
-mv package/README src/CHANGES daemontools/*.html "${SOURCE_DIRECTORY}"
diff --git a/z-utils/daemontools/daemontools-docs.tar.bz2
b/z-utils/daemontools/daemontools-docs.tar.bz2
deleted file mode 100644
index f96ece9..0000000
Binary files a/z-utils/daemontools/daemontools-docs.tar.bz2 and /dev/null
differ
diff --git a/z-utils/daemontools/init.d/svscan
b/z-utils/daemontools/init.d/svscan
deleted file mode 100644
index f01f3d0..0000000
--- a/z-utils/daemontools/init.d/svscan
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-# Note: svscan may be started and respawned directly from inittab.
-
-if [ -x "/command/svscan" ]; then
- PROGRAM="/command/svscan"
-elif [ -x "/sbin/svscan" ]; then
- PROGRAM="/sbin/svscan"
-else
- error "svscan not found"
-fi
-
-if [ -d "/service" ]; then
- ARGS="/service"
-elif [ -d "/etc/service" ]; then
- ARGS="/etc/service"
-else
- error "service directory not found"
-fi
-
-RUNLEVEL=3
-NEEDS="+network"
-
-. /etc/init.d/smgl_init
-
-SUPERVISE_IN_INITTAB="`grep '^supervise:' /etc/inittab`"
-
-start()
-{
- if [ -n "${SUPERVISE_IN_INITTAB}" ]; then
- echo "svscan is being run from /etc/inittab."
- else
- _start
- fi
-}
-
-stop_services()
-{
- echo -n "Stopping supervised services... "
- if [ `/bin/ls "${ARGS}" | wc -l` -gt 0 ]; then
- echo
- for SVC in "${ARGS}/"*; do
- echo "Stopping $SVC..."
- svc -dx "$SVC"
- evaluate_retval
- if [ -d "$SVC/log" ]; then
- echo "Stopping $SVC/log..."
- svc -dx "$SVC/log"
- evaluate_retval
- fi
- done
- else
- echo "no services found."
- fi
-}
-
-stop()
-{
- stop_services
-
- if [ -n "${SUPERVISE_IN_INITTAB}" ]; then
- echo "svscan is being run from /etc/inittab and cannot be stopped."
- else
- _stop
- fi
-}
-
-restart()
-{
- if [ -n "${SUPERVISE_IN_INITTAB}" ]; then
- stop_services
- _stop
- echo "svscan will be restarted by init."
- else
- _restart
- fi
-}
-
-status()
-{
- _status
- if [ -n "${SUPERVISE_IN_INITTAB}" ]; then
- echo "run from /etc/inittab."
- else
- echo "run standalone."
- fi
- svstat "${ARGS}/"*
-}



  • [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (520018e7fb5d1b16ceca88da6a245d05c1792d01), Vlad Glagolev, 10/02/2018

Archive powered by MHonArc 2.6.24.

Top of Page