[mapguide-commits] r10031 - in trunk/MgDev: . Oem/LinuxApt
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Mar 20 05:42:16 PDT 2023
Author: jng
Date: 2023-03-20 05:42:15 -0700 (Mon, 20 Mar 2023)
New Revision: 10031
Added:
trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz
trunk/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2
trunk/MgDev/Oem/LinuxApt/apr-util-1.6.3.tar.bz2
trunk/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2
trunk/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2
Removed:
trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.37.tar.gz
trunk/MgDev/Oem/LinuxApt/apr-1.7.0.tar.bz2
trunk/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2
trunk/MgDev/Oem/LinuxApt/httpd-2.4.52.tar.bz2
trunk/MgDev/Oem/LinuxApt/php-8.1.11.tar.bz2
Modified:
trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
trunk/MgDev/cmake_linuxapt.sh
trunk/MgDev/prepare_webtier_components.bat
Log:
Web tier component updates:
- httpd 2.4.52 -> 2.4.56
- PHP 8.1.11 -> 8.1.17
- apr 1.7.0 -> 1.7.2
- apr-util 1.6.1 -> 1.6.3
- Tomcat 9.0.37 -> 9.0.73
Modified: trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/LinuxApt/CMakeLists.txt 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/Oem/LinuxApt/CMakeLists.txt 2023-03-20 12:42:15 UTC (rev 10031)
@@ -19,7 +19,8 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tomcat.conf DESTINATION ${MG_INSTALL_WEB_PREFIX}/apache2/conf/mapguide COMPONENT ${MG_COMPONENT})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tomcat)
- execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-9.0.37.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/tomcat --strip-components=1)
+ # TODO: Offload tomcat version to top-level var
+ execute_process(COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/apache-tomcat-9.0.73.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/tomcat --strip-components=1)
configure_file(${CMAKE_MODULE_PATH}/../configs/mapguide.xml.in ${CMAKE_CURRENT_BINARY_DIR}/tomcat/conf/Catalina/localhost/mapguide.xml)
# Don't overwrite startup.sh in the CMAKE_CURRENT_BINARY_DIR as the subseqent install will do the same thing
Deleted: trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.37.tar.gz
===================================================================
(Binary files differ)
Added: trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz
===================================================================
(Binary files differ)
Index: trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz
===================================================================
--- trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz 2023-03-20 12:42:15 UTC (rev 10031)
Property changes on: trunk/MgDev/Oem/LinuxApt/apache-tomcat-9.0.73.tar.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/MgDev/Oem/LinuxApt/apr-1.7.0.tar.bz2
===================================================================
(Binary files differ)
Added: trunk/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2
===================================================================
(Binary files differ)
Index: trunk/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2
===================================================================
--- trunk/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2 2023-03-20 12:42:15 UTC (rev 10031)
Property changes on: trunk/MgDev/Oem/LinuxApt/apr-1.7.2.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/MgDev/Oem/LinuxApt/apr-util-1.6.1.tar.bz2
===================================================================
(Binary files differ)
Added: trunk/MgDev/Oem/LinuxApt/apr-util-1.6.3.tar.bz2
===================================================================
(Binary files differ)
Index: trunk/MgDev/Oem/LinuxApt/apr-util-1.6.3.tar.bz2
===================================================================
--- trunk/MgDev/Oem/LinuxApt/apr-util-1.6.3.tar.bz2 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/Oem/LinuxApt/apr-util-1.6.3.tar.bz2 2023-03-20 12:42:15 UTC (rev 10031)
Property changes on: trunk/MgDev/Oem/LinuxApt/apr-util-1.6.3.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/MgDev/Oem/LinuxApt/httpd-2.4.52.tar.bz2
===================================================================
(Binary files differ)
Added: trunk/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2
===================================================================
(Binary files differ)
Index: trunk/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2
===================================================================
--- trunk/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2 2023-03-20 12:42:15 UTC (rev 10031)
Property changes on: trunk/MgDev/Oem/LinuxApt/httpd-2.4.56.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/MgDev/Oem/LinuxApt/php-8.1.11.tar.bz2
===================================================================
(Binary files differ)
Added: trunk/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2
===================================================================
(Binary files differ)
Index: trunk/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2
===================================================================
--- trunk/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2 2023-03-20 12:42:15 UTC (rev 10031)
Property changes on: trunk/MgDev/Oem/LinuxApt/php-8.1.17.tar.bz2
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/MgDev/cmake_linuxapt.sh
===================================================================
--- trunk/MgDev/cmake_linuxapt.sh 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/cmake_linuxapt.sh 2023-03-20 12:42:15 UTC (rev 10031)
@@ -119,11 +119,11 @@
echo "Created LinuxApt working dir at: $LINUXAPT_WORK_DIR"
fi
-PHP_VER=8.1.11
-HTTPD_VER=2.4.52
+PHP_VER=8.1.17
+HTTPD_VER=2.4.56
TC_VER=1.2.48
-APR_VER=1.7.0
-APR_UTIL_VER=1.6.1
+APR_VER=1.7.2
+APR_UTIL_VER=1.6.3
HTTPD_PORT=8008
TOMCAT_PORT=8009
Modified: trunk/MgDev/prepare_webtier_components.bat
===================================================================
--- trunk/MgDev/prepare_webtier_components.bat 2023-03-20 12:14:01 UTC (rev 10030)
+++ trunk/MgDev/prepare_webtier_components.bat 2023-03-20 12:42:15 UTC (rev 10031)
@@ -1,6 +1,6 @@
@echo off
SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
-SET HTTPD_VER=2.4.52
+SET HTTPD_VER=2.4.56
pushd Oem\LinuxApt
:check_httpd
if not exist httpd-%HTTPD_VER% goto unpack_httpd
More information about the mapguide-commits
mailing list