Notification time stamped 2022-02-22 09:33:58 UTC
From 79bd7efcec325618e2b3d5b6dedf4a19b2c45556 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen dchen@redhat.com Date: Feb 22 2022 07:47:01 +0000 Subject: - Upstream update to 2.4.0
- Fixed CVE-2021-42072 (RHBZ 2022094) - BuildDepends added: gmock-devel, gulrak-filesystem-devel - Address the issue from pull request #1, thanks aekoroglu.
---
diff --git a/.gitignore b/.gitignore index b4715cc..0f0334b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /barrier-2.3.2.tar.gz /barrier-2.3.3.tar.gz +/barrier-2.4.0.tar.gz diff --git a/barrier.spec b/barrier.spec index 22e59f6..0019cec 100644 --- a/barrier.spec +++ b/barrier.spec @@ -1,18 +1,23 @@ -%{!?_vpath_builddir:%define _vpath_builddir build} +%undefine __cmake_in_source_build %global icon_path %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg Summary: Use a single keyboard and mouse to control multiple computers Name: barrier -Version: 2.3.3 -Release: 6%{?dist} +Version: 2.4.0 +Release: 1%{?dist} License: GPLv2 URL: https://github.com/debauchee/barrier/wiki Source0: https://github.com/debauchee/%%7Bname%7D/archive/v%%7Bversion%7D/%%7Bname%7D...
+# https://github.com/debauchee/barrier/issues/1366 +Patch0: fix-includes.patch + BuildRequires: avahi-compat-libdns_sd-devel BuildRequires: cmake3 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ +BuildRequires: gmock-devel BuildRequires: gtest-devel +BuildRequires: gulrak-filesystem-devel BuildRequires: libX11-devel BuildRequires: libXtst-devel BuildRequires: libcurl-devel @@ -30,29 +35,22 @@ which machine to control by moving your mouse to the edge of the screen, or by using a key press to switch focus to a different system.
%prep -%setup -q -## ext/gtest and ext/gmock does not seems to contain *.cc +%autosetup -p1 ## thus remove test -rm -fr src/test -sed -i.remove-test -e 's/(add_subdirectory(test))/# \1/' src/CMakeLists.txt
+## thus ignore the tests +sed -i.remove-test -e 's/.*gtest.cmake/#&/' src/CMakeLists.txt ## Category DesktopUtility is NOT registered sed -i.remove-invalid -e 's/DesktopUtility;//' res/%{name}.desktop
+sed -i.use-gcc-ar -e '/include (CheckIncludeFiles)/ i set(CMAKE_AR "/usr/bin/gcc-ar")' CMakeLists.txt +sed -i.use-gcc-ranlib -e '/include (CheckIncludeFiles)/ i set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")' CMakeLists.txt + %build -%if 0%{?fedora} < 33 -mkdir %{_vpath_builddir} -cd %{_vpath_builddir} -%{cmake3} .. -%make_build -%else -%{cmake} -%{cmake_build} -%endif - -%if 0%{?fedora} < 33 -cd - -%endif +%cmake . \ + -DBARRIER_BUILD_INSTALLER=OFF \ + -DBARRIER_BUILD_TESTS=no +%cmake_build
%install cd %{_vpath_builddir} @@ -95,7 +93,7 @@ cat <<END> %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml </provides>
<releases> - <release version="%{version}" date="2020-10-30" /> + <release version="%{version}" date="2021-11-02" /> </releases> </component> END @@ -123,6 +121,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/barrier.desktop %{_mandir}/man1/barriers.1*
%changelog +* Tue Feb 22 2022 Ding-Yi Chen dchen@redhat.com - 2.4.0-1 +- Upstream update to 2.4.0 + - Fixed CVE-2021-42072 (RHBZ 2022094) +- BuildDepends added: gmock-devel, gulrak-filesystem-devel +- Address the issue from pull request #1, thanks aekoroglu. + * Wed Jan 19 2022 Fedora Release Engineering releng@fedoraproject.org - 2.3.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/fix-includes.patch b/fix-includes.patch new file mode 100644 index 0000000..ea33149 --- /dev/null +++ b/fix-includes.patch @@ -0,0 +1,22 @@ +From 1b74a4bc8c975d99b27fe23ec2c4185b5b21e496 Mon Sep 17 00:00:00 2001 +From: Simon Lees sflees@suse.de +Date: Wed, 3 Nov 2021 13:16:39 +1030 +Subject: [PATCH] Include <cstddef> for NULL + +Fixes #1366 +--- + src/lib/base/Event.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h +index 38a2cf1129..7f4461c914 100644 +--- a/src/lib/base/Event.h ++++ b/src/lib/base/Event.h +@@ -18,6 +18,7 @@ + + #pragma once + ++#include <cstddef> + #include "common/basic_types.h" + #include "common/stdmap.h" + diff --git a/sources b/sources index 5166621..92c5892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (barrier-2.3.3.tar.gz) = 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777 +SHA512 (barrier-2.4.0.tar.gz) = dff8d95c358688952baee0bbbf56b818e40a6c0483d58f6cadd55558ab5d0cefc92a37b0751bfd70868686e1716c729871ae00a30ee9b0ba944f531dfb742449
https://src.fedoraproject.org/rpms/barrier/c/79bd7efcec325618e2b3d5b6dedf4a1...
scm-commits@lists.fedoraproject.org