[mapguide-commits] r9335 - in trunk/MgDev: . Oem/LinuxApt Oem/httpd/lib64 Oem/php/x64/Release_TS

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat Mar 3 04:21:40 PST 2018 

Author: jng
Date: 2018-03-03 04:21:40 -0800 (Sat, 03 Mar 2018)
New Revision: 9335

Added:
   trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2
   trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz
   trunk/MgDev/Oem/httpd/lib64/mod_proxy.lib
Removed:
   trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.18.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.6.23.tar.bz2
   trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.41-src.tar.gz
Modified:
   trunk/MgDev/
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   trunk/MgDev/Oem/httpd/lib64/apr-1.lib
   trunk/MgDev/Oem/httpd/lib64/aprutil-1.lib
   trunk/MgDev/Oem/httpd/lib64/libapr-1.exp
   trunk/MgDev/Oem/httpd/lib64/libapr-1.lib
   trunk/MgDev/Oem/httpd/lib64/libapriconv-1.exp
   trunk/MgDev/Oem/httpd/lib64/libapriconv-1.lib
   trunk/MgDev/Oem/httpd/lib64/libaprutil-1.exp
   trunk/MgDev/Oem/httpd/lib64/libaprutil-1.lib
   trunk/MgDev/Oem/httpd/lib64/libhttpd.exp
   trunk/MgDev/Oem/httpd/lib64/libhttpd.lib
   trunk/MgDev/Oem/httpd/lib64/mod_dav.exp
   trunk/MgDev/Oem/httpd/lib64/mod_dav.lib
   trunk/MgDev/Oem/httpd/lib64/xml.lib
   trunk/MgDev/Oem/php/x64/Release_TS/php5ts.lib
   trunk/MgDev/configure.in
   trunk/MgDev/prepare_webtier_components.bat
Log:
Merged revision(s) 9322-9323 from branches/3.1/MgDev:
#2774: Update LinuxApt tarballs
........
#2774: Update import libs for 64-bit PHP and Apache
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2018-03-03 12:11:48 UTC (rev 9334)
+++ trunk/MgDev	2018-03-03 12:21:40 UTC (rev 9335)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
 /branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
 /branches/3.0/MgDev:8658,8705,8710
-/branches/3.1/MgDev:9026,9058-9059,9067-9068
+/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323
 /sandbox/VC140:8684-8759
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
Deleted: trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz (from rev 9323, branches/3.1/MgDev/Oem/LinuxApt/apache-tomcat-7.0.82.tar.gz)
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2018-03-03 12:11:48 UTC (rev 9334)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2018-03-03 12:21:40 UTC (rev 9335)
@@ -15,10 +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
+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

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

Copied: trunk/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2 (from rev 9323, branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29-deps.tar.bz2)
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2 (from rev 9323, branches/3.1/MgDev/Oem/LinuxApt/httpd-2.4.29.tar.bz2)
===================================================================
(Binary files differ)

Deleted: trunk/MgDev/Oem/LinuxApt/php-5.6.23.tar.bz2
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2 (from rev 9323, branches/3.1/MgDev/Oem/LinuxApt/php-5.6.33.tar.bz2)
===================================================================
(Binary files differ)

Deleted: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.41-src.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz (from rev 9323, branches/3.1/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.42-src.tar.gz)
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/apr-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/aprutil-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapr-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapr-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapriconv-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapriconv-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libaprutil-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libaprutil-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libhttpd.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libhttpd.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/mod_dav.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/mod_dav.lib
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/httpd/lib64/mod_proxy.lib (from rev 9323, branches/3.1/MgDev/Oem/httpd/lib64/mod_proxy.lib)
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/xml.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/php/x64/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2018-03-03 12:11:48 UTC (rev 9334)
+++ trunk/MgDev/configure.in	2018-03-03 12:21:40 UTC (rev 9335)
@@ -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: trunk/MgDev/prepare_webtier_components.bat
===================================================================
--- trunk/MgDev/prepare_webtier_components.bat	2018-03-03 12:11:48 UTC (rev 9334)
+++ trunk/MgDev/prepare_webtier_components.bat	2018-03-03 12:21:40 UTC (rev 9335)
@@ -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