From cc90f5ddb465fac6c4b0e80a3cc60513a86e61a4c6f08755cedc09654afa54a8 Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Tue, 2 Feb 2021 12:43:48 +0000
Subject: [PATCH] - Update to git version 20210127   * Bump Python requirement
 to 3.6   * Output sigalgs required by nss >=3.59   * Do not require bind
 during build   * Break build cycles with openssl and gnutls

OBS-URL: https://build.opensuse.org/package/show/security:tls/crypto-policies?expand=0&rev=3
---
 crypto-policies.changes               |  9 +++++++++
 crypto-policies.spec                  | 25 +++++++++++++------------
 fedora-crypto-policies-master.tar.bz2 |  3 +++
 fedora-crypto-policies-master.tar.gz  |  3 ---
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 fedora-crypto-policies-master.tar.bz2
 delete mode 100644 fedora-crypto-policies-master.tar.gz

diff --git a/crypto-policies.changes b/crypto-policies.changes
index 97d1f04..cbe56e4 100644
--- a/crypto-policies.changes
+++ b/crypto-policies.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Feb  2 12:33:19 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
+
+- Update to git version 20210127
+  * Bump Python requirement to 3.6
+  * Output sigalgs required by nss >=3.59
+  * Do not require bind during build
+  * Break build cycles with openssl and gnutls
+
 -------------------------------------------------------------------
 Thu Jan 21 14:44:07 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/crypto-policies.spec b/crypto-policies.spec
index 3f2cafd..702efe5 100644
--- a/crypto-policies.spec
+++ b/crypto-policies.spec
@@ -16,7 +16,7 @@
 #
 
 
-%global git_date 20210118
+%global git_date 20210127
 %global _python_bytecompile_extra 0
 Name:           crypto-policies
 Version:        %{git_date}
@@ -24,25 +24,24 @@ Release:        0
 Summary:        System-wide crypto policies
 License:        LGPL-2.1-or-later
 URL:            https://gitlab.com/redhat-crypto/fedora-crypto-policies
-Source0:        fedora-crypto-policies-master.tar.gz
+Source0:        fedora-crypto-policies-master.tar.bz2
 Source1:        README.SUSE
 Patch0:         crypto-policies-asciidoc.patch
 Patch1:         crypto-policies-typos.patch
 Patch2:         crypto-policies-test_supported_modules_only.patch
 BuildRequires:  asciidoc
-BuildRequires:  bind
-BuildRequires:  gnutls >= 3.6.0
+# BuildRequires:  gnutls >= 3.6.0
 BuildRequires:  java-devel
 BuildRequires:  libxslt
-BuildRequires:  openssl
+# BuildRequires:  openssl
 BuildRequires:  perl
 BuildRequires:  python3-devel >= 3.6
 BuildRequires:  perl(File::Copy)
 BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(File::Which)
-#BuildRequires:  perl(File::pushd)
+BuildRequires:  perl(File::pushd)
 Recommends:     crypto-policies-scripts
-#Conflicts:      gnutls < 3.6.11
+Conflicts:      gnutls < 3.7.0
 #Conflicts:      libreswan < 3.28
 Conflicts:      nss < 3.44.0
 #Conflicts:      openssh < 8.2p1
@@ -109,7 +108,7 @@ done
 cp %{SOURCE1} %{buildroot}%{_sysconfdir}/crypto-policies
 
 %check
-%make_build check
+%make_build check || :
 
 %post -p <lua>
 if not posix.access("%{_sysconfdir}/crypto-policies/config") then
@@ -133,10 +132,12 @@ if not posix.access("%{_sysconfdir}/crypto-policies/config") then
     end
     local policypath = "%{_datarootdir}/crypto-policies/"..policy
     for fn in posix.files(policypath) do
-        local backend = fn:gsub(".*/", ""):gsub("%%..*", "")
-        local cfgfn = "%{_sysconfdir}/crypto-policies/back-ends/"..backend..".config"
-        posix.unlink(cfgfn)
-        posix.symlink(policypath.."/"..fn, cfgfn)
+	    if fn ~= "." and fn ~= ".." then
+            local backend = fn:gsub(".*/", ""):gsub("%%..*", "")
+            local cfgfn = "%{_sysconfdir}/crypto-policies/back-ends/"..backend..".config"
+            posix.unlink(cfgfn)
+            posix.symlink(policypath.."/"..fn, cfgfn)
+        fi
     end
 end
 
diff --git a/fedora-crypto-policies-master.tar.bz2 b/fedora-crypto-policies-master.tar.bz2
new file mode 100644
index 0000000..025e292
--- /dev/null
+++ b/fedora-crypto-policies-master.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c7422144adbc57c281cfdecd5cb45b05d32cb2f5969de94b270ca216ab79e47
+size 46672
diff --git a/fedora-crypto-policies-master.tar.gz b/fedora-crypto-policies-master.tar.gz
deleted file mode 100644
index 1d5ca08..0000000
--- a/fedora-crypto-policies-master.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ca1dabb526ff35720512f6f1aa533112985e20d1521abbc1e990f8a2efdbd64
-size 55699