Bump, and moving this directly to stable as it is just bug fixes from 1.5_p6 both in the gentoo version and the upstream.

5 files changed, 156 insertions, 19 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 6329ca200993..6902d273ad9d 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.18 2004/09/11 12:49:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.19 2004/10/07 17:11:23 lostlogic Exp $
+
+*bestcrypt-1.5_p7 (07 Oct 2004)
+
+  07 Oct 2004; Brandon Low <lostlogic@gentoo.org> +bestcrypt-1.5_p7.ebuild:
+  Bump, and moving this directly to stable as it is just bug fixes from 1.5_p6
+  both in the gentoo version and the upstream.
 
   11 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml:
   crypto herd to maintain
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 0bf1dc760e58..8db0c07a6695 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,30 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 33ece9eedfb87d2a0319f635f30c1158 ChangeLog 2913
 MD5 84d875011ca557b0ef037f38047bf330 bestcrypt-1.2_p6.ebuild 1539
 MD5 d420cae4702001db3c9d401bba45f917 bestcrypt-1.4_p2.ebuild 1516
+MD5 458b118ea3f626f7f6a245efa5366215 bestcrypt-1.5_p6.ebuild 1500
 MD5 ebdf18b78fd87efd486d7880203fb8ec bestcrypt-1.5_p1.ebuild 1665
+MD5 d5eb4d76e4ccea13d1ddc2f84326dc29 bestcrypt-1.5_p5.ebuild 1501
+MD5 33ece9eedfb87d2a0319f635f30c1158 ChangeLog 2913
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
+MD5 458b118ea3f626f7f6a245efa5366215 bestcrypt-1.5_p7.ebuild 1500
 MD5 40c01633137047f428dcc798ecdcf0fb bestcrypt-1.5_p2.ebuild 1650
-MD5 d5eb4d76e4ccea13d1ddc2f84326dc29 bestcrypt-1.5_p5.ebuild 1501
-MD5 458b118ea3f626f7f6a245efa5366215 bestcrypt-1.5_p6.ebuild 1500
+MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p2-makefile_fix.patch 2047
 MD5 c5fbab81816aa1d6f319f8434d2db2b2 files/bcrypt 3113
-MD5 5b4b4d2cf3a069dcc49e6803af149665 files/bcrypt2 3097
 MD5 b0b2c330ce5e18ccd0ad06aa6aff62a3 files/digest-bestcrypt-1.2_p6 67
 MD5 9c378965942830e2966d15c1c0d0816b files/digest-bestcrypt-1.4_p2 67
 MD5 73a8ba802e25017bcceb177c6b8f4105 files/digest-bestcrypt-1.5_p1 67
-MD5 9e28557b9e0d6e148ba9da712b789909 files/bestcrypt-1.5_p2-bdev_file_fix.patch 365
-MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p2-makefile_fix.patch 2047
 MD5 423393c6218fc246347ba804c6d12093 files/digest-bestcrypt-1.5_p2 67
-MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p5-makefile_fix.patch 2047
-MD5 c77a72f4f64ecd2ff3f754543ca23aad files/bestcrypt-1.5_p6-makefile_fix.patch 2286
 MD5 4db01d5af606b757325ba05826a8ebfa files/digest-bestcrypt-1.5_p5 67
 MD5 5d4026b2dc6da6c144fdf10f11d9a92c files/digest-bestcrypt-1.5_p6 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBQvUgmdTrptrqvGERArYqAJ40OPRYbfeOoTwuo/RMz6IsG923BQCfXPQZ
