[mapguide-commits] r9425 - branches/3.1/MgDev/Oem/LinuxApt
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Dec 31 00:09:25 PST 2018
Author: jng
Date: 2018-12-31 00:09:25 -0800 (Mon, 31 Dec 2018)
New Revision: 9425
Added:
branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.92.tar.gz
branches/3.1/MgDev/Oem/LinuxApt/apr-1.6.5.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.37.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/php-5.6.39.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.46-src.tar.gz
Removed:
branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz
branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2
branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz
Modified:
branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh
Log:
RFC 168: Upgrade the following web tier dependencies:
- Apache HTTPD 2.4.37
- For reasons I do not know, Apache does not offer a deps package for this release, so we've gone back to including the latest apr (1.6.5) and apr-util (1.6.1) and build_apt.sh has been updated to work against these packages again.
- PHP 5.6.39
- Tomcat 7.0.92
- Tomcat Connector 1.2.46
Deleted: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz
===================================================================
(Binary files differ)
Added: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.92.tar.gz
===================================================================
(Binary files differ)
Index: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.92.tar.gz
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.92.tar.gz 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.92.tar.gz 2018-12-31 08:09:25 UTC (rev 9425)
Property changes on: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.92.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/3.1/MgDev/Oem/LinuxApt/apr-1.6.5.tar.bz2
===================================================================
(Binary files differ)
Index: branches/3.1/MgDev/Oem/LinuxApt/apr-1.6.5.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/apr-1.6.5.tar.bz2 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/apr-1.6.5.tar.bz2 2018-12-31 08:09:25 UTC (rev 9425)
Property changes on: branches/3.1/MgDev/Oem/LinuxApt/apr-1.6.5.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2
===================================================================
(Binary files differ)
Index: branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2 2018-12-31 08:09:25 UTC (rev 9425)
Property changes on: branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh 2018-12-31 08:09:25 UTC (rev 9425)
@@ -15,10 +15,12 @@
INSTALLDIR=/usr/local/mapguideopensource
-HTTPD_VER=2.4.29
-PHP_VER=5.6.33
-TOMCAT_VER=7.0.82
-CONNECTOR_VER=1.2.42
+HTTPD_VER=2.4.37
+PHP_VER=5.6.39
+TOMCAT_VER=7.0.92
+CONNECTOR_VER=1.2.46
+APR_VER=1.6.5
+APR_UTIL_VER=1.6.1
PORT=8008
TOMCAT=0
TOMCAT_PORT=8009
@@ -145,7 +147,14 @@
#**********************************************************
echo "Apache Httpd build started"
tar -jxf httpd-$HTTPD_VER.tar.bz2
-tar -jxf httpd-$HTTPD_VER-deps.tar.bz2
+if [ ! -d "httpd-$HTTPD_VER/srclib/apr" ]; then
+ tar -jxf apr-$APR_VER.tar.bz2
+ mv apr-$APR_VER httpd-$HTTPD_VER/srclib/apr
+fi
+if [ ! -d "httpd-$HTTPD_VER/srclib/aprutil" ]; then
+ tar -jxf apr-util-$APR_UTIL_VER.tar.bz2
+ mv apr-util-$APR_UTIL_VER httpd-$HTTPD_VER/srclib/apr-util
+fi
pushd httpd-$HTTPD_VER
./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
--with-included-apr --with-port=$PORT
@@ -523,3 +532,4 @@
echo "Tomcat startup completed"
fi
+
Deleted: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2
===================================================================
(Binary files differ)
Deleted: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2
===================================================================
(Binary files differ)
Added: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.37.tar.bz2
===================================================================
(Binary files differ)
Index: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.37.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.37.tar.bz2 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.37.tar.bz2 2018-12-31 08:09:25 UTC (rev 9425)
Property changes on: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.37.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2
===================================================================
(Binary files differ)
Added: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.39.tar.bz2
===================================================================
(Binary files differ)
Index: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.39.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/php-5.6.39.tar.bz2 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/php-5.6.39.tar.bz2 2018-12-31 08:09:25 UTC (rev 9425)
Property changes on: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.39.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz
===================================================================
(Binary files differ)
Added: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.46-src.tar.gz
===================================================================
(Binary files differ)
Index: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.46-src.tar.gz
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.46-src.tar.gz 2018-12-16 14:44:32 UTC (rev 9424)
+++ branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.46-src.tar.gz 2018-12-31 08:09:25 UTC (rev 9425)
Property changes on: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.46-src.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
More information about the mapguide-commits
mailing list