Changeset: 92e15a54ea3f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92e15a54ea3f
Modified Files:
MonetDB.spec
buildtools/selinux/monetdb.te
geom/monetdb5/geom.c
geom/monetdb5/geom.h
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (77 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -885,7 +885,7 @@ developer, but if you do want to test, t
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%package selinux
-Summary: MonetDB - Monet Database Management System
+Summary: SELinux policy files for MonetDB
Group: Applications/Databases
%if "%{_selinux_policy_version}" != ""
Requires: selinux-policy >= %{_selinux_policy_version}
@@ -1041,6 +1041,9 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Sun Nov 5 2017 Sjoerd Mullender <[email protected]> - 11.27.9-20171105
+- BZ#6460 - selinux doen't allow mmap
+
* Mon Oct 23 2017 Sjoerd Mullender <[email protected]> - 11.27.9-20171023
- Rebuilt.
- BZ#6207: identifier ambiguous when grouping and selecting the same
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,4 +1,4 @@
-policy_module(monetdb, 0.1)
+policy_module(monetdb, 0.2)
# The above line declares that this file is a SELinux policy file. Its
# name is monetdb, so the file should be saved as monetdb.te
@@ -39,6 +39,7 @@ manage_files_pattern(mserver5_t, mserver
manage_dirs_pattern(mserver5_t, mserver5_db_t, mserver5_db_t)
manage_files_pattern(monetdbd_t, mserver5_db_t, mserver5_db_t)
manage_dirs_pattern(monetdbd_t, mserver5_db_t, mserver5_db_t)
+allow mserver5_t mserver5_db_t:file { map };
# the context used for the configuration files
type monetdbd_etc_t;
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -14,6 +14,10 @@
#include "geom.h"
#include "mal_exception.h"
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && _MSC_VER < 1800
+#define isnan(x) _isnan(x)
+#endif
+
int TYPE_mbr;
static wkb *geos2wkb(const GEOSGeometry *geosGeometry);
@@ -2959,6 +2963,8 @@ wkbGetCoordinate(dbl *out, wkb **geom, i
err = createException(MAL, "geom.GetCoordinate",
SQLSTATE(38000) "Geos operation GEOSGeom_getCoordSeq failed");
} else if (!GEOSCoordSeq_getOrdinate(gcs, 0, *dimNum, out))
err = createException(MAL, "geom.GetCoordinate",
SQLSTATE(38000) "Geos operation GEOSCoordSeq_getOrdinate failed");
+ else if (isnan(*out))
+ *out = dbl_nil;
GEOSGeom_destroy(geosGeometry);
return err;
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -22,7 +22,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#if defined(_MSC_VER) && defined(__INTEL_COMPILER)
+#include <mathimf.h>
+#else
#include <math.h>
+#endif
#include <time.h>
#include <gdk_logger.h>
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
