From 324f856b770e4fe16d10ffcd069f2f7b70585589 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 7 Dec 2014 11:25:02 -0500
Subject: [PATCH] Deactivate subversion server in default config

---
 config/sysinfos.default           |  2 ++
 stage3/pkg/subversion             | 21 +--------------------
 stage5/hv-install-1               |  6 ++++--
 {stage3 => stage5}/pkg/subversion |  6 +-----
 4 files changed, 8 insertions(+), 27 deletions(-)
 copy {stage3 => stage5}/pkg/subversion (88%)

diff --git a/config/sysinfos.default b/config/sysinfos.default
index 1ffd631..abf9ee3 100644
--- a/config/sysinfos.default
+++ b/config/sysinfos.default
@@ -121,6 +121,8 @@ SANE_SUPPORT="yes"
 # variable to the IP address of that remote computer.
 SANE_SERVER=""
 
+SVN_SERVER="no"
+
 # Define this if you want to use a remote CUPS print server
 #CUPS_SERVER="server.mydomain.com"
 
diff --git a/stage3/pkg/subversion b/stage3/pkg/subversion
index 6a1a135..69a4e31 100644
--- a/stage3/pkg/subversion
+++ b/stage3/pkg/subversion
@@ -1,27 +1,8 @@
 #!/bin/bash
 
-SVN_USER=svn
-
-hvconfig_pre()
-{
-    groupadd -f ${SVN_USER}
-    hv_useradd -c SvnServer -d /dev/null -g ${SVN_USER} -s /bin/false ${SVN_USER}
-}
-
-hvbuild()
+hvbuild_post()
 {
-    ${HVMAKE}
-    
     # Build perl bindings (needed by git-svn)
     ${HVMAKE} swig-pl
-
-    ${HVMAKE} install
     ${HVMAKE} install-swig-pl
 }
-
-hvbuild_post()
-{
-    # Creating repositories directory
-    mkdir -p /srv/svn
-    chown ${SVN_USER}:${SVN_USER} /srv/svn
-}
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index bdc8822..1617845 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -231,8 +231,10 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
-    # Subversion server (client was already installed in stage2)
-    ipkg ${SUBVERSION}
+    if [ x"${SVN_SERVER}" == xyes ]; then
+        # Subversion server (client was already installed in stage3)
+        ipkg ${SUBVERSION}
+    fi
 fi
 
 ipkg ${LIBGSF}
diff --git a/stage3/pkg/subversion b/stage5/pkg/subversion
similarity index 88%
copy from stage3/pkg/subversion
copy to stage5/pkg/subversion
index 6a1a135..e3a0bbe 100644
--- a/stage3/pkg/subversion
+++ b/stage5/pkg/subversion
@@ -8,14 +8,10 @@ hvconfig_pre()
     hv_useradd -c SvnServer -d /dev/null -g ${SVN_USER} -s /bin/false ${SVN_USER}
 }
 
-hvbuild()
+hvbuild_post()
 {
-    ${HVMAKE}
-    
     # Build perl bindings (needed by git-svn)
     ${HVMAKE} swig-pl
-
-    ${HVMAKE} install
     ${HVMAKE} install-swig-pl
 }
 
-- 
2.20.1