version bump

Package-Manager: portage-2.1.1_pre2-r6

5 files changed, 198 insertions, 9 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index e3376409f039..b287e958f26f 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.3 2006/06/06 12:05:42 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.4 2006/07/11 11:47:45 dragonheart Exp $
+
+*truecrypt-4.2a (11 Jul 2006)
+
+  11 Jul 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/truecrypt-4.2a-makefile.patch, +truecrypt-4.2a.ebuild:
+  version bump
 
 *truecrypt-4.2-r1 (06 Jun 2006)
 
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index dcab1f4f1340..6d71729bf2f4 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -9,15 +9,24 @@ AUX truecrypt-4.2-nosectorformat.patch 2849 RMD160 b768b33f3a2faf958a96581edb354
 MD5 8b2f309ee8ede7314be4166d7dff9750 files/truecrypt-4.2-nosectorformat.patch 2849
 RMD160 b768b33f3a2faf958a96581edb354e203df59c59 files/truecrypt-4.2-nosectorformat.patch 2849
 SHA256 08ecf0cc0f5a68e4b6761c33448bd0a560b2a66bad48025ef91551e97dca9518 files/truecrypt-4.2-nosectorformat.patch 2849
+AUX truecrypt-4.2a-makefile.patch 1646 RMD160 31343f923d8807bb8eb2482e0a01822b012c9bed SHA1 c9ca37521e0861c3ccc24550f862eacb14bc6242 SHA256 714f9670aff535a4c5b698b87e17006cb1d735312edd2dcbe42c04bee6a2daf2
+MD5 18bc8dafc18102ceb3d725f60d6efa05 files/truecrypt-4.2a-makefile.patch 1646
+RMD160 31343f923d8807bb8eb2482e0a01822b012c9bed files/truecrypt-4.2a-makefile.patch 1646
+SHA256 714f9670aff535a4c5b698b87e17006cb1d735312edd2dcbe42c04bee6a2daf2 files/truecrypt-4.2a-makefile.patch 1646
 DIST truecrypt-4.2-source-code.tar.gz 1076093 RMD160 74ba185bad9952ea9b3b0e358e9fee6f2080e6b9 SHA1 603bac50891c49b051f7a9bcc15b1196168bff2a SHA256 54f54cd68c99efe3fd2c0899174b38d4cfe1ad576112672aabd2ac64e336cd1f
+DIST truecrypt-4.2a-source-code.tar.gz 1088418 RMD160 8d5b142f9cc7de5693b527f8d708d9e1ebd1e2b3 SHA1 915a8771f9a76d06f5071ca07f5fe902a7f26575 SHA256 ba1892584bf52b5a12eef185563705774566a70537d139aef8770477dfe9636f
 EBUILD truecrypt-4.2-r1.ebuild 2915 RMD160 2308c8db56a0e66eeb8db82a0295a61288d02084 SHA1 139016965b2010ae880b0323724e8b1b1e2199a1 SHA256 8b9380f43e727dcc992363c111fd5152c6e951cab99abb7a97d8a7e7ebef6bbb
 MD5 68a91f3966a56b1039da4d94eb160eed truecrypt-4.2-r1.ebuild 2915
 RMD160 2308c8db56a0e66eeb8db82a0295a61288d02084 truecrypt-4.2-r1.ebuild 2915
 SHA256 8b9380f43e727dcc992363c111fd5152c6e951cab99abb7a97d8a7e7ebef6bbb truecrypt-4.2-r1.ebuild 2915
