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

[Baptiste Jonglez]

    Date: Thursday, February 22, 2018 @ 22:29:12
  Author: zorun
Revision: 297130

upgpkg: crypto++ 6.1.0-1

The so-name bump needs a rebuild of dependent packages, but fortunately,
starting from this version, the so-name will only bump at major releases
(next one: 7.0.0)

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

--------------------+
 PKGBUILD           |   16 ++++++++--------
 fix-cxxflags.patch |   49 -------------------------------------------------
 libcrypto++.pc     |    4 ++--
 3 files changed, 10 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-22 22:20:58 UTC (rev 297129)
+++ PKGBUILD	2018-02-22 22:29:12 UTC (rev 297130)
@@ -6,9 +6,9 @@
 # Contributor: jlvsimoes <jlvsimoes at oninet.pt>
 
 pkgname=crypto++
-pkgver=6.0.0
+pkgver=6.1.0
 _srcver=${pkgver//./}
-pkgrel=2
+pkgrel=1
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('x86_64')
 url="https://www.cryptopp.com/"
@@ -20,12 +20,12 @@
 source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"
         'libcrypto++.pc')
 # Checksums from https://www.cryptopp.com/release600.html
-sha1sums=('290dfc1948b860b29da40f8c5559f6559ce787db'
-          '7a6c6fc7aed96ff7be554eee60450a1914b0cd95')
-sha256sums=('64ac2db96b3f1b7a23675e2be95d16c96055edffa2d5e2de6245fdb6baa92dda'
-            '14228b0d1a6f07572090ab17b60bf9829308d174e763eb31966f723b0cb51134')
-sha512sums=('7a60c28be1fc9418adeabe8c66d868b46e65fb3d77d308b9431b16905cde7faa670180619150e849ae44d70f44aa8501a0a0c4354ec84f194fd8138d14aca9bf'
-            'bba4ff9c01e353f0336e01836fd1418a08f43ab9215f678cc80cc94954d689e94e1425c7ed95f9b12d210bfc73574c98d0579b1356232c50f32f342395408ac2')
+sha1sums=('c4e7c14ad17b6fae6a1b84d0824b4365f2a779e6'
+          'f776881de464d591b33eec88b76039bc5da8c1c8')
+sha256sums=('21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7'
+            '86370744f3191eaba9f334c293fdf1670188a4462edef98ace9389462664b01b')
+sha512sums=('cb01330ffb2f34bf51ca5a9d530b0be987c7cf36ab2be0e562a61bd39748f9fa5533be43050c7505f8be22b03a9dece829c1b27987b9c9c5cb7ecf51d75bf6a3'
+            'e15a5d1e2c3d9e0fd87028848e7174fc0589a1f492d5acc95c1b1d7073bccdfa325d515b6ef3c4aed850b48302b876a754add1a73123e4bc5416dbf0586258a1')
 
 build() {
   CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe

Deleted: fix-cxxflags.patch
===================================================================
--- fix-cxxflags.patch	2018-02-22 22:20:58 UTC (rev 297129)
+++ fix-cxxflags.patch	2018-02-22 22:29:12 UTC (rev 297130)
@@ -1,49 +0,0 @@
-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	2018-02-22 22:20:58 UTC (rev 297129)
+++ libcrypto++.pc	2018-02-22 22:29:12 UTC (rev 297130)
@@ -4,8 +4,8 @@
 libdir=${prefix}/lib
 includedir=${prefix}/include
 
-Name: libcrypto++-6.0.0
+Name: libcrypto++-6.1.0
 Description: Class library of cryptographic schemes
-Version: 6.0.0
+Version: 6.1.0
 Libs: -L${libdir} -lcryptopp
 Cflags: -I${includedir}