#49770: version bump

(Portage version: 2.1_pre5-r4)

5 files changed, 119 insertions, 15 deletions

diff --git a/app-misc/secure-delete/ChangeLog b/app-misc/secure-delete/ChangeLog
index a5f317e35421..b7a2dd95b688 100644
--- a/app-misc/secure-delete/ChangeLog
+++ b/app-misc/secure-delete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/secure-delete
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/ChangeLog,v 1.17 2006/02/08 21:02:12 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/ChangeLog,v 1.18 2006/03/08 20:20:33 smithj Exp $
+
+*secure-delete-3.1 (08 Mar 2006)
+
+  08 Mar 2006; <smithj@gentoo.org> +secure-delete-3.1.ebuild:
+  #49770: version bump
 
   25 Nov 2005; Tom Gall <tgall@gentoo.org> secure-delete-3.0.ebuild:
   stable on ppc64
diff --git a/app-misc/secure-delete/Manifest b/app-misc/secure-delete/Manifest
index b8b431ee7e8c..e5519e27630f 100644
--- a/app-misc/secure-delete/Manifest
+++ b/app-misc/secure-delete/Manifest
@@ -1,22 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bdc98cef20fb5f4023fdc6aa3aa190ab ChangeLog 2083
-RMD160 bb6e89ec706796c554f6d156495e62052308f4f1 ChangeLog 2083
-SHA256 681ff0a6a6aa35c1eb1c0ce081fcd5836ad2ab69ec1644ecd5c617f7cb7dbf21 ChangeLog 2083
+MD5 04ea7eadcf405760ec94cf989f12db0a ChangeLog 2203
+RMD160 ff9f1dc782e8374c43cebbc9400dbfe499ebed49 ChangeLog 2203
+SHA256 92c6c341fa06ed7cffa941fafcfe2911812dcdf4352651ed96b55778b58b3f53 ChangeLog 2203
 MD5 1bee983c8785c87d868a02f06c49e29d files/digest-secure-delete-3.0 68
 RMD160 3af9566f9d5e506d0e6ac1857e68090ed660103a files/digest-secure-delete-3.0 68
 SHA256 0976979230089c353816e8d963a625b5ffe8ca29ceef4ad4f84dc11824602859 files/digest-secure-delete-3.0 68