-MISC ChangeLog 865 RMD160 9cef1da05ed7aa519cf97db8de82d5e50b3b77c6 SHA1 7c1a3fa9ff48b8108ba941d297fe8333f07e253c SHA256 9414b02880c55265678d37d059f566fce1e452a2318f6d867f8c6ec97b3ebb01
-MD5 46a4ff82209478c52c7acc93e6074562 ChangeLog 865
-RMD160 9cef1da05ed7aa519cf97db8de82d5e50b3b77c6 ChangeLog 865
-SHA256 9414b02880c55265678d37d059f566fce1e452a2318f6d867f8c6ec97b3ebb01 ChangeLog 865
+EBUILD truecrypt-4.2a.ebuild 2830 RMD160 bafc0f0cdb2af52374972f0b1b947b5f5ba612ab SHA1 e3cf070203b31f98a8f2b6360f4fb8725edcf0ff SHA256 bd2f93127c4a8e6ef88fa7612fad29d2265d5c0e37514174ddefdc5349342ff0
+MD5 c29064bc668e04460b374d4cbe59c918 truecrypt-4.2a.ebuild 2830
+RMD160 bafc0f0cdb2af52374972f0b1b947b5f5ba612ab truecrypt-4.2a.ebuild 2830
+SHA256 bd2f93127c4a8e6ef88fa7612fad29d2265d5c0e37514174ddefdc5349342ff0 truecrypt-4.2a.ebuild 2830
+MISC ChangeLog 1029 RMD160 d5f9cf60236a5a19352c6fe766828bf724726c7f SHA1 f5113ad86965bb67e7d0543327bb1bb099647346 SHA256 26ec2a7b54f50d633c02de63a9f7756ccf862945de4a183f0795e3ef698e6b12
+MD5 3193a23f2a6ca8b5aa3bd0fe7624ce23 ChangeLog 1029
+RMD160 d5f9cf60236a5a19352c6fe766828bf724726c7f ChangeLog 1029
+SHA256 26ec2a7b54f50d633c02de63a9f7756ccf862945de4a183f0795e3ef698e6b12 ChangeLog 1029
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
@@ -25,10 +34,13 @@ SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata
 MD5 f32ba14b3b0c568e21d7dd5c6754851d files/digest-truecrypt-4.2-r1 280
 RMD160 61f26925d2f0d6141f6044018997143bdef215c0 files/digest-truecrypt-4.2-r1 280
 SHA256 200aa4f6243ac5b5f4cff0aa69d85c25b74456555c04e5db2b2e1327d7f0e9a6 files/digest-truecrypt-4.2-r1 280
