openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2021
- 1 participants
- 2461 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nextcloud for openSUSE:Factory checked in at 2021-12-01 20:47:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nextcloud (Old)
and /work/SRC/openSUSE:Factory/.nextcloud.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud"
Wed Dec 1 20:47:05 2021 rev:67 rq:934987 version:23.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nextcloud/nextcloud.changes 2021-11-17 01:15:36.734191697 +0100
+++ /work/SRC/openSUSE:Factory/.nextcloud.new.31177/nextcloud.changes 2021-12-02 02:18:37.581994887 +0100
@@ -1,0 +2,6 @@
+Tue Nov 30 13:56:51 UTC 2021 - ecsos <ecsos(a)opensuse.org>
+
+- Update to 23.0.0
+ - No changelog from upstream at this time.
+
+-------------------------------------------------------------------
Old:
----
nextcloud-22.2.3.tar.bz2
New:
----
nextcloud-23.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nextcloud.spec ++++++
--- /var/tmp/diff_new_pack.xkMWxA/_old 2021-12-02 02:18:38.541991538 +0100
+++ /var/tmp/diff_new_pack.xkMWxA/_new 2021-12-02 02:18:38.545991524 +0100
@@ -47,7 +47,7 @@
%endif
Name: nextcloud
-Version: 22.2.3
+Version: 23.0.0
Release: 0
Summary: File hosting service
License: AGPL-3.0-only
@@ -138,7 +138,7 @@
BuildRequires: apache2 >= 2.4
Requires: %{name} = %{version}
Requires: apache2
-Requires: mod_php_any < 7.5.0
+Requires: mod_php_any < 8.1.0
Requires: mod_php_any >= 7.3.0
Supplements: packageand(apache2:%name)
++++++ nextcloud-22.2.3.tar.bz2 -> nextcloud-23.0.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/nextcloud/nextcloud-22.2.3.tar.bz2 /work/SRC/openSUSE:Factory/.nextcloud.new.31177/nextcloud-23.0.0.tar.bz2 differ: char 11, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package neovim for openSUSE:Factory checked in at 2021-12-01 20:47:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/neovim (Old)
and /work/SRC/openSUSE:Factory/.neovim.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neovim"
Wed Dec 1 20:47:08 2021 rev:40 rq:935013 version:0.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2021-11-18 10:34:43.775957429 +0100
+++ /work/SRC/openSUSE:Factory/.neovim.new.31177/neovim.changes 2021-12-02 02:18:32.026014269 +0100
@@ -1,0 +2,70 @@
+Tue Nov 30 18:22:24 UTC 2021 - Matej Cepl <mcepl(a)suse.com>
+
+- Update to 0.6.0 (details on
+ - Diagnostics and LSP changes
+ Initially, diagnostic module is part of vim.lsp module. In
+ order to support external plugins such as null-ls.nvim, the
+ nvim team has refactor the diagnostic module to its module
+ vim.diagnostic. So we need to change our config accordingly.
+
+ vim.lsp.diagnostic.show_line_diagnostics() has been changed
+ to vim.diagnostic.open_float(). Previously, there is no easy
+ to show diagnostic source unless with some hack, you can now
+ show source in diagnostics in open_float() easily:
+
+ vim.diagnostic.open_float(nil, {
+ source = 'always'
+ })
+
+ vim.lsp.diagnostic.goto_prev() and
+ vim.lsp.diagnostic.goto_next() has been renamed to
+ vim.diagnostic.goto_prev() and vim.diagnostic.goto_next()
+ respectively.
+
+ vim.lsp.diagnostic.set_loclist() and
+ vim.lsp.diagnostic.set_qflist() has been renamed to
+ vim.diagnostic.setloclist() and vim.diagnostic.setqflist()
+ instead.
+
+ Diagnostics signs has been renamed, for example (old ���> new):
+ LspDiagnosticsSignError ���> DiagnosticSignError (Lsp is
+ removed, Diagnostics is changed to singular from
+ Diagnostic)
+ LspDiagnosticsSignWarning ���> DiagnosticSignWarn
+ LspDiagnosticsSignInformation ���> DiagnosticSignInfo
+ LspDiagnosticsSignHint ���> DiagnosticSignHint
+
+ Also, related highlight has been renamed too:
+ DiagnosticsDefaultError ���> DiagnosticSignError
+ DiagnosticsDefaultWarning ���> DiagnosticSignWarn
+ DiagnosticsDefaultInformation ���> DiagnosticSignInfo
+ DiagnosticsDefaultHint ���> DiagnosticSignHint
+
+ Now, we can use the following lua snippet to change diagnostic signs:
+
+ vim.fn.sign_define("DiagnosticSignError",
+ { text = "���", texthl = "DiagnosticSignError" })
+ vim.fn.sign_define("DiagnosticSignWarn",
+ { text = "!", texthl = "DiagnosticSignWarn" })
+ vim.fn.sign_define("DiagnosticSignInformation",
+ { text = "���", texthl = "DiagnosticSignInfo" })
+ vim.fn.sign_define("DiagnosticSignHint",
+ { text = "���", texthl = "DiagnosticSignHint" })
+
+ - Changes to the default
+ There are also changes to options and mappings that you might
+ be interested.
+
+ Option default value changes:
+ - backupdir can now be created automatically and double
+ backslash is used, see this commit.
+ - option inccommand is set to nosplit
+ - set nojoinspaces by default
+
+ Mapping changes:
+ - <C-L> now defaults to nohlsearch and diffupdate
+ - In normal mode, Y is mapped to y$, see this commit, no
+ need for nnoremap Y y$ anymore.
+- Remove upstreamed patch vim7188-fix-netrw-command.patch.
+
+-------------------------------------------------------------------
Old:
----
neovim-0.5.1.tar.gz
vim7188-fix-netrw-command.patch
New:
----
neovim-0.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ neovim.spec ++++++
--- /var/tmp/diff_new_pack.w6G7dm/_old 2021-12-02 02:18:32.502012609 +0100
+++ /var/tmp/diff_new_pack.w6G7dm/_new 2021-12-02 02:18:32.506012594 +0100
@@ -26,7 +26,7 @@
%define luaver 5.1
%define luaver_nopoint 51
Name: neovim
-Version: 0.5.1
+Version: 0.6.0
Release: 0
Summary: Vim-fork focused on extensibility and agility
License: Apache-2.0 AND Vim
@@ -41,9 +41,6 @@
Patch0: neovim.patch
# PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mcepl(a)cepl.eu build with old Lua with external bit module
Patch1: neovim-0.1.7-bitop.patch
-# PATCH-FIX-UPSTREAM vim7188-fix-netrw-command.patch gh#vim/vim#4738 mcepl(a)suse.com
-# make gx in netrw working again
-Patch2: vim7188-fix-netrw-command.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -82,9 +79,9 @@
# luajit implements version 5.1 of the lua language spec, so it needs the
# compat versions of libs.
BuildRequires: lua51-LPeg
+BuildRequires: libluv-devel >= %{luv_min_ver}
BuildRequires: lua51-bit32
BuildRequires: lua51-luarocks
-BuildRequires: libluv-devel >= %{luv_min_ver}
BuildRequires: lua51-luv >= %{luv_min_ver}
BuildRequires: lua51-mpack
Requires: lua51-bit32
@@ -115,7 +112,6 @@
# %%if %%{without luajit}
%patch1 -p1
# %%endif
-%patch2 -p1
# Remove __DATE__ and __TIME__.
BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
++++++ neovim-0.5.1.tar.gz -> neovim-0.6.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/neovim/neovim-0.5.1.tar.gz /work/SRC/openSUSE:Factory/.neovim.new.31177/neovim-0.6.0.tar.gz differ: char 13, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package munin for openSUSE:Factory checked in at 2021-12-01 20:46:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/munin (Old)
and /work/SRC/openSUSE:Factory/.munin.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "munin"
Wed Dec 1 20:46:18 2021 rev:26 rq:934674 version:2.0.66
Changes:
--------
--- /work/SRC/openSUSE:Factory/munin/munin.changes 2021-10-31 22:56:15.247726464 +0100
+++ /work/SRC/openSUSE:Factory/.munin.new.31177/munin.changes 2021-12-02 02:18:25.082038493 +0100
@@ -1,0 +2,9 @@
+Mon Nov 29 15:46:03 UTC 2021 - Johannes Segitz <jsegitz(a)suse.com>
+
+- Removed
+ * PrivateDevices=true
+ * ProtectClock=true
+ * RestrictRealtime=true
+ from munin-node.service (bsc#1193118)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ munin-node.service ++++++
--- /var/tmp/diff_new_pack.M1gg4X/_old 2021-12-02 02:18:25.726036247 +0100
+++ /var/tmp/diff_new_pack.M1gg4X/_new 2021-12-02 02:18:25.730036232 +0100
@@ -7,14 +7,11 @@
# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
ProtectSystem=full
ProtectHome=true
-PrivateDevices=true
ProtectHostname=true
-ProtectClock=true
ProtectKernelTunables=true
ProtectKernelModules=true
ProtectKernelLogs=true
ProtectControlGroups=true
-RestrictRealtime=true
# end of automatic additions
Type=forking
ExecStart=/usr/sbin/munin-node
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mtools for openSUSE:Factory checked in at 2021-12-01 20:46:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mtools (Old)
and /work/SRC/openSUSE:Factory/.mtools.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtools"
Wed Dec 1 20:46:46 2021 rev:57 rq:934480 version:4.0.36
Changes:
--------
--- /work/SRC/openSUSE:Factory/mtools/mtools.changes 2021-08-18 08:55:07.631027335 +0200
+++ /work/SRC/openSUSE:Factory/.mtools.new.31177/mtools.changes 2021-12-02 02:18:22.846046293 +0100
@@ -1,0 +2,11 @@
+Sat Nov 27 13:11:48 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 4.0.36:
+ * Fix error status of recursive listing of empty root directory
+ * If recursive listing, also show matched files at level one
+ * Use "seekless" reads & write internally, where possible
+ * Text mode conversion refactoring
+ * Misc refactoring
+- remove mtools-aliasing.diff (obsolete)
+
+-------------------------------------------------------------------
Old:
----
mtools-4.0.35.tar.bz2
mtools-4.0.35.tar.bz2.sig
mtools-aliasing.diff
New:
----
mtools-4.0.36.tar.bz2
mtools-4.0.36.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mtools.spec ++++++
--- /var/tmp/diff_new_pack.Rl7v12/_old 2021-12-02 02:18:23.270044814 +0100
+++ /var/tmp/diff_new_pack.Rl7v12/_new 2021-12-02 02:18:23.270044814 +0100
@@ -17,18 +17,17 @@
Name: mtools
-Version: 4.0.35
+Version: 4.0.36
Release: 0
Summary: Tools to access MS-DOS filesystems without kernel drivers
License: GPL-3.0-or-later
Group: System/Filesystems
-URL: http://mtools.linux.lu/
+URL: https://www.gnu.org/software/mtools/
Source0: https://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2
Source1: https://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2.sig
# https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=mtools
Source2: %{name}.keyring
Patch0: %{name}-conf.diff
-Patch3: %{name}-aliasing.diff
Patch5: %{name}-prototypes.diff
BuildRequires: makeinfo
BuildRequires: texinfo
@@ -54,7 +53,6 @@
%prep
%setup -q
%patch0
-%patch3
%patch5 -p1
%build
++++++ mtools-4.0.35.tar.bz2 -> mtools-4.0.36.tar.bz2 ++++++
++++ 3671 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mousepad for openSUSE:Factory checked in at 2021-12-01 20:47:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mousepad (Old)
and /work/SRC/openSUSE:Factory/.mousepad.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mousepad"
Wed Dec 1 20:47:24 2021 rev:12 rq:934936 version:0.5.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/mousepad/mousepad.changes 2021-09-25 22:51:36.435361536 +0200
+++ /work/SRC/openSUSE:Factory/.mousepad.new.31177/mousepad.changes 2021-12-02 02:18:17.226065898 +0100
@@ -1,0 +2,21 @@
+Mon Nov 29 09:45:08 UTC 2021 - Marcel Kuehlhorn <tux93(a)opensuse.org>
+
+- Update to version 0.5.8
+ * Revert "Chain-up to parent in `mousepad_window_scroll_event()`"
+ (gxo#apps/mousepad#150)
+ * Search: Fix a memory leak
+ * Search: Remove obsolete workaround for the document finalization
+ * Drop restrictions on URI scheme
+ * Update `POTFILES.in`
+ * Printing: Remove the "Page Setup" dialog (gxo#apps/mousepad#148)
+ * Flatpak: Complete scripts
+ * Flatpak: Access remote locations with GVfs
+ * Search: Fix the history cleanup
+ * Search: Prevent GTask warnings when replacing text
+ * Search: Ensure settings synchronization before searching
+ * Fix translation domain in Appdata file
+ * flatpak: Update README
+ * flatpak: Add generic manifest and basic scripts
+ * Translation Updates
+
+-------------------------------------------------------------------
Old:
----
mousepad-0.5.7.tar.bz2
New:
----
mousepad-0.5.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mousepad.spec ++++++
--- /var/tmp/diff_new_pack.GhBLXW/_old 2021-12-02 02:18:17.606064572 +0100
+++ /var/tmp/diff_new_pack.GhBLXW/_new 2021-12-02 02:18:17.610064559 +0100
@@ -18,7 +18,7 @@
%define libname libmousepad0
Name: mousepad
-Version: 0.5.7
+Version: 0.5.8
Release: 0
Summary: Simple Text Editor for Xfce
License: GPL-2.0-or-later
++++++ mousepad-0.5.7.tar.bz2 -> mousepad-0.5.8.tar.bz2 ++++++
++++ 23281 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package motion for openSUSE:Factory checked in at 2021-12-01 20:47:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/motion (Old)
and /work/SRC/openSUSE:Factory/.motion.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "motion"
Wed Dec 1 20:47:14 2021 rev:12 rq:934871 version:4.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/motion/motion.changes 2021-11-02 19:19:45.975111652 +0100
+++ /work/SRC/openSUSE:Factory/.motion.new.31177/motion.changes 2021-12-02 02:18:15.350072442 +0100
@@ -1,0 +2,38 @@
+Sun Nov 28 13:15:58 UTC 2021 - Jonas Kvinge <jonaski(a)opensuse.org>
+
+- Update to 4.4.0:
+ * Fixes
+ + Use default for non ASCII characters in drawing
+ + Maximum movie time
+ + Guide updates
+ * Enhancements
+ + Updated translations
+ + Lockout on failed authentications
+ + Hardware decoding for some network cameras
+ + User specification of ffmpeg options for network cameras
+ + Change default processing for http cameras.
+ * New Configuration Options
+ + watchdog_tmo
+ + watchdog_kill
+ + pause
+ + webcontrol_lock_minutes
+ + webcontrol_lock_attempts
+ + webcontrol_lock_max_ips
+ * Renamed Configuration Options
+ + vid_control_params -> video_params
+ + mmalcam_control_params -> mmalcam_params
+ * Changed Configuration Options
+ + v4l2_palette use video_params
+ + input use video_params
+ + norm use video_params
+ + frequency use video_params
+ + netcam_highres use netcam_high_params
+ + netcam_keepalive use netcam_params
+ + netcam_proxy use netcam_params
+ + netcam_tolerant_check use netcam_params
+ + netcam_use_tcp use netcam_params
+ + netcam_decoder use netcam_params
+ + webcontrol_cors_header use webcontrol_header_params
+ + stream_cors_header use stream_header_params
+
+-------------------------------------------------------------------
Old:
----
release-4.3.2.tar.gz
New:
----
release-4.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ motion.spec ++++++
--- /var/tmp/diff_new_pack.tSRVtd/_old 2021-12-02 02:18:16.214069429 +0100
+++ /var/tmp/diff_new_pack.tSRVtd/_new 2021-12-02 02:18:16.218069414 +0100
@@ -1,7 +1,7 @@
#
# spec file for package motion
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define spooldir /var/spool/motion
Name: motion
-Version: 4.3.2
+Version: 4.4.0
Release: 0
Summary: A motion detection system
License: GPL-2.0-or-later
@@ -118,7 +118,7 @@
%files
%doc doc/CHANGELOG doc/CREDITS README.md doc/*.png doc/*.html doc/*.jpg
-%license doc/COPYING
+%license LICENSE
%dir %{_sysconfdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/examples
++++++ release-4.3.2.tar.gz -> release-4.4.0.tar.gz ++++++
++++ 62320 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package monitoring-plugins-nwc_health for openSUSE:Factory checked in at 2021-12-01 20:47:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-nwc_health"
Wed Dec 1 20:47:38 2021 rev:17 rq:935036 version:10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health/monitoring-plugins-nwc_health.changes 2021-11-22 23:04:49.337803536 +0100
+++ /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.31177/monitoring-plugins-nwc_health.changes 2021-12-02 02:18:13.106080270 +0100
@@ -1,0 +2,6 @@
+Wed Nov 24 18:58:47 CET 2021 - ro(a)suse.de
+
+- add dependencies to perl-JSON, perl-JSON-XS, perl-File-Slurp
+ to prevent errors
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-nwc_health.spec ++++++
--- /var/tmp/diff_new_pack.G9YyqB/_old 2021-12-02 02:18:13.566078666 +0100
+++ /var/tmp/diff_new_pack.G9YyqB/_new 2021-12-02 02:18:13.570078652 +0100
@@ -35,6 +35,9 @@
Obsoletes: nagios-plugins-nwc_health < %{version}-%{release}
Requires: perl-Nagios-Plugin
Requires: perl-Net-SNMP
+Requires: perl(File::Slurp)
+Requires: perl(JSON)
+Requires: perl(JSON::XS)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package matrix-synapse for openSUSE:Factory checked in at 2021-11-30 23:16:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/matrix-synapse (Old)
and /work/SRC/openSUSE:Factory/.matrix-synapse.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "matrix-synapse"
Tue Nov 30 23:16:07 2021 rev:49 rq:934737 version:1.48.0
Mon Nov 29 17:28:30 2021 rev:48 rq:934407 version:1.47.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse.changes 2021-11-23 22:13:07.158372131 +0100
+++ /work/SRC/openSUSE:Factory/.matrix-synapse.new.31177/matrix-synapse.changes 2021-12-02 02:17:55.378142114 +0100
@@ -1,0 +2,128 @@
+Tue Nov 30 14:59:49 UTC 2021 - Marcus Rueckert <mrueckert(a)suse.de>
+
+- Update to 1.48.0
+ This release removes support for the long-deprecated
+ trust_identity_server_for_password_resets configuration flag.
+ This release also fixes some performance issues with some
+ background database updates introduced in Synapse 1.47.0.
+ - Features
+ - Experimental support for the thread relation defined in
+ MSC3440. (#11161)
+ - Support filtering by relation senders & types per MSC3440.
+ (#11236)
+ - Add support for the /_matrix/client/v3 and /_matrix/media/v3
+ APIs from Matrix v1.1. (#11318, #11371)
+ - Support the stable version of MSC2778: the
+ m.login.application_service login type. Contributed by
+ @tulir. (#11335)
+ - Add a new version of delete room admin API DELETE
+ /_synapse/admin/v2/rooms/<room_id> to run it in the
+ background. Contributed by @dklimpel. (#11223)
+ - Allow the admin Delete Room API to block a room without the
+ need to join it. (#11228)
+ - Add an admin API to un-shadow-ban a user. (#11347)
+ - Add an admin API to run background database schema updates.
+ (#11352)
+ - Add an admin API for blocking a room. (#11324)
+ - Update the JWT login type to support custom a sub claim.
+ (#11361)
+ - Store and allow querying of arbitrary event relations.
+ (#11391)
+ - Bugfixes
+ - Fix a long-standing bug wherein display names or avatar URLs
+ containing null bytes cause an internal server error when
+ stored in the DB. (#11230)
+ - Prevent MSC2716 historical state events from being pushed to
+ an application service via /transactions. (#11265)
+ - Fix a long-standing bug where uploading extremely thin images
+ (e.g. 1000x1) would fail. Contributed by @Neeeflix. (#11288)
+ - Fix a bug, introduced in Synapse 1.46.0, which caused the
+ check_3pid_auth and on_logged_out callbacks in legacy
+ password authentication provider modules to not be
+ registered. Modules using the generic module interface were
+ not affected. (#11340)
+ - Fix a bug introduced in 1.41.0 where space hierarchy
+ responses would be incorrectly reused if multiple users were
+ to make the same request at the same time. (#11355)
+ - Fix a bug introduced in 1.45.0 where the read_templates
+ method of the module API would error. (#11377)
+ - Fix an issue introduced in 1.47.0 which prevented servers
+ re-joining rooms they had previously left, if their signing
+ keys were replaced. (#11379)
+ - Fix a bug introduced in 1.13.0 where creating and publishing
+ a room could cause errors if room_list_publication_rules is
+ configured. (#11392)
+ - Improve performance of various background database updates.
+ (#11421, #11422)
+ - Improved Documentation
+ - Suggest users of the Debian packages add configuration to
+ /etc/matrix-synapse/conf.d/ to prevent, upon upgrade, being
+ asked to choose between their configuration and the
+ maintainer's. (#11281)
+ - Fix typos in the documentation for the username_available
+ admin API. Contributed by Stanislav Motylkov. (#11286)
+ - Add Single Sign-On, SAML and CAS pages to the documentation.
+ (#11298)
+ - Change the word 'Home server' as one word 'homeserver' in
+ documentation. (#11320)
+ - Fix missing quotes for wildcard domains in
+ federation_certificate_verification_whitelist. (#11381)
+ - Deprecations and Removals
+ - Remove deprecated trust_identity_server_for_password_resets
+ configuration flag. (#11333, #11395)
+ - Internal Changes
+ - Add type annotations to synapse.metrics. (#10847)
+ - Split out federated PDU retrieval function into a non-cached
+ version. (#11242)
+ - Clean up code relating to to-device messages and sending
+ ephemeral events to application services. (#11247)
+ - Fix a small typo in the error response when a relation type
+ other than 'm.annotation' is passed to GET
+ /rooms/{room_id}/aggregations/{event_id}. (#11278)
+ - Drop unused database tables room_stats_historical and
+ user_stats_historical. (#11280)
+ - Require all files in synapse/ and tests/ to pass mypy unless
+ specifically excluded. (#11282, #11285, #11359)
+ - Add missing type hints to synapse.app. (#11287)
+ - Remove unused parameters on
+ FederationEventHandler._check_event_auth. (#11292)
+ - Add type hints to synapse._scripts. (#11297)
+ - Fix an issue which prevented the
+ remove_deleted_devices_from_device_inbox background database
+ schema update from running when updating from a recent
+ Synapse version. (#11303)
+ - Add type hints to storage classes. (#11307, #11310, #11311,
+ #11312, #11313, #11314, #11316, #11322, #11332, #11339,
+ #11342)
+ - Add type hints to synapse.util. (#11321, #11328)
+ - Improve type annotations in Synapse's test suite. (#11323,
+ #11330)
+ - Test that room alias deletion works as intended. (#11327)
+ - Add type annotations for some methods and properties in the
+ module API. (#11341)
+ - Fix running scripts-dev/complement.sh, which was broken in
+ v1.47.0rc1. (#11368)
+ - Rename internal functions for token generation to better
+ reflect what they do. (#11369, #11370)
+ - Add type hints to configuration classes. (#11377)
+ - Publish a develop image to Docker Hub. (#11380)
+ - Keep fallback key marked as used if it's re-uploaded.
+ (#11382)
+ - Use auto_attribs on the attrs class RefreshTokenLookupResult.
+ (#11386)
+ - Rename unstable access_token_lifetime configuration option to
+ refreshable_access_token_lifetime to make it clear it only
+ concerns refreshable access tokens. (#11388)
+ - Do not run the broken MSC2716 tests when running
+ scripts-dev/complement.sh. (#11389)
+ - Remove dead code from supporting ACME. (#11393)
+ - Refactor including the bundled relations when serializing an
+ event. (#11408)
+
+-------------------------------------------------------------------
+Sun Nov 28 18:35:03 UTC 2021 - Marcus Rueckert <mrueckert(a)suse.de>
+
+- bump ijson to make it clear that we really need 3.1
+ https://github.com/matrix-org/synapse/pull/11439
+
+-------------------------------------------------------------------
Old:
----
matrix-synapse-1.47.1.obscpio
New:
----
matrix-synapse-1.48.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ matrix-synapse-test.spec ++++++
--- /var/tmp/diff_new_pack.vSEEvw/_old 2021-12-02 02:17:56.122139518 +0100
+++ /var/tmp/diff_new_pack.vSEEvw/_new 2021-12-02 02:17:56.126139505 +0100
@@ -27,7 +27,7 @@
%define pkgname matrix-synapse
Name: %{pkgname}-test
-Version: 1.47.1
+Version: 1.48.0
Release: 0
Summary: Test package for %{pkgname}
License: Apache-2.0
++++++ matrix-synapse.spec ++++++
--- /var/tmp/diff_new_pack.vSEEvw/_old 2021-12-02 02:17:56.146139434 +0100
+++ /var/tmp/diff_new_pack.vSEEvw/_new 2021-12-02 02:17:56.150139420 +0100
@@ -47,7 +47,7 @@
%define pkgname matrix-synapse
%define eggname matrix_synapse
Name: %{pkgname}
-Version: 1.47.1
+Version: 1.48.0
Release: 0
Summary: Matrix protocol reference homeserver
License: Apache-2.0
@@ -104,7 +104,7 @@
%requires_eq %{use_python}-frozendict
BuildRequires: %{use_python}-idna >= 2.5
%requires_eq %{use_python}-idna
-BuildRequires: %{use_python}-ijson >= 3.0
+BuildRequires: %{use_python}-ijson >= 3.1
%requires_eq %{use_python}-ijson
BuildRequires: %{use_python}-jsonschema >= 3.0.0
%requires_eq %{use_python}-jsonschema
++++++ _service ++++++
--- /var/tmp/diff_new_pack.vSEEvw/_old 2021-12-02 02:17:56.186139295 +0100
+++ /var/tmp/diff_new_pack.vSEEvw/_new 2021-12-02 02:17:56.186139295 +0100
@@ -4,11 +4,11 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">https://github.com/matrix-org/synapse.git</param>
<param name="scm">git</param>
- <param name="revision">v1.47.1</param>
+ <param name="revision">v1.48.0</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<!--
- <param name="revision">v1.48.0rc1</param>
+ <param name="revision">v1.49.0rc1</param>
<param name="versionrewrite-pattern">v([\.\d]+)(rc.*)</param>
<param name="versionrewrite-replacement">\1~\2</param>
-->
++++++ matrix-synapse-1.47.1.obscpio -> matrix-synapse-1.48.0.obscpio ++++++
/work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse-1.47.1.obscpio /work/SRC/openSUSE:Factory/.matrix-synapse.new.31177/matrix-synapse-1.48.0.obscpio differ: char 49, line 1
++++++ matrix-synapse.obsinfo ++++++
--- /var/tmp/diff_new_pack.vSEEvw/_old 2021-12-02 02:17:56.246139086 +0100
+++ /var/tmp/diff_new_pack.vSEEvw/_new 2021-12-02 02:17:56.246139086 +0100
@@ -1,5 +1,5 @@
name: matrix-synapse
-version: 1.47.1
-mtime: 1637347213
-commit: 8fa83999d688bb4c1747f2237002422e566e085f
+version: 1.48.0
+mtime: 1638272886
+commit: e713855dca17a7605bae99ea8d71bc7f8657e4b8
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package matomo for openSUSE:Factory checked in at 2021-12-01 20:47:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/matomo (Old)
and /work/SRC/openSUSE:Factory/.matomo.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "matomo"
Wed Dec 1 20:47:07 2021 rev:34 rq:934911 version:4.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/matomo/matomo.changes 2021-10-08 00:07:04.581857667 +0200
+++ /work/SRC/openSUSE:Factory/.matomo.new.31177/matomo.changes 2021-12-02 02:17:52.402152496 +0100
@@ -1,0 +2,147 @@
+Wed Dec 1 06:21:11 UTC 2021 - ecsos <ecsos(a)opensuse.org>
+
+- Update to 4.6.1
+ - In this release there is no code change but a change to the
+ "Manifest File integrity list" to prevent a warning in the
+ System check for some users.
+
+-------------------------------------------------------------------
+Tue Nov 30 08:42:01 UTC 2021 - ecsos <ecsos(a)opensuse.org>
+
+- Update to 4.6.0
+ * matomo-org/matomo
+ - #6784 Dashboard shows proportional evolution comparison for incomplete periods (rather than absolute values)
+ - #3883 Row Evolution, Support Per-Goals and Ecommerce metrics: conversions, conversion rate, revenue and total revenue
+ - #6032 Transitions reports: export full data as XML/JSON
+ - #10291 Show difference in graphs for data of ���unfinished periods��� and ���complete periods���
+ - #14370 Remember ���Rows to display��� user preference for Evolution graphs
+ - #17976 Scheduled tasks should not launch archiving
+ - #8444 Ensure that the archive algorithm cannot be triggered multiple times for a same site/period/segment
+ - #11627 JavaScript Tracker: Add possibility to set URL parameters to ignore
+ - #18186 Improve in-app feedback mechanism to gain insight from users about pain points
+ - #18036 Optimise ecommerce life time metric query
+ - #18079 Make error messages not leak potentially sensitive information when tracker db connection fails
+ - #18244 Ensure DNS records are only requested for IP allowlist when needed
+ - #18232 Remove ���refer us��� feature
+ - #18250 Remove review popup
+ - #18251 Collect feedback about what features people are using?
+ - #3513 Column names could stick to the top of screen when scrolling down report tables
+ - #16607 More verbose error message when login nonce check fails
+ - #18164 Install routine: Fix text contrast for accessibility
+ - #17589 Add config option to disable http requests in System Checks to prevent server crashes with mod_security
+ - #17856 [database_tests] section no longer generated when executing php tests
+ - #18133 JSONp API request (with callback) strips first and last character from result
+ - #18178 Fix segment creation fails when enable_create_realtime_segments = 0
+ - #18313 Newsletter Signup in personal settings, mention Matomo privacy policy applies
+ - #17815 Improve UI of report info icon to show report generation time and help message
+ - #18058 Add system check for 32 bit PHP / OS
+ - #18070 New console command ���marketplace:add-license-key��� which adds a marketplace license key
+ - #18107 Add more granular access control for segment creation
+ - #18162 Close Tooltip when redirecting to another page
+ - #18152 Improve performance of Process::isSupported by caching it
+ - #18157 Make cli archiving faster if only one concurrent request per website is configured
+ - #18172 Fix initial export option values so checkbox shows correct value
+ - #18211 Updates davaxi/sparkline to 2.0 to PHP8.1 compatible version
+ - #18215 Fix CSP issue when viewing marketplace plugin details
+ - #15429 Mention guides for Wix, WordPress, SquareSpace, Sharepoint in the ���No data��� email and in the ���Tracking code��� pag
+ - #17602 Fix 2-lines label overflows the input
+ - #17786 Install routine: language changer line height improvements
+ - #11175 Improve help text on ���Users��� report when no data
+ - #17010 When ���average generation time��� is zero, hide the sparkline and ���Avg generation time��� graphs metric from picker
+ - #17890 Remove ���add new segment��� selector in segment editor
+ - #17996 Manage Users: When user is admin, mention other users might exist
+ - #17973 Remove Provider and CustomVariables plugin from our core release
+ - #18011 Update list of no longer supported browsers (IE11)
+ - #17923 Make SecurityPolicy methods a public API and fully enable the CSP
+ - #16153 Tracking request may trigger a warning when providing an invalid regex
+ - #14695 Special character apostrophe is not getting printed properly in visits log (campaign url)
+ - #16067 Fix dashboard showing incorrect percentage on increases bigger than 1000%
+ - #17939 Include lox/xhprof in the Matomo build release so Profiling works
+ - #18019 Make the opt out work when a PHP 32 bit is used
+ - #18130 Fixed in place sorting order bug for PHP8+
+ - #18231 Fix annotations for ���Behaviour > Performance��� StackedBarEvolution charts
+ - #18267 Decode goal top dimension values
+ - #10550 Add field lastSeen in the API for the UsersManager
+ - #17916 Introduce new config setting to set a contact email address
+ - #17940 [Vue] Introduce Vue + Workflow commands
+ - #18071 Provide console command for adding a marketplace license key (#18070)
+ - #18074 Update container factory to allow for sorting plugins
+ - #18110 Use detachEvent when removeEventListener isn���t available
+ - #18123 Don���t browser archive when segment is set to be pre-processed
+ - #18137 Make the Twig cache template path more configurable with a DI entry
+ - #18149 Fix error cannot read property ���replace��� of undefined in quick search
+ - #18156 Small optimisations to Archiving performance
+ - #18166 [Vue] Migrate content-block, enriched-headline, rate-feature + related
+ - #18187 Fix possible problem with CSP in overlay feature
+ - #18193 [Vue] migrate comparisons service + component
+ - #18204 Always remove hash part from URL when detecting the script name
+ - #18213 [Vue] migrate date-picker and other period-selector related components
+ - #18214 [Vue] migrate dropdown and related directives
+ - #18225 [Vue] migrate notifications directive & service + UI.Notifications
+ - #18235 Changes to keep sorting order consistent across all PHP versions for Live.getLastVisitsDetails API
+ - #18241 Take archive TTL time into consideration for today when browser archiving is enabled
+ - #18255 Fix archiving too many segments that aren���t needed and showing 0 conversions for new visits/returning visitors
+ - #18263 Support downloading system tests from plugins
+ - #18278 Remove cache clearing from forget invalidations loop.
+ - #18300 Corrected paths mentioning ���piwik/��� to ���/path/to/matomo/���.
+ - #18309 Couple of fixes in QuickForm2 for PHP8.1 compatibility
+ * matomo-org/tag-manager
+ - #217 Enable Debugging mode without URL parameter
+ - #375 Right clicks trigger twice for ���All Links Click��� and ���All Elements Click��� in Firefox
+ - #378 Fix deprecation warning on PHP 8.1
+ * matomo-org/device-detector
+ - #5773 Add detection for Google Podcasts
+ - #6793 Improvements for the OS parser a second level of regular expressions has been added
+ - #6870 Detect devices for existing brands: Xiaomi, Samsung, Realme, Tecno Mobile, Mobicel, Vivo, Lenovo, ZTE,
+ OPPO, Oukitel, CUBOT, UMIDIGI, OnePlus, Ulefone, Doogee, TCL, Vivo, Vertex, Infinix, Kr��ger&Matz, Wiko, DEXP, BQ
+ - #6872 Detect new brand Nubia
+ - #6873 Detect new brands: Bluebird, Mara and Detect devices for existing brands: Kr��ger&Matz, iHunt, Sony, Teclast,
+ Tanix, Logicom, Nubia, Xiaomi, QMobile, DIXON, Zuum, Vodacom, Mobicel, Oukitel, Motorola, Stylo, Tecno Mobile,
+ Chuwi, OnePlus, Vivo, iTel, Doogee, Cat, Homtom, CUBOT, MLS, Blu, Casper, Unonu
+ - #6874 Detect new brands: BMAX, Geotex and Detect devices for existing brands: Telefunken, Asus, Huawei, Lenovo,
+ Tecno Mobile, Nomi, Coolpad, Blu, Navitel, Winnovo, Digiland, DEXP, Sony, Inoi, OPPO, Samsung, Xiaomi, LG, Vivo,
+ UMIDIGI, Mobicel, Teclast, Zuum
+ - #6877 Detect new brand: Rakuten and Detect devices for existing brands: Beelink, Sony, Blackview, Samsung,
+ NUU Mobile, Oukitel, Coolpad, LG, DEXP, Acer, ZTE, TCL, Mobicel, Contixo, BQ, ONYX BOOX, Mecer, Digma, Lenovo,
+ RCA Tablets, Intex, Huawei, Santin, Vivo, NOA, iTel, Sharp, Prestigio, HTC, OnePlus, Wiko, Fly, Meizu, Lava, Gionee
+ - #6878 detect the device type for other browsers (Huawei, Quark, MQQBrowser)
+ - #6879 Detect devices for existing brands: Vivo, Huawei, ZTE, Smartisan, Samsung, OPPO, HTC, Xiaolajiao, POCO, Xiaomi, Blu
+ - #6880 Adds detection for Apple iPhone 13 models
+ - #6881 Detect device type for chrome forks
+ - #6883 Detect devices for existing brands: Vivo, HTC, Hisense, Gionee, Huawei, Samsung, Realme, Blu, NOA
+ - #6885 Detect oss: Java ME, REX
+ - #6886 Detect new brand: DING DING and Detect devices for existing brands: Zopo, F2 Mobile, iBall, Kr��ger&Matz,
+ Hotwav, Orange, Tecno Mobile, Runbo, Vonino, M4tel, Kempler & Strauss, Rokit, Stylo, DEXP, Prestigio, Mobicel, Santin
+ - #6888 Detect devices for existing brands: X-TIGI, Prestigio, Micromax, LG, DEXP, Oukitel, Hurricane, Alcatel,
+ M4tel, Blackview, S-TELL, Coolpad, HTC, Teclast, Mecer, Huawei, Reeder, Orange, Mobicel, Realme, NUU Mobile,
+ Xiaomi, Huawei, Hisense, Zuum, Kr��ger&Matz, Motorola
+ - #6889 Adds detection for GitHub Desktop and Logi Options+ apps
+ - #6890 Adds detection for Bonsai, Peeps dBrowser, Flash, Harman, Lagatos, LT, PSI, Spectre and Sushi Browsers
+ - #6891 Adds detection for Roku OS
+ - #6892 Adds detection for OpenWrt OS and uclient-fetch library
+ - #6894 Adds detection for multiples apps and improves iOS, Windows, iPhone, iPod detection
+ - #6895 Detect devices for existing brands: Nubia, F150, Vivo, Huawei, Realme, Google, Oukitel, TCL, Packard Bell,
+ Xiaomi, Cube, Lenovo, OnePlus, iHunt, Proline, Reeder, Stylo, Hurricane, OPPO, Mobicel, Ugoos, Beeline, 4Good,
+ Teclast, K-Touch, Prestigio, Tecno Mobile, AllDocube, Ravoz, T-Mobile, DIXON, Motorola, Asus
+ - #6897 Detect new brands: Trident, SUNWIND, OKSI, Taiga System and Detect devices for existing brands: TechPad,
+ Santin, Realme, Meizu, Alcatel, Xiaomi, ONN, UMIDIGI, DEXP, Premio, Oukitel, Coolpad, Sky, Huawei, Stylo, Mobicel,
+ Casper, Infinix, TCL, Qumo
+ - #6899 Adds detection for Apple Watch Series 7
+ - #6900 Improves detection for Apple devices
+ - #6901 Improves detection for Hisense, Samsung and TCL devices
+ - #6902 Improves Android, iPadOS, iOS, macOS version detection
+ - #6903 Improves detection for iOS, iPadOS, macOS, Android, Windows, Apple, Motorola, Samsung and Sony brands,
+ and adds detection for Telco brand and various apps
+ - #6904 Adds detection for Cellution, Juniper Systems, Kazuna, Oculus, STRONG, Topelotek brands and improves detection for
+ Alcatel, Amazon, ANS, Kocaso, LG, Motorola, Sony, UMIDIGI brands
+ - #6905 Adds detection for various apps
+ - #6906 Detect new brands: Glofiish, Polar, MyGica and Detect devices for existing brands: Cavion, Stylo, Mobicel,
+ Hurricane, Proline, bq, Hisense, Archos, NOA, GOCLEVER, Blackview, Blu
+ - #6907 Adds detection for KRIP brand, improves detection for Alcatel, Blu, BMobile, Epik One, Gateway, Huawei, Hyundai,
+ IKU Mobile, MobiWire, MicroMax, Positivo, Safaricom, TCL, UMIDIGI, Vivo brands and improves detection for Opera GX,
+ Windows, x86, x64 platforms
+* matomo-org/matomo-php-tracker
+ - #97 Fix for double newline issue when a redirect is used
+ - #98 Couple of fixes for PHP 8.1
+
+-------------------------------------------------------------------
Old:
----
matomo-4.5.0.tar.gz
New:
----
matomo-4.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ matomo.spec ++++++
--- /var/tmp/diff_new_pack.VwG3Hz/_old 2021-12-02 02:17:53.002150402 +0100
+++ /var/tmp/diff_new_pack.VwG3Hz/_new 2021-12-02 02:17:53.002150402 +0100
@@ -21,7 +21,7 @@
%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d}
Name: matomo
-Version: 4.5.0
+Version: 4.6.1
Release: 0
Summary: Web analytics platform
License: GPL-3.0-or-later
@@ -118,12 +118,12 @@
#
# Fix integrity check triggered from fix of rpmlint errors.
# Drop moved files
-for i in CHANGELOG.md CONTRIBUTING.md PRIVACY.md README.md SECURITY.md LEGALNOTICE LICENSE 'misc\/cron\/.htaccess' 'misc\/How to install Matomo.html' 'vendor\/tecnickcom\/tcpdf\/tools\/.htaccess' 'vendor\/twig\/twig\/ext\/twig\/php_twig.h' 'vendor\/twig\/twig\/ext\/twig\/twig.c' 'js\/piwik.js.orig'
+for i in CHANGELOG.md CONTRIBUTING.md PRIVACY.md README.md SECURITY.md LEGALNOTICE LICENSE 'misc\/cron\/.htaccess' 'misc\/How to install Matomo.html' 'vendor\/tecnickcom\/tcpdf\/tools\/.htaccess' 'vendor\/twig\/twig\/ext\/twig\/php_twig.h' 'vendor\/twig\/twig\/ext\/twig\/twig.c' 'js\/piwik.js.orig' '.eslintignore' '.eslintrc.js' '.browserslistrc' 'vendor\/lox\/xhprof\/extension\/php_xhprof.h' 'vendor\/lox\/xhprof\/extension\/xhprof.c'
do
sed -i "/\W\"${i}\"\W/d" config/manifest.inc.php
done
# Insert new hashes for chanded files
-for file in console 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' 'vendor/wikimedia/less.php/bin/lessc' 'misc/log-analytics/import_logs.py'
+for file in console 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' 'vendor/wikimedia/less.php/bin/lessc' 'vendor/lox/xhprof/scripts/xhprofile.php' 'misc/log-analytics/import_logs.py' 'core/CliMulti.php'
do
size=$(ls -l $file | awk '{ print $5 }')
checksum=$(md5sum $file | awk '{ print $1 }')
@@ -235,12 +235,10 @@
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/console
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/cron/archive.sh
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/log-analytics/import_logs.py
-%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/clean-xhprof.sh
-%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/build-xhprof.sh
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/pear/archive_tar/sync-php4
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
-%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh
+%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/lox/xhprof/scripts/xhprofile.php
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/wikimedia/less.php/bin/lessc
%{apache_serverroot}/%{name}/*
++++++ matomo-4.5.0.tar.gz -> matomo-4.6.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/matomo/matomo-4.5.0.tar.gz /work/SRC/openSUSE:Factory/.matomo.new.31177/matomo-4.6.1.tar.gz differ: char 13, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mapserver for openSUSE:Factory checked in at 2021-12-01 20:47:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mapserver (Old)
and /work/SRC/openSUSE:Factory/.mapserver.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mapserver"
Wed Dec 1 20:47:23 2021 rev:4 rq:934922 version:7.6.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/mapserver/mapserver.changes 2021-06-16 20:36:39.983307087 +0200
+++ /work/SRC/openSUSE:Factory/.mapserver.new.31177/mapserver.changes 2021-12-02 02:17:47.694168918 +0100
@@ -1,0 +2,27 @@
+Thu Nov 11 16:38:03 UTC 2021 - Boris Manojlovic <boris(a)steki.net>
+
+
+- update to release 7.6.4
+ * PostGIS: fix ST_Intersects() with collections with PostGIS < 2.5.
+ Fixes https://github.com/MapServer/MapServer/pull/6355#issuecomment-877290417 (Even Rouault) : 3e42e35
+ * Check if sizeunits is not set to pixels (Patrik Sylve) : 3688004
+ * Change legend symbol scale factor when SIZEUNITS is set to METERS (Patrik Sylve) : 39a4ead
+ * spatialindex for sqlite sources in filter (Wouter Visscher) : 955d14e
+ * Make sure requested class with mode=legendicon is not negative. ( #6357 ) (Steve Lime) : 0901b57
+ * Updates to CONTRIBUTING.md (Jeff McKenna) : ee6297a
+ * PostGIS: fix ST_Intersects() with bounding box that is a point (follow-up of fixes #6181 , fixes #6230 )
+ (fixes https://github.com/MapServer/MapServer/pull/6347#issuecomment-870002856) (Even Rouault) : 44d5d9c
+ * WMS: make attribute color binding work with FILTER vendor parameter (fixes #6200 ) (Even Rouault) : 1a98ac7
+ * msQueryByFeatures(): avoid potential segfault when reslut set is empty (Even Rouault) : 98ad83a
+ * PostGIS: use ST_Intersects instead of && for bounding box (fixes #6181 , fixes #6230 ) (Even Rouault) : e2ef155
+ * check_single_font(): use quotation mark when msGetGlyphIndex() fails to retrieve the glyph (Even Rouault) : 53ee29e
+ * msGetGlyphByIndex() / msGetGlyphOutline(): tweak debug/error messages (Even Rouault) : 0bbf943
+ * When a font is missing a glyph we try to fallback to using a question mark (Krister Wicksell) : cf4756e
+ * WFS: fix paging with GPKG/Spatialite datasources and non-point geometries (fixes #6325 ) (Even Rouault) : ce8dc4d
+ * Fix querymap failure for polygon layers with labels only (no styles) ( #6262 ) (Tamas Szekeres) : 782ee8b
+ * mapxbase: validate nHeadLen (Max Kellermann) : ee5d5de
+ * mapshape, mapxbase: fix several memory leaks in error code paths (Max Kellermann) : 5e4c504
+ * mapshape: validate numshapes (Max Kellermann) : b5c0e29
+ * mapshape: remove useless null terminator (Max Kellermann) : 9755395
+
+-------------------------------------------------------------------
Old:
----
mapserver-7.6.3.tar.gz
New:
----
mapserver-7.6.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mapserver.spec ++++++
--- /var/tmp/diff_new_pack.lWQxyx/_old 2021-12-02 02:17:48.146167342 +0100
+++ /var/tmp/diff_new_pack.lWQxyx/_new 2021-12-02 02:17:48.146167342 +0100
@@ -17,6 +17,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%bcond_with ruby
#
@@ -30,12 +31,12 @@
%endif
Name: mapserver
-Version: 7.6.3
+Version: 7.6.4
Release: 0
Summary: Environment for building spatially-enabled internet applications
License: MIT
Group: Productivity/Networking/Web/Servers
-Url: https://www.mapserver.org/
+URL: https://www.mapserver.org/
Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
Source9: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location
@@ -72,8 +73,8 @@
%if 0%{?suse_version} >= 1500
BuildRequires: postgresql-server-devel >= 9.1
%endif
-BuildRequires: proj
BuildRequires: libprotobuf-c-devel
+BuildRequires: proj
BuildRequires: protobuf-c
BuildRequires: readline-devel
BuildRequires: rpm
@@ -99,9 +100,9 @@
Mapserver library for mapserver or mapscript module. you need this lib to run mapserver
or any of the mapscript module (php, java, python, ruby)
+
# We don't require apache2_mod-php5 users could have php5 running
# with other modes (cgi, php-fpm etc)
-
%package -n php-mapscript
Summary: PHP/Mapscript map making extensions to PHP
Group: Development/Libraries/Other
++++++ mapserver-7.6.3.tar.gz -> mapserver-7.6.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/CMakeLists.txt new/mapserver-7.6.4/CMakeLists.txt
--- old/mapserver-7.6.3/CMakeLists.txt 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/CMakeLists.txt 2021-07-12 22:16:21.000000000 +0200
@@ -17,7 +17,7 @@
set (MapServer_VERSION_MAJOR 7)
set (MapServer_VERSION_MINOR 6)
-set (MapServer_VERSION_REVISION 3)
+set (MapServer_VERSION_REVISION 4)
set (MapServer_VERSION_SUFFIX "")
# Set C++ version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/CONTRIBUTING.md new/mapserver-7.6.4/CONTRIBUTING.md
--- old/mapserver-7.6.3/CONTRIBUTING.md 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/CONTRIBUTING.md 2021-07-12 22:16:21.000000000 +0200
@@ -5,28 +5,33 @@
## Bugs and Help
-GitHub issues should only be created to log bugs. For general help and support the MapServer [mailing lists](http://mapserver.org/community/lists.html)
+GitHub issues should only be created to log bugs. For general help and support the MapServer [mailing lists](https://mapserver.org/community/lists.html)
should be used. If you are unsure if you have discovered a bug, or may need help with configuring MapServer please
-post to the [mapserver-users list](http://lists.osgeo.org/mailman/listinfo/mapserver-users). There is also
-a [MapServer FAQ](http://www.mapserver.org/faq.html) which may have a solution to your problem.
+post to the [mapserver-users list](https://lists.osgeo.org/mailman/listinfo/mapserver-users). There is also
+a [MapServer FAQ](https://mapserver.org/faq.html) which may have a solution to your problem.
-If you have discovered a bug, please refer to the [Bug Submission page](http://mapserver.org/development/bugs.html) for
+If you have discovered a bug, please refer to the [Bug Submission page](https://mapserver.org/development/bugs.html) for
guidelines on creating an issue on GitHub. Please also search the existing issues to see if the bug has already been reported, and
add any further details to the existing issue.
-For professional support please see the [MapServer Service Providers page](http://mapserver.org/community/service_providers.html).
+For professional support please see the [MapServer Service Providers page](https://mapserver.org/community/service_providers.html).
## Development
-A separate [mapserver-dev mailing list](http://lists.osgeo.org/mailman/listinfo/mapserver-dev) is available for developers
-working on the MapServer code.
-
-Details on using GitHub can be found on the [MapServer GitHub page](http://mapserver.org/development/git.html)
+A separate [mapserver-dev mailing list](https://lists.osgeo.org/mailman/listinfo/mapserver-dev) is available for developers
+working on the MapServer code. Send a short message there to introduce yourself
+to the community, and mention what you are interested in working on.
+
+Details on using GitHub can be found on the [MapServer GitHub page](https://mapserver.org/development/git.html).
+
+Request for Comments (RFCs), where upcoming major changes to the source
+code are proposed, and a description of the various software tests & release
+plans, can be found on the [MapServer Development page](https://mapserver.org/development/).
Additional developer notes can be found in the [MapServer wiki](https://github.com/mapserver/mapserver/wiki#developer-notes), including
coding style and guidelines, memory management, and working with Git.
## Documentation
-The MapServer documentation is stored in a [separate repository](https://github.com/mapserver/docs). Please submit any documentation
-issues or changes there. See the [Documentation Development Guide](http://mapserver.org/development/documentation.html) for further details.
+The MapServer documentation is stored in a [separate repository](https://github.com/MapServer/MapServer-documentation). Please submit any documentation
+issues or changes there. See the [Documentation Development Guide](https://mapserver.org/development/documentation.html) for further details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/HISTORY.TXT new/mapserver-7.6.4/HISTORY.TXT
--- old/mapserver-7.6.3/HISTORY.TXT 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/HISTORY.TXT 2021-07-12 22:16:21.000000000 +0200
@@ -10,7 +10,18 @@
For a complete change history, please see the Git log comments. For more
details about recent point releases, please see the online changelog at:
-http://mapserver.org/development/changelog/
+https://mapserver.org/development/changelog/
+
+7.6.4 release (2021-07-12)
+--------------------------
+
+- improved performance of GPKG and SpatiaLite queries (#6361)
+
+- WFS: fix paging with GPKG/Spatialite datasources and non-point geometries (#6325)
+
+- PostGIS: use ST_Intersects instead of && for bounding box (#6348)
+
+see detailed changelog for other fixes
7.6.3 release (2021-04-30)
-------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/ci/travis/after_success.sh new/mapserver-7.6.4/ci/travis/after_success.sh
--- old/mapserver-7.6.3/ci/travis/after_success.sh 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/ci/travis/after_success.sh 2021-07-12 22:16:21.000000000 +0200
@@ -1,11 +1,11 @@
#!/bin/sh
set -eu
-if [ "$BUILD_NAME" != "PHP_7.2_WITH_ASAN" ]; then
- # Only run coverage when it is safe to do so (not on pull requests), and only on master branch
+if [ "$BUILD_NAME" != "PHP_7.3_WITH_ASAN" ]; then
+ # Only run coverage when it is safe to do so (not on pull requests), and only on main branch
echo "$TRAVIS_SECURE_ENV_VARS"
echo "$TRAVIS_BRANCH"
- sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then echo "run coverage"; ./run_code_coverage_upload.sh; fi'
+ sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "main"; then echo "run coverage"; ./run_code_coverage_upload.sh; fi'
ln -s ../../../mapparser.y build/CMakeFiles/mapserver.dir/
ln -s ../../../maplexer.l build/CMakeFiles/mapserver.dir/
coveralls --exclude renderers --exclude mapscript --exclude apache --exclude build/mapscript/mapscriptJAVA_wrap.c --exclude build/mapscript/mapscriptPYTHON_wrap.c --exclude shp2img.c --exclude legend.c --exclude scalebar.c --exclude msencrypt.c --exclude sortshp.c --exclude shptreevis.c --exclude shptree.c --exclude testexpr.c --exclude sym2img.c --exclude testcopy.c --exclude shptreetst.c --exclude tile4ms.c --exclude proj --exclude swig-3.0.12 --extension .c --extension .cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/ci/travis/before_install.sh new/mapserver-7.6.4/ci/travis/before_install.sh
--- old/mapserver-7.6.3/ci/travis/before_install.sh 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/ci/travis/before_install.sh 2021-07-12 22:16:21.000000000 +0200
@@ -1,31 +1,38 @@
#!/bin/sh
set -eu
-sudo mv /etc/apt/sources.list.d/pgdg* /tmp
-dpkg -l | grep postgresql
-dpkg -l | grep postgis
-sudo apt-get remove postgresql*
-sudo add-apt-repository -y ppa:ubuntugis/ppa
-sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-testing
+# Remove pre-installed things in Travis image
+if ls /etc/apt/sources.list.d/pgdg* 2>/dev/null >/dev/null; then sudo mv /etc/apt/sources.list.d/pgdg* /tmp; fi
+dpkg -l | grep postgresql || /bin/true
+dpkg -l | grep postgis || /bin/true
+sudo apt-get remove --purge postgresql* libpq-dev libpq5 || /bin/true
+
+sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
sudo apt-get update
-sudo apt-get install --allow-unauthenticated protobuf-c-compiler libprotobuf-c0-dev bison flex python-lxml libfribidi-dev cmake librsvg2-dev colordiff libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-xpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev python-dev libexempi-dev lcov lftp postgis libharfbuzz-dev gdal-bin ccache curl pyflakes
-sudo apt-get install --allow-unauthenticated libmono-system-drawing4.0-cil mono-mcs
-sudo apt-get install --allow-unauthenticated php5-dev || sudo apt-get install --allow-unauthenticated php7-dev
-sudo apt-get install --allow-unauthenticated libperl-dev
-sudo pip install cpp-coveralls
+sudo apt-get install -y --allow-unauthenticated protobuf-c-compiler libprotobuf-c0-dev bison flex libfribidi-dev cmake librsvg2-dev colordiff libpq-dev libpng-dev libjpeg-dev libgif-dev libgeos-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal-dev libproj-dev libxml2-dev libexempi-dev lcov lftp postgis libharfbuzz-dev gdal-bin ccache curl postgresql-server-dev-10 postgresql-10-postgis-3 postgresql-10-postgis-3-scripts swig g++
+# following are already installed on Travis CI
+#sudo apt-get install --allow-unauthenticated php-dev python-dev python3-dev
+sudo apt-get install -y --allow-unauthenticated libmono-system-drawing4.0-cil mono-mcs
+sudo apt-get install -y --allow-unauthenticated libperl-dev
+sudo apt-get install -y --allow-unauthenticated openjdk-8-jdk
+
+pip install cpp-coveralls pyflakes lxml
sudo pip install -U -r msautotest/requirements.txt
-# install swig 3.0.12 (defaults to 2.0.11 on trusty)
-wget http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz
+
export CC="ccache gcc"
export CXX="ccache g++"
-tar xf swig-3.0.12.tar.gz
-cd swig-3.0.12 && ./configure --prefix=/usr && make -j2 && sudo make install
-swig -version
-cd ..
+
+sudo sed -i 's/md5/trust/' /etc/postgresql/10/main/pg_hba.conf
+sudo sed -i 's/peer/trust/' /etc/postgresql/10/main/pg_hba.conf
+sudo service postgresql restart 10
+
cd msautotest
-pyflakes .
+python -m pyflakes .
./create_postgis_test_data.sh
-python -m SimpleHTTPServer &> /dev/null &
+
+# py3
+python -m http.server &> /dev/null &
+
cd ..
touch maplexer.l
touch mapparser.y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/ci/travis/script.sh new/mapserver-7.6.4/ci/travis/script.sh
--- old/mapserver-7.6.3/ci/travis/script.sh 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/ci/travis/script.sh 2021-07-12 22:16:21.000000000 +0200
@@ -1,13 +1,13 @@
#!/bin/sh
set -eu
-if [ "$BUILD_NAME" = "PHP_7.2_WITH_ASAN" ]; then
- export CC="ccache clang"
- export CXX="ccache clang++"
-else
+#if [ "$BUILD_NAME" = "PHP_7.3_WITH_ASAN" ]; then
+# export CC="ccache clang"
+# export CXX="ccache clang++"
+#else
export CC="ccache gcc"
export CXX="ccache g++"
-fi
+#fi
curl http://download.osgeo.org/proj/proj-6.1.1.tar.gz > proj-6.1.1.tar.gz
tar xzf proj-6.1.1.tar.gz
@@ -16,7 +16,7 @@
(cd proj; CFLAGS='-O2 -DPROJ_RENAME_SYMBOLS' CXXFLAGS='-O2 -DPROJ_RENAME_SYMBOLS' ./configure --disable-static --prefix=/usr/local && CCACHE_CPP2=yes make -j2 && sudo make -j3 install)
sudo rm -f /usr/include/proj_api.h
-if [ "$BUILD_NAME" = "PHP_7.2_WITH_ASAN" ]; then
+if [ "$BUILD_NAME" = "PHP_7.3_WITH_ASAN" ]; then
# Force use of PROJ 4 API
sudo rm /usr/local/include/proj.h
# -DNDEBUG to avoid issues with cairo cleanup
@@ -24,7 +24,7 @@
export AUTOTEST_OPTS="--strict --run_under_asan"
# Only run tests that only involve mapserv/shp2img binaries. mspython, etc would require LD_PREOLOAD'ing the asan shared object
make -j4 asan_compatible_tests
-elif [ "$BUILD_NAME" = "PHP_7.3_WITH_PROJ6" ]; then
+elif [ "$BUILD_NAME" = "PHP_7.4_WITH_PROJ6" ]; then
# Avoid any use of PROJ 4 API
sudo rm -f /usr/include/proj_api.h
make cmakebuild MFLAGS="-j2" CMAKE_C_FLAGS="-O2 -DPROJ_RENAME_SYMBOLS" CMAKE_CXX_FLAGS="-O2 -DPROJ_RENAME_SYMBOLS" EXTRA_CMAKEFLAGS="-DPROJ_INCLUDE_DIR=/usr/local/include -DPROJ_LIBRARY=/usr/local/lib/libproj.so.15"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/fontcache.c new/mapserver-7.6.4/fontcache.c
--- old/mapserver-7.6.3/fontcache.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/fontcache.c 2021-07-12 22:16:21.000000000 +0200
@@ -287,8 +287,14 @@
FT_Set_Pixel_Sizes(face->face,0,MS_NINT(size * 96/72.0));
}
error = FT_Load_Glyph(face->face,key.codepoint,FT_LOAD_DEFAULT|FT_LOAD_NO_BITMAP|FT_LOAD_NO_HINTING|FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
+ if (error) {
+ msDebug("Unable to load glyph %u for font \"%s\". Using ? as fallback.\n", key.codepoint, face->font);
+ // If we can't find a glyph then try to fallback to a question mark.
+ unsigned int fallbackCodepoint = msGetGlyphIndex(face, 0x3F);
+ error = FT_Load_Glyph(face->face,fallbackCodepoint,FT_LOAD_DEFAULT|FT_LOAD_NO_BITMAP|FT_LOAD_NO_HINTING|FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
+ }
if(error) {
- msSetError(MS_MISCERR, "unable to load glyph %ud for font \"%s\"", "msGetGlyphByIndex()",key.codepoint, face->font);
+ msSetError(MS_MISCERR, "unable to load glyph %u for font \"%s\"", "msGetGlyphByIndex()",key.codepoint, face->font);
free(gc);
#ifdef USE_THREAD
if (use_global_ft_cache)
@@ -335,8 +341,14 @@
pen.x = pen.y = 0;
FT_Set_Transform(face->face, &matrix, &pen);
error = FT_Load_Glyph(face->face,glyph->key.codepoint,FT_LOAD_DEFAULT|FT_LOAD_NO_BITMAP/*|FT_LOAD_IGNORE_TRANSFORM*/|FT_LOAD_NO_HINTING|FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
+ if (error) {
+ msDebug("Unable to load glyph %u for font \"%s\". Using ? as fallback.\n", glyph->key.codepoint, face->font);
+ // If we can't find a glyph then try to fallback to a question mark.
+ unsigned int fallbackCodepoint = msGetGlyphIndex(face, 0x3F);
+ error = FT_Load_Glyph(face->face,fallbackCodepoint,FT_LOAD_DEFAULT|FT_LOAD_NO_BITMAP/*|FT_LOAD_IGNORE_TRANSFORM*/|FT_LOAD_NO_HINTING|FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
+ }
if(error) {
- msSetError(MS_MISCERR, "unable to load glyph %ud for font \"%s\"", "msGetGlyphByIndex()",glyph->key.codepoint, face->font);
+ msSetError(MS_MISCERR, "unable to load glyph %u for font \"%s\"", "msGetGlyphOutline()",glyph->key.codepoint, face->font);
#ifdef USE_THREAD
if (use_global_ft_cache)
msReleaseLock(TLOCK_TTF);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mapdraw.c new/mapserver-7.6.4/mapdraw.c
--- old/mapserver-7.6.3/mapdraw.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mapdraw.c 2021-07-12 22:16:21.000000000 +0200
@@ -1307,7 +1307,7 @@
{
int i, status;
char annotate=MS_TRUE, cache=MS_FALSE;
- int drawmode = MS_DRAWMODE_FEATURES|MS_DRAWMODE_QUERY;
+ int drawmode = MS_DRAWMODE_FEATURES;
shapeObj shape;
int maxnumstyles=1;
@@ -1356,13 +1356,16 @@
/* if MS_HILITE, alter the one style (always at least 1 style), and set a MINDISTANCE for the labelObj to avoid duplicates */
if(map->querymap.style == MS_HILITE) {
+
+ drawmode |= MS_DRAWMODE_QUERY;
+
if (layer->numclasses > 0) {
colorbuffer = (colorObj*)msSmallMalloc(layer->numclasses*sizeof(colorObj));
mindistancebuffer = (int*)msSmallMalloc(layer->numclasses*sizeof(int));
}
for(i=0; i<layer->numclasses; i++) {
- if(layer->type == MS_LAYER_POLYGON) { /* alter BOTTOM style since that's almost always the fill */
+ if(layer->type == MS_LAYER_POLYGON && layer->class[i]->numstyles > 0) { /* alter BOTTOM style since that's almost always the fill */
if (layer->class[i]->styles == NULL) {
msSetError(MS_MISCERR, "Don't know how to draw class %s of layer %s without a style definition.", "msDrawQueryLayer()", layer->class[i]->name, layer->name);
msFree(colorbuffer);
@@ -1521,7 +1524,7 @@
/* if MS_HILITE, restore color and mindistance values */
if(map->querymap.style == MS_HILITE) {
for(i=0; i<layer->numclasses; i++) {
- if(layer->type == MS_LAYER_POLYGON) {
+ if(layer->type == MS_LAYER_POLYGON && layer->class[i]->numstyles > 0) {
if(MS_VALID_COLOR(layer->class[i]->styles[0]->color))
layer->class[i]->styles[0]->color = colorbuffer[i];
else if(MS_VALID_COLOR(layer->class[i]->styles[0]->outlinecolor))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/maplegend.c new/mapserver-7.6.4/maplegend.c
--- old/mapserver-7.6.3/maplegend.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/maplegend.c 2021-07-12 22:16:21.000000000 +0200
@@ -189,6 +189,12 @@
/*
** now draw the appropriate color/symbol/size combination
*/
+
+ /* Scalefactor will be infinity when SIZEUNITS is set in LAYER */
+ if(lp->sizeunits != MS_PIXELS) {
+ lp->scalefactor = 1.0;
+ }
+
switch(type) {
case MS_LAYER_POINT:
marker.x = dstX + MS_NINT(width / 2.0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mapogr.cpp new/mapserver-7.6.4/mapogr.cpp
--- old/mapserver-7.6.3/mapogr.cpp 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mapogr.cpp 2021-07-12 22:16:21.000000000 +0200
@@ -2272,66 +2272,6 @@
bool bSpatialiteOrGPKGAddOrderByFID = false;
- if( psInfo->dialect && psInfo->pszMainTableName != NULL &&
- ( (EQUAL(psInfo->dialect, "Spatialite") && psInfo->bHasSpatialIndex)
- || EQUAL(psInfo->dialect, "GPKG") ) &&
- bIsValidRect )
- {
- select = msStringConcatenate(select, " JOIN ");
-
- char szSpatialIndexName[256];
- snprintf( szSpatialIndexName, sizeof(szSpatialIndexName),
- "%s_%s_%s",
- EQUAL(psInfo->dialect, "Spatialite") ? "idx" : "rtree",
- psInfo->pszSpatialFilterTableName,
- psInfo->pszSpatialFilterGeometryColumn );
- char* pszEscapedSpatialIndexName = msLayerEscapePropertyName(
- layer, szSpatialIndexName);
- select = msStringConcatenate(select, "\"");
- select = msStringConcatenate(select, pszEscapedSpatialIndexName);
- msFree(pszEscapedSpatialIndexName);
- select = msStringConcatenate(select, "\" ms_spat_idx ON \"");
- char* pszEscapedMainTableName = msLayerEscapePropertyName(
- layer, psInfo->pszMainTableName);
- select = msStringConcatenate(select, pszEscapedMainTableName);
- msFree(pszEscapedMainTableName);
- select = msStringConcatenate(select, "\".");
- if( psInfo->pszRowId )
- {
- char* pszEscapedRowId = msLayerEscapePropertyName(
- layer, psInfo->pszRowId);
- select = msStringConcatenate(select, "\"");
- select = msStringConcatenate(select, pszEscapedRowId);
- select = msStringConcatenate(select, "\"");
- msFree(pszEscapedRowId);
- }
- else
- select = msStringConcatenate(select, "ROWID");
- if( EQUAL(psInfo->dialect, "Spatialite") )
- select = msStringConcatenate(select, " = ms_spat_idx.pkid AND ");
- else
- select = msStringConcatenate(select, " = ms_spat_idx.id AND ");
-
- char szCond[256];
- if( EQUAL(psInfo->dialect, "Spatialite") )
- {
- snprintf(szCond, sizeof(szCond),
- "ms_spat_idx.xmin <= %.15g AND ms_spat_idx.xmax >= %.15g AND "
- "ms_spat_idx.ymin <= %.15g AND ms_spat_idx.ymax >= %.15g",
- rect.maxx, rect.minx, rect.maxy, rect.miny);
- }
- else
- {
- snprintf(szCond, sizeof(szCond),
- "ms_spat_idx.minx <= %.15g AND ms_spat_idx.maxx >= %.15g AND "
- "ms_spat_idx.miny <= %.15g AND ms_spat_idx.maxy >= %.15g",
- rect.maxx, rect.minx, rect.maxy, rect.miny);
- }
- select = msStringConcatenate(select, szCond);
-
- bSpatialiteOrGPKGAddOrderByFID = true;
- }
-
const char *sql = layer->filter.native_string;
if (psInfo->dialect && sql && *sql != '\0' &&
(EQUAL(psInfo->dialect, "Spatialite") ||
@@ -2368,16 +2308,102 @@
msFree(points);
filter = msStringConcatenate(filter, "))");
}
- else if( psInfo->dialect && EQUAL(psInfo->dialect, "Spatialite") &&
- psInfo->pszMainTableName != NULL && !psInfo->bHasSpatialIndex )
+ else if( psInfo->dialect &&
+ (EQUAL(psInfo->dialect, "Spatialite") ||
+ EQUAL(psInfo->dialect, "GPKG")) &&
+ psInfo->pszMainTableName != NULL )
{
+ if( (EQUAL(psInfo->dialect, "Spatialite") && psInfo->bHasSpatialIndex)
+ || EQUAL(psInfo->dialect, "GPKG") )
+ {
+ if (filter) filter = msStringConcatenate(filter, " AND ");
+ char* pszEscapedMainTableName = msLayerEscapePropertyName(
+ layer, psInfo->pszMainTableName);
+ filter = msStringConcatenate(filter, "\"");
+ filter = msStringConcatenate(filter, pszEscapedMainTableName);
+ msFree(pszEscapedMainTableName);
+ filter = msStringConcatenate(filter, "\".");
+ if( psInfo->pszRowId )
+ {
+ char* pszEscapedRowId = msLayerEscapePropertyName(
+ layer, psInfo->pszRowId);
+ filter = msStringConcatenate(filter, "\"");
+ filter = msStringConcatenate(filter, pszEscapedRowId);
+ filter = msStringConcatenate(filter, "\"");
+ msFree(pszEscapedRowId);
+ }
+ else
+ filter = msStringConcatenate(filter, "ROWID");
+
+ filter = msStringConcatenate(filter, " IN ");
+ filter = msStringConcatenate(filter, "(");
+ filter = msStringConcatenate(filter, "SELECT ");
+
+ if( EQUAL(psInfo->dialect, "Spatialite") )
+ filter = msStringConcatenate(filter, "ms_spat_idx.pkid");
+ else
+ filter = msStringConcatenate(filter, "ms_spat_idx.id");
+
+ filter = msStringConcatenate(filter, " FROM ");
+
+ char szSpatialIndexName[256];
+ snprintf( szSpatialIndexName, sizeof(szSpatialIndexName),
+ "%s_%s_%s",
+ EQUAL(psInfo->dialect, "Spatialite") ? "idx" : "rtree",
+ psInfo->pszSpatialFilterTableName,
+ psInfo->pszSpatialFilterGeometryColumn );
+ char* pszEscapedSpatialIndexName = msLayerEscapePropertyName(
+ layer, szSpatialIndexName);
+
+ filter = msStringConcatenate(filter, "\"");
+ filter = msStringConcatenate(filter, pszEscapedSpatialIndexName);
+ msFree(pszEscapedSpatialIndexName);
+
+ filter = msStringConcatenate(filter, "\" ms_spat_idx WHERE ");
+
+ char szCond[256];
+ if( EQUAL(psInfo->dialect, "Spatialite") )
+ {
+ snprintf(szCond, sizeof(szCond),
+ "ms_spat_idx.xmin <= %.15g AND ms_spat_idx.xmax >= %.15g AND "
+ "ms_spat_idx.ymin <= %.15g AND ms_spat_idx.ymax >= %.15g",
+ rect.maxx, rect.minx, rect.maxy, rect.miny);
+ }
+ else
+ {
+ snprintf(szCond, sizeof(szCond),
+ "ms_spat_idx.minx <= %.15g AND ms_spat_idx.maxx >= %.15g AND "
+ "ms_spat_idx.miny <= %.15g AND ms_spat_idx.maxy >= %.15g",
+ rect.maxx, rect.minx, rect.maxy, rect.miny);
+ }
+ filter = msStringConcatenate(filter, szCond);
+
+ filter = msStringConcatenate(filter, ")");
+
+ bSpatialiteOrGPKGAddOrderByFID = true;
+ }
+
+ const bool isGPKG = EQUAL(psInfo->dialect, "GPKG");
if (filter) filter = msStringConcatenate(filter, " AND");
const char *col = OGR_L_GetGeometryColumn(psInfo->hLayer); // which geom field??
- filter = msStringConcatenate(filter, " MbrIntersects(\"");
+ filter = msStringConcatenate(filter, " Intersects(");
+ if( isGPKG )
+ {
+ // Casting GeoPackage geometries to spatialie ones is done
+ // automatically normally, since GDAL enables the
+ // "amphibious" mode, but without it
+ // explicilty specified, spatialite 4.3.0a does an
+ // out-of-bounds access.
+ filter = msStringConcatenate(filter, "GeomFromGPB(");
+ }
+ filter = msStringConcatenate(filter, "\"");
char* escaped = msLayerEscapePropertyName(layer, col);
filter = msStringConcatenate(filter, escaped);
msFree(escaped);
- filter = msStringConcatenate(filter, "\", BuildMbr(");
+ filter = msStringConcatenate(filter, "\"");
+ if( isGPKG )
+ filter = msStringConcatenate(filter, ")");
+ filter = msStringConcatenate(filter, ", BuildMbr(");
char *points = (char *)msSmallMalloc(30*2*5);
snprintf(points, 30*4, "%lf,%lf,%lf,%lf", rect.minx, rect.miny, rect.maxx, rect.maxy);
filter = msStringConcatenate(filter, points);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mappostgis.c new/mapserver-7.6.4/mappostgis.c
--- old/mapserver-7.6.3/mappostgis.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mappostgis.c 2021-07-12 22:16:21.000000000 +0200
@@ -1666,37 +1666,44 @@
char *strBox = NULL;
size_t sz;
+ const int bIsPoint = rect->minx == rect->maxx && rect->miny == rect->maxy;
if (layer->debug) {
msDebug("msPostGISBuildSQLBox called.\n");
}
if ( strSRID ) {
- static char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))',%s)";
+ static const char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))',%s)";
+ static const char *strBoxTemplatePoint = "ST_GeomFromText('POINT(%.15g %.15g)',%s)";
/* 10 doubles + 1 integer + template characters */
sz = 10 * 22 + strlen(strSRID) + strlen(strBoxTemplate);
strBox = (char*)msSmallMalloc(sz+1); /* add space for terminating NULL */
- if ( sz <= snprintf(strBox, sz, strBoxTemplate,
+ if ( (bIsPoint && sz <= (size_t)(snprintf(strBox, sz, strBoxTemplatePoint,
+ rect->minx, rect->miny, strSRID))) ||
+ (!bIsPoint && sz <= (size_t)(snprintf(strBox, sz, strBoxTemplate,
rect->minx, rect->miny,
rect->minx, rect->maxy,
rect->maxx, rect->maxy,
rect->maxx, rect->miny,
rect->minx, rect->miny,
- strSRID)) {
+ strSRID))) ) {
msSetError(MS_MISCERR,"Bounding box digits truncated.","msPostGISBuildSQLBox");
return NULL;
}
} else {
- static char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))')";
+ static const char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))')";
+ static const char *strBoxTemplatePoint = "ST_GeomFromText('POINT(%.15g %.15g)')";
/* 10 doubles + template characters */
sz = 10 * 22 + strlen(strBoxTemplate);
strBox = (char*)msSmallMalloc(sz+1); /* add space for terminating NULL */
- if ( sz <= snprintf(strBox, sz, strBoxTemplate,
+ if ( (bIsPoint && sz <= (size_t)(snprintf(strBox, sz, strBoxTemplatePoint,
+ rect->minx, rect->miny))) ||
+ (!bIsPoint && sz <= (size_t)(snprintf(strBox, sz, strBoxTemplate,
rect->minx, rect->miny,
rect->minx, rect->maxy,
rect->maxx, rect->maxy,
rect->maxx, rect->miny,
- rect->minx, rect->miny) ) {
+ rect->minx, rect->miny))) ) {
msSetError(MS_MISCERR,"Bounding box digits truncated.","msPostGISBuildSQLBox");
return NULL;
}
@@ -2055,7 +2062,6 @@
char *strBox = 0;
char *strSRID = 0;
size_t strBoxLength = 0;
- static const char *strRectTemplate = "\"%s\" && %s";
/* We see to set the SRID on the box, but to what SRID? */
strSRID = msPostGISBuildSQLSRID(layer);
@@ -2066,27 +2072,53 @@
}
strBox = msPostGISBuildSQLBox(layer, rect, strSRID);
- msFree(strSRID);
if ( strBox ) {
strBoxLength = strlen(strBox);
} else {
msSetError(MS_MISCERR, "Unable to build box SQL.", "msPostGISBuildSQLWhere()");
free( strLimit );
free( strOffset );
+ msFree(strSRID);
return NULL;
}
- strRect = (char*)msSmallMalloc(strlen(strRectTemplate) + strBoxLength + strlen(layerinfo->geomcolumn) +1 );
- sprintf(strRect, strRectTemplate, layerinfo->geomcolumn, strBox);
+ if( strstr(strSRID, "find_srid(") == NULL )
+ {
+ // If the SRID is known, we can safely use ST_Intersects()
+ // otherwise if find_srid() would return 0, ST_Intersects() would not
+ // work at all, which breaks the msautotest/query/query_postgis.map
+ // tests, releated to bdry_counpy2 layer that has no SRID
+ if( layerinfo->version >= 20500 )
+ {
+ static const char *strRectTemplate = "ST_Intersects(\"%s\", %s)";
+ strRect = (char*)msSmallMalloc(strlen(strRectTemplate) + strBoxLength + strlen(layerinfo->geomcolumn) +1 );
+ sprintf(strRect, strRectTemplate, layerinfo->geomcolumn, strBox);
+ }
+ else
+ {
+ // ST_Intersects() before PostGIS 2.5 doesn't support collections
+ // See https://github.com/MapServer/MapServer/pull/6355#issuecomment-877355007
+ static const char *strRectTemplate = "(\"%s\" && %s) AND ST_Distance(\"%s\", %s) = 0";
+ strRect = (char*)msSmallMalloc(strlen(strRectTemplate) + 2 * (strBoxLength + strlen(layerinfo->geomcolumn)) +1 );
+ sprintf(strRect, strRectTemplate, layerinfo->geomcolumn, strBox, layerinfo->geomcolumn, strBox);
+ }
+ }
+ else
+ {
+ static const char *strRectTemplate = "\"%s\" && %s";
+ strRect = (char*)msSmallMalloc(strlen(strRectTemplate) + strBoxLength + strlen(layerinfo->geomcolumn) +1 );
+ sprintf(strRect, strRectTemplate, layerinfo->geomcolumn, strBox);
+ }
strRectLength = strlen(strRect);
free(strBox);
+ msFree(strSRID);
/* Combine with other rectangle expressed in another SRS */
/* (generally equivalent to the above in current code paths) */
if( rectInOtherSRID != NULL && otherSRID > 0 )
{
char* strRectOtherSRID;
- static const char *strRectOtherSRIDTemplate = "NOT ST_Disjoint(ST_Transform(%s,%d),%s)";
+ static const char *strRectOtherSRIDTemplate = "ST_Intersects(ST_Transform(%s,%d),%s)";
char szSRID[32];
char* strTmp = NULL;
@@ -2121,7 +2153,7 @@
{
char* strSRID;
char* strRectOtherSRID;
- static const char *strRectOtherSRIDTemplate = "NOT ST_Disjoint(%s,%s)";
+ static const char *strRectOtherSRIDTemplate = "ST_Intersects(%s,%s)";
char* strTmp = NULL;
strSRID = msPostGISBuildSQLSRID(layer);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mapquery.c new/mapserver-7.6.4/mapquery.c
--- old/mapserver-7.6.3/mapquery.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mapquery.c 2021-07-12 22:16:21.000000000 +0200
@@ -1617,7 +1617,7 @@
} /* next selection shape */
- if(lp->resultcache->numresults == 0) msLayerClose(lp); /* no need to keep the layer open */
+ if(lp->resultcache == NULL || lp->resultcache->numresults == 0) msLayerClose(lp); /* no need to keep the layer open */
} /* next layer */
/* was anything found? */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mapservutil.c new/mapserver-7.6.4/mapservutil.c
--- old/mapserver-7.6.3/mapservutil.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mapservutil.c 2021-07-12 22:16:21.000000000 +0200
@@ -1651,7 +1651,7 @@
if(numtokens == 2) { /* check the class index */
classindex = atoi(tokens[1]);
- if(classindex >= GET_LAYER(mapserv->map, layerindex)->numclasses) {
+ if(classindex < 0 || classindex >= GET_LAYER(mapserv->map, layerindex)->numclasses) {
msSetError(MS_WEBERR, "Icon class=%d not found in layer=%s.", "mapserv()", classindex, GET_LAYER(mapserv->map, layerindex)->name);
status = MS_FAILURE;
goto li_cleanup;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mapshape.c new/mapserver-7.6.4/mapshape.c
--- old/mapserver-7.6.3/mapshape.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mapshape.c 2021-07-12 22:16:21.000000000 +0200
@@ -1726,11 +1726,18 @@
/* load some information about this shapefile */
msSHPGetInfo( shpfile->hSHP, &shpfile->numshapes, &shpfile->type);
+
+ if( shpfile->numshapes < 0 || shpfile->numshapes > 256000000 ) {
+ msSetError(MS_SHPERR, "Corrupted .shp file : numshapes = %d.",
+ "msShapefileOpen()", shpfile->numshapes);
+ msSHPClose(shpfile->hSHP);
+ return -1;
+ }
+
msSHPReadBounds( shpfile->hSHP, -1, &(shpfile->bounds));
bufferSize = strlen(filename)+5;
dbfFilename = (char *)msSmallMalloc(bufferSize);
- dbfFilename[0] = '\0';
strcpy(dbfFilename, filename);
/* clean off any extention the filename might have */
@@ -1749,6 +1756,7 @@
if( log_failures )
msSetError(MS_IOERR, "(%s)", "msShapefileOpen()", dbfFilename);
free(dbfFilename);
+ msSHPClose(shpfile->hSHP);
return(-1);
}
free(dbfFilename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/mapxbase.c new/mapserver-7.6.4/mapxbase.c
--- old/mapserver-7.6.3/mapxbase.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/mapxbase.c 2021-07-12 22:16:21.000000000 +0200
@@ -192,6 +192,7 @@
pabyBuf = (uchar *) msSmallMalloc(500);
if( VSIFReadL( pabyBuf, 32, 1, psDBF->fp ) != 1 )
{
+ VSIFCloseL( psDBF->fp );
msFree(psDBF);
msFree(pabyBuf);
return( NULL );
@@ -203,6 +204,13 @@
psDBF->nHeaderLength = nHeadLen = pabyBuf[8] + pabyBuf[9]*256;
psDBF->nRecordLength = nRecLen = pabyBuf[10] + pabyBuf[11]*256;
+ if (nHeadLen <= 32) {
+ VSIFCloseL( psDBF->fp );
+ msFree(psDBF);
+ msFree(pabyBuf);
+ return( NULL );
+ }
+
psDBF->nFields = nFields = (nHeadLen - 32) / 32;
psDBF->pszCurrentRecord = (char *) msSmallMalloc(nRecLen);
@@ -217,6 +225,7 @@
if( VSIFReadL( pabyBuf, nHeadLen - 32, 1, psDBF->fp ) != 1 )
{
msFree(psDBF->pszCurrentRecord);
+ VSIFCloseL( psDBF->fp );
msFree(psDBF);
msFree(pabyBuf);
return( NULL );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mapserver-7.6.3/textlayout.c new/mapserver-7.6.4/textlayout.c
--- old/mapserver-7.6.3/textlayout.c 2021-04-30 23:26:25.000000000 +0200
+++ new/mapserver-7.6.4/textlayout.c 2021-07-12 22:16:21.000000000 +0200
@@ -214,7 +214,7 @@
}
#endif
-int WARN_UNUSED check_single_font(fontSetObj *fontset, char *fontkey, text_run *run, TextInfo *glyphs, int ignore_missing) {
+static int check_single_font(fontSetObj *fontset, char *fontkey, text_run *run, TextInfo *glyphs, int ignore_missing) {
int i;
face_element *fcache = NULL;
if(fontset && fontkey) {
@@ -228,16 +228,23 @@
run->face = fcache;
if(UNLIKELY(!fcache)) return MS_FAILURE;
for(i=0; i<run->length; i++) {
- int codepoint = msGetGlyphIndex(fcache, glyphs->unicodes[run->offset+i]);
+ unsigned int codepoint = msGetGlyphIndex(fcache, glyphs->unicodes[run->offset+i]);
if(codepoint || ignore_missing)
+ {
+ if( codepoint == 0 )
+ {
+ msDebug("Unable to find glyph for codepoint %u. Using ? as fallback.\n", glyphs->unicodes[run->offset+i]);
+ codepoint = msGetGlyphIndex(fcache, '?');
+ }
glyphs->codepoints[run->offset+i] = codepoint;
+ }
else
return MS_FAILURE;
}
return MS_SUCCESS;
}
-int WARN_UNUSED get_face_for_run(fontSetObj *fontset, char *fontlist, text_run *run, TextInfo *glyphs) {
+static int get_face_for_run(fontSetObj *fontset, char *fontlist, text_run *run, TextInfo *glyphs) {
char *startfont, *endfont;
int ok;
#if defined(USE_HARFBUZZ) && defined(USE_FRIBIDI)
1
0