Upgrade to HTTPD 2.4.2, APR 1.4.6, Memcached 1.4.13, Python 2.7.3, Ubuntu 12.04, and Mac OS X 10.7.4.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1361918 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 61 insertions, 101 deletions

diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index ef2209122b..fbd2587e13 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -15,9 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Install a complete distribution, the required system tools and libraries, the
-# runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu Server
-# 10.10 system.
+# Install a minimal distribution, the required system tools and libraries,
+# runtime dependencies and the Tuscany SCA runtime on Ubuntu Server 12.04.
 
 # Display commands as they are executed
 set -x
@@ -25,6 +24,9 @@ set -x
 # Build and install in the current directory
 build=`pwd`
 
+# First update the system
+sudo apt-get update
+
 # Install core dev tools
 sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make gdb vim
 if [ "$?" != "0" ]; then
@@ -43,27 +45,42 @@ if [ "$?" != "0" ]; then
 fi
 cd $build
 
-# Build Apache APR and HTTP server
+# Build Apache APR and APR util
 sudo apt-get -y install libssl-dev libpcre3-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-svn co -r 1201086 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
-cd apr-1.4.x
-curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/apr-1.4.x.patch
-patch -p0 <apr-1.4.x.patch
+curl -OL http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz
+tar xzf apr-1.4.6.tar.gz
+cd apr-1.4.6
 ./buildconf
-./configure -with-openssl --with-crypto --with-expat=$build/expat-2.0.1-bin --prefix=$build/apr-1.4.x-bin
+./configure --prefix=$build/apr-1.4.6-bin
 make
 make install
 if [ "$?" != "0" ]; then
     exit $?
 fi
 cd $build
-curl -OL http://archive.apache.org/dist/httpd/httpd-2.3.15-beta.tar.gz
-tar xzf httpd-2.3.15-beta.tar.gz
-cd httpd-2.3.15-beta
-./configure --enable-ssl --enable-proxy --enable-usertrack --enable-cgi --enable-session-crypto --enable-mods-shared=most --enable-mpms-shared="prefork worker event" --with-mpm=prefork --with-apr=$build/apr-1.4.x-bin --with-expat=$build/expat-2.0.1-bin --prefix=$build/httpd-2.3.15-bin
+
+curl -OL http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz
+tar xzf apr-util-1.4.1.tar.gz
+cd apr-util-1.4.1
+curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/apr-util-1.4.1.patch
+patch -p0 <apr-util-1.4.1.patch
+./buildconf --with-apr=$build/apr-1.4.6
+./configure --with-apr=$build/apr-1.4.6-bin --with-openssl --with-crypto --with-expat=$build/expat-2.0.1-bin --prefix=$build/apr-util-1.4.1-bin
+make
+make install
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
+
+# Build HTTP server
+curl -OL http://archive.apache.org/dist/httpd/httpd-2.4.2.tar.gz
+tar xzf httpd-2.4.2.tar.gz
+cd httpd-2.4.2
+./configure --enable-ssl --enable-proxy --enable-usertrack --enable-cgi --enable-session-crypto --enable-mods-shared=most --enable-mpms-shared="prefork worker event" --with-mpm=prefork --with-apr=$build/apr-1.4.6-bin --with-apr-util=$build/apr-util-1.4.1-bin --with-expat=$build/expat-2.0.1-bin --prefix=$build/httpd-2.4.2-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -76,10 +93,10 @@ sudo apt-get -y install libevent-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-curl -OL http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
-tar xzf memcached-1.4.7.tar.gz
-cd memcached-1.4.7
-./configure --prefix=$build/memcached-1.4.7-bin
+curl -OL http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz
+tar xzf memcached-1.4.13.tar.gz
+cd memcached-1.4.13
+./configure --prefix=$build/memcached-1.4.13-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -98,20 +115,11 @@ if [ "$?" != "0" ]; then
 fi
 cd $build
 
