commit e7868f1d34fbfc1e2434bc31ae3a962b4872d74c
Author: Jakub Bogusz <[email protected]>
Date: Tue Jun 6 21:06:32 2017 +0200
- updated to 5.6.4 (note: soname changed to follow upstream)
- removed obsolete cxx patch
- dropped autotools support provided by autotools patch; use upstream cmake
support instead
cryptopp-autotools.patch | 308 -----------------------------------------------
cryptopp.spec | 51 +++-----
cxx.patch | 106 ----------------
3 files changed, 20 insertions(+), 445 deletions(-)
---
diff --git a/cryptopp.spec b/cryptopp.spec
index 7b08b97..6e8e923 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -7,24 +7,20 @@
%undefine with_asm
%endif
-%define orig_ver 561
+%define orig_ver 564
Summary: Cryptopp Library - a free C++ class library of cryptographic
schemes
Summary(pl.UTF-8): Cryptopp - biblioteka klas C++ dostarczająca narzędzia
do kryptografii
Name: cryptopp
-Version: 5.6.1
-Release: 4
-License: BSD-like
+Version: 5.6.4
+Release: 1
+License: Boost v1.0 (BSD-like)
Group: Libraries
Source0: http://downloads.sourceforge.net/cryptopp/%{name}%{orig_ver}.zip
-# Source0-md5: 96cbeba0907562b077e26bcffb483828
+# Source0-md5: 4ee7e5cdd4a45a14756c169eaf2a77fc
Source1: %{name}.pc
-Patch0: %{name}-autotools.patch
-Patch1: cxx.patch
URL: http://www.cryptopp.com/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: cmake >= 2.8.5
BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
BuildRequires: unzip
Obsoletes: cryptopp-progs
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,31 +58,23 @@ Statyczna biblioteka Cryptopp.
%prep
%setup -q -c
-%patch0 -p1
-%patch1 -p0
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%if %{without asm}
-CFLAGS="%{rpmcflags} -DCRYPTOPP_DISABLE_X86ASM"
-CXXFLAGS="%{rpmcxxflags} -DCRYPTOPP_DISABLE_X86ASM"
-%endif
-%configure
-%{__make} -j1
+install -d build
+cd build
+%cmake .. \
+ %{!?with_asm:-DDISABLE_ASM=ON}
+
+%{__make}
%if %{with tests}
-./cryptest v
+ctest -V
%endif
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- INSTALL="install -p -c " \
+
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -96,7 +84,9 @@ sed -e "
s|@VERSION@|%{version}|g
" %{SOURCE1} > $RPM_BUILD_ROOT%{_pkgconfigdir}/cryptopp.pc
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/cryptest
+# tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/cryptest.exe
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cryptopp/Test{Data,Vectors}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -107,15 +97,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc License.txt Readme.txt
-%attr(755,root,root) %{_libdir}/libcryptopp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcryptopp.so.4
+%attr(755,root,root) %{_libdir}/libcryptopp.so.5.6
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcryptopp.so
-%{_libdir}/libcryptopp.la
%{_includedir}/cryptopp
%{_pkgconfigdir}/cryptopp.pc
+%{_libdir}/cmake/cryptopp
%files static
%defattr(644,root,root,755)
diff --git a/cryptopp-autotools.patch b/cryptopp-autotools.patch
deleted file mode 100644
index c479038..0000000
--- a/cryptopp-autotools.patch
+++ /dev/null
@@ -1,308 +0,0 @@
---- src.orig/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ src/GNUmakefile.am 2012-09-04 21:28:23.000000000 +0200
-@@ -0,0 +1,287 @@
-+lib_LTLIBRARIES = libcryptopp.la
-+libcryptopp_la_LDFLAGS = -version-info 5:6:1
-+libcryptopp_la_LIBADD = -lpthread
-+libcryptopp_la_SOURCES = \
-+ 3way.cpp \
-+ adler32.cpp \
-+ algebra.cpp \
-+ algparam.cpp \
-+ arc4.cpp \
-+ asn.cpp \
-+ authenc.cpp \
-+ base32.cpp \
-+ base64.cpp \
-+ basecode.cpp \
-+ bfinit.cpp \
-+ blowfish.cpp \
-+ blumshub.cpp \
-+ camellia.cpp \
-+ cast.cpp \
-+ casts.cpp \
-+ cbcmac.cpp \
-+ ccm.cpp \
-+ channels.cpp \
-+ cmac.cpp \
-+ cpu.cpp \
-+ crc.cpp \
-+ cryptlib_bds.cpp \
-+ cryptlib.cpp \
-+ default.cpp \
-+ des.cpp \
-+ dessp.cpp \
-+ dh2.cpp \
-+ dh.cpp \
-+ dll.cpp \
-+ dsa.cpp \
-+ eax.cpp \
-+ ec2n.cpp \
-+ eccrypto.cpp \
-+ ecp.cpp \
-+ elgamal.cpp \
-+ emsa2.cpp \
-+ eprecomp.cpp \
-+ esign.cpp \
-+ files.cpp \
-+ filters.cpp \
-+ fips140.cpp \
-+ gcm.cpp \
-+ gf2_32.cpp \
-+ gf256.cpp \
-+ gf2n.cpp \
-+ gfpcrypt.cpp \
-+ gost.cpp \
-+ gzip.cpp \
-+ hex.cpp \
-+ hmac.cpp \
-+ hrtimer.cpp \
-+ ida.cpp \
-+ idea.cpp \
-+ integer.cpp \
-+ iterhash.cpp \
-+ luc.cpp \
-+ mars.cpp \
-+ marss.cpp \
-+ md2.cpp \
-+ md4.cpp \
-+ md5.cpp \
-+ misc.cpp \
-+ modes.cpp \
-+ mqueue.cpp \
-+ mqv.cpp \
-+ nbtheory.cpp \
-+ network.cpp \
-+ oaep.cpp \
-+ osrng.cpp \
-+ panama.cpp \
-+ pch.cpp \
-+ pkcspad.cpp \
-+ polynomi.cpp \
-+ pssr.cpp \
-+ pubkey.cpp \
-+ queue.cpp \
-+ rabin.cpp \
-+ randpool.cpp \
-+ rc2.cpp \
-+ rc5.cpp \
-+ rc6.cpp \
-+ rdtables.cpp \
-+ rijndael.cpp \
-+ ripemd.cpp \
-+ rng.cpp \
-+ rsa.cpp \
-+ rw.cpp \
-+ safer.cpp \
-+ salsa.cpp \
-+ seal.cpp \
-+ seed.cpp \
-+ serpent.cpp \
-+ shacal2.cpp \
-+ sha.cpp \
-+ sharkbox.cpp \
-+ shark.cpp \
-+ simple.cpp \
-+ skipjack.cpp \
-+ socketft.cpp \
-+ sosemanuk.cpp \
-+ square.cpp \
-+ squaretb.cpp \
-+ strciphr.cpp \
-+ tea.cpp \
-+ tftables.cpp \
-+ tiger.cpp \
-+ tigertab.cpp \
-+ trdlocal.cpp \
-+ ttmac.cpp \
-+ twofish.cpp \
-+ vmac.cpp \
-+ wait.cpp \
-+ wake.cpp \
-+ whrlpool.cpp \
-+ winpipes.cpp \
-+ xtr.cpp \
-+ xtrcrypt.cpp \
-+ zdeflate.cpp \
-+ zinflate.cpp \
-+ zlib.cpp
-+
-+pkginclude_HEADERS = \
-+ 3way.h \
-+ adler32.h \
-+ aes.h \
-+ algebra.h \
-+ algparam.h \
-+ arc4.h \
-+ argnames.h \
-+ asn.h \
-+ authenc.h \
-+ base32.h \
-+ base64.h \
-+ basecode.h \
-+ bench.h \
-+ blowfish.h \
-+ blumshub.h \
-+ camellia.h \
-+ cast.h \
-+ cbcmac.h \
-+ ccm.h \
-+ channels.h \
-+ cmac.h \
-+ config.h \
-+ cpu.h \
-+ crc.h \
-+ cryptlib.h \
-+ default.h \
-+ des.h \
-+ dh2.h \
-+ dh.h \
-+ dll.h \
-+ dmac.h \
-+ dsa.h \
-+ eax.h \
-+ ec2n.h \
-+ eccrypto.h \
-+ ecp.h \
-+ elgamal.h \
-+ emsa2.h \
-+ eprecomp.h \
-+ esign.h \
-+ factory.h \
-+ files.h \
-+ filters.h \
-+ fips140.h \
-+ fltrimpl.h \
-+ gcm.h \
-+ gf2_32.h \
-+ gf256.h \
-+ gf2n.h \
-+ gfpcrypt.h \
-+ gost.h \
-+ gzip.h \
-+ hex.h \
-+ hmac.h \
-+ hrtimer.h \
-+ ida.h \
-+ idea.h \
-+ integer.h \
-+ iterhash.h \
-+ local.h \
-+ lubyrack.h \
-+ luc.h \
-+ mars.h \
-+ md2.h \
-+ md4.h \
-+ md5.h \
-+ mdc.h \
-+ misc.h \
-+ modarith.h \
-+ modes.h \
-+ modexppc.h \
-+ mqueue.h \
-+ mqv.h \
-+ nbtheory.h \
-+ network.h \
-+ nr.h \
-+ oaep.h \
-+ oids.h \
-+ osrng.h \
-+ panama.h \
-+ pch.h \
-+ pkcspad.h \
-+ polynomi.h \
-+ pssr.h \
-+ pubkey.h \
-+ pwdbased.h \
-+ queue.h \
-+ rabin.h \
-+ randpool.h \
-+ rc2.h \
-+ rc5.h \
-+ rc6.h \
-+ resource.h \
-+ rijndael.h \
-+ ripemd.h \
-+ rng.h \
-+ rsa.h \
-+ rw.h \
-+ safer.h \
-+ salsa.h \
-+ seal.h \
-+ secblock.h \
-+ seckey.h \
-+ seed.h \
-+ serpent.h \
-+ serpentp.h \
-+ shacal2.h \
-+ sha.h \
-+ shark.h \
-+ simple.h \
-+ skipjack.h \
-+ smartptr.h \
-+ socketft.h \
-+ sosemanuk.h \
-+ square.h \
-+ stdcpp.h \
-+ strciphr.h \
-+ tea.h \
-+ tiger.h \
-+ trdlocal.h \
-+ trunhash.h \
-+ ttmac.h \
-+ twofish.h \
-+ validate.h \
-+ vmac.h \
-+ wait.h \
-+ wake.h \
-+ whrlpool.h \
-+ winpipes.h \
-+ words.h \
-+ xtrcrypt.h \
-+ xtr.h \
-+ zdeflate.h \
-+ zinflate.h \
-+ zlib.h
-+
-+bin_PROGRAMS = cryptest
-+cryptest_SOURCES = \
-+ bench.cpp \
-+ bench2.cpp \
-+ test.cpp \
-+ validat1.cpp \
-+ validat2.cpp \
-+ validat3.cpp \
-+ datatest.cpp \
-+ regtest.cpp \
-+ fipstest.cpp \
-+ fipsalgt.cpp \
-+ dlltest.cpp
-+
-+nodist_cryptest_SOURCES = adhoc.cpp
-+CLEANFILES = adhoc.cpp
-+cryptest_LDADD = -lcryptopp
-+
-+adhoc.cpp: GNUmakefile
-+ if test -f adhoc.cpp; then \
-+ touch adhoc.cpp; \
-+ else \
-+ cp adhoc.cpp.proto adhoc.cpp; \
-+ fi
-*** crypto52.orig/configure.in 1970-01-01 01:00:00.000000000 +0100
---- crypto52/configure.in 2004-07-14 23:18:44.000000000 +0200
-***************
-*** 0 ****
---- 1,13 ----
-+ AC_INIT([cryptopp], 5.6.1)
-+ AC_CONFIG_SRCDIR(configure.in)
-+ AM_INIT_AUTOMAKE([no-define])
-+ AM_CONFIG_HEADER([local.h])
-+ AM_MAINTAINER_MODE
-+
-+ AC_PROG_CXX
-+ AC_PROG_LIBTOOL
-+ AC_PROG_INSTALL
-+
-+ AC_C_BIGENDIAN
-+
-+ AC_OUTPUT(GNUmakefile)
diff --git a/cxx.patch b/cxx.patch
deleted file mode 100644
index 31ca399..0000000
--- a/cxx.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- algebra.cpp.orig 2010-08-06 18:44:32.000000000 +0200
-+++ algebra.cpp 2012-09-04 20:57:51.692241542 +0200
-@@ -58,7 +58,7 @@
- Element g[3]={b, a};
- unsigned int i0=0, i1=1, i2=2;
-
-- while (!Equal(g[i1], this->Identity()))
-+ while (!this->Equal(g[i1], this->Identity()))
- {
- g[i2] = Mod(g[i0], g[i1]);
- unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-@@ -74,7 +74,7 @@
- Element y;
- unsigned int i0=0, i1=1, i2=2;
-
-- while (!Equal(g[i1], Identity()))
-+ while (!this->Equal(g[i1], Identity()))
- {
- // y = g[i0] / g[i1];
- // g[i2] = g[i0] % g[i1];
---- eccrypto.cpp.orig 2010-08-06 18:44:28.000000000 +0200
-+++ eccrypto.cpp 2012-09-04 21:00:59.462246807 +0200
-@@ -435,7 +435,7 @@
- StringSource ssG(param.g, true, new HexDecoder);
- Element G;
- bool result = GetCurve().DecodePoint(G, ssG,
(size_t)ssG.MaxRetrievable());
-- SetSubgroupGenerator(G);
-+ this->SetSubgroupGenerator(G);
- assert(result);
-
- StringSource ssN(param.n, true, new HexDecoder);
-@@ -591,7 +591,7 @@
- if (level >= 2 && pass)
- {
- const Integer &q = GetSubgroupOrder();
-- Element gq = gpc ?
gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g,
q);
-+ Element gq = gpc ?
gpc->Exponentiate(this->GetGroupPrecomputation(), q) :
this->ExponentiateElement(g, q);
- pass = pass && IsIdentity(gq);
- }
- return pass;
-@@ -629,7 +629,7 @@
- typename EC::Point P;
- if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
- BERDecodeError();
-- SetPublicElement(P);
-+ this->SetPublicElement(P);
- }
-
- template <class EC>
---- eccrypto.h.orig 2010-08-06 18:46:24.000000000 +0200
-+++ eccrypto.h 2012-09-04 21:15:16.992185075 +0200
-@@ -43,7 +43,7 @@
- void Initialize(const EllipticCurve &ec, const Point &G, const Integer
&n, const Integer &k = Integer::Zero())
- {
- this->m_groupPrecomputation.SetCurve(ec);
-- SetSubgroupGenerator(G);
-+ this->SetSubgroupGenerator(G);
- m_n = n;
- m_k = k;
- }
-@@ -145,9 +145,9 @@
- typedef typename EC::Point Element;
-
- void Initialize(const DL_GroupParameters_EC<EC> ¶ms, const Element
&Q)
-- {this->AccessGroupParameters() = params; SetPublicElement(Q);}
-+ {this->AccessGroupParameters() = params;
this->SetPublicElement(Q);}
- void Initialize(const EC &ec, const Element &G, const Integer &n, const
Element &Q)
-- {this->AccessGroupParameters().Initialize(ec, G, n);
SetPublicElement(Q);}
-+ {this->AccessGroupParameters().Initialize(ec, G, n);
this->SetPublicElement(Q);}
-
- // X509PublicKey
- void BERDecodePublicKey(BufferedTransformation &bt, bool
parametersPresent, size_t size);
-@@ -166,9 +166,9 @@
- void Initialize(const EC &ec, const Element &G, const Integer &n, const
Integer &x)
- {this->AccessGroupParameters().Initialize(ec, G, n);
this->SetPrivateExponent(x);}
- void Initialize(RandomNumberGenerator &rng, const
DL_GroupParameters_EC<EC> ¶ms)
-- {GenerateRandom(rng, params);}
-+ {this->GenerateRandom(rng, params);}
- void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element
&G, const Integer &n)
-- {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
-+ {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G,
n));}
-
- // PKCS8PrivateKey
- void BERDecodePrivateKey(BufferedTransformation &bt, bool
parametersPresent, size_t size);
---- panama.cpp.orig 2010-08-09 14:22:42.000000000 +0200
-+++ panama.cpp 2012-09-04 21:03:09.792164693 +0200
-@@ -422,7 +422,7 @@
- {
- this->ThrowIfInvalidTruncatedSize(size);
-
-- PadLastBlock(this->BLOCKSIZE, 0x01);
-+ this->PadLastBlock(this->BLOCKSIZE, 0x01);
-
- HashEndianCorrectedBlock(this->m_data);
-
---- secblock.h.orig 2010-08-06 18:46:20.000000000 +0200
-+++ secblock.h 2012-09-04 20:56:16.405572203 +0200
-@@ -88,7 +88,7 @@
-
- pointer allocate(size_type n, const void * = NULL)
- {
-- CheckSize(n);
-+ this->CheckSize(n);
- if (n == 0)
- return NULL;
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cryptopp.git/commitdiff/e7868f1d34fbfc1e2434bc31ae3a962b4872d74c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
