diff options
author | 2010-05-09 20:11:31 +0200 | |
---|---|---|
committer | 2010-05-09 20:11:31 +0200 | |
commit | ed0dc872b38040505c7c3dec1544cd355e214ba8 (patch) | |
tree | c53486ce2e0a20f9a6a19bd2df565f8f98c4e1a7 /app-crypt | |
parent | Merge git://gitorious.org/n900-overlay/n900-overlay (diff) | |
download | jensp-ed0dc872b38040505c7c3dec1544cd355e214ba8.tar.gz jensp-ed0dc872b38040505c7c3dec1544cd355e214ba8.tar.bz2 jensp-ed0dc872b38040505c7c3dec1544cd355e214ba8.zip |
more fixes, thanks Tommy[D]
Diffstat (limited to 'app-crypt')
-rw-r--r-- | app-crypt/miracl/Manifest | 3 | ||||
-rw-r--r-- | app-crypt/miracl/files/miracl-fix-buildsystem.patch | 145 | ||||
-rw-r--r-- | app-crypt/miracl/miracl-5.4.1.ebuild | 16 |
3 files changed, 153 insertions, 11 deletions
diff --git a/app-crypt/miracl/Manifest b/app-crypt/miracl/Manifest index 46de352..164cbea 100644 --- a/app-crypt/miracl/Manifest +++ b/app-crypt/miracl/Manifest @@ -1,3 +1,4 @@ +AUX miracl-fix-buildsystem.patch 4963 RMD160 0f9e3063382d60087bb5f04b16fd61a927b96a12 SHA1 1c497f87fb88404c97987f782f405b5df0e8636d SHA256 f9036d3145327a6e27d300bdc55e763caa218b5f8c866c4e383ad2bc2bb9438c AUX miracl-noexecstack.patch 6544 RMD160 b626fdcc71a2a8fcb2121740415d0755288c7dc7 SHA1 eb4074f98ca85dfcfa27f06c496d3a71186005f5 SHA256 3dadaa7730d77b229074d608c2f1e356f26d6b71769c9abbba3062764a99feb8 DIST miracl-5.4.1.tar.bz2 1333376 RMD160 dc480fd8a878bde5dbef0419a78a0648170d94c4 SHA1 174078320814ac7e10e8a0638402dc6d56f5f765 SHA256 6fb91171459b5f6873bdf25bb7b146459522b75006736a802e8d3ef189625cb7 -EBUILD miracl-5.4.1.ebuild 966 RMD160 a3a451fa44c0d8394016bbd04d661f03730096db SHA1 972c23815dd4c8e3291502117373262e177cd26b SHA256 7334ac5f9cd96f1b176d8021e06730ecaa6226b0fc29656b25f0d94ffd69700b +EBUILD miracl-5.4.1.ebuild 745 RMD160 69154d2d81a275ef3d062645ee2f00a738b3a1e7 SHA1 f4ef69b8a28313f1a6b093e15ae31ae98cb61783 SHA256 5766cce8b09ababe0f832e978567f9e284b551dc17425e632f864f1958ce0149 diff --git a/app-crypt/miracl/files/miracl-fix-buildsystem.patch b/app-crypt/miracl/files/miracl-fix-buildsystem.patch new file mode 100644 index 0000000..27fd335 --- /dev/null +++ b/app-crypt/miracl/files/miracl-fix-buildsystem.patch @@ -0,0 +1,145 @@ +--- a/linux 2008-08-12 14:29:54.000000000 +0200 ++++ b/linux 2010-05-09 18:23:06.118664451 +0200 +@@ -1,54 +1,55 @@ ++#!/bin/bash + rm *.exe + rm *.lib + rm miracl.a + cp mirdef.lnx mirdef.h +-gcc -c -m32 -O2 mrcore.c +-gcc -c -m32 -O2 mrarth0.c +-gcc -c -m32 -O2 mrarth1.c +-gcc -c -m32 -O2 mrarth2.c +-gcc -c -m32 -O2 mralloc.c +-gcc -c -m32 -O2 mrsmall.c +-gcc -c -m32 -O2 mrio1.c +-gcc -c -m32 -O2 mrio2.c +-gcc -c -m32 -O2 mrgcd.c +-gcc -c -m32 -O2 mrjack.c +-gcc -c -m32 -O2 mrxgcd.c +-gcc -c -m32 -O2 mrarth3.c +-gcc -c -m32 -O2 mrbits.c +-gcc -c -m32 -O2 mrrand.c +-gcc -c -m32 -O2 mrprime.c +-gcc -c -m32 -O2 mrcrt.c +-gcc -c -m32 -O2 mrscrt.c +-gcc -c -m32 -O2 mrmonty.c +-gcc -c -m32 -O2 mrpower.c +-gcc -c -m32 -O2 mrsroot.c +-gcc -c -m32 -O2 mrcurve.c +-gcc -c -m32 -O2 mrfast.c +-gcc -c -m32 -O2 mrshs.c +-gcc -c -m32 -O2 mrshs256.c +-gcc -c -m32 -O2 mrshs512.c +-gcc -c -m32 -O2 mraes.c +-gcc -c -m32 -O2 mrlucas.c +-gcc -c -m32 -O2 mrzzn2.c +-gcc -c -m32 -O2 mrzzn2b.c +-gcc -c -m32 -O2 mrzzn3.c +-gcc -c -m32 -O2 mrecn2.c +-gcc -c -m32 -O2 mrstrong.c +-gcc -c -m32 -O2 mrbrick.c +-gcc -c -m32 -O2 mrebrick.c +-gcc -c -m32 -O2 mrec2m.c +-gcc -c -m32 -O2 mrgf2m.c +-gcc -c -m32 -O2 mrflash.c +-gcc -c -m32 -O2 mrfrnd.c +-gcc -c -m32 -O2 mrdouble.c +-gcc -c -m32 -O2 mrround.c +-gcc -c -m32 -O2 mrbuild.c +-gcc -c -m32 -O2 mrflsh1.c +-gcc -c -m32 -O2 mrpi.c +-gcc -c -m32 -O2 mrflsh2.c +-gcc -c -m32 -O2 mrflsh3.c +-gcc -c -m32 -O2 mrflsh4.c +-as mrmuldv.s -o mrmuldv.o ++$CC -c $CFLAGS -fPIC -fPIC mrcore.c ++$CC -c $CFLAGS -fPIC -fPIC mrarth0.c ++$CC -c $CFLAGS -fPIC -fPIC mrarth1.c ++$CC -c $CFLAGS -fPIC -fPIC mrarth2.c ++$CC -c $CFLAGS -fPIC -fPIC mralloc.c ++$CC -c $CFLAGS -fPIC -fPIC mrsmall.c ++$CC -c $CFLAGS -fPIC -fPIC mrio1.c ++$CC -c $CFLAGS -fPIC -fPIC mrio2.c ++$CC -c $CFLAGS -fPIC -fPIC mrgcd.c ++$CC -c $CFLAGS -fPIC -fPIC mrjack.c ++$CC -c $CFLAGS -fPIC -fPIC mrxgcd.c ++$CC -c $CFLAGS -fPIC mrarth3.c ++$CC -c $CFLAGS -fPIC mrbits.c ++$CC -c $CFLAGS -fPIC mrrand.c ++$CC -c $CFLAGS -fPIC mrprime.c ++$CC -c $CFLAGS -fPIC mrcrt.c ++$CC -c $CFLAGS -fPIC mrscrt.c ++$CC -c $CFLAGS -fPIC mrmonty.c ++$CC -c $CFLAGS -fPIC mrpower.c ++$CC -c $CFLAGS -fPIC mrsroot.c ++$CC -c $CFLAGS -fPIC mrcurve.c ++$CC -c $CFLAGS -fPIC mrfast.c ++$CC -c $CFLAGS -fPIC mrshs.c ++$CC -c $CFLAGS -fPIC mrshs256.c ++$CC -c $CFLAGS -fPIC mrshs512.c ++$CC -c $CFLAGS -fPIC mraes.c ++$CC -c $CFLAGS -fPIC mrlucas.c ++$CC -c $CFLAGS -fPIC mrzzn2.c ++$CC -c $CFLAGS -fPIC mrzzn2b.c ++$CC -c $CFLAGS -fPIC mrzzn3.c ++$CC -c $CFLAGS -fPIC mrecn2.c ++$CC -c $CFLAGS -fPIC mrstrong.c ++$CC -c $CFLAGS -fPIC mrbrick.c ++$CC -c $CFLAGS -fPIC mrebrick.c ++$CC -c $CFLAGS -fPIC mrec2m.c ++$CC -c $CFLAGS -fPIC mrgf2m.c ++$CC -c $CFLAGS -fPIC mrflash.c ++$CC -c $CFLAGS -fPIC mrfrnd.c ++$CC -c $CFLAGS -fPIC mrdouble.c ++$CC -c $CFLAGS -fPIC mrround.c ++$CC -c $CFLAGS -fPIC mrbuild.c ++$CC -c $CFLAGS -fPIC mrflsh1.c ++$CC -c $CFLAGS -fPIC mrpi.c ++$CC -c $CFLAGS -fPIC mrflsh2.c ++$CC -c $CFLAGS -fPIC mrflsh3.c ++$CC -c $CFLAGS -fPIC mrflsh4.c ++as mrmuldv.S -o mrmuldv.o + ar rc miracl.a mrcore.o mrarth0.o mrarth1.o mrarth2.o mralloc.o mrsmall.o mrzzn2.o mrzzn3.o + ar r miracl.a mrio1.o mrio2.o mrjack.o mrgcd.o mrxgcd.o mrarth3.o mrbits.o mrecn2.o + ar r miracl.a mrrand.o mrprime.o mrcrt.o mrscrt.o mrmonty.o mrcurve.o mrsroot.o mrzzn2b.o +@@ -57,21 +58,21 @@ + ar r miracl.a mrflsh1.o mrpi.o mrflsh2.o mrflsh3.o mrflsh4.o + ar r miracl.a mrbrick.o mrebrick.o mrec2m.o mrgf2m.o mrmuldv.o mrshs512.o + rm mr*.o +-gcc -m32 -O2 bmark.c miracl.a -o bmark +-gcc -m32 -O2 fact.c miracl.a -o fact +-g++ -c -m32 -O2 big.cpp +-g++ -c -m32 -O2 crt.cpp +-g++ -c -m32 -O2 zzn.cpp +-g++ -c -m32 -O2 ecn.cpp +-g++ -c -m32 -O2 ec2.cpp +-g++ -m32 -O2 mersenne.cpp big.o miracl.a -o mersenne +-g++ -m32 -O2 brent.cpp big.o zzn.o miracl.a -o brent +-g++ -c -m32 -O2 flash.cpp +-g++ -m32 -O2 sample.cpp flash.o miracl.a -o sample +-g++ -m32 -O2 ecsgen.cpp ecn.o big.o miracl.a -o ecsgen +-g++ -m32 -O2 ecsign.cpp ecn.o big.o miracl.a -o ecsign +-g++ -m32 -O2 ecsver.cpp ecn.o big.o miracl.a -o ecsver +-g++ -m32 -O2 pk-demo.cpp ecn.o crt.o big.o miracl.a -o pk-demo +-g++ -c -m32 -O2 polymod.cpp +-g++ -c -m32 -O2 poly.cpp +-g++ -m32 -O2 schoof.cpp polymod.o poly.o ecn.o crt.o zzn.o big.o miracl.a -o schoof ++$CC $CFLAGS bmark.c miracl.a -o bmark ++$CC $CFLAGS fact.c miracl.a -o fact ++$CXX -c $CXXFLAGS big.cpp ++$CXX -c $CXXFLAGS crt.cpp ++$CXX -c $CXXFLAGS zzn.cpp ++$CXX -c $CXXFLAGS ecn.cpp ++$CXX -c $CXXFLAGS ec2.cpp ++$CXX $CXXFLAGS mersenne.cpp big.o miracl.a -o mersenne ++$CXX $CXXFLAGS brent.cpp big.o zzn.o miracl.a -o brent ++$CXX -c $CXXFLAGS flash.cpp ++$CXX $CXXFLAGS sample.cpp flash.o miracl.a -o sample ++$CXX $CXXFLAGS ecsgen.cpp ecn.o big.o miracl.a -o ecsgen ++$CXX $CXXFLAGS ecsign.cpp ecn.o big.o miracl.a -o ecsign ++$CXX $CXXFLAGS ecsver.cpp ecn.o big.o miracl.a -o ecsver ++$CXX $CXXFLAGS pk-demo.cpp ecn.o crt.o big.o miracl.a -o pk-demo ++$CXX -c $CXXFLAGS polymod.cpp ++$CXX -c $CXXFLAGS poly.cpp ++$CXX $CXXFLAGS schoof.cpp polymod.o poly.o ecn.o crt.o zzn.o big.o miracl.a -o schoof diff --git a/app-crypt/miracl/miracl-5.4.1.ebuild b/app-crypt/miracl/miracl-5.4.1.ebuild index 39989ca..aec121d 100644 --- a/app-crypt/miracl/miracl-5.4.1.ebuild +++ b/app-crypt/miracl/miracl-5.4.1.ebuild @@ -6,7 +6,7 @@ EAPI=2 inherit eutils toolchain-funcs -DESCRIPTION="crypto library" +DESCRIPTION="big number cryptography library" HOMEPAGE="http://www.shamus.ie" SRC_URI="http://chaox.net/~jens/${P}.tar.bz2" @@ -16,20 +16,16 @@ KEYWORDS="~amd64 ~x86" IUSE="" src_prepare() { + epatch "${FILESDIR}"/$PN-fix-buildsystem.patch + epatch "${FILESDIR}"/$PN-noexecstack.patch if use amd64; then - sed -i "s|gcc -c -m64 -O2|$(tc-getCC) -c -m64 -fPIC $CFLAGS|g" linux64 || die - sed -i "s|g++ -c -m64 -O2|$(tc-getCXX) -c -m64 -fPIC $CFLAGS|g" linux64 || die - mv linux64 linux || die - else - sed -i "s|gcc -c -m32 -O2|$(tc-getCC) -c -m32 $CFLAGS|g" linux || die - sed -i "s|g++ -c -m32 -O2|$(tc-getCXX) -c -m32 $CFLAGS|g" linux || die + sed -i 's|mrmuldv.S|mrmuldv.S64|g' linux || die fi - sed -i "s|mrmuldv.s|mrmuldv.S|g" linux || die - epatch "${FILESDIR}"/$PN-noexecstack.patch } src_compile() { - bash ./linux || die + chmod +x ./linux + CC="$(tc-getCC)" CXX="$(tc-getCXX)" ./linux || die } src_install() { |