Stilly error by me in bug #81905

(Portage version: 2.0.51.16)

7 files changed, 14 insertions, 339 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index e5be5f654530..4d910d6705d7 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.27 2005/01/26 08:56:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.28 2005/02/15 08:59:59 dragonheart Exp $
+
+  15 Feb 2005; Daniel Black <dragonheart@gentoo.org> -files/bcrypt,
+  -files/bcrypt2, -files/bestcrypt-1.5_p7-makefile_fix.patch,
+  bestcrypt-1.5_p10.ebuild, -bestcrypt-1.5_p7.ebuild:
+  Stilly error by me in bug #81905. Fixed to include devfsd correctly. Removed
+  old version and added devfsd restart in pkg_postinst. Thanks to Craig
+  <craig@haquarter.de>
 
   26 Jan 2005; Daniel Black <dragonheart@gentoo.org>
   -files/bestcrypt-1.5_p9-makefile_fix.patch, files/bestcrypt.devfs,
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
index 4de7f5f3df17..4d43ee434369 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild,v 1.2 2005/01/26 08:56:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild,v 1.3 2005/02/15 08:59:59 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -82,7 +82,7 @@ src_install() {
 	dodoc README LICENSE HIDDEN_PART
 
 	insinto /etc/devfs.d
-	doins files/bestcrypt.devfs
+	doins ${FILESDIR}/bestcrypt.devfs
 }
 
 
