[arch-commits] Commit in iwd/trunk (PKGBUILD ell-0.37.patch)

[Felix Yan]

    Date: Friday, February 5, 2021 @ 15:14:05
  Author: felixonmars
Revision: 846150

upgpkg: iwd 1.11-2: add a patch for ell 0.37 (FS#69544)

Added:
  iwd/trunk/ell-0.37.patch
Modified:
  iwd/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 +++++++++---
 ell-0.37.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-05 15:12:54 UTC (rev 846149)
+++ PKGBUILD	2021-02-05 15:14:05 UTC (rev 846150)
@@ -4,7 +4,7 @@
 
 pkgname=iwd
 pkgver=1.11
-pkgrel=1
+pkgrel=2
 pkgdesc='Internet Wireless Daemon'
 arch=('x86_64')
 url='https://git.kernel.org/cgit/network/wireless/iwd.git/'
@@ -11,13 +11,19 @@
 license=('LGPL')
 depends=('glibc' 'readline' 'libreadline.so' 'ell')
 makedepends=('python-docutils' 'dbus' 'systemd')
-source=("https://www.kernel.org/pub/linux/network/wireless/iwd-${pkgver}.tar"{.xz,.sign})
+source=("https://www.kernel.org/pub/linux/network/wireless/iwd-${pkgver}.tar"{.xz,.sign}
+        ell-0.37.patch)
 sha512sums=('09c5e5e105b6107d88eff4238bf023f7bf1a408f522b9f84fac890c123bff2e124b937b81e1559db7fe0720f0ac423dc7d37c1b6d502fc4a7b7403fcd798e01d'
-            'SKIP')
+            'SKIP'
+            '62ccf320ce1a1b3aba25b4d1ab9162aa3717fc6dab31788d820bdda167a62339a83cd6ebadd50e21a1be808b019bbc03aed059079492acd2cd9e85f66d704839')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659')
 changelog=ChangeLog
 install=iwd.install
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < ell-0.37.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 	dbus-run-session ./configure --prefix=/usr \

Added: ell-0.37.patch
===================================================================
--- ell-0.37.patch	                        (rev 0)
+++ ell-0.37.patch	2021-02-05 15:14:05 UTC (rev 846150)
@@ -0,0 +1,28 @@
+From 9ef3d51f8724c9b9f9fd4d4fffcc730f4bb1c806 Mon Sep 17 00:00:00 2001
+From: Andrew Zaborowski <andrew.zaborowski at intel.com>
+Date: Thu, 24 Dec 2020 00:22:15 +0100
+Subject: crypto: Update l_pkcs5_pbkdf2 call after rename
+
+---
+ src/crypto.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/crypto.c b/src/crypto.c
+index f5f8e24d..563f17ce 100644
+--- a/src/crypto.c
++++ b/src/crypto.c
+@@ -552,8 +552,9 @@ int crypto_psk_from_passphrase(const char *passphrase,
+ 	if (ssid_len == 0 || ssid_len > 32)
+ 		return -ERANGE;
+ 
+-	result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, ssid, ssid_len,
+-				4096, psk, sizeof(psk));
++	result = l_cert_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase,
++					ssid, ssid_len, 4096,
++					psk, sizeof(psk));
+ 	if (!result)
+ 		return -ENOKEY;
+ 
+-- 
+cgit 1.2.3-1.el7
+