Author: jsdelfino
Date: Sat Nov 12 19:17:31 2011
New Revision: 1201308
URL: http://svn.apache.org/viewvc?rev=1201308&view=rev
Log:
Upgrade to HTTPD 2.3.15-beta.
Modified:
tuscany/sca-cpp/trunk/INSTALL
tuscany/sca-cpp/trunk/macos/macos-install
tuscany/sca-cpp/trunk/modules/edit/ssl-start
tuscany/sca-cpp/trunk/modules/edit/start
tuscany/sca-cpp/trunk/modules/http/httpd-conf
tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
tuscany/sca-cpp/trunk/modules/http/httpd.hpp
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
Modified: tuscany/sca-cpp/trunk/INSTALL
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/INSTALL?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Sat Nov 12 19:17:31 2011
@@ -76,7 +76,7 @@ gcc-g++-4.4.5
Then install the following development dependencies:
Apache HTTP server and APR:
-httpd-2.3.10 (http://httpd.apache.org/)
+httpd-2.3.15 (http://httpd.apache.org/)
apr-1.4.x (http://apr.apache.org/)
built with OpenSSL libssl-0.9.8, libpcre3-8.02,
and expat 2.0.1
@@ -222,7 +222,7 @@ dependencies installed in the standard s
dependencies installed under $build:
./configure --prefix=$build/tuscany-sca-cpp-bin \
---with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-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-curl=$build/curl-7.19.5-bin --with-libxml2=/usr \
Modified: tuscany/sca-cpp/trunk/macos/macos-install
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/macos/macos-install?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/macos/macos-install (original)
+++ tuscany/sca-cpp/trunk/macos/macos-install Sat Nov 12 19:17:31 2011
@@ -67,7 +67,7 @@ fi
cd $build
# Build Apache APR and HTTP server
-svn co -r 1051230 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
+svn co -r 1201086 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
cd apr-1.4.x
./buildconf
./configure -with-openssl --with-crypto --with-expat=$build/expat-2.0.1-bin
--prefix=$build/apr-1.4.x-bin
@@ -77,10 +77,10 @@ if [ "$?" != "0" ]; then
exit $?
fi
cd $build
-curl -OL http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
-tar xzf httpd-2.3.10-alpha.tar.gz
-cd httpd-2.3.10
-./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 --with-pcre=$build/pcre-8.12-bin
--prefix=$build/httpd-2.3.10-bin
+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 --with-pcre=$build/pcre-8.12-bin
--prefix=$build/httpd-2.3.15-bin
make
make install
if [ "$?" != "0" ]; then
@@ -234,7 +234,7 @@ cd $build
git clone git://github.com/jsdelfino/mod_auth_openid.git
cd mod_auth_openid
./autogen.sh
-./configure --prefix=$build/mod-auth-openid-bin
CXXFLAGS="-I$build/pcre-8.12-bin/include" --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.10-bin --with-curl=$build/curl-7.19.5-bin
--with-pcre=$build/pcre-8.12-bin --with-libopkele=$build/libopkele-bin
+./configure --prefix=$build/mod-auth-openid-bin
CXXFLAGS="-I$build/pcre-8.12-bin/include" --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.15-bin --with-curl=$build/curl-7.19.5-bin
--with-pcre=$build/pcre-8.12-bin --with-libopkele=$build/libopkele-bin
make
make install
if [ "$?" != "0" ]; then
@@ -258,7 +258,7 @@ cd $build
curl -L
http://sourceforge.net/projects/mod-security/files/modsecurity-apache/2.6.1/modsecurity-apache_2.6.1.tar.gz/download
-o 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.10-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.19.5-bin
--with-pcre=$build/pcre-8.12-bin LIBS="-L$build/expat-2.0.1-bin/lib
-R$build/expat-2.0.1-bin/lib" CFLAGS="-I$build/pcre-8.12-bin/include"
+./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.19.5-bin
--with-pcre=$build/pcre-8.12-bin LIBS="-L$build/expat-2.0.1-bin/lib
-R$build/expat-2.0.1-bin/lib" CFLAGS="-I$build/pcre-8.12-bin/include"
make
make install
if [ "$?" != "0" ]; then
@@ -296,7 +296,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.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.10-bin
--with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-bin
--with-leveldb=$build/leveldb --with-js-include=$build/js-1.8.5-bin/include/js
--with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin
--enable-threads --enable-python --enable-opencl
--with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-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.19.5-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-bin
--with-leveldb=$build/leveldb --with-js-include=$build/js-1.8.5-bin/include/js
--with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin
--enable-threads --enable-python --enable-opencl
--with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-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
make
make install
if [ "$?" != "0" ]; then
@@ -305,8 +305,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 autoconf-2.13
autoconf-2.13-bin autoconf-2.13.tar.gz curl-7.19.5 curl-7.19.5-bin
curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin
httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5
js185-1.0.0.tar.gz libcloud-0.4.2-bin libevent-2.0.13-stable
libevent-2.0.13-stable-bin libevent-2.0.13-stable.tar.gz 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.0-bin
modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.1
modsecurity-crs_2.2.1.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem
pcre-8.12 pcre-8.12-bin pcre-8.12.zip pkg-confi
g-0.25 pkg-config-0.25-bin pkg-config-0.25.tar.gz tidy tinycdb tinycdb-bin
leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
+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 autoconf-2.13
autoconf-2.13-bin autoconf-2.13.tar.gz curl-7.19.5 curl-7.19.5-bin
curl-7.19.5.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 libevent-2.0.13-stable
libevent-2.0.13-stable-bin libevent-2.0.13-stable.tar.gz 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.0-bin
modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.1
modsecurity-crs_2.2.1.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem
pcre-8.12 pcre-8.12-bin pcre-8.12.zip pkg-c
onfig-0.25 pkg-config-0.25-bin pkg-config-0.25.tar.gz tidy tinycdb tinycdb-bin
leveldb 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.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin
libevent-2.0.13-stable-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 pcre-8.12-bin
tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.15-bin js-1.8.5-bin libcloud-0.4.2-bin
libevent-2.0.13-stable-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 pcre-8.12-bin
tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
Modified: tuscany/sca-cpp/trunk/modules/edit/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/ssl-start?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/ssl-start (original)
+++ tuscany/sca-cpp/trunk/modules/edit/ssl-start Sat Nov 12 19:17:31 2011
@@ -52,14 +52,6 @@ ErrorDocument 404 /notfound/
ErrorDocument 401 /notauth/
ErrorDocument 500 /oops/
-# Redirect www to main home page
-RewriteEngine on
-RewriteCond %{HTTP_HOST} ^www\.sca-store\.com [NC]
-RewriteCond %{SERVER_PORT} !^443$
-RewriteRule .* https://sca-store.com:%{SERVER_PORT}%{REQUEST_URI} [L,R]
-RewriteCond %{HTTP_HOST} ^www\.sca-store\.com [NC]
-RewriteRule .* https://sca-store.com%{REQUEST_URI} [L,R]
-
EOF
# Configure SCA contributions
Modified: tuscany/sca-cpp/trunk/modules/edit/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/start?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/start (original)
+++ tuscany/sca-cpp/trunk/modules/edit/start Sat Nov 12 19:17:31 2011
@@ -38,14 +38,6 @@ ErrorDocument 404 /notfound/
ErrorDocument 401 /notauth/
ErrorDocument 500 /oops/
-# Redirect www to main home page
-RewriteEngine on
-RewriteCond %{HTTP_HOST} ^www\.sca-store\.com [NC]
-RewriteCond %{SERVER_PORT} !^80$
-RewriteRule .* http://sca-store.com:%{SERVER_PORT}%{REQUEST_URI} [L,R]
-RewriteCond %{HTTP_HOST} ^www\.sca-store\.com [NC]
-RewriteRule .* http://sca-store.com%{REQUEST_URI} [L,R]
-
EOF
# Configure SCA contributions
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Sat Nov 12 19:17:31 2011
@@ -29,6 +29,11 @@ port=`$here/httpd-addr port $3`
pport=`$here/httpd-addr pport $3`
listen=`$here/httpd-addr listen $3`
vhost=`$here/httpd-addr vhost $3`
+if [ "$pport" = "80" ]; then
+ pportsuffix=""
+else
+ pportsuffix=":$pport"
+fi
mkdir -p $4
htdocs=`echo "import os; print os.path.realpath('$4')" | python`
@@ -53,7 +58,7 @@ cat >$root/conf/httpd.conf <<EOF
# Apache HTTPD server configuration
# Main server name
-ServerName http://$host:$pport
+ServerName http://$host$pportsuffix
PidFile $root/logs/httpd.pid
# Load configured MPM
@@ -150,11 +155,13 @@ Listen $listen
# Setup HTTP virtual host
<VirtualHost $vhost>
-ServerName http://$host:$pport
+ServerName http://$host$pportsuffix
+<Location />
RewriteEngine on
RewriteCond %{HTTP_HOST} !^$host [NC]
-RewriteRule .* http://$host:$pport%{REQUEST_URI} [R,L]
+RewriteRule .* http://$host$pportsuffix%{REQUEST_URI} [R]
+</Location>
Include conf/svhost.conf
@@ -218,7 +225,6 @@ LoadModule rewrite_module ${modules_pref
LoadModule mime_module ${modules_prefix}/modules/mod_mime.so
LoadModule status_module ${modules_prefix}/modules/mod_status.so
LoadModule info_module ${modules_prefix}/modules/mod_info.so
-LoadModule asis_module ${modules_prefix}/modules/mod_asis.so
LoadModule negotiation_module ${modules_prefix}/modules/mod_negotiation.so
LoadModule dir_module ${modules_prefix}/modules/mod_dir.so
LoadModule setenvif_module ${modules_prefix}/modules/mod_setenvif.so
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Sat Nov 12 19:17:31 2011
@@ -31,6 +31,11 @@ pport=`$here/httpd-addr pport $gport`
sslpport=`$here/httpd-addr pport $2`
sslport=`$here/httpd-addr listen $2`
sslvhost=`$here/httpd-addr vhost $2`
+if [ "$sslpport" = "443" ]; then
+ sslpportsuffix=""
+else
+ sslpportsuffix=":$sslpport"
+fi
htdocs=`echo $conf | awk '{ print $8 }'`
mkdir -p $htdocs
@@ -58,7 +63,13 @@ Listen $sslport
# HTTPS virtual host
<VirtualHost $sslvhost>
-ServerName https://$host:$sslpport
+ServerName https://$host$sslpportsuffix
+
+<Location />
+RewriteEngine on
+RewriteCond %{HTTP_HOST} !^$host [NC]
+RewriteRule .* https://$host$sslpportsuffix%{REQUEST_URI} [R]
+</Location>
Include conf/svhost-ssl.conf
@@ -86,7 +97,7 @@ cat >>$root/conf/svhost.conf <<EOF
RewriteEngine on
RewriteCond %{SERVER_PORT} ^$port$ [OR]
RewriteCond %{SERVER_PORT} ^$pport$
-RewriteRule .* https://$host:$sslpport%{REQUEST_URI} [R,L]
+RewriteRule .* https://$host$sslpportsuffix%{REQUEST_URI} [R]
</Location>
EOF
@@ -98,7 +109,7 @@ cat >>$root/conf/dvhost.conf <<EOF
RewriteEngine on
RewriteCond %{SERVER_PORT} ^$port$ [OR]
RewriteCond %{SERVER_PORT} ^$pport$
-RewriteRule .* https://%{SERVER_NAME}:$sslpport%{REQUEST_URI} [R,L]
+RewriteRule .* https://%{SERVER_NAME}$sslpportsuffix%{REQUEST_URI} [R]
</Location>
EOF
Modified: tuscany/sca-cpp/trunk/modules/http/httpd.hpp
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd.hpp?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd.hpp Sat Nov 12 19:17:31 2011
@@ -43,7 +43,15 @@
#include <http_core.h>
#include <http_connection.h>
#include <http_request.h>
+// Ignore conversion warnings in HTTPD 2.3.15 header
+#ifdef WANT_MAINTAINER_MODE
+#pragma GCC diagnostic ignored "-Wconversion"
+#endif
#include <http_protocol.h>
+// Re-enable conversion warnings
+#ifdef WANT_MAINTAINER_MODE
+#pragma GCC diagnostic warning "-Wconversion"
+#endif
// Hack to workaround compile error with HTTPD 2.3.8
#define aplog_module_index aplog_module_index = 0
#include <http_log.h>
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Sat Nov 12 19:17:31 2011
@@ -48,7 +48,7 @@ sudo apt-get -y install libssl-dev libpc
if [ "$?" != "0" ]; then
exit $?
fi
-svn co -r 1051230 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
+svn co -r 1201086 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
cd apr-1.4.x
./buildconf
./configure -with-openssl --with-crypto --with-expat=$build/expat-2.0.1-bin
--prefix=$build/apr-1.4.x-bin
@@ -58,10 +58,10 @@ if [ "$?" != "0" ]; then
exit $?
fi
cd $build
-curl -OL http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
-tar xzf httpd-2.3.10-alpha.tar.gz
-cd httpd-2.3.10
-./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.10-bin
+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
make
make install
if [ "$?" != "0" ]; then
@@ -204,7 +204,7 @@ cd $build
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.10-bin
--with-curl=$build/curl-7.19.5-bin --with-libopkele=$build/libopkele-bin
+./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.19.5-bin --with-libopkele=$build/libopkele-bin
make
make install
if [ "$?" != "0" ]; then
@@ -228,7 +228,7 @@ cd $build
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.10-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.19.5-bin
LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
+./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.19.5-bin
LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
make
make install
if [ "$?" != "0" ]; then
@@ -321,7 +321,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.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.10-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
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-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.19.5-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
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-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
make
make install
if [ "$?" != "0" ]; then
@@ -330,8 +330,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.19.5
curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin
expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz
httpd-2.3.10-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 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 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.19.5
curl-7.19.5-bin curl-7.19.5.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 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 tiny
cdb-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.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.10-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 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.x-bin curl-7.19.5-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 scribe-2.2-bin
thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all?rev=1201308&r1=1201307&r2=1201308&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all Sat Nov 12 19:17:31 2011
@@ -48,7 +48,7 @@ sudo apt-get -y install libssl-dev libpc
if [ "$?" != "0" ]; then
exit $?
fi
-svn co -r 1051230 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
+svn co -r 1201086 http://svn.apache.org/repos/asf/apr/apr/trunk apr-1.4.x
cd apr-1.4.x
./buildconf
./configure -with-openssl --with-crypto --with-expat=$build/expat-2.0.1-bin
--prefix=$build/apr-1.4.x-bin
@@ -58,10 +58,10 @@ if [ "$?" != "0" ]; then
exit $?
fi
cd $build
-curl -OL http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
-tar xzf httpd-2.3.10-alpha.tar.gz
-cd httpd-2.3.10
-./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.10-bin
+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
make
make install
if [ "$?" != "0" ]; then
@@ -171,7 +171,7 @@ fi
curl -OL http://www.apache.org/dist/ws/axis2-c/1_6_0/axis2c-src-1.6.0.tar.gz
tar xzf axis2c-src-1.6.0.tar.gz
cd axis2c-src-1.6.0
-./configure --enable-openssl --with-apache2=$build/httpd-2.3.10-bin/include
--with-apr=$build/apr-1.4.x-bin/include/apr-2 --prefix=$build/axis2c-1.6.0-bin
+./configure --enable-openssl --with-apache2=$build/httpd-2.3.15-bin/include
--with-apr=$build/apr-1.4.x-bin/include/apr-2 --prefix=$build/axis2c-1.6.0-bin
make
make install
if [ "$?" != "0" ]; then
@@ -258,7 +258,7 @@ cd $build
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.10-bin
--with-curl=$build/curl-7.19.5-bin --with-libopkele=$build/libopkele-bin
+./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.19.5-bin --with-libopkele=$build/libopkele-bin
make
make install
if [ "$?" != "0" ]; then
@@ -282,7 +282,7 @@ cd $build
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.10-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.19.5-bin
LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
+./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.19.5-bin
LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
make
make install
if [ "$?" != "0" ]; then
@@ -391,7 +391,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.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.10-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
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--enable-gae --with-gae=$build/google_appengine --enable-java
--with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice
--with-libxml2=$build/libxml2-2.7.7-bin --with-axis2c=$build/axis2c-1.6.0-bin
--enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --with-vysper=$build/vysper-0.6
--enable-sqldb --with-pgsql=$build/postgresql-9.0.3-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-au
th-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.19.5-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
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--enable-gae --with-gae=$build/google_appengine --enable-java
--with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice
--with-libxml2=$build/libxml2-2.7.7-bin --with-axis2c=$build/axis2c-1.6.0-bin
--enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --with-vysper=$build/vysper-0.6
--enable-sqldb --with-pgsql=$build/postgresql-9.0.3-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-au
th-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
make
make install
if [ "$?" != "0" ]; then
@@ -400,8 +400,8 @@ fi
cd $build
# Create src archive
-tar czf tuscany-sca-cpp-all-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
axis2c-1.6.0-bin axis2c-src-1.6.0 axis2c-src-1.6.0.tar.gz curl-7.19.5
curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin
expat-2.0.1.tar.gz google_appengine google_appengine_1.4.0.zip htmltidy-bin
httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-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 postgresql-9.0.3 post
gresql-9.0.3-bin postgresql-9.0.3.tar.gz qpidc-0.6 qpidc-0.6-bin
qpid-cpp-0.6.tar.gz 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
vysper-0.6 vysper-0.6-bin.tar.gz
+tar czf tuscany-sca-cpp-all-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
axis2c-1.6.0-bin axis2c-src-1.6.0 axis2c-src-1.6.0.tar.gz curl-7.19.5
curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin
expat-2.0.1.tar.gz google_appengine google_appengine_1.4.0.zip 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 postgresql-9.0.3
postgresql-9.0.3-bin postgresql-9.0.3.tar.gz qpidc-0.6 qpidc-0.6-bin
qpid-cpp-0.6.tar.gz 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
vysper-0.6 vysper-0.6-bin.tar.gz
# Create bin archive
-tar czf tuscany-sca-cpp-all-1.0.tar.gz apr-1.4.x-bin axis2c-1.6.0-bin
curl-7.19.5-bin expat-2.0.1-bin google_appengine htmltidy-bin httpd-2.3.10-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 postgresql-9.0.3-bin qpidc-0.6-bin scribe-2.2-bin
thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6
+tar czf tuscany-sca-cpp-all-1.0.tar.gz apr-1.4.x-bin axis2c-1.6.0-bin
curl-7.19.5-bin expat-2.0.1-bin google_appengine 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 postgresql-9.0.3-bin qpidc-0.6-bin scribe-2.2-bin
thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6
