Changeset: b95fbb877a39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b95fbb877a39
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
monetdb5/modules/atoms/mtime.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_parser.y
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: typing
Log Message:
Merged with Oct2020
diffs (truncated from 54376 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.38.0
+current_version = 11.39.0
commit = False
tag = False
@@ -11,10 +11,6 @@ serialize = set(MONETDB_VERSION_MAJOR "{
search = %global version {current_version}
replace = %global version {new_version}
-[bumpversion:file:NT/rules.msc]
-
-[bumpversion:file:NT/monetdb_config.h.in]
-
[bumpversion:file:gdk/libbat.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
@@ -34,3 +30,4 @@ serialize = {major},{minor},{patch}
[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
+
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -780,3 +780,4 @@ 1e3bd8cd485a0880a7557aa5307e986a210a1e00
bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_11
1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_SP1_release
+94231c85384d893701beeeb69996f57c70fade4d Oct2020_root
diff --git a/ChangeLog b/ChangeLog.Oct2020
rename from ChangeLog
rename to ChangeLog.Oct2020
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.38.0
+%global version 11.39.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -753,7 +753,8 @@ fi
%files selinux
%defattr(-,root,root,0755)
-%doc buildtools/selinux/*
+%docdir %{_datadir}/doc/MonetDB-selinux
+%{_datadir}/doc/MonetDB-selinux/*
%{_datadir}/selinux/*/monetdb.pp
%endif
@@ -763,6 +764,7 @@ fi
%build
%cmake3 \
+ -DRELEASE_VERSION=ON \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -793,22 +795,6 @@ fi
%cmake3_build
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-cd buildtools/selinux
-%if 0%{?fedora} < 27
-# no `map' policy available before Fedora 27
-sed -i '/map/d' monetdb.te
-%endif
-
-for selinuxvariant in %{selinux_variants}
-do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- mv monetdb.pp monetdb.pp.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-cd -
-%endif
-
%install
%cmake3_install
@@ -836,12 +822,6 @@ rm -f %{buildroot}%{_bindir}/monetdb_mte
rm -rf %{buildroot}%{_datadir}/monetdb # /cmake
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-for selinuxvariant in %{selinux_variants}
-do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 buildtools/selinux/monetdb.pp.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/monetdb.pp
-done
if [ -x /usr/sbin/hardlink ]; then
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
else
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -41,23 +41,29 @@ def main():
arch = 'x86'
libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
- vs = '2019'
+ with open('CMakeCache.txt') as cache:
+ for line in cache:
+ if line.startswith('CMAKE_GENERATOR_INSTANCE:INTERNAL='):
+ comdir = line.split('=', 1)[1].strip().replace('/', '\\')
+ break
+ else:
+ comdir = r'C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community'
+ msvc = os.path.join(comdir, r'VC\Redist\MSVC')
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"
Name="MonetDB ODBC Driver" UpgradeCode="{}"
Version="{}">'.format(upgradecode[arch], sys.argv[1]))
print(r' <Package Id="*" Comments="MonetDB ODBC Driver"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC"
Languages="1033" Manufacturer="MonetDB BV" Platform="{}"/>'.format(arch))
print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A
later version of [ProductName] is already installed."
AllowSameVersionUpgrades="no"/>')
- print(r' <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>')
- print(r' <WixVariable Id="WixUIBannerBmp" Value="banner.bmp"/>')
+ print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>')
+ print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>')
# print(r' <WixVariable Id="WixUIDialogBmp"
Value="backgroundRipple.bmp"/>')
print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>')
- print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
+ print(r' <Property Id="ARPPRODUCTICON" Value="share\monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall"
ExeCommand="/Install" Execute="deferred" Impersonate="no"/>')
print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall"
ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
@@ -80,12 +86,12 @@ def main():
vcpkg.format(r'bin\zlib1.dll')])
print(r' </Directory>')
id = comp(features, id, 12,
- [r'license.rtf'])
+ [r'share\license.rtf'])
id = comp(features, id, 12,
[r'bin\odbcinstall.exe'],
fid = 'odbcinstall')
id = comp(features, id, 12,
- [r'website.html'],
+ [r'share\website.html'],
name = 'MonetDB Web Site',
sid = 'website_html',
vital = 'no')
@@ -109,7 +115,7 @@ def main():
print(r' </Feature>')
print(r' <UIRef Id="WixUI_InstallDir"/>')
print(r' <UIRef Id="WixUI_ErrorProgressText"/>')
- print(r' <Icon Id="monetdb.ico" SourceFile="monetdb.ico"/>')
+ print(r' <Icon Id="monetdb.ico" SourceFile="share\monetdb.ico"/>')
print(r' <InstallExecuteSequence>')
print(r' <Custom Action="driverinstall" Before="RegisterUser">')
print(r' NOT Installed OR REINSTALL')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -48,7 +48,14 @@ def main():
arch = 'x86'
libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
- vs = '2019'
+ with open('CMakeCache.txt') as cache:
+ for line in cache:
+ if line.startswith('CMAKE_GENERATOR_INSTANCE:INTERNAL='):
+ comdir = line.split('=', 1)[1].strip().replace('/', '\\')
+ break
+ else:
+ comdir = r'C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community'
+ msvc = os.path.join(comdir, r'VC\Redist\MSVC')
features = []
extend = []
debug = []
@@ -65,8 +72,8 @@ def main():
print(r' <UpgradeVersion OnlyDetect="no" Minimum="11.29.3"
IncludeMinimum="no" Maximum="{}"
Property="GEOMINSTALLED"/>'.format(sys.argv[1]))
print(r' </Upgrade>')
print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A
later version of [ProductName] is already installed."
AllowSameVersionUpgrades="no"/>')
- print(r' <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>')
- print(r' <WixVariable Id="WixUIBannerBmp" Value="banner.bmp"/>')
+ print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>')
+ print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>')
# print(r' <WixVariable Id="WixUIDialogBmp"
Value="backgroundRipple.bmp"/>')
print(r' <Property Id="INSTALLDIR">')
print(r' <RegistrySearch Id="MonetDBRegistry"
Key="Software\[Manufacturer]\[ProductName]" Name="InstallPath" Root="HKLM"
Type="raw"/>')
@@ -99,10 +106,9 @@ def main():
print(r' <Property Id="ApplicationFolderName" Value="MonetDB"/>')
print(r' <Property Id="WixAppFolder" Value="WixPerMachineFolder"/>')
print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>')
- print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
+ print(r' <Property Id="ARPPRODUCTICON" Value="share\monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
@@ -195,7 +201,7 @@ def main():
r'share\doc\MonetDB-SQL\dump-restore.txt'],
vital = 'no')
id = comp(features, id, 18,
- [r'website.html'],
+ [r'share\website.html'],
name = 'MonetDB Web Site',
sid = 'website_html',
vital = 'no')
@@ -203,7 +209,7 @@ def main():
print(r' </Directory>')
print(r' </Directory>')
id = comp(features, id, 12,
- [r'license.rtf',
+ [r'share\license.rtf',
r'M5server.bat',
r'msqldump.bat'])
id = comp(pyapi3, id, 12,
@@ -259,7 +265,7 @@ def main():
print(r' </Feature>')
print(r' <UIRef Id="WixUI_Mondo"/>')
print(r' <UIRef Id="WixUI_ErrorProgressText"/>')
- print(r' <Icon Id="monetdb.ico" SourceFile="monetdb.ico"/>')
+ print(r' <Icon Id="monetdb.ico" SourceFile="share\monetdb.ico"/>')
print(r' </Product>')
print(r'</Wix>')
diff --git a/buildtools/selinux/monetdb.fc b/buildtools/selinux/monetdb.fc
deleted file mode 100644
--- a/buildtools/selinux/monetdb.fc
+++ /dev/null
@@ -1,15 +0,0 @@
-/usr/bin/monetdbd --
gen_context(system_u:object_r:monetdbd_exec_t,s0)
-/usr/bin/mserver5 --
gen_context(system_u:object_r:mserver5_exec_t,s0)
-/usr/lib/systemd/system/monetdbd.*
gen_context(system_u:object_r:monetdbd_unit_file_t,s0)
-/var/log/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_log_t,s0)
-# for some reason we cannot use /run/monetdb here, even though that is the
real name
-/var/run/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
-# database "farm"
-/var/monetdb5/dbfarm(/.*)?
gen_context(system_u:object_r:mserver5_db_t,s0)
-/var/monetdb5/dbfarm/\.merovingian_properties --
gen_context(system_u:object_r:monetdbd_etc_t,s0)
-/var/monetdb5/dbfarm/\.merovingian_lock --
gen_context(system_u:object_r:monetdbd_lock_t,s0)
-/var/monetdb5/dbfarm/.*/\.gdk_lock --
gen_context(system_u:object_r:mserver5_lock_t,s0)
-/var/lib/monetdb(/.*)?
gen_context(system_u:object_r:mserver5_db_t,s0)
-/var/lib/monetdb/\.merovingian_properties --
gen_context(system_u:object_r:monetdbd_etc_t,s0)
-/var/lib/monetdb/\.merovingian_lock --
gen_context(system_u:object_r:monetdbd_lock_t,s0)
-/var/lib/monetdb/.*/\.gdk_lock --
gen_context(system_u:object_r:mserver5_lock_t,s0)
diff --git a/buildtools/selinux/monetdb.if b/buildtools/selinux/monetdb.if
deleted file mode 100644
--- a/buildtools/selinux/monetdb.if
+++ /dev/null
@@ -1,1 +0,0 @@
-## <summary></summary>
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
deleted file mode 100644
--- a/buildtools/selinux/monetdb.te
+++ /dev/null
@@ -1,150 +0,0 @@
-policy_module(monetdb, 1.0)
-# 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
-
-# Declare the system types and classes we're using.
-require {
- type proc_net_t;
- type tmp_t;
- type var_t;
- type var_lib_t;
- type user_home_t;
- type user_home_dir_t;
- type unconfined_service_t; # for EPEL 7
- type proc_t; # for EPEL 7
- type cgroup_t;
- class dir { read };
- class fd { use };
- class fifo_file { getattr read write };
- class file { entrypoint execute getattr manage_file_perms map open read
};
- class netlink_selinux_socket create_socket_perms;
- class process { rlimitinh siginh signal sigchld sigkill transition };
- class tcp_socket create_stream_socket_perms;
- class udp_socket create_stream_socket_perms;
- class unix_dgram_socket create_socket_perms;
- class unix_stream_socket { connectto create_stream_socket_perms getopt
read shutdown write };
-}
-
-# First, we declare the monetdbd_t domain, used for the "monetdbd"
-# process. Because it is launched by systemd, we tell the policy that
-# monetdbd_exec_t (the context of monetdbd), when launched by systemd,
-# should transition to monetdbd_t.
-type monetdbd_t; # monetdbd when run by systemd
-type monetdbd_exec_t; # /usr/bin/monetdbd
-init_daemon_domain(monetdbd_t, monetdbd_exec_t)
-
-# monetdbd_t must be allowed to execute mserver5 which has context
-# mserver5_exec_t which must then transition to the mserver5_t domain
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
