Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 ftp/proftpd/BUILD          |    1 +
 ftp/proftpd/HISTORY        |    5 ++++-
 ftp/proftpd/init.d/proftpd |    8 --------
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 6066097f9c88ccc7ec55af3c5252329022bed69f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    proftpd: corrected stop() in init script

commit 89752a2b528752fb620c32f192dff60599f65cf8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    proftpd: redefine localstatedir to /var/run

diff --git a/ftp/proftpd/BUILD b/ftp/proftpd/BUILD
index 652c27e..da079c3 100755
--- a/ftp/proftpd/BUILD
+++ b/ftp/proftpd/BUILD
@@ -18,6 +18,7 @@ fi &&
 
 OPTS="${PROFTPD_OPTS} \
       ${OPTS} \
+      --localstatedir=$INSTALL_ROOT/var/run \
       --with-modules=${PROFTPD_MODS// /:} \
       --with-includes=${SQL_INC}" &&
 
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index e905d48..ee4d4d9 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -2,11 +2,14 @@
        * DETAILS: PATCHLEVEL=1
        * BUILD: remove pic flags wisely; fix basic config file only when 
xinetd
          script had been installed; use default_build; dropped deprecated 
seds;
-         use PROFTPD_OPTS and PROFTPD_MODS; moved sql include paths here
+         use PROFTPD_OPTS and PROFTPD_MODS; moved sql include paths here;
+         redefine localstatedir to /var/run
        * CONFIGURE, DEPENDS: use new modules framework; added missing options
          and dependencies; switched to PROFTPD_OPTS
        * PRE_BUILD: added, to optionally apply the patch
        * ldap-cert.patch: added, for certificates selection support in 
mod_ldap
+       * init.d/proftpd: switch to default stop() method, which doesn't 
return
+         success on already stopped service
 
 2012-01-09 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: SECURITY_PATCH++ (CVE-2011-4130)
diff --git a/ftp/proftpd/init.d/proftpd b/ftp/proftpd/init.d/proftpd
index 09a4400..848b81c 100755
--- a/ftp/proftpd/init.d/proftpd
+++ b/ftp/proftpd/init.d/proftpd
@@ -5,11 +5,3 @@ RUNLEVEL=3
 NEEDS="+remote_fs"
 
 . /etc/init.d/smgl_init
-
-stop() {
-  echo "Stopping proftpd..."
-  if [ -f /var/run/proftpd.pid ]; then
-    kill `cat /var/run/proftpd.pid`
-  fi
-  evaluate_retval
-}