+MD5 a99bad1b52e32e9cd558e789e2fe1454 files/digest-truecrypt-4.2a 283
+RMD160 1d9b3feac90fb5546a1d6fc89c493bc7e89f41f8 files/digest-truecrypt-4.2a 283
+SHA256 cd3851eb2af9bac302c5f4c005182d63300cf2031178fef1a1aef525b23209f8 files/digest-truecrypt-4.2a 283
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEhXChmdTrptrqvGERAjraAJ0YFbs1FRD6LjXUMZw21pRpJBifzgCeP91W
-ncb2xXOpm1Z+q52pDb94fFk=
-=lJ/h
+iD8DBQFEs5CamdTrptrqvGERAo92AKCDgpaRGFpgx5P35gqs6c+sbd2zcgCgiums
+ZcasRxFYP5VMVgSChn4a3EQ=
+=O3zB
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/files/digest-truecrypt-4.2a b/app-crypt/truecrypt/files/digest-truecrypt-4.2a
new file mode 100644
index 000000000000..6aac1268b685
--- /dev/null
+++ b/app-crypt/truecrypt/files/digest-truecrypt-4.2a
@@ -0,0 +1,3 @@
+MD5 6e60ead403fe23355f61341ccce68ff1 truecrypt-4.2a-source-code.tar.gz 1088418
+RMD160 8d5b142f9cc7de5693b527f8d708d9e1ebd1e2b3 truecrypt-4.2a-source-code.tar.gz 1088418
+SHA256 ba1892584bf52b5a12eef185563705774566a70537d139aef8770477dfe9636f truecrypt-4.2a-source-code.tar.gz 1088418
diff --git a/app-crypt/truecrypt/files/truecrypt-4.2a-makefile.patch b/app-crypt/truecrypt/files/truecrypt-4.2a-makefile.patch
new file mode 100644
index 000000000000..92b458d439df
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-4.2a-makefile.patch
@@ -0,0 +1,65 @@
+--- Linux/Cli/Makefile.orig	2006-06-27 06:18:32.000000000 +1000
++++ Linux/Cli/Makefile	2006-07-11 21:24:07.000000000 +1000
+@@ -9,22 +9,13 @@
+ -include ../Common/.platform
+ endif
+ 
+-ifdef NO_WARNINGS
+-CFLAGS := -w
+-else
+-CFLAGS := -W
+-endif
+ CFLAGS += -I../../Crypto -I../../Common -I../Kernel
+ CFLAGS += -D_cdecl="" -DBOOL=int -DTRUE=1 -DFALSE=0 -DMAX_PATH=260
+ CFLAGS += $(TYPES)
+ 
+-ifndef DEBUG
+ # Do not enable strict aliasing
+-CFLAGS += -O2 -fno-strict-aliasing
+-else
+-CFLAGS += -ggdb
++CFLAGS += -fno-strict-aliasing
+ NO_STRIP := 1
+-endif
+ 
+ KERNEL_OBJS_F := ../.kernel-objs
+ USER_OBJS_F := ../.user-objs
+@@ -60,11 +51,11 @@
+ OBJS += $(TC_COMMON)/Tests.o
+ OBJS += Cli.o 
+ 
+-%.o: %.c
++%.o: %.c $(USER_OBJS_F)
+ 	@echo Compiling $(<F)
+-	@$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MMD -o $@ -c $<
++	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MMD -o $@ -c $<
+ 
+-all: objclean truecrypt
++all: $(USER_OBJS_F) truecrypt
+ 	@echo Done.
+ 
+ ../Common/.platform: ../Common/Platform.c
+@@ -75,7 +66,7 @@
+ 
+ truecrypt: $(OBJS)
+ 	@echo Linking $@
+-	@$(CC) -o $@ $(OBJS)
++	$(CC) -o $@ $(OBJS)
+ ifndef NO_STRIP
+ 	@strip $@
+ endif
+@@ -85,9 +76,11 @@
+ truecrypt.1: objclean truecrypt
+ 	help2man -N -i Man/help2man.inc ./truecrypt >Man/truecrypt.1
+ 	
+-objclean:
+-	@if [ -f $(KERNEL_OBJS_F) ]; then rm -f ${OBJS} $(KERNEL_OBJS_F); fi
++$(USER_OBJS_F):
++	@if [ -f $(KERNEL_OBJS_F) ]; then rm -f $(OBJS) $(KERNEL_OBJS_F); fi
+ 	@>$(USER_OBJS_F)
+ 
+ clean:
+-	-rm -f truecrypt ${OBJS} *.d $(TC_COMMON)/*.d $(TC_CRYPTO)/*.d ../Common/platform ../Common/.platform
++	-rm -f truecrypt $(OBJS) *.d $(TC_COMMON)/*.d $(TC_CRYPTO)/*.d ../Common/platform ../Common/.platform
++
++.PHONY: man clean all
diff --git a/app-crypt/truecrypt/truecrypt-4.2a.ebuild b/app-crypt/truecrypt/truecrypt-4.2a.ebuild
new file mode 100644
index 000000000000..7f022ddd6089
--- /dev/null
+++ b/app-crypt/truecrypt/truecrypt-4.2a.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2a.ebuild,v 1.1 2006/07/11 11:47:45 dragonheart Exp $
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Free open-source disk encryption software"
+HOMEPAGE="http://www.truecrypt.org/"
+SRC_URI="http://www.truecrypt.org/downloads/truecrypt-${PV}-source-code.tar.gz"
+
+LICENSE="truecrypt-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="virtual/linux-sources
+	sys-fs/device-mapper"
+
+RDEPEND="sys-fs/device-mapper"
+
+BUILD_PARAMS="KSRC=${KV_DIR} NO_WARNINGS=1"
+BUILD_TARGETS="truecrypt"
+MODULE_NAMES="truecrypt(block:${S}/Linux/Kernel)"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	dmcrypt_check
+	kernel_is lt 2 6 5 && die 'requires at least 2.6.5 kernel version'
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	linux-mod_pkg_setup
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	linux-mod_src_compile || die "Truecrypt module compilation failed."
+	cd "${S}/Linux/Cli"
+	einfo "Building truecrypt utility"
+	tc-export CC
+	# remove kernel linked crypt stuff
+	emake clean || die "make clean failed"
+	emake truecrypt || die "Compile and/or linking of TrueCrypt Linux CLI application failed."
+}
+
+src_test() {
+	"${S}/Linux/Cli/truecrypt" --test
+}
+
+pkg_preinst() {
+	# unload truecrypt modules if already loaded
+	/sbin/rmmod truecrypt >&- 2>&-
+	if grep -q "^truecrypt" /proc/modules
+	then
+		die "Please dismount all mounted TrueCrypt volumes"
+	fi
+}
+
+src_install() {
+	# installing files
+	dobin Linux/Cli/truecrypt
+	doman Linux/Cli/Man/truecrypt.1
+	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
+
+	# installing kernel module
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	einfo " For TrueCrypt 4.2 to work you have to load a "
+	einfo " kernel module. This can be done in three ways: "
+	einfo
+	einfo " 1. Loading the module automatically by the running kernel. "
+	einfo "    For this 'Automatic kernel module loading' needs to be "
+	einfo "    enabled (CONFIG_KMOD=y). "
+	einfo " 2. Loading the module manually before mounting the volume. "
+	einfo "    Try 'modprobe truecrypt' as root to load the module. "
+	einfo " 3. Load the module during boot by listing it in "
+	einfo "    '/etc/modules.autoload.d/kernel-2.6' "
+}
+
+dmcrypt_check() {
+	ebegin "Checking for Device mapper support (BLK_DEV_DM)"
+	linux_chkconfig_present BLK_DEV_DM
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "TrueCrypt requires Device mapper support!"
+		ewarn "Please enable Device mapper support in your kernel config, found at:"
+		ewarn "(for 2.6 kernels)"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Multi-Device Support"
+		ewarn "      <*> Device mapper support"
+		ewarn
+		ewarn "and recompile your kernel if you want this package to work."
+		epause 10
+	fi
+}
+