[arch-commits] Commit in crypto++/trunk (PKGBUILD fix-cxxflags.patch libcrypto++.pc)

[Baptiste Jonglez]

    Date: Thursday, June 15, 2017 @ 07:15:26
  Author: zorun
Revision: 237109

upgpkg: crypto++ 5.6.5-3

Fix FS#51605 and various cleanup: use upstream hashes, fetch source from
HTTPS, fix version in libcrypto++.pc.

Added:
  crypto++/trunk/fix-cxxflags.patch
Modified:
  crypto++/trunk/PKGBUILD
  crypto++/trunk/libcrypto++.pc

--------------------+
 PKGBUILD           |   22 ++++++++++++++++++----
 fix-cxxflags.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 libcrypto++.pc     |    4 ++--
 3 files changed, 69 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-15 07:09:32 UTC (rev 237108)
+++ PKGBUILD	2017-06-15 07:15:26 UTC (rev 237109)
@@ -8,7 +8,7 @@
 pkgname=crypto++
 pkgver=5.6.5
 _srcver=${pkgver//./}
-pkgrel=2
+pkgrel=3
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('i686' 'x86_64')
 url="http://www.cryptopp.com/"
@@ -15,11 +15,25 @@
 license=('custom')
 depends=('gcc-libs')
 makedepends=('unzip')
-source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
+source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"
+        "fix-cxxflags.patch"
         'libcrypto++.pc')
-md5sums=('df5ef4647b4e978bba0cac79a83aaed5'
-         'ea27f28fe0303fcaa24d83cf4a964d53')
+# Checksums from https://www.cryptopp.com/release565.html
+sha1sums=('a74f207a315b6a133af9640a45bde9d6e378af4d'
+          'f044b55c615ed0d6c0239bd43dda67db1fdb4cca'
+          'e4e2fc3172b4a85bffad812a0de8531843912ff1')
+sha256sums=('a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34'
+            'e27679cd5e1068e84c84c18395d4f32254fa900887ee89a15c38580236490dc5'
+            'aee5ca989bfd25236095fccb245a5c7f559eae97c41979e952ac35b29453d8b5')
+sha512sums=('f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7'
+            '49a81998489e65dcb270de77f6149a3dcf03c9a04bd2c9baf2e92f6bd749fe69aca5de0803b94757778f272357d2357e873b652c9bb06e8f03b7bf9b55bbc9d4'
+            '798ff42e3dcc4edd33b9fb1b605e608dd53a668afb28032620927b49f17fcb5b212f6cf4e9af30cc2b36bf74bb9f0152dad4f40fdb19d8f557dfed196ea0921d')
 
+prepare() {
+  # Upstream patch for https://bugs.archlinux.org/task/51605
+  patch -p1 < "$srcdir"/fix-cxxflags.patch
+}
+
 build() {
   CXXFLAGS+=" -DNDEBUG -fPIC" make -f GNUmakefile-cross  
   make libcryptopp.so

Added: fix-cxxflags.patch
===================================================================
--- fix-cxxflags.patch	                        (rev 0)
+++ fix-cxxflags.patch	2017-06-15 07:15:26 UTC (rev 237109)
@@ -0,0 +1,49 @@
+From 733a073d65548848aabc39a45b5addb0e01b68fe Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <noloader at gmail.com>
+Date: Thu, 27 Oct 2016 01:01:01 -0400
+Subject: [PATCH] Fix mismatched arch capabilities (Issue 283)
+
+---
+ rijndael.cpp | 8 ++++----
+ rijndael.h   | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/rijndael.cpp b/rijndael.cpp
+index fb934d08..37237be6 100644
+--- a/rijndael.cpp
++++ b/rijndael.cpp
+@@ -1345,17 +1345,17 @@ size_t Rijndael::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xo
+ 
+ #endif
+ 
+-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+-
++#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
+ size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const
+ {
++#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+ 	if (HasAESNI())
+ 		return AESNI_AdvancedProcessBlocks(AESNI_Dec_Block, AESNI_Dec_4_Blocks, (MAYBE_CONST __m128i *)(const void *)m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags);
++#endif
+ 
+ 	return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags);
+ }
+-
+-#endif	// #if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
++#endif	// CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
+ 
+ NAMESPACE_END
+ 
+diff --git a/rijndael.h b/rijndael.h
+index 5b334ffc..bdcf3ed3 100644
+--- a/rijndael.h
++++ b/rijndael.h
+@@ -69,7 +69,7 @@ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentat
+ 	{
+ 	public:
+ 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
+-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
++#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
+ 		size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
+ #endif
+ 	};

Modified: libcrypto++.pc
===================================================================
--- libcrypto++.pc	2017-06-15 07:09:32 UTC (rev 237108)
+++ libcrypto++.pc	2017-06-15 07:15:26 UTC (rev 237109)
@@ -4,8 +4,8 @@
 libdir=${prefix}/lib
 includedir=${prefix}/include
 
-Name: libcrypto++-5.6.4
+Name: libcrypto++-5.6.5
 Description: Class library of cryptographic schemes
-Version: 5.6.4
+Version: 5.6.5
 Libs: -L${libdir} -lcryptopp
 Cflags: -I${includedir}