Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package urfkill for openSUSE:Factory checked 
in at 2024-04-07 22:10:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/urfkill (Old)
 and      /work/SRC/openSUSE:Factory/.urfkill.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "urfkill"

Sun Apr  7 22:10:36 2024 rev:22 rq:1165661 version:0.5.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/urfkill/urfkill.changes  2024-02-21 
17:57:06.256795801 +0100
+++ /work/SRC/openSUSE:Factory/.urfkill.new.1905/urfkill.changes        
2024-04-07 22:12:56.537843658 +0200
@@ -1,0 +2,9 @@
+Fri Apr  5 12:12:52 UTC 2024 - Dr. Werner Fink <wer...@suse.de>
+
+- Add patch rfkill_even_size.patch
+  * Change size check to only fail if less than RFKILL_EVENT_SIZE_V1
+    as new fields are being added to the struct
+- Add patch configure_err_message.patch 
+  * Do not use comma in AC_MSG_ERROR() as this is used for exit status
+
+-------------------------------------------------------------------

New:
----
  configure_err_message.patch
  rfkill_even_size.patch

BETA DEBUG BEGIN:
  New:    as new fields are being added to the struct
- Add patch configure_err_message.patch 
  * Do not use comma in AC_MSG_ERROR() as this is used for exit status
  New:
- Add patch rfkill_even_size.patch
  * Change size check to only fail if less than RFKILL_EVENT_SIZE_V1
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ urfkill.spec ++++++
--- /var/tmp/diff_new_pack.s4GCvd/_old  2024-04-07 22:12:56.997860505 +0200
+++ /var/tmp/diff_new_pack.s4GCvd/_new  2024-04-07 22:12:57.001860651 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package urfkill
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@
 Group:          System/Daemons
 Source:         
https://github.com/lcp/urfkill/archive/%{name}-%{version}.tar.gz
 Patch0:         urfkill-change-default-user.patch
+Patch1:         configure_err_message.patch
+Patch2:         rfkill_even_size.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -114,7 +116,8 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README
+%license COPYING
+%doc AUTHORS NEWS README
 %dir %{_libexecdir}/urfkill
 %{_libexecdir}/urfkill/urfkilld
 %{_datadir}/dbus-1/interfaces/*.xml

++++++ configure_err_message.patch ++++++
---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/configure.ac
+++ b/configure.ac      2024-04-05 12:06:03.419144263 +0000
@@ -184,7 +184,7 @@ AS_IF([test "$with_session_tracking" = "
 AS_IF([test "$with_session_tracking" = "none"], with_session_tracking=no)
 # check value
 AS_IF([! (echo "$with_session_tracking" | grep -q -E 
"^(systemd|consolekit|no)$")],
-        AC_MSG_ERROR([--with-session-tracking must be systemd/consolekit/no, 
not $with_session_tracking]))
+        AC_MSG_ERROR([--with-session-tracking must be systemd/consolekit/no 
not $with_session_tracking]))
 # add conditionals and subtitution
 AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = 
"consolekit")
 AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "$with_session_tracking" = 
"systemd")

++++++ rfkill_even_size.patch ++++++
>From 2e9f3c0de869d30359c3b14ce6804625c5c4464d Mon Sep 17 00:00:00 2001
From: William Wilson <william.wil...@canonical.com>
Date: Wed, 31 Mar 2021 16:10:27 -0500
Subject: [PATCH] Change size check to only fail if less than
 RFKILL_EVENT_SIZE_V1 as new fields are being added to the struct

---
 src/urf-arbitrator.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/urf-arbitrator.c b/src/urf-arbitrator.c
index ac9b958..677c901 100644
--- a/src/urf-arbitrator.c
+++ b/src/urf-arbitrator.c
@@ -587,7 +587,12 @@ urf_arbitrator_startup (UrfArbitrator *arbitrator,
                        break;
                }
 
-               if (len != RFKILL_EVENT_SIZE_V1) {
+               /* There has been a change in the kernel that allows for an 
extra
+                 * byte in the rfkill event struct that tracks a reason field.
+                * see commit id 14486c82612a177cb910980c70ba900827ca0894 for
+                 * more information
+                */
+               if (len < RFKILL_EVENT_SIZE_V1) {
                        g_warning("Wrong size of RFKILL event\n");
                        continue;
                }

Reply via email to