-8Gk/PLBy+YWzG+6kZKhIg1c=
-=+nKb
------END PGP SIGNATURE-----
+MD5 362ade933d7aab0a81b18a9e08d1e24f files/digest-bestcrypt-1.5_p7 67
+MD5 9e28557b9e0d6e148ba9da712b789909 files/bestcrypt-1.5_p2-bdev_file_fix.patch 365
+MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p5-makefile_fix.patch 2047
+MD5 c77a72f4f64ecd2ff3f754543ca23aad files/bestcrypt-1.5_p6-makefile_fix.patch 2286
+MD5 5b4b4d2cf3a069dcc49e6803af149665 files/bcrypt2 3097
+MD5 77255c4aaf4bc9639ec3d6df4649de76 files/bestcrypt-1.5_p7-makefile_fix.patch 2663
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild
new file mode 100644
index 000000000000..ea8309e4042f
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild,v 1.1 2004/10/07 17:11:23 lostlogic Exp $
+
+inherit flag-o-matic eutils check-kernel
+
+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"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="x86 ~amd64"
+
+DEPEND="virtual/linux-sources"
+
+S=${WORKDIR}/bcrypt
+
+pkg_setup() {
+	if [ -e /usr/src/linux/include/linux/modsetver.h ] &&
+	   [ ! -e /usr/src/linux/include/linux/modversions.h ]; then
+		einfo "Setting modsetver->modversions symlink"
+		ln -s /usr/src/linux/include/linux/modsetver.h \
+		      /usr/src/linux/include/linux/modversions.h
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-makefile_fix.patch
+}
+
+src_compile() {
+	filter-flags -fforce-addr
+
+	emake -j1 EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" || die
+}
+
+src_install() {
+	exeinto /etc/rc.d/init.d
+	doexe ${FILESDIR}/bcrypt
+	dodir \
+		/usr/bin \
+		/etc/init.d \
+		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
+		/etc/rc{0,1,2,3,4,5,6}.d \
+		/usr/share/man/man8 \
+		/lib/modules/${KV}/kernel/drivers/block
+	einstall MAN_PATH="/usr/share/man" \
+		 root="${D}" \
+		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bcrypt2 bcrypt
+	rm -rf ${D}/etc/rc*.d
+	dodoc README LICENSE
+}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.5_p7-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p7-makefile_fix.patch
new file mode 100644
index 000000000000..1751357356ce
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p7-makefile_fix.patch
@@ -0,0 +1,77 @@
+--- modules	2004-07-07 20:49:59.000000000 +0200
++++ modules	2004-07-07 20:53:58.000000000 +0200
+@@ -1,7 +1,7 @@
+ 
+ # $Id: bestcrypt-1.5_p7-makefile_fix.patch,v 1.1 2004/10/07 17:11:23 lostlogic Exp $
+ 
+-KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
++KERNEL_VERSION=`readlink /usr/src/linux|sed -e "s:.*linux-\([0-9]\+\.[0-9]\+\)\..*:\1:"`
+ KEXT=o
+ if [ $KERNEL_VERSION = "2.6" ]; then
+     KEXT=ko ; 
+--- mod/Makefile.org	2004-07-07 20:49:59.000000000 +0200
++++ mod/Makefile	2004-07-07 20:53:58.000000000 +0200
+@@ -42,7 +42,8 @@
+ 
+ CFLAGS = -c -D__KERNEL__ -DMODULE 
+ 
+-KVER = $(shell uname -r | sed 's/\(.\..\).*/\1/')
++KVER = $(shell readlink /usr/src/linux|sed -e "s:.*linux-\([0-9]\+\.[0-9]\+\)\..*:\1:")
++KNAME = $(shell readlink /usr/src/linux|sed "s:linux-::")
+ 
+ OBJS = bc_dev22.o
+ KEXT = o
+@@ -66,7 +67,7 @@
+ #	Linux 2.4.x 
+ #######################################################################
+ ifeq ($(KVER), 2.4)
+-KERNEL_DIR = /lib/modules/$(shell uname -r)/build
++KERNEL_DIR = /lib/modules/$(KNAME)/build
+ OBJS = bc_dev24.o
+ SYMSRC = bc_dev24.c
+ CFLAGS += $(shell $(CC) -I$(KERNEL_DIR)/include/ -c test_nice.c -o /dev/null 2>/dev/null && echo "-D_NICE_PRESENT_")
+@@ -84,7 +85,7 @@
+ #	Linux 2.6.x 
+ #######################################################################
+ ifeq ($(KVER), 2.6)
+-KERNEL_TMP = /lib/modules/$(shell uname -r)
++KERNEL_TMP = /lib/modules/$(KNAME)
+ ifeq ($(shell [ -e $(KERNEL_TMP)/source ] && echo "123"), 123)
+ KERNEL_DIR=$(KERNEL_TMP)/source
+ else
+@@ -95,14 +96,6 @@
+ 
+ CFLAGS += -I$(CUR_DIR)/../include/ -I$(KERNEL_DIR)/include/
+ 
+-ifeq ($(ARCH), alpha)
+-CFLAGS += -O2 -pipe -fno-strict-aliasing -fno-common -mno-fp-regs -ffixed-8 -mcpu=ev5
+-else
+-ifeq ($(ARCH), x86_64)
+-CFLAGS += -O2 -fno-strength-reduce -fno-strict-aliasing -mcmodel=kernel
+-else
+-CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
+-endif
+-endif
++CFLAGS += $(EXTRA_CFLAGS)
+ 
+ LDFLAGS = -d -r
+--- src/Makefile.org	2004-07-07 20:54:07.000000000 +0200
++++ src/Makefile	2004-07-07 20:54:24.000000000 +0200
+@@ -24,6 +24,7 @@
+ CFLAGS += -L../lib -I../include/ 
+ CFLAGS += -Wall -O2 -fno-strict-aliasing
+ #CFLAGS += -g -static -O6
++CFLAGS += $(EXTRA_CFLAGS)
+ LDFLAGS =
+ 
+ TARGETS = bctool
+--- kgsha/Makefile.org	2004-07-07 20:54:34.000000000 +0200
++++ kgsha/Makefile	2004-07-07 20:54:50.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include -g 
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha.a
+ HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7
new file mode 100644
index 000000000000..5070c5f64b07
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7
@@ -0,0 +1 @@
+MD5 7883533e8d62c598e66a86f1eb8feb8f BestCrypt-1.5-7.tar.gz 168103