From 19daec1480a2fcff9a516d698ab6c79b15b69431 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Jan 08 2018 20:35:40 +0000
Subject: Add to cryptopp vanilla sources


---

diff --git a/.gitignore b/.gitignore
index b8ae719..deed2ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-cryptopp-5.6.1.svn479.tar.bz2
-/cryptopp561.zip
-/cryptopp562.zip
-/cryptopp563.zip
+cryptopp*.zip
diff --git a/cryptopp.pc b/cryptopp.pc
index 418b93e..1e6a73a 100644
--- a/cryptopp.pc
+++ b/cryptopp.pc
@@ -4,7 +4,7 @@ libdir=@LIBDIR@
 
 Name: Crypto++
 Description: A free C++ class library of cryptographic schemes
-Version: 5.6.3
+Version: @VERSION@
 URL: http://www.cryptopp.com
 Requires:
 Conflicts:
diff --git a/cryptopp.spec b/cryptopp.spec
index a3d794b..f8ae83c 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,22 +1,16 @@
 Name:           cryptopp
-Version:        5.6.3
-Release:        10%{?dist}
+Version:        5.6.5
+Release:        1%{?dist}
 Summary:        C++ class library of cryptographic schemes
 License:        Boost
 Group:          System Environment/Libraries
 URL:            http://www.cryptopp.com/
-Source0:        http://www.cryptopp.com/cryptopp563.zip
+Source0:        http://www.cryptopp.com/cryptopp565.zip
 Source1:        cryptopp.pc
-Patch0:         cryptopp-autotools.patch
-# Debian patch installs TestVectors and TestData in /usr/share/cryptopp/
-# http://groups.google.com/group/cryptopp-users/browse_thread/thread/6fe2192340f07e5d
-Patch1:         cryptopp-data-files-location.patch
-Patch2:		cryptopp-fix_the_Rijndael_timing_attack_counter_measure.patch
-Patch3:		cryptopp-improve_constant_propagation.patch		 
-# Upstream patch to fix RDSEED test exception
-# http://comments.gmane.org/gmane.comp.encryption.cryptopp/8028
-Patch4:		cryptopp-5.6.3-fix-RDSEED-test-exception.patch
-BuildRequires:  doxygen, autoconf, libtool
+BuildRequires:  doxygen
+%ifarch i686 x86_64
+BuildRequires:  nasm
+%endif
 
 %description
 Crypto++ Library is a free C++ class library of cryptographic schemes.
@@ -59,54 +53,47 @@ This package contains programs for manipulating %{name} routines.
 
 %prep
 %setup -q -c
-rm -f GNUmakefile
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-autoreconf --verbose --force --install
 perl -pi -e 's/\r$//g' License.txt Readme.txt
 
 %build
-%configure --disable-static
-
-make %{?_smp_mflags}
+%ifarch i686 x86_64
+./rdrand-nasm.sh
+%endif
+make -f GNUmakefile %{?_smp_mflags} CXXFLAGS="-DNDEBUG %{optflags} -fPIC -DPIC" LDFLAGS="%{?__global_ldflags}" shared cryptest.exe
 doxygen
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c "
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c " PREFIX="%{_prefix}" LIBDIR="%{_libdir}"
 
 # Install the pkg-config file
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
 # Fill in the variables
 sed -i "s|@PREFIX@|%{_prefix}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
 sed -i "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
+sed -i "s|@VERSION@|%{version}}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/TestVectors
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/TestData
 install -m644 TestVectors/* $RPM_BUILD_ROOT%{_datadir}/%{name}/TestVectors
 install -m644 TestData/* $RPM_BUILD_ROOT%{_datadir}/%{name}/TestData
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/cryptestcwd
+# Rename cryptest
+mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \
+   $RPM_BUILD_ROOT%{_bindir}/cryptest
 
-%check
-./cryptestcwd v
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%{_libdir}/libcryptopp.so.6*
+%{_libdir}/libcryptopp.so.*
 %doc License.txt Readme.txt
 
 %files devel
 %{_includedir}/cryptopp
 %{_libdir}/libcryptopp.so
+%exclude %{_libdir}/libcryptopp.a
 %{_libdir}/pkgconfig/cryptopp.pc
 
 %files doc
@@ -117,6 +104,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/cryptestcwd
 %{_datadir}/%{name}
 
 %changelog
+* Mon Jan 08 2018 Nicolas Chauvet <kwizart@gmail.com> - 5.6.5-1
+- Update to 5.6.5 (vanilla)
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index bedba9b..3b09c58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aea6483a1af49497dc7900d8e09a05da  cryptopp563.zip
+SHA512 (cryptopp565.zip) = f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7