Version bump, closes bug#149483. Upstream merged all our patches, so we don't need them anymore.

Package-Manager: portage-2.1.1

3 files changed, 12 insertions, 143 deletions

diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 58144db56199..76034a232509 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bcrypt3 3246 RMD160 2049cdd2934451843a2c72d4337e359ef3928f2f SHA1 04433a0504b3ec85b083a531acb09e3a608b22e6 SHA256 83296e7fb84845ee0a177b9bc2d88caddb66440b38c3505fc91061873b2a45b3
 MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
 RMD160 2049cdd2934451843a2c72d4337e359ef3928f2f files/bcrypt3 3246
@@ -22,21 +19,21 @@ MD5 7363de908c43373f6ccfc37fcc32989a files/bestcrypt-1.6_p5-makefile_fix.patch 2
 RMD160 f6bbdc9dc392fc2ca784ce3b6fafa05fe94b31d1 files/bestcrypt-1.6_p5-makefile_fix.patch 2229
 SHA256 f73b2e78dea62960aec05c5cd6bfaaf830aaf36f4a21d257fed48d26c7995b7b files/bestcrypt-1.6_p5-makefile_fix.patch 2229
 DIST BestCrypt-1.6-5.tar.gz 194939 RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 SHA1 527cc86e82b65326f6b9fa37ce44ced970b19ae8 SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd
-DIST BestCrypt-1.6-7.tar.gz 195093 RMD160 b1e3e2e243481966cc74a0da03e725cf61797e53 SHA1 3a585e5c533356fbdb0a41714568346ff4e6dae2 SHA256 a031dc9c5783a18ecb6dcb4e1557b2f4c9893961cd07b040b4db070d88bf6777
+DIST BestCrypt-1.6-8.tar.gz 195314 RMD160 f5451d7ba238199a3602136383e04654acda9c1f SHA1 0bd828846fb025e04fb11af456708cd90e3a3e22 SHA256 2229a0caf1a806052b505edd0a33882119e9981e07468c3b71a743db9c453073
 DIST bcrypt-rc6-serpent-c.diff.gz 6034 RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 SHA1 ed23242a81d7681b887951be67019a24780c978a SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5
 DIST bcrypt-rc6-serpent.diff.gz 5718 RMD160 f388894ea0f3d1055dffaf118083baefa5822000 SHA1 f82278c22678e7dedb74bf6bbc202702fbe3f988 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8
 EBUILD bestcrypt-1.6_p5.ebuild 3316 RMD160 bc53ee8324320e613240b973bd5cceb6f3550f6f SHA1 5d29aa5f023c62c330b02b5503c9c7cdd2bc16c7 SHA256 24746d9c907025a894c0022b1421520a8b5865a9342ebe6082464f74a96175a9
 MD5 5f5313cdc84728a105e89d475e01b2f5 bestcrypt-1.6_p5.ebuild 3316
 RMD160 bc53ee8324320e613240b973bd5cceb6f3550f6f bestcrypt-1.6_p5.ebuild 3316
 SHA256 24746d9c907025a894c0022b1421520a8b5865a9342ebe6082464f74a96175a9 bestcrypt-1.6_p5.ebuild 3316
