Add patch to fix issue with pyca.

2 files changed, 20 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99ea2b253b16..8b1c4bcb658c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freeipa
 	pkgdesc = The Identity, Policy and Audit system
 	pkgver = 4.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.freeipa.org/
 	arch = i686
 	arch = x86_64
@@ -27,16 +27,18 @@ pkgbase = freeipa
 	source = freeipa-client-update-sshd_config.hook
 	source = nis-domainname.service
 	source = ipaplatform.tar.gz
+	source = https://github.com/freeipa/freeipa/pull/6459.patch
 	sha256sums = 2280594dc7d4bb8b25f8f9e1c4285b1fff1012acb6d4884b307b0703a676ce66
 	sha256sums = 09894b521258983da988b6d78ed8d5370669ffb7d6a6e3cfbf0c0b8eda67f11b
 	sha256sums = 1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d
 	sha256sums = 74a394af693e3677146eff18a770a4271fba961b2af93b15b8ae26157af1760a
 	sha256sums = 7e20412c9347106485adee06b5fcee174c67eb5a30b6730452e300dfc44faa5e
+	sha256sums = 6614bc8e034246c6acf6af244da6ed995fd76b331561ffa830d9ec75a9881503
 
 pkgname = python-ipalib
 	pkgdesc = Python libraries used by IPA
 	arch = any
-	depends = freeipa-common=4.10.0-1
+	depends = freeipa-common=4.10.0-2
 	depends = python-gssapi>=1.2.0
 	depends = gnupg
 	depends = keyutils
@@ -56,15 +58,15 @@ pkgname = python-ipalib
 	depends = python-dnspython>=1.15
 	depends = python-netifaces>=0.10.4
 	depends = python-pyusb
-	provides = python-ipapython=4.10.0-1
-	provides = python-ipaplatform=4.10.0-1
+	provides = python-ipapython=4.10.0-2
+	provides = python-ipaplatform=4.10.0-2
 
 pkgname = python-ipaclient
 	pkgdesc = Python libraries used by IPA client
 	arch = any
-	depends = freeipa-client-common=4.10.0-1
-	depends = freeipa-common=4.10.0-1
-	depends = python-ipalib=4.10.0-1
+	depends = freeipa-client-common=4.10.0-2
+	depends = freeipa-common=4.10.0-2
+	depends = python-ipalib=4.10.0-2
 	depends = python-dnspython>=1.15
 	depends = python-jinja
 	optdepends = oddjob: mkhomedir support
@@ -82,9 +84,9 @@ pkgname = freeipa-client-common
 pkgname = freeipa-client
 	pkgdesc = IPA authentication for use on clients
 	install = freeipa-client.install
-	depends = freeipa-client-common=4.10.0-1
-	depends = freeipa-common=4.10.0-1
-	depends = python-ipaclient=4.10.0-1
+	depends = freeipa-client-common=4.10.0-2
+	depends = freeipa-common=4.10.0-2
+	depends = python-ipaclient=4.10.0-2
 	depends = python-augeas
 	depends = cyrus-sasl-gssapi
 	depends = ntp
diff --git a/PKGBUILD b/PKGBUILD
index 5ceb3c166ff0..779d838f38d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=(python-ipalib
          freeipa-client-common
          freeipa-client)
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc='The Identity, Policy and Audit system'
 arch=('i686' 'x86_64')
 url='http://www.freeipa.org/'
@@ -38,18 +38,23 @@ source=("https://releases.pagure.org/freeipa/freeipa-${pkgver}.tar.gz"
         freeipa-client-update-sshd_config
         freeipa-client-update-sshd_config.hook
         nis-domainname.service
-        ipaplatform.tar.gz)
+        ipaplatform.tar.gz
+        'https://github.com/freeipa/freeipa/pull/6459.patch')
 sha256sums=('2280594dc7d4bb8b25f8f9e1c4285b1fff1012acb6d4884b307b0703a676ce66'
             '09894b521258983da988b6d78ed8d5370669ffb7d6a6e3cfbf0c0b8eda67f11b'
             '1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d'
             '74a394af693e3677146eff18a770a4271fba961b2af93b15b8ae26157af1760a'
-            '7e20412c9347106485adee06b5fcee174c67eb5a30b6730452e300dfc44faa5e')
+            '7e20412c9347106485adee06b5fcee174c67eb5a30b6730452e300dfc44faa5e'
+            '6614bc8e034246c6acf6af244da6ed995fd76b331561ffa830d9ec75a9881503')
 
 prepare() {
     cd freeipa-${pkgver}
 
     rm -rf ipaplatform/arch
 
+    # Fix https://pagure.io/freeipa/issue/9160
+    patch -p1 -i "$srcdir/6459.patch"
+
     sed -i 's|/etc/sysconfig/autofs|/etc/autofs/autofs.conf|' 'client/man/ipa-client-automount.1'
     sed -i 's|/etc/pki/ca-trust/source/ipa.p11-kit|/etc/ca-certificates/trust-source/ipa.p11-kit|' 'client/man/ipa-client-install.1'
     sed -i 's|/etc/sysconfig/network|/etc/hostname\n.br\n/etc/conf.d/network|' 'client/man/ipa-client-install.1'