openSUSE Commits
Threads by month
- ----- 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
September 2023
- 1 participants
- 2327 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mangohud for openSUSE:Factory checked in at 2023-09-29 21:14:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mangohud (Old)
and /work/SRC/openSUSE:Factory/.mangohud.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mangohud"
Fri Sep 29 21:14:11 2023 rev:14 rq:1114213 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mangohud/mangohud.changes 2023-04-18 15:53:02.329470588 +0200
+++ /work/SRC/openSUSE:Factory/.mangohud.new.28202/mangohud.changes 2023-09-29 21:15:46.546515355 +0200
@@ -1,0 +2,76 @@
+Fri Sep 29 04:11:09 UTC 2023 - Dead Mozay <dead_mozay(a)opensuse.org>
+
+- Update to version 0.7.0:
+ * Parameters:
+ - gpu_fan displays the gpu fan RPM, only works on AMD.
+ - gpu_junction_temp displays the junction temperature on AMD GPUs.
+ - removed io_stats, just use io_read and io_write instead.
+ - engine_short_names shortens the names of engines, e.g VULKAN
+ becomes VK.
+ - text_outline adds a colored outline around all text.
+ - text_outline_color sets the color of the outline,
+ default: 000000.
+ - text_outline_thickness sets the thickness of the outline,
+ default: 1.5.
+ - temp_fahrenheit changes all temps to fahrenheit from celsius.
+ - dynamic_frame_timing dynamically changes the range of the
+ frametime graph.
+ - duration displays the time since mangohud initialized.
+ - gpu_voltage shows the current gpu voltage, only works on AMD.
+ - fps_text override fps text.
+ - horizontal_stretch sets the background to stretch across
+ width of application (enabled by default).
+ - core_bars turns core_load into a histogram.
+ - device_battery Shows battery level of wireless devices,
+ accepts gamepad mouse.
+ - device_battery_icon shows battery icon instead of percent.
+ * preset: This parameter allows you to choose from a number
+ of config presets.
+ - 0: no display
+ - 1: only fps.
+ - 2: horizontal.
+ - 3: more detailed default layout
+ - 4: full
+ * Changes:
+ - Removed MANGOHUD_DLSYM because it's redundant.
+ - Fixed core mhz when Cool'n'Quiet and similar is disabled
+ in bios.
+ - Added /etc/MangoHud.conf as a possible config location.
+ - Add CPU architecture to vulkan manifest name.
+ - mangoplot is a python script that graphs one or more mangohud
+ csv logs.
+ - mangoapp: resolved issue where different sized displays
+ caused rendering issues.
+ - mangohud script: guard so we don't add mangohud
+ lib to LD_PRELOAD multiple times.
+ - split mangohud into two shared libraries, one for vulkan and
+ one for opengl. This should resolve issues where mangohud
+ would init vulkan and opengl at the same time.
+ - statically link stdc++. This fixed a lot of crashing issues
+ when MANGOHUD=1 was set before starting steam.
+ - added support for zenergy kernel driver.
+ - fixed alpha param that stopped working at some point.
+ - added --version to mangohud script.
+ - When using horizontal layout set table_columns param to
+ current count of table_columns instead of manually.
+ - Intel GPU: use fdinfo for GPU load.
+ - logging: calculate fps data using frametime.
+ - AMDGPU: get core clock from hwmon instead of gpu_metrics.
+ - gamepad_battery is now deprecated
+ use device_battery= mouse or gamepad.
+ - logging: added process RSS and swap usage.
+ - Fixed a memory leak when resizing vulkan windows.
+ * Blacklist:
+ - blacklist: if blacklisted application is hardcoded,
+ don't proceed to load config blacklists.
+ - blacklist: only print blacklist info message once.
+ + blacklist: added more hardcoded entries:
+ - tabtip.exe
+ - steam.exe
+ - wine64-preloader
+ - explorer.exe
+ - wine-preloader
+ - iexplore.exe
+ - rundll32.exe
+
+-------------------------------------------------------------------
Old:
----
mangohud-0.6.9-1.tar.gz
New:
----
mangohud-0.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mangohud.spec ++++++
--- /var/tmp/diff_new_pack.vV364k/_old 2023-09-29 21:15:48.222575827 +0200
+++ /var/tmp/diff_new_pack.vV364k/_new 2023-09-29 21:15:48.226575971 +0200
@@ -16,12 +16,12 @@
#
-%define internal_ver 0.6.9-1
+%define internal_ver %{version}
%define imgui_ver 1.81
%define imgui_wrap 1
%define vulkan_ver 1.2.158
Name: mangohud
-Version: 0.6.9~1
+Version: 0.7.0
Release: 0
Summary: A Vulkan and OpenGL overlay for monitoring
License: MIT
@@ -111,6 +111,7 @@
%license LICENSE
%doc README.md
%{_bindir}/%{name}
+%{_bindir}/mangoplot
%{_bindir}/%{name}ctl
%{_libdir}/%{name}/
%{_datadir}/doc/%{name}/
++++++ mangohud-0.6.9-1.tar.gz -> mangohud-0.7.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/mangohud/mangohud-0.6.9-1.tar.gz /work/SRC/openSUSE:Factory/.mangohud.new.28202/mangohud-0.7.0.tar.gz differ: char 12, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lsp-plugins for openSUSE:Factory checked in at 2023-09-29 21:14:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lsp-plugins (Old)
and /work/SRC/openSUSE:Factory/.lsp-plugins.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lsp-plugins"
Fri Sep 29 21:14:09 2023 rev:29 rq:1114153 version:1.2.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/lsp-plugins/lsp-plugins.changes 2023-09-11 21:26:09.681884657 +0200
+++ /work/SRC/openSUSE:Factory/.lsp-plugins.new.28202/lsp-plugins.changes 2023-09-29 21:15:44.622445935 +0200
@@ -1,0 +2,6 @@
+Thu Sep 28 20:32:32 UTC 2023 - Konstantin Voinov <kv(a)kott.no-ip.biz>
+
+- Add 01-Fixed-double-free-of-generated-port-metadata.patch
+ from upstream fixing crashes
+
+-------------------------------------------------------------------
New:
----
01-Fixed-double-free-of-generated-port-metadata.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lsp-plugins.spec ++++++
--- /var/tmp/diff_new_pack.aRbcq0/_old 2023-09-29 21:15:45.882491398 +0200
+++ /var/tmp/diff_new_pack.aRbcq0/_new 2023-09-29 21:15:45.882491398 +0200
@@ -28,7 +28,9 @@
License: LGPL-3.0-or-later
Group: Productivity/Multimedia/Sound/Utilities
URL: https://lsp-plug.in/
+
Source0: https://github.com/sadko4u/lsp-plugins/releases/download/%{version}/%{name}…
+Patch0: 01-Fixed-double-free-of-generated-port-metadata.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: ladspa
@@ -139,7 +141,7 @@
%prep
%setup -qn %{name}
-%autopatch -p1
+%patch0 -p1 -d modules/lsp-plugin-fw
%build
export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
++++++ 01-Fixed-double-free-of-generated-port-metadata.patch ++++++
From 4975f943c743eadba745d1c84c1aa2bda67c64f8 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u(a)gmail.com>
Date: Thu, 28 Sep 2023 20:06:12 +0300
Subject: [PATCH] Fixed double free of generated port metadata
---
CHANGELOG | 1 +
include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h | 10 +++++++---
.../lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h | 5 +++--
include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h | 5 +++--
include/lsp-plug.in/plug-fw/wrap/ladspa/impl/wrapper.h | 4 ++--
include/lsp-plug.in/plug-fw/wrap/ladspa/wrapper.h | 4 ++--
include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h | 10 ++++++----
include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h | 6 ++++--
8 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a315d397..d71f975f 100644
diff --git a/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h b/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h
index 9928ae34..a5c55302 100644
--- a/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2022 Linux Studio Plugins Project <https://lsp-plug.in/>
- * (C) 2022 Vladimir Sadovnikov <sadko4u(a)gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ * (C) 2023 Vladimir Sadovnikov <sadko4u(a)gmail.com>
*
* This file is part of lsp-plugin-fw
* Created on: 24 дек. 2022 г.
@@ -110,7 +110,11 @@ namespace lsp
// Cleanup generated metadata
for (size_t i=0, n=vGenMetadata.size(); i<n; ++i)
- meta::drop_port_metadata(vGenMetadata.uget(i));
+ {
+ meta::port_t *p = vGenMetadata.uget(i);
+ lsp_trace("destroy generated port metadata %p", p);
+ meta::drop_port_metadata(p);
+ }
vGenMetadata.flush();
// Destroy the loader
diff --git a/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h b/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h
index 397fec3b..81c84cda 100644
--- a/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2022 Linux Studio Plugins Project <https://lsp-plug.in/>
- * (C) 2022 Vladimir Sadovnikov <sadko4u(a)gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ * (C) 2023 Vladimir Sadovnikov <sadko4u(a)gmail.com>
*
* This file is part of lsp-plugin-fw
* Created on: 31 янв. 2022 г.
@@ -151,6 +151,7 @@ namespace lsp
lsp_trace("destroy generated UI port metadata %p", port);
meta::drop_port_metadata(port);
}
+ vGenMetadata.flush();
// Destroy the display
if (pDisplay != NULL)
diff --git a/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h b/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h
index be97b9e3..96a23760 100644
--- a/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2022 Linux Studio Plugins Project <https://lsp-plug.in/>
- * (C) 2022 Vladimir Sadovnikov <sadko4u(a)gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ * (C) 2023 Vladimir Sadovnikov <sadko4u(a)gmail.com>
*
* This file is part of lsp-plugin-fw
* Created on: 31 янв. 2022 г.
@@ -466,6 +466,7 @@ namespace lsp
// lsp_trace("destroy generated port metadata %p", port);
meta::drop_port_metadata(port);
}
+ vGenMetadata.flush();
// Clear all other port containers
vDataPorts.flush();
diff --git a/include/lsp-plug.in/plug-fw/wrap/ladspa/impl/wrapper.h b/include/lsp-plug.in/plug-fw/wrap/ladspa/impl/wrapper.h
index 78d3dfdc..7c0b49d3 100644
--- a/include/lsp-plug.in/plug-fw/wrap/ladspa/impl/wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/ladspa/impl/wrapper.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Linux Studio Plugins Project <https://lsp-plug.in/>
- * (C) 2021 Vladimir Sadovnikov <sadko4u(a)gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ * (C) 2023 Vladimir Sadovnikov <sadko4u(a)gmail.com>
*
* This file is part of lsp-plugin-fw
* Created on: 26 янв. 2022 г.
diff --git a/include/lsp-plug.in/plug-fw/wrap/ladspa/wrapper.h b/include/lsp-plug.in/plug-fw/wrap/ladspa/wrapper.h
index 97236bc7..e15bf40e 100644
--- a/include/lsp-plug.in/plug-fw/wrap/ladspa/wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/ladspa/wrapper.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Linux Studio Plugins Project <https://lsp-plug.in/>
- * (C) 2021 Vladimir Sadovnikov <sadko4u(a)gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ * (C) 2023 Vladimir Sadovnikov <sadko4u(a)gmail.com>
*
* This file is part of lsp-plugin-fw
* Created on: 1 нояб. 2021 г.
diff --git a/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h b/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h
index 98973f1d..2b377ab5 100644
--- a/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Linux Studio Plugins Project <https://lsp-plug.in/>
- * (C) 2021 Vladimir Sadovnikov <sadko4u(a)gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ * (C) 2023 Vladimir Sadovnikov <sadko4u(a)gmail.com>
*
* This file is part of lsp-plugin-fw
* Created on: 24 нояб. 2021 г.
@@ -155,9 +155,11 @@ namespace lsp
// Cleanup generated metadata
for (size_t i=0; i<vGenMetadata.size(); ++i)
{
- lsp_trace("destroy generated port metadata %p", vGenMetadata[i]);
- drop_port_metadata(vGenMetadata[i]);
+ meta::port_t *p = vGenMetadata.uget(i);
+ lsp_trace("destroy generated port metadata %p", p);
+ drop_port_metadata(p);
}
+ vGenMetadata.flush();
vExtPorts.flush();
vMeshPorts.flush();
diff --git a/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h b/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h
index 8c2afeae..c6c55d1d 100644
--- a/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h
+++ b/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h
@@ -195,9 +195,11 @@ namespace lsp
// Cleanup generated metadata
for (size_t i=0; i<vGenMetadata.size(); ++i)
{
- lsp_trace("destroy generated port metadata %p", vGenMetadata[i]);
- drop_port_metadata(vGenMetadata[i]);
+ meta::port_t *p = vGenMetadata.uget(i);
+ lsp_trace("destroy generated port metadata %p", p);
+ drop_port_metadata(p);
}
+ vGenMetadata.flush();
// Destroy manifest
if (pPackage != NULL)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-PyQt6-sip for openSUSE:Factory checked in at 2023-09-29 21:14:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyQt6-sip (Old)
and /work/SRC/openSUSE:Factory/.python-PyQt6-sip.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyQt6-sip"
Fri Sep 29 21:14:08 2023 rev:10 rq:1114144 version:13.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyQt6-sip/python-PyQt6-sip.changes 2023-06-12 15:26:56.043223314 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyQt6-sip.new.28202/python-PyQt6-sip.changes 2023-09-29 21:15:43.206394844 +0200
@@ -1,0 +2,6 @@
+Wed Sep 27 09:07:58 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Update to ABI version 13.5.2
+ * Match python-sip6-devel 6.7.10+
+
+-------------------------------------------------------------------
Old:
----
PyQt6_sip-13.5.1.tar.gz
New:
----
PyQt6_sip-13.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyQt6-sip.spec ++++++
--- /var/tmp/diff_new_pack.FSfgzW/_old 2023-09-29 21:15:44.358436410 +0200
+++ /var/tmp/diff_new_pack.FSfgzW/_new 2023-09-29 21:15:44.358436410 +0200
@@ -18,7 +18,7 @@
%{?sle15_python_module_pythons}
Name: python-PyQt6-sip
-Version: 13.5.1
+Version: 13.5.2
Release: 0
Summary: The sip module support for PyQt6
License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
++++++ PyQt6_sip-13.5.1.tar.gz -> PyQt6_sip-13.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_sip-13.5.1/PKG-INFO new/PyQt6_sip-13.5.2/PKG-INFO
--- old/PyQt6_sip-13.5.1/PKG-INFO 2023-04-13 17:05:22.851324300 +0200
+++ new/PyQt6_sip-13.5.2/PKG-INFO 2023-07-21 18:58:20.322810200 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt6_sip
-Version: 13.5.1
+Version: 13.5.2
Summary: The sip module support for PyQt6
Home-page: https://www.riverbankcomputing.com/software/sip/
Author: Riverbank Computing Limited
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_sip-13.5.1/PyQt6_sip.egg-info/PKG-INFO new/PyQt6_sip-13.5.2/PyQt6_sip.egg-info/PKG-INFO
--- old/PyQt6_sip-13.5.1/PyQt6_sip.egg-info/PKG-INFO 2023-04-13 17:05:22.000000000 +0200
+++ new/PyQt6_sip-13.5.2/PyQt6_sip.egg-info/PKG-INFO 2023-07-21 18:58:20.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt6-sip
-Version: 13.5.1
+Version: 13.5.2
Summary: The sip module support for PyQt6
Home-page: https://www.riverbankcomputing.com/software/sip/
Author: Riverbank Computing Limited
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_sip-13.5.1/setup.py new/PyQt6_sip-13.5.2/setup.py
--- old/PyQt6_sip-13.5.1/setup.py 2023-04-13 17:05:22.000000000 +0200
+++ new/PyQt6_sip-13.5.2/setup.py 2023-07-21 18:58:20.000000000 +0200
@@ -38,7 +38,7 @@
# Do the setup.
setup(
name='PyQt6_sip',
- version='13.5.1',
+ version='13.5.2',
license='SIP',
python_requires='>=3.7',
ext_modules=[module]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_sip-13.5.1/sip.h new/PyQt6_sip-13.5.2/sip.h
--- old/PyQt6_sip-13.5.1/sip.h 2023-04-13 17:05:22.000000000 +0200
+++ new/PyQt6_sip-13.5.2/sip.h 2023-07-21 18:58:20.000000000 +0200
@@ -46,7 +46,7 @@
/* The version of the ABI. */
#define SIP_ABI_MAJOR_VERSION 13
#define SIP_ABI_MINOR_VERSION 5
-#define SIP_MODULE_PATCH_VERSION 1
+#define SIP_MODULE_PATCH_VERSION 2
/*
@@ -74,8 +74,8 @@
/* The version of the code generator. */
-#define SIP_VERSION 0x60709
-#define SIP_VERSION_STR "6.7.9"
+#define SIP_VERSION 0x6070a
+#define SIP_VERSION_STR "6.7.10"
/* These are all dependent on the user-specified name of the sip module. */
#define _SIP_MODULE_FQ_NAME "PyQt6.sip"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_sip-13.5.1/sip_array.c new/PyQt6_sip-13.5.2/sip_array.c
--- old/PyQt6_sip-13.5.1/sip_array.c 2023-04-13 17:05:22.000000000 +0200
+++ new/PyQt6_sip-13.5.2/sip_array.c 2023-07-21 18:58:20.000000000 +0200
@@ -284,6 +284,8 @@
static int sipArray_getbuffer(PyObject *self, Py_buffer *view, int flags)
{
sipArrayObject *array = (sipArrayObject *)self;
+ const char *format;
+ Py_ssize_t itemsize;
if (view == NULL)
return 0;
@@ -297,23 +299,28 @@
view->obj = self;
Py_INCREF(self);
+ /*
+ * If there is no format, ie. it is a wrapped type, then present it as
+ * bytes.
+ */
+ if ((format = array->format) == NULL)
+ {
+ format = "B";
+ itemsize = sizeof (unsigned char);
+ }
+ else
+ {
+ itemsize = array->stride;
+ }
+
view->buf = array->data;
view->len = array->len * array->stride;
view->readonly = (array->flags & SIP_READ_ONLY);
- view->itemsize = array->stride;
+ view->itemsize = itemsize;
view->format = NULL;
if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT)
- {
- if (array->format == NULL)
- {
- PyErr_SetString(PyExc_BufferError,
- "format has not been specified");
- return -1;
- }
-
- view->format = (char *)array->format;
- }
+ view->format = format;
view->ndim = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_sip-13.5.1/sip_core.c new/PyQt6_sip-13.5.2/sip_core.c
--- old/PyQt6_sip-13.5.1/sip_core.c 2023-04-13 17:05:22.000000000 +0200
+++ new/PyQt6_sip-13.5.2/sip_core.c 2023-07-21 18:58:20.000000000 +0200
@@ -1890,7 +1890,7 @@
{
void *mem;
- if ((mem = PyMem_Malloc(nbytes)) == NULL)
+ if ((mem = PyMem_RawMalloc(nbytes)) == NULL)
PyErr_NoMemory();
return mem;
@@ -1902,7 +1902,7 @@
*/
void sip_api_free(void *mem)
{
- PyMem_Free(mem);
+ PyMem_RawFree(mem);
}
@@ -11129,7 +11129,11 @@
*/
static PyObject *sip_api_py_type_dict(const PyTypeObject *py_type)
{
+#if PY_VERSION_HEX >= 0x030c0000
+ return PyType_GetDict(py_type);
+#else
return py_type->tp_dict;
+#endif
}
++++++ support-python3.6.patch ++++++
--- /var/tmp/diff_new_pack.FSfgzW/_old 2023-09-29 21:15:44.486441028 +0200
+++ /var/tmp/diff_new_pack.FSfgzW/_new 2023-09-29 21:15:44.486441028 +0200
@@ -1,7 +1,7 @@
-Index: PyQt6_sip-13.5.1/PKG-INFO
+Index: PyQt6_sip-13.5.2/PKG-INFO
===================================================================
---- PyQt6_sip-13.5.1.orig/PKG-INFO
-+++ PyQt6_sip-13.5.1/PKG-INFO
+--- PyQt6_sip-13.5.2.orig/PKG-INFO
++++ PyQt6_sip-13.5.2/PKG-INFO
@@ -9,7 +9,7 @@ License: SIP
Platform: X11
Platform: macOS
@@ -11,10 +11,10 @@
License-File: LICENSE
License-File: LICENSE-GPL3
License-File: LICENSE-GPL2
-Index: PyQt6_sip-13.5.1/PyQt6_sip.egg-info/PKG-INFO
+Index: PyQt6_sip-13.5.2/PyQt6_sip.egg-info/PKG-INFO
===================================================================
---- PyQt6_sip-13.5.1.orig/PyQt6_sip.egg-info/PKG-INFO
-+++ PyQt6_sip-13.5.1/PyQt6_sip.egg-info/PKG-INFO
+--- PyQt6_sip-13.5.2.orig/PyQt6_sip.egg-info/PKG-INFO
++++ PyQt6_sip-13.5.2/PyQt6_sip.egg-info/PKG-INFO
@@ -9,7 +9,7 @@ License: SIP
Platform: X11
Platform: macOS
@@ -24,22 +24,22 @@
License-File: LICENSE
License-File: LICENSE-GPL3
License-File: LICENSE-GPL2
-Index: PyQt6_sip-13.5.1/setup.py
+Index: PyQt6_sip-13.5.2/setup.py
===================================================================
---- PyQt6_sip-13.5.1.orig/setup.py
-+++ PyQt6_sip-13.5.1/setup.py
+--- PyQt6_sip-13.5.2.orig/setup.py
++++ PyQt6_sip-13.5.2/setup.py
@@ -40,6 +40,6 @@ setup(
name='PyQt6_sip',
- version='13.5.1',
+ version='13.5.2',
license='SIP',
- python_requires='>=3.7',
+ python_requires='>=3.6',
ext_modules=[module]
)
-Index: PyQt6_sip-13.5.1/sip.h
+Index: PyQt6_sip-13.5.2/sip.h
===================================================================
---- PyQt6_sip-13.5.1.orig/sip.h
-+++ PyQt6_sip-13.5.1/sip.h
+--- PyQt6_sip-13.5.2.orig/sip.h
++++ PyQt6_sip-13.5.2/sip.h
@@ -24,8 +24,8 @@
#include <Python.h>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-PyQt6 for openSUSE:Factory checked in at 2023-09-29 21:14:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyQt6 (Old)
and /work/SRC/openSUSE:Factory/.python-PyQt6.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyQt6"
Fri Sep 29 21:14:08 2023 rev:17 rq:1114143 version:6.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyQt6/python-PyQt6.changes 2023-07-25 11:51:32.229604917 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyQt6.new.28202/python-PyQt6.changes 2023-09-29 21:15:41.466332063 +0200
@@ -1,0 +2,7 @@
+Wed Sep 27 09:15:27 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Update to 6.5.2
+ * Added the missing NativeGesture, Quit, EnterEditFocus and
+ LeaveEditFocus members of QEventType.
+
+-------------------------------------------------------------------
Old:
----
PyQt6-6.5.1.tar.gz
New:
----
PyQt6-6.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyQt6.spec ++++++
--- /var/tmp/diff_new_pack.HcPlDb/_old 2023-09-29 21:15:42.718377237 +0200
+++ /var/tmp/diff_new_pack.HcPlDb/_new 2023-09-29 21:15:42.722377381 +0200
@@ -21,7 +21,7 @@
%define pyqt_build_for_qt6 1
%{?sle15_python_module_pythons}
Name: python-%{mname}
-Version: 6.5.1
+Version: 6.5.2
Release: 0
Summary: Python bindings for Qt 6
License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
++++++ PyQt6-6.5.1.tar.gz -> PyQt6-6.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/ChangeLog new/PyQt6-6.5.2/ChangeLog
--- old/PyQt6-6.5.1/ChangeLog 2023-06-02 12:40:57.300344000 +0200
+++ new/PyQt6-6.5.2/ChangeLog 2023-07-22 17:08:24.134214200 +0200
@@ -1,3 +1,95 @@
+2023-07-22 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * NEWS, extras/lupdate/python_source.py:
+ Fixed an exception in pylupdate.
+ [38c17a29338d] [6.5.2] <6.5-maint>
+
+2023-07-21 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * NEWS, qpy/QtCore/qstring.sip:
+ Fixed a regression in using None as a QString.
+ [6089948fc034] <6.5-maint>
+
+2023-07-15 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Fixed the type hints for all ellipsis arguments.
+ [dc5cc8a6f07d] <6.5-maint>
+
+2023-07-14 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * qpy/QtCore/qstring.sip:
+ Further fix fro QString's type hint.
+ [5c0f11c46cb1] <6.5-maint>
+
+ * NEWS, qpy/QtCore/qstring.sip:
+ Fixed the type hint for QString.
+ [2857fd3946c7] <6.5-maint>
+
+2023-07-12 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * PyQt6.msp:
+ Another type hint fix for QObject.findChild().
+ [dd57f73873eb] <6.5-maint>
+
+ * PyQt6.msp:
+ Fixed the type hints fro QObject.findChild() and
+ QObject.findChildren().
+ [b088d75e77d6] <6.5-maint>
+
+2023-07-09 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Fixed PYQT_SLOT for the QtCore module.
+ [f5cb0b97d94e] <6.5-maint>
+
+2023-07-05 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * extras/lupdate/python_source.py:
+ pylupdate will now look for tr() and translate() as a function as
+ well as a method.
+ [a0230e25929a] <6.5-maint>
+
+ * PyQt6.msp:
+ Fixed the type hint for pyqtSlot().
+ [b8e51995b3c5] <6.5-maint>
+
+ * PyQt6.msp:
+ Fixed the type hint for PYQT_SLOT.
+ [8c73a0c3dd1f] <6.5-maint>
+
+ * NEWS, PyQt6.msp, qpy/QtCore/qbytearrayview.sip:
+ Fixed the type hints for QByteArray and QByteArrayView.
+ [f631f8e6cc3e] <6.5-maint>
+
+2023-06-08 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp, project.py:
+ Added the missing QEvent.Type.EnterEditFocus and
+ QEvent.Type.LeaveEditFocus enum members.
+ [a8d9583f33d9] <6.5-maint>
+
+ * NEWS, PyQt6.msp:
+ Added the missing QEvent.Type.NativeGesture and QEvent.Type.Quit
+ enum members.
+ [ebd0738bb268] <6.5-maint>
+
+2023-06-04 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * NEWS:
+ Updated the NEWS file.
+ [6590e301a19c] <6.5-maint>
+
+ * config-tests/cfgtest_QtCore.cpp:
+ Fixed building against Qt older than v6.5.
+ [4860e1d699d4] <6.5-maint>
+
+2023-06-02 Phil Thompson <phil(a)riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 6.5.1 for changeset 443f350df939
+ [9d6e72a95cae] <6.5-maint>
+
2023-05-26 Phil Thompson <phil(a)riverbankcomputing.com>
* NEWS, qpy/QtCore/qpycore_pyqtboundsignal.cpp:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/NEWS new/PyQt6-6.5.2/NEWS
--- old/PyQt6-6.5.1/NEWS 2023-06-02 12:40:57.301942800 +0200
+++ new/PyQt6-6.5.2/NEWS 2023-07-22 17:08:24.136437000 +0200
@@ -1,3 +1,8 @@
+v6.5.2 22nd July 2023
+ - Added the missing NativeGesture, Quit, EnterEditFocus and LeaveEditFocus
+ members of QEventType.
+ - Bug fixes.
+
v6.5.1 26th May 2023
- Added support for QPermission and related classes and methods.
- Added the max_workers argument to uic.compileUiDir() to specifiy the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/PKG-INFO new/PyQt6-6.5.2/PKG-INFO
--- old/PyQt6-6.5.1/PKG-INFO 2023-06-02 12:41:06.071410200 +0200
+++ new/PyQt6-6.5.2/PKG-INFO 2023-07-22 17:08:32.899154400 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt6
-Version: 6.5.1
+Version: 6.5.2
Requires-Python: >=3.6.1
Summary: Python bindings for the Qt cross platform application toolkit
Home-Page: https://www.riverbankcomputing.com/software/pyqt/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/config-tests/cfgtest_QtCore.cpp new/PyQt6-6.5.2/config-tests/cfgtest_QtCore.cpp
--- old/PyQt6-6.5.1/config-tests/cfgtest_QtCore.cpp 2023-06-02 12:40:57.311180600 +0200
+++ new/PyQt6-6.5.2/config-tests/cfgtest_QtCore.cpp 2023-07-22 17:08:24.145340200 +0200
@@ -31,7 +31,7 @@
if (sizeof (qreal) != sizeof (double))
out << "PyQt_qreal_double\n";
-#if !QT_CONFIG(permissions)
+#if QT_VERSION < 0x060500 || !QT_CONFIG(permissions)
out << "PyQt_Permissions";
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/lupdate/python_source.py new/PyQt6-6.5.2/lupdate/python_source.py
--- old/PyQt6-6.5.1/lupdate/python_source.py 2023-06-02 12:40:57.511485600 +0200
+++ new/PyQt6-6.5.2/lupdate/python_source.py 2023-07-22 17:08:24.334739000 +0200
@@ -149,11 +149,6 @@
if isinstance(node.func, ast.Attribute):
name = node.func.attr
- if name == 'tr':
- call_args = self._parse_tr(node)
- elif name == 'translate':
- call_args = self._parse_translate(node)
-
elif isinstance(node.func, ast.Name):
name = node.func.id
@@ -161,6 +156,14 @@
call_args = self._parse_QT_TR_NOOP(node)
elif name == 'QT_TRANSLATE_NOOP':
call_args = self._parse_QT_TRANSLATE_NOOP(node)
+ else:
+ name = ''
+
+ # Allow these to be either methods or functions.
+ if name == 'tr':
+ call_args = self._parse_tr(node)
+ elif name == 'translate':
+ call_args = self._parse_translate(node)
# Update the context if the arguments are usable.
if call_args is not None and call_args.source != '':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/project.py new/PyQt6-6.5.2/project.py
--- old/PyQt6-6.5.1/project.py 2023-06-02 12:40:57.553051200 +0200
+++ new/PyQt6-6.5.2/project.py 2023-07-22 17:08:24.376157800 +0200
@@ -505,7 +505,8 @@
def __init__(self, project):
""" Initialise the bindings. """
- super().__init__(project, 'QtCore', qmake_QT=['-gui'])
+ super().__init__(project, 'QtCore', qmake_QT=['-gui'],
+ define_macros=['QT_KEYPAD_NAVIGATION'])
def handle_test_output(self, test_output):
""" Handle the output from the external test program and return True if
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/pyproject.toml new/PyQt6-6.5.2/pyproject.toml
--- old/PyQt6-6.5.1/pyproject.toml 2023-06-02 12:40:57.553341000 +0200
+++ new/PyQt6-6.5.2/pyproject.toml 2023-07-22 17:08:24.376478700 +0200
@@ -6,7 +6,7 @@
# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQt6"
-version = "6.5.1"
+version = "6.5.2"
summary = "Python bindings for the Qt cross platform application toolkit"
home-page = "https://www.riverbankcomputing.com/software/pyqt/"
author = "Riverbank Computing Limited"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/QtCoremod.sip new/PyQt6-6.5.2/sip/QtCore/QtCoremod.sip
--- old/PyQt6-6.5.1/sip/QtCore/QtCoremod.sip 2023-06-02 12:41:05.022572000 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/QtCoremod.sip 2023-07-22 17:08:31.887981400 +0200
@@ -75,8 +75,8 @@
const char *PYQT_VERSION_STR;
%ModuleCode
-static int PYQT_VERSION = 0x060501;
-static const char *PYQT_VERSION_STR = "6.5.1";
+static int PYQT_VERSION = 0x060502;
+static const char *PYQT_VERSION_STR = "6.5.2";
%End
%Include qglobal.sip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/qbytearray.sip new/PyQt6-6.5.2/sip/QtCore/qbytearray.sip
--- old/PyQt6-6.5.1/sip/QtCore/qbytearray.sip 2023-06-02 12:41:05.108444500 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/qbytearray.sip 2023-07-22 17:08:31.952804800 +0200
@@ -24,7 +24,7 @@
#include <qbytearray.h>
%End
-class QByteArray
+class QByteArray /TypeHintIn="Union[QByteArray, bytes, bytearray, memoryview]"/
{
%TypeHeaderCode
#include <qbytearray.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/qbytearrayview.sip new/PyQt6-6.5.2/sip/QtCore/qbytearrayview.sip
--- old/PyQt6-6.5.1/sip/QtCore/qbytearrayview.sip 2023-06-02 12:41:05.128395000 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/qbytearrayview.sip 2023-07-22 17:08:31.992654600 +0200
@@ -18,11 +18,7 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-// Note that the typing module doesn't have the means for describing objects
-// that implement the buffer protocol. We therefore just document the common
-// cases for documentation purposes even though all of them are accessed via
-// the buffer protocol.
-%MappedType QByteArrayView /TypeHint="Union[QByteArray, bytes, bytearray, memoryview]"/
+%MappedType QByteArrayView /TypeHint="QByteArray"/
{
%TypeHeaderCode
#include <qbytearrayview.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/qcoreapplication.sip new/PyQt6-6.5.2/sip/QtCore/qcoreapplication.sip
--- old/PyQt6-6.5.1/sip/QtCore/qcoreapplication.sip 2023-06-02 12:41:05.008861800 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/qcoreapplication.sip 2023-07-22 17:08:31.853528000 +0200
@@ -353,7 +353,7 @@
# Convenient type aliases.
PYQT_SIGNAL = typing.Union[QtCore.pyqtSignal, QtCore.pyqtBoundSignal]
-PYQT_SLOT = typing.Union[typing.Callable[..., None], QtCore.pyqtBoundSignal]
+PYQT_SLOT = typing.Union[typing.Callable[..., Any], QtCore.pyqtBoundSignal]
%End
%TypeHintCode
@@ -393,7 +393,15 @@
def emit(self, *args: typing.Any) -> None: ...
+FuncT = typing.TypeVar('FuncT', bound=typing.Callable)
+def pyqtSlot(*types, name: typing.Optional[str] = ..., result: typing.Optional[str] = ...) -> typing.Callable[[FuncT], FuncT]: ...
+
+
+# For QObject.findChild() and QObject.findChildren().
+QObjectT = typing.TypeVar('QObjectT', bound=QObject)
+
+
# Convenient type aliases.
PYQT_SIGNAL = typing.Union[pyqtSignal, pyqtBoundSignal]
-PYQT_SLOT = typing.Union[typing.Callable[..., None], pyqtBoundSignal]
+PYQT_SLOT = typing.Union[typing.Callable[..., Any], pyqtBoundSignal]
%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/qcoreevent.sip new/PyQt6-6.5.2/sip/QtCore/qcoreevent.sip
--- old/PyQt6-6.5.1/sip/QtCore/qcoreevent.sip 2023-06-02 12:41:05.017321600 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/qcoreevent.sip 2023-07-22 17:08:31.882551400 +0200
@@ -69,6 +69,7 @@
Show,
Hide,
Close,
+ Quit,
ParentChange,
ParentAboutToChange,
ThreadChange,
@@ -180,6 +181,7 @@
TouchBegin,
TouchUpdate,
TouchEnd,
+ NativeGesture,
RequestSoftwareInputPanel,
CloseSoftwareInputPanel,
WinIdChange,
@@ -198,6 +200,8 @@
PlatformSurface,
TabletTrackingChange,
GraphicsSceneLeave,
+ EnterEditFocus,
+ LeaveEditFocus,
User,
MaxUser,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/qobject.sip new/PyQt6-6.5.2/sip/QtCore/qobject.sip
--- old/PyQt6-6.5.1/sip/QtCore/qobject.sip 2023-06-02 12:41:04.975372600 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/qobject.sip 2023-07-22 17:08:31.839393600 +0200
@@ -374,7 +374,7 @@
sipRes = new QString(QCoreApplication::translate(sipPyTypeName((PyTypeObject *)sipSelf), a0, a1, a2));
%End
- SIP_PYOBJECT findChild(SIP_PYTYPE type, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="QObject"/;
+ SIP_PYOBJECT findChild(SIP_PYTYPE type /TypeHint="Type[QObjectT]"/, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="QObjectT"/;
%MethodCode
sipRes = qtcore_FindChild(sipCpp, qtcore_type_to_tuple(a0), *a1, *a2);
@@ -382,7 +382,7 @@
sipIsErr = 1;
%End
- SIP_PYOBJECT findChild(SIP_PYTUPLE types /TypeHintValue="()"/, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="QObject"/;
+ SIP_PYOBJECT findChild(SIP_PYTUPLE types /TypeHint="Tuple[Type[QObjectT], ...]", TypeHintValue="()"/, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="QObjectT"/;
%MethodCode
sipRes = qtcore_FindChild(sipCpp, qtcore_check_tuple_types(a0), *a1, *a2);
@@ -390,7 +390,7 @@
sipIsErr = 1;
%End
- SIP_PYLIST findChildren(SIP_PYTYPE type, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObject]"/;
+ SIP_PYLIST findChildren(SIP_PYTYPE type /TypeHint="Type[QObjectT]"/, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObjectT]"/;
%MethodCode
sipRes = qtcore_FindChildren(sipCpp, qtcore_type_to_tuple(a0), *a1, *a2);
@@ -398,7 +398,7 @@
sipIsErr = 1;
%End
- SIP_PYLIST findChildren(SIP_PYTUPLE types /TypeHintValue="()"/, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObject]"/;
+ SIP_PYLIST findChildren(SIP_PYTUPLE types /TypeHint="Tuple[Type[QObjectT], ...]", TypeHintValue="()"/, const QString &name = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObjectT]"/;
%MethodCode
sipRes = qtcore_FindChildren(sipCpp, qtcore_check_tuple_types(a0), *a1, *a2);
@@ -406,7 +406,7 @@
sipIsErr = 1;
%End
- SIP_PYLIST findChildren(SIP_PYTYPE type, const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObject]"/;
+ SIP_PYLIST findChildren(SIP_PYTYPE type /TypeHint="Type[QObjectT]"/, const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObjectT]"/;
%MethodCode
sipRes = qtcore_FindChildren(sipCpp, qtcore_type_to_tuple(a0), *a1, *a2);
@@ -414,7 +414,7 @@
sipIsErr = 1;
%End
- SIP_PYLIST findChildren(SIP_PYTUPLE types /TypeHintValue="()"/, const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObject]"/;
+ SIP_PYLIST findChildren(SIP_PYTUPLE types /TypeHint="Tuple[Type[QObjectT], ...]", TypeHintValue="()"/, const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const /TypeHint="List[QObjectT]"/;
%MethodCode
sipRes = qtcore_FindChildren(sipCpp, qtcore_check_tuple_types(a0), *a1, *a2);
@@ -556,7 +556,7 @@
sipRes = qpycore_pyqtEnum(a0);
%End
-SIP_PYOBJECT pyqtSlot(... types, const char *name = 0, const char *result = 0) /NoArgParser/;
+SIP_PYOBJECT pyqtSlot(... types, const char *name = 0, const char *result = 0) /NoArgParser, NoTypeHint/;
%Docstring
@pyqtSlot(*types, name: typing.Optional[str], result: typing.Optional[str])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtCore/qstring.sip new/PyQt6-6.5.2/sip/QtCore/qstring.sip
--- old/PyQt6-6.5.1/sip/QtCore/qstring.sip 2023-06-02 12:41:04.968230500 +0200
+++ new/PyQt6-6.5.2/sip/QtCore/qstring.sip 2023-07-22 17:08:31.832251500 +0200
@@ -18,7 +18,7 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-%MappedType QString /AllowNone,TypeHint="str",TypeHintValue="''"/
+%MappedType QString /AllowNone, TypeHintIn="Optional[str]", TypeHintOut="str", TypeHintValue="''"/
{
%TypeHeaderCode
#include <qstring.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtGui/qpainter.sip new/PyQt6-6.5.2/sip/QtGui/qpainter.sip
--- old/PyQt6-6.5.1/sip/QtGui/qpainter.sip 2023-06-02 12:41:04.569005300 +0200
+++ new/PyQt6-6.5.2/sip/QtGui/qpainter.sip 2023-07-22 17:08:31.438242200 +0200
@@ -193,7 +193,7 @@
void drawPoints(const QPolygonF &points);
void drawPoints(const QPolygon &points);
void drawPoints(const QPointF *points /Array/, int pointCount /ArraySize/);
- void drawPoints(const QPointF *point, ...);
+ void drawPoints(const QPointF *point, ... /TypeHint="QPointF"/);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -207,7 +207,7 @@
%End
void drawPoints(const QPoint *points /Array/, int pointCount /ArraySize/);
- void drawPoints(const QPoint *point, ...);
+ void drawPoints(const QPoint *point, ... /TypeHint="QPoint"/);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -221,7 +221,7 @@
%End
void drawLines(const QLineF *lines /Array/, int lineCount /ArraySize/);
- void drawLines(const QLineF *line, ...);
+ void drawLines(const QLineF *line, ... /TypeHint="QLineF"/);
%MethodCode
QLineF *lines = qtgui_inst_array<QLineF>(a0, a1, sipType_QLineF);
@@ -239,7 +239,7 @@
sipCpp->drawLines(a0, a1 / 2);
%End
- void drawLines(const QPointF *pointPair, ...);
+ void drawLines(const QPointF *pointPair, ... /TypeHint="QPointF"/);
%MethodCode
QPointF *pairs = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -253,7 +253,7 @@
%End
void drawLines(const QLine *lines /Array/, int lineCount /ArraySize/);
- void drawLines(const QLine *line, ...);
+ void drawLines(const QLine *line, ... /TypeHint="QLine"/);
%MethodCode
QLine *lines = qtgui_inst_array<QLine>(a0, a1, sipType_QLine);
@@ -271,7 +271,7 @@
sipCpp->drawLines(a0, a1 / 2);
%End
- void drawLines(const QPoint *pointPair, ...);
+ void drawLines(const QPoint *pointPair, ... /TypeHint="QPoint"/);
%MethodCode
QPoint *pairs = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -285,7 +285,7 @@
%End
void drawRects(const QRectF *rects /Array/, int rectCount /ArraySize/);
- void drawRects(const QRectF *rect, ...);
+ void drawRects(const QRectF *rect, ... /TypeHint="QRectF"/);
%MethodCode
QRectF *rects = qtgui_inst_array<QRectF>(a0, a1, sipType_QRectF);
@@ -299,7 +299,7 @@
%End
void drawRects(const QRect *rects /Array/, int rectCount /ArraySize/);
- void drawRects(const QRect *rect, ...);
+ void drawRects(const QRect *rect, ... /TypeHint="QRect"/);
%MethodCode
QRect *rects = qtgui_inst_array<QRect>(a0, a1, sipType_QRect);
@@ -317,7 +317,7 @@
void drawPolyline(const QPolygonF &polyline);
void drawPolyline(const QPolygon &polyline);
void drawPolyline(const QPointF *points /Array/, int pointCount /ArraySize/);
- void drawPolyline(const QPointF *point, ...);
+ void drawPolyline(const QPointF *point, ... /TypeHint="QPointF"/);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -331,7 +331,7 @@
%End
void drawPolyline(const QPoint *points /Array/, int pointCount /ArraySize/);
- void drawPolyline(const QPoint *point, ...);
+ void drawPolyline(const QPoint *point, ... /TypeHint="QPoint"/);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -347,7 +347,7 @@
void drawPolygon(const QPolygonF &points, Qt::FillRule fillRule = Qt::OddEvenFill);
void drawPolygon(const QPolygon &points, Qt::FillRule fillRule = Qt::OddEvenFill);
void drawPolygon(const QPointF *points /Array/, int pointCount /ArraySize/, Qt::FillRule fillRule = Qt::OddEvenFill);
- void drawPolygon(const QPointF *point, ...);
+ void drawPolygon(const QPointF *point, ... /TypeHint="QPointF"/);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -361,7 +361,7 @@
%End
void drawPolygon(const QPoint *points /Array/, int pointCount /ArraySize/, Qt::FillRule fillRule = Qt::OddEvenFill);
- void drawPolygon(const QPoint *point, ...);
+ void drawPolygon(const QPoint *point, ... /TypeHint="QPoint"/);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -377,7 +377,7 @@
void drawConvexPolygon(const QPolygonF &poly);
void drawConvexPolygon(const QPolygon &poly);
void drawConvexPolygon(const QPointF *points /Array/, int pointCount /ArraySize/);
- void drawConvexPolygon(const QPointF *point, ...);
+ void drawConvexPolygon(const QPointF *point, ... /TypeHint="QPointF"/);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -391,7 +391,7 @@
%End
void drawConvexPolygon(const QPoint *points /Array/, int pointCount /ArraySize/);
- void drawConvexPolygon(const QPoint *point, ...);
+ void drawConvexPolygon(const QPoint *point, ... /TypeHint="QPoint"/);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6-6.5.1/sip/QtGui/qpolygon.sip new/PyQt6-6.5.2/sip/QtGui/qpolygon.sip
--- old/PyQt6-6.5.1/sip/QtGui/qpolygon.sip 2023-06-02 12:41:04.531709400 +0200
+++ new/PyQt6-6.5.2/sip/QtGui/qpolygon.sip 2023-07-22 17:08:31.400129600 +0200
@@ -63,7 +63,7 @@
QPoint point(int i) const;
void setPoint(int index, int x, int y);
void setPoint(int index, const QPoint &p);
- void setPoints(int firstx, int firsty, ...);
+ void setPoints(int firstx, int firsty, ... /TypeHint="int"/);
%MethodCode
// Accept at least one pair of integer coordinates.
int nPoints = 1 + ((PyTuple_Size(a2) + 1) >> 1);
@@ -81,7 +81,7 @@
delete[] points;
%End
- void putPoints(int index, int firstx, int firsty, ...);
+ void putPoints(int index, int firstx, int firsty, ... /TypeHint="int"/);
%MethodCode
// Accept at least one pair of integer coordinates.
int nPoints = 1 + ((PyTuple_Size(a3) + 1) >> 1);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qscintilla for openSUSE:Factory checked in at 2023-09-29 21:14:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla (Old)
and /work/SRC/openSUSE:Factory/.qscintilla.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla"
Fri Sep 29 21:14:07 2023 rev:6 rq:1114141 version:2.14.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2023-01-31 16:20:22.993660908 +0100
+++ /work/SRC/openSUSE:Factory/.qscintilla.new.28202/qscintilla.changes 2023-09-29 21:15:39.526262066 +0200
@@ -1,0 +2,11 @@
+Wed Sep 27 09:10:13 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Update to 2.14.1
+ * Bug fixes.
+- Release 2.14.0
+ * Added the QsciLexerAsm, QsciLexerMASM and QsciLexerNASM classes.
+ * Added the QsciLexerHex, QsciLexerIntelHex, QsciLexerSRec and
+ QsciLexerTekHex classes.
+ * Bug fixes.
+
+-------------------------------------------------------------------
Old:
----
QScintilla_src-2.13.4.tar.gz
New:
----
QScintilla_src-2.14.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.VzMoVc/_old 2023-09-29 21:15:40.802308106 +0200
+++ /var/tmp/diff_new_pack.VzMoVc/_new 2023-09-29 21:15:40.806308249 +0200
@@ -51,7 +51,7 @@
%define debug_package_requires libqscintilla2_qt5-%{sonum} = %{version}-%{release}
%define sonum 15
Name: qscintilla%{?psuffix}
-Version: 2.13.4
+Version: 2.14.1
Release: 0
Summary: C++ Editor Class Library
License: GPL-3.0-only
++++++ QScintilla_src-2.13.4.tar.gz -> QScintilla_src-2.14.1.tar.gz ++++++
++++ 43936 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2023-09-29 21:14:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Sep 29 21:14:06 2023 rev:506 rq:1114121 version:20230928.864b176
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2023-09-28 00:40:18.244838474 +0200
+++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28202/openSUSE-release-tools.changes 2023-09-29 21:15:37.210178502 +0200
@@ -1,0 +2,6 @@
+Thu Sep 28 16:50:58 UTC 2023 - opensuse-releaseteam(a)opensuse.org
+
+- Update to version 20230928.864b176:
+ * Disable aggregating over financial year
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20230925.6075c72.obscpio
New:
----
openSUSE-release-tools-20230928.864b176.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.64HfVj/_old 2023-09-29 21:15:38.486224541 +0200
+++ /var/tmp/diff_new_pack.64HfVj/_new 2023-09-29 21:15:38.490224686 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20230925.6075c72
+Version: 20230928.864b176
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.64HfVj/_old 2023-09-29 21:15:38.522225840 +0200
+++ /var/tmp/diff_new_pack.64HfVj/_new 2023-09-29 21:15:38.526225984 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param name="changesrevision">6075c72ca857cdcabb28d2a76280a4b29f7e20e2</param>
+ <param name="changesrevision">864b17693c3af44db38fe9d8dc26ca50240912d6</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20230925.6075c72.obscpio -> openSUSE-release-tools-20230928.864b176.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20230925.6075c72/metrics/access/aggregate.php new/openSUSE-release-tools-20230928.864b176/metrics/access/aggregate.php
--- old/openSUSE-release-tools-20230925.6075c72/metrics/access/aggregate.php 2023-09-25 16:31:17.000000000 +0200
+++ new/openSUSE-release-tools-20230928.864b176/metrics/access/aggregate.php 2023-09-28 18:49:30.000000000 +0200
@@ -154,7 +154,7 @@
function aggregate_all($period)
{
global $CACHE_DIR;
- $intervals = ['day' => 'Y-m-d', 'week' => 'Y-W', 'month' => 'Y-m', 'FQ' => null, 'FY' => null];
+ $intervals = ['day' => 'Y-m-d', 'week' => 'Y-W', 'month' => 'Y-m', 'FQ' => null];
$merged = [];
$merged_protocol = [];
$date_previous = null;
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.64HfVj/_old 2023-09-29 21:15:39.326254849 +0200
+++ /var/tmp/diff_new_pack.64HfVj/_new 2023-09-29 21:15:39.330254994 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20230925.6075c72
-mtime: 1695652277
-commit: 6075c72ca857cdcabb28d2a76280a4b29f7e20e2
+version: 20230928.864b176
+mtime: 1695919770
+commit: 864b17693c3af44db38fe9d8dc26ca50240912d6
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Math-BigInt for openSUSE:Factory checked in at 2023-09-29 21:14:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Math-BigInt (Old)
and /work/SRC/openSUSE:Factory/.perl-Math-BigInt.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Math-BigInt"
Fri Sep 29 21:14:05 2023 rev:47 rq:1114118 version:1.999842
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Math-BigInt/perl-Math-BigInt.changes 2023-07-27 16:52:24.390355995 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Math-BigInt.new.28202/perl-Math-BigInt.changes 2023-09-29 21:15:33.418041682 +0200
@@ -1,0 +2,31 @@
+Thu Sep 28 03:07:38 UTC 2023 - Tina Müller <timueller+perl(a)suse.de>
+
+- updated to 1.999842
+ see /usr/share/doc/packages/perl-Math-BigInt/CHANGES
+
+ 1.999842 2023-09-27
+ * Fix a bug causing Math::BigInt and Math::BigFloat to be caught in an endless
+ recursion. The bug was introduced when trying to fix
+ https://github.com/pjacklam/p5-Math-BigInt/issues/8
+ * Allow div_scale to be 0. It is not documented what div_scale <= 0 means, but
+ there are modules that set div_scale to 0 (e.g., Astro::Units) and fail
+ their tests if this is not supported.
+ 1.999841 2023-09-21
+ * Remove development files that were accidentally included in the
+ distribution.
+ 1.999840 2023-09-18
+ * Add methods bblsft() and bbrsft(), which do bitwise left and right shift,
+ respectively. The binary operators for bitwise left and right shift, "<<"
+ and ">>", now call the methods bblsft() and bbrsft(), respectively.
+ While this behaviour is consistent with how "<<" and ">>" work on floating
+ point numbers in core Perl, it changes how "<<" and ">>" worked on
+ Math::BigFloat objects. This is a corner case, but any code currently using
+ "<<" and ">>" on Math::BigFloat objects might need to be modified as follows
+ $x >>= $y should be changed to $x -> brsft($y)
+ $x <<= $y should be changed to $x -> blsft($y)
+ $x >> $y should be changed to $x -> copy() -> brsft($y)
+ $x << $y should be changed to $x -> copy() -> blsft($y)
+ * Improve blsft() and brsft(). They now support negative shift values, an
+ arbitrarily large base, and have better handling of cases involving NaN.
+
+-------------------------------------------------------------------
Old:
----
Math-BigInt-1.999839.tar.gz
New:
----
Math-BigInt-1.999842.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Math-BigInt.spec ++++++
--- /var/tmp/diff_new_pack.1QiPUl/_old 2023-09-29 21:15:35.314110091 +0200
+++ /var/tmp/diff_new_pack.1QiPUl/_new 2023-09-29 21:15:35.330110669 +0200
@@ -18,7 +18,7 @@
%define cpan_name Math-BigInt
Name: perl-Math-BigInt
-Version: 1.999839
+Version: 1.999842
Release: 0
License: Artistic-1.0 OR GPL-1.0-or-later
Summary: Arbitrary size integer math package
@@ -34,11 +34,6 @@
BuildRequires: perl(Test::More) >= 0.94
Requires: perl(Carp) >= 1.22
Requires: perl(Math::Complex) >= 1.36
-Provides: perl(Math::BigFloat) = 1.999839
-Provides: perl(Math::BigInt) = 1.999839
-Provides: perl(Math::BigInt::Calc) = 1.999839
-Provides: perl(Math::BigInt::Lib) = 1.999839
-%define __perllib_provides /bin/true
%{perl_requires}
# MANUAL BEGIN
Recommends: perl(bignum) >= 0.22
++++++ Math-BigInt-1.999839.tar.gz -> Math-BigInt-1.999842.tar.gz ++++++
++++ 2575 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocserv for openSUSE:Factory checked in at 2023-09-29 21:14:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocserv (Old)
and /work/SRC/openSUSE:Factory/.ocserv.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocserv"
Fri Sep 29 21:14:04 2023 rev:22 rq:1114117 version:1.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocserv/ocserv.changes 2023-09-02 22:08:32.553170775 +0200
+++ /work/SRC/openSUSE:Factory/.ocserv.new.28202/ocserv.changes 2023-09-29 21:15:31.053956387 +0200
@@ -1,0 +2,9 @@
+Mon Sep 25 08:41:26 UTC 2023 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 1.2.2
+ * Fix session and accounting data tracking of ocserv. This
+ reverts fix for #444 (#541)
+ * No longer account ICMP and IGMP data for idle session detection
+- Update URL
+
+-------------------------------------------------------------------
Old:
----
ocserv-1.2.1.tar.xz
ocserv-1.2.1.tar.xz.sig
New:
----
ocserv-1.2.2.tar.xz
ocserv-1.2.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocserv.spec ++++++
--- /var/tmp/diff_new_pack.oQ6dMl/_old 2023-09-29 21:15:32.850021189 +0200
+++ /var/tmp/diff_new_pack.oQ6dMl/_new 2023-09-29 21:15:32.850021189 +0200
@@ -17,12 +17,13 @@
Name: ocserv
-Version: 1.2.1
+Version: 1.2.2
Release: 0
Summary: OpenConnect VPN Server
License: GPL-2.0-only
Group: Productivity/Networking/Security
-URL: http://www.infradead.org/ocserv
+URL: https://ocserv.gitlab.io/www/
+#Git-Clone: https://gitlab.com/openconnect/ocserv.git
Source: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
Source1: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
Source2: ca.tmpl
@@ -40,15 +41,14 @@
Patch3: %{name}-LZ4_compress_default.patch
BuildRequires: autogen
BuildRequires: dbus-1-devel
-%if 0%{suse_version} >= 1500
BuildRequires: firewall-macros
-%endif
BuildRequires: freeradius-client-devel
BuildRequires: gperf
BuildRequires: gpg2
BuildRequires: libev-devel
#!BuildIgnore: libevent-devel
BuildRequires: libgnutls-devel >= 3.1.10
+BuildRequires: liblz4-devel
BuildRequires: libmaxminddb-devel
BuildRequires: libnl3-devel
BuildRequires: libprotobuf-c-devel
@@ -64,11 +64,7 @@
BuildRequires: rubygem(ronn)
# /usr/bin/certtool for generating certificates
Requires: gnutls >= 3.1.10
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
-%if 0%{?suse_version} > 1310
-BuildRequires: liblz4-devel
-%endif
%description
OpenConnect server (ocserv) is an SSL VPN server. Its purpose is to
@@ -110,9 +106,7 @@
make %{?_smp_mflags} DESTDIR=%{buildroot} install
install -Dm 0755 %{SOURCE5} %{buildroot}%{_sbindir}/ocserv-forwarding
-%if 0%{suse_version} >= 1500
install -D -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/firewalld/services/ocserv.xml
-%endif
install -d %{buildroot}%{_sysconfdir}/ocserv/certificates
install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ocserv/certificates
@@ -136,9 +130,7 @@
%post
%service_add_post ocserv.service ocserv.socket
-%if 0%{suse_version} >= 1500
%firewalld_reload
-%endif
%preun
%service_del_preun ocserv.service ocserv.socket
@@ -151,11 +143,9 @@
%doc AUTHORS NEWS README.md
%license COPYING
%config %{_sysconfdir}/ocserv
-%if 0%{suse_version} >= 1500
%dir %{_prefix}/lib/firewalld
%dir %{_prefix}/lib/firewalld/services
%{_prefix}/lib/firewalld/services/ocserv.xml
-%endif
%{_bindir}/occtl
%{_bindir}/ocpasswd
%{_bindir}/ocserv-script
++++++ ocserv-1.2.1.tar.xz -> ocserv-1.2.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/AUTHORS new/ocserv-1.2.2/AUTHORS
--- old/ocserv-1.2.1/AUTHORS 2023-08-22 15:11:05.000000000 +0200
+++ new/ocserv-1.2.2/AUTHORS 2023-09-21 21:14:26.000000000 +0200
@@ -16,11 +16,11 @@
William Dauchy <w.dauchy at criteo.com>
Alexey Dotsenko <lex at rwx.su>
Daniel Lenski <daniel.lenski at finalphasesystems.com>
+Dimitri Papadopoulos <3234522+DimitriPapadopoulos at users.noreply.github.com>
Frank Huang <chuang213 at gmail.com>
Joerg Mayer <jmayer at loplof.de>
Björn Ketelaars <bjorn.ketelaars at hydroxide.nl>
David Woodhouse <dwmw2 at infradead.org>
-Dimitri Papadopoulos <3234522+DimitriPapadopoulos at users.noreply.github.com>
Faidon Liambotis <paravoid at debian.org>
John Thiltges <jthiltges2 at unl.edu>
Leendert van Doorn <leendert at paramecium.org>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/ChangeLog new/ocserv-1.2.2/ChangeLog
--- old/ocserv-1.2.1/ChangeLog 2023-08-22 15:11:06.000000000 +0200
+++ new/ocserv-1.2.2/ChangeLog 2023-09-21 21:14:27.000000000 +0200
@@ -1,3 +1,181 @@
+commit f616475643783995c4208ae205e288019eec18e5
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Thu Sep 21 21:14:05 2023 +0200
+
+ released 1.2.2
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit ac49187a7ce4735d1de6c629558963e8b28e9b6e
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Wed Sep 20 22:10:53 2023 +0200
+
+ doc update
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit 747940238dce29775aedec7a19f138065caaef8a
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Mon Sep 18 17:10:35 2023 +0200
+
+ tests: added test for idle and session timeout
+
+ This checks the functionality of idle-timeout and
+ session-timeout as well as whether the cookies are
+ invalidated after the user is disconnected.
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit 049d9e520e42575cfb56c951376b241635823be6
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Mon Sep 18 20:12:37 2023 +0200
+
+ worker: do not account ICMP/IGMP data for idle detection
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit b0c9ef1e0e45e126e3ed6e896b81f696772c46b7
+Merge: f71538d2 61b6f0a9
+Author: Dimitri Papadopoulos Orfanos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+Date: Fri Sep 15 13:57:33 2023 +0000
+
+ Merge branch 'static' into 'master'
+
+ Make functions static where it makes sense
+
+ See merge request openconnect/ocserv!370
+
+commit f71538d226d46e5dd7430f0b8733df43a09d1733
+Merge: a12873af d21d2c45
+Author: Dimitri Papadopoulos Orfanos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+Date: Fri Sep 15 13:57:00 2023 +0000
+
+ Merge branch 'static_camouflage' into 'master'
+
+ Make check_camouflage_url() static
+
+ See merge request openconnect/ocserv!368
+
+commit a12873af21f031a693be9438f8867a6a58fa6191
+Merge: 8f4e2de4 b29d9156
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Fri Sep 15 13:29:41 2023 +0000
+
+ Merge branch 'codespell' into 'master'
+
+ Fix misspelling newly reported by codespell
+
+ See merge request openconnect/ocserv!369
+
+commit 8f4e2de4b561147ed44d11441c7cc7db42ea908f
+Merge: fbfbdc05 fec6cc99
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Fri Sep 15 13:29:04 2023 +0000
+
+ Merge branch 'rc_avpair_add' into 'master'
+
+ worker: check the return value of rc_avpair_add()
+
+ Closes #546
+
+ See merge request openconnect/ocserv!372
+
+commit fbfbdc058ac3fb40f5d0bca3fc766a791b7d6ed6
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Fri Sep 15 15:06:01 2023 +0200
+
+ tests: use sec-mod-scale on cookie tests
+
+ This ensures we catch issues similar to !288.
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit 26258d7cb120939a92c5bfa6ebca016725b21c98
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Fri Sep 15 11:11:50 2023 +0200
+
+ Revert "Fixing issue: Authentication requests from the same IP address are not load balanced among security modules"
+
+ Each cookie is valid for its IP address and when reconnected it must
+ reach the same sec-mod that contains the corresponding session
+ information.
+
+ This reverts commit 4ec99609ca1d1ba986ee58a0695bab87c12ae7c7.
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit fec6cc99083f4f7b9064a23d33f1f30f89221224
+Author: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+Date: Fri Sep 15 13:43:27 2023 +0200
+
+ worker: check the return value of rc_avpair_add()
+
+ We have been checking the return value of rc_avpair_add() in all cases,
+ except the PW_NAS_IP_ADDRESS/PW_NAS_IPV6_ADDRESS cases.
+
+ Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+
+commit 61b6f0a9248a82742ff1961f09b06ab4a97926b8
+Author: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+Date: Mon Sep 11 19:38:44 2023 +0200
+
+ Make functions static where it makes sense
+
+ Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+
+commit b29d9156996fb8356093571357d68d6e2fa014b3
+Author: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+Date: Mon Sep 11 19:18:00 2023 +0200
+
+ Fix misspelling newly reported by codespell
+
+ Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+
+commit d21d2c455c6041bef294e2bb9b43c86680a31b40
+Author: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+Date: Mon Sep 11 19:03:27 2023 +0200
+
+ Make check_camouflage_url() static
+
+ It is called only from worker-vpn.c.
+
+ Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos(a)users.noreply.gitlab.com>
+
+commit 6dd533a10c37eb000056b774a02b55aaa31f578e
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Sat Sep 2 20:54:15 2023 +0200
+
+ bumped version
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
+commit 16b86e751ae3232a5420b8dbbb3416310f9b8d18
+Merge: 6aad62e2 ab8a05e4
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Sat Sep 2 18:52:26 2023 +0000
+
+ Merge branch 'TODO' into 'master'
+
+ Why not delete TODO instead of only emptying it?
+
+ See merge request openconnect/ocserv!365
+
+commit ab8a05e4c2eef5e20defe7a64e8e5145926f2efd
+Author: Dimitri Papadopoulos <3234522+DimitriPapadopoulos(a)users.noreply.github.com>
+Date: Fri Sep 1 18:26:29 2023 +0300
+
+ Why not delete TODO instead of only emptying it?
+
+ Signed-off-by: Dimitri Papadopoulos <3234522+DimitriPapadopoulos(a)users.noreply.github.com>
+
+commit 6aad62e2666044f23d0364d5696c852414181e78
+Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+Date: Mon Aug 28 20:48:02 2023 +0200
+
+ debug: increased default log-level to debug
+
+ Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
+
commit 895a23f372fd2ef7f29c8ccd635e33b32de0915f
Author: Nikos Mavrogiannopoulos <n.mavrogiannopoulos(a)gmail.com>
Date: Tue Aug 22 15:10:32 2023 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/Makefile.in new/ocserv-1.2.2/Makefile.in
--- old/ocserv-1.2.1/Makefile.in 2023-07-27 22:41:32.000000000 +0200
+++ new/ocserv-1.2.2/Makefile.in 2023-09-15 10:47:16.000000000 +0200
@@ -168,7 +168,7 @@
$(top_srcdir)/tests/data/pam/nss-passwd.in \
$(top_srcdir)/tests/data/pam/ocserv.in \
$(top_srcdir)/tests/data/raddb/radiusd.conf.in AUTHORS COPYING \
- ChangeLog INSTALL NEWS README.md TODO build-aux/ar-lib \
+ ChangeLog INSTALL NEWS README.md build-aux/ar-lib \
build-aux/compile build-aux/config.guess \
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/missing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/NEWS new/ocserv-1.2.2/NEWS
--- old/ocserv-1.2.1/NEWS 2023-08-22 15:10:12.000000000 +0200
+++ new/ocserv-1.2.2/NEWS 2023-09-21 21:13:51.000000000 +0200
@@ -1,3 +1,9 @@
+* Version 1.2.2 (released 2023-09-21)
+- Fix session and accounting data tracking of ocserv. This
+ reverts fix for #444 (#541)
+- No longer account ICMP and IGMP data for idle session detection
+
+
* Version 1.2.1 (released 2023-08-22)
- Accept the Clavister OneConnect VPN Android client (#485)
- No longer require to set device name per vhost (#480)
@@ -242,7 +248,7 @@
* Version 0.11.7 (released 2017-02-12)
-- Fixed compilation issue related to autogen file re-use
+- Fixed compilation issue related to autogen file reuse
- Send the "vpn-profile-manifest" fields after successful authentication.
This enables openconnect to retrieve the XML configuration.
- Enhanced the cert-user-oid config option to read the SAN(rfc822name) value.
@@ -574,7 +580,7 @@
- Added configuration option 'listen-host-is-dyndns'. That,
if set, notifies the client with "X-CSTP-DynDNS: true", in
CSTP headers.
-- When a client's IP is re-used by the same client connecting with
+- When a client's IP is reused by the same client connecting with
the cookie (e.g., when roaming), call the disconnect script.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/configure new/ocserv-1.2.2/configure
--- old/ocserv-1.2.1/configure 2023-07-27 22:41:31.000000000 +0200
+++ new/ocserv-1.2.2/configure 2023-09-15 10:47:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for ocserv 1.2.1.
+# Generated by GNU Autoconf 2.71 for ocserv 1.2.2.
#
# Report bugs to <openconnect-devel(a)lists.infradead.org>.
#
@@ -611,8 +611,8 @@
# Identity of this package.
PACKAGE_NAME='ocserv'
PACKAGE_TARNAME='ocserv'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='ocserv 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='ocserv 1.2.2'
PACKAGE_BUGREPORT='openconnect-devel(a)lists.infradead.org'
PACKAGE_URL=''
@@ -1559,7 +1559,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ocserv 1.2.1 to adapt to many kinds of systems.
+\`configure' configures ocserv 1.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1630,7 +1630,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ocserv 1.2.1:";;
+ short | recursive ) echo "Configuration of ocserv 1.2.2:";;
esac
cat <<\_ACEOF
@@ -1864,7 +1864,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ocserv configure 1.2.1
+ocserv configure 1.2.2
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2469,7 +2469,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ocserv $as_me 1.2.1, which was
+It was created by ocserv $as_me 1.2.2, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3873,7 +3873,7 @@
# Define the identity of the package.
PACKAGE='ocserv'
- VERSION='1.2.1'
+ VERSION='1.2.2'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -19739,7 +19739,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ocserv $as_me 1.2.1, which was
+This file was extended by ocserv $as_me 1.2.2, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19807,7 +19807,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-ocserv config.status 1.2.1
+ocserv config.status 1.2.2
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/configure.ac new/ocserv-1.2.2/configure.ac
--- old/ocserv-1.2.1/configure.ac 2023-07-27 15:50:33.000000000 +0200
+++ new/ocserv-1.2.2/configure.ac 2023-09-02 20:54:07.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ(2.61)
-AC_INIT([ocserv], [1.2.1], [openconnect-devel(a)lists.infradead.org]
+AC_INIT([ocserv], [1.2.2], [openconnect-devel(a)lists.infradead.org]
PKG_PROG_PKG_CONFIG
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/doc/Makefile.in new/ocserv-1.2.2/doc/Makefile.in
--- old/ocserv-1.2.1/doc/Makefile.in 2023-07-27 22:41:32.000000000 +0200
+++ new/ocserv-1.2.2/doc/Makefile.in 2023-09-15 10:47:16.000000000 +0200
@@ -383,9 +383,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ $(AUTOMAKE) --foreign doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/doc/ocserv.8 new/ocserv-1.2.2/doc/ocserv.8
--- old/ocserv-1.2.1/doc/ocserv.8 2023-07-11 17:04:53.000000000 +0200
+++ new/ocserv-1.2.2/doc/ocserv.8 2023-09-18 17:11:01.000000000 +0200
@@ -1,6 +1,6 @@
.\" generated with Ronn-NG/v0.9.1
.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "OCSERV" "8" "July 2023" ""
+.TH "OCSERV" "8" "September 2023" ""
.SH "NAME"
\fBocserv\fR \- OpenConnect VPN server
.SH "SYNOPSIS"
@@ -550,7 +550,7 @@
#persistent\-cookies = true
# Whether roaming is allowed, i\.e\., if true a cookie is
-# restricted to a single IP address and cannot be re\-used
+# restricted to a single IP address and cannot be reused
# from a different IP\.
deny\-roaming = false
@@ -622,7 +622,7 @@
# 4 http
# 8 sensitive
# 9 TLS
-log\-level = 1
+log\-level = 3
# Set the protocol\-defined priority (SO_PRIORITY) for packets to
# be sent\. That is a number from 0 to 6 with 0 being the lowest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/doc/sample.config new/ocserv-1.2.2/doc/sample.config
--- old/ocserv-1.2.1/doc/sample.config 2023-07-11 14:54:03.000000000 +0200
+++ new/ocserv-1.2.2/doc/sample.config 2023-09-15 15:59:02.000000000 +0200
@@ -376,7 +376,7 @@
#persistent-cookies = true
# Whether roaming is allowed, i.e., if true a cookie is
-# restricted to a single IP address and cannot be re-used
+# restricted to a single IP address and cannot be reused
# from a different IP.
deny-roaming = false
@@ -448,7 +448,7 @@
# 4 http
# 8 sensitive
# 9 TLS
-log-level = 1
+log-level = 3
# Set the protocol-defined priority (SO_PRIORITY) for packets to
# be sent. That is a number from 0 to 6 with 0 being the lowest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/Makefile.in new/ocserv-1.2.2/src/Makefile.in
--- old/ocserv-1.2.1/src/Makefile.in 2023-07-27 22:41:32.000000000 +0200
+++ new/ocserv-1.2.2/src/Makefile.in 2023-09-15 10:47:16.000000000 +0200
@@ -839,9 +839,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/auth/radius.c new/ocserv-1.2.2/src/auth/radius.c
--- old/ocserv-1.2.1/src/auth/radius.c 2023-06-17 06:37:42.000000000 +0200
+++ new/ocserv-1.2.2/src/auth/radius.c 2023-09-15 15:59:02.000000000 +0200
@@ -287,9 +287,21 @@
if (inet_pton(AF_INET, pctx->our_ip, &in) != 0) {
in.s_addr = ntohl(in.s_addr);
- rc_avpair_add(pctx->vctx->rh, &send, PW_NAS_IP_ADDRESS, (char*)&in, sizeof(struct in_addr), 0);
+ if (rc_avpair_add(pctx->vctx->rh, &send, PW_NAS_IP_ADDRESS, (char*)&in, sizeof(struct in_addr), 0) == NULL) {
+ syslog(LOG_ERR,
+ "%s:%u: error in constructing radius message for user '%s'", __func__, __LINE__,
+ pctx->username);
+ ret = ERR_AUTH_FAIL;
+ goto cleanup;
+ }
} else if (inet_pton(AF_INET6, pctx->our_ip, &in6) != 0) {
- rc_avpair_add(pctx->vctx->rh, &send, PW_NAS_IPV6_ADDRESS, (char*)&in6, sizeof(struct in6_addr), 0);
+ if (rc_avpair_add(pctx->vctx->rh, &send, PW_NAS_IPV6_ADDRESS, (char*)&in6, sizeof(struct in6_addr), 0) == NULL) {
+ syslog(LOG_ERR,
+ "%s:%u: error in constructing radius message for user '%s'", __func__, __LINE__,
+ pctx->username);
+ ret = ERR_AUTH_FAIL;
+ goto cleanup;
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/ip-lease.c new/ocserv-1.2.2/src/ip-lease.c
--- old/ocserv-1.2.1/src/ip-lease.c 2023-06-16 19:01:24.000000000 +0200
+++ new/ocserv-1.2.2/src/ip-lease.c 2023-09-15 15:59:02.000000000 +0200
@@ -27,7 +27,7 @@
#include <icmp-ping.h>
#include <arpa/inet.h>
-void ip_from_seed(uint8_t *seed, unsigned seed_size,
+static void ip_from_seed(uint8_t *seed, unsigned seed_size,
void *ip, size_t ip_size)
{
uint8_t digest[20];
@@ -104,7 +104,7 @@
void steal_ip_leases(struct proc_st* proc, struct proc_st *thief)
{
/* here we reset the old tun device, and assign the old addresses
- * to a new device. We cannot re-use the old device because the
+ * to a new device. We cannot reuse the old device because the
* fd is only available to the worker process and not here (main)
*/
reset_tun(proc);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/main-auth.c new/ocserv-1.2.2/src/main-auth.c
--- old/ocserv-1.2.1/src/main-auth.c 2023-06-09 15:21:22.000000000 +0200
+++ new/ocserv-1.2.2/src/main-auth.c 2023-09-15 15:59:02.000000000 +0200
@@ -201,7 +201,7 @@
put_into_cgroup(s, proc->config->cgroup, proc->pid);
}
- /* disconnect and re-use previous session's IPs*/
+ /* disconnect and reuse previous session's IPs*/
if (old_proc != NULL) {
if (strcmp(proc->username, old_proc->username) != 0) {
mslog(s, old_proc, LOG_ERR, "the user of the new session doesn't match the old (new: %s)",
@@ -209,7 +209,7 @@
return -1;
}
- mslog(s, old_proc, LOG_INFO, "disconnecting previous user session due to session re-use");
+ mslog(s, old_proc, LOG_INFO, "disconnecting previous user session due to session reuse");
/* steal its leases */
steal_ip_leases(old_proc, proc);
@@ -245,7 +245,7 @@
* users are found.
*
* In addition this function will also check whether the cookie
- * used had been re-used before, and then disconnect the old session
+ * used had been reused before, and then disconnect the old session
* (cookies are unique).
*/
int check_multiple_users(main_server_st *s, struct proc_st* proc)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/main.c new/ocserv-1.2.2/src/main.c
--- old/ocserv-1.2.1/src/main.c 2023-06-16 19:01:03.000000000 +0200
+++ new/ocserv-1.2.2/src/main.c 2023-09-19 11:08:49.000000000 +0200
@@ -1078,7 +1078,6 @@
pid = fork();
if (pid == 0) { /* child */
unsigned int sec_mod_instance_index;
- char buf[MAX_IP_STR]; // buffer holding human readable sockaddr
/* close any open descriptors, and erase
* sensitive data before running the worker
*/
@@ -1096,10 +1095,12 @@
set_self_oom_score_adj(s);
- sec_mod_instance_index = hash_any(&ws->remote_addr, ws->remote_addr_len, 0) % s->sec_mod_instance_count;
- mslog(s, NULL, LOG_DEBUG, "map worker serving remote address %s to secmod instance %u",
- human_addr((struct sockaddr*)&ws->remote_addr, ws->remote_addr_len, buf, sizeof(buf)),
- sec_mod_instance_index);
+ /* Each cookie is valid for its IP address and when resuming it must
+ * reach the same sec-mod process that contains the corresponding
+ * session information under the SID. */
+ sec_mod_instance_index = hash_any(
+ SA_IN_P_GENERIC(&ws->remote_addr, ws->remote_addr_len),
+ SA_IN_SIZE(ws->remote_addr_len), 0) % s->sec_mod_instance_count;
/* write sec-mod's address */
memcpy(&ws->secmod_addr, &s->sec_mod_instances[sec_mod_instance_index].secmod_addr, s->sec_mod_instances[sec_mod_instance_index].secmod_addr_len);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/sec-mod.h new/ocserv-1.2.2/src/sec-mod.h
--- old/ocserv-1.2.1/src/sec-mod.h 2023-07-18 11:31:59.000000000 +0200
+++ new/ocserv-1.2.2/src/sec-mod.h 2023-09-15 15:59:02.000000000 +0200
@@ -86,7 +86,7 @@
typedef struct client_entry_st {
/* A unique session identifier used to distinguish sessions
* prior to authentication. It is sent as cookie to the client
- * who re-uses it when it performs authentication in multiple
+ * who reuses it when it performs authentication in multiple
* sessions.
*/
uint8_t sid[SID_SIZE];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/version.inc new/ocserv-1.2.2/src/version.inc
--- old/ocserv-1.2.1/src/version.inc 2023-08-16 13:04:35.000000000 +0200
+++ new/ocserv-1.2.2/src/version.inc 2023-09-20 17:23:35.000000000 +0200
@@ -1 +1 @@
-version = "1.2.1";
+version = "1.2.2";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/src/worker-vpn.c new/ocserv-1.2.2/src/worker-vpn.c
--- old/ocserv-1.2.1/src/worker-vpn.c 2023-08-22 15:08:45.000000000 +0200
+++ new/ocserv-1.2.2/src/worker-vpn.c 2023-09-20 11:22:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Nikos Mavrogiannopoulos
+ * Copyright (C) 2013-2023 Nikos Mavrogiannopoulos
* Copyright (C) 2015, 2016 Red Hat, Inc.
*
* This file is part of ocserv.
@@ -493,6 +493,7 @@
ban_ip_reply_msg__free_unpacked(reply, &pa);
}
+static
void send_stats_to_secmod(worker_st * ws, time_t now, unsigned discon_reason)
{
CliStatsMsg msg = CLI_STATS_MSG__INIT;
@@ -753,7 +754,7 @@
}
#endif
-void check_camouflage_url(struct worker_st *ws)
+static void check_camouflage_url(struct worker_st *ws)
{
if (WSCONFIG(ws)->camouflage_secret == NULL)
return;
@@ -1615,6 +1616,23 @@
return ret;
}
+/* Returns true if the data provided are not IP control messages
+ * (ICMP, IGMP). */
+static bool is_data(const uint8_t *data, size_t size)
+{
+ if (size > 20) {
+ uint8_t version = data[0] >> 4;
+ if (version == 0x04) {
+ if (data[9] == 0x01 || data[9] == 0x02) /* ICMP/IGMP */
+ return 0;
+ } else if (version == 0x06) {
+ if (data[9] == 0x3A || data[9] == 0x80)
+ return 0;
+ }
+ }
+ return 1;
+}
+
static int tun_mainloop(struct worker_st *ws, struct timespec *tnow)
{
int ret, l, e;
@@ -1643,7 +1661,6 @@
return 0;
}
-
dtls_to_send.data = ws->buffer;
dtls_to_send.size = l;
@@ -1730,7 +1747,9 @@
ret = cstp_send(ws, cstp_to_send.data, cstp_to_send.size + 8);
CSTP_FATAL_ERR_CMD(ws, ret, exit_worker_reason(ws, REASON_ERROR));
}
- ws->last_nc_msg = tnow->tv_sec;
+
+ if (is_data(ws->buffer + 8, l)) /* do not account ICMP */
+ ws->last_nc_msg = tnow->tv_sec;
}
return 0;
@@ -2595,7 +2614,9 @@
return -1;
}
ws->tun_bytes_in += plain_size;
- ws->last_nc_msg = now;
+
+ if (is_data(plain, plain_size)) /* do not account ICMP */
+ ws->last_nc_msg = now;
break;
default:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/Makefile.am new/ocserv-1.2.2/tests/Makefile.am
--- old/ocserv-1.2.1/tests/Makefile.am 2023-07-27 15:50:33.000000000 +0200
+++ new/ocserv-1.2.2/tests/Makefile.am 2023-09-19 11:08:59.000000000 +0200
@@ -46,7 +46,8 @@
data/haproxy-proxyproto-v1.cfg scripts/proxy-connectscript-v1 data/test-multiple-client-ip.config \
data/test-client-bypass-protocol.config asan.supp certs/ca.tmpl certs/server-cert.tmpl \
certs/user-cert.tmpl data/test-camouflage.config data/test-camouflage-norealm.config \
- data/radius-multi-group.config data/test-group-cert.config
+ data/radius-multi-group.config data/test-group-cert.config data/session-timeout.config \
+ data/idle-timeout.config
xfail_scripts =
dist_check_SCRIPTS = ocpasswd-test
@@ -59,12 +60,12 @@
if ENABLE_ROOT_TESTS
#other root requiring tests
dist_check_SCRIPTS += haproxy-connect test-iroute test-multi-cookie test-pass-script \
- test-cookie-timeout test-cookie-timeout-2 test-explicit-ip \
+ idle-timeout test-cookie-timeout test-cookie-timeout-2 test-explicit-ip \
test-cookie-invalidation test-user-config test-append-routes test-ban \
multiple-routes json test-udp-listen-host test-max-same-1 test-script-multi-user \
apple-ios ipv6-iface test-namespace-listen disconnect-user disconnect-user2 \
ping-leases test-ban-local test-client-bypass-protocol ipv6-small-net test-camouflage \
- test-camouflage-norealm vhost-traffic defvhost-traffic
+ test-camouflage-norealm vhost-traffic defvhost-traffic session-timeout
if RADIUS_ENABLED
dist_check_SCRIPTS += radius-group radius-multi-group radius-otp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/Makefile.in new/ocserv-1.2.2/tests/Makefile.in
--- old/ocserv-1.2.1/tests/Makefile.in 2023-07-27 22:41:32.000000000 +0200
+++ new/ocserv-1.2.2/tests/Makefile.in 2023-09-21 21:14:27.000000000 +0200
@@ -94,12 +94,12 @@
#other root requiring tests
@ENABLE_ROOT_TESTS_TRUE@am__append_5 = haproxy-connect test-iroute test-multi-cookie test-pass-script \
-@ENABLE_ROOT_TESTS_TRUE@ test-cookie-timeout test-cookie-timeout-2 test-explicit-ip \
+@ENABLE_ROOT_TESTS_TRUE@ idle-timeout test-cookie-timeout test-cookie-timeout-2 test-explicit-ip \
@ENABLE_ROOT_TESTS_TRUE@ test-cookie-invalidation test-user-config test-append-routes test-ban \
@ENABLE_ROOT_TESTS_TRUE@ multiple-routes json test-udp-listen-host test-max-same-1 test-script-multi-user \
@ENABLE_ROOT_TESTS_TRUE@ apple-ios ipv6-iface test-namespace-listen disconnect-user disconnect-user2 \
@ENABLE_ROOT_TESTS_TRUE@ ping-leases test-ban-local test-client-bypass-protocol ipv6-small-net test-camouflage \
-@ENABLE_ROOT_TESTS_TRUE@ test-camouflage-norealm vhost-traffic defvhost-traffic
+@ENABLE_ROOT_TESTS_TRUE@ test-camouflage-norealm vhost-traffic defvhost-traffic session-timeout
@ENABLE_ROOT_TESTS_TRUE@@RADIUS_ENABLED_TRUE@am__append_6 = radius-group radius-multi-group radius-otp
@ENABLE_ROOT_TESTS_TRUE@am__append_7 = traffic lz4-compression lzs-compression \
@@ -207,22 +207,23 @@
valid_hostname_DEPENDENCIES = $(am__DEPENDENCIES_2)
am__dist_check_SCRIPTS_DIST = ocpasswd-test server-cert-ed25519 \
server-cert-rsa-pss haproxy-connect test-iroute \
- test-multi-cookie test-pass-script test-cookie-timeout \
- test-cookie-timeout-2 test-explicit-ip \
+ test-multi-cookie test-pass-script idle-timeout \
+ test-cookie-timeout test-cookie-timeout-2 test-explicit-ip \
test-cookie-invalidation test-user-config test-append-routes \
test-ban multiple-routes json test-udp-listen-host \
test-max-same-1 test-script-multi-user apple-ios ipv6-iface \
test-namespace-listen disconnect-user disconnect-user2 \
ping-leases test-ban-local test-client-bypass-protocol \
ipv6-small-net test-camouflage test-camouflage-norealm \
- vhost-traffic defvhost-traffic radius-group radius-multi-group \
- radius-otp traffic lz4-compression lzs-compression \
- aes256-cipher aes128-cipher oc-aes256-gcm-cipher \
- oc-aes128-gcm-cipher test-config-per-group \
- ac-aes128-gcm-cipher ac-aes256-gcm-cipher no-dtls-cipher \
- psk-negotiate psk-negotiate-match test-multiple-client-ip \
- radius radius-config test-vhost test-pass test-pass-cert \
- test-cert test-group-pass test-pass-group-cert \
+ vhost-traffic defvhost-traffic session-timeout radius-group \
+ radius-multi-group radius-otp traffic lz4-compression \
+ lzs-compression aes256-cipher aes128-cipher \
+ oc-aes256-gcm-cipher oc-aes128-gcm-cipher \
+ test-config-per-group ac-aes128-gcm-cipher \
+ ac-aes256-gcm-cipher no-dtls-cipher psk-negotiate \
+ psk-negotiate-match test-multiple-client-ip radius \
+ radius-config test-vhost test-pass test-pass-cert test-cert \
+ test-group-pass test-pass-group-cert \
test-pass-group-cert-no-pass test-sighup test-enc-key \
test-sighup-key-change test-get-cert test-san-cert test-gssapi \
test-pass-opt-cert test-cert-opt-pass test-gssapi-opt-pass \
@@ -790,7 +791,8 @@
data/haproxy-proxyproto-v1.cfg scripts/proxy-connectscript-v1 data/test-multiple-client-ip.config \
data/test-client-bypass-protocol.config asan.supp certs/ca.tmpl certs/server-cert.tmpl \
certs/user-cert.tmpl data/test-camouflage.config data/test-camouflage-norealm.config \
- data/radius-multi-group.config data/test-group-cert.config
+ data/radius-multi-group.config data/test-group-cert.config data/session-timeout.config \
+ data/idle-timeout.config
xfail_scripts =
dist_check_SCRIPTS = ocpasswd-test $(am__append_4) $(am__append_5) \
@@ -845,9 +847,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu tests/Makefile
+ $(AUTOMAKE) --foreign tests/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1377,6 +1379,13 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+idle-timeout.log: idle-timeout
+ @p='idle-timeout'; \
+ b='idle-timeout'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
test-cookie-timeout.log: test-cookie-timeout
@p='test-cookie-timeout'; \
b='test-cookie-timeout'; \
@@ -1551,6 +1560,13 @@
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+session-timeout.log: session-timeout
+ @p='session-timeout'; \
+ b='session-timeout'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
radius-group.log: radius-group
@p='radius-group'; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/data/idle-timeout.config new/ocserv-1.2.2/tests/data/idle-timeout.config
--- old/ocserv-1.2.1/tests/data/idle-timeout.config 1970-01-01 01:00:00.000000000 +0100
+++ new/ocserv-1.2.2/tests/data/idle-timeout.config 2023-09-20 22:09:54.000000000 +0200
@@ -0,0 +1,187 @@
+# User authentication method. Could be set multiple times and in that case
+# all should succeed.
+# Options: certificate, pam.
+#auth = "certificate"
+auth = "plain[./data/test1.passwd]"
+#auth = "pam"
+
+isolate-workers = @ISOLATE_WORKERS@
+
+occtl-socket-file = @OCCTL_SOCKET@
+use-occtl = true
+
+# A banner to be displayed on clients
+#banner = "Welcome"
+
+# Use listen-host to limit to specific IPs or to the IPs of a provided hostname.
+#listen-host = [IP|HOSTNAME]
+
+use-dbus = no
+
+# Limit the number of clients. Unset or set to zero for unlimited.
+#max-clients = 1024
+max-clients = 16
+
+# Limit the number of client connections to one every X milliseconds
+# (X is the provided value). Set to zero for no limit.
+#rate-limit-ms = 100
+
+# Limit the number of identical clients (i.e., users connecting multiple times)
+# Unset or set to zero for unlimited.
+max-same-clients = 2
+
+# TCP and UDP port number
+tcp-port = @PORT@
+udp-port = @PORT@
+
+# Keepalive in seconds
+keepalive = 32400
+
+# Dead peer detection in seconds
+dpd = 440
+
+# MTU discovery (DPD must be enabled)
+try-mtu-discovery = false
+
+# The key and the certificates of the server
+# The key may be a file, or any URL supported by GnuTLS (e.g.,
+# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
+# or pkcs11:object=my-vpn-key;object-type=private)
+#
+# There may be multiple certificate and key pairs and each key
+# should correspond to the preceding certificate.
+server-cert = ./certs/server-cert.pem
+server-key = ./certs/server-key.pem
+
+# Diffie-Hellman parameters. Only needed if you require support
+# for the DHE ciphersuites (by default this server supports ECDHE).
+# Can be generated using:
+# certtool --generate-dh-params --outfile /path/to/dh.pem
+#dh-params = /path/to/dh.pem
+
+# If you have a certificate from a CA that provides an OCSP
+# service you may provide a fresh OCSP status response within
+# the TLS handshake. That will prevent the client from connecting
+# independently on the OCSP server.
+# You can update this response periodically using:
+# ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response
+# Make sure that you replace the following file in an atomic way.
+#ocsp-response = /path/to/ocsp.der
+
+# In case PKCS #11 or TPM keys are used the PINs should be available
+# in files. The srk-pin-file is applicable to TPM keys only (It's the storage
+# root key).
+#pin-file = /path/to/pin.txt
+#srk-pin-file = /path/to/srkpin.txt
+
+# The Certificate Authority that will be used
+# to verify clients if certificate authentication
+# is set.
+#ca-cert = /path/to/ca.pem
+
+# The object identifier that will be used to read the user ID in the client certificate.
+# The object identifier should be part of the certificate's DN
+# Useful OIDs are:
+# CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1
+#cert-user-oid = 0.9.2342.19200300.100.1.1
+
+# The object identifier that will be used to read the user group in the client
+# certificate. The object identifier should be part of the certificate's DN
+# Useful OIDs are:
+# OU (organizational unit) = 2.5.4.11
+#cert-group-oid = 2.5.4.11
+
+# A revocation list of ca-cert is set
+#crl = /path/to/crl.pem
+
+# GnuTLS priority string
+tls-priorities = "PERFORMANCE:%SERVER_PRECEDENCE:%COMPAT"
+
+# To enforce perfect forward secrecy (PFS) on the main channel.
+#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA"
+
+# The time (in seconds) that a client is allowed to stay connected prior
+# to authentication
+auth-timeout = 40
+
+# The time (in seconds) that a client is not allowed to reconnect after
+# a failed authentication attempt.
+#min-reauth-time = 2
+
+# Cookie timeout (in seconds)
+# Once a client is authenticated he's provided a cookie with
+# which he can reconnect. That cookie will be invalided if not
+# used within this timeout value. On a user disconnection, that
+# cookie will also be active for this time amount prior to be
+# invalid. That should allow a reasonable amount of time for roaming
+# between different networks.
+cookie-timeout = 30
+
+# Script to call when a client connects and obtains an IP
+# Parameters are passed on the environment.
+# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client),
+# DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP
+# in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON
+# may be "connect" or "disconnect".
+#connect-script = /usr/bin/myscript
+#disconnect-script = /usr/bin/myscript
+
+# UTMP
+use-utmp = true
+
+# PID file
+pid-file = /var/run/ocserv.pid
+
+# The default server directory. Does not require any devices present.
+#chroot-dir = /path/to/chroot
+
+# socket file used for IPC, will be appended with .PID
+# It must be accessible within the chroot environment (if any)
+socket-file = /var/run/ocserv-socket
+
+# The user the worker processes will be run as. It should be
+# unique (no other services run as this user).
+run-as-user = nobody
+run-as-group = daemon
+
+# Network settings
+
+device = vpns
+
+# The default domain to be advertised
+default-domain = example.com
+
+ipv4-network = @VPNNET@
+#ipv6-network = @VPNNET6@
+
+# Prior to leasing any IP from the pool ping it to verify that
+# it is not in use by another (unrelated to this server) host.
+ping-leases = false
+
+# Leave empty to assign the default MTU of the device
+# mtu =
+
+#route = 192.168.1.0/255.255.255.0
+#route = 192.168.5.0/255.255.255.0
+
+#
+# The following options are for (experimental) AnyConnect client
+# compatibility. They are only available if the server is built
+# with --enable-anyconnect
+#
+
+# Client profile xml. A sample file exists in doc/profile.xml.
+# This file must be accessible from inside the worker's chroot.
+# The profile is ignored by the openconnect client.
+#user-profile = profile.xml
+
+# Unless set to false it is required for clients to present their
+# certificate even if they are authenticating via a previously granted
+# cookie. Legacy CISCO clients do not do that, and thus this option
+# should be set for them.
+#always-require-cert = false
+
+sec-mod-scale = 6
+
+idle-timeout = 25
+mobile-idle-timeout = 25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/data/raddb/clients.conf new/ocserv-1.2.2/tests/data/raddb/clients.conf
--- old/ocserv-1.2.1/tests/data/raddb/clients.conf 2023-06-02 04:30:07.000000000 +0200
+++ new/ocserv-1.2.2/tests/data/raddb/clients.conf 2023-09-15 15:59:02.000000000 +0200
@@ -364,7 +364,7 @@
# the same as above, but they are nested inside of a section.
#
# You can have as many per-socket client lists as you have "listen"
-# sections, or you can re-use a list among multiple "listen" sections.
+# sections, or you can reuse a list among multiple "listen" sections.
#
# Un-comment this section, and edit a "listen" section to add:
# "clients = per_socket_clients". That IP address/port combination
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/data/session-timeout.config new/ocserv-1.2.2/tests/data/session-timeout.config
--- old/ocserv-1.2.1/tests/data/session-timeout.config 1970-01-01 01:00:00.000000000 +0100
+++ new/ocserv-1.2.2/tests/data/session-timeout.config 2023-09-20 22:09:54.000000000 +0200
@@ -0,0 +1,186 @@
+# User authentication method. Could be set multiple times and in that case
+# all should succeed.
+# Options: certificate, pam.
+#auth = "certificate"
+auth = "plain[./data/test1.passwd]"
+#auth = "pam"
+
+isolate-workers = @ISOLATE_WORKERS@
+
+occtl-socket-file = @OCCTL_SOCKET@
+use-occtl = true
+
+# A banner to be displayed on clients
+#banner = "Welcome"
+
+# Use listen-host to limit to specific IPs or to the IPs of a provided hostname.
+#listen-host = [IP|HOSTNAME]
+
+use-dbus = no
+
+# Limit the number of clients. Unset or set to zero for unlimited.
+#max-clients = 1024
+max-clients = 16
+
+# Limit the number of client connections to one every X milliseconds
+# (X is the provided value). Set to zero for no limit.
+#rate-limit-ms = 100
+
+# Limit the number of identical clients (i.e., users connecting multiple times)
+# Unset or set to zero for unlimited.
+max-same-clients = 2
+
+# TCP and UDP port number
+tcp-port = @PORT@
+udp-port = @PORT@
+
+# Keepalive in seconds
+keepalive = 32400
+
+# Dead peer detection in seconds
+dpd = 440
+
+# MTU discovery (DPD must be enabled)
+try-mtu-discovery = false
+
+# The key and the certificates of the server
+# The key may be a file, or any URL supported by GnuTLS (e.g.,
+# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
+# or pkcs11:object=my-vpn-key;object-type=private)
+#
+# There may be multiple certificate and key pairs and each key
+# should correspond to the preceding certificate.
+server-cert = ./certs/server-cert.pem
+server-key = ./certs/server-key.pem
+
+# Diffie-Hellman parameters. Only needed if you require support
+# for the DHE ciphersuites (by default this server supports ECDHE).
+# Can be generated using:
+# certtool --generate-dh-params --outfile /path/to/dh.pem
+#dh-params = /path/to/dh.pem
+
+# If you have a certificate from a CA that provides an OCSP
+# service you may provide a fresh OCSP status response within
+# the TLS handshake. That will prevent the client from connecting
+# independently on the OCSP server.
+# You can update this response periodically using:
+# ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response
+# Make sure that you replace the following file in an atomic way.
+#ocsp-response = /path/to/ocsp.der
+
+# In case PKCS #11 or TPM keys are used the PINs should be available
+# in files. The srk-pin-file is applicable to TPM keys only (It's the storage
+# root key).
+#pin-file = /path/to/pin.txt
+#srk-pin-file = /path/to/srkpin.txt
+
+# The Certificate Authority that will be used
+# to verify clients if certificate authentication
+# is set.
+#ca-cert = /path/to/ca.pem
+
+# The object identifier that will be used to read the user ID in the client certificate.
+# The object identifier should be part of the certificate's DN
+# Useful OIDs are:
+# CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1
+#cert-user-oid = 0.9.2342.19200300.100.1.1
+
+# The object identifier that will be used to read the user group in the client
+# certificate. The object identifier should be part of the certificate's DN
+# Useful OIDs are:
+# OU (organizational unit) = 2.5.4.11
+#cert-group-oid = 2.5.4.11
+
+# A revocation list of ca-cert is set
+#crl = /path/to/crl.pem
+
+# GnuTLS priority string
+tls-priorities = "PERFORMANCE:%SERVER_PRECEDENCE:%COMPAT"
+
+# To enforce perfect forward secrecy (PFS) on the main channel.
+#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA"
+
+# The time (in seconds) that a client is allowed to stay connected prior
+# to authentication
+auth-timeout = 40
+
+# The time (in seconds) that a client is not allowed to reconnect after
+# a failed authentication attempt.
+#min-reauth-time = 2
+
+# Cookie timeout (in seconds)
+# Once a client is authenticated he's provided a cookie with
+# which he can reconnect. That cookie will be invalided if not
+# used within this timeout value. On a user disconnection, that
+# cookie will also be active for this time amount prior to be
+# invalid. That should allow a reasonable amount of time for roaming
+# between different networks.
+cookie-timeout = 30
+
+# Script to call when a client connects and obtains an IP
+# Parameters are passed on the environment.
+# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client),
+# DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP
+# in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON
+# may be "connect" or "disconnect".
+#connect-script = /usr/bin/myscript
+#disconnect-script = /usr/bin/myscript
+
+# UTMP
+use-utmp = true
+
+# PID file
+pid-file = /var/run/ocserv.pid
+
+# The default server directory. Does not require any devices present.
+#chroot-dir = /path/to/chroot
+
+# socket file used for IPC, will be appended with .PID
+# It must be accessible within the chroot environment (if any)
+socket-file = /var/run/ocserv-socket
+
+# The user the worker processes will be run as. It should be
+# unique (no other services run as this user).
+run-as-user = nobody
+run-as-group = daemon
+
+# Network settings
+
+device = vpns
+
+# The default domain to be advertised
+default-domain = example.com
+
+ipv4-network = @VPNNET@
+#ipv6-network = @VPNNET6@
+
+# Prior to leasing any IP from the pool ping it to verify that
+# it is not in use by another (unrelated to this server) host.
+ping-leases = false
+
+# Leave empty to assign the default MTU of the device
+# mtu =
+
+#route = 192.168.1.0/255.255.255.0
+#route = 192.168.5.0/255.255.255.0
+
+#
+# The following options are for (experimental) AnyConnect client
+# compatibility. They are only available if the server is built
+# with --enable-anyconnect
+#
+
+# Client profile xml. A sample file exists in doc/profile.xml.
+# This file must be accessible from inside the worker's chroot.
+# The profile is ignored by the openconnect client.
+#user-profile = profile.xml
+
+# Unless set to false it is required for clients to present their
+# certificate even if they are authenticating via a previously granted
+# cookie. Legacy CISCO clients do not do that, and thus this option
+# should be set for them.
+#always-require-cert = false
+
+sec-mod-scale = 6
+
+session-timeout = 25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/data/test-cookie-invalidation.config new/ocserv-1.2.2/tests/data/test-cookie-invalidation.config
--- old/ocserv-1.2.1/tests/data/test-cookie-invalidation.config 2023-06-09 14:37:12.000000000 +0200
+++ new/ocserv-1.2.2/tests/data/test-cookie-invalidation.config 2023-09-20 22:09:54.000000000 +0200
@@ -177,3 +177,5 @@
# cookie. Legacy CISCO clients do not do that, and thus this option
# should be set for them.
#always-require-cert = false
+
+sec-mod-scale = 6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/data/test-cookie-timeout-2.config new/ocserv-1.2.2/tests/data/test-cookie-timeout-2.config
--- old/ocserv-1.2.1/tests/data/test-cookie-timeout-2.config 2023-06-09 14:37:12.000000000 +0200
+++ new/ocserv-1.2.2/tests/data/test-cookie-timeout-2.config 2023-09-20 22:09:54.000000000 +0200
@@ -186,3 +186,5 @@
# cookie. Legacy CISCO clients do not do that, and thus this option
# should be set for them.
#always-require-cert = false
+
+sec-mod-scale = 6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/data/test-cookie-timeout.config new/ocserv-1.2.2/tests/data/test-cookie-timeout.config
--- old/ocserv-1.2.1/tests/data/test-cookie-timeout.config 2023-06-09 14:37:12.000000000 +0200
+++ new/ocserv-1.2.2/tests/data/test-cookie-timeout.config 2023-09-20 22:09:54.000000000 +0200
@@ -186,3 +186,5 @@
# cookie. Legacy CISCO clients do not do that, and thus this option
# should be set for them.
#always-require-cert = false
+
+sec-mod-scale = 6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/idle-timeout new/ocserv-1.2.2/tests/idle-timeout
--- old/ocserv-1.2.1/tests/idle-timeout 1970-01-01 01:00:00.000000000 +0100
+++ new/ocserv-1.2.2/tests/idle-timeout 2023-09-20 16:46:17.000000000 +0200
@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+# Copyright (C) 2023 Nikos Mavrogiannopoulos
+#
+# This file is part of ocserv.
+#
+# ocserv is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# ocserv is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+OCCTL="${OCCTL:-../src/occtl/occtl}"
+SERV="${SERV:-../src/ocserv}"
+srcdir=${srcdir:-.}
+OCCTL_SOCKET=./occtl-ban-$$.socket
+PIDFILE=ocserv-pid.$$.tmp
+CPIDFILE=openpid.$$.tmp
+OUTFILE=ban.$$.tmp
+
+ADDRESS=10.23.2.1
+CLI_ADDRESS=10.23.1.1
+VPNNET=172.34.215.0/24
+VPNADDR=172.34.215.1
+VPNNET6=fd7b:b45a:eef2:3dee:b86c:b589:fce9:0/112
+VPNADDR6=fd7b:b45a:eef2:3dee:b86c:b589:fce9:0
+
+. `dirname $0`/common.sh
+. `dirname $0`/ns.sh
+
+eval "${GETPORT}"
+
+function finish {
+ set +e
+ echo " * Cleaning up..."
+ test -n "${PID}" && kill ${PID} >/dev/null 2>&1
+ test -n "${PIDFILE}" && rm -f ${PIDFILE} >/dev/null 2>&1
+ test -n "${CPIDFILE}" && rm -f ${CPIDFILE} >/dev/null 2>&1
+ test -n "${CONFIG}" && rm -f ${CONFIG} >/dev/null 2>&1
+ test -n "${OUTFILE}" && rm -f ${OUTFILE} >/dev/null 2>&1
+}
+trap finish EXIT
+
+echo "Testing whether idle timeout works as expected... "
+
+update_config idle-timeout.config
+${CMDNS2} ${SERV} -p ${PIDFILE} -f -c ${CONFIG} -d 3 & PID=$!
+
+sleep 5
+
+echo "Connecting to obtain cookie... "
+eval `echo "test" | ${CMDNS1} ${OPENCONNECT} --passwd-on-stdin -q ${ADDRESS}:${PORT} -u test --authenticate --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8=`
+
+if [ -z "$COOKIE" ];then
+ fail $PID "Could not obtain cookie"
+fi
+
+#echo "Cookie: $COOKIE"
+sleep 1
+echo ""
+echo "Connecting with cookie... "
+${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${PORT} -u test -C "$COOKIE" --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= --background --pid-file "${CPIDFILE}"
+
+sleep 4
+
+if [ ! -f "${CPIDFILE}" ];then
+ fail $PID "It was not possible to establish session!"
+fi
+
+echo "ping remote address"
+
+set -e
+${CMDNS1} ping -c 3 ${VPNADDR}
+${CMDNS2} ${OCCTL} -s ${OCCTL_SOCKET} show user test
+set +e
+
+# We wait more than the configured time as idle timeout is enforced every
+# a couple of seconds.
+echo "Waiting for idle timeout... "
+sleep 60
+
+${CMDNS2} ${OCCTL} -s ${OCCTL_SOCKET} show user test
+if test $? = 0;then
+ fail $PID "Client listed in occtl after timeout!"
+fi
+
+${CMDNS1} ping -c 3 ${VPNADDR}
+if test $? = 0;then
+ fail $PID "Client remains connected after timeout!"
+fi
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/session-timeout new/ocserv-1.2.2/tests/session-timeout
--- old/ocserv-1.2.1/tests/session-timeout 1970-01-01 01:00:00.000000000 +0100
+++ new/ocserv-1.2.2/tests/session-timeout 2023-09-19 11:08:59.000000000 +0200
@@ -0,0 +1,112 @@
+#!/bin/bash
+#
+# Copyright (C) 2023 Nikos Mavrogiannopoulos
+#
+# This file is part of ocserv.
+#
+# ocserv is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# ocserv is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+OCCTL="${OCCTL:-../src/occtl/occtl}"
+SERV="${SERV:-../src/ocserv}"
+srcdir=${srcdir:-.}
+OCCTL_SOCKET=./occtl-ban-$$.socket
+PIDFILE=ocserv-pid.$$.tmp
+CPIDFILE=openpid.$$.tmp
+OUTFILE=ban.$$.tmp
+
+ADDRESS=10.74.2.1
+CLI_ADDRESS=10.74.1.1
+VPNNET=172.34.135.0/24
+VPNADDR=172.34.135.1
+VPNNET6=fd7b:b45a:eef2:3d3e:b86c:b589:fce9:0/112
+VPNADDR6=fd7b:b45a:eef2:3d3e:b86c:b589:fce9:0
+
+. `dirname $0`/common.sh
+. `dirname $0`/ns.sh
+
+eval "${GETPORT}"
+
+function finish {
+ set +e
+ echo " * Cleaning up..."
+ test -n "${PID}" && kill ${PID} >/dev/null 2>&1
+ test -n "${PIDFILE}" && rm -f ${PIDFILE} >/dev/null 2>&1
+ test -n "${CPIDFILE}" && rm -f ${CPIDFILE} >/dev/null 2>&1
+ test -n "${CONFIG}" && rm -f ${CONFIG} >/dev/null 2>&1
+ test -n "${OUTFILE}" && rm -f ${OUTFILE} >/dev/null 2>&1
+}
+trap finish EXIT
+
+echo "Testing whether session timeout works as expected... "
+
+update_config session-timeout.config
+${CMDNS2} ${SERV} -p ${PIDFILE} -f -c ${CONFIG} -d 3 & PID=$!
+
+sleep 5
+
+echo "Connecting to obtain cookie... "
+eval `echo "test" | ${CMDNS1} ${OPENCONNECT} --passwd-on-stdin -q ${ADDRESS}:${PORT} -u test --authenticate --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8=`
+
+if [ -z "$COOKIE" ];then
+ fail $PID "Could not obtain cookie"
+fi
+
+#echo "Cookie: $COOKIE"
+sleep 1
+echo ""
+echo "Connecting with cookie... "
+${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${PORT} -u test -C "$COOKIE" --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= --background --pid-file "${CPIDFILE}"
+
+sleep 4
+
+if [ ! -f "${CPIDFILE}" ];then
+ fail $PID "It was not possible to establish session!"
+fi
+
+echo "ping remote address"
+
+set -e
+${CMDNS1} ping -c 3 ${VPNADDR}
+${CMDNS2} ${OCCTL} -s ${OCCTL_SOCKET} show user test
+set +e
+
+# We wait more than the configured time as session timeout is enforced every
+# a couple of seconds.
+echo "Waiting for session timeout... "
+sleep 60
+
+${CMDNS2} ${OCCTL} -s ${OCCTL_SOCKET} show user test
+if test $? = 0;then
+ fail $PID "Client listed in occtl after timeout!"
+fi
+
+${CMDNS1} ping -c 3 ${VPNADDR}
+if test $? = 0;then
+ fail $PID "Client remains connected after timeout!"
+fi
+
+sleep 5
+
+echo "Connecting with cookie... "
+rm -f "${CPIDFILE}"
+${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${PORT} -u test -C "$COOKIE" --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= --background --pid-file "${CPIDFILE}"
+
+sleep 4
+
+if [ -f "${CPIDFILE}" ];then
+ fail $PID "Established session with invalidated cookie!"
+fi
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/test-max-same-1 new/ocserv-1.2.2/tests/test-max-same-1
--- old/ocserv-1.2.1/tests/test-max-same-1 2023-07-17 17:18:04.000000000 +0200
+++ new/ocserv-1.2.2/tests/test-max-same-1 2023-09-15 15:59:02.000000000 +0200
@@ -25,7 +25,7 @@
eval "${GETPORT}"
-echo "Testing whether max-same-clients=1 allows cookie re-use... "
+echo "Testing whether max-same-clients=1 allows cookie reuse... "
PIDFILE1="${srcdir}/ci$$-1.pid.tmp"
PIDFILE2="${srcdir}/ci$$-2.pid.tmp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocserv-1.2.1/tests/test-multi-cookie new/ocserv-1.2.2/tests/test-multi-cookie
--- old/ocserv-1.2.1/tests/test-multi-cookie 2023-07-17 17:18:04.000000000 +0200
+++ new/ocserv-1.2.2/tests/test-multi-cookie 2023-09-15 15:59:02.000000000 +0200
@@ -25,7 +25,7 @@
eval "${GETPORT}"
-echo "Testing whether cookies are being re-used... "
+echo "Testing whether cookies are being reused... "
PIDFILE1="${srcdir}/ci$$-1.pid.tmp"
PIDFILE2="${srcdir}/ci$$-2.pid.tmp"
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package helvum for openSUSE:Factory checked in at 2023-09-29 21:14:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/helvum (Old)
and /work/SRC/openSUSE:Factory/.helvum.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helvum"
Fri Sep 29 21:14:03 2023 rev:8 rq:1114125 version:0.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/helvum/helvum.changes 2023-02-13 16:43:17.972216777 +0100
+++ /work/SRC/openSUSE:Factory/.helvum.new.28202/helvum.changes 2023-09-29 21:15:29.633905151 +0200
@@ -1,0 +2,32 @@
+Thu Sep 28 14:12:34 UTC 2023 - Adam Mizerski <adam(a)mizerski.pl>
+
+- update to 0.5.1
+ - Fix an issue where the headerbar is overly large
+- update to 0.5.0
+ - Helvum has been ported to libadwaita, and now requires libadwaita >= 1.3 to
+ build.
+ - The graph UI has been redesigned to fit the libadwaita style and to improve
+ usability and looks. Nodes now have a background, ports are split into a
+ label and a round handle, and more minor changes.
+ - Ports are now added and removed more reliably from nodes, and are sorted by
+ name.
+ - An "About" window has been added, and can be opened using the new primary
+ menu, opened by a button in the headerbar.
+ - The application no longer enters an unusable state if the app can't connect
+ to the pipewire server, or loses connection. Instead, the app will attempt
+ to reconnect on an interval, and display a banner in the UI to notify the
+ user that the app is not connected.
+- started using cargo-packaging
+
+-------------------------------------------------------------------
+Mon Aug 21 15:01:19 UTC 2023 - Adam Mizerski <adam(a)mizerski.pl>
+
+- update to 0.4.1
+ - Nodes are now allocated their proper size when the graph is zoomed, so that
+ they do not become smaller when the graph is zoomed in.
+ - When dragging a port to create a link, a link is now drawn from the port to
+ the cursor position to visualize the linking process. If hovering over a
+ compatible port, the link snaps to that port.
+ - Multiple internal improvements.
+
+-------------------------------------------------------------------
Old:
----
helvum-0.4.0.tar.xz
New:
----
helvum-0.5.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ helvum.spec ++++++
--- /var/tmp/diff_new_pack.w4AZTv/_old 2023-09-29 21:15:30.857949315 +0200
+++ /var/tmp/diff_new_pack.w4AZTv/_new 2023-09-29 21:15:30.857949315 +0200
@@ -16,20 +16,21 @@
#
-%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
%define app_id org.pipewire.Helvum
Name: helvum
-Version: 0.4.0
+Version: 0.5.1
Release: 0
Summary: A GTK patchbay for pipewire
-License: (Apache-2.0 OR BSL-1.0) AND GPL-3.0-only AND (Apache-2.0 OR MIT) AND (MIT OR Unlicense) AND Apache-2.0 AND BSD-3-Clause AND ISC AND MIT
+License: GPL-3.0-only AND ( (MIT OR Apache-2.0) AND Unicode-DFS-2016 ) AND ( Apache-2.0 OR MIT ) AND ( Unlicense OR MIT ) AND Apache-2.0 AND Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND ISC AND MIT AND
URL: https://gitlab.freedesktop.org/pipewire/helvum
-Source: https://gitlab.freedesktop.org/pipewire/helvum/uploads/2b68fb86bf4b988c3183…
-BuildRequires: cargo
+Source: https://gitlab.freedesktop.org/pipewire/helvum/uploads/f523a2c71046fb21a758…
+BuildRequires: cargo-packaging
BuildRequires: clang-devel
-BuildRequires: gtk4-devel
-BuildRequires: pipewire-devel
-ExcludeArch: s390 s390x ppc ppc64 ppc64le %{ix86}
+BuildRequires: pkgconfig(glib-2.0) >= 2.66
+BuildRequires: pkgconfig(gtk4) >= 4.4.0
+BuildRequires: pkgconfig(libadwaita-1) >= 1.3
+BuildRequires: pkgconfig(libpipewire-0.3)
+ExclusiveArch: %{rust_tier1_arches}
%description
Helvum is a GTK-based patchbay for pipewire, inspired by the JACK tool catia.
@@ -38,10 +39,10 @@
%setup -q
%build
-RUSTFLAGS=%{rustflags} cargo build --release
+%{cargo_build}
%install
-RUSTFLAGS=%{rustflags} cargo install --no-track --root=%{buildroot}%{_prefix} --path .
+%{cargo_install}
sed 's/@icon@/%{app_id}/g' data/%{app_id}.desktop.in > data/%{app_id}.desktop
install -D -m0644 -t %{buildroot}%{_datadir}/applications/ data/%{app_id}.desktop
install -D -m0644 -t %{buildroot}%{_datadir}/icons/hicolor/scalable/apps data/icons/%{app_id}.svg
++++++ helvum-0.4.0.tar.xz -> helvum-0.5.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/helvum/helvum-0.4.0.tar.xz /work/SRC/openSUSE:Factory/.helvum.new.28202/helvum-0.5.1.tar.xz differ: char 26, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2023-09-29 21:14:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt-creator (Old)
and /work/SRC/openSUSE:Factory/.qt-creator.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-creator"
Fri Sep 29 21:14:01 2023 rev:26 rq:1114097 version:11.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2023-08-28 17:13:35.677159047 +0200
+++ /work/SRC/openSUSE:Factory/.qt-creator.new.28202/qt-creator.changes 2023-09-29 21:15:27.361823175 +0200
@@ -1,0 +2,8 @@
+Thu Sep 28 10:16:54 UTC 2023 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 11.0.3:
+ * https://www.qt.io/blog/qt-creator-11.0.3-released
+- Drop patch, merged upstream:
+ * 0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch
+
+-------------------------------------------------------------------
Old:
----
0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch
qt-creator-opensource-src-11.0.2.tar.xz
New:
----
qt-creator-opensource-src-11.0.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt-creator.spec ++++++
--- /var/tmp/diff_new_pack.GLm09l/_old 2023-09-29 21:15:29.357895193 +0200
+++ /var/tmp/diff_new_pack.GLm09l/_new 2023-09-29 21:15:29.357895193 +0200
@@ -16,7 +16,7 @@
#
-%define real_version 11.0.2
+%define real_version 11.0.3
%define short_version 11.0
%define tar_name qt-creator-opensource-src
%define tar_suffix %{nil}
@@ -50,7 +50,7 @@
%endif
Name: %{pkgname_prefix}-creator
-Version: 11.0.2
+Version: 11.0.3
Release: 0
Summary: Integrated Development Environment targeting Qt apps
# src/plugins/cmakeprojectmanager/configmodelitemdelegate.* -> LGPL-2.1-only OR LGPL-3.0-only
@@ -63,7 +63,6 @@
Source: https://download.qt.io/official_releases/qtcreator/%{short_version}/%{real_…
Source1: qt-creator-rpmlintrc
# Patches 0-10 are upstream changes
-Patch0: 0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch
# Patches 11-20 are openSUSE changes
Patch11: fix-application-output.patch
Patch12: 0001-Disable-some-plugins.patch
++++++ qt-creator-opensource-src-11.0.2.tar.xz -> qt-creator-opensource-src-11.0.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/qt-creator/qt-creator-opensource-src-11.0.2.tar.xz /work/SRC/openSUSE:Factory/.qt-creator.new.28202/qt-creator-opensource-src-11.0.3.tar.xz differ: char 27, line 1
1
0