-EBUILD bestcrypt-1.6_p7.ebuild 3348 RMD160 54c835262156d10b9fd3aab3372649c86cdb95f0 SHA1 3e5b17f5b870175748390bb085754f79d8e425d4 SHA256 6643560f6a11250ff4b365d4e84ae0fbdfbc5b0e0d4c268adc8b56a6304e7502
-MD5 846471915722799376d55c555385653b bestcrypt-1.6_p7.ebuild 3348
-RMD160 54c835262156d10b9fd3aab3372649c86cdb95f0 bestcrypt-1.6_p7.ebuild 3348
-SHA256 6643560f6a11250ff4b365d4e84ae0fbdfbc5b0e0d4c268adc8b56a6304e7502 bestcrypt-1.6_p7.ebuild 3348
-MISC ChangeLog 9830 RMD160 0a9e93f82b6bda08406ad1991efb6ff450042173 SHA1 5732c220f863d6c8089bf2bf675c7dcd9cb63176 SHA256 f4f141df549df83239b32ebcc273c27ee04905aadbc015540114b054f93c3490
-MD5 9efa14f0d1c2bc105e626cf73e01f26f ChangeLog 9830
-RMD160 0a9e93f82b6bda08406ad1991efb6ff450042173 ChangeLog 9830
-SHA256 f4f141df549df83239b32ebcc273c27ee04905aadbc015540114b054f93c3490 ChangeLog 9830
+EBUILD bestcrypt-1.6_p8.ebuild 3205 RMD160 08434ecc17bad3ac88fd98473703b447e3aeaaef SHA1 4d6d3c157d0a60302023fa0159c240255d2b4ec1 SHA256 f23de4c7d8e5d9d5707e831daa6550923dc8a4dff7d7173fe831982886131ddf
+MD5 05f80f56276e043db3bbf0087b793fc7 bestcrypt-1.6_p8.ebuild 3205
+RMD160 08434ecc17bad3ac88fd98473703b447e3aeaaef bestcrypt-1.6_p8.ebuild 3205
+SHA256 f23de4c7d8e5d9d5707e831daa6550923dc8a4dff7d7173fe831982886131ddf bestcrypt-1.6_p8.ebuild 3205
+MISC ChangeLog 10068 RMD160 f42de3b5d4943c49a2610ac3b1f68621206fb066 SHA1 1b266d5db99922ab332469b032e9f09ac73994c4 SHA256 72b12947bac893d13192b46c93783448fb6808df91f0928bab43a6403f95850c
+MD5 3b11fcce0f64f4212e7bdcde5cb89a84 ChangeLog 10068
+RMD160 f42de3b5d4943c49a2610ac3b1f68621206fb066 ChangeLog 10068
+SHA256 72b12947bac893d13192b46c93783448fb6808df91f0928bab43a6403f95850c ChangeLog 10068
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
@@ -44,13 +41,6 @@ SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata
 MD5 dd170d28f62e65e70cd3cf160e0d9861 files/digest-bestcrypt-1.6_p5 759
 RMD160 acebddcb31cb47ea345067db1e487d10f5068496 files/digest-bestcrypt-1.6_p5 759
 SHA256 a3d6af6139630204aa7a115bdb7e889a0d75751948b27461b66f610b6db7d60d files/digest-bestcrypt-1.6_p5 759
