Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (18be4ed5148c69de1caa9a741a5477a5eea8ca43)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (18be4ed5148c69de1caa9a741a5477a5eea8ca43)
  • Date: Fri, 7 Oct 2016 07:47:51 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

collab/subversion/DETAILS | 1 +
collab/subversion/HISTORY | 4 ++++
collab/subversion/init.d/subversion | 16 ++++++++++++++--
collab/subversion/init.d/subversion.conf | 4 ++++
libs/libowfat/DETAILS | 2 +-
libs/libowfat/HISTORY | 3 +++
6 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 18be4ed5148c69de1caa9a741a5477a5eea8ca43
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libowfat: version 0.31

commit 5847ddd0358e2798d92beef3212cd2abe480ca57
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

subversion: support running as non-root in init script

This is kludgy and leaves much to be desired. For example, the
PID file is not cleaned up. Our init system really needs to support
running as differing user and in chroot via loadproc/killproc.
Also, those should actually use $PIDFILE and not only remove
/var/run/$base.pid in killproc.

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 656e206..8a74a5a 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,6 +1,7 @@
SPELL=subversion
VERSION=1.9.4
SECURITY_PATCH=8
+ PATCHLEVEL=1
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index e529d17..c2c34f0 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,7 @@
+2016-10-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * init.d/subversion{,.conf}: add support for running as non-root
+ * DETAILS: PATCHLEVEL++
+
2016-04-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9.4, SECURITY_PATCH++, fixes CVE-2016-2167 and
CVE-2016-2168
diff --git a/collab/subversion/init.d/subversion
b/collab/subversion/init.d/subversion
index 13f437e..5db3313 100755
--- a/collab/subversion/init.d/subversion
+++ b/collab/subversion/init.d/subversion
@@ -2,7 +2,7 @@

. /etc/sysconfig/subversion

-PIDFILE=/var/run/subversion.pid
+PIDFILE=/var/run/subversion/svnserve.pid
PROGRAM=/usr/bin/svnserve
RUNLEVEL=3
NEEDS="+network +remote_fs"
@@ -17,5 +17,17 @@ OPTS="-d --pid-file $PIDFILE -r $REPOSITORIES"

start()
{
- loadproc "${PROGRAM}" $OPTS
+ mkdir -p $(dirname $PIDFILE)
+ if [[ -z "$DAEMON_USER" ]]; then
+ loadproc "${PROGRAM}" $OPTS
+ else
+ # This can succeed to start svnserve,
+ # but that could quickly fail without us noticing.
+ chown "$DAEMON_USER" $(dirname $PIDFILE) &&
+ su -c "$PROGRAM $OPTS" "$DAEMON_USER"
+ # Kludge to detect failure (because of user permissions, normally).
+ sleep 1
+ test -e /proc/$(cat $PIDFILE)/exe
+ evaluate_retval
+ fi
}
diff --git a/collab/subversion/init.d/subversion.conf
b/collab/subversion/init.d/subversion.conf
index f6f7206..6d0adfd 100644
--- a/collab/subversion/init.d/subversion.conf
+++ b/collab/subversion/init.d/subversion.conf
@@ -18,3 +18,7 @@ READ_ONLY="NO"
# Controllers whether the server uses thread to handle request, as opposed to
# forked processes
THREADS="NO"
+
+# Run as specific user.
+# Defaults to root.
+DAEMON_USER=""
diff --git a/libs/libowfat/DETAILS b/libs/libowfat/DETAILS
index d95e23d..69756f0 100755
--- a/libs/libowfat/DETAILS
+++ b/libs/libowfat/DETAILS
@@ -1,5 +1,5 @@
SPELL=libowfat
- VERSION=0.30
+ VERSION=0.31
SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.xz"
SOURCE_URL[0]=http://www.fefe.de/$SPELL/$SOURCE
diff --git a/libs/libowfat/HISTORY b/libs/libowfat/HISTORY
index 54fd166..886d17e 100644
--- a/libs/libowfat/HISTORY
+++ b/libs/libowfat/HISTORY
@@ -1,3 +1,6 @@
+2016-10-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 0.31
+
2016-10-01 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: +x
* FelixvonLeitner.gpg: minimized to 4K



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (18be4ed5148c69de1caa9a741a5477a5eea8ca43), Thomas Orgis, 10/07/2016

Archive powered by MHonArc 2.6.24.

Top of Page