[SM-Commit] PERFORCE change 80194 by Mathieu Lonjaret for review

Perforce Review Daemon p4review at smee.org
Sun Jun 4 12:35:01 EDT 2006


Change 80194 by mathieu_lonjaret at lejatorn-coriolis on 2006/06/04 17:32:59

	reworked the queries

Affected files ...

... //sgl/grimoires/devel/ftp/proftpd/BUILD#4 edit
... //sgl/grimoires/devel/ftp/proftpd/CONFIGURE#4 edit
... //sgl/grimoires/devel/ftp/proftpd/CONFLICTS#2 edit
... //sgl/grimoires/devel/ftp/proftpd/DEPENDS#2 edit
... //sgl/grimoires/devel/ftp/proftpd/HISTORY#11 edit

Differences ...

==== //sgl/grimoires/devel/ftp/proftpd/BUILD#4 (xtext) ====

@@ -7,77 +7,9 @@
   fi
 fi                                                                    &&
 
-cd  modules                                                           &&
+sedit  "s/	standalone/	inetd/"  sample-configurations/basic.conf     &&
 
-if  grep  -q  'mod_radius'  ${DEPENDS_CONFIG}/proftpd;  then
-  if  !  [  -e  mod_radius.c  ];  then
-    ln  -s  ../contrib/mod_radius.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'mod_ratio'  ${DEPENDS_CONFIG}/proftpd;  then
-  if  !  [  -e  mod_ratio.c  ];  then
-    ln  -s  ../contrib/mod_ratio.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'mod_readme'  ${DEPENDS_CONFIG}/proftpd;  then
-  if  !  [  -e  mod_readme.c  ];  then
-    ln  -s  ../contrib/mod_readme.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'mod_rewrite'  ${DEPENDS_CONFIG}/proftpd;  then
-  if  !  [  -e  mod_rewrite.c  ];  then
-    ln  -s  ../contrib/mod_rewrite.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'mod_tls'  ${DEPENDS_CONFIG}/proftpd;  then
-  if  !  [  -e  mod_tls.c  ];  then
-    ln  -s  ../contrib/mod_tls.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'mod_wrap'  ${DEPENDS_CONFIG}/proftpd;  then
-  if  !  [  -e  mod_wrap.c  ];  then
-    ln  -s  ../contrib/mod_wrap.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'proftpd:openldap:on'  ${DEPENDS_STATUS};  then
-  if  !  [  -e  mod_ldap.c  ];  then
-    ln  -s  ../contrib/mod_ldap.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'proftpd:mysql:on'  ${DEPENDS_STATUS};  then
-  if  !  [  -e  mod_sql.c  ];  then
-    ln  -s  ../contrib/mod_sql.c
-  fi                                                                  &&
-  if  !  [  -e  mod_sql_mysql.c  ];  then
-    ln  -s  ../contrib/mod_sql_mysql.c
-  fi
-fi                                                                    &&
-
-if  grep  -q  'proftpd:postgresql:on'  ${DEPENDS_STATUS};  then
-  cd  ../contrib
-  sedit  's:<pgsql/libpq-fe.h>:<libpq-fe.h>:'  mod_sql_postgres.c     &&
-  cd  ../modules
-  if  !  [  -e  mod_sql.c  ];  then
-    ln  -s  ../contrib/mod_sql.c
-  fi                                                                  &&
-
-  if  !  [  -e  mod_sql_postgres.c  ];  then
-    ln  -s  ../contrib/mod_sql_postgres.c
-  fi
-fi                                                                    &&
-
-cd  ${SOURCE_DIRECTORY}
-
-sedit  "s/	standalone/	inetd/"  sample-configurations/basic.conf  &&
-
-OPTS="$PROFTPD_CAPS ${OPTS//^/:}"                                     &&
+OPTS="${PROFTPD_CAPS} ${PROFTPD_MODS} ${OPTS}"                        &&
 
 ./configure  --prefix=${INSTALL_ROOT}/usr                             \
              --sysconfdir=${INSTALL_ROOT}/etc                         \

==== //sgl/grimoires/devel/ftp/proftpd/CONFIGURE#4 (xtext) ====

@@ -7,37 +7,34 @@
   fi
 fi                                                                    &&
 
-#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
 
-  echo  'CONFIGURED="y"'  >>  ${SPELL_CONFIG}
-fi

==== //sgl/grimoires/devel/ftp/proftpd/CONFLICTS#2 (xtext) ====

@@ -1,3 +1,3 @@
-conflicts  pure-ftpd
-conflicts  wu-ftpd
+conflicts  pure-ftpd &&
+conflicts  wu-ftpd   &&
 conflicts  vsftpd

==== //sgl/grimoires/devel/ftp/proftpd/DEPENDS#2 (xtext) ====

@@ -1,10 +1,24 @@
-optional_depends  "linux-pam"  "--enable-auth-pam"        "--disable-auth-pam"  "for security"             &&
-optional_depends  "openldap"   "--with-modules=mod_ldap"  ""                    "for LDAP authentication"  &&
+if [[ "x`echo $PROFTPD_MODS | grep tls`" != "x" ]]; then 
+  depends openssl 
+fi                                                                &&
+
+if [[ "x`echo $PROFTPD_MODS | grep wrap`" != "x" ]]; then 
+  depends tcp_wrappers 
+fi                                                                &&
+
+if [[ "x`echo $PROFTPD_MODS | grep mysql`" != "x" ]]; then 
+  depends mysql 
+fi                                                                &&
+
+if [[ "x`echo $PROFTPD_MODS | grep postgresql`" != "x" ]]; then 
+  depends postgresql 
+fi                                                                &&
+
+if [[ "x`echo $PROFTPD_MODS | grep ldap`" != "x" ]]; then 
+  depends openldap 
+fi                                                                &&
+
+optional_depends  "linux-pam"  "--enable-auth-pam" \
+"--disable-auth-pam"  "for security" 
+
 
-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

==== //sgl/grimoires/devel/ftp/proftpd/HISTORY#11 (text) ====

@@ -1,3 +1,7 @@
+2006-06-04 Mathieu Lonjaret <lejatorn at sourcemage.org>
+	*CONFIGURE, DEPENDS, BUILD, CONFLICTS: reworked the spell (use
+	config_query).
+
 2006-03-24 Mathieu Lonjaret <lejatorn at sourcemage.org>
 	*BUILD, CONFIGURE: reworked query
 



More information about the SM-Commit mailing list