Versin bump, closing #42125 and other fixes.

6 files changed, 155 insertions, 5 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 673245a15525..e8ea78ced63b 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.11 2004/03/27 08:35:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.12 2004/03/27 15:11:20 aliz Exp $
+
+*bestcrypt-1.5_p2 (27 Mar 2004)
+
+  27 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> bestcrypt-1.5_p2.ebuild:
+  Fix detection of kernel dir, closing #42125. Also add patch for missing
+  BDEV_FILE in newer 2.6 kernels and new Makefile patch.
 
   27 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   bestcrypt-1.2_p6.ebuild, bestcrypt-1.4_p2.ebuild, bestcrypt-1.5_p1.ebuild:
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index e62e71837bb1..d957c190001d 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,9 +1,13 @@
-MD5 9d255fb9c7a6f3194196ba8c0a0c5050 ChangeLog 2013
-MD5 4e17a425aed5ecdc6f79526eb55073d4 bestcrypt-1.4_p2.ebuild 1518
 MD5 58e3e7b9a4186c67728fb4dc883161af bestcrypt-1.2_p6.ebuild 1541
+MD5 4e17a425aed5ecdc6f79526eb55073d4 bestcrypt-1.4_p2.ebuild 1518
 MD5 039843df5f3a3da7c2130907fd21b164 bestcrypt-1.5_p1.ebuild 1667
+MD5 8bdd980603e950902f138d990f558db4 ChangeLog 2246
+MD5 cb8697a364188936a6c43a83fe1de4b5 bestcrypt-1.5_p2.ebuild 1647
+MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p2-makefile_fix.patch 2047
 MD5 c5fbab81816aa1d6f319f8434d2db2b2 files/bcrypt 3113
-MD5 5b4b4d2cf3a069dcc49e6803af149665 files/bcrypt2 3097
-MD5 9c378965942830e2966d15c1c0d0816b files/digest-bestcrypt-1.4_p2 67
 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 423393c6218fc246347ba804c6d12093 files/digest-bestcrypt-1.5_p2 67
+MD5 9e28557b9e0d6e148ba9da712b789909 files/bestcrypt-1.5_p2-bdev_file_fix.patch 365
+MD5 5b4b4d2cf3a069dcc49e6803af149665 files/bcrypt2 3097
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild
new file mode 100644
index 000000000000..8be436e78727
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild,v 1.1 2004/03/27 15:11:20 aliz 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"
+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
+
+	get_KV_info
+	if [ "${KV_major}" == "2" -a "${KV_minor}" == "6" -a "${KV_micro}" -ge "4" ]; then
+		epatch ${FILESDIR}/${P}-bdev_file_fix.patch
+	fi
+}
+
+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_p2-bdev_file_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-bdev_file_fix.patch
new file mode 100644
index 000000000000..a4af5a3c83b8
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-bdev_file_fix.patch
@@ -0,0 +1,11 @@
+--- mod/bc_dev26.c	2004-03-27 14:46:16.163050206 +0000
++++ mod/bc_dev26.c	2004-03-27 15:02:29.696906457 +0000
+@@ -634,7 +634,7 @@
+ 	}
+ 
+ 	if (S_ISBLK(bc->bc_dentry->d_inode->i_mode))
+-		blkdev_put(bc->bc_dentry->d_inode->i_bdev, BDEV_FILE);
++		blkdev_put(bc->bc_dentry->d_inode->i_bdev);
+ 
+ 	if (!bc->bc_flags.readonly)
+ 		put_write_access(bc->bc_dentry->d_inode);
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch
new file mode 100644
index 000000000000..9868634c3930
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch
@@ -0,0 +1,65 @@
+--- mod/Makefile	2004-02-10 10:32:19.000000000 +0000
++++ mod/Makefile	2004-03-27 13:40:22.811483270 +0000
+@@ -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
+ KEXT = ko
+@@ -92,13 +93,7 @@
+ 
+ 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), i386)
+-CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
+-# -Wall
+-endif
++CFLAGS += $(EXTRA_CFLAGS)
+ 
+ LDFLAGS = -d -r
+ 
+--- src/Makefile	2004-03-27 14:02:53.281310545 +0000
++++ src/Makefile	2004-03-27 14:03:09.227381640 +0000
+@@ -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	2004-03-27 14:04:43.074259248 +0000
++++ kgsha/Makefile	2004-03-27 14:05:03.033341700 +0000
+@@ -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_p2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2
new file mode 100644
index 000000000000..cc9a75ca7fa9
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2
@@ -0,0 +1 @@
+MD5 98b5197997e15157fc3e409c53e6a45e BestCrypt-1.5-2.tar.gz 166302