[mapguide-commits] r9322 - in branches/3.1/MgDev: . Oem/LinuxApt

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Feb 28 06:31:59 PST 2018 

Author: jng
Date: 2018-02-28 06:31:57 -0800 (Wed, 28 Feb 2018)
New Revision: 9322

Added:
   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
Removed:
   branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz
   branches/3.1/MgDev/Oem/LinuxApt/apr-1.5.2.tar.bz2
   branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
   branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.18.tar.bz2
   branches/3.1/MgDev/Oem/LinuxApt/php-5.6.23.tar.bz2
   branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.41-src.tar.gz
Modified:
   branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh
   branches/3.1/MgDev/configure.in
   branches/3.1/MgDev/prepare_webtier_components.bat
Log:
#2774: Update LinuxApt tarballs

Deleted: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz
===================================================================
(Binary files differ)

Added: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz
===================================================================
(Binary files differ)

Index: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz	2018-02-28 14:31:57 UTC (rev 9322)

Property changes on: branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: branches/3.1/MgDev/Oem/LinuxApt/apr-1.5.2.tar.bz2
===================================================================
(Binary files differ)

Deleted: branches/3.1/MgDev/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
===================================================================
(Binary files differ)

Modified: branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/Oem/LinuxApt/build_apt.sh	2018-02-28 14:31:57 UTC (rev 9322)
@@ -15,12 +15,10 @@
 
 INSTALLDIR=/usr/local/mapguideopensource
 
-HTTPD_VER=2.4.18
-PHP_VER=5.6.23
-TOMCAT_VER=7.0.68
-CONNECTOR_VER=1.2.41
-APR_VER=1.5.2
-APR_UTIL_VER=1.5.4
+HTTPD_VER=2.4.29
+PHP_VER=5.6.33
+TOMCAT_VER=7.0.82
+CONNECTOR_VER=1.2.42
 PORT=8008
 TOMCAT=0
 TOMCAT_PORT=8009
@@ -147,14 +145,7 @@
 #**********************************************************
 echo "Apache Httpd build started"
 tar -jxf httpd-$HTTPD_VER.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
+tar -jxf httpd-$HTTPD_VER-deps.tar.bz2
 pushd httpd-$HTTPD_VER
 ./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
 --with-included-apr --with-port=$PORT

Deleted: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.18.tar.bz2
===================================================================
(Binary files differ)

Added: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2
===================================================================
(Binary files differ)

Index: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2	2018-02-28 14:31:57 UTC (rev 9322)

Property changes on: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.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/httpd-2.4.29.tar.bz2
===================================================================
(Binary files differ)

Index: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2	2018-02-28 14:31:57 UTC (rev 9322)

Property changes on: branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.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.23.tar.bz2
===================================================================
(Binary files differ)

Added: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2
===================================================================
(Binary files differ)

Index: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2	2018-02-28 14:31:57 UTC (rev 9322)

Property changes on: branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.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.41-src.tar.gz
===================================================================
(Binary files differ)

Added: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz
===================================================================
(Binary files differ)

Index: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz
===================================================================
--- branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz	2018-02-28 14:31:57 UTC (rev 9322)

Property changes on: branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: branches/3.1/MgDev/configure.in
===================================================================
--- branches/3.1/MgDev/configure.in	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/configure.in	2018-02-28 14:31:57 UTC (rev 9322)
@@ -39,7 +39,7 @@
 map_opt_oem_distsubdirs=""
 
 dnl *******************************************************
-dnl PHP 5.6.23 Configuration
+dnl PHP 5.6.33 Configuration
 dnl *******************************************************
 AC_ARG_WITH([php],
         MAP_HELP_STRING([--with-php],
@@ -48,8 +48,8 @@
         [with_php=no])
 
 if test $with_php = "no"; then
-    AC_MSG_NOTICE([Using php 5.6.23 from included Oem Directory])
-	php_src=`pwd`/Oem/LinuxApt/php-5.6.23
+    AC_MSG_NOTICE([Using php 5.6.33 from included Oem Directory])
+	php_src=`pwd`/Oem/LinuxApt/php-5.6.33
 else
     AC_MSG_NOTICE([Using custom PHP source directory])
 	php_src=$with_php
@@ -62,7 +62,7 @@
 AC_SUBST(php_src)
 
 dnl *******************************************************
-dnl httpd 2.4.18 Configuration
+dnl httpd 2.4.29 Configuration
 dnl *******************************************************
 AC_ARG_WITH([httpd],
 		MAP_HELP_STRING([--with-httpd],
@@ -71,8 +71,8 @@
 		[with_httpd=no])
 
 if test $with_httpd = "no"; then
-    AC_MSG_NOTICE([Using httpd 2.4.18 from included Oem Directory])
-	httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.18
+    AC_MSG_NOTICE([Using httpd 2.4.29 from included Oem Directory])
+	httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.29
 else
     AC_MSG_NOTICE([Using custom httpd source directory])
 	httpd_src=$with_httpd

Modified: branches/3.1/MgDev/prepare_webtier_components.bat
===================================================================
--- branches/3.1/MgDev/prepare_webtier_components.bat	2018-02-17 06:31:59 UTC (rev 9321)
+++ branches/3.1/MgDev/prepare_webtier_components.bat	2018-02-28 14:31:57 UTC (rev 9322)
@@ -1,7 +1,7 @@
 @echo off
 SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
-SET HTTPD_VER=2.4.18
-SET PHP_VER=5.6.23
+SET HTTPD_VER=2.4.29
+SET PHP_VER=5.6.33
 pushd Oem\LinuxApt
 :check_httpd
 if not exist httpd-%HTTPD_VER% goto unpack_httpd

More information about the mapguide-commits mailing list