From 378eda3cd93e36f9d0e5d56da3eda84046a90d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 23 Feb 2018 12:31:02 +0100
Subject: [PATCH] - Rebase to 3.9.0

---
 .gitignore                                  |  1 +
 opencryptoki-3.2-conditional-manpages.patch | 18 -----------------
 opencryptoki.spec                           | 22 ++++++++++-----------
 sources                                     |  2 +-
 4 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 opencryptoki-3.2-conditional-manpages.patch

diff --git a/.gitignore b/.gitignore
index 847f1b1..dcabad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ opencryptoki-2.3.1.tar.gz
 /opencryptoki-3.6.2.tar.gz
 /opencryptoki-3.7.0.tar.gz
 /opencryptoki-3.8.2.tar.gz
+/opencryptoki-3.9.0.tar.gz
diff --git a/opencryptoki-3.2-conditional-manpages.patch b/opencryptoki-3.2-conditional-manpages.patch
deleted file mode 100644
index 0e15fdc..0000000
--- a/opencryptoki-3.2-conditional-manpages.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
-index f2274d7..d98ae8c 100644
---- a/man/man1/Makefile.am
-+++ b/man/man1/Makefile.am
-@@ -1,3 +1,12 @@
--man1_MANS=pkcsconf.1 pkcsicsf.1 pkcsep11_migrate.1 pkcscca.1
-+man1_MANS=pkcsconf.1 pkcsicsf.1
-+
-+if ENABLE_PKCSEP11_MIGRATE
-+man1_MANS += pkcsep11_migrate.1
-+endif
-+
-+if ENABLE_CCATOK
-+man1_MANS += pkcscca.1
-+endif
-+
- EXTRA_DIST = $(man1_MANS)
- CLEANFILES = $(man1_MANS)
diff --git a/opencryptoki.spec b/opencryptoki.spec
index 2f9076a..20b93a6 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,15 +1,13 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
-Version:		3.8.2
-Release:		3%{?dist}
+Version:		3.9.0
+Release:		1%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
-Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:		https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=732756
 Patch0:			%{name}-2.4-group.patch
-# do not install pkcsep11_migrate.1 and pkcscca.1 when it's not enabled
-Patch1:			%{name}-3.2-conditional-manpages.patch
 
 # Use --no-undefined to debug missing symbols
 #Patch100:			%{name}-3.2-no-undefined.patch
@@ -177,11 +175,7 @@ configured with Enterprise PKCS#11 (EP11) firmware.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .group
-%patch1 -p1 -b .man
-
-#%patch100 -p1 -b .no-undefined
+%autosetup -p1
 
 
 %build
@@ -317,8 +311,11 @@ exit 0
 %files ep11tok
 %doc doc/README.ep11_stdll
 %config(noreplace) %{_sysconfdir}/%{name}/ep11tok.conf
+%config(noreplace) %{_sysconfdir}/%{name}/ep11cpfilter.conf
 %{_sbindir}/pkcsep11_migrate
-%{_mandir}/man1/pkcsep11_migrate.1.*
+%{_sbindir}/pkcsep11_session
+%{_mandir}/man1/pkcsep11_migrate.1*
+%{_mandir}/man1/pkcsep11_session.1*
 %{_libdir}/opencryptoki/stdll/libpkcs11_ep11.*
 %{_libdir}/opencryptoki/stdll/PKCS11_EP11.so
 %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/ep11tok/
@@ -327,6 +324,9 @@ exit 0
 
 
 %changelog
+* Fri Feb 23 2018 Dan Horák <dan[at]danny.cz> - 3.9.0-1
+- Rebase to 3.9.0
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index fad198b..ed839bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (opencryptoki-3.8.2.tar.gz) = 4272711509e6098f70d7f653a4d6fa1914f7bab035d3df22b5cafb06d4f2713c2a16f3dffe24138394f98c61eff7677526fd9fa5f48f4a012fb5670d23dacc12
+SHA512 (opencryptoki-3.9.0.tar.gz) = ce557e008434c57379d0bed84b5013bb3854306226856db13b7daef742c57106aa5ef24187b12bf90f3493a321967f3033e6b0f99a03af5e4a4e98688c88ef52