[Git][debian-gis-team/mapserver][experimental] 6 commits: New upstream version 8.2.0~beta3
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Jun 12 04:37:44 BST 2024
Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver
Commits:
577b8c53 by Bas Couwenberg at 2024-06-12T05:20:49+02:00
New upstream version 8.2.0~beta3
- - - - -
b8ba2d98 by Bas Couwenberg at 2024-06-12T05:21:03+02:00
Update upstream source from tag 'upstream/8.2.0_beta3'
Update to upstream version '8.2.0~beta3'
with Debian dir b84fbe5baf78b5487b8be9fd87454f5e64a83c3e
- - - - -
dc26d982 by Bas Couwenberg at 2024-06-12T05:22:55+02:00
New upstream beta release.
- - - - -
d102c198 by Bas Couwenberg at 2024-06-12T05:25:32+02:00
Update symbols for other architectures.
- - - - -
0a737c56 by Bas Couwenberg at 2024-06-12T05:31:30+02:00
Update symbols for amd64.
- - - - -
a9062855 by Bas Couwenberg at 2024-06-12T05:31:30+02:00
Set distribution to experimental.
- - - - -
7 changed files:
- CMakeLists.txt
- HISTORY.md
- debian/changelog
- debian/libmapserver2t64.symbols
- src/mapogroutput.cpp
- src/mapregex.c
- src/mapregex.h
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 "-beta2")
+set (MapServer_VERSION_SUFFIX "-beta3")
# 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-beta3 release (2024-06-11)
+--------------------------------
+
+- security fix to prevent SQL injections through regex validation (#7075)
+
8.2.0-beta2 release (2024-06-08)
--------------------------------
@@ -115,6 +120,15 @@ RC2 was released as the final 8.0.0 (see major changes below)
- upgrade Travis and GitHub CI to run on Ubuntu Focal (#6430)
+7.6.5 release (2023-04-17)
+--------------------------
+
+- remove password content from logs (#6621)
+
+- increase security and stability (#6818)
+
+see detailed changelog for other fixes
+
7.6.4 release (2021-07-12)
--------------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mapserver (8.2.0~beta3-1~exp1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 12 Jun 2024 05:25:33 +0200
+
mapserver (8.2.0~beta2-1~exp1) experimental; urgency=medium
* New upstream beta release.
=====================================
debian/libmapserver2t64.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 8.2.0~beta1 amd64 arm64 armel armhf i386 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64
+# SymbolsHelper-Confirmed: 8.2.0~beta3 amd64
libmapserver.so.2 #PACKAGE# #MINVER#
* Build-Depends-Package: libmapserver-dev
CompareEllipseRegion at Base 6.2.1
@@ -399,8 +399,8 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA10_cLi0EEEvRT_RKT0_ at Base 8.0.0
(arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA11_cLi0EEEvRT_RKT0_ at Base 8.0.0
(arch=amd64 arm64)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA21_cLi0EEEvRT_RKT0_ at Base 8.0.1
- _ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA22_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta1
- _ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA24_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta1
+ (arch=amd64 riscv64)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA22_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta3
+ _ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA24_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta3
(arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA4_cLi0EEEvRT_RKT0_ at Base 8.0.0
(arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA5_cLi0EEEvRT_RKT0_ at Base 8.0.0
(arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA6_cLi0EEEvRT_RKT0_ at Base 8.0.0
@@ -418,7 +418,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA17_cLi0EEEvRT_RKT0_ at Base 8.0.1
(arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA3_cLi0EEEvRT_RKT0_ at Base 8.0.1
(arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA8_cLi0EEEvRT_RKT0_ at Base 8.0.1
- (arch=amd64 arm64 armel armhf mips64el ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA9_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta1
+ (arch=amd64 arm64 armel armhf loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA9_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta2
(optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20get_arithmetic_valueINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEdLi0EEEvRKT_RT0_ at Base 8.0.0
(optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20get_arithmetic_valueINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEElLi0EEEvRKT_RT0_ at Base 8.0.0
(optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail20get_arithmetic_valueINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEdLi0EEEvRKT_RT0_ at Base 8.0.0
@@ -496,7 +496,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv 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)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEC1EPSF_ at Base 8.0.1
(optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEC2EPSF_ at Base 8.0.1
- (optional=templinst)_ZN11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.2.0~beta1
+ (optional=templinst|arch=!armel !armhf !i386 !m68k !powerpc)_ZN11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.2.0~beta1
(optional=templinst|arch=armel armhf i386 m68k powerpc)_ZN11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.2.0~beta1
(arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmanneqERKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES2_IhSaIhEEEESE_ at Base 8.0.0
(arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmanneqERKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES2_IhSaIhEEEESE_ at Base 8.0.0
@@ -933,7 +933,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
_ZN9mapserver9verdana18E at Base 6.2.1
_ZNK10ClipperLib16clipperException4whatEv at Base 6.2.1
(arch=i386 mipsel sh4 sparc)_ZNK10ClipperLib6Int128dvERKS0_ at Base 8.0.0
- (arch=!amd64 !arm64 !armel !armhf !m68k !mips64el !powerpc !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK10ClipperLib6Int128mlERKS0_ at Base 8.0.1
+ (arch=!amd64 !arm64 !armel !armhf !loong64 !m68k !mips64el !powerpc !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK10ClipperLib6Int128mlERKS0_ at Base 8.0.1
_ZNK10ClipperLib7Clipper14IsContributingERKNS_5TEdgeE at Base 6.2.1
_ZNK10ClipperLib7Clipper17IsEvenOddFillTypeERKNS_5TEdgeE at Base 6.2.1
_ZNK10ClipperLib7Clipper20IsEvenOddAltFillTypeERKNS_5TEdgeE 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)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixEOS5_ at Base 8.2.0~beta1
+ (optional=templinst|arch=amd64 loong64 m68k mips64el ppc64el riscv64 sparc64)_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)_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|arch=amd64 loong64 m68k mips64el ppc64el riscv64 sparc64)_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/mapogroutput.cpp
=====================================
@@ -768,7 +768,12 @@ int msOGRWriteFromQuery(mapObj *map, outputFormatObj *format, int sendheaders)
}
if (!EQUAL(storage, "stream")) {
- msBuildPath(datasource_name, request_dir, fo_filename);
+ if (!msBuildPath(datasource_name, request_dir, fo_filename)) {
+ msFree(request_dir);
+ CSLDestroy(layer_options);
+ CSLDestroy(ds_options);
+ return MS_FAILURE;
+ }
if (EQUAL(form, "zip")) {
/* if generating a zip file, remove the zip extension for the internal */
@@ -779,7 +784,7 @@ int msOGRWriteFromQuery(mapObj *map, outputFormatObj *format, int sendheaders)
/* and add .dat extension if user didn't provide another extension */
if (EQUAL(CPLGetExtension(datasource_name), "")) {
- strcat(datasource_name, ".dat");
+ strlcat(datasource_name, ".dat", sizeof(datasource_name));
}
}
=====================================
src/mapregex.c
=====================================
@@ -57,7 +57,16 @@ MS_API_EXPORT(int) ms_regcomp(ms_regex_t *regex, const char *expr, int cflags) {
/* Must free in regfree() */
regex_t *sys_regex = (regex_t *)msSmallMalloc(sizeof(regex_t));
regex->sys_regex = (void *)sys_regex;
- int ret = regcomp(sys_regex, expr, cflags);
+ int reg_cflags = 0;
+ if (cflags & MS_REG_EXTENDED)
+ reg_cflags |= REG_EXTENDED;
+ if (cflags & MS_REG_ICASE)
+ reg_cflags |= REG_ICASE;
+ if (cflags & MS_REG_NOSUB)
+ reg_cflags |= REG_NOSUB;
+ if (cflags & MS_REG_NEWLINE)
+ reg_cflags |= REG_NEWLINE;
+ int ret = regcomp(sys_regex, expr, reg_cflags);
if (ret != 0) {
free(regex->sys_regex);
regex->sys_regex = NULL;
=====================================
src/mapregex.h
=====================================
@@ -66,11 +66,10 @@ MS_API_EXPORT(void) ms_regfree(ms_regex_t *);
#define MS_REG_BASIC 0000
#define MS_REG_EXTENDED 0001
#define MS_REG_ICASE 0002
+// WARNING: GNU regex has REG_NOSUB = (1 << 3) = 8
#define MS_REG_NOSUB 0004
+// WARNING: GNU regex has REG_NEWLINE = (1 << 2) = 4
#define MS_REG_NEWLINE 0010
-#define MS_REG_NOSPEC 0020
-#define MS_REG_PEND 0040
-#define MS_REG_DUMP 0200
/* === regerror.c === */
#define MS_REG_OKAY 0
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/6f0012d30e13f563990dcd13eaf9be3977eb2f59...a906285518823e76120e76dffbb9b8c30f5b21e8
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/6f0012d30e13f563990dcd13eaf9be3977eb2f59...a906285518823e76120e76dffbb9b8c30f5b21e8
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/20240612/ea9f8b0c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list