@@ -97,4 +97,8 @@ pkg_postinst() {
 	einfo
 	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
 	ewarn "http://www.jetico.com/"
+
+	if [ -e "${ROOT}/dev/.devfsd" ]; then
+		killall -HUP devfsd
+	fi
 }
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild
deleted file mode 100644
index 4710ad33eda3..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 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.3 2005/01/03 04:33:12 dragonheart Exp $
-
-inherit flag-o-matic eutils check-kernel
-
-MY_PN="bcrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="mirror://gentoo/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/bcrypt b/app-crypt/bestcrypt/files/bcrypt
deleted file mode 100644
index cba4eb8dcc51..000000000000
--- a/app-crypt/bestcrypt/files/bcrypt
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/sbin/runscript
-#
-# bestcrypt         Encrypted File Systems.
-#
-# Version:      1.2
-#
-# Revision:  $Id: bcrypt,v 1.2 2003/10/27 11:01:24 aliz Exp $
-#
-# Author:       Jetico Inc. (support@jetico.com)
-#
-# Modified by Stefan Tittel (with thanks to steveb) to work around
-# the "xargs: environment too large for exec"-error occuring in
-# the gentoo 1.4 linux distribution.
-
-# chkconfig: 2345 85 98
-# description: BestCrypt init script
-
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-# See how we were called.
-
-KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
-
-start() {
-	ebegin "Initializing BestCrypt"
-	declare -i status=0
-	rm -rf /dev/bcrypt?* 2>/dev/null
-        if [ $KERNEL_VERSION = "2.2" ]; then
-         mknod -m 666 /dev/bcrypt0 b 7 128
-         mknod -m 666 /dev/bcrypt1 b 7 129
-         mknod -m 666 /dev/bcrypt2 b 7 130
-         mknod -m 666 /dev/bcrypt3 b 7 131
-         mknod -m 666 /dev/bcrypt4 b 7 132
-         mknod -m 666 /dev/bcrypt5 b 7 133
-         mknod -m 666 /dev/bcrypt6 b 7 134
-         mknod -m 666 /dev/bcrypt7 b 7 135
-         mknod -m 666 /dev/bcrypt8 b 7 136
-         mknod -m 666 /dev/bcrypt9 b 7 137
-         mknod -m 666 /dev/bcrypt10 b 7 138
-         mknod -m 666 /dev/bcrypt11 b 7 139
-         mknod -m 666 /dev/bcrypt12 b 7 140
-         mknod -m 666 /dev/bcrypt13 b 7 141
-         mknod -m 666 /dev/bcrypt14 b 7 142
-         mknod -m 666 /dev/bcrypt15 b 7 143
-        else
-	  if [ ! -c /dev/.devfsd ]
-	  then
-            mknod -m 666 /dev/bcrypt0 b 188 0
-            mknod -m 666 /dev/bcrypt1 b 188 1
-            mknod -m 666 /dev/bcrypt2 b 188 2
-            mknod -m 666 /dev/bcrypt3 b 188 3
-            mknod -m 666 /dev/bcrypt4 b 188 4
-            mknod -m 666 /dev/bcrypt5 b 188 5
-            mknod -m 666 /dev/bcrypt6 b 188 6
-            mknod -m 666 /dev/bcrypt7 b 188 7
-            mknod -m 666 /dev/bcrypt8 b 188 8
-            mknod -m 666 /dev/bcrypt9 b 188 9
-            mknod -m 666 /dev/bcrypt10 b 188 10
-            mknod -m 666 /dev/bcrypt11 b 188 11
-            mknod -m 666 /dev/bcrypt12 b 188 12
-            mknod -m 666 /dev/bcrypt13 b 188 13
-            mknod -m 666 /dev/bcrypt14 b 188 14
-            mknod -m 666 /dev/bcrypt15 b 188 15
-          fi
-	fi
-	insmod bc -qs || status=1
-	insmod bc_blowfish -qs || status=1
-	insmod bc_des -qs || status=1
-	insmod bc_gost -qs || status=1
-	insmod bc_twofish -qs || status=1
-	insmod bc_bf448 -qs || status=1
-	insmod bc_bf128 -qs || status=1
-	insmod bc_3des -qs || status=1
-	insmod bc_idea -qs || status=1
-	insmod bc_rijn -qs || status=1
-	insmod bc_cast -qs || status=1
-	eend ${status}
-}
-
-stop() {
-	ebegin "Unmounting encrypted filesystems"
-
-# The original line causing the "xargs: environment too large for exec error".	
-	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
-
-# The line for which it work's fine now.
-	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
-
-	eend $?
-	ebegin "Shutting down BestCrypt modules"
-	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
-		rmmod $i
-	done
-	rm -f /dev/bcrypt?* 2>/dev/null
-	rmmod bc
-	eend $?
-}
diff --git a/app-crypt/bestcrypt/files/bcrypt2 b/app-crypt/bestcrypt/files/bcrypt2
deleted file mode 100644
index d4a38cdadf6e..000000000000
--- a/app-crypt/bestcrypt/files/bcrypt2
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/sbin/runscript
-#
-# bestcrypt         Encrypted File Systems.
-#
-# Version:      1.2
-#
-# Revision:  $Id: bcrypt2,v 1.1 2004/01/18 18:52:09 lostlogic Exp $
-#
-# Author:       Jetico Inc. (support@jetico.com)
-#
-# Modified by Stefan Tittel (with thanks to steveb) to work around
-# the "xargs: environment too large for exec"-error occuring in
-# the gentoo 1.4 linux distribution.
-
-# chkconfig: 2345 85 98
-# description: BestCrypt init script
-
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-# See how we were called.
-
-KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
-
-start() {
-	ebegin "Initializing BestCrypt"
-	declare -i status=0
-	rm -rf /dev/bcrypt?* 2>/dev/null
-        if [ $KERNEL_VERSION = "2.2" ]; then
-         mknod -m 666 /dev/bcrypt0 b 7 128
-         mknod -m 666 /dev/bcrypt1 b 7 129
-         mknod -m 666 /dev/bcrypt2 b 7 130
-         mknod -m 666 /dev/bcrypt3 b 7 131
-         mknod -m 666 /dev/bcrypt4 b 7 132
-         mknod -m 666 /dev/bcrypt5 b 7 133
-         mknod -m 666 /dev/bcrypt6 b 7 134
-         mknod -m 666 /dev/bcrypt7 b 7 135
-         mknod -m 666 /dev/bcrypt8 b 7 136
-         mknod -m 666 /dev/bcrypt9 b 7 137
-         mknod -m 666 /dev/bcrypt10 b 7 138
-         mknod -m 666 /dev/bcrypt11 b 7 139
-         mknod -m 666 /dev/bcrypt12 b 7 140
-         mknod -m 666 /dev/bcrypt13 b 7 141
-         mknod -m 666 /dev/bcrypt14 b 7 142
-         mknod -m 666 /dev/bcrypt15 b 7 143
-        else
-	  if [ ! -c /dev/.devfsd ]
-	  then
-            mknod -m 666 /dev/bcrypt0 b 188 0
-            mknod -m 666 /dev/bcrypt1 b 188 1
-            mknod -m 666 /dev/bcrypt2 b 188 2
-            mknod -m 666 /dev/bcrypt3 b 188 3
-            mknod -m 666 /dev/bcrypt4 b 188 4
-            mknod -m 666 /dev/bcrypt5 b 188 5
-            mknod -m 666 /dev/bcrypt6 b 188 6
-            mknod -m 666 /dev/bcrypt7 b 188 7
-            mknod -m 666 /dev/bcrypt8 b 188 8
-            mknod -m 666 /dev/bcrypt9 b 188 9
-            mknod -m 666 /dev/bcrypt10 b 188 10
-            mknod -m 666 /dev/bcrypt11 b 188 11
-            mknod -m 666 /dev/bcrypt12 b 188 12
-            mknod -m 666 /dev/bcrypt13 b 188 13
-            mknod -m 666 /dev/bcrypt14 b 188 14
-            mknod -m 666 /dev/bcrypt15 b 188 15
-          fi
-	fi
-	modprobe bc || status=1
-	modprobe bc_blowfish || status=1
-	modprobe bc_des || status=1
-	modprobe bc_gost || status=1
-	modprobe bc_twofish || status=1
-	modprobe bc_bf448 || status=1
-	modprobe bc_bf128 || status=1
-	modprobe bc_3des || status=1
-	modprobe bc_idea || status=1
-	modprobe bc_rijn || status=1
-	modprobe bc_cast || status=1
-	eend ${status}
-}
-
-stop() {
-	ebegin "Unmounting encrypted filesystems"
-
-# The original line causing the "xargs: environment too large for exec error".	
-	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
-
-# The line for which it work's fine now.
-	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
-
-	eend $?
-	ebegin "Shutting down BestCrypt modules"
-	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
-		rmmod $i
-	done
-	rm -f /dev/bcrypt?* 2>/dev/null
-	rmmod bc
-	eend $?
-}
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
deleted file mode 100644
index 1751357356ce..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p7-makefile_fix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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
deleted file mode 100644
index 5070c5f64b07..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7883533e8d62c598e66a86f1eb8feb8f BestCrypt-1.5-7.tar.gz 168103