-MD5 5df70254bf17acdc5e21034485dfa276 files/digest-bestcrypt-1.6_p7 759
-RMD160 5a78ae8a07477e19e57031191fa7fad5c70b73e0 files/digest-bestcrypt-1.6_p7 759
-SHA256 8784b636073f5f265368efc2ae16741f0ebab7cfbb38e219342bdb557f2670b3 files/digest-bestcrypt-1.6_p7 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNsO0z974XjDVpbkRAlOtAKCPHmSrWNV5oOx6cy3qMfbUyVS7fQCff2N1
-DPvTNi5853iePMeS7edAQ70=
-=DDD8
------END PGP SIGNATURE-----
+MD5 0ffcc4a5226694d116ed631f7435615b files/digest-bestcrypt-1.6_p8 759
+RMD160 aa79eb520f8b62fd232d10584dc1ce70b4284936 files/digest-bestcrypt-1.6_p8 759
+SHA256 349c11996cd4cf8d52d0fc69a088404d9653a87f83a6772d7ee53f6f73f4fbc2 files/digest-bestcrypt-1.6_p8 759
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild
deleted file mode 100644
index 72a9d6809577..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p7.ebuild,v 1.2 2006/10/15 19:07:34 alonbl Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
-
-MY_PN="bcrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/BestCrypt-${PV/_p/-}.tar.gz
-	!x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz )
-	x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE="pcmcia"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/bcrypt"
-
-#get-version
-MODULE_NAMES="bc(block:"${S}"/mod)
-		bc_des(block:"${S}"/mod/des)
-		bc_3des(block:"${S}"/mod/3des)
-		bc_bf128(block:"${S}"/mod/bf128)
-		bc_bf448(block:"${S}"/mod/bf448)
-		bc_blowfish(block:"${S}"/mod/blowfish)
-		bc_cast(block:"${S}"/mod/cast)
-		bc_gost(block:"${S}"/mod/gost)
-		bc_idea(block:"${S}"/mod/idea)
-		bc_rijn(block:"${S}"/mod/rijn)
-		bc_twofish(block:"${S}"/mod/twofish)
-		bc_serpent(block:"${S}"/mod/serpent)
-		bc_rc6(block:"${S}"/mod/rc6)"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-1.6_p5-kernel-quotes.patch
-	epatch "${FILESDIR}"/${PN}-1.6_p5-makefile_fix.patch
-	epatch "${FILESDIR}"/${PN}-1.6_p5-gcc41.patch
-	epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch
-
-	if use x86;
-	then
-		epatch bcrypt-rc6-serpent.diff
-	else
-		epatch bcrypt-rc6-serpent-c.diff
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C kgsha256 CPP="$(tc-getCXX)"  EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
-
-	# Don't put stack protection in the kernel - it just is bad
-	_filter-hardened -fstack-protector-all -fstack-protector
-
-	emake  -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \
-		|| die "compile failed"
-
-	emake  -C mod OBJS="bc_dev${KV_MAJOR}${KV_MINOR}.o bc_mgr.o" \
-		KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
-		AS=$(tc-getAS) CPP=$(tc-getCXX) EXTRA_CFLAGS="${CFLAGS}" || die "compile failed"
-
-	einfo "Modules compiled"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodir /etc
-	cp etc/bc.conf "${D}"/etc/bc.conf
-
-	dobin bin/bctool
-	insinto /usr/bin
-	for link in bcumount bcformat bcfsck bcnew bcpasswd bcinfo \
-		bclink bcunlink bcmake_hidden bcreencrypt;
-	do
-		dosym bctool /usr/bin/${link}
-	done
-
-	# bug 107392
-	insinto /usr/$(get_libdir)
-	doins lib/libkgsha{,256}.so
-
-	doman man/bctool.8
-	newinitd "${FILESDIR}"/bcrypt3 bcrypt
-	dodoc README HIDDEN_PART
-}
-
-
-pkg_postinst() {
-
-	einfo "If you are using the serpent or rc6 encryption modules and have any problems,"
-	einfo "please submit bugs to http://bugs.gentoo.org because these modules are not part"
-	einfo "of the standard distribution of BestCrypt for Linux released by Jetico."
-	einfo "For more information on these additional modules:"
-	einfo "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
-
-	einfo
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p7 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p7
deleted file mode 100644
index d2d4e3c32f6e..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4327929bafe064e0edda2d4c3c23b25e BestCrypt-1.6-7.tar.gz 195093
-RMD160 b1e3e2e243481966cc74a0da03e725cf61797e53 BestCrypt-1.6-7.tar.gz 195093
-SHA256 a031dc9c5783a18ecb6dcb4e1557b2f4c9893961cd07b040b4db070d88bf6777 BestCrypt-1.6-7.tar.gz 195093
-MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
-RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 bcrypt-rc6-serpent-c.diff.gz 6034
-SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5 bcrypt-rc6-serpent-c.diff.gz 6034
-MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718
-RMD160 f388894ea0f3d1055dffaf118083baefa5822000 bcrypt-rc6-serpent.diff.gz 5718
-SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 bcrypt-rc6-serpent.diff.gz 5718