commit 472a31a8c54fbbc066812e4df72e7022ae53088f
Author: Paweł Sikora <[email protected]>
Date: Tue Sep 4 21:58:21 2012 +0200
updated to 5.6.1, dropped internal testsuite installation.
cryptopp-autotools.patch | 632 ++++++++++++++++++++++-------------------------
cryptopp.spec | 28 +--
2 files changed, 303 insertions(+), 357 deletions(-)
---
diff --git a/cryptopp.spec b/cryptopp.spec
index cafdc80..c98b419 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,14 +1,15 @@
-%define orig_ver 552
+%define orig_ver 561
Summary: Cryptopp Library - a free C++ class library of cryptographic
schemes
Summary(pl.UTF-8): Cryptopp - klasa C++ dostarczająca narzędzia do
kryptografii
Name: cryptopp
-Version: 5.5.2
+Version: 5.6.1
Release: 1
License: GPL
Group: Libraries
Source0: http://dl.sourceforge.net/cryptopp/%{name}%{orig_ver}.zip
-# Source0-md5: a889be9d9ad5c202c925fb105caa4857
+# Source0-md5: 96cbeba0907562b077e26bcffb483828
Patch0: %{name}-autotools.patch
+Patch1: cxx.patch
URL: http://www.cryptopp.com/
BuildRequires: autoconf
BuildRequires: automake
@@ -63,6 +64,7 @@ Programy dla Cryptopp.
%prep
%setup -q -c
%patch0 -p1
+%patch1 -p0
%build
%{__libtoolize}
@@ -73,20 +75,16 @@ Programy dla Cryptopp.
%configure \
CXXFLAGS="%{rpmcxxflags} -DCRYPTOPP_DISABLE_X86ASM"
+
%{__make}
+./cryptest v
+
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_includedir}/cryptopp
-install -d $RPM_BUILD_ROOT%{_datadir}/cryptopp
-install .libs/cryptest $RPM_BUILD_ROOT%{_bindir}/cryptest
-cp -a .libs/libcryptopp.so* $RPM_BUILD_ROOT%{_libdir}
-install .libs/libcryptopp.a $RPM_BUILD_ROOT%{_libdir}
-install *.h $RPM_BUILD_ROOT%{_includedir}/cryptopp
-install *.dat $RPM_BUILD_ROOT%{_datadir}/cryptopp
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc License.txt Readme.txt
+%attr(755,root,root) %ghost %{_libdir}/libcryptopp.so.4
%attr(755,root,root) %{_libdir}/libcryptopp.so.*.*.*
%files devel
@@ -107,8 +106,3 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/libcryptopp.a
-
-%files progs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/cryptopp
diff --git a/cryptopp-autotools.patch b/cryptopp-autotools.patch
index 168bbc4..476a8b3 100644
--- a/cryptopp-autotools.patch
+++ b/cryptopp-autotools.patch
@@ -1,343 +1,295 @@
-diff -crN crypto52.orig/GNUmakefile.am crypto52/GNUmakefile.am
-*** crypto52.orig/GNUmakefile.am 1970-01-01 01:00:00.000000000 +0100
---- crypto52/GNUmakefile.am 2004-07-24 14:14:34.231122920 +0200
-***************
-*** 0 ****
---- 1,331 ----
-+ lib_LTLIBRARIES = libcryptopp.la
-+ libcryptopp_la_LDFLAGS = -version-info 5:5:2
-+ libcryptopp_la_LIBADD = -lpthread
-+ libcryptopp_la_SOURCES = \
-+ 3way.cpp \
-+ adler32.cpp \
-+ algebra.cpp \
-+ algparam.cpp \
-+ arc4.cpp \
-+ asn.cpp \
-+ base32.cpp \
-+ base64.cpp \
-+ basecode.cpp \
-+ bfinit.cpp \
-+ blowfish.cpp \
-+ blumshub.cpp \
-+ camellia.cpp \
-+ cast.cpp \
-+ casts.cpp \
-+ cbcmac.cpp \
-+ channels.cpp \
-+ cpu.cpp \
-+ crc.cpp \
-+ cryptlib.cpp \
-+ cryptlib_bds.cpp \
-+ default.cpp \
-+ des.cpp \
-+ dessp.cpp \
-+ dh.cpp \
-+ dh2.cpp \
-+ dll.cpp \
-+ dsa.cpp \
-+ ec2n.cpp \
-+ eccrypto.cpp \
-+ ecp.cpp \
-+ elgamal.cpp \
-+ emsa2.cpp \
-+ eprecomp.cpp \
-+ esign.cpp \
-+ files.cpp \
-+ filters.cpp \
-+ fips140.cpp \
-+ fipstest.cpp \
-+ gf256.cpp \
-+ gf2_32.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 \
-+ serpent.cpp \
-+ sha.cpp \
-+ shacal2.cpp \
-+ shark.cpp \
-+ sharkbox.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 \
-+ wait.cpp \
-+ wake.cpp \
-+ whrlpool.cpp \
-+ winpipes.cpp \
-+ vmac.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 \
-+ base32.h \
-+ base64.h \
-+ basecode.h \
-+ bench.h \
-+ blowfish.h \
-+ blumshub.h \
-+ camellia.h \
-+ cast.h \
-+ cbcmac.h \
-+ channels.h \
-+ config.h \
-+ cpu.h \
-+ crc.h \
-+ cryptlib.h \
-+ default.h \
-+ des.h \
-+ dh.h \
-+ dh2.h \
-+ dll.h \
-+ dmac.h \
-+ dsa.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 \
-+ gf256.h \
-+ gf2_32.h \
-+ gf2n.h \
-+ gfpcrypt.h \
-+ gost.h \
-+ gzip.h \
-+ hex.h \
-+ hmac.h \
-+ hrtimer.h \
-+ ida.h \
-+ idea.h \
-+ integer.h \
-+ iterhash.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 \
-+ serpent.h \
-+ serpentp.h \
-+ sha.h \
-+ shacal2.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 \
-+ wait.h \
-+ wake.h \
-+ whrlpool.h \
-+ winpipes.h \
-+ words.h \
-+ vmac.h \
-+ xtr.h \
-+ xtrcrypt.h \
-+ zdeflate.h \
-+ zinflate.h \
-+ zlib.h
-+
-+ pkgdata_DATA = \
-+ 3desval.dat \
-+ 3wayval.dat \
-+ camellia.dat \
-+ cast128v.dat \
-+ cast256v.dat \
-+ descert.dat \
-+ dh1024.dat \
-+ dh2048.dat \
-+ dlie1024.dat \
-+ dlie2048.dat \
-+ dsa1024b.dat \
-+ dsa1024.dat \
-+ dsa512.dat \
-+ elgc1024.dat \
-+ esig1023.dat \
-+ esig1536.dat \
-+ esig2046.dat \
-+ gostval.dat \
-+ ideaval.dat \
-+ luc1024.dat \
-+ luc2048.dat \
-+ lucc1024.dat \
-+ lucc512.dat \
-+ lucd1024.dat \
-+ lucd512.dat \
-+ lucs1024.dat \
-+ lucs512.dat \
-+ marsval.dat \
-+ mqv1024.dat \
-+ mqv2048.dat \
-+ nr1024.dat \
-+ nr2048.dat \
-+ rabi1024.dat \
-+ rabi2048.dat \
-+ rc2val.dat \
-+ rc5val.dat \
-+ rc6val.dat \
-+ rijndael.dat \
-+ rsa1024.dat \
-+ rsa2048.dat \
-+ rsa400pb.dat \
-+ rsa400pv.dat \
-+ rsa512a.dat \
-+ rw1024.dat \
-+ rw2048.dat \
-+ saferval.dat \
-+ serpentv.dat \
-+ shacal2v.dat \
-+ sharkval.dat \
-+ skipjack.dat \
-+ squareva.dat \
-+ twofishv.dat \
-+ usage.dat \
-+ xtrdh171.dat \
-+ xtrdh342.dat
-+
-+ bin_PROGRAMS = cryptest
-+ cryptest_SOURCES = \
-+ bench.cpp \
-+ bench2.cpp \
-+ test.cpp \
-+ validat1.cpp \
-+ validat2.cpp \
-+ validat3.cpp \
-+ datatest.cpp \
-+ regtest.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
-diff -crN crypto52.orig/configure.in crypto52/configure.in
-*** crypto52.orig/configure.in 1970-01-01 01:00:00.000000000 +0100
---- crypto52/configure.in 2004-07-14 23:18:44.000000000 +0200
+--- 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 ----
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cryptopp.git/commitdiff/fa8cb0018de020c26f1f960d9177448a8bd406ec
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
