gcloop support added

5 files changed, 279 insertions, 17 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 182669ad274f..a9cc3deafb2d 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.67 2004/02/09 20:52:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.68 2004/02/17 16:47:05 lu_zero Exp $
+
+*util-linux-2.12-r5 (17 Feb 2004)
+
+  17 Feb 2004; Luca Barbato <lu_zero@gentoo.org> util-linux-2.12-r5.ebuild,
+  files/util-linux-2.12-gcloop.patch:
+  Added support for gcloop in losetup
 
   09 Feb 2004; <gustavoz@gentoo.org> util-linux-2.12-r4.ebuild:
   stable on hppa and sparc
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 170f25bfaa31..a7153123c82f 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,24 +1,26 @@
-MD5 ecc0d97dbb96a867cfd0486c7e2bb89f ChangeLog 11118
+MD5 342d0d1ac6bcc5a9ebab35f5f7cfc549 ChangeLog 11304
+MD5 056e730aa51b97a01b08eb6236e2a9d2 util-linux-2.12-r5.ebuild 3914
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 780eb6860abb6d79b37b2bc337a51177 util-linux-2.11z-r8.ebuild 3222
-MD5 56da3847e8af00adfb1c3d9d4e7947d9 util-linux-2.11z-r9.ebuild 3414
-MD5 6d685a28db8eb02c63016d7bcd6679e5 util-linux-2.12-r2.ebuild 3305
-MD5 32ba56421301097af1db48df06fb3581 util-linux-2.12-r3.ebuild 3749
-MD5 e647c55610ed3db5e31b7aa575fe9f2e util-linux-2.12-r4.ebuild 3848
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r8 153
+MD5 dffe1a2b1de957dcb30ba68152ade8a0 util-linux-2.11z-r9.ebuild 3413
+MD5 cc3d1f9d5845a2a07d36358bfbc24c79 util-linux-2.11z-r8.ebuild 3221
+MD5 1d4d761f9314a0b263acfbf0be64e399 util-linux-2.12-r4.ebuild 3847
+MD5 a88439ff67042ff70da71aef1cc2ec0c util-linux-2.12-r3.ebuild 3748
+MD5 4d61c2fe53a74c629800dcd8d2246c11 util-linux-2.12-r2.ebuild 3304
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
-MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
+MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
 MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
-MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
-MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
+MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
+MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
+MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
 MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
+MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
+MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
 MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
+MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
+MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
 MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
-MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
-MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
-MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
-MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12-r5 b/sys-apps/util-linux/files/digest-util-linux-2.12-r5
new file mode 100644
index 000000000000..cedffcb9a126
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12-r5
@@ -0,0 +1,2 @@
+MD5 997adf78b98d9d1c5db4f37ea982acff util-linux-2.12.tar.gz 1857871
+MD5 1734111e696acfb6d08f52f1e1b3d024 util-linux-2.12-cryptoapi-losetup.patch.bz2 4871
diff --git a/sys-apps/util-linux/files/util-linux-2.12-gcloop.patch b/sys-apps/util-linux/files/util-linux-2.12-gcloop.patch
new file mode 100644
index 000000000000..97be88c07b2c
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12-gcloop.patch
@@ -0,0 +1,116 @@
+diff -ruN util-linux-2.12.orig/mount/lomount.c util-linux-2.12/mount/lomount.c
+--- util-linux-2.12.orig/mount/lomount.c	2004-02-17 02:08:05.341716624 +0100
++++ util-linux-2.12/mount/lomount.c	2004-02-17 02:12:10.653423576 +0100
+@@ -60,7 +60,8 @@
+         info->lo_flags = info64->lo_flags;
+         info->lo_init[0] = info64->lo_init[0];
+         info->lo_init[1] = info64->lo_init[1];
+-        if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI)
++        if ((info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI) ||
++		(info->lo_encrypt_type == LO_CRYPT_COMPRESS))
+                 memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE);
+         else
+                 memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE);
+@@ -321,7 +322,8 @@
+ 
+ int
+ set_loop(const char *device, const char *file, int offset,
+-	 const char *encryption, int pfd, int *loopro) {
++	 const char *encnumber,const char *encryption,
++	 int pfd, int *loopro) {
+ 	struct loop_info64 loopinfo64;
+ 	int fd, ffd, mode;
+ 	char *pass;
+@@ -344,8 +346,9 @@
+ 	memset(&loopinfo64, 0, sizeof(loopinfo64));
+ 
+ 	xstrncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE);
+-
++			
+ 	if (encryption && *encryption) {
++
+ 		if (digits_only(encryption)) {
+ 			loopinfo64.lo_encrypt_type = atoi(encryption);
+ 		} else {
+@@ -386,6 +389,12 @@
+ 		}
+ 	}
+ 
++	if (encnumber && *encnumber) {
++
++		if (digits_only(encnumber))
++			loopinfo64.lo_encrypt_type = atoi(encnumber);
++	}
++
+ 	loopinfo64.lo_offset = offset;
+ 
+ #ifdef MCL_FUTURE  
+@@ -601,7 +610,7 @@
+ 
+ int
+ main(int argc, char **argv) {
+-	char *offset, *encryption, *passfd;
++	char *offset, *encryption, *encnumber, *passfd;
+ 	int delete, off, c;
+ 	int res = 0;
+ 	int ro = 0;
+@@ -612,7 +621,7 @@
+ 	textdomain(PACKAGE);
+ 
+ 	delete = off = 0;
+-	offset = encryption = passfd = NULL;
++	offset = encryption = encnumber = passfd = NULL;
+ 	progname = argv[0];
+ 	while ((c = getopt(argc,argv,"de:E:o:p:v")) != -1) {
+ 		switch (c) {
+@@ -620,6 +629,7 @@
+ 			delete = 1;
+ 			break;
+ 		case 'E':
++			encnumber = optarg;
+ 		case 'e':
+ 			encryption = optarg;
+ 			break;
+@@ -651,7 +661,7 @@
+ 		if (passfd && sscanf(passfd,"%d",&pfd) != 1)
+ 			usage();
+ 		res = set_loop(argv[optind], argv[optind+1], off,
+-			       encryption, pfd, &ro);
++				encnumber, encryption, pfd, &ro);
+ 	}
+ 	return res;
+ }
+diff -ruN util-linux-2.12.orig/mount/lomount.h util-linux-2.12/mount/lomount.h
+--- util-linux-2.12.orig/mount/lomount.h	2004-02-17 02:08:05.339716928 +0100
++++ util-linux-2.12/mount/lomount.h	2004-02-17 02:08:14.921260312 +0100
+@@ -1,6 +1,6 @@
+ extern int verbose;
+ extern int set_loop(const char *, const char *, int, const char *,
+-		    int, int *);
++		    const char *, int, int *);
+ extern int del_loop(const char *);
+ extern int is_loop_device(const char *);
+ extern char * find_unused_loop_device(void);
+diff -ruN util-linux-2.12.orig/mount/loop.h util-linux-2.12/mount/loop.h
+--- util-linux-2.12.orig/mount/loop.h	2004-02-17 02:08:05.341716624 +0100
++++ util-linux-2.12/mount/loop.h	2004-02-17 02:08:14.922260160 +0100
+@@ -2,6 +2,7 @@
+ #define LO_CRYPT_XOR	1
+ #define LO_CRYPT_DES	2
+ #define LO_CRYPT_CRYPTOAPI 18
++#define LO_CRYPT_COMPRESS  19
+ 
+ #define LOOP_SET_FD		0x4C00
+ #define LOOP_CLR_FD		0x4C01
+diff -ruN util-linux-2.12.orig/mount/mount.c util-linux-2.12/mount/mount.c
+--- util-linux-2.12.orig/mount/mount.c	2004-02-17 02:08:05.281725744 +0100
++++ util-linux-2.12/mount/mount.c	2004-02-17 02:08:14.924259856 +0100
+@@ -612,7 +612,7 @@
+       offset = opt_offset ? strtoul(opt_offset, NULL, 0) : 0;
+       if (opt_keygen)
+ 	pfd = use_keygen_prog(opt_keygen, keygen_args, _n_keygen_args);
+-      if (set_loop(*loopdev, *loopfile, offset,
++      if (set_loop(*loopdev, *loopfile, offset, NULL,
+ 		   opt_encryption, pfd, &loopro)) {
+ 	if (verbose)
+ 	  printf(_("mount: failed setting up loop device\n"));
diff --git a/sys-apps/util-linux/util-linux-2.12-r5.ebuild b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
new file mode 100644
index 000000000000..5465423728bd
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.1 2004/02/17 16:47:05 lu_zero Exp $
+
+IUSE="crypt nls static pam selinux"
+
+inherit eutils flag-o-matic
+
+## see below for details on pic.patch
+case ${ARCH} in
+	"x86"|"hppa"|"sparc"|"ppc")
+		;;
+	*)
+		filter-flags -fPIC
+		;;
+esac
+
+S="${WORKDIR}/${P}"
+CRYPT_PATCH_P="${P}-cryptoapi-losetup"
+SELINUX_PATCH="util-linux-2.12-selinux.diff.bz2"
+DESCRIPTION="Various useful Linux utilities"
+SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
+	ftp://ftp.cwi.nl/pub/aeb/${PN}/${P}.tar.gz
+	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+
+KEYWORDS="x86 ~amd64 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~ia64 ~ppc64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.2-r2
+	selinux? ( sys-libs/libselinux )
+	pam? ( sys-apps/pam-login )
+	crypt? ( app-crypt/hashalot )"
+
+RDEPEND="${DEPEND} dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# CryptoAPI losetup patch for the cryptoapi sepecific
+	# to the 2.6 linux kernel. Needs hashalot.
+	# Original patch location:
+	# http://www.stwing.org/~sluskyb/util-linux/losetup-combined.patch
+	# Mailing list post with info:
+	# http://www.kerneli.org/pipermail/cryptoapi-devel/2003-September/000634.html
+	# Follow thread for usage.
+	use crypt && epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
+
+	# Fix rare failures with -j4 or higher
+	epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch
+
+	# Fix unreadable df output
+	epatch ${FILESDIR}/no-symlink-resolve.patch
+
+	# Add the O option to agetty to display DNS domainname in the issue
+	# file, thanks to Marius Mauch <genone@genone.de>, bug #22275.
+	#
+	# NOTE:  Removing this will break future baselayout, so PLEASE
+	#        consult with me before doing so.
+	#
+	# <azarah@gentoo.og> (17 Jul 2003)
+	epatch ${FILESDIR}/${PN}-2.11z-agetty-domainname-option.patch
+
+	# Add NFS4 support (kernel 2.5/2.6).
+#	if [ ! -z "`use crypt`" ] ; then
+#		epatch ${FILESDIR}/${PN}-2.11z-01-nfsv4-crypt.dif
+#	else
+		epatch ${FILESDIR}/${PN}-2.11z-01-nfsv4.dif
+#	fi
+
+	# <solar@gentoo.org> This patch should allow us to remove -fPIC
+	# out of the filter-flags we need this be able to emit position
+	# independent code so we can link our elf executables as shared
+	# objects. "prelink" should now also be able to take advantage
+	epatch ${FILESDIR}/${PN}-2.11z-pic.patch
+
+	# Allow util-linux to compile with 2.6.x headers #31286
+	epatch ${FILESDIR}/${P}-kernel-2.6.patch
+
+	# Add support to read fat/fat32 labels, bug #36722
+	epatch ${FILESDIR}/${P}-fat-LABEL-support.patch
+
+	# Add support for gcloop 
+	epatch ${FILESDIR}/${P}-gcloop.patch
+
+	# Enable pam only if we use it
+	use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG
+
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+
+	sed -i \
+		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
+		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
+		-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
+		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
+		-e "s:usr/man:usr/share/man:" \
+		-e "s:usr/info:usr/share/info:" \
+		-e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \
+		MCONFIG || die "MCONFIG sed"
+
+	if [ -z "`use nls`" ] ; then
+		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
+			die "MCONFIG nls sed"
+	fi
+
+	# /bin/kill is provided by procps ONLY
+	epatch ${FILESDIR}/${PN}-no-kill.patch
+}
+
+src_compile() {
+	if [ "`use static`" ] ; then
+		export LDFLAGS="${LDFLAGS} -static"
+	fi
+
+	econf || die "configure failed"
+
+	emake || die "emake failed"
+	cd sys-utils && makeinfo *.texi || die "makeinfo failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	dodoc HISTORY MAINTAINER README VERSION
+	docinto licenses
+	dodoc licenses/* HISTORY
+	docinto examples
+	dodoc example.files/*
+}
+