openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
February 2020
- 1 participants
- 4649 discussions
Hello community,
here is the log from the commit of package openQA for openSUSE:Factory checked in at 2020-02-29 21:24:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openQA (Old)
and /work/SRC/openSUSE:Factory/.openQA.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openQA"
Sat Feb 29 21:24:37 2020 rev:126 rq:780368 version:4.6.1582908813.c5b7e89c0
Changes:
--------
openQA-test.changes: same change
openQA-worker-test.changes: same change
--- /work/SRC/openSUSE:Factory/openQA/openQA.changes 2020-02-26 15:07:26.725478373 +0100
+++ /work/SRC/openSUSE:Factory/.openQA.new.26092/openQA.changes 2020-02-29 21:24:56.730567677 +0100
@@ -1,0 +2,30 @@
+Fri Feb 28 19:04:52 UTC 2020 - coolo(a)suse.com
+
+- Update to version 4.6.1582908813.c5b7e89c0:
+ * Makefile: Add KEEP_DB flag for optional, faster re-runs
+ * Extract a script "openqa-setup-db" for local database setup
+ * Make "developer" test as unstable based on recent results
+ * systemd: Prevent error on repeated startup of openqa-setup-db
+ * Improve shell style of t/test_postgresql based on shellcheck
+ * systemd: Make worker also only depend necessary network related targets
+ * Remove misleading log message of test setup
+ * Make check for error message in fullstack cache test less specific
+ * Refactor setup of fullstack tests
+ * Initialize host of cache client via sub to ease test setup
+ * Format test of the worker's web UI connection in a more compact way
+ * systemd: Fix premature startup of services when network is not fully up yet
+ * worker: Log only a debug message if a JSON can not be opened
+ * Remove unused modules from scheduler fullstack test
+ * Alleviate debugging of test_postgresql
+ * load_templates: Remove query uses from table requests
+ * load_templates: Create groups that do not exist
+ * Prevent search popover icons from appearing on top of menus
+ * Improve logging, error handling and notes for worker-server connection
+ * Delete unused and uncovered method 'Worker::WebUIConnection::disable'
+ * Delete unused and uncovered method 'Utils::append_channel_to_defaults'
+ * Stop the worker as usual when handling 'incompatible' command
+ * Update systemd/openqa-enqueue-bug-cleanup.timer
+ * Align jobtemplate inline help to left
+ * Fix openqa-enqueue-bug-cleanup.timer description
+
+-------------------------------------------------------------------
Old:
----
openQA-4.6.1582671252.ca350bd34.obscpio
New:
----
openQA-4.6.1582908813.c5b7e89c0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openQA-devel-test.spec ++++++
--- /var/tmp/diff_new_pack.8DK9Tf/_old 2020-02-29 21:24:58.354570891 +0100
+++ /var/tmp/diff_new_pack.8DK9Tf/_new 2020-02-29 21:24:58.354570891 +0100
@@ -18,7 +18,7 @@
%define short_name openQA-devel
Name: %{short_name}-test
-Version: 4.6.1582671252.ca350bd34
+Version: 4.6.1582908813.c5b7e89c0
Release: 0
Summary: Test package for %{short_name}
License: GPL-2.0-or-later
++++++ openQA-test.spec ++++++
--- /var/tmp/diff_new_pack.8DK9Tf/_old 2020-02-29 21:24:58.370570922 +0100
+++ /var/tmp/diff_new_pack.8DK9Tf/_new 2020-02-29 21:24:58.370570922 +0100
@@ -18,7 +18,7 @@
%define short_name openQA
Name: %{short_name}-test
-Version: 4.6.1582671252.ca350bd34
+Version: 4.6.1582908813.c5b7e89c0
Release: 0
Summary: Test package for openQA
License: GPL-2.0-or-later
++++++ openQA-worker-test.spec ++++++
--- /var/tmp/diff_new_pack.8DK9Tf/_old 2020-02-29 21:24:58.394570970 +0100
+++ /var/tmp/diff_new_pack.8DK9Tf/_new 2020-02-29 21:24:58.394570970 +0100
@@ -18,7 +18,7 @@
%define short_name openQA-worker
Name: %{short_name}-test
-Version: 4.6.1582671252.ca350bd34
+Version: 4.6.1582908813.c5b7e89c0
Release: 0
Summary: Test package for %{short_name}
License: GPL-2.0-or-later
++++++ openQA.spec ++++++
--- /var/tmp/diff_new_pack.8DK9Tf/_old 2020-02-29 21:24:58.414571009 +0100
+++ /var/tmp/diff_new_pack.8DK9Tf/_new 2020-02-29 21:24:58.414571009 +0100
@@ -65,7 +65,7 @@
%define devel_requires %build_requires %test_requires rsync chromedriver curl postgresql-devel %qemu tar xorg-x11-fonts sudo perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy)
Name: openQA
-Version: 4.6.1582671252.ca350bd34
+Version: 4.6.1582908813.c5b7e89c0
Release: 0
Summary: The openQA web-frontend, scheduler and tools
License: GPL-2.0-or-later
@@ -259,6 +259,7 @@
ln -s %{_datadir}/openqa/script/openqa-validate-yaml %{buildroot}%{_bindir}/openqa-validate-yaml
%if %{with python_scripts}
ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-label-all
+ln -s %{_datadir}/openqa/script/setup-db %{buildroot}%{_bindir}/openqa-setup-db
%endif
cd %{buildroot}
@@ -521,6 +522,8 @@
%files local-db
%{_unitdir}/openqa-setup-db.service
+%{_datadir}/openqa/script/setup-db
+%{_bindir}/openqa-setup-db
%files bootstrap
%{_datadir}/openqa/script/openqa-bootstrap
++++++ openQA-4.6.1582671252.ca350bd34.obscpio -> openQA-4.6.1582908813.c5b7e89c0.obscpio ++++++
/work/SRC/openSUSE:Factory/openQA/openQA-4.6.1582671252.ca350bd34.obscpio /work/SRC/openSUSE:Factory/.openQA.new.26092/openQA-4.6.1582908813.c5b7e89c0.obscpio differ: char 50, line 1
++++++ openQA.obsinfo ++++++
--- /var/tmp/diff_new_pack.8DK9Tf/_old 2020-02-29 21:24:58.478571136 +0100
+++ /var/tmp/diff_new_pack.8DK9Tf/_new 2020-02-29 21:24:58.478571136 +0100
@@ -1,5 +1,5 @@
name: openQA
-version: 4.6.1582671252.ca350bd34
-mtime: 1582671252
-commit: ca350bd34e8cd35d4ef9c4d9c76da2045c796ecf
+version: 4.6.1582908813.c5b7e89c0
+mtime: 1582908813
+commit: c5b7e89c080651455b8bf7c4fe47e481c7f22869
1
0
Hello community,
here is the log from the commit of package os-autoinst for openSUSE:Factory checked in at 2020-02-29 21:24:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-autoinst (Old)
and /work/SRC/openSUSE:Factory/.os-autoinst.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-autoinst"
Sat Feb 29 21:24:32 2020 rev:109 rq:780365 version:4.6.1582730128.1997f880
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst.changes 2020-02-26 15:07:10.165445332 +0100
+++ /work/SRC/openSUSE:Factory/.os-autoinst.new.26092/os-autoinst.changes 2020-02-29 21:24:50.814555969 +0100
@@ -1,0 +2,7 @@
+Fri Feb 28 19:03:46 UTC 2020 - okurz(a)suse.com
+
+- Update to version 4.6.1582730128.1997f880:
+ * Append HDD infos to GENERAL_HW_FLASH_ARGS - poo#63766
+ * Improve bwmqemu::log_call
+
+-------------------------------------------------------------------
Old:
----
os-autoinst-4.6.1582561187.791d0a5d.obscpio
New:
----
os-autoinst-4.6.1582730128.1997f880.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-autoinst-test.spec ++++++
--- /var/tmp/diff_new_pack.KHQjY7/_old 2020-02-29 21:24:52.994560284 +0100
+++ /var/tmp/diff_new_pack.KHQjY7/_new 2020-02-29 21:24:52.994560284 +0100
@@ -19,7 +19,7 @@
%define name_ext -test
%define short_name os-autoinst
Name: %{short_name}%{?name_ext}
-Version: 4.6.1582561187.791d0a5d
+Version: 4.6.1582730128.1997f880
Release: 0
Summary: test package for os-autoinst
#BuildRequires: %{short_name} == %{version}
++++++ os-autoinst.spec ++++++
--- /var/tmp/diff_new_pack.KHQjY7/_old 2020-02-29 21:24:53.010560315 +0100
+++ /var/tmp/diff_new_pack.KHQjY7/_new 2020-02-29 21:24:53.014560323 +0100
@@ -17,7 +17,7 @@
Name: os-autoinst
-Version: 4.6.1582561187.791d0a5d
+Version: 4.6.1582730128.1997f880
Release: 0
Summary: OS-level test automation
License: GPL-2.0-or-later
++++++ os-autoinst-4.6.1582561187.791d0a5d.obscpio -> os-autoinst-4.6.1582730128.1997f880.obscpio ++++++
/work/SRC/openSUSE:Factory/os-autoinst/os-autoinst-4.6.1582561187.791d0a5d.obscpio /work/SRC/openSUSE:Factory/.os-autoinst.new.26092/os-autoinst-4.6.1582730128.1997f880.obscpio differ: char 50, line 1
++++++ os-autoinst.obsinfo ++++++
--- /var/tmp/diff_new_pack.KHQjY7/_old 2020-02-29 21:24:53.062560418 +0100
+++ /var/tmp/diff_new_pack.KHQjY7/_new 2020-02-29 21:24:53.062560418 +0100
@@ -1,5 +1,5 @@
name: os-autoinst
-version: 4.6.1582561187.791d0a5d
-mtime: 1582561187
-commit: 791d0a5d43be3b6a4f753f8433d4ba5d223a3498
+version: 4.6.1582730128.1997f880
+mtime: 1582730128
+commit: 1997f88040bedd1b3a959479be3ccedca39746c5
1
0
Hello community,
here is the log from the commit of package keepassxc for openSUSE:Factory checked in at 2020-02-29 21:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/keepassxc (Old)
and /work/SRC/openSUSE:Factory/.keepassxc.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keepassxc"
Sat Feb 29 21:24:29 2020 rev:24 rq:780344 version:2.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/keepassxc/keepassxc.changes 2020-01-20 22:52:39.571279228 +0100
+++ /work/SRC/openSUSE:Factory/.keepassxc.new.26092/keepassxc.changes 2020-02-29 21:24:37.378529380 +0100
@@ -1,0 +2,8 @@
+Fri Feb 28 15:15:34 UTC 2020 - Michal Suchanek <msuchanek(a)suse.com>
+
+- Clicking the tray icon momentarily shows and immediately hides window. Make
+ it stick (boo#1165293).
+- Fix window not minimizing to tray.
+ + add keepassxc-Fix-window-hiding-after-shown.patch
+
+-------------------------------------------------------------------
New:
----
keepassxc-Fix-window-hiding-after-shown.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ keepassxc.spec ++++++
--- /var/tmp/diff_new_pack.aXiIt7/_old 2020-02-29 21:24:38.258531121 +0100
+++ /var/tmp/diff_new_pack.aXiIt7/_new 2020-02-29 21:24:38.262531129 +0100
@@ -1,7 +1,7 @@
#
# spec file for package keepassxc
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,7 @@
Source2: https://keepassxc.org/keepassxc_master_signing_key.asc#/%{name}.keyring
Source98: debian.tar.xz
Source99: keepassxc.dsc
+Patch: keepassxc-Fix-window-hiding-after-shown.patch
BuildRequires: cmake >= 3.1.0
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@@ -46,8 +47,8 @@
BuildRequires: ykpers-devel
%endif
BuildRequires: libyubikey-devel
-BuildRequires: readline-devel
BuildRequires: pkgconfig
+BuildRequires: readline-devel
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
@@ -97,6 +98,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%define _lto_cflags %{nil}
++++++ keepassxc-Fix-window-hiding-after-shown.patch ++++++
>From 345ae7feaae558f69a6f22bc7f438f0a233a71b5 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek(a)suse.de>
Date: Fri, 21 Feb 2020 01:17:20 +0100
Subject: [PATCH 1/4] gui: Use proper windowing system detection.
The GUI features depend on windowing system used, not OS.
Signed-off-by: Michal Suchanek <msuchanek(a)suse.de>
---
src/gui/MainWindow.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index b0dec4bf..d52ce9d2 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1287,13 +1287,13 @@ void MainWindow::processTrayIconTrigger()
void MainWindow::hideWindow()
{
saveWindowInformation();
-#if !defined(Q_OS_LINUX) && !defined(Q_OS_MACOS)
- // On some Linux systems, the window should NOT be minimized and hidden (i.e. not shown), at
- // the same time (which would happen if both minimize on startup and minimize to tray are set)
- // since otherwise it causes problems on restore as seen on issue #1595. Hiding it is enough.
- // TODO: Add an explanation for why this is also not done on Mac (or remove the check)
- setWindowState(windowState() | Qt::WindowMinimized);
-#endif
+ if (QGuiApplication::platformName() != "xcb") {
+ // In X11 the window should NOT be minimized and hidden (i.e. not
+ // shown) at the same time (which would happen if both minimize on
+ // startup and minimize to tray are set) since otherwise it causes
+ // problems on restore as seen on issue #1595. Hiding it is enough.
+ setWindowState(windowState() | Qt::WindowMinimized);
+ }
// Only hide if tray icon is active, otherwise window will be gone forever
if (isTrayIconEnabled()) {
hide();
--
2.25.1
>From 942cbed7d3c1a31ed547d6c411d8080653f5b5f9 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek(a)suse.de>
Date: Sun, 16 Feb 2020 22:38:35 +0100
Subject: [PATCH 2/4] gui: Fix main window hiding after shown
There is an issue with the WM sometimes produding an event that
keepassxc interprets as request to hide the main window just after it is
shown. A workaround with immediately fired timer was implemented.
However, there is no guarantee on execution ordering of the timer
callback and other application code. Remove the timer and override
show() and hide() on main window to only hide if the window has not been
shown recently.
Signed-off-by: Michal Suchanek <msuchanek(a)suse.de>
---
src/core/Clock.cpp | 5 +++++
src/core/Clock.h | 1 +
src/gui/MainWindow.cpp | 26 +++++++++++++++++++++++++-
src/gui/MainWindow.h | 4 ++++
4 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
index be9e91dc..5704d4bf 100644
--- a/src/core/Clock.cpp
+++ b/src/core/Clock.cpp
@@ -34,6 +34,11 @@ uint Clock::currentSecondsSinceEpoch()
return instance().currentDateTimeImpl().toTime_t();
}
+qint64 Clock::currentMilliSecondsSinceEpoch()
+{
+ return instance().currentDateTimeImpl().toMSecsSinceEpoch();
+}
+
QDateTime Clock::serialized(const QDateTime& dateTime)
{
auto time = dateTime.time();
diff --git a/src/core/Clock.h b/src/core/Clock.h
index 8f81b096..4d1ee253 100644
--- a/src/core/Clock.h
+++ b/src/core/Clock.h
@@ -28,6 +28,7 @@ public:
static QDateTime currentDateTime();
static uint currentSecondsSinceEpoch();
+ static qint64 currentMilliSecondsSinceEpoch();
static QDateTime serialized(const QDateTime& dateTime);
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index d52ce9d2..95c004f5 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1073,7 +1073,7 @@ void MainWindow::changeEvent(QEvent* event)
if (isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible()
&& config()->get("GUI/MinimizeToTray").toBool()) {
event->ignore();
- QTimer::singleShot(0, this, SLOT(hide()));
+ hide();
}
if (config()->get("security/lockdatabaseminimize").toBool()) {
@@ -1284,6 +1284,30 @@ void MainWindow::processTrayIconTrigger()
}
}
+void MainWindow::show()
+{
+ m_lastShowTime = Clock::currentMilliSecondsSinceEpoch();
+ QMainWindow::show();
+}
+
+bool MainWindow::shouldHide()
+{
+ qint64 current_time = Clock::currentMilliSecondsSinceEpoch();
+
+ if (current_time - m_lastShowTime < 50) {
+ return false;
+ }
+
+ return true;
+}
+
+void MainWindow::hide()
+{
+ if (shouldHide()) {
+ QMainWindow::hide();
+ }
+}
+
void MainWindow::hideWindow()
{
saveWindowInformation();
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 0e74edf6..a50d82d3 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,6 +70,8 @@ public slots:
void hideGlobalMessage();
void showYubiKeyPopup();
void hideYubiKeyPopup();
+ void hide();
+ void show();
void hideWindow();
void toggleWindow();
void bringToFront();
@@ -133,6 +135,7 @@ private:
static const QString BaseWindowTitle;
+ bool shouldHide();
void saveWindowInformation();
bool saveLastDatabases();
void updateTrayIcon();
@@ -164,6 +167,7 @@ private:
bool m_appExiting = false;
bool m_contextMenuFocusLock = false;
uint m_lastFocusOutTime = 0;
+ qint64 m_lastShowTime = 0;
QTimer m_trayIconTriggerTimer;
QSystemTrayIcon::ActivationReason m_trayIconTriggerReason;
};
--
2.25.1
>From f1ba4aa57f4607239b9c09d97060c9e7a015fea4 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek(a)suse.de>
Date: Mon, 17 Feb 2020 14:54:29 +0100
Subject: [PATCH 3/4] gui: Do not apply workaround for main window hiding on
Windows
The bug with main window hiding just after shown is not observed on
Windows and applying the workaround break Windows GUI tests. I don't
have Windows machine to investigate the failure.
Signed-off-by: Michal Suchanek <msuchanek(a)suse.de>
---
src/gui/MainWindow.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 95c004f5..f5bbd663 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1286,18 +1286,21 @@ void MainWindow::processTrayIconTrigger()
void MainWindow::show()
{
+#ifndef _WIN32
m_lastShowTime = Clock::currentMilliSecondsSinceEpoch();
+#endif
QMainWindow::show();
}
bool MainWindow::shouldHide()
{
+#ifndef _WIN32
qint64 current_time = Clock::currentMilliSecondsSinceEpoch();
if (current_time - m_lastShowTime < 50) {
return false;
}
-
+#endif
return true;
}
--
2.25.1
>From 31db796157f27a4bbdbc4744364b60e7d8b01d1c Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek(a)suse.de>
Date: Mon, 24 Feb 2020 12:33:43 +0100
Subject: [PATCH 4/4] gui: When minimizing window take tray settings into
account.
The user can set an option to hide window instead of minimizing when
tray icon is enabled. This is not honored in most places where the main
windows is minimized. Fix it. This also allows using the tray icon as a
workaround for minimization not working under some circumstances in X11.
Signed-off-by: Michal Suchanek <msuchanek(a)suse.de>
---
src/gui/DatabaseWidget.cpp | 9 +++++----
src/gui/MainWindow.cpp | 11 ++++++++++-
src/gui/MainWindow.h | 1 +
src/gui/TotpDialog.cpp | 2 +-
src/gui/TotpExportSettingsDialog.cpp | 2 +-
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index fd579b04..d81aa073 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -49,6 +49,7 @@
#include "gui/EntryPreviewWidget.h"
#include "gui/FileDialog.h"
#include "gui/KeePass1OpenWidget.h"
+#include "gui/MainWindow.h"
#include "gui/MessageBox.h"
#include "gui/OpVaultOpenWidget.h"
#include "gui/TotpDialog.h"
@@ -677,7 +678,7 @@ void DatabaseWidget::setClipboardTextAndMinimize(const QString& text)
clipboard()->setText(text);
if (config()->get("HideWindowOnCopy").toBool()) {
if (config()->get("MinimizeOnCopy").toBool()) {
- window()->showMinimized();
+ getMainWindow()->minimizeOrHide();
} else if (config()->get("DropToBackgroundOnCopy").toBool()) {
window()->lower();
}
@@ -782,7 +783,7 @@ void DatabaseWidget::openUrlForEntry(Entry* entry)
QProcess::startDetached(cmdString.mid(6));
if (config()->get("MinimizeOnOpenUrl").toBool()) {
- window()->showMinimized();
+ getMainWindow()->minimizeOrHide();
}
}
} else {
@@ -791,7 +792,7 @@ void DatabaseWidget::openUrlForEntry(Entry* entry)
QDesktopServices::openUrl(url);
if (config()->get("MinimizeOnOpenUrl").toBool()) {
- window()->showMinimized();
+ getMainWindow()->minimizeOrHide();
}
}
}
@@ -972,7 +973,7 @@ void DatabaseWidget::loadDatabase(bool accepted)
m_saveAttempts = 0;
emit databaseUnlocked();
if (config()->get("MinimizeAfterUnlock").toBool()) {
- window()->showMinimized();
+ getMainWindow()->minimizeOrHide();
}
} else {
if (m_databaseOpenWidget->database()) {
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index f5bbd663..4d9e3b7b 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -295,7 +295,7 @@ MainWindow::MainWindow()
connect(m_ui->menuGroups, SIGNAL(aboutToHide()), SLOT(releaseContextFocusLock()));
// Control window state
- new QShortcut(Qt::CTRL + Qt::Key_M, this, SLOT(showMinimized()));
+ new QShortcut(Qt::CTRL + Qt::Key_M, this, SLOT(minimizeOrHide()));
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_M, this, SLOT(hideWindow()));
// Control database tabs
new QShortcut(Qt::CTRL + Qt::Key_Tab, this, SLOT(selectNextDatabaseTab()));
@@ -1333,6 +1333,15 @@ void MainWindow::hideWindow()
}
}
+void MainWindow::minimizeOrHide()
+{
+ if (config()->get("GUI/MinimizeToTray").toBool()) {
+ hideWindow();
+ } else {
+ showMinimized();
+ }
+}
+
void MainWindow::toggleWindow()
{
if (isVisible() && !isMinimized()) {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index a50d82d3..0fd4c8ac 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -73,6 +73,7 @@ public slots:
void hide();
void show();
void hideWindow();
+ void minimizeOrHide();
void toggleWindow();
void bringToFront();
void closeAllDatabases();
diff --git a/src/gui/TotpDialog.cpp b/src/gui/TotpDialog.cpp
index 639eb0eb..7292cfcd 100644
--- a/src/gui/TotpDialog.cpp
+++ b/src/gui/TotpDialog.cpp
@@ -67,7 +67,7 @@ void TotpDialog::copyToClipboard()
clipboard()->setText(m_entry->totp());
if (config()->get("HideWindowOnCopy").toBool()) {
if (config()->get("MinimizeOnCopy").toBool()) {
- getMainWindow()->showMinimized();
+ getMainWindow()->minimizeOrHide();
} else if (config()->get("DropToBackgroundOnCopy").toBool()) {
getMainWindow()->lower();
window()->lower();
diff --git a/src/gui/TotpExportSettingsDialog.cpp b/src/gui/TotpExportSettingsDialog.cpp
index 178cd6d9..ea14eabd 100644
--- a/src/gui/TotpExportSettingsDialog.cpp
+++ b/src/gui/TotpExportSettingsDialog.cpp
@@ -105,7 +105,7 @@ void TotpExportSettingsDialog::copyToClipboard()
clipboard()->setText(m_totpUri);
if (config()->get("HideWindowOnCopy").toBool()) {
if (config()->get("MinimizeOnCopy").toBool()) {
- getMainWindow()->showMinimized();
+ getMainWindow()->minimizeOrHide();
} else if (config()->get("DropToBackgroundOnCopy").toBool()) {
getMainWindow()->lower();
window()->lower();
--
2.25.1
1
0
Hello community,
here is the log from the commit of package shotcut for openSUSE:Factory checked in at 2020-02-29 21:24:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shotcut (Old)
and /work/SRC/openSUSE:Factory/.shotcut.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shotcut"
Sat Feb 29 21:24:23 2020 rev:30 rq:780301 version:20.02.17
Changes:
--------
--- /work/SRC/openSUSE:Factory/shotcut/shotcut.changes 2019-09-25 08:31:24.654360196 +0200
+++ /work/SRC/openSUSE:Factory/.shotcut.new.26092/shotcut.changes 2020-02-29 21:24:34.602523886 +0100
@@ -1,0 +2,69 @@
+Tue Feb 18 18:56:50 UTC 2020 - Pavol Cupka <palica(a)liguros.net>
+
+- Update to release version 20.02.17
+- Upstream changes:
+ - Fixes:
+ - Fixed dropping multiple files to Playlist in a new project (broken in v19.12.31).
+ - Fixed some broken keyboard shortcuts in the Turkish translation.
+ - Fixed Properties > Speed not working after a project file repair.
+ - Fixed clip selection after Insert Track or Remove Track.
+ - Fixed Playlist > Add Selected to Timeline creates corrupt clips (broken in v19.12.31).
+ - Fixed Settings > Display Method > Software (Mesa) on Windows (broken in v19.12.31).
+ - Fixed creating a Project folder with leading or trailing spaces.
+ - Fixed saving the length property in MLT XML as a time value independent of frame rate.
+ - Fixed starting Text: Simple video filter with "@" shows "0".
+ - Fixed seeking previous & next on the first track in Keyframes where you trim a filter or use simple keyframes.
+ - Fixed an unexpected transition is created when moving a clip rightward adjacent to the next clip in Timeline (regression in v19.12.16).
+ - Fixed drag-n-drop from Source player to Timeline left player in an inconsistent state (broken in v19.09.14).
+ - Fixed an inconsistent colorspace conversion when accessing a cached image.
+ - Fixed Playlist > Copy followed by a change in Properties incorrectly changes the playlist item.
+ - Fixed clicking on the rectangle control may change its size.
+ - Fixed using the LUT (3D) filter with file with extended characters in its file path on Windows.
+ - Fixed a crash when using a transition on every track at the same time.
+ - Changes:
+ - Improved the reliability of Timeline > Select None.
+ - Changed Timeline > Master > Properties > Frame rate to show 6 decimal digits.
+ - Reduced the latency of scrubbing (regression in v19.12.31).
+ - Changed the video-overlay rectangle control used in some filters to allow changing the position by dragging from anywhere inside the rectangle.
+ - To enable, one must first double-click the center circle to put it into a positioning-locked mode. Otherwise, you would be prevented from dragging the clip out of the Source player.
+ - Changed the Filters panel on macOS to prevent floating to avoid a frequently reported problem of the Filters window appearing blank/black.
+ - Changed Timeline > clip context menu > Detach Audio to not seek afterwards.
+ - Improved mouse wheel and trackpad behavior in Timeline.
+ - Now, you do not need to ensure the mouse pointer is over a clip, speed is reduced, and zoom keeps focal point in view. The new zoom behavior does not apply when using the option Center the Playhead in the timeline menu.
+ - Upgraded MLT to version 6.20.0 and WebVfx to version 1.2.0.
+ - New:
+ - Added Settings > Preview Scaling!
+ This reduces the resolution for rendering effects for preview within the app, but there may be added a fair cost to the CPU for down-scaling sources to the preview resolution. Thus, this will be more beneficial when low resolution proxies are created, which is planned for version 20.04 in April.
+ Please understand that preview scaling will not always provide perfect fidelity. Some differences are unavoidable especially where blur, softness, and noise are concerned.
+ Some filters may not support preview scaling and will process at full project resolution:
+ Choppy
+ Rutt-Etra-Izer
+ Stabilize
+ Text: HTML > Blank with Web Animations
+ Text: HTML > Simple Scroll
+ Text: HTML > Two Column Scroll
+ - Added Export > Advanced > Video >Use preview scaling.
+ This is intended to provide a faster export for draft review. You should leave the export resolution set to the project resolution unless your preset or video codec dictates a resolution.
+ - Added Views > Scopes > Video Vector.
+ Note that the graticule on this is non-traditional, inspired by Alexis Van Hurkman.
+ - Added Filters > Audio > Pitch.
+ This is handy when changing the speed of a clip anywhere from 4.0x - 0.25x.
+ - Added the ability to rename clips in Properties by clicking into the header where the name is displayed.
+ - Added support for using a video clip in Transition Properties > Video.
+ This is handy to use with @jonray's matte transitions.
+ - Added a few more export presets:
+ audio/ALAC
+ audio/FLAC
+ intermediate/DNxHR HQ
+ intermediate/ProRes HQ
+ intermediate/ProRes was changed to ProRes 422
+ - Added Arabic translation.
+- Remove patch shotcut-noupdatecheck.patch no longer needed,
+ the package can be now configured to not check for updates
+
+-------------------------------------------------------------------
+Sat Feb 15 22:56:27 UTC 2020 - Pavol Cupka <palica(a)liguros.net>
+
+- Update to release version 19.12.31
+
+-------------------------------------------------------------------
Old:
----
shotcut-19.09.14.tar.gz
shotcut-noupdatecheck.patch
New:
----
shotcut-20.02.17.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shotcut.spec ++++++
--- /var/tmp/diff_new_pack.NkWYYC/_old 2020-02-29 21:24:35.702526063 +0100
+++ /var/tmp/diff_new_pack.NkWYYC/_new 2020-02-29 21:24:35.706526071 +0100
@@ -1,7 +1,7 @@
#
# spec file for package shotcut
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
%bcond_with x264
Name: shotcut
-Version: 19.09.14
+Version: 20.02.17
Release: 0
# This package creates a build time version from the current date and uses it to check
# for updates. See patch1 and prep/build section. For reproducible builds.
@@ -30,12 +30,10 @@
Summary: Video and audio editor and creator
License: GPL-3.0-or-later
Group: Productivity/Multimedia/Video/Editors and Convertors
-Url: http://www.shotcut.org/
+URL: http://www.shotcut.org/
Source: https://github.com/mltframework/shotcut/archive/v%{version}.tar.gz#/%{name}…
-# PATCH-FIX-OPENSUSE shotcut-noupdatecheck.patch davejplater(a)gmail.com -- Disable automatic update check
-Patch1: shotcut-noupdatecheck.patch
# PATCH-FIX-UPSTREAM shotcut-with-mlt-6.16.0.patch davejplater(a)gmail.com -- Fix missing type define with mlt < 6.17.0
-Patch2: shotcut-with-mlt-6.16.0.patch
+Patch1: shotcut-with-mlt-6.16.0.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
@@ -95,22 +93,14 @@
find . \
\( -name \*.html -o -name \*.js \) -type f -executable -exec chmod a-x {} + || :
-# Create version.json from current version
-echo "{" > version.json
-echo " \"version_number\": %{_vstring}02," >> version.json
-echo " \"version_string\": \"%{version}.02\"," >> version.json
-echo " \"url\": \"https://shotcut.org/blog/new-release-%{_vstring}/\"" >> version.json
-echo "}" >> version.json
-echo "" >> version.json
-
%build
##if LIBMLT_VERSION_INT >= MLT_VERSION_CPP_UPDATED 397568
##define LIBMLT_VERSION_INT 397312 ((LIBMLT_VERSION_MAJOR<<16)+(LIBMLT_VERSION_MINOR<<8)+LIBMLT_VERSION_REVISION)
-export _VSTRING="%{version}.02"
%qmake5 \
QMAKE_STRIP="" \
- _VSTRING="%{version}.02" \
- PREFIX="%{_prefix}" -Wall -recursive
+ PREFIX="%{_prefix}" -Wall -recursive \
+ SHOTCUT_VERSION=%{version} \
+ DEFINES+=SHOTCUT_NOUPGRADE
make %{_smp_mflags} VERBOSE=1
# CC=gcc-8 CPP=cpp-8 CXX=g++-8
@@ -138,7 +128,6 @@
echo "%lang($lang) $langdir/$qm" >>"$langlist"
done
popd
-cp -v version.json %{buildroot}%{_datadir}/%{name}
%suse_update_desktop_file -i org.%{name}.Shotcut
chmod 0755 %{buildroot}/%{_datadir}/%{name}/qml/export-edl/rebuild.sh
%fdupes -s %{buildroot}/%{_datadir}
++++++ shotcut-19.09.14.tar.gz -> shotcut-20.02.17.tar.gz ++++++
++++ 250823 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package afl for openSUSE:Factory checked in at 2020-02-29 21:24:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/afl (Old)
and /work/SRC/openSUSE:Factory/.afl.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "afl"
Sat Feb 29 21:24:19 2020 rev:48 rq:780291 version:2.62c
Changes:
--------
--- /work/SRC/openSUSE:Factory/afl/afl.changes 2020-02-26 15:04:09.801085466 +0100
+++ /work/SRC/openSUSE:Factory/.afl.new.26092/afl.changes 2020-02-29 21:24:27.470509772 +0100
@@ -1,0 +2,8 @@
+Fri Feb 28 14:09:26 UTC 2020 - Marcus Meissner <meissner(a)suse.com>
+
+- updated to 2.62c
+ - Important fix for memory allocation functions that result in afl-fuzz not identifying crashes - UPDATE!
+ - Small fix for -E/-V to release the CPU
+ - CmpLog does not need sancov anymore
+
+-------------------------------------------------------------------
Old:
----
2.61c.tar.gz
New:
----
2.62c.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ afl.spec ++++++
--- /var/tmp/diff_new_pack.xUQaqk/_old 2020-02-29 21:24:29.290513374 +0100
+++ /var/tmp/diff_new_pack.xUQaqk/_new 2020-02-29 21:24:29.294513382 +0100
@@ -17,7 +17,7 @@
Name: afl
-Version: 2.61c
+Version: 2.62c
Release: 0
Summary: American fuzzy lop is a security-oriented fuzzer
License: Apache-2.0
++++++ 2.61c.tar.gz -> 2.62c.tar.gz ++++++
++++ 2212 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ibus-typing-booster for openSUSE:Factory checked in at 2020-02-29 21:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-typing-booster (Old)
and /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-typing-booster"
Sat Feb 29 21:24:17 2020 rev:35 rq:780313 version:2.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-typing-booster/ibus-typing-booster.changes 2020-02-09 20:48:23.926874381 +0100
+++ /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.26092/ibus-typing-booster.changes 2020-02-29 21:24:22.330499600 +0100
@@ -1,0 +2,11 @@
+Thu Feb 27 16:41:11 UTC 2020 - maiku.fabian(a)gmail.com
+
+- Update to 2.8.1
+- Prevent also BackSpace from reopening a preedit when the option
+ “Arrow keys can reopen a preedit” is off
+- Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/87
+- Resolves: rhbz#1637647
+- Translation updates from Weblate for es, tr, he
+- Update emoji annotations from CLDR
+
+-------------------------------------------------------------------
Old:
----
ibus-typing-booster-2.8.0.tar.gz
New:
----
ibus-typing-booster-2.8.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-typing-booster.spec ++++++
--- /var/tmp/diff_new_pack.qHYl09/_old 2020-02-29 21:24:24.710504310 +0100
+++ /var/tmp/diff_new_pack.qHYl09/_new 2020-02-29 21:24:24.722504334 +0100
@@ -15,7 +15,7 @@
#
Name: ibus-typing-booster
-Version: 2.8.0
+Version: 2.8.1
Release: 0
Summary: An input completion utility
License: GPL-3.0+
++++++ ibus-typing-booster-2.8.0.tar.gz -> ibus-typing-booster-2.8.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/ibus-typing-booster/ibus-typing-booster-2.8.0.tar.gz /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.26092/ibus-typing-booster-2.8.1.tar.gz differ: char 12, line 1
1
0
Hello community,
here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2020-02-29 21:24:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old)
and /work/SRC/openSUSE:Factory/.lttng-modules.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules"
Sat Feb 29 21:24:13 2020 rev:12 rq:780075 version:2.11.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2019-10-04 11:22:42.364900623 +0200
+++ /work/SRC/openSUSE:Factory/.lttng-modules.new.26092/lttng-modules.changes 2020-02-29 21:24:15.990487053 +0100
@@ -1,0 +2,9 @@
+Wed Feb 26 14:29:32 UTC 2020 - Alexei Sorokin <sor.alexei(a)meowr.ru>
+
+- Update to version 2.11.2:
+ * See /usr/share/doc/packages/lttng-modules/ChangeLog
+- Rebase and rename lttng-modules-fix-leap-15.0.patch to
+ lttng-modules-fix-leap-15.1.patch.
+- Update the spec.
+
+-------------------------------------------------------------------
Old:
----
lttng-modules-2.10.11.tar.bz2
lttng-modules-2.10.11.tar.bz2.asc
lttng-modules-fix-leap-15.0.patch
New:
----
lttng-modules-2.11.2.tar.bz2
lttng-modules-2.11.2.tar.bz2.asc
lttng-modules-fix-leap-15.1.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lttng-modules.spec ++++++
--- /var/tmp/diff_new_pack.5Rko5w/_old 2020-02-29 21:24:17.190489428 +0100
+++ /var/tmp/diff_new_pack.5Rko5w/_new 2020-02-29 21:24:17.202489452 +0100
@@ -1,7 +1,7 @@
#
# spec file for package lttng-modules
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,58 +16,37 @@
#
-%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse}
-%ifarch x86_64
-%define buildrt 1
-%endif
-%endif
Name: lttng-modules
-Version: 2.10.11
+Version: 2.11.2
Release: 0
Summary: Licensing information for package lttng-modules
License: GPL-2.0-only AND LGPL-2.1-only AND MIT
Group: System/Kernel
-Url: https://lttng.org/
+URL: https://lttng.org/
Source: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2
Source1: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2.asc
Source2: %{name}.keyring
Source3: %{name}-preamble
Source4: Module.supported
-# PATCH-FIX-OPENSUSE lttng-modules-fix-leap-15.0.patch -- Fix building on openSUSE Leap 15.0.
-Patch0: lttng-modules-fix-leap-15.0.patch
-BuildRequires: kernel-devel
-BuildRequires: kernel-source
-BuildRequires: kernel-syms
-BuildRequires: module-init-tools
+# PATCH-FIX-OPENSUSE lttng-modules-fix-leap-15.1.patch -- Fix building on openSUSE Leap 15.1.
+Patch0: lttng-modules-fix-leap-15.1.patch
+BuildRequires: %{kernel_module_package_buildreqs}
ExclusiveArch: %ix86 x86_64 aarch64 ppc64 ppc64le
-%if 0%{?buildrt}
-BuildRequires: kernel-syms-rt
-%endif
%description
This package provides licensing documentation for the lttng kmp packages.
-%suse_kernel_module_package -p %{name}-preamble ec2 xen xenpae vmi um
-
-%package KMP
-Summary: LTTng Kernel Tracing Modules
-Group: System/Kernel
-
-%description KMP
-This package contains the LTTng 2.0 Kernel Modules necessary for
-instrumenting kernel subsystems.
+%kernel_module_package -p %{name}-preamble -x ec2 xen xenpae vmi um
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
set -- *
-mkdir source
-mkdir obj
+mkdir source obj
for i in "$@"; do
case $i in
- LICENSE|*.txt) ;;
+ LICENSE|LICENSES|ChangeLog) ;;
*) mv $i source ;;
esac
done
@@ -78,7 +57,7 @@
rm -rf obj/$flavor
cp -r source obj/$flavor
cp %{SOURCE4} obj/$flavor
- make %{?_smp_mflags} V=1 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \
+ %make_build -C %{kernel_source $flavor} modules \
M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m
done
@@ -87,11 +66,12 @@
export INSTALL_MOD_DIR=updates
export BRP_PESIGN_FILES="*.ko /lib/firmware"
for flavor in %{flavors_to_build}; do
- make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install \
+ make -C %{kernel_source $flavor} modules_install \
M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m
done
%files
-%license LICENSE lgpl-2.1.txt gpl-2.0.txt mit-license.txt
+%license LICENSE LICENSES/GPL-2.0 LICENSES/LGPL-2.1 LICENSES/MIT
+%doc ChangeLog
%changelog
++++++ lttng-modules-2.10.11.tar.bz2 -> lttng-modules-2.11.2.tar.bz2 ++++++
++++ 16591 lines of diff (skipped)
++++++ lttng-modules-fix-leap-15.0.patch -> lttng-modules-fix-leap-15.1.patch ++++++
--- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules-fix-leap-15.0.patch 2019-04-22 12:27:03.368946253 +0200
+++ /work/SRC/openSUSE:Factory/.lttng-modules.new.26092/lttng-modules-fix-leap-15.1.patch 2020-02-29 21:24:15.958486990 +0100
@@ -1,82 +1,78 @@
-Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/block.h
-===================================================================
---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/block.h
-+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/block.h
-@@ -618,7 +618,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
+--- a/instrumentation/events/lttng-module/block.h
++++ b/instrumentation/events/lttng-module/block.h
+@@ -619,7 +619,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
TP_ARGS(q, bio),
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
-@@ -663,7 +664,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complet
+@@ -664,7 +665,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complet
#endif
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-@@ -697,7 +699,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_m
+@@ -698,7 +700,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_m
TP_ARGS(q, rq, bio),
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-@@ -763,7 +766,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_queue,
+@@ -764,7 +767,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_queue,
TP_ARGS(q, bio),
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-@@ -854,7 +858,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_r
+@@ -855,7 +859,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_r
TP_ARGS(q, bio, rw),
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0)
#else
ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
-@@ -1019,7 +1024,8 @@ LTTNG_TRACEPOINT_EVENT(block_split,
+@@ -1020,7 +1025,8 @@ LTTNG_TRACEPOINT_EVENT(block_split,
TP_ARGS(q, bio, new_sector),
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-@@ -1062,7 +1068,8 @@ LTTNG_TRACEPOINT_EVENT(block_remap,
+@@ -1063,7 +1069,8 @@ LTTNG_TRACEPOINT_EVENT(block_remap,
TP_ARGS(q, bio, dev, from),
TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h
-===================================================================
---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/btrfs.h
-+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h
-@@ -39,10 +39,12 @@ struct extent_state;
+--- a/instrumentation/events/lttng-module/btrfs.h
++++ b/instrumentation/events/lttng-module/btrfs.h
+@@ -44,10 +44,12 @@ struct extent_state;
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -89,7 +85,7 @@
LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
TP_PROTO(const struct btrfs_root *root),
-@@ -146,7 +148,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i
+@@ -151,7 +153,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i
)
#endif
@@ -99,17 +95,17 @@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
-@@ -285,7 +288,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
-
- #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
+@@ -368,7 +371,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
+ BTRFS_I(inode)->root->root_key.objectid)
+ )
+ )
+-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
+ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
-@@ -329,6 +333,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
+@@ -412,6 +416,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
)
)
#elif (LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
@@ -117,7 +113,15 @@
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0))
-@@ -376,6 +381,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
+@@ -459,6 +464,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
+ #endif
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \
+ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
+ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
+ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
+@@ -664,6 +670,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -125,7 +129,7 @@
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -581,6 +587,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
+@@ -766,6 +773,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_g
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -133,7 +137,7 @@
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -623,6 +630,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
+@@ -1006,6 +1014,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tre
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -141,7 +145,7 @@
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -797,6 +805,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf
+@@ -1295,6 +1304,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf
)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -149,7 +153,7 @@
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -1000,7 +1009,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref
+@@ -1498,7 +1508,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref
)
#endif
@@ -159,7 +163,7 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
-@@ -1070,7 +1080,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
+@@ -1568,7 +1579,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
TP_ARGS(fs_info, map, offset, size)
)
@@ -169,7 +173,7 @@
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0))
-@@ -1146,6 +1157,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
+@@ -1644,6 +1656,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -177,15 +181,7 @@
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -1186,6 +1198,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
- #endif
-
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
-+ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \
- LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
- LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
- LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -1223,7 +1236,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser
+@@ -1737,7 +1750,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser
)
#endif
@@ -195,7 +191,7 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
-@@ -1392,7 +1406,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
+@@ -1956,7 +1970,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
TP_ARGS(block_group, start, len)
)
@@ -205,15 +201,7 @@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
btrfs_find_free_extent,
-@@ -1611,6 +1626,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
- #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
-+ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \
- LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
- LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
- LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -1707,6 +1723,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust
+@@ -2316,6 +2331,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -221,25 +209,21 @@
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/kmem.h
-===================================================================
---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/kmem.h
-+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/kmem.h
-@@ -132,7 +132,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_
+--- a/instrumentation/events/lttng-module/kmem.h
++++ b/instrumentation/events/lttng-module/kmem.h
+@@ -133,7 +133,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_
)
)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
-+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) || \
++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
TP_PROTO(struct page *page),
-Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/kvm.h
-===================================================================
---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/kvm.h
-+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/kvm.h
-@@ -111,6 +111,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
+--- a/instrumentation/events/lttng-module/kvm.h
++++ b/instrumentation/events/lttng-module/kvm.h
+@@ -112,6 +112,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
|| LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
|| LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \
@@ -247,3 +231,15 @@
|| LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0))
LTTNG_TRACEPOINT_EVENT(kvm_mmio,
+--- a/instrumentation/events/lttng-module/mm_vmscan.h
++++ b/instrumentation/events/lttng-module/mm_vmscan.h
+@@ -94,7 +94,8 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_
+
+ #endif
+
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0) \
++ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */
+ LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
+
+ TP_PROTO(int nid, int zid, int order, gfp_t gfp_flags),
++++++ lttng-modules-preamble ++++++
--- /var/tmp/diff_new_pack.5Rko5w/_old 2020-02-29 21:24:17.734490505 +0100
+++ /var/tmp/diff_new_pack.5Rko5w/_new 2020-02-29 21:24:17.734490505 +0100
@@ -1,3 +1,3 @@
-Requires: kernel-%1
-Requires: lttng-modules
-Enhances: kernel-%1
+Requires: kernel-%1
+Enhances: kernel-%1
+Supplements: (kernel-%1 and %name)
1
0
Hello community,
here is the log from the commit of package nrpe for openSUSE:Factory checked in at 2020-02-29 21:23:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nrpe (Old)
and /work/SRC/openSUSE:Factory/.nrpe.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nrpe"
Sat Feb 29 21:23:40 2020 rev:11 rq:780480 version:3.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2018-10-23 20:38:12.460700764 +0200
+++ /work/SRC/openSUSE:Factory/.nrpe.new.26092/nrpe.changes 2020-02-29 21:23:57.898451250 +0100
@@ -1,0 +2,49 @@
+Fri Feb 21 15:52:55 UTC 2020 - lars(a)linux-schulserver.de
+
+- nrpe.xml firewalld file is handled by firewalld package
+- Leap 15.1 is suse_version 1500 (thanks, dimstar)
+
+-------------------------------------------------------------------
+Mon Feb 3 15:09:45 UTC 2020 - Dominique Leuenberger <dimstar(a)opensuse.org>
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+ shortcut through the -mini flavors.
+
+-------------------------------------------------------------------
+Sun Mar 17 01:38:53 UTC 2019 - Lars Vogdt <lars(a)linux-schulserver.de>
+
+- Do not package nrpe.xml for Leap 15.0, as it is included in
+ firewalld package there.
+
+-------------------------------------------------------------------
+Sun Feb 17 16:02:23 UTC 2019 - lars(a)linux-schulserver.de
+
+- add nrpe.xml snipplet for firewalld
+- still ship nrpe snipplet for SuSEfirewalld for now
+- use systemd files directly from upstream:
+ + drop Requires=var-run.mount line from service file
+ + drop nrpe.service
+ + drop nrpe.socket
+ + do not create tmpfiles.d/nrpe in spec any longer
+- handle migration from /etc/nagios/nrpe.cfg to /etc/nrpe.cfg also
+ for systemd case (triggerun)
+- increase warn/crit level for processes to 350/400 in a default
+ installation
+- added patch and dh.h file to NOT re-calculate dh.h parameters
+ during each build (for reproducable builds).
+ Can be enable/disable by setting the 'reproducable' build
+ condition. Default is: "on" for suse_version >= 15
+ + nrpe-3.2.1-static_dh_parameters.patch
+ + nrpe-3.2.1-dh.h
+- use _rundir and _tmpfilesdir macros everywhere
+- do not create nagios user/group during install on (open)SUSE
+ systems and rely on the files section here instead
+- rename nagios-nrpe-rpmlintrc and nagios-nrpe-SuSEfirewall2 to
+ nrpe-rpmlintrc and nrpe-SuSEfirewall2
+- simplify rpmlintrc
+- build nrpe-doc package as noarch
+- specfile cleanup & remove other distribution specials
+- disable chkconfig call in Makefile on old distributions
+ nrpe-3.2.1-disable-chkconfig_in_Makefile.patch
+
+-------------------------------------------------------------------
Old:
----
nagios-nrpe-SuSEfirewall2
nagios-nrpe-rpmlintrc
nrpe.service
nrpe.socket
New:
----
nrpe-3.2.1-dh.h
nrpe-3.2.1-disable-chkconfig_in_Makefile.patch
nrpe-3.2.1-static_dh_parameters.patch
nrpe-SuSEfirewall2
nrpe-rpmlintrc
nrpe.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nrpe.spec ++++++
--- /var/tmp/diff_new_pack.KKDlPc/_old 2020-02-29 21:23:59.314454052 +0100
+++ /var/tmp/diff_new_pack.KKDlPc/_new 2020-02-29 21:23:59.314454052 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nrpe
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,113 +16,92 @@
#
-# Macro that print mesages to syslog at package (un)install time
%define nnmmsg logger -t %{name}/rpm
%define nrpeport 5666
%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
+ %define _rundir %{_localstatedir}/run
%endif
-
+%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d}
%if 0%{?suse_version} >= 1210 || 0%{?centos_version} >= 600
-%bcond_without systemd
+ %bcond_without systemd
%else
-%bcond_with systemd
+ %bcond_with systemd
+%endif
+%if 0%{?suse_version} >= 01500
+ %bcond_without firewalld
+%else
+ %bcond_with firewalld
+%endif
+%if 0%{?suse_version} >= 01500
+%bcond_without reproducable
+%else
+%bcond_with reproducable
%endif
-
Name: nrpe
Version: 3.2.1
Release: 0
Summary: Nagios Remote Plug-In Executor
License: GPL-2.0-or-later
Group: System/Monitoring
-Url: http://www.nagios.org/
+URL: http://www.nagios.org/
Source0: nrpe-%{version}.tar.bz2
Source1: nrpe.init
-Source2: nagios-nrpe-rpmlintrc
-Source3: nagios-nrpe-SuSEfirewall2
+Source2: nrpe-rpmlintrc
+Source3: nrpe-SuSEfirewall2
Source4: nrpe.8
Source5: check_nrpe.cfg
-Source6: nrpe.service
-Source8: nrpe.socket
Source10: README.SUSE
Source11: README.SUSE.systemd-addon
-# apparmor profile
Source12: usr.sbin.nrpe
+Source13: nrpe.xml
+Source14: nrpe-3.2.1-dh.h
# PATCH-FIX-UPSTREAM improve help output of nrpe and check_nrpe
Patch2: nrpe-improved_help.patch
# PATCH-FIX-openSUSE fix pathnames for nrpe_check_control command
Patch4: nrpe_check_control.patch
# PATCH-FIX-UPSTREAM using implicit definitions of functions
Patch5: nrpe-implicit_declaration.patch
-%if 0%{?suse_version}
+# PATCH-FIX-openSUSE patch used to NOT re-calculate dh.h parameters (for reproducable builds)
+Patch6: nrpe-3.2.1-static_dh_parameters.patch
+# PATCH-FIX-openSUSE disable chkconfig call in Makefile
+Patch7: nrpe-3.2.1-disable-chkconfig_in_Makefile.patch
+BuildRequires: monitoring-plugins-common
+BuildRequires: nagios-rpm-macros
+Requires(pre): grep
+Requires(pre): sed
+Provides: nagios-nrpe = %{version}
+Obsoletes: nagios-nrpe < 2.14
+Provides: nagios-nrpe-client = %{version}
+Obsoletes: nagios-nrpe-client < %{version}
PreReq: %fillup_prereq
-PreReq: %insserv_prereq
-%endif
%if 0%{?suse_version} < 1200
+PreReq: %insserv_prereq
PreReq: /bin/logger
%else
-PreReq: /usr/bin/logger
-%endif
-PreReq: coreutils
-PreReq: grep
-%if 0%{?suse_version}
-PreReq: netcfg
-PreReq: pwdutils
+Requires(pre): %{_bindir}/logger
%endif
-PreReq: sed
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires(pre): netcfg
+Requires(pre): pwdutils
%if 0%{?suse_version} > 1130
%if 0%{?suse_version} <= 1230
-PreReq: sysvinit(network)
-PreReq: sysvinit(syslog)
+Requires(pre): sysvinit(network)
+Requires(pre): sysvinit(syslog)
%endif
%endif
-#
-BuildRequires: monitoring-plugins-common
-BuildRequires: nagios-rpm-macros
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-BuildRequires: tcp_wrappers-devel
-%else
-BuildRequires: tcpd-devel
-%endif
-#
-%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: krb5-devel
-%else
-BuildRequires: heimdal-devel
-%endif
-#
-%if 0%{?suse_version} > 1020
BuildRequires: libopenssl-devel
BuildRequires: openssl
-%else
-BuildRequires: openssl-devel
-%endif
-#
-%if 0%{?suse_version} > 1020
+BuildRequires: tcpd-devel
Recommends: inet-daemon
-Recommends: monitoring-plugins-users
-Recommends: monitoring-plugins-load
Recommends: monitoring-plugins-disk
+Recommends: monitoring-plugins-load
Recommends: monitoring-plugins-procs
-%else
-%if 0%{?suse_version}
-Requires: inet-daemon
-%endif
-Requires: monitoring-plugins
-%endif
-#
-Provides: nagios-nrpe = %{version}
-Obsoletes: nagios-nrpe < 2.14
-Provides: nagios-nrpe-client = %{version}
-Obsoletes: nagios-nrpe-client < %{version}
-
+Recommends: monitoring-plugins-users
%if %{with systemd}
-BuildRequires: systemd
-%{?systemd_requires}
+BuildRequires: pkgconfig(systemd)
+%{?systemd_ordering}
%endif
-
-%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
NRPE can be used to run Nagios plugins on a remote machine for
@@ -135,6 +114,9 @@
Group: Documentation/Other
Provides: nagios-nrpe-doc = %{version}
Obsoletes: nagios-nrpe-doc < 2.14
+%if 0%{?suse_version} >= 1230
+BuildArch: noarch
+%endif
%description doc
This package contains the README files, OpenOffice and PDF
@@ -143,13 +125,13 @@
%package -n monitoring-plugins-nrpe
Summary: NRPE plugin
Group: System/Monitoring
-%if 0%{?suse_version} > 1020
-Recommends: monitoring_daemon
-%endif
Provides: nagios-nrpe-server = %{version}-%{release}
Obsoletes: nagios-nrpe-server < 2.14
Provides: nagios-plugins-nrpe = %{version}-%{release}
Obsoletes: nagios-plugins-nrpe < 2.15-%{release}
+%if 0%{?suse_version} > 1020
+Recommends: monitoring_daemon
+%endif
%description -n monitoring-plugins-nrpe
This package contains the plugin for the host runing the Nagios
@@ -167,18 +149,21 @@
%patch2 -p1
%patch4 -p1
%patch5 -p1
+%if %{with reproducable}
+%patch6 -p1
+install -m644 %{SOURCE14} include/dh.h
+%endif
+%patch7 -p1
cp -a %{SOURCE10} .
cp -a %{SOURCE12} .
%if 0%{?suse_version} >= 1210
cat %{SOURCE11} >> README.SUSE
%endif
chmod -x contrib/README.nrpe_check_control
-%if 0%{?suse_version} > 01110
# increase the number of 'allowed' processes on newer systems:
-sed -i "s|check_procs -w 150 -c 200|check_procs -w 250 -c 300|g" sample-config/nrpe.cfg.in
-%endif
+sed -i "s|check_procs -w 150 -c 200|check_procs -w 350 -c 400|g" sample-config/nrpe.cfg.in
# add the new include directory
-sed -i "s|#include_dir=<someotherdirectory>|#include_dir=<someotherdirectory>\ninclude_dir=/etc/nrpe.d|g" sample-config/nrpe.cfg.in
+sed -i "s|#include_dir=<someotherdirectory>|#include_dir=<someotherdirectory>\ninclude_dir=%{_sysconfdir}/nrpe.d|g" sample-config/nrpe.cfg.in
%build
%configure \
@@ -192,7 +177,7 @@
--bindir=%{_sbindir} \
--sbindir=%{_sbindir} \
--with-logdir=%{nagios_logdir} \
- --with-piddir=/var/run/nrpe \
+ --with-piddir=%{_rundir}/%{name} \
--with-pluginsdir=%{nagios_plugindir} \
--enable-install-method=os \
--with-dist-type=suse \
@@ -208,7 +193,7 @@
--with-nagios-group=%{nagios_group} \
--with-nrpe-user=%{nagios_user} \
--with-nrpe-group=%{nagios_group} \
- --with-nrpe-port=%nrpeport \
+ --with-nrpe-port=%{nrpeport} \
--enable-command-args \
--enable-bash-command-substitution \
--enable-ssl
@@ -217,14 +202,16 @@
gcc %{optflags} -o contrib/nrpe_check_control contrib/nrpe_check_control.c
%install
-%nagios_command_user_group_add
install -d %{buildroot}%{_sysconfdir}/xinetd.d
install -d %{buildroot}%{_rundir}/%{name}
%if %{with systemd}
-install -d %{buildroot}/usr/lib/tmpfiles.d
+install -d %{buildroot}%{_tmpfilesdir}/
+install -d %{buildroot}%{_unitdir}/
+%else
+install -d %{buildroot}%{_sysconfdir}/init.d/
%endif
install -d %{buildroot}%{_sysconfdir}/nrpe.d
-make install install-config install-inetd install-daemon \
+make install install-config install-inetd install-daemon install-init \
DESTDIR=%{buildroot} \
CGICFGDIR="%{_sysconfdir}" \
NAGIOS_INSTALL_OPTS="" \
@@ -234,16 +221,28 @@
INIT_OPTS=""
install -Dm 644 %{SOURCE4} %{buildroot}%{_mandir}/man8/nrpe.8
-%if 0%{?suse_version} <= 1230
-install -Dm 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nrpe
-ln -s -f ../../etc/init.d/nrpe %{buildroot}%{_sbindir}/rcnrpe
+
+%if %{with systemd}
+ sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}.service
+ install -Dm644 startup/default-socket %{buildroot}%{_unitdir}/%{name}.socket
+ ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnrpe
%else
-ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnrpe
+ %if 0%{?suse_version} <= 1230
+ # openSUSE uses own nrpe init script
+ rm %{buildroot}%{_sysconfdir}/init.d/nrpe
+ install -Dm 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nrpe
+ ln -s -f ../..%{_initddir}/nrpe %{buildroot}%{_sbindir}/rcnrpe
+ %endif
%endif
-# install SuSEfirewall2 script
-%if 0%{?suse_version} > 1020
-install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
+%if %{with firewalld}
+ # firewalld service file - handled by firewalld package now
+ # install -Dm 644 %{SOURCE13} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
+ # temporary: also install SuSEfirewall2 snipplet for a while
+ install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
+%else
+ # install SuSEfirewall2 script
+ install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
%endif
# fix pid_file in nrpe.cfg
@@ -271,21 +270,6 @@
# install simple nrpe.cfg for the Nagios server in the objects directory
install -Dm644 %{SOURCE5} %{buildroot}%{nagios_sysconfdir}/objects/check_nrpe.cfg
-%if %{with systemd}
-# install systemd specific files
-install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
-%if 0%{?centos_version}
-sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" -e "/Requires=var-run.mount/d" %{buildroot}%{_unitdir}/%{name}.service
-%else
-sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}.service
-%endif
-install -Dm644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.socket
-install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
-echo "d %{_rundir}/%{name} 0755 %{nagios_user} %{nagios_group} -" > %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-chmod 644 %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-%endif
-
-# install config update script in doc dir...
install -Dm755 update-cfg.pl %{buildroot}/%{_defaultdocdir}/%{name}/examples/update-cfg.pl
# ...and also the files we want in the main package
install -m644 CHANGELOG.md README.SUSE README.md usr.sbin.nrpe %{buildroot}/%{_defaultdocdir}/%{name}/
@@ -297,47 +281,33 @@
%nagios_user_group_add
%nagios_command_user_group_add
# check if the port for nrpe is already defined in /etc/services
-if grep -q %nrpeport /etc/services ; then
+if grep -q %{nrpeport} %{_sysconfdir}/services ; then
: OK - port already defined
else
- %nnmmsg "Adding port %nrpeport to /etc/services"
- echo "nrpe %nrpeport/tcp # Nagios nrpe" >> etc/services
+ %{nnmmsg} "Adding port %{nrpeport} to %{_sysconfdir}/services"
+ echo "nrpe %{nrpeport}/tcp # Nagios nrpe" >> etc/services
fi
%if %{with systemd}
- %if 0%{?centos_version}
- #systemd_pre nrpe.service nrpe.socket
- %else
%service_add_pre nrpe.service nrpe.socket
- %endif
%endif
%preun
%if %{with systemd}
- %if 0%{?centos_version}
- %systemd_preun nrpe.service nrpe.socket
- %else
%service_del_preun nrpe.service nrpe.socket
- %endif
%else
-%stop_on_removal %{name}
+ %stop_on_removal %{name}
%endif
%post
-%if 0%{?suse_version}
- %if 0%{?suse_version} <= 1230
+%if 0%{?suse_version} <= 1230
%{fillup_and_insserv -fy %{name}}
- %else
+%else
%fillup_only %{name}
- %endif
%endif
%if %{with systemd}
- %if 0%{?centos_version}
- %systemd_post nrpe.service nrpe.socket
- %else
%service_add_post nrpe.service nrpe.socket
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
- %endif
%endif
%pre -n monitoring-plugins-nrpe
@@ -345,25 +315,34 @@
%nagios_user_group_add
%triggerun -- nagios-nrpe < 2.14
-STATUS='/var/adm/update-scripts/nrpe'
-if [ -x %{_sysconfdir}/init.d/nrpe ]; then
+STATUS='%{_localstatedir}/adm/update-scripts/nrpe'
+%if %{with systemd}
+ if systemctl -q is-enabled nrpe.service ; then
+ echo "systemctl -q restart nrpe.service" >> "$STATUS"
+ elif systemctl -q is-enabled xinetd.service ; then
+ echo "systemctl -q reload xinetd.service" >> "$STATUS"
+ else
+ touch "$STATUS"
+ fi
+%else
+ if [ -x %{_sysconfdir}/init.d/nrpe ]; then
%{_sysconfdir}/init.d/nrpe status >/dev/null
if test $? = 0; then
echo "%{_sysconfdir}/init.d/nrpe restart" >> "$STATUS"
else
touch "$STATUS"
fi
- chmod +x "$STATUS"
-fi
-if [ -x %{_sysconfdir}/init.d/xinetd ]; then
+ fi
+ if [ -x %{_sysconfdir}/init.d/xinetd ]; then
%{_sysconfdir}/init.d/xinetd status >/dev/null
if test $? = 0; then
echo "%{_sysconfdir}/init.d/xinetd try-restart" >> "$STATUS"
+ fi
else
touch "$STATUS"
fi
- chmod +x "$STATUS"
-fi
+%endif
+chmod +x "$STATUS"
%triggerpostun -- nagios-nrpe < 2.14
# Move /etc/nagios/nrpe.cfg to /etc/nrpe.cfg when updating from an old version
@@ -377,23 +356,20 @@
fi
sed -i "s|%{nagios_sysconfdir}/nrpe.cfg|%{_sysconfdir}/nrpe.cfg|g" %{_sysconfdir}/xinetd.d/nrpe || :
sed -i "s|nrpe-service|%{name}|g" %{_sysconfdir}/sysconfig/SuSEfirewall2 || :
-if [ -e /var/adm/update-scripts/nrpe ]; then
- /bin/sh /var/adm/update-scripts/nrpe
- rm /var/adm/update-scripts/nrpe
+if [ -e %{_localstatedir}/adm/update-scripts/nrpe ]; then
+ /bin/sh %{_localstatedir}/adm/update-scripts/nrpe
+ rm %{_localstatedir}/adm/update-scripts/nrpe
fi
%postun
-%if 0%{?suse_version}
- %insserv_cleanup
- %if %{with systemd}
+%if %{with systemd}
%service_del_postun nrpe.service nrpe.socket
%else
%restart_on_update nrpe
+ %if 0%{?suse_version}
+ %insserv_cleanup
%endif
%endif
-%if 0%{?centos_version}
- %systemd_postun_with_restart nrpe.service nrpe.socket
-%endif
%files
%defattr(-,root,root)
@@ -403,32 +379,31 @@
%doc %{_defaultdocdir}/%{name}/README.md
%doc %{_defaultdocdir}/%{name}/CHANGELOG.md
%doc %{_defaultdocdir}/%{name}/usr.sbin.nrpe
-%doc %{_defaultdocdir}/%{name}//examples/update-cfg.pl
-%{_mandir}/man8/nrpe.8*
+%doc %{_defaultdocdir}/%{name}/examples/update-cfg.pl
+%{_mandir}/man8/nrpe.8%{?ext_man}
%dir %{_sysconfdir}/nrpe.d
%config(noreplace) %{_sysconfdir}/nrpe.cfg
%if 0%{?suse_version} > 1315
%dir %{_sysconfdir}/xinetd.d
%endif
%config(noreplace) %{_sysconfdir}/xinetd.d/nrpe
-%if 0%{?suse_version} > 1020
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe
-%endif
%if 0%{?suse_version} <= 1230
-%{_sysconfdir}/init.d/nrpe
-%ghost %dir %{_rundir}/%{name}
%ghost %{_rundir}/%{name}/nrpe.pid
%endif
%if %{with systemd}
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
%{_tmpfilesdir}/%{name}.conf
-%ghost %dir %{_rundir}/%{name}
+%else
+%{_sysconfdir}/init.d/nrpe
%endif
+%ghost %dir %{_rundir}/%{name}
%attr(0755,root,root) %{_sbindir}/nrpe
%{_sbindir}/rcnrpe
%files doc
+%defattr(-,root,root)
%defattr(0644,root,root,0755)
%doc CHANGELOG.md LEGAL *.md docs/*.pdf
++++++ nrpe-3.2.1-dh.h ++++++
#ifndef HEADER_DH_H
# include <openssl/dh.h>
#endif
DH *get_dh2048()
{
static unsigned char dhp_2048[] = {
0xED, 0x49, 0xA6, 0x2E, 0xB7, 0x99, 0xA6, 0x48, 0x89, 0x13,
0xA0, 0xC9, 0xB2, 0xF5, 0x43, 0xB3, 0xD5, 0x03, 0x53, 0x42,
0x83, 0xB5, 0xC0, 0x14, 0x92, 0x8A, 0x3A, 0xC2, 0x51, 0xC8,
0x7C, 0xE9, 0xA2, 0x5E, 0x90, 0x6F, 0x5C, 0xB6, 0xA7, 0xC6,
0x4B, 0x6D, 0x61, 0x84, 0x03, 0xC8, 0x13, 0x22, 0xBA, 0x77,
0x55, 0x7C, 0x49, 0x90, 0xED, 0xE9, 0x3E, 0x2D, 0xF1, 0x3C,
0xC8, 0xEF, 0x2E, 0x86, 0x33, 0x63, 0x7D, 0x2D, 0x3E, 0x9A,
0xED, 0xDE, 0x99, 0x54, 0x08, 0xDC, 0x1B, 0xBC, 0xD9, 0x76,
0x42, 0xCE, 0x13, 0x5A, 0xA7, 0x7C, 0xFE, 0xFE, 0x8C, 0xD1,
0xDF, 0xF8, 0xB5, 0x16, 0xBF, 0x69, 0x60, 0xDA, 0xA3, 0xFC,
0xC0, 0x4C, 0xF2, 0xD1, 0x72, 0x5B, 0x50, 0x4E, 0x2C, 0x38,
0x0E, 0xC6, 0x24, 0xBF, 0x6A, 0x6D, 0x76, 0x17, 0x76, 0x15,
0x2A, 0x84, 0x4A, 0xF0, 0xBD, 0x2D, 0xBF, 0x57, 0xB9, 0xB2,
0x90, 0x35, 0x82, 0x2D, 0x5E, 0x48, 0x72, 0x1F, 0x69, 0xD7,
0x5C, 0x62, 0x1F, 0xA3, 0xA7, 0x9B, 0x8C, 0x1D, 0xF3, 0xFA,
0xF3, 0x49, 0x1E, 0x86, 0x17, 0x29, 0x9D, 0x60, 0xE7, 0xCF,
0xC8, 0x9F, 0x3F, 0x51, 0xA2, 0xF6, 0xDD, 0xDF, 0xE1, 0xB3,
0xF2, 0x79, 0x0F, 0x59, 0x52, 0x19, 0xCB, 0x70, 0xE8, 0x2C,
0xA7, 0xF9, 0x92, 0xBB, 0x6A, 0x27, 0x24, 0x34, 0x80, 0x8E,
0x4E, 0x03, 0x2B, 0xD8, 0x5C, 0xF3, 0xCE, 0x64, 0xF7, 0xFE,
0x64, 0xBC, 0x87, 0x17, 0xE7, 0x52, 0x44, 0xDE, 0x3C, 0x5F,
0xA4, 0x96, 0xB7, 0x6A, 0x91, 0x46, 0x3F, 0x03, 0x76, 0xB6,
0x0A, 0x8C, 0x68, 0x99, 0x60, 0x6B, 0x7E, 0xFB, 0x7A, 0x60,
0xF1, 0xB7, 0x39, 0xFF, 0xF5, 0xF2, 0xA3, 0xD2, 0x5A, 0x10,
0x8A, 0x1B, 0x94, 0x68, 0x01, 0x6B, 0xB5, 0xF8, 0x86, 0xA7,
0x9B, 0x5B, 0x95, 0x90, 0xC2, 0x33
};
static unsigned char dhg_2048[] = {
0x02
};
DH *dh = DH_new();
BIGNUM *dhp_bn, *dhg_bn;
if (dh == NULL)
return NULL;
dhp_bn = BN_bin2bn(dhp_2048, sizeof(dhp_2048), NULL);
dhg_bn = BN_bin2bn(dhg_2048, sizeof(dhg_2048), NULL);
if (dhp_bn == NULL || dhg_bn == NULL
|| !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
DH_free(dh);
BN_free(dhp_bn);
BN_free(dhg_bn);
return NULL;
}
return dh;
}
++++++ nrpe-3.2.1-disable-chkconfig_in_Makefile.patch ++++++
Index: nrpe-nrpe-3.2.1/Makefile.in
===================================================================
--- nrpe-nrpe-3.2.1.orig/Makefile.in
+++ nrpe-nrpe-3.2.1/Makefile.in
@@ -128,13 +128,7 @@ install-init:
elif test $(INIT_TYPE) = launchd; then\
launchctl load $(INIT_DIR)/$(INIT_FILE); \
else\
- if test -f /sbin/chkconfig ; then \
- case "$(DESTDIR)" in */rpmbuild/*) break;; \
- *)/sbin/chkconfig nrpe on;; \
- esac; \
- else\
- echo "Make sure to enable the nrpe daemon";\
- fi;\
+ echo "Make sure to enable the nrpe daemon";\
fi;\
fi
++++++ nrpe-3.2.1-static_dh_parameters.patch ++++++
Index: nrpe-nrpe-3.2.1/macros/ax_nagios_get_ssl
===================================================================
--- nrpe-nrpe-3.2.1.orig/macros/ax_nagios_get_ssl
+++ nrpe-nrpe-3.2.1/macros/ax_nagios_get_ssl
@@ -292,10 +292,15 @@ if test x$SSL_TYPE != xNONE; then
AC_DEFINE(USE_SSL_DH)
# Generate DH parameters
if test -f "$sslbin"; then
- echo ""
- echo "*** Generating DH Parameters for SSL/TLS ***"
- # awk to strip off meta data at bottom of dhparam output
- $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ if test -f include/dh.h ; then
+ echo ""
+ echo "*** Skipping generation of DH Parameters for SSL/TLS: include/dh.h already exists ***"
+ else
+ echo ""
+ echo "*** Generating DH Parameters for SSL/TLS ***"
+ # awk to strip off meta data at bottom of dhparam output
+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ fi
fi
fi
fi
Index: nrpe-nrpe-3.2.1/configure
===================================================================
--- nrpe-nrpe-3.2.1.orig/configure
+++ nrpe-nrpe-3.2.1/configure
@@ -7722,10 +7722,15 @@ fi
# Generate DH parameters
if test -f "$sslbin"; then
- echo ""
- echo "*** Generating DH Parameters for SSL/TLS ***"
- # awk to strip off meta data at bottom of dhparam output
- $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ if test -f include/dh.h ; then
+ echo ""
+ echo "*** Skipping generation of DH Parameters for SSL/TLS: include/dh.h already exists ***"
+ else
+ echo ""
+ echo "*** Generating DH Parameters for SSL/TLS ***"
+ # awk to strip off meta data at bottom of dhparam output
+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ fi
fi
fi
fi
++++++ nrpe-SuSEfirewall2 ++++++
## Name: NRPE Service
## Description: Opens port for NRPE Service to allow connects from Nagios.
# space separated list of allowed TCP ports
TCP="5666"
# space separated list of allowed UDP ports
UDP=""
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""
++++++ nrpe-implicit_declaration.patch ++++++
--- /var/tmp/diff_new_pack.KKDlPc/_old 2020-02-29 21:23:59.418454258 +0100
+++ /var/tmp/diff_new_pack.KKDlPc/_new 2020-02-29 21:23:59.418454258 +0100
@@ -1,7 +1,7 @@
-Index: nrpe-3.1.1/contrib/nrpe_check_control.c
+Index: nrpe-nrpe-3.2.1/contrib/nrpe_check_control.c
===================================================================
---- nrpe-3.1.1.orig/contrib/nrpe_check_control.c
-+++ nrpe-3.1.1/contrib/nrpe_check_control.c
+--- nrpe-nrpe-3.2.1.orig/contrib/nrpe_check_control.c
++++ nrpe-nrpe-3.2.1/contrib/nrpe_check_control.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdlib.h>
++++++ nrpe-rpmlintrc ++++++
# better PreRequire grep as we need it for /etc/services...
addFilter("W: useless-explicit-requires grep")
++++++ nrpe.xml ++++++
<?xml version="1.0" encoding="utf-8"?>
<service>
<short>NRPE</short>
<description>Opens port for NRPE Service to allow connects from Nagios.</description>
<port protocol="tcp" port="5666"/>
</service>
1
0
Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2020-02-29 21:23:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Sat Feb 29 21:23:37 2020 rev:154 rq:780281 version:3.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2020-01-19 20:54:15.459950029 +0100
+++ /work/SRC/openSUSE:Factory/.wireshark.new.26092/wireshark.changes 2020-02-29 21:23:45.642426995 +0100
@@ -1,0 +2,16 @@
+Thu Feb 27 07:51:33 UTC 2020 - Robert Frohl <rfrohl(a)suse.com>
+
+- wireshark 3.2.2 (boo#1165241)
+ * CVE-2020-9431: LTE RRC dissector memory leak.
+ * CVE-2020-9430: WiMax DLMAP dissector crash.
+ * CVE-2020-9428: EAP dissector crash.
+ * CVE-2020-9429: WireGuard dissector crash.
+- Further features, bug fixes and updated protocol support as listed in:
+ https://www.wireshark.org/docs/relnotes/wireshark-3.2.2.html
+
+-------------------------------------------------------------------
+Thu Jan 23 13:34:13 UTC 2020 - Robert Frohl <rfrohl(a)suse.com>
+
+- Fixed build against SLE flavors
+
+-------------------------------------------------------------------
Old:
----
SIGNATURES-3.2.1.txt
wireshark-3.2.1.tar.xz
New:
----
SIGNATURES-3.2.2.txt
wireshark-3.2.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.qzbyyO/_old 2020-02-29 21:23:47.410430495 +0100
+++ /var/tmp/diff_new_pack.qzbyyO/_new 2020-02-29 21:23:47.422430519 +0100
@@ -27,7 +27,7 @@
%bcond_with lz4
%endif
Name: wireshark
-Version: 3.2.1
+Version: 3.2.2
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -168,7 +168,18 @@
%build
%cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/'
+%if 0%{?is_opensuse}
%cmake_build
+%else
+# if the cmake_build makro does not exit we build it by hand...
+/usr/bin/make \
+ %if "/usr/bin/make" == "/usr/bin/make"
+ -O VERBOSE=1 \
+ %else
+ -v \
+ %endif
+ -j8
+%endif
%install
%cmake_install
++++++ SIGNATURES-3.2.1.txt -> SIGNATURES-3.2.2.txt ++++++
--- /work/SRC/openSUSE:Factory/wireshark/SIGNATURES-3.2.1.txt 2020-01-19 20:54:13.823949170 +0100
+++ /work/SRC/openSUSE:Factory/.wireshark.new.26092/SIGNATURES-3.2.2.txt 2020-02-29 21:23:44.078423900 +0100
@@ -1,40 +1,40 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-wireshark-3.2.1.tar.xz: 31522124 bytes
-SHA256(wireshark-3.2.1.tar.xz)=589f640058d6408ebbd695a80ebbd6e7bd99d8db64ecda253d27100dfd27e85b
-RIPEMD160(wireshark-3.2.1.tar.xz)=decbaf93645bd2b5283b5307b4730a6967116e3b
-SHA1(wireshark-3.2.1.tar.xz)=d0b8eb3e01264afb98ec151d7114ed14cf174ced
-
-Wireshark-win64-3.2.1.exe: 60054504 bytes
-SHA256(Wireshark-win64-3.2.1.exe)=7c69778b9f35fa5335dc5b8e6e1cbbe2e18a7fdfe77b47edb7402206c93ee5d4
-RIPEMD160(Wireshark-win64-3.2.1.exe)=28ae37dca5a7b6584cfa8618ca735221e7bd9603
-SHA1(Wireshark-win64-3.2.1.exe)=9d1b731fea3ebe8840c8c6eecc0bbaf6ce9f7100
-
-Wireshark-win32-3.2.1.exe: 54755072 bytes
-SHA256(Wireshark-win32-3.2.1.exe)=20d8861550367ae6ba588a34eabcd149090a5a2da9f2849a2609857929dd5513
-RIPEMD160(Wireshark-win32-3.2.1.exe)=e1f1dc2fcd4788948718fe16d271d330eeb8691c
-SHA1(Wireshark-win32-3.2.1.exe)=c2f0e86283a463149012da38b89869d29f6f4b65
-
-Wireshark-win32-3.2.1.msi: 42926080 bytes
-SHA256(Wireshark-win32-3.2.1.msi)=9ff38be33feefa9c08b2c06f60d0630b5674a1c1d92ac1454beb6e071411d60d
-RIPEMD160(Wireshark-win32-3.2.1.msi)=e822c270679c844b0d68660b37bad8c4404e2972
-SHA1(Wireshark-win32-3.2.1.msi)=7956c6629a12aa68c48f128f75bed8611edc2a6f
-
-Wireshark-win64-3.2.1.msi: 48230400 bytes
-SHA256(Wireshark-win64-3.2.1.msi)=23e6b6f3c348d860d8ec12088c8094434c4c3bc3897f7e3ae949939ec24ccc2d
-RIPEMD160(Wireshark-win64-3.2.1.msi)=89e5676d0129841c3fe1c9e802831b11e1a95a9e
-SHA1(Wireshark-win64-3.2.1.msi)=6861d5221b5c8bcc44fef7af141e195cc88d17ca
-
-WiresharkPortable_3.2.1.paf.exe: 36534000 bytes
-SHA256(WiresharkPortable_3.2.1.paf.exe)=82ba51f4568071341d7484f92033939647c275537180419fe49617adbb3b3c9e
-RIPEMD160(WiresharkPortable_3.2.1.paf.exe)=37086e00dad1abc223e6c2ed561525f5545d0d97
-SHA1(WiresharkPortable_3.2.1.paf.exe)=983378044b9672338357c66cd63fdb9fe40401df
-
-Wireshark 3.2.1 Intel 64.dmg: 96254431 bytes
-SHA256(Wireshark 3.2.1 Intel 64.dmg)=a1b08841676b626e3dee42274ad321b90c31eccda6808c59ee5ea644e3782cb4
-RIPEMD160(Wireshark 3.2.1 Intel 64.dmg)=a4e88414580b29563dd0b44cc2acb0132d9f315f
-SHA1(Wireshark 3.2.1 Intel 64.dmg)=1b43fedae40e99006508476927357df203e88f10
+wireshark-3.2.2.tar.xz: 31548392 bytes
+SHA256(wireshark-3.2.2.tar.xz)=5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79
+RIPEMD160(wireshark-3.2.2.tar.xz)=886e731f8055c32f82d29931981b13a07bb0584c
+SHA1(wireshark-3.2.2.tar.xz)=9cc54a56e9c2ed77e1bc436d9ae2f7bba68d26f8
+
+Wireshark-win64-3.2.2.exe: 60064040 bytes
+SHA256(Wireshark-win64-3.2.2.exe)=cc9b49c696219cc093debaae11febeb546b2a508f41150b983ae0af6954c0512
+RIPEMD160(Wireshark-win64-3.2.2.exe)=2b292f3882e1eb27a01707fc98aa460501cbb296
+SHA1(Wireshark-win64-3.2.2.exe)=865313414ccd9a1f9792f0a94e5de01b59716274
+
+Wireshark-win32-3.2.2.exe: 54766256 bytes
+SHA256(Wireshark-win32-3.2.2.exe)=73af61a1edae2af371e432a09bbda8af48a8ada0ea789592ff24499d80070ae6
+RIPEMD160(Wireshark-win32-3.2.2.exe)=849d9cbb6c807369148a7e80826b62892ae6d9e6
+SHA1(Wireshark-win32-3.2.2.exe)=32cfdad68a57619fad98a36b184fcba9aecd7f40
+
+Wireshark-win64-3.2.2.msi: 48234496 bytes
+SHA256(Wireshark-win64-3.2.2.msi)=2be8c75267a4a5670facc7246e3afa145a9f0b04fe9cc6a03876a2100cf54d51
+RIPEMD160(Wireshark-win64-3.2.2.msi)=34ce997ebc0f70a5f58ec8c9ad469743ebc7b7a8
+SHA1(Wireshark-win64-3.2.2.msi)=c03c345347ff1b2e143bea23521a3e3051dce4ec
+
+Wireshark-win32-3.2.2.msi: 42946560 bytes
+SHA256(Wireshark-win32-3.2.2.msi)=9806b8985b5e697b273dd16d5039877b7f7d2bed3c48581f540556cf5b60ee57
+RIPEMD160(Wireshark-win32-3.2.2.msi)=9136a45df0d15d526b308697560a3cd3fb8328e4
+SHA1(Wireshark-win32-3.2.2.msi)=4730be9ec289cc33b290216de2f42027980de9e9
+
+WiresharkPortable_3.2.2.paf.exe: 36532592 bytes
+SHA256(WiresharkPortable_3.2.2.paf.exe)=bcae2ceaf37afb2ab1f6bb1b9f1054c68a537e22b98219407561007ba3217647
+RIPEMD160(WiresharkPortable_3.2.2.paf.exe)=d66557ea96adadff42db9b484ab1030da9a92855
+SHA1(WiresharkPortable_3.2.2.paf.exe)=1235aaa1a73b33065ebab1e21bdcb2c10a9bbf55
+
+Wireshark 3.2.2 Intel 64.dmg: 97487826 bytes
+SHA256(Wireshark 3.2.2 Intel 64.dmg)=c6bda7aba34c441dc8b3998ffbe938ea37a98cf9e4cbf0136a8b65229ce0887f
+RIPEMD160(Wireshark 3.2.2 Intel 64.dmg)=db7aaf2ff01d14653c5dbca355cf042cdc472192
+SHA1(Wireshark 3.2.2 Intel 64.dmg)=1a37a7cd62ab258431ad166d62cfbc42f0a7287a
You can validate these hashes using the following commands (among others):
@@ -44,17 +44,17 @@
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
-iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAl4fZlEACgkQgiRKeOb+
-rur7Iw/+JpFIb9bJHITeWzeZeDt9A9ujONdwtChN5gKod+0TgiB1KgbCzm5atGzF
-iwn7JQo3pLQ8p0FxTXOWVuwbbLWMGU9UtLnyE7mX8X2JvSwbh61PtniUwfuugccZ
-boEIybi3eksAHa57eCu2dzqMUJ2Deuy16at59vx/gNtuSNf5OveSUdSkoOrhLHTT
-AQea3IoCGWecL6W+TgVin/GiCHLAl5syw75LF4dEN1nFiXwhS0fb6Xa+RPhkMXP0
-a6VNpLi+z8h/b47wQAjhTqrAeLimMVcv+IXh1H2Yi3VJtF0+QBSUKI+pBWkoMqwp
-FM24hZRVKxMs5xiPY5cDX62qHFgMl0/5Vn0/dNX/H2l2hSCEJzUXw78MjZbE5HDJ
-GQV4vGjfcT8z99V6BvzRI7MjajBuFFKRMw2C0DNmcCnBqhjPWdJRkCurtq7jnPYx
-39jMjEO/peOI7qqH00N5SdpPhpcKMz3v7QHAiBXsMNtGXt6Xc/wfe/8VHObH95ez
-IAIcfK2LFwLF+kF2/mGRiL44epl1KOfp6Zsn77c+2+klnQL0ZxwqxpOuNVZ36Ylf
-pHmsAaz1P1Xm7N5M+Pw4mBmTe3vZ7PVgt1/2BnHl8sG/Gb0JP8bmxSPYMxEmRGOH
-F50I5/Qm6hD+w3I0PUtjddFfWZWalAFbF97kt0HRglneOO1HFGg=
-=0QNh
+iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAl5W4l4ACgkQgiRKeOb+
+ruqVJA//ctBHfeFtMvuIhDyDLzgGxFSOB448Aa2BxBSWd/WQ9gqwmbHK7LZKx5UA
+27BWikL+ZJFEe1hzh4cwgcpq7wmutWabDZSRIzg1zmEsvqrNrwiCGEeaAnEr8dgQ
+cj+YapEBXauMG3Be5OWDzzXZYP5H96KOoFmubCrFSEgq2jY+tg4Ukyks28mWB+vN
+Ys8XsSIYEfXGIynW5aZCRcXrqMUTgIfDUXjYjRui/ZPuRaXFd1fryNV4jYM3/JO9
+tIbEf4Cluy7vKpiWMlY4DB66vZU7m9iGaR1JR4SPACa0oPTZCeWxx/elcI6y29oo
+LXEBGnsas3HSdDGEc7uZ18mV1jFbp0VBgS1pNPOoiZFa2vJ4htOji1ZeK4BLwNg6
+qBIVpyPeRqnDCcYq53xCc3aKQe4VN42OdCwuD3sSUK0b8PbPeAlDzxntJRoAUAQG
+FwbQumODbJHqJlb5E4UmCjSrrmoyI1w48s1DDgESeBjQYmSqm1tp2P7P3E2gyYQQ
+L2mIdeHjzOVSzsc4X8MTvEUlG8IxbnwmQsy+YwFl54ijIHddthHX2MqDZLp/8zO7
+l5uX2p9yRBj8xCOjfkp8KOzzab4htYtpAmfER9gWL56IDbK/BqjjNoCxxcbxZ47a
+y5yvP3IZsbdzchr5ktF6ZJbN1OzjPIr+VmUd5R8a92LgWjve9pI=
+=PJXP
-----END PGP SIGNATURE-----
++++++ wireshark-3.2.1.tar.xz -> wireshark-3.2.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/wireshark/wireshark-3.2.1.tar.xz /work/SRC/openSUSE:Factory/.wireshark.new.26092/wireshark-3.2.2.tar.xz differ: char 15, line 1
1
0
Hello community,
here is the log from the commit of package libzip for openSUSE:Factory checked in at 2020-02-29 21:23:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzip (Old)
and /work/SRC/openSUSE:Factory/.libzip.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzip"
Sat Feb 29 21:23:34 2020 rev:38 rq:779940 version:1.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzip/libzip.changes 2020-01-30 09:35:36.633304184 +0100
+++ /work/SRC/openSUSE:Factory/.libzip.new.26092/libzip.changes 2020-02-29 21:23:40.670417156 +0100
@@ -1,0 +2,6 @@
+Mon Feb 24 08:26:07 UTC 2020 - Paolo Stivanin <info(a)paolostivanin.com>
+
+- version update to 1.6.1
+ * Bugfix for double-free in zipcmp(1) during cleanup.
+
+-------------------------------------------------------------------
Old:
----
libzip-1.6.0.tar.xz
New:
----
libzip-1.6.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzip.spec ++++++
--- /var/tmp/diff_new_pack.hdnTCs/_old 2020-02-29 21:23:41.402418605 +0100
+++ /var/tmp/diff_new_pack.hdnTCs/_new 2020-02-29 21:23:41.406418613 +0100
@@ -18,7 +18,7 @@
%define sover 5
Name: libzip
-Version: 1.6.0
+Version: 1.6.1
Release: 0
Summary: C library for reading, creating, and modifying zip archives
License: BSD-3-Clause
++++++ libzip-1.6.0.tar.xz -> libzip-1.6.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.6.0/CMakeLists.txt new/libzip-1.6.1/CMakeLists.txt
--- old/libzip-1.6.0/CMakeLists.txt 2020-01-24 12:03:14.000000000 +0100
+++ new/libzip-1.6.1/CMakeLists.txt 2020-02-03 15:18:57.000000000 +0100
@@ -82,7 +82,7 @@
SET(PACKAGE_NAME ${PACKAGE})
SET(PACKAGE_VERSION_MAJOR "1")
SET(PACKAGE_VERSION_MINOR "6")
-SET(PACKAGE_VERSION_MICRO "0")
+SET(PACKAGE_VERSION_MICRO "1")
#SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_MICRO}")
SET(PACKAGE_VERSION ${VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.6.0/NEWS.md new/libzip-1.6.1/NEWS.md
--- old/libzip-1.6.0/NEWS.md 2020-01-24 12:03:14.000000000 +0100
+++ new/libzip-1.6.1/NEWS.md 2020-02-03 15:18:57.000000000 +0100
@@ -1,3 +1,8 @@
+1.6.1 [2020-02-03]
+==================
+
+* Bugfix for double-free in zipcmp(1) during cleanup.
+
1.6.0 [2020-01-24]
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.6.0/man/links new/libzip-1.6.1/man/links
--- old/libzip-1.6.0/man/links 2020-01-24 12:03:14.000000000 +0100
+++ new/libzip-1.6.1/man/links 2020-02-03 15:18:57.000000000 +0100
@@ -6,6 +6,7 @@
zip_file_extra_field_delete zip_file_extra_field_delete_by_id
zip_file_extra_field_get zip_file_extra_field_get_by_id
zip_file_extra_fields_count zip_file_extra_fields_count_by_id
+zip_file_set_mtime zip_file_set_dostime
zip_file_strerror zip_strerror
zip_fopen zip_fopen_index
zip_fopen_encrypted zip_fopen_index_encrypted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.6.0/src/zipcmp.c new/libzip-1.6.1/src/zipcmp.c
--- old/libzip-1.6.0/src/zipcmp.c 2020-01-24 12:03:14.000000000 +0100
+++ new/libzip-1.6.1/src/zipcmp.c 2020-02-03 15:18:57.000000000 +0100
@@ -248,7 +248,6 @@
}
for (j = 0; j < a[i].nentry; j++) {
free(a[i].entry[j].name);
- free(a[i].entry[j].extra_fields);
}
free(a[i].entry);
}
1
0