Version bumped. Close 56128

5 files changed, 136 insertions, 1 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 246318fc75a4..ffbefd618875 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.16 2004/07/02 21:41:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.17 2004/07/07 16:59:40 mholzer Exp $
+
+*bestcrypt-1.5_p6 (07 Jul 2004)
+
+  07 Jul 2004; Martin Holzer <mholzer@gentoo.org>
+  +files/bestcrypt-1.5_p6-makefile_fix.patch, +bestcrypt-1.5_p6.ebuild:
+  Version bumped. Close 56128
 
 *bestcrypt-1.5_p5 (03 Jul 2004)
 
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 007efe685f2c..7394d83e1806 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,4 +1,5 @@
 MD5 d420cae4702001db3c9d401bba45f917 bestcrypt-1.4_p2.ebuild 1516
+MD5 d5eb4d76e4ccea13d1ddc2f84326dc29 bestcrypt-1.5_p6.ebuild 1501
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 84d875011ca557b0ef037f38047bf330 bestcrypt-1.2_p6.ebuild 1539
 MD5 ebdf18b78fd87efd486d7880203fb8ec bestcrypt-1.5_p1.ebuild 1665
@@ -8,6 +9,7 @@ MD5 d5eb4d76e4ccea13d1ddc2f84326dc29 bestcrypt-1.5_p5.ebuild 1501
 MD5 423393c6218fc246347ba804c6d12093 files/digest-bestcrypt-1.5_p2 67
 MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p5-makefile_fix.patch 2047
 MD5 c5fbab81816aa1d6f319f8434d2db2b2 files/bcrypt 3113
+MD5 5d4026b2dc6da6c144fdf10f11d9a92c files/digest-bestcrypt-1.5_p6 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 9c378965942830e2966d15c1c0d0816b files/digest-bestcrypt-1.4_p2 67
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p6.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p6.ebuild
new file mode 100644
index 000000000000..d3f1b682eff0
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p6.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_p6.ebuild,v 1.1 2004/07/07 16:59:40 mholzer 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"
+
+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_p6-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p6-makefile_fix.patch
new file mode 100644
index 000000000000..cc0827afa638
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p6-makefile_fix.patch
@@ -0,0 +1,66 @@
+--- 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_DIR = /lib/modules/$(shell uname -r)/build
++KERNEL_DIR = /lib/modules/$(KNAME)/build
+ OBJS = bc_dev26.o
+ CFLAGS += -I$(KERNEL_DIR)/include/asm/mach-default/ -DKBUILD_BASENAME=BestCrypt
+ CFLAGS += $(shell $(CC) -I$(KERNEL_DIR)/include/ -I$(KERNEL_DIR)/include/asm/mach-default/ -c test_blkdev_put.c -o /dev/null 2>/dev/null && echo "-D_BLKDEV_2_")
+@@ -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_p6 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6
new file mode 100644
index 000000000000..45562294b188
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6
@@ -0,0 +1 @@
+MD5 5185fd607851e0eacf356381d69ea2d9 BestCrypt-1.5-6.tar.gz 167995