Version bump. Adding patches thanks to Billy Holmes <billy@gonoph.net> in bug 57912

8 files changed, 223 insertions, 8 deletions

diff --git a/sys-fs/cloop/ChangeLog b/sys-fs/cloop/ChangeLog
index ba9fb5bcda36..325009a70329 100644
--- a/sys-fs/cloop/ChangeLog
+++ b/sys-fs/cloop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/cloop
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.1 2004/11/23 22:36:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.2 2004/11/23 22:50:05 genstef Exp $
+
+*cloop-2.01.5 (23 Nov 2004)
+
+  23 Nov 2004; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  +files/cloop.fix.patch, +files/kernel-2.6.8-fs_h-fix.patch,
+  +files/kernel26_amd64.patch, +cloop-2.01.5.ebuild:
+  Version bump. Adding patches thanks to Billy Holmes <billy@gonoph.net> in
+  bug 57912
 
 *cloop-1.0 (23 Nov 2004)
 
diff --git a/sys-fs/cloop/Manifest b/sys-fs/cloop/Manifest
index bed0d843e378..5495f1f24ad6 100644
--- a/sys-fs/cloop/Manifest
+++ b/sys-fs/cloop/Manifest
@@ -1,10 +1,15 @@
-MD5 8e1bc0ee4930bbf704bb46c9b5548a50 cloop-0.68.ebuild 2113
-MD5 3111209697f13ecb2cf469d2ef4f90d9 cloop-2.00.ebuild 2030
-MD5 8a3e8423b217221a78e35ca0d93afeab cloop-1.0.ebuild 1835
-MD5 2f72def221ab4ddd09c603a9e5c64e85 ChangeLog 1445
-MD5 f8e78ef3fd76cbc56c247d2aa17be955 cloop-1.02.ebuild 1941
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a9c58ce17c978363b0aa5e2e6545c7ba cloop-0.68.ebuild 2110
+MD5 4020c6c408d6d4b8abf295a2fbdf6465 cloop-2.01.5.ebuild 1825
+MD5 f921e57967efb1fc6c2cb4ccb0dcbb92 cloop-2.00.ebuild 2027
+MD5 7498bc7803ebc9010d29cecefc3079b6 cloop-1.0.ebuild 1832
+MD5 6baba4f9f69660093247f730333bfcbc ChangeLog 1965
+MD5 4bb124b6d8e7842a97dd4b5fc87c545a cloop-1.02.ebuild 1938
+MD5 2d8e24e9e409e35ee446ec8d59f23c8d metadata.xml 269
+MD5 fddd6265f57fe660c663a7b5b673f7f7 files/kernel-2.6.8-fs_h-fix.patch 759
 MD5 35d772e2810697ea7458e58d4cd8dac1 files/digest-cloop-1.0 62
 MD5 aeb66341a09c65ce27293e9bc8867e7c files/digest-cloop-0.68 64
 MD5 012e4f17d0612ece27ca653c7af35662 files/digest-cloop-1.02 63
 MD5 cc6063c4f68af1ae01cf6437c8a224b8 files/digest-cloop-2.00 63