+MD5 1746ba70c22589308d722045eb7a860d files/digest-secure-delete-3.1 250
+RMD160 523600cb5d99a0617b1f8b83f9643325741fc7bf files/digest-secure-delete-3.1 250
+SHA256 6caed62262c9b612927d8a44765bebb9209a049a2581e6ccfc6099452fdb7109 files/digest-secure-delete-3.1 250
+MD5 d5cbbeea26872849071fbb0f2a6d2c4a files/secure-delete-3.1-do-not-use-the-kernel-module.patch 1493
+RMD160 3a33fdf3361768d5c6af93def4bd50b9a53c08e3 files/secure-delete-3.1-do-not-use-the-kernel-module.patch 1493
+SHA256 76e2987c590f0e40455d0d4aec87fca97a7b55ae348fc8d9eeeacaec4b665849 files/secure-delete-3.1-do-not-use-the-kernel-module.patch 1493
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
 SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310
 MD5 368e13118c25d89512de00ab88a0f03a secure-delete-3.0.ebuild 1129
 RMD160 53ca5decaabb7190af3319d8b53d3b08c32d9eb9 secure-delete-3.0.ebuild 1129
 SHA256 91272ead16f8a8d2d3660ff27c6eb8d97ef08b987538d11c4f2f4e4851936e24 secure-delete-3.0.ebuild 1129
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6lxgV3J2n04EauwRAqp/AJ92AKTtOkkF12N+USiURmv2q4WHIQCgmbeS
-bJA4yX/v1VgBpNBjzUM847Q=
-=b+ae
------END PGP SIGNATURE-----
+MD5 8acee8f0c584ea0e039d59a6da8f0166 secure-delete-3.1.ebuild 1333
+RMD160 e1554ee8e9376064b5f9795686271e01f42c8d43 secure-delete-3.1.ebuild 1333
+SHA256 e4626a8ab00295e36c89f65dafe0bda8db52bc3659b7eb1b26a42e53528a1a50 secure-delete-3.1.ebuild 1333
diff --git a/app-misc/secure-delete/files/digest-secure-delete-3.1 b/app-misc/secure-delete/files/digest-secure-delete-3.1
new file mode 100644
index 000000000000..dfd4007facac
--- /dev/null
+++ b/app-misc/secure-delete/files/digest-secure-delete-3.1
@@ -0,0 +1,3 @@
+MD5 aabbd7e77bf96b326d260f16fb7f8bba secure_delete-3.1.tar.gz 62073
+RMD160 923807f99bcc7eed7f0e7f8823ef110b2d0070bc secure_delete-3.1.tar.gz 62073
+SHA256 a9d846d1dce3f1bdf13bbb306e8596bc1f263198a086f6beecd90ccf7bddf8d5 secure_delete-3.1.tar.gz 62073
diff --git a/app-misc/secure-delete/files/secure-delete-3.1-do-not-use-the-kernel-module.patch b/app-misc/secure-delete/files/secure-delete-3.1-do-not-use-the-kernel-module.patch
new file mode 100644
index 000000000000..a685b81bc619
--- /dev/null
+++ b/app-misc/secure-delete/files/secure-delete-3.1-do-not-use-the-kernel-module.patch
@@ -0,0 +1,41 @@
+--- Makefile.old	2006-03-08 14:59:53.000000000 -0500
++++ Makefile	2006-03-08 15:00:23.000000000 -0500
+@@ -7,7 +7,7 @@
+ OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2
+ #LD_MOD=-r
+ 
+-all: sdel-lib.o srm sfill sswap smem sdel-mod.o
++all: sdel-lib.o srm sfill sswap smem 
+ 	@echo
+ 	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
+ 	@echo "having fun."
+@@ -15,9 +15,6 @@
+ 	@echo "I hope YOU have fun!"
+ 	@echo
+ 
+-sdel-mod.o: sdel-mod.c
+-	$(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c
+-
+ sdel-lib.o: sdel-lib.c
+ 	$(CC) ${OPT} -c sdel-lib.c
+ 
+@@ -35,7 +32,7 @@
+ 	-strip smem
+ 
+ clean:
+-	rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
++	rm -f sfill srm sswap smem sdel sdel-lib.o 
+ 
+ install: all
+ 	mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null
+@@ -47,8 +44,8 @@
+ 	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
+ 	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
+ 	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
+-	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
+-#	@-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete"
++	-test -e 
++#	@-test '!' -e 
+ 	@echo
+ 	@echo "If men could get pregnant, abortion would be a sacrament."
+ 	@echo
diff --git a/app-misc/secure-delete/secure-delete-3.1.ebuild b/app-misc/secure-delete/secure-delete-3.1.ebuild
new file mode 100644
index 000000000000..b02492bd6f0a
--- /dev/null
+++ b/app-misc/secure-delete/secure-delete-3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.1.ebuild,v 1.1 2006/03/08 20:20:33 smithj Exp $
+
+inherit eutils
+
+MY_P=${PN//-/_}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Secure file/disk/swap/memory erasure utilities"
+HOMEPAGE="http://www.thc.org/"
+SRC_URI="http://www.thc.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	!app-misc/srm"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	chmod u+w .
+
+	sed -i \
+		-e 's|mktemp|mkstemp|g' \
+		sfill.c
+
+	# the kernel module will not compile without smp support and there is no
+	# good way to ensure that a user has it
+	epatch ${FILESDIR}/${PN}-3.1-do-not-use-the-kernel-module.patch
+}
+
+src_compile() {
+	make OPT="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" || die
+}
+
+src_install() {
+	make \
+		INSTALL_DIR=${D}/usr/bin \
+		MAN_DIR=${D}/usr/share/man \
+		DOC_DIR=${D}/usr/share/doc/${PF} \
+		install || die "compile problem"
+
+	dodoc secure_delete.doc usenix6-gutmann.doc
+}
+
+pkg_postinst() {
+	ewarn "sfill and srm are useless on journaling filesystems,"
+	ewarn "such as reiserfs or XFS."
+	ewarn "See documentation for more information."
+	
+	einfo "The kernel module has been removed since it does not compile"
+	einfo "for non-smp kernels."
+}