Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (d1c04e52f11536c3c724993d0f19c6d9da4bbbb6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (d1c04e52f11536c3c724993d0f19c6d9da4bbbb6)
  • Date: Sat, 23 Aug 2008 19:54:45 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

devel/git/DETAILS | 1
devel/git/HISTORY | 6 +++
devel/git/init.d/git-daemon | 65
+++++++++++++++++++++------------------
devel/git/init.d/git-daemon.conf | 11 ++++--
net/maradns/DETAILS | 3 -
net/maradns/HISTORY | 2 -
python-pypi/moinmoin/DETAILS | 4 +-
python-pypi/moinmoin/HISTORY | 3 +
8 files changed, 57 insertions(+), 38 deletions(-)

New commits:
commit d1c04e52f11536c3c724993d0f19c6d9da4bbbb6
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

python-pypi/moinmoin: Updated VERSION to 1.7.1

commit c906cece3994e7de541230aae00f045d87d1f91d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

devel/git: reworked the git-daemon init script and added options for user
and group

commit ad3f149f522ff3334d4969f32a11866aa4c412da
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/maradns: Updated to 1.3.07.09

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index c33e07a..cc42cda 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -23,6 +23,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
SOURCE6_IGNORE=signature
fi
+ PATCHLEVEL=1
LICENSE[0]=GPL
WEB_SITE=http://git.or.cz/
KEYWORDS="scm devel"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 95c747d..dd1e92f 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2008-08-23 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/git-daemon(.conf): reworked, and added options for user/group
+ and made it so one does not need to run su (it has it's own forking
+ and user/group handling now)
+
2008-08-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.0
* init.d/git-daemon: use the multicall git binary (since 1.6); fixed
diff --git a/devel/git/init.d/git-daemon b/devel/git/init.d/git-daemon
index c43b45a..0cf40c5 100755
--- a/devel/git/init.d/git-daemon
+++ b/devel/git/init.d/git-daemon
@@ -1,45 +1,52 @@
#!/bin/bash

-PIDFILE=/var/run/git.pid
+. /etc/sysconfig/git-daemon
+
+PIDFILE=/var/run/git-daemon.pid
PROGRAM=/usr/bin/git
RUNLEVEL=3
NEEDS="+network"
+ARGS="daemon --detach --reuseaddr --pid-file=${PIDFILE} ${EXTRA_ARGS}"
+
+[[ -z ${TIMEOUT} ]] || ARGS="${ARGS} --timeout=${TIMEOUT}"
+[[ -z ${INIT_TIMEOUT} ]] || ARGS="${ARGS} --init-timeout=${INIT_TIMEOUT}"
+[[ -z ${PORT} ]] || ARGS="${ARGS} --port=${PORT}"
+[[ -z ${USER} ]] || ARGS="${ARGS} --user=${USER}"
+[[ -z ${GROUP} ]] || ARGS="${ARGS} --group=${GROUP}"
+[[ -z ${STRICT_PATHS} ]] || ARGS="${ARGS} --strict-paths"
+[[ -z ${BASE_PATH} ]] || ARGS="${ARGS} --base-path=${BASE_PATH}"
+
+if [[ -z ${LOG_FILE} ]]; then
+ ARGS="${ARGS} --syslog"
+fi
+
+if [[ -z ${EXPORTED_DIRECTORIES} ]]; then
+ ARGS="${ARGS} --export-all"
+else
+ ARGS="${ARGS} ${EXPORTED_DIRECTORIES}"
+fi

-. /etc/sysconfig/git-daemon
. /etc/init.d/smgl_init

-create_args()
+start()
{
- ARGS="daemon --pid-file=/var/run/git.pid $EXTRA_ARGS"
- [[ $TIMEOUT ]] && ARGS="$ARGS --timeout=$TIMEOUT"
- [[ $INIT_TIMEOUT ]] && ARGS="$ARGS --init-timeout=$INIT_TIMEOUT"
- [[ $PORT ]] && ARGS="$ARGS --port=$PORT"
- [[ $STRICT_PATHS ]] && ARGS="$ARGS --strict-paths"
- [[ $BASE_PATH ]] && ARGS="$ARGS --base-path=$BASE_PATH"
- if [ -z $EXPORTED_DIRECTORIES ]; then
- ARGS="$ARGS --export-all"
- else
- ARGS="$ARGS $EXPORTED_DIRECTORIES"
- fi
- if [ -z $LOG_FILE ]; then
- LOG_FILE="/var/log/git-daemon.log"
- fi
+ echo "Starting ${NAME}..."
+ loadproc ${PROGRAM} ${ARGS}
}

-start()
+stop()
{
- echo "Starting Git Daemon:"
- create_args
- (
- unset -f echo &&
- su $USER -c "$PROGRAM $ARGS >> $LOG_FILE 2>&1 &"
- )
- evaluate_retval
+ echo "Stopping ${NAME}..."
+ killproc ${PROGRAM/git/git-daemon}
}

-stop()
+status()
+{
+ statusproc ${PROGRAM/git/git-daemon}
+}
+
+reload()
{
- echo "Shutting down Git Daemon:"
- killproc git-daemon
- evaluate_retval
+ echo "Reloading ${NAME}..."
+ reloadproc ${PROGRAM/git/git-daemon}
}
diff --git a/devel/git/init.d/git-daemon.conf
b/devel/git/init.d/git-daemon.conf
index 2a95b72..8264530 100644
--- a/devel/git/init.d/git-daemon.conf
+++ b/devel/git/init.d/git-daemon.conf
@@ -21,6 +21,10 @@ PORT="9418"
# User to run git-daemon as
USER="root"

+# Alternative Group
+# Group to run git-daemon as
+GROUP=""
+
# Strict Paths
# Match paths exactly (i.e. don't allow "/foo/repo" when the real
# path is "/foo/repo.git" or "/foo/repo/.git") and don't do
@@ -45,7 +49,6 @@ BASE_PATH="/"
EXPORTED_DIRECTORIES=""

# Log File
-# Log where all output of the git-daemon is logged to. When using
-# --syslog this file won't contain very much. Defaults to
-# /var/log/git-daemon.log
-LOG_FILE="/var/log/git-daemon.log"
+# Log where all output of the git-daemon is logged to. Defaults to
+# /var/log/git-daemon.log. Syslog is used when this variable is empty
+LOG_FILE=""
diff --git a/net/maradns/DETAILS b/net/maradns/DETAILS
index c32c683..758052f 100755
--- a/net/maradns/DETAILS
+++ b/net/maradns/DETAILS
@@ -1,5 +1,5 @@
SPELL=maradns
- VERSION=1.3.07.08
+ VERSION=1.3.07.09
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.maradns.org/download/$(echo $VERSION | cut -c
-3)/$VERSION/$SOURCE
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG="maradns.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
WEB_SITE=http://www.maradns.org/
SECURITY_PATCH=1
- PATCHLEVEL=1
LICENSE[0]=BSD
ENTERED=20021019
SHORT="MaraDNS is a authoritative and recursive DNS server."
diff --git a/net/maradns/HISTORY b/net/maradns/HISTORY
index ee37e9b..cb927a6 100644
--- a/net/maradns/HISTORY
+++ b/net/maradns/HISTORY
@@ -1,6 +1,6 @@
2008-08-23 Elisamuel Resto <ryuji AT sourcemage.org>
* PRE_BUILD: Duende has a hardcoded UID of 66, change to 65534
(nobody)
- * DETAILS: PATCHLEVEL=1
+ * DETAILS: PATCHLEVEL=1; Updated to 1.3.07.09

2008-07-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.3.07.08
diff --git a/python-pypi/moinmoin/DETAILS b/python-pypi/moinmoin/DETAILS
index 2ccdbdd..98ce55c 100755
--- a/python-pypi/moinmoin/DETAILS
+++ b/python-pypi/moinmoin/DETAILS
@@ -1,8 +1,8 @@
SPELL=moinmoin
- VERSION=1.7.0
+ VERSION=1.7.1
SOURCE=${SPELL%%moin}-$VERSION.tar.gz
SOURCE_URL[0]=http://static.moinmo.in/files/$SOURCE
-
SOURCE_HASH=sha512:7369607a885dc6b33fac2230719c9faaef14ca92e787195711271041ef44c60b6fe19595e1ceaead27623a62b6206124c32794f17cbb116c104fb9f204d6cd03
+
SOURCE_HASH=sha512:4d7db948d0d85443920a8f9931693705a46d378b3ba0d849f0dc06e95c6f883cec0794003188c3b42165e02f91e859f95888f57a4422d7c1877cbed0bc331df9
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%%moin}-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://moinmo.in/
diff --git a/python-pypi/moinmoin/HISTORY b/python-pypi/moinmoin/HISTORY
index da4e817..bdc3dfc 100644
--- a/python-pypi/moinmoin/HISTORY
+++ b/python-pypi/moinmoin/HISTORY
@@ -1,3 +1,6 @@
+2008-08-23 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated VERSION to 1.7.1
+
2008-07-20 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated VERSION to 1.7.0
* DEPENDS: to enable Xapian usage, it needs xapian-bindings built



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (d1c04e52f11536c3c724993d0f19c6d9da4bbbb6), Elisamuel Resto, 08/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page