+MD5 4666ce65a6ce33f0a2c449fcec7e0488 files/cloop.fix.patch 2071
+MD5 eba344b1fcf93c086a762d9f059adf84 files/digest-cloop-2.01.5 64
+MD5 ab48f2b1094c297eaa04e42906bf652b files/kernel26_amd64.patch 2121
diff --git a/sys-fs/cloop/cloop-2.01.5.ebuild b/sys-fs/cloop/cloop-2.01.5.ebuild
new file mode 100644
index 000000000000..853fd2fd5eda
--- /dev/null
+++ b/sys-fs/cloop/cloop-2.01.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.01.5.ebuild,v 1.1 2004/11/23 22:50:05 genstef Exp $
+
+inherit kernel-mod eutils versionator
+
+DESCRIPTION="Compressed filesystem loopback kernel module"
+HOMEPAGE="http://www.knopper.net/knoppix/"
+SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_$(replace_version_separator 2 '-').tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+pkg_setup() {
+	if kernel-mod_is_2_4_kernel ;
+	then
+		kernel-mod_configoption_present ZLIB_DEFLATE || \
+			die "You need ZLIB_DEFLATE support in your kernel!"
+	fi
+	kernel-mod_configoption_present ZLIB_INFLATE || \
+		die "You need ZLIB_INFLATE support in your kernel!"
+	kernel-mod_check_modules_supported
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/kernel26_amd64.patch
+	kernel-mod_is_2_6_kernel && [ "${KV_PATCH}" -gt 7 ] && epatch ${FILESDIR}/kernel-2.6.8-fs_h-fix.patch
+	cd ${S}
+	epatch ${FILESDIR}/cloop.fix.patch
+}
+
+src_compile() {
+	kernel-mod_src_compile
+}
+
+src_install() {
+	insinto /lib/modules/${KV_VERSION_FULL}/misc
+	kernel-mod_is_2_4_kernel && doins cloop.o || doins cloop.ko
+	dobin create_compressed_fs extract_compressed_fs
+	cp debian/create_compressed_fs.1 debian/extract_compressed_fs.1
+	doman debian/create_compressed_fs.1 debian/extract_compressed_fs.1
+	dodoc CHANGELOG README
+}
+
+pkg_postinst () {
+	if kernel-mod_is_2_4_kernel ; then
+		einfo "Adding /dev/cloop devices"
+		if [ -e /dev/cloop ] ; then
+			rm -f /dev/cloop
+		fi
+		mknod /dev/cloop b 240 0 || die
+		if [ -e /dev/cloop1 ] ; then
+			rm -f /dev/cloop1
+		fi
+		mknod /dev/cloop1 b 240 1 || die
+	fi
+
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}
diff --git a/sys-fs/cloop/files/cloop.fix.patch b/sys-fs/cloop/files/cloop.fix.patch
new file mode 100644
index 000000000000..7b92064eaefe
--- /dev/null
+++ b/sys-fs/cloop/files/cloop.fix.patch
@@ -0,0 +1,43 @@
+diff -urN ../tmp-orig/cloop-2.01.4/advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h ./advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h
+--- ../tmp-orig/cloop-2.01.4/advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h	2003-02-10 20:25:06.000000000 +0100
++++ ./advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h	2004-07-10 15:27:58.225214667 +0200
+@@ -51,13 +51,13 @@
+ public:
+   void Encode(CRangeEncoder *aRangeEncoder, UINT32 aSymbol)
+   {
+-    aRangeEncoder->EncodeBit(m_Probability, kNumBitModelTotalBits, aSymbol);
+-    UpdateModel(aSymbol);
++    aRangeEncoder->EncodeBit(this->m_Probability, kNumBitModelTotalBits, aSymbol);
++    this->UpdateModel(aSymbol);
+   }
+   UINT32 GetPrice(UINT32 aSymbol) const
+   {
+     return g_PriceTables.m_StatePrices[
+-      (((m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
++      (((this->m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
+   }
+ };
+ 
+@@ -68,11 +68,11 @@
+ public:
+   UINT32 Decode(CRangeDecoder *aRangeDecoder)
+   {
+-    UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * m_Probability;
++    UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * this->m_Probability;
+     if (aRangeDecoder->m_Code < aNewBound)
+     {
+       aRangeDecoder->m_Range = aNewBound;
+-      m_Probability += (kBitModelTotal - m_Probability) >> aNumMoveBits;
++      this->m_Probability += (kBitModelTotal - this->m_Probability) >> aNumMoveBits;
+       if (aRangeDecoder->m_Range < kTopValue)
+       {
+         aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
+@@ -84,7 +84,7 @@
+     {
+       aRangeDecoder->m_Range -= aNewBound;
+       aRangeDecoder->m_Code -= aNewBound;
+-      m_Probability -= (m_Probability) >> aNumMoveBits;
++      this->m_Probability -= (this->m_Probability) >> aNumMoveBits;
+       if (aRangeDecoder->m_Range < kTopValue)
+       {
+         aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
diff --git a/sys-fs/cloop/files/digest-cloop-2.01.5 b/sys-fs/cloop/files/digest-cloop-2.01.5
new file mode 100644
index 000000000000..cc0eb187161d
--- /dev/null
+++ b/sys-fs/cloop/files/digest-cloop-2.01.5
@@ -0,0 +1 @@
+MD5 38daf7faba0427fed469137bca917c1c cloop_2.01-5.tar.gz 428324
diff --git a/sys-fs/cloop/files/kernel-2.6.8-fs_h-fix.patch b/sys-fs/cloop/files/kernel-2.6.8-fs_h-fix.patch
new file mode 100644
index 000000000000..eb9e359844ac
--- /dev/null
+++ b/sys-fs/cloop/files/kernel-2.6.8-fs_h-fix.patch
@@ -0,0 +1,20 @@
+--- cloop-2.01/compressed_loop.c.orig	2004-05-14 15:22:47.000000000 -0400
++++ cloop-2.01/compressed_loop.c	2004-11-22 11:32:45.772837000 -0500
+@@ -202,7 +202,7 @@
+                           unsigned long offset, unsigned long size)
+ {
+  char *kaddr;
+- struct clo_read_data *p = (struct clo_read_data*)desc->buf;
++ struct clo_read_data *p = (struct clo_read_data*)desc->arg.buf;
+  unsigned long count = desc->count;
+  if (size > count) size = count;
+  kaddr = kmap(page);
+@@ -228,7 +228,7 @@
+    read_descriptor_t desc;
+    desc.written = 0;
+    desc.count   = size;
+-   desc.buf     = (char*)&cd;
++   desc.arg.buf     = (char*)&cd;
+    desc.error   = 0;
+ #ifdef REDHAT_KERNEL /* Greenshoe Linux */
+    do_generic_file_read(f, &pos, &desc, clo_read_actor, 0);
diff --git a/sys-fs/cloop/files/kernel26_amd64.patch b/sys-fs/cloop/files/kernel26_amd64.patch
new file mode 100644
index 000000000000..464915ae5e49
--- /dev/null
+++ b/sys-fs/cloop/files/kernel26_amd64.patch
@@ -0,0 +1,69 @@
+diff -ru cloop-2.01/Makefile cloop-2.01.new/Makefile
+--- cloop-2.01/Makefile	2004-05-14 14:17:51.000000000 -0500
++++ cloop-2.01.new/Makefile	2004-07-21 16:26:59.167257880 -0500
+@@ -1,18 +1,51 @@
+ #!/usr/bin/make
+ 
+-KERNEL_DIR=/usr/src/linux
++KVERSION=$(shell uname -r)
++MACHINE=$(shell uname -m)
++KERNEL_DIR=/lib/modules/$(KVERSION)/build
++KERNEL_INCLUDE=$(KERNEL_DIR)/include
++INCLUDE_26:=-include $(KERNEL_INCLUDE)/config/modversions.h -include $(KERNEL_INCLUDE)/linux/version.h
++INCLUDE_24:=-include $(KERNEL_INCLUDE)/linux/modversions.h
++
++file_exist=$(shell test -f $(1) && echo yes || echo no)
++
++# test for 2.6 or 2.4 kernel
++ifeq ($(call file_exist,$(KERNEL_DIR)/Rules.make), yes)
++PATCHLEVEL:=4
++else
++PATCHLEVEL:=6
++endif
+ 
+ ifdef APPSONLY
+ CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer 
+ else
+-include $(KERNEL_DIR)/.config
++ifeq ($(PATCHLEVEL),4)
+ include $(KERNEL_DIR)/conf.vars
++else
++include $(KERNEL_DIR)/.config
++endif
+ endif
+ 
+ CKERNOPS:=-D__KERNEL__ -DMODULE -fno-builtin -nostdlib -DKBUILD_MODNAME="cloop" -DKBUILD_BASENAME="cloop"
+ 
++# I needed this for my amd64 system running 2.6.7
++# it maybe required for 2.6, so I add it here
++ifeq ($(PATCHLEVEL),6)
++CKERNOPS+= -D__OPTIMIZE__
++endif
++
++# check for amd64
++ifeq ($(MACHINE),x86_64)
++CKERNOPS+=-mno-red-zone -mcmodel=kernel
++endif
++
+ ifdef CONFIG_MODVERSIONS
+-MODVERSIONS:= -DMODVERSIONS -include $(KERNEL_DIR)/include/linux/modversions.h
++MODVERSIONS:= -DMODVERSIONS
++ifeq ($(PATCHLEVEL),4)
++MODVERSIONS+=$(INCLUDE_24)
++else
++MODVERSIONS+=$(INCLUDE_26)
++endif
+ CKERNOPS += $(MODVERSIONS)
+ endif
+ 
+diff -ru cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc cloop-2.01.new/advancecomp-1.9_create_compressed_fs/advfs.cc
+--- cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc	2004-04-18 15:33:29.000000000 -0500
++++ cloop-2.01.new/advancecomp-1.9_create_compressed_fs/advfs.cc	2004-07-20 11:55:28.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include "utility.h"
+ #include "compress.h"
+ #include "siglock.h"
++#define __OPTIMIZE__
+ #include <netinet/in.h>
+ 
+ #include "lib/mng.h"
diff --git a/sys-fs/cloop/metadata.xml b/sys-fs/cloop/metadata.xml
index 96a2d586367d..209f080820d9 100644
--- a/sys-fs/cloop/metadata.xml
+++ b/sys-fs/cloop/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>genstef@gentoo.org</email>
+    <name>Stefan Schweizer</name>
+  </maintainer>
 </pkgmetadata>