-# Build LevelDB
-git clone https://code.google.com/p/leveldb/
-cd leveldb
-make all
-if [ "$?" != "0" ]; then
-    exit $?
-fi
-cd $build
-
 # Build Libcurl
 curl -OL http://curl.haxx.se/download/curl-7.24.0.tar.gz
 tar xzf curl-7.24.0.tar.gz
 cd curl-7.24.0
-./configure --prefix=$build/curl-7.24.0-bin
+./configure --enable-threaded-resolver --prefix=$build/curl-7.24.0-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -174,51 +182,11 @@ if [ "$?" != "0" ]; then
 fi
 cd $build
 
-# Build HTML Tidy
-sudo apt-get -y install cvs
-if [ "$?" != "0" ]; then
-    exit $?
-fi
-cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy co -P tidy
-cd tidy
-sh build/gnuauto/setup.sh
-./configure --prefix=$build/htmltidy-bin
-make
-make install
-if [ "$?" != "0" ]; then
-    exit $?
-fi
-cd $build
-
-# Build Libopkele
-git clone git://github.com/jsdelfino/libopkele.git
-cd libopkele
-./autogen.bash
-./configure --prefix=$build/libopkele-bin --with-curl=$build/curl-7.24.0-bin --with-expat=$build/expat-2.0.1-bin --with-htmltidy=$build/htmltidy-bin
-make
-make install
-if [ "$?" != "0" ]; then
-    exit $?
-fi
-cd $build
-
-# Build Mod_auth_openid
-git clone git://github.com/jsdelfino/mod_auth_openid.git
-cd mod_auth_openid
-./autogen.sh
-./configure --prefix=$build/mod-auth-openid-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.15-bin --with-curl=$build/curl-7.24.0-bin --with-libopkele=$build/libopkele-bin
-make
-make install
-if [ "$?" != "0" ]; then
-    exit $?
-fi
-cd $build
-
 # Build Liboauth
 curl -OL http://liboauth.sourceforge.net/pool/liboauth-0.9.1.tar.gz
 tar xzf liboauth-0.9.1.tar.gz
 cd liboauth-0.9.1
-./configure --prefix=$build/liboauth-0.9.1-bin CURL_CFLAGS="-I$build/curl-7.24.0-bin/include" CURL_LIBS="-L$build/curl-7.24.0-bin/lib -R$build/curl-7.24.0-bin/lib -lcurl"
+./configure --prefix=$build/liboauth-0.9.1-bin CURL_CFLAGS="-I$build/curl-7.24.0-bin/include" CURL_LIBS="-L$build/curl-7.24.0-bin/lib -lcurl"
 make
 make install
 if [ "$?" != "0" ]; then
@@ -227,23 +195,23 @@ fi
 cd $build
 
 # Build mod_security
-curl -OL http://downloads.sourceforge.net/project/mod-security/modsecurity-apache/2.6.1/modsecurity-apache_2.6.1.tar.gz
-tar xzf modsecurity-apache_2.6.1.tar.gz
-cd modsecurity-apache_2.6.1
-./configure --prefix=$build/modsecurity-apache-2.6.1-bin --with-apxs=$build/httpd-2.3.15-bin/bin/apxs --with-apr=$build/apr-1.4.x-bin/bin/apr-2-config --with-apu=$build/apr-1.4.x-bin/bin/apr-2-config --with-libxml=$build/libxml2-2.7.7-bin --with-curl=$build/curl-7.24.0-bin LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
+curl -OL http://people.apache.org/~jsdelfino/tuscany/cpp/dependencies/modsecurity-apache_2.6.6.tar.gz
+tar xzf modsecurity-apache_2.6.6.tar.gz
+cd modsecurity-apache_2.6.6
+./configure --prefix=$build/modsecurity-apache-2.6.6-bin --with-apxs=$build/httpd-2.4.2-bin/bin/apxs --with-apr=$build/apr-1.4.6-bin/bin/apr-1-config --with-apu=$build/apr-util-1.4.1-bin/bin/apu-1-config --with-libxml=$build/libxml2-2.7.7-bin --with-curl=$build/curl-7.24.0-bin LIBS="-L$build/expat-2.0.1-bin/lib"
 make
 make install
 if [ "$?" != "0" ]; then
     exit $?
 fi
 cd $build
