[Git][debian-gis-team/mapserver][experimental] 5 commits: New upstream version 8.2.0~rc3
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Jun 28 15:27:17 BST 2024
Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver
Commits:
c64f450f by Bas Couwenberg at 2024-06-28T15:44:52+02:00
New upstream version 8.2.0~rc3
- - - - -
1401e8de by Bas Couwenberg at 2024-06-28T15:45:06+02:00
Update upstream source from tag 'upstream/8.2.0_rc3'
Update to upstream version '8.2.0~rc3'
with Debian dir 82207f68d2d7e5ac2098c47514acab70a4de753a
- - - - -
9a093031 by Bas Couwenberg at 2024-06-28T15:45:19+02:00
New upstream release candidate.
- - - - -
96650b56 by Bas Couwenberg at 2024-06-28T15:46:34+02:00
Update symbols for other architectures.
- - - - -
bbcda574 by Bas Couwenberg at 2024-06-28T15:46:55+02:00
Set distribution to experimental.
- - - - -
6 changed files:
- CMakeLists.txt
- HISTORY.md
- INSTALL → INSTALL.md
- debian/changelog
- debian/libmapserver2t64.symbols
- src/mapfile.c
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
set (MapServer_VERSION_MAJOR 8)
set (MapServer_VERSION_MINOR 2)
set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-rc2")
+set (MapServer_VERSION_SUFFIX "-rc3")
# Set C++ version
# Make CMAKE_CXX_STANDARD available as cache option overridable by user
=====================================
HISTORY.md
=====================================
@@ -13,6 +13,11 @@ https://mapserver.org/development/changelog/
The online Migration Guide can be found at https://mapserver.org/MIGRATION_GUIDE.html
+8.2.0-rc3 release (2024-06-28)
+------------------------------
+
+- fix memory corruption in msUpdate...FromString (#7038)
+
8.2.0-rc2 release (2024-06-27)
------------------------------
=====================================
INSTALL → INSTALL.md
=====================================
@@ -4,11 +4,11 @@ instructions.
Unix compilation instructions
-----------------------------
-See INSTALL.CMAKE or the document on the MapServer website at
-<https://mapserver.org/installation/unix.html>
+See [INSTALL.CMAKE](INSTALL.CMAKE) or the document on the MapServer website at
+https://mapserver.org/installation/unix.html
Win32 compilation instructions
------------------------------
See README.WIN32 or the document on the MapServer website at
-<https://mapserver.org/installation/win32.html>
+https://mapserver.org/installation/win32.html
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mapserver (8.2.0~rc3-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Jun 2024 15:46:36 +0200
+
mapserver (8.2.0~rc2-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/libmapserver2t64.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 8.2.0~rc2 amd64
+# SymbolsHelper-Confirmed: 8.2.0~rc2 amd64 arm64 m68k
libmapserver.so.2 #PACKAGE# #MINVER#
* Build-Depends-Package: libmapserver-dev
CompareEllipseRegion at Base 6.2.1
@@ -1247,7 +1247,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=!armel !riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN4inja8TextNodeESaIvELN9__gnu_cxx12_Lock_policyE2EED2Ev at Base 8.0.0
(optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN11ms_nlohmann10basic_jsonIS_St6vectorS5_b{int64_t}{uint64_t}dSaNS6_14adl_serializerES8_IhSaIhEEEESt4lessIS5_ESaISt4pairIKS5_SC_EEEixERSG_ at Base 8.0.1
(optional=templinst|arch=amd64 arm64)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN4inja8TemplateESt4lessIS5_ESaISt4pairIKS5_S7_EEEixERSB_ at Base 8.0.1
- (optional=templinst|arch=amd64 loong64 ppc64el)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixEOS5_ at Base 8.2.0~beta1
+ (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixEOS5_ at Base 8.2.0~beta1
(optional=templinst)_ZNSt3mapISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiEN4inja15FunctionStorage12FunctionDataESt4lessIS7_ESaIS0_IKS7_SA_EEEC1ESt16initializer_listISE_ERKSC_RKSF_ at Base 8.0.0
(optional=templinst)_ZNSt3mapISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiEN4inja15FunctionStorage12FunctionDataESt4lessIS7_ESaIS0_IKS7_SA_EEEC2ESt16initializer_listISE_ERKSC_RKSF_ at Base 8.0.0
(optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64)_ZNSt4pairIKS_INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiEN4inja15FunctionStorage12FunctionDataEEC1IS_IPKciESA_Lb1EEEOT_OT0_ at Base 8.0.0
@@ -1414,7 +1414,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=amd64 arm64 ia64 loong64 m68k mips64el ppc64el riscv64 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N4inja8TemplateEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS7_ at Base 8.0.0
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N4inja8TemplateEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE4findERS7_ at Base 8.0.0
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_ at Base 8.2.0~beta1
- (optional=templinst|arch=amd64 loong64 ppc64el)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 8.2.0~beta1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 8.2.0~beta1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10shared_ptrIN4inja18BlockStatementNodeEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE17_M_emplace_uniqueIJRS7_RSB_EEES6_ISt17_Rb_tree_iteratorISC_EbEDpOT_ at Base 8.0.0
(optional=templinst)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiES0_IKS7_N4inja15FunctionStorage12FunctionDataEESt10_Select1stISC_ESt4lessIS7_ESaISC_EE24_M_get_insert_unique_posERS8_ at Base 8.0.0
(optional=templinst|arch=amd64 arm64 ia64 loong64 m68k mips64el ppc64el riscv64 sparc64)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiES0_IKS7_N4inja15FunctionStorage12FunctionDataEESt10_Select1stISC_ESt4lessIS7_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS8_ at Base 8.0.0
=====================================
src/mapfile.c
=====================================
@@ -2102,9 +2102,9 @@ int msUpdateLabelFromString(labelObj *label, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -2616,9 +2616,9 @@ int msUpdateClusterFromString(clusterObj *cluster, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -3096,9 +3096,9 @@ int msUpdateStyleFromString(styleObj *style, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -3766,9 +3766,9 @@ int msUpdateClassFromString(classObj *class, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
if (classResolveSymbolNames(class) != MS_SUCCESS)
return MS_FAILURE;
@@ -4836,9 +4836,9 @@ int msUpdateLayerFromString(layerObj *layer, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
/* step through classes to resolve symbol names */
for (i = 0; i < layer->numclasses; i++) {
@@ -5249,9 +5249,9 @@ int msUpdateReferenceMapFromString(referenceMapObj *ref, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -5643,9 +5643,9 @@ int msUpdateLegendFromString(legendObj *legend, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -5842,9 +5842,9 @@ int msUpdateScalebarFromString(scalebarObj *scalebar, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -5991,9 +5991,9 @@ int msUpdateQueryMapFromString(queryMapObj *querymap, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -6240,9 +6240,9 @@ int msUpdateWebFromString(webObj *web, char *string) {
return MS_FAILURE; /* parse error */
;
}
- msReleaseLock(TLOCK_PARSER);
msyylex_destroy();
+ msReleaseLock(TLOCK_PARSER);
return MS_SUCCESS;
}
@@ -6966,6 +6966,7 @@ mapObj *msLoadMapFromString(char *buffer, char *new_mappath,
if (!msGetCWD(szCWDPath, MS_MAXPATHLEN, "msLoadMapFromString()")) {
msFreeMap(map);
msReleaseLock(TLOCK_PARSER);
+ return (NULL);
}
if (new_mappath) {
mappath = msStrdup(new_mappath);
@@ -7111,12 +7112,12 @@ mapObj *msLoadMap(const char *filename, const char *new_mappath,
if (loadMapInternal(map) != MS_SUCCESS) {
msFreeMap(map);
- msReleaseLock(TLOCK_PARSER);
if (msyyin) {
msyycleanup_includes();
fclose(msyyin);
msyyin = NULL;
}
+ msReleaseLock(TLOCK_PARSER);
return NULL;
}
msReleaseLock(TLOCK_PARSER);
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/118969279b092954c0cd6ef9dbb253e4bff00a22...bbcda5745ba2837f77133c717e0be9e0ed470e06
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/118969279b092954c0cd6ef9dbb253e4bff00a22...bbcda5745ba2837f77133c717e0be9e0ed470e06
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240628/47799b91/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list