Merge pull request #3891 from DestroyFX/update-cryptopp

crypto++: update to 563

common/shlibs

@@ -1237,7 +1237,7 @@ libdb-5.3.so libdb-5.3.21_1
 libdb_cxx-5.3.so libdb-cxx-5.3.21_1
 libsdb.so.0 sdb-0.6.2_1
 libcares.so.2 c-ares-1.10.0_1
-libcryptopp.so.562 crypto++-562_4
+libcryptopp.so.563 crypto++-563_1
 libqzeitgeist.so.1 libqzeitgeist-0.8.0_1
 libphonon.so.4 phonon-4.6.0_1
 libphononexperimental.so.4 phonon-4.6.0_1

srcpkgs/crypto++/patches/arm-native.patch

@@ -0,0 +1,33 @@
+--- GNUmakefile.orig	2016-03-20 22:08:25.169365978 -0600
++++ GNUmakefile	2016-03-20 22:35:13.653257163 -0600
+@@ -75,21 +75,6 @@
+  endif
+ endif
+ 
+-# Guard use of -march=native
+-ifeq ($(GCC_COMPILER),0)
+-   CXXFLAGS += -march=native
+-else ifneq ($(GCC42_OR_LATER),0)
+-   CXXFLAGS += -march=native
+-else
+-  # GCC 3.3 and "unknown option -march="
+-  # GCC 4.1 compiler crash with -march=native.
+-  ifneq ($(IS_X86_64),0)
+-    CXXFLAGS += -m64
+-  else
+-    CXXFLAGS += -m32
+-  endif # X86/X32/X64
+-endif
+-
+ # Aligned access required at -O3 for GCC due to vectorization (circa 08/2008). Expect other compilers to do the same.
+ UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
+ ifeq ($(findstring -O3,$(CXXFLAGS)),-O3)
+@@ -175,7 +160,7 @@
+ endif
+ 
+ ifneq ($(SUN_COMPILER),0)	# override flags for CC Sun C++ compiler
+-CXXFLAGS ?= -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
++CXXFLAGS ?= -DNDEBUG -O -g0 -template=no%extdef $(M32OR64)
+ LDFLAGS =
+ AR = $(CXX)
+ ARFLAGS = -xar -o

srcpkgs/crypto++/patches/soname.patch

@@ -1,19 +1,20 @@
---- GNUmakefile.orig	2015-02-16 10:07:31.188232968 +0100
+--- GNUmakefile.orig	2016-03-20 18:33:19.932703639 -0600
-+++ GNUmakefile	2015-02-16 10:09:08.028179047 +0100
++++ GNUmakefile	2016-03-20 22:08:25.169365978 -0600
-@@ -16,6 +16,7 @@ IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(E
+@@ -36,6 +36,8 @@
- IS_LINUX = $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -c "linux")
+ INTEL_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
- IS_MINGW = $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -c "mingw")
+ MACPORTS_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "macports")
- CLANG_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "clang version")
-+VERSION = 562
  
++VERSION = 563
++
  # Default prefix for make install
  ifeq ($(PREFIX),)
-@@ -165,7 +166,7 @@ libcryptopp.a: $(LIBOBJS)
+ PREFIX = /usr
+@@ -375,7 +377,7 @@
  	$(RANLIB) $@
  
- libcryptopp.so: $(LIBOBJS)
+ libcryptopp.so: public_service | $(LIBOBJS)
--	$(CXX) -shared -o $@ $(LIBOBJS)
+-	$(CXX) -shared -o $@ $(CXXFLAGS) $(GOLD_OPTION) $(LIBOBJS) $(LDLIBS)
-+	$(CXX) -shared -Wl,-soname=libcryptopp.so.$(VERSION) -o $@.$(VERSION) $(LIBOBJS)
++	$(CXX) -shared -Wl,-soname=libcryptopp.so.$(VERSION) -o $@.$(VERSION) $(CXXFLAGS) $(GOLD_OPTION) $(LIBOBJS) $(LDLIBS)
  
- cryptest.exe: libcryptopp.a $(TESTOBJS)
+ libcryptopp.dylib: $(LIBOBJS)
- 	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
+ 	$(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" $(LIBOBJS)

srcpkgs/crypto++/template

@@ -1,7 +1,7 @@
 # Template build file for 'crypto++'.
 pkgname=crypto++
-version=562
+version=563
-revision=6
+revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
 short_desc="A free C++ class library of cryptographic schemes"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.cryptopp.com/"
 license="Boost Software License 1.0, Public domain"
 distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574
+checksum=9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9
 
 do_build() {
 	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile