[xtables-addons-kmod/f30: 5/6] Patch for kernel-5.2 (rfbz #5376)
by Leigh Scott
commit 7dfa2c6a05b27539f82e333e4c8a588295306d31
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 2 18:48:00 2019 +0100
Patch for kernel-5.2 (rfbz #5376)
...x-5.2-crypto-desc-flags-compatibility-fix.patch | 44 ++++++++++++++++++++++
xtables-addons-kmod.spec | 9 ++++-
2 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch b/Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch
new file mode 100644
index 0000000..daf45e0
--- /dev/null
+++ b/Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch
@@ -0,0 +1,44 @@
+From 747b399fa22fa5b89d3334e0272ff1b9dc5493ac Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+github(a)de-korte.org>
+Date: Sun, 18 Aug 2019 19:05:45 +0200
+Subject: [PATCH 1/2] Add Linux 5.2 crypto desc flags compatibility fix The
+ flags field was deprecated by linux commit
+ 877b5691f27a1aec0d9b53095a323e45c30069e2 ("crypto: shash - remove
+ shash_desc::flags")
+
+---
+ extensions/pknock/xt_pknock.c | 2 ++
+ extensions/xt_SYSRQ.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
+index c76901a..78b86f3 100644
+--- xtables-addons-3.3/extensions/pknock/xt_pknock.c
++++ xtables-addons-3.3/extensions/pknock/xt_pknock.c
+@@ -1125,7 +1125,9 @@ static int __init xt_pknock_mt_init(void)
+
+ crypto.size = crypto_shash_digestsize(crypto.tfm);
+ crypto.desc.tfm = crypto.tfm;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ crypto.desc.flags = 0;
++#endif
+
+ pde = proc_mkdir("xt_pknock", init_net.proc_net);
+ if (pde == NULL) {
+diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
+index c386c7e..1b151ea 100644
+--- xtables-addons-3.3/extensions/xt_SYSRQ.c
++++ xtables-addons-3.3/extensions/xt_SYSRQ.c
+@@ -114,7 +114,9 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len)
+ }
+
+ desc.tfm = sysrq_tfm;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ desc.flags = 0;
++#endif
+ ret = crypto_shash_init(&desc);
+ if (ret != 0)
+ goto hash_fail;
+--
+2.21.0
+
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index b496a8e..22dedaa 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -11,10 +11,11 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: http://xtables-addons.sourceforge.net
Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/xtables-addons-%{...
+Patch0: Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch
BuildRequires: %{_bindir}/kmodtool
@@ -38,7 +39,8 @@ the xtables-addons package in order to make use of these modules.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0
+%autosetup -c -T -a 0 -p 0
+ls
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
done
@@ -59,6 +61,9 @@ done
%{?akmod_install}
%changelog
+* Mon Sep 02 2019 Leigh Scott <leigh123linux(a)gmail.com> - 3.3-3
+- Patch for kernel-5.2 (rfbz #5376)
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[xtables-addons-kmod] Patch for kernel-5.2 (rfbz #5376)
by Leigh Scott
commit bdbb814d5ac511d243a4c3b280db0c7008fbb7f3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 2 18:48:00 2019 +0100
Patch for kernel-5.2 (rfbz #5376)
...x-5.2-crypto-desc-flags-compatibility-fix.patch | 44 ++++++++++++++++++++++
xtables-addons-kmod.spec | 9 ++++-
2 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch b/Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch
new file mode 100644
index 0000000..daf45e0
--- /dev/null
+++ b/Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch
@@ -0,0 +1,44 @@
+From 747b399fa22fa5b89d3334e0272ff1b9dc5493ac Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+github(a)de-korte.org>
+Date: Sun, 18 Aug 2019 19:05:45 +0200
+Subject: [PATCH 1/2] Add Linux 5.2 crypto desc flags compatibility fix The
+ flags field was deprecated by linux commit
+ 877b5691f27a1aec0d9b53095a323e45c30069e2 ("crypto: shash - remove
+ shash_desc::flags")
+
+---
+ extensions/pknock/xt_pknock.c | 2 ++
+ extensions/xt_SYSRQ.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
+index c76901a..78b86f3 100644
+--- xtables-addons-3.3/extensions/pknock/xt_pknock.c
++++ xtables-addons-3.3/extensions/pknock/xt_pknock.c
+@@ -1125,7 +1125,9 @@ static int __init xt_pknock_mt_init(void)
+
+ crypto.size = crypto_shash_digestsize(crypto.tfm);
+ crypto.desc.tfm = crypto.tfm;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ crypto.desc.flags = 0;
++#endif
+
+ pde = proc_mkdir("xt_pknock", init_net.proc_net);
+ if (pde == NULL) {
+diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
+index c386c7e..1b151ea 100644
+--- xtables-addons-3.3/extensions/xt_SYSRQ.c
++++ xtables-addons-3.3/extensions/xt_SYSRQ.c
+@@ -114,7 +114,9 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len)
+ }
+
+ desc.tfm = sysrq_tfm;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ desc.flags = 0;
++#endif
+ ret = crypto_shash_init(&desc);
+ if (ret != 0)
+ goto hash_fail;
+--
+2.21.0
+
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index b496a8e..22dedaa 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -11,10 +11,11 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: http://xtables-addons.sourceforge.net
Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/xtables-addons-%{...
+Patch0: Add-Linux-5.2-crypto-desc-flags-compatibility-fix.patch
BuildRequires: %{_bindir}/kmodtool
@@ -38,7 +39,8 @@ the xtables-addons package in order to make use of these modules.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0
+%autosetup -c -T -a 0 -p 0
+ls
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
done
@@ -59,6 +61,9 @@ done
%{?akmod_install}
%changelog
+* Mon Sep 02 2019 Leigh Scott <leigh123linux(a)gmail.com> - 3.3-3
+- Patch for kernel-5.2 (rfbz #5376)
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[cinelerra-gg] Use python3_pkgversion macro for EL7 builds
by Frank R Dana
commit f9b9dc1542a6d37e58060a3cd53db57523ba9247
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 2 06:44:31 2019 -0400
Use python3_pkgversion macro for EL7 builds
cinelerra-gg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec
index 0081b2d..c72ff5d 100644
--- a/cinelerra-gg.spec
+++ b/cinelerra-gg.spec
@@ -34,7 +34,7 @@ BuildRequires: gettext
BuildRequires: libtool
BuildRequires: nasm
BuildRequires: perl-interpreter
-BuildRequires: python3
+BuildRequires: python%{python3_pkgversion}
BuildRequires: texinfo
BuildRequires: udftools
BuildRequires: wget
4 years, 7 months
