[patch] patches device-mapper/* to -r1 which includes patch for dmsetup

device-mapper-r1.patch (text/plain), 5.75 KB, created by Justin Whitney on 2004-02-27 20:31:58 UTC

diff -urN /usr/portage/sys-libs/device-mapper/ChangeLog device-mapper/ChangeLog
--- /usr/portage/sys-libs/device-mapper/ChangeLog	2004-01-22 10:17:29.000000000 -0500
+++ device-mapper/ChangeLog	2004-02-27 23:28:21.830890608 -0500
@@ -2,6 +2,12 @@
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header: /home/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.9 2004/01/22 14:54:21 pyrania Exp $
 
+  27 Feb 2004; Justin Whitney <[e-mail]>
+  device-mapper-1.00.07-r1.ebuild:
+  Bumped to 1.00.07-r1.  Make dmsetup lock its pages
+  for use with dm-crypt and unencrypted swapspace.
+
+
   22 Jan 2004; Markus Nigbur <[e-mail]>
   device-mapper-1.00.07.ebuild:
   Marked stable on sparc.
diff -urN /usr/portage/sys-libs/device-mapper/Manifest device-mapper/Manifest
--- /usr/portage/sys-libs/device-mapper/Manifest	2004-01-22 10:17:29.000000000 -0500
+++ device-mapper/Manifest	2004-02-27 23:29:10.605475744 -0500
@@ -1,6 +1,8 @@
 MD5 774c3fb4802ab156a7d831d8b68e7a52 device-mapper-1.00.05.ebuild 1006
-MD5 6b4850132b07f98ef2002e6b39fb6d98 device-mapper-1.00.07.ebuild 1023
-MD5 5fc80031f309ee769e8d79b10661c293 ChangeLog 1851
+MD5 dc3a73d226399c941514fe088f0e6277 device-mapper-1.00.07-r1.ebuild 1065
+MD5 8ef48631b3211c6dd8365078c85f5b16 ChangeLog 2041
 MD5 8ef457f9ac46b73b855b4a4e5ff9d7d3 metadata.xml 243
 MD5 32893d4b8efc4a7891b77331810fc30b files/digest-device-mapper-1.00.05 70
 MD5 b6ee13a8f0d0d9a8600559f997c8ba9d files/digest-device-mapper-1.00.07 70
+MD5 b6ee13a8f0d0d9a8600559f997c8ba9d files/digest-device-mapper-1.00.07-r1 70
+MD5 5ac7328b43d8da734b056cb7b2fd9d80 files/dmsetup-dmcrypt.patch 623
diff -urN /usr/portage/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild device-mapper/device-mapper-1.00.07-r1.ebuild
--- /usr/portage/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild	1969-12-31 19:00:00.000000000 -0500
+++ device-mapper/device-mapper-1.00.07-r1.ebuild	2004-02-27 23:13:53.471901240 -0500
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /home/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.07.ebuild,v 1.5 2004/01/22 14:54:21 pyrania Exp $
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
+HOMEPAGE="http://www.sistina.com/products_lvm.htm"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM2/${PN}/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 sparc"
+
+DEPEND="virtual/linux-sources"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+pkg_setup() {
+	[ ! -e "/usr/src/linux/include/linux/dm-ioctl.h" ] && {
+		eerror
+		eerror "Your currently linked kernel (/usr/src/linux) hasn't"
+		eerror "been patched for device mapper support."
+		eerror
+		die "kernel not patched for device mapper support"
+	}
+
+	return 0
+}
+
+src_compile() {
+	epatch ${FILESDIR}/dmsetup-dmcrypt.patch
+	econf
+
+	# Parallel build doesn't work.
+	emake -j1 || die "compile problem"
+}
+
+src_install() {
+	einstall sbindir="${D}/sbin" libdir="${D}/lib"
+	dodoc COPYING* INSTALL INTRO README VERSION
+}
diff -urN /usr/portage/sys-libs/device-mapper/device-mapper-1.00.07.ebuild device-mapper/device-mapper-1.00.07.ebuild
--- /usr/portage/sys-libs/device-mapper/device-mapper-1.00.07.ebuild	2004-01-22 10:17:29.000000000 -0500
+++ device-mapper/device-mapper-1.00.07.ebuild	1969-12-31 19:00:00.000000000 -0500
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.07.ebuild,v 1.5 2004/01/22 14:54:21 pyrania Exp $
-
-DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
-HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM2/${PN}/${PN}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 sparc"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/${PN}.${PV}"
-
-pkg_setup() {
-	[ ! -e "/usr/src/linux/include/linux/dm-ioctl.h" ] && {
-		eerror
-		eerror "Your currently linked kernel (/usr/src/linux) hasn't"
-		eerror "been patched for device mapper support."
-		eerror
-		die "kernel not patched for device mapper support"
-	}
-
-	return 0
-}
-
-src_compile() {
-	econf
-
-	# Parallel build doesn't work.
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	einstall sbindir="${D}/sbin" libdir="${D}/lib"
-	dodoc COPYING* INSTALL INTRO README VERSION
-}
diff -urN /usr/portage/sys-libs/device-mapper/files/digest-device-mapper-1.00.07-r1 device-mapper/files/digest-device-mapper-1.00.07-r1
--- /usr/portage/sys-libs/device-mapper/files/digest-device-mapper-1.00.07-r1	1969-12-31 19:00:00.000000000 -0500
+++ device-mapper/files/digest-device-mapper-1.00.07-r1	2004-02-27 23:29:10.600476504 -0500
@@ -0,0 +1 @@
+MD5 44920cd973a6abc79109af9bff9d8af6 device-mapper.1.00.07.tgz 498954
diff -urN /usr/portage/sys-libs/device-mapper/files/dmsetup-dmcrypt.patch device-mapper/files/dmsetup-dmcrypt.patch
--- /usr/portage/sys-libs/device-mapper/files/dmsetup-dmcrypt.patch	1969-12-31 19:00:00.000000000 -0500
+++ device-mapper/files/dmsetup-dmcrypt.patch	2004-02-27 23:12:08.041929032 -0500
@@ -0,0 +1,24 @@
+--- device-mapper.1.00.07/dmsetup/dmsetup.c	2004-02-27 23:03:38.148444624 -0500
++++ device-mapper.1.00.07.mlock/dmsetup/dmsetup.c	2004-02-27 23:06:17.323246376 -0500
+@@ -13,6 +13,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <sys/mman.h>
+ 
+ #ifdef HAVE_GETOPTLONG
+ #  include <getopt.h>
+@@ -697,6 +698,13 @@
+ 
+ int main(int argc, char **argv)
+ {
++
++	/*lock memory pages for crypt target*/
++	if(mlockall(MCL_CURRENT|MCL_FUTURE)) {
++		fprintf(stderr, "Couldn't lock memory pages, (are you root?).  Bailing\n");
++		exit(1);
++	}
++
+ 	struct command *c;
+ 
+ 	if (!_process_switches(&argc, &argv)) {