-curl -OL http://downloads.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.2.tar.gz
-tar xzf modsecurity-crs_2.2.2.tar.gz
-cd modsecurity-crs_2.2.2
-curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/modsecurity-crs_2.2.2.patch
-patch -p0 <modsecurity-crs_2.2.2.patch
-cp -R base_rules $build/modsecurity-apache-2.6.1-bin
-cp -R optional_rules $build/modsecurity-apache-2.6.1-bin
+curl -OL http://people.apache.org/~jsdelfino/tuscany/cpp/dependencies/modsecurity-crs_2.2.5.tar.gz
+tar xzf modsecurity-crs_2.2.5.tar.gz
+cd modsecurity-crs_2.2.5
+#curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/modsecurity-crs_2.2.5.patch
+#patch -p0 <modsecurity-crs_2.2.2.patch
+cp -R base_rules $build/modsecurity-apache-2.6.6-bin
+cp -R optional_rules $build/modsecurity-apache-2.6.6-bin
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -284,6 +252,8 @@ fi
 curl -OL http://archive.apache.org/dist/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz
 tar xzf thrift-0.2.0-incubating.tar.gz
 cd thrift-0.2.0
+curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/thrift-0.2.0.patch
+patch -p0 <thrift-0.2.0.patch
 ./bootstrap.sh
 ./configure --prefix=$build/thrift-0.2.0-bin --with-java=no --with-erlang=no --with-py=no --with-perl=no --with-ruby=no --with-csharp=no --disable-static
 make
@@ -313,9 +283,10 @@ fi
 curl -OL http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz
 tar xzf scribe-2.2.tar.gz
 cd scribe
-curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/scribe.patch
-patch -p0 <scribe.patch
-./bootstrap.sh --prefix=$build/scribe-2.2-bin PY_PREFIX=$build/scribe-2.2-bin --with-thriftpath=$build/thrift-0.2.0-bin --with-fb303path=$build/thrift-0.2.0-bin/contrib/fb303 --disable-static
+curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/scribe-2.2.patch
+patch -p0 <scribe-2.2.patch
+autoreconf --force --verbose --install
+./configure --prefix=$build/scribe-2.2-bin PY_PREFIX=$build/scribe-2.2-bin --with-thriftpath=$build/thrift-0.2.0-bin --with-fb303path=$build/thrift-0.2.0-bin/contrib/fb303 --disable-static CPPFLAGS="-DBOOST_FILESYSTEM_VERSION=2" LIBS="-lboost_system -lboost_filesystem"
 make
 make install
 if [ "$?" != "0" ]; then
@@ -325,10 +296,10 @@ cp src/lib/libscribe.so $build/scribe-2.2-bin/lib
 cd $build
 
 # Build Python
-curl -OL http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz
-tar xzf Python-2.6.6.tgz
-cd Python-2.6.6
-./configure --prefix=$build/python-2.6.6-bin --enable-shared
+curl -OL http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz
+tar xzf Python-2.7.3.tgz
+cd Python-2.7.3
+./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -336,22 +307,11 @@ if [ "$?" != "0" ]; then
 fi
 cd $build
 
-# Build Apache Libcloud
-curl -OL http://archive.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.4.2.tar.bz2
-tar xjf apache-libcloud-incubating-0.4.2.tar.bz2
-cd apache-libcloud-incubating-0.4.2
-python setup.py build
-python setup.py install --home $build/libcloud-0.4.2-bin
-if [ "$?" != "0" ]; then
-    exit $?
-fi
-cd $build
-
 # Build Google Page Speed
 curl -OL https://dl-ssl.google.com/page-speed/sdk/current/page-speed-sdk.zip
 unzip page-speed-sdk.zip
 cd page-speed-1.9
