[packages_10.03.2] subversion: merge r28765, r29067

SVN-Revision: 30266

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 690f10d50223a9dbc2227fc94ca0606a621b76fe..c458b9c383ea797ed8393db134b4a906698a8599 100644 (file)
--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subversion
 PKG_VERSION:=1.6.17
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads

diff --git a/net/subversion/files/subversion.init b/net/subversion/files/subversion.init
index 6b24f581b462cdf8f7d6b4734599ad52e150a1a1..c2bcc07ac8a6d126f01fc589499091a474974ec9 100644 (file)
--- a/net/subversion/files/subversion.init
+++ b/net/subversion/files/subversion.init
@@ -1,11 +1,12 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-start_service () {
+start_instance () {
        local section="$1"
-       config_get path "$section" path
-       config_get port "$section" port
+       config_get path "$section" 'path'
+       config_get port "$section" 'port'
 
        if [ ! -d "$path" ]; then
                echo "The subversion repository (${path}) does not exist."
@@ -16,20 +17,21 @@ start_service () {
                echo "        svnadmin create --fs-type fsfs /srv/svn"
                echo
                echo "Changing the path using UCI (default path is: /var/local/svn):"
-               echo "        uci set subversion.cfg1.path="/srv/svn""
+               echo "        uci set subversion.@[0].path="/srv/svn""
                echo "        uci commit"
                echo "        /etc/init.d/subversion restart"
-               exit 1
+               return 1
        fi
 
-       svnserve -d --listen-port ${port} -r ${path}
+       service_start /usr/bin/svnserve -d --listen-port ${port} -r ${path}
 }
 
 start() {
-       config_load "subversion"
-       config_foreach start_service subversion
+       config_load 'subversion'
+       config_foreach start_instance 'subversion'
 }
 
 stop() {
-       killall -9 svnserve
+       SERVICE_SIG_STOP="INT" \
+       service_stop /usr/bin/svnserve
 }