Source Mage code commit list

[Mathieu Lonjaret <scm AT sourcemage.org>]

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

 http/thttpd/CONFIGURE |    6 ++++++
 http/thttpd/HISTORY   |    3 +++
 http/thttpd/PRE_BUILD |   14 +++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 379c9b5db0ab5451c918ef78256c193bdf8b03dd
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

    thttpd: added ~user mapping support

diff --git a/http/thttpd/CONFIGURE b/http/thttpd/CONFIGURE
new file mode 100755
index 0000000..37b3c69
--- /dev/null
+++ b/http/thttpd/CONFIGURE
@@ -0,0 +1,6 @@
+config_query_list THTTPD_TILDE "What kind of \"~user\" mapping do you want?" 
\
+none \
+web_tree \
+home_dir
+
+
diff --git a/http/thttpd/HISTORY b/http/thttpd/HISTORY
index 2202bfb..38bdd8a 100644
--- a/http/thttpd/HISTORY
+++ b/http/thttpd/HISTORY
@@ -1,3 +1,6 @@
+2007-11-26 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+       * CONFIGURE, PRE_BUILD: added ~user mapping support 
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/http/thttpd/PRE_BUILD b/http/thttpd/PRE_BUILD
index db297c7..d5d21d4 100755
--- a/http/thttpd/PRE_BUILD
+++ b/http/thttpd/PRE_BUILD
@@ -1,3 +1,15 @@
 default_pre_build                                            &&
 sedit  "s/www/www-data/"      $SOURCE_DIRECTORY/Makefile.in  &&
-sedit  "s/\/www-data/\/www/"  $SOURCE_DIRECTORY/Makefile.in
+sedit  "s/\/www-data/\/www/"  $SOURCE_DIRECTORY/Makefile.in  &&
+if [ "x${THTTPD_TILDE}" != "xnone" ] ; then
+  if [ "x${THTTPD_TILDE}" == "xweb_tree" ] ; then
+    pattern="TILDE_MAP_1" 
+  elif [ "x${THTTPD_TILDE}" == "xhome_dir" ] ; then
+    pattern="TILDE_MAP_2"
+  fi                                                         &&
+  line=`grep -n ${pattern} $SOURCE_DIRECTORY/config.h`       &&
+  line_number=`echo ${line} | sed -r 's/(.*):.*/\1/'`        &&
+  line=`echo ${line} | sed -r 's/.*:(.*)/\1/'`               &&
+  let line_number=${line_number}+3                           &&
+  sed -i -r "${line_number}i ${line}" $SOURCE_DIRECTORY/config.h 
+fi