-make builddir=$build/page-speed-1.9-bin
+make builddir=$build/page-speed-1.9-bin CXXFLAGS="-Wno-unused-but-set-variable"
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -368,7 +328,7 @@ cd $build
 git clone git://git.apache.org/tuscany-sca-cpp.git
 cd tuscany-sca-cpp
 ./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.24.0-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.15-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --enable-pagespeed --with-pagespeed=$build/page-speed-1.9-bin --enable-libcloud --with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python --with-python=$build/python-2.6.6-bin --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --enable-sqldb --with-pgsql=$build/postgresql-9.1.2-bin --with-pgbouncer=$build/pgbouncer-1.5-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.1-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.24.0-bin --with-apr=$build/apr-1.4.6-bin --with-apr-util=$build/apr-util-1.4.1-bin --with-httpd=$build/httpd-2.4.2-bin --with-memcached=$build/memcached-1.4.13-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --enable-pagespeed --with-pagespeed=$build/page-speed-1.9-bin --enable-threads --enable-python --with-python=$build/python-2.7.3-bin --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --enable-sqldb --with-pgsql=$build/postgresql-9.1.2-bin --with-pgbouncer=$build/pgbouncer-1.5-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.6-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -377,8 +337,8 @@ fi
 cd $build
 
 # Create src archive
-tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin curl-7.24.0 curl-7.24.0-bin curl-7.24.0.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.15-beta httpd-2.3.15-beta.tar.gz httpd-2.3.15-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.1-bin modsecurity-apache_2.6.1.tar.gz modsecurity-crs_2.2.2 modsecurity-crs_2.2.2.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem page-speed-1.9 page-speed-1.9-bin page-speed-sdk.zip pgbouncer-1.5 pgbouncer-1.5-bin pgbouncer-1.5.tar.gz postgresql-9.1.2 postgresql-9.1.2-bin postgresql-9.1.2.tar.gz Python-2.6.6 python-2.6.6-bin Python-2.6.6.tgz scribe scribe-2.2-bin scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz tidy tinycdb-0.77 tinycdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0-src.tar.gz apr-1.4.6 apr-1.4.6.tar.gz apr-1.4.6-bin apr-util-1.4.1 apr-util-1.4.1.tar.gz apr-util-1.4.1-bin curl-7.24.0 curl-7.24.0-bin curl-7.24.0.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz httpd-2.4.2 httpd-2.4.2.tar.gz httpd-2.4.2-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.13 memcached-1.4.13-bin memcached-1.4.13.tar.gz modsecurity-apache_2.6.6 modsecurity-apache-2.6.6-bin modsecurity-apache_2.6.6.tar.gz modsecurity-crs_2.2.5 modsecurity-crs_2.2.5.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem page-speed-1.9 page-speed-1.9-bin page-speed-sdk.zip pgbouncer-1.5 pgbouncer-1.5-bin pgbouncer-1.5.tar.gz postgresql-9.1.2 postgresql-9.1.2-bin postgresql-9.1.2.tar.gz Python-2.7.3 python-2.7.3-bin Python-2.7.3.tgz scribe scribe-2.2-bin scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz tinycdb-0.77 tinycdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
 
 # Create bin archive
-tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.24.0-bin expat-2.0.1-bin htmltidy-bin httpd-2.3.15-bin js-1.8.5-bin libcloud-0.4.2-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel page-speed-1.9-bin pgbouncer-1.5-bin postgresql-9.1.2-bin python-2.6.6-bin scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.6-bin apr-util-1.4.1-bin curl-7.24.0-bin expat-2.0.1-bin httpd-2.4.2-bin js-1.8.5-bin liboauth-0.9.1-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.13-bin modsecurity-apache-2.6.6-bin nspr-4.8.8-bin nuvem/nuvem-parallel page-speed-1.9-bin pgbouncer-1.5-bin postgresql-9.1.2-bin python-2.7.3-bin scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin