Version bump, thanks to Jack Lloyd, added executable stack fix, closes bug#149213

Package-Manager: portage-2.1.1

5 files changed, 151 insertions, 23 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 8ee7014d6a86..8c2a1ca6bb09 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.17 2006/02/20 22:11:11 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.18 2006/10/24 19:33:26 alonbl Exp $
+
+*botan-1.5.11 (24 Oct 2006)
+
+  24 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/botan-1.5.11-asm.patch, +botan-1.5.11.ebuild:
+  Version bump, thanks to Jack Lloyd, added executable stack fix, closes
+  bug#149213
 
   20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> botan-1.5.5.ebuild:
   Clean up leading whitespaces, add additional quoting, and drop the
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 4820390e80f5..ca453e6d136e 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,30 +1,53 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 600746ab0a906fee75f3dc94b89faf40 ChangeLog 3001
-RMD160 8aff6e9641cfe4d01a00a8df406ea852a8ac4bc8 ChangeLog 3001
-SHA256 2f8e2d50fe020e792c6fcb269b52c66904796c900083ac259ed4416e843dc5ec ChangeLog 3001
+AUX botan-1.4.4-gcc34.patch 479 RMD160 6ed6b8890650ccd391df188419c56a0ec27bfb3b SHA1 87b1444bf852fa45ec358f3e737e149f086ad3fb SHA256 4df4e37ecca2dfbd841106f1207a95a3658ebc17419e4a58fe6ff93b9d410ba4
+MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
+RMD160 6ed6b8890650ccd391df188419c56a0ec27bfb3b files/botan-1.4.4-gcc34.patch 479
+SHA256 4df4e37ecca2dfbd841106f1207a95a3658ebc17419e4a58fe6ff93b9d410ba4 files/botan-1.4.4-gcc34.patch 479
+AUX botan-1.4.9-gcc-4.patch 493 RMD160 547d9d4da48f19d74adeab6fa45cb3239a4c5d0d SHA1 8430b9536984fd37bdd46cc27b5d8ec35ac71b66 SHA256 ee00785faa69dc7d7e679146b736063afa6bceba78a3ba3c85547c69814d4373
+MD5 f997b850a6fbcfc3be36b7d4133b029a files/botan-1.4.9-gcc-4.patch 493
+RMD160 547d9d4da48f19d74adeab6fa45cb3239a4c5d0d files/botan-1.4.9-gcc-4.patch 493
+SHA256 ee00785faa69dc7d7e679146b736063afa6bceba78a3ba3c85547c69814d4373 files/botan-1.4.9-gcc-4.patch 493
+AUX botan-1.5.11-asm.patch 571 RMD160 4c901e3302e42e45e26fc0c7117d143aa75244a1 SHA1 a543e47cd2d4226fefa83cf0cb1e2a6859aa11e2 SHA256 94977172090d058a4972ab71b8b2996fc9cc483837a3cd49acdc6bead7c0c30c
+MD5 6debf97edcd6ceee0eb103aaa62d88ff files/botan-1.5.11-asm.patch 571
+RMD160 4c901e3302e42e45e26fc0c7117d143aa75244a1 files/botan-1.5.11-asm.patch 571
+SHA256 94977172090d058a4972ab71b8b2996fc9cc483837a3cd49acdc6bead7c0c30c files/botan-1.5.11-asm.patch 571
+DIST Botan-1.4.11.tgz 1802089
+DIST Botan-1.4.12.tgz 1801371
+DIST Botan-1.4.4.tgz 1436270
+DIST Botan-1.4.9.tgz 1812447
+DIST Botan-1.5.11.tgz 1373484 RMD160 6a080d69eb53d8a7c0c3c70848401e397e0ce8b3 SHA1 c6dd8496d4bbec75b5331966de0c4d497543d22c SHA256 efff1ad12e22bdbf69f007a58b49a273a548c4bf0b83cac0a92f6d332c8f43e5
+DIST Botan-1.5.5.tgz 1240713 RMD160 660651795018b2071b815137ce6925524b32bf7e SHA256 f8989356a1d40fcff7a867db9168ad6ecb9abca22b64bc0c0b9db653bb814907
+EBUILD botan-1.4.11.ebuild 2466 RMD160 553c07d469e4f91d5d70d8e9fc895878fa6d80a8 SHA1 e6e4caed80c8c5571cf3e6b783849fd063b4b5a1 SHA256 d08badd0ace9d7367934d51b204c2aea5c3442c9ce59741df5460729109ceab9
 MD5 c7ad182eb1036a405d6fdf92cfc0d4d1 botan-1.4.11.ebuild 2466
 RMD160 553c07d469e4f91d5d70d8e9fc895878fa6d80a8 botan-1.4.11.ebuild 2466
 SHA256 d08badd0ace9d7367934d51b204c2aea5c3442c9ce59741df5460729109ceab9 botan-1.4.11.ebuild 2466
+EBUILD botan-1.4.12.ebuild 2466 RMD160 cff9249907c6e7ac291920b5965bf3a0b424a141 SHA1 aa5c700e0e9a79ba2dccb4ae1ad031ce01c57780 SHA256 7421966bda7a9773ac42c1efd6ae0ca60f3ff819c949ab549b8c56467e3bd0be
 MD5 49683ba3788a052d975b79aaa0f2c984 botan-1.4.12.ebuild 2466
 RMD160 cff9249907c6e7ac291920b5965bf3a0b424a141 botan-1.4.12.ebuild 2466
 SHA256 7421966bda7a9773ac42c1efd6ae0ca60f3ff819c949ab549b8c56467e3bd0be botan-1.4.12.ebuild 2466
+EBUILD botan-1.4.4.ebuild 2392 RMD160 a2beb4966dedf3d117df10ed72cb94e04a888b35 SHA1 6da3ae5b46a84e18c48d94b8f67cce8ebb5c812d SHA256 f1d1eee56c0271b3b103a966812f5974ddbd7888cac25a09ca313086d2144dc8
 MD5 043543f19cd858215284f52640cd15ce botan-1.4.4.ebuild 2392
 RMD160 a2beb4966dedf3d117df10ed72cb94e04a888b35 botan-1.4.4.ebuild 2392
 SHA256 f1d1eee56c0271b3b103a966812f5974ddbd7888cac25a09ca313086d2144dc8 botan-1.4.4.ebuild 2392
+EBUILD botan-1.4.9.ebuild 2550 RMD160 8f867a05ca9925e5e642d26d40e368379db84f53 SHA1 4b0850882fea4198fb860290872bf5b4f3b22672 SHA256 6b090ffa03a4363704ebe0eb0e05a897b428d32bb4d809842a50002dbe6afb9a
 MD5 cc8e69ca2141787b033cbbacac2fac2b botan-1.4.9.ebuild 2550
 RMD160 8f867a05ca9925e5e642d26d40e368379db84f53 botan-1.4.9.ebuild 2550
 SHA256 6b090ffa03a4363704ebe0eb0e05a897b428d32bb4d809842a50002dbe6afb9a botan-1.4.9.ebuild 2550
+EBUILD botan-1.5.11.ebuild 2606 RMD160 5a50baeef02d0c52d6a41e8fb74b1c65c6dfef8a SHA1 ad235fdd0b2f4cc70ad16e93b2091aeff07032d7 SHA256 11785e846698bca34fb4d22f17e8de87c98a3f31085bdd1c9f873f28d4efd625
+MD5 3103be79b7ec497732747801fa65b8e3 botan-1.5.11.ebuild 2606
+RMD160 5a50baeef02d0c52d6a41e8fb74b1c65c6dfef8a botan-1.5.11.ebuild 2606
+SHA256 11785e846698bca34fb4d22f17e8de87c98a3f31085bdd1c9f873f28d4efd625 botan-1.5.11.ebuild 2606
+EBUILD botan-1.5.5.ebuild 2525 RMD160 e99614a67cc9efe531ba6fdb1fc69cc4590e899d SHA1 a6b124f0ef53eeb72b9501eaaebce77ce25a30cd SHA256 19766b483faaffde71d0b289523b619ebc719d5b0e084d168714b0ee7aefaf53
 MD5 7c02ae041daddf9f9f0115053a78e8a2 botan-1.5.5.ebuild 2525
 RMD160 e99614a67cc9efe531ba6fdb1fc69cc4590e899d botan-1.5.5.ebuild 2525
 SHA256 19766b483faaffde71d0b289523b619ebc719d5b0e084d168714b0ee7aefaf53 botan-1.5.5.ebuild 2525
-MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
-RMD160 6ed6b8890650ccd391df188419c56a0ec27bfb3b files/botan-1.4.4-gcc34.patch 479
-SHA256 4df4e37ecca2dfbd841106f1207a95a3658ebc17419e4a58fe6ff93b9d410ba4 files/botan-1.4.4-gcc34.patch 479
-MD5 f997b850a6fbcfc3be36b7d4133b029a files/botan-1.4.9-gcc-4.patch 493
-RMD160 547d9d4da48f19d74adeab6fa45cb3239a4c5d0d files/botan-1.4.9-gcc-4.patch 493
-SHA256 ee00785faa69dc7d7e679146b736063afa6bceba78a3ba3c85547c69814d4373 files/botan-1.4.9-gcc-4.patch 493
+MISC ChangeLog 3219 RMD160 8b92459c50aa88b0b37e95ead597659bddf9e6dc SHA1 e700a68fa22ca87b7c1f8ded795f7b135da54e45 SHA256 b77f689983c5bbb0a5d86a4e02eccd393bb1f3ae6c15b798ed06fa21d9d3ea2a
+MD5 eb5f70579bd1ea77b1fddde10c893f6e ChangeLog 3219
+RMD160 8b92459c50aa88b0b37e95ead597659bddf9e6dc ChangeLog 3219
+SHA256 b77f689983c5bbb0a5d86a4e02eccd393bb1f3ae6c15b798ed06fa21d9d3ea2a ChangeLog 3219
+MISC metadata.xml 463 RMD160 a50421a9df0c4f6f8ded9568525613993bd03f46 SHA1 05f66f0d6e803177100d8fc252fa313e325c3641 SHA256 a5cb191344e60da7f987220e591ee31c12b6c4ca898a03dc83745e51f56c2715
+MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
+RMD160 a50421a9df0c4f6f8ded9568525613993bd03f46 metadata.xml 463
+SHA256 a5cb191344e60da7f987220e591ee31c12b6c4ca898a03dc83745e51f56c2715 metadata.xml 463
 MD5 9105f271f3d69095584cafe41c3131ef files/digest-botan-1.4.11 62
 RMD160 a16d49d47e2838d62948d6325c97c07fe5f3e32d files/digest-botan-1.4.11 62
 SHA256 1163b2545feefc5a3205a36e62f8f36385b6a46cae8772a210940b711ae68a9f files/digest-botan-1.4.11 62
@@ -37,16 +60,9 @@ SHA256 4cb1c4f9c4617e89b86628b173c38d7d68a5901068a07e106d96c52041bd5553 files/di
 MD5 f35ec7d42986b3a8a270b4aaa7483817 files/digest-botan-1.4.9 61
 RMD160 ed450fd36eaf23c61ec6a9d2bdb2e3375a2bdd29 files/digest-botan-1.4.9 61
 SHA256 8a443401e2e8c08e6a640c882645c95a35060b921dd3d5f04963bbe4d4625e60 files/digest-botan-1.4.9 61
+MD5 6d9539708136788c00c0a25aefbeb12a files/digest-botan-1.5.11 232
+RMD160 62888493de05fbfeff908dc4fcb6c7a5becdb080 files/digest-botan-1.5.11 232
+SHA256 4dbe56c34e4f16b2dc408717f32d5a05286fd23e25284d0db71b983a90fb7851 files/digest-botan-1.5.11 232
 MD5 4f5cb43c8d7f6af23aba1f3c59d7ad44 files/digest-botan-1.5.5 229
 RMD160 67412a0c7f3a39efcc8cf963fb26268602c08125 files/digest-botan-1.5.5 229
 SHA256 a2547ee3e3acd62beacc49c37eba7e3d503af2fd5a38d48efa646daa0369bd3a files/digest-botan-1.5.5 229
-MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
-RMD160 a50421a9df0c4f6f8ded9568525613993bd03f46 metadata.xml 463
-SHA256 a5cb191344e60da7f987220e591ee31c12b6c4ca898a03dc83745e51f56c2715 metadata.xml 463
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+j8vCRZPokWLroQRAsg4AJ9IXZw1A7g66TBWeah6s1xkQHmdPgCgkzE+
-KADJDQ+vI91nVHkjqzQ6ySI=
-=famq
------END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.5.11.ebuild b/dev-libs/botan/botan-1.5.11.ebuild
new file mode 100644
index 000000000000..483741a5274c
--- /dev/null
+++ b/dev-libs/botan/botan-1.5.11.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.5.11.ebuild,v 1.1 2006/10/24 19:33:26 alonbl Exp $
+
+inherit eutils
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="http://botan.randombit.net/"
+SRC_URI="http://botan.randombit.net/files/${MY_P}.tgz"
+
+KEYWORDS="~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="BSD"
+IUSE="bzip2 gmp ssl zlib"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.3 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	gmp? ( >=dev-libs/gmp-4.2.1 )
+	ssl? ( >=dev-libs/openssl-0.9.8c )"
+
+# configure.pl requires Getopt::Long, File::Spec, and File::Copy;
+# all seem included in dev-lang/perl ATM.
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-asm.patch"
+}
+
+src_compile() {
+	# Modules that should work under any semi-recent Unix
+	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,tm_posix,mux_pthr"
+
+	if useq bzip2; then modules="$modules,comp_bzip2"; fi
+	if useq zlib; then modules="$modules,comp_zlib"; fi
+	if useq gmp; then modules="$modules,eng_gmp"; fi
+	if useq ssl; then modules="$modules,eng_ossl"; fi
+
+	# This is also supported on i586+ - hope this is correct.
+	# documention says sparc though not enables because of
+	# http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
+
+	if [ "${ARCH}" = "alpha" -o "${ARCH}" = "amd64" ] || \
+			[ "${ARCH}" = "x86" -a "${CHOST:0:4}" != "i386" -a "${CHOST:0:4}" != "i486" ]; then
+		modules="$modules,tm_hard"
+	fi
+
+	# If we have assembly code for this machine, use it
+	if [ "${ARCH}" = "x86" ]; then
+		modules="$modules,mp_ia32,alg_ia32"
+	elif [ "${ARCH}" = "amd64" ]; then
+		modules="$modules,mp_amd64"
+	elif [ "${ARCH}" = "alpha" -o "${ARCH}" = "ia64" -o \
+		"${ARCH}" = "ppc64" -o "${PROFILE_ARCH}" = "mips64"  ]; then
+		modules="$modules,mp_asm64"
+	fi
+
+	# Enable v9 instructions for sparc64
+	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="$(echo ${CHOST} | cut -d - -f 1)"
+	fi
+
+	cd "${S}"
+	einfo "Enabling modules: " ${modules}
+
+	# FIXME: We might actually be on *BSD or OS X...
+	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
+			die "configure.pl failed"
+	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
+}
+
+src_test() {
+	chmod -R ugo+rX "${S}"
+	emake check || die "emake check failed"
+	env LD_LIBRARY_PATH="${S}" ./check --validate || die "validation tests failed"
+}
+
+src_install() {
+	make INSTALLROOT="${D}/usr" install || die "make install failed"
+}
diff --git a/dev-libs/botan/files/botan-1.5.11-asm.patch b/dev-libs/botan/files/botan-1.5.11-asm.patch
new file mode 100644
index 000000000000..0a48eb0f3368
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.5.11-asm.patch
@@ -0,0 +1,14 @@
+diff -urNp Botan-1.5.11.org/modules/alg_ia32/asm_macr.h Botan-1.5.11/modules/alg_ia32/asm_macr.h
+--- Botan-1.5.11.org/modules/alg_ia32/asm_macr.h	2006-09-10 08:59:20.000000000 +0300
++++ Botan-1.5.11/modules/alg_ia32/asm_macr.h	2006-10-24 21:14:15.000000000 +0200
+@@ -6,6 +6,10 @@
+ #ifndef BOTAN_EXT_ASM_MACROS_H__
+ #define BOTAN_EXT_ASM_MACROS_H__
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
++
+ /*************************************************
+ * General/Global Macros                          *
+ *************************************************/
diff --git a/dev-libs/botan/files/digest-botan-1.5.11 b/dev-libs/botan/files/digest-botan-1.5.11
new file mode 100644
index 000000000000..41a922e3ffb9
--- /dev/null
+++ b/dev-libs/botan/files/digest-botan-1.5.11
@@ -0,0 +1,3 @@
+MD5 6fc71b20d30dedd93b0c19a74b2ae0c2 Botan-1.5.11.tgz 1373484
+RMD160 6a080d69eb53d8a7c0c3c70848401e397e0ce8b3 Botan-1.5.11.tgz 1373484
+SHA256 efff1ad12e22bdbf69f007a58b49a273a548c4bf0b83cac0a92f6d332c8f43e5 Botan-1.5.11.tgz 1373484