From fc1d6f9a8a2146731f8bf13abc9d8e938c384f57 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Jul 25 2017 06:52:37 +0000 Subject: Applied fix path of libdir in generate-policies.pl Signed-off-by: Nikos Mavrogiannopoulos --- diff --git a/0001-fix-path-of-libdir.patch b/0001-fix-path-of-libdir.patch new file mode 100644 index 0000000..a989b75 --- /dev/null +++ b/0001-fix-path-of-libdir.patch @@ -0,0 +1,39 @@ +From 4096807f6db7dde64c2fc4326dea020fa8a5ca9d Mon Sep 17 00:00:00 2001 +From: Troy Dawson +Date: Mon, 24 Jul 2017 08:54:21 -0700 +Subject: [PATCH] fix path of libdir + +--- + generate-policies.pl | 2 +- + tests/verify-output.pl | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/generate-policies.pl b/generate-policies.pl +index 6f5c294..0bae2ff 100755 +--- a/generate-policies.pl ++++ b/generate-policies.pl +@@ -10,7 +10,7 @@ if (!defined ${output_dir}) { + exit 1; + } + +-my $libdir = "back-ends/"; ++my $libdir = "./back-ends/"; + use lib "back-ends/"; + + my @profiles = ("EMPTY", "DEFAULT", "FUTURE", "LEGACY"); +diff --git a/tests/verify-output.pl b/tests/verify-output.pl +index d01716b..e003071 100755 +--- a/tests/verify-output.pl ++++ b/tests/verify-output.pl +@@ -3,7 +3,7 @@ + use strict; + use warnings; + +-my $libdir = "back-ends/"; ++my $libdir = "./back-ends/"; + use lib "back-ends/"; + + my @profiles = ("DEFAULT", "FUTURE", "LEGACY"); +-- +1.8.3.1 + diff --git a/crypto-policies.spec b/crypto-policies.spec index 90ce31f..074199b 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -15,6 +15,9 @@ URL: https://github.com/nmav/fedora-crypto-policies Source0: crypto-policies-git%{git_commit_hash}.tar.gz Source1: config +# Fix path of libdir in generate-policies.pl (#1474442) +Patch1: 0001-fix-path-of-libdir.patch + BuildArch: noarch BuildRequires: asciidoc BuildRequires: libxslt @@ -25,6 +28,7 @@ BuildRequires: bind BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: perl(File::pushd), perl(File::Temp), perl(File::Copy) +BuildRequires: python3 # used by crypto-update-policies Requires: coreutils @@ -41,6 +45,7 @@ https://fedoraproject.org/wiki/Changes/CryptoPolicy %prep %setup -q -n %{aname} +%patch1 -p1 %build @@ -96,6 +101,11 @@ make check %{?_smp_mflags} %license COPYING.LESSER %changelog +* Mon Jul 24 2017 Troy Dawson 20170606-2.git7c32281 +- perl dependency renamed to perl-interpreter +- remove useless Requires(post) +- Fix path of libdir in generate-policies.pl (#1474442) + * Tue Jun 6 2017 Nikos Mavrogiannopoulos - 20170606-1.git7c32281 - Updated to latest upstream - Allows gnutls applications in LEGACY mode, to use certificates of 768-bits