Old version cleanout. Version bump converted to linux-mod eclass. Solves bug #67732

12 files changed, 40 insertions, 213 deletions

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
deleted file mode 100644
index a4af5a3c83b8..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-bdev_file_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 9868634c3930..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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/bestcrypt-1.5_p5-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p5-makefile_fix.patch
deleted file mode 100644
index 9868634c3930..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p5-makefile_fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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/bestcrypt-1.5_p6-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p6-makefile_fix.patch
deleted file mode 100644
index cc0827afa638..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p6-makefile_fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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/bestcrypt-1.5_p9-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p9-makefile_fix.patch
new file mode 100644
index 000000000000..6f1e4f3ef6bc
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p9-makefile_fix.patch
@@ -0,0 +1,38 @@
+--- mod/Makefile.org	2004-07-07 20:49:59.000000000 +0200
++++ mod/Makefile	2004-07-07 20:53:58.000000000 +0200
+@@ -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.2_p6 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.2_p6
deleted file mode 100644
index d1fd9d073219..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.2_p6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93d275cf6d351e9e286dc54316e4c1a2 BestCrypt-1.2-6.tar.gz 160552
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.4_p2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.4_p2
deleted file mode 100644
index a794b3b6ca13..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.4_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f333b05b732579ea2ad0740fb35006c9 BestCrypt-1.4-2.tar.gz 161696
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p1 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p1
deleted file mode 100644
index 754ffb599a27..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e53732960b290e2ebdfd705b428d4fb BestCrypt-1.5-1.tar.gz 166553
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2
deleted file mode 100644
index cc9a75ca7fa9..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98b5197997e15157fc3e409c53e6a45e BestCrypt-1.5-2.tar.gz 166302
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p5 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p5
deleted file mode 100644
index f277395a3224..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6680a7e9683729dfcf416a2ad832b3fc BestCrypt-1.5-5.tar.gz 167957
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6
deleted file mode 100644
index 45562294b188..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5185fd607851e0eacf356381d69ea2d9 BestCrypt-1.5-6.tar.gz 167995
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p9 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p9
new file mode 100644
index 000000000000..86a59f5f9bf3
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p9
@@ -0,0 +1,2 @@
+MD5 d963ef2c9d9196ea128cc39180bf1c71 BestCrypt-1.5-9.tar.gz 169750
+MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718