From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Mathieu Lonjaret" <lejatorn AT sourcemage.org>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 80195 by Mathieu Lonjaret for review
Date: Sun, 4 Jun 2006 17:35:01 +0100 (BST)
Change 80195 by mathieu_lonjaret@lejatorn-coriolis on 2006/06/04 17:34:28
-#rest of the file still needs to be rewritten properly
-if ! grep -q 'CONFIGURED=\"y\"' ${DEPENDS_CONFIG}/proftpd; then
- if query "enable IPv6 support? " n; then
- echo 'OPTS="${OPTS} --enable-ipv6"' >> ${SPELL_CONFIG}
- fi
+config_query_option PROFTPD_IP6 "enable IPv6 support?" \
+y "--enable-ipv6" "" &&
- if query "Choose optional user contributed modules to install? " n; then
- if query "Include support for RADIUS (RFC2865) authentication and
accounting? " n; then
- echo 'OPTS="${OPTS} --with-modules=mod_radius"' >> ${SPELL_CONFIG}
- fi
+config_query PROFTPD_MOD \
+"Choose optional user contributed modules to install?" n &&
- if query "Include support for user upload/download ratios? " n; then
- echo 'OPTS="${OPTS} --with-modules=mod_ratio"' >> ${SPELL_CONFIG}
- fi
+#radius module failed (probably missing dep), all the others not in
+#the query are yet to be tried.
+if [[ $PROFTPD_MOD == "y" ]]; then
+ config_query_multi PROFTPD_MODS "Choose among this list:" \
+ mod_ratio mod_readme mod_rewrite mod_tls mod_wrap \
+ mod_sql mod_ldap &&
- if query "Include support for displaying \"readme\" files (controlled
by the \"DisplayReadme\" directive)? " n; then
- echo 'OPTS="${OPTS} --with-modules=mod_readme"' >> ${SPELL_CONFIG}
- fi
+ PROFTPD_MODS="--with-modules=`echo $PROFTPD_MODS | sed 's/\ /:/g'`" &&
- if query "Include support for powerful regular expression-based
command parameter rewrite engine? " n; then
- echo 'OPTS="${OPTS} --with-modules=mod_rewrite"' >> ${SPELL_CONFIG}
- fi
+ if [[ "x`echo $PROFTPD_MODS | grep sql`" != "x" ]]; then
+ config_query_list PROFTPD_SQL \
+ "You chose mod_sql, now which DBMS do you want:" mod_sql_mysql \
+ mod_sql_postgres &&
- if query "Include support for SSL/TLS authentication/encryption? " n;
then
- echo 'OPTS="${OPTS} --with-modules=mod_tls"' >> ${SPELL_CONFIG}
+ if [[ "x${PROFTPD_SQL}" == "xmod_sql_mysql" ]]; then
+ SQL_INC="/usr/include/mysql"
+ else
+ SQL_INC="/usr/include/postgresql"
fi
-
- if query "Include support for TCP Wrappers? " n; then
- echo 'OPTS="${OPTS} --with-modules=mod_wrap"' >> ${SPELL_CONFIG}
- fi
- fi
+
+ PROFTPD_MODS="${PROFTPD_MODS}:${PROFTPD_SQL} \
+ --with-includes=${SQL_INC}"
+ fi
+fi
-if query "Would you like to compile the modules for SQL authentication? "
n; then
- if query "Use MySQL for SQL authentication (answer 'n' for PostgreSQL)?
" y; then
- depends "mysql" "--with-modules=mod_sql^mod_sql_mysql
--with-includes=/usr/include/mysql --with-libraries=/usr/lib"
- else
- depends "postgresql" "--with-modules=mod_sql^mod_sql_postgres"
- fi
-fi