pull in upstream fixes

.spec cleanup
This commit is contained in:
Rex Dieter 2020-10-07 16:01:44 -05:00
parent 1fa6e335b4
commit 3d14514cc8
3 changed files with 45 additions and 19 deletions

11
.gitignore vendored
View File

@ -8,3 +8,14 @@
/kdeconnect-kde-20.04.3.tar.xz
/kdeconnect-kde-20.08.0.tar.xz
/kdeconnect-kde-20.08.1.tar.xz
/0010-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
/0011-Do-not-leak-the-local-user-in-the-device-name.patch
/0012-Fix-use-after-free-in-LanLinkProvider-connectError.patch
/0013-Limit-identity-packets-to-8KiB.patch
/0014-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
/0015-Don-t-brute-force-reading-the-socket.patch
/0016-Limit-number-of-connected-sockets-from-unpaired-devi.patch
/0017-Do-not-remember-more-than-a-few-identity-packets-at-.patch
/0018-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
/0019-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
/0020-Fix-kdeconnect_open-MimeType.patch

View File

@ -1,17 +1,15 @@
%undefine __cmake_in_source_build
# enable experimental (default off) bluetooth support
#global bluetooth 1
%global module kdeconnect-kde
Name: kde-connect
Name: kde-connect
Version: 20.08.1
Release: 1%{?dist}
License: GPLv2+
Summary: KDE Connect client for communication with smartphones
Release: 2%{?dist}
License: GPLv2+
Summary: KDE Connect client for communication with smartphones
Url: https://community.kde.org/KDEConnect
#Url: https://cgit.kde.org/kdeconnect-kde.git
Url: https://community.kde.org/KDEConnect
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
%global stable unstable
@ -20,8 +18,18 @@ Url: https://community.kde.org/KDEConnect
%endif
Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{module}-%{version}.tar.xz
# firewalld service definition, see https://bugzilla.redhat.com/show_bug.cgi?id=1257699#c2
Source2: kde-connect.xml
## upstream patches (lookaside cache)
Patch10: 0010-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
Patch11: 0011-Do-not-leak-the-local-user-in-the-device-name.patch
Patch12: 0012-Fix-use-after-free-in-LanLinkProvider-connectError.patch
Patch13: 0013-Limit-identity-packets-to-8KiB.patch
Patch14: 0014-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
Patch15: 0015-Don-t-brute-force-reading-the-socket.patch
Patch16: 0016-Limit-number-of-connected-sockets-from-unpaired-devi.patch
Patch17: 0017-Do-not-remember-more-than-a-few-identity-packets-at-.patch
Patch18: 0018-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
Patch19: 0019-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
Patch20: 0020-Fix-kdeconnect_open-MimeType.patch
BuildRequires: desktop-file-utils
BuildRequires: firewalld-filesystem
@ -119,19 +127,15 @@ Supplements: (kdeconnectd and nautilus)
%build
%{cmake_kf5} \
%cmake_kf5 \
%{?bluetooth:-DBLUETOOTH_ENABLED:BOOL=ON}
%cmake_build
%install
%cmake_install
# firewalld as shipped in f31+ provides it's own kdeconnect.xml
%if 0%{?fedora} && 0%{?fedora} < 31
install -m644 -p -D %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/services/kde-connect.xml
%endif
%find_lang %{name} --all-name --with-html
# https://bugzilla.redhat.com/show_bug.cgi?id=1296523
@ -179,10 +183,6 @@ fi
%{_datadir}/applications/org.kde.kdeconnect.daemon.desktop
%{_libexecdir}/kdeconnectd
%{_datadir}/dbus-1/services/org.kde.kdeconnect.service
# firewalld as shipped in f31+ provides it's own kdeconnect.xml
%if 0%{?fedora} && 0%{?fedora} < 31
%{_prefix}/lib/firewalld/services/kde-connect.xml
%endif
%ldconfig_scriptlets libs
@ -199,6 +199,10 @@ fi
%changelog
* Wed Oct 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.1-2
- pull in upstream fixes
- .spec cleanup
* Tue Sep 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.1-1
- 20.08.1

11
sources
View File

@ -1 +1,12 @@
SHA512 (kdeconnect-kde-20.08.1.tar.xz) = c6322b1a77323a814f9a501d871f03c70530f9ba63dcede4228005f528da577078c1fc56760ee4181e0cc90ffa97ced59451c6d2546e3c9424afa21ff2d76f8c
SHA512 (0010-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch) = dd593407698560993dfffc1e3b6e43b59cb61b59375ec2fc8594dbdf7227921b1998613e45d538eb230ab40273e454289637866251c3c4997b2fa2f13ffd58fe
SHA512 (0011-Do-not-leak-the-local-user-in-the-device-name.patch) = 5b34a54438fee4adf5d3b5f8de972775783871aad89a56d6ab75b7cc5ba9da4becb4ba962cde0ba60385a059e480b4fe51474ff189a6d8a6fc05f326c82ee29e
SHA512 (0012-Fix-use-after-free-in-LanLinkProvider-connectError.patch) = 06724b1ddf86bdd790980e2d3f601088c861f9cc1e022f9ad29d3696dabafe070b89ea69c519aa2e5145e3a05321029218fb1a8fca4c7dce7edc159220e5cc66
SHA512 (0013-Limit-identity-packets-to-8KiB.patch) = 8c419727574bfd2b8323578ac09baaed6e85b51055a5ceb59d7cd16f7b74f8dfde932f80bc111406a4bfa03895f5d7a33b7be6d5fa05a073f0b8fd2a0c7ea0fd
SHA512 (0014-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch) = 2daf743c1cfa8a24b8509201e829bb83c153a1ef23d25d26173cf5589582b58fdfa2bad8d9dfa8f7e697f175b782e3bd1f72f677134b30670db6b213df5288a6
SHA512 (0015-Don-t-brute-force-reading-the-socket.patch) = d25b04febd032337763a1aa9bf5ac99499359951997d5b993137b1d27b10d50210bd3c6ede97e7906447b20c0ad6735142e38b02dbc2e1ff671bc293e8ef3796
SHA512 (0016-Limit-number-of-connected-sockets-from-unpaired-devi.patch) = 10af5088de833a7e0a607f952748a9860654039f44f6ed718c73730ab250f7d6daea3e22f09302bfabc631e48e80a2965b247f8c6c2a91ead5cf83c99ffc8ea2
SHA512 (0017-Do-not-remember-more-than-a-few-identity-packets-at-.patch) = 2e6ffafe9fcfde58385a079804ddba1c285095d1c1066a9e1d02ef8d8ea9557edd6cda71ee776370625f7ee867e543aac47e0a6be3c7713d27e35c47cd1109f7
SHA512 (0018-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch) = 3bcfdfe4472165110912978d23c0b59bd4227a0bcacb93d7bb511c468e7fd76558c9dd68de709b42e41b29aa712329d0b21e1953737b79c86738b07690f047b7
SHA512 (0019-Do-not-replace-connections-for-a-given-deviceId-if-t.patch) = e1d07b0d621a19cf1bdbb0d3638d6120ceefaa8b4ca61549b0bfe7f7406ed6e2cfa18ad8b31a85b31127ef949a1e110d3c040404a79e422a22b265ef1399c300
SHA512 (0020-Fix-kdeconnect_open-MimeType.patch) = 96cd8945197f2ecb91f7ab076938daf051580b4567496c7e9a4a329498a3ec34e23553a819da481f9d183557bd0b04b23396f17ac4798803c79555dd28f6aec5