[telegram-desktop/f36] Updated to version 4.5.2.
by Vitaly Zaitsev
commit 9c2b52220a808e6b3388e8d47842b4e3fe7e5475
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Jan 3 14:10:39 2023 +0100
Updated to version 4.5.2.
sources | 2 +-
telegram-desktop.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 5a9bf87..5a4efe4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-4.5.1-full.tar.gz) = 4aaaa98bad89d1c44aae17fbe2a2aaafd6c0ac4a8aa12ee669662c5cbcefb2a73b844e8613d71888527abf8c0a806333995a6c60af266d7110f493d10ede5047
+SHA512 (tdesktop-4.5.2-full.tar.gz) = 3af203dc5ffc7372df7605e2ab42085a0f5b7b440dc31dc1dac6cd9752ba2a2d8efd3646fbd91f793c4a3d77a2dea0ae01157bef2ec235795304bc176a4b5616
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 02f9f89..e2637cc 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -12,7 +12,7 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 4.5.1
+Version: 4.5.2
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -221,6 +221,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Tue Jan 03 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.5.2-1
+- Updated to version 4.5.2.
+
* Mon Jan 02 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.5.1-1
- Updated to version 4.5.1.
1 year, 3 months
[wl-kmod] Add patch for kernel >= 6.1
by Nicolas Viéville
commit 376fcc70ff8ccd5176d22eadec1820e211c72e2e
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Tue Jan 3 09:40:18 2023 +0100
Add patch for kernel >= 6.1
Remove spec file clean section - rpmlint error
wl-kmod-024_kernel_6.1_adaptation.patch | 84 +++++++++++++++++++++++++++++++++
wl-kmod.spec | 11 +++--
2 files changed, 91 insertions(+), 4 deletions(-)
---
diff --git a/wl-kmod-024_kernel_6.1_adaptation.patch b/wl-kmod-024_kernel_6.1_adaptation.patch
new file mode 100644
index 0000000..5cb383b
--- /dev/null
+++ b/wl-kmod-024_kernel_6.1_adaptation.patch
@@ -0,0 +1,84 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-17 01:08:31.537677649 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2023-01-03 09:20:31.743032501 +0100
+@@ -107,14 +107,25 @@
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+ #endif
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
++ struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
+ struct net_device *dev, u8 key_idx, bool unicast, bool multicast);
+ #else
+ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
+ struct net_device *dev, u8 key_idx);
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
++static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr);
++static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
++ void *cookie, void (*callback) (void *cookie, struct key_params *params));
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
+ u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
+ static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
+@@ -1237,7 +1248,11 @@
+ return err;
+ }
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_config_default_key(struct wiphy *wiphy,
++ struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+ static s32
+ wl_cfg80211_config_default_key(struct wiphy *wiphy,
+ struct net_device *dev, u8 key_idx, bool unicast, bool multicast)
+@@ -1262,7 +1277,11 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32
+ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
+ u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
+@@ -1383,7 +1402,11 @@
+ return err;
+ }
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32
+ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
+ u8 key_idx, bool pairwise, const u8 *mac_addr)
+@@ -1426,7 +1449,12 @@
+ return err;
+ }
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
++ void (*callback) (void *cookie, struct key_params * params))
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32
+ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
+ u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
diff --git a/wl-kmod.spec b/wl-kmod.spec
index a60c07f..af9c956 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 45%{?dist}
+Release: 46%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -41,6 +41,7 @@ Patch19: wl-kmod-020_kernel_5.10_get_set_fs_removed.patch
Patch20: wl-kmod-021_kernel_5.17_adaptation.patch
Patch21: wl-kmod-022_kernel_5.18_adaptation.patch
Patch22: wl-kmod-023_kernel_6.0_adaptation.patch
+Patch23: wl-kmod-024_kernel_6.1_adaptation.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -104,6 +105,7 @@ pushd %{name}-%{version}-src
%patch20 -p1 -b .kernel_5.17_adaptation
%patch21 -p1 -b .kernel_5.18_adaptation
%patch22 -p1 -b .kernel_6.0_adaptation
+%patch23 -p1 -b .kernel_6.1_adaptation
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
@@ -342,10 +344,11 @@ done
chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
%{?akmod_install}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%changelog
+* Tue Jan 03 2023 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-46
+- Add patch for kernel >= 6.1
+- Remove spec file clean section - rpmlint error
+
* Mon Oct 17 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-45
- Fix patch for kernel >= 6.0
1 year, 3 months