Added suspend2-2.2.8.4 support

Package-Manager: portage-2.1.1-r1

5 files changed, 148 insertions, 5 deletions

diff --git a/sys-fs/dazuko/ChangeLog b/sys-fs/dazuko/ChangeLog
index 68069a070bc5..0a87a22f2a21 100644
--- a/sys-fs/dazuko/ChangeLog
+++ b/sys-fs/dazuko/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/dazuko
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/ChangeLog,v 1.7 2006/10/21 19:48:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/ChangeLog,v 1.8 2006/11/08 18:41:51 alonbl Exp $
+
+*dazuko-2.3.1-r1 (08 Nov 2006)
+
+  08 Nov 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/dazuko-2.3.1-suspend2.patch, +dazuko-2.3.1-r1.ebuild:
+  Added suspend2-2.2.8.4 support
 
   21 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> dazuko-2.3.1.ebuild:
   Add ~alpha and ~ia64 keywords, bug 151630.
diff --git a/sys-fs/dazuko/Manifest b/sys-fs/dazuko/Manifest
index 6b6427f250e9..77ceb1c90840 100644
--- a/sys-fs/dazuko/Manifest
+++ b/sys-fs/dazuko/Manifest
@@ -1,3 +1,7 @@
+AUX dazuko-2.3.1-suspend2.patch 1834 RMD160 e7afb1b6c46400a578448e9705221d6245396b1d SHA1 4e205e2428efdf67dfb506e6e83fcdc6e5e6b0ef SHA256 c25d6fc1cb1f454f60cb95512454daea241a77489804cf0625971956bd0ae11f
+MD5 c6ed5e400be9bf46a0446d6dcb68ed92 files/dazuko-2.3.1-suspend2.patch 1834
+RMD160 e7afb1b6c46400a578448e9705221d6245396b1d files/dazuko-2.3.1-suspend2.patch 1834
+SHA256 c25d6fc1cb1f454f60cb95512454daea241a77489804cf0625971956bd0ae11f files/dazuko-2.3.1-suspend2.patch 1834
 DIST dazuko-2.1.0.tar.gz 159456
 DIST dazuko-2.1.1.tar.gz 162359
 DIST dazuko-2.2.0.tar.gz 162903
@@ -14,14 +18,18 @@ EBUILD dazuko-2.2.0.ebuild 1297 RMD160 4f55ea6cbb5d9dd0533669a49dd3da8f0576f433
 MD5 df67e67e44ebf67900596f29c094acd1 dazuko-2.2.0.ebuild 1297
 RMD160 4f55ea6cbb5d9dd0533669a49dd3da8f0576f433 dazuko-2.2.0.ebuild 1297
 SHA256 0841931715c44c1bf359d6f0ae2646f57feafad6561a1ed02968125c3794b898 dazuko-2.2.0.ebuild 1297
+EBUILD dazuko-2.3.1-r1.ebuild 1169 RMD160 82d2fca89bc34eac081188814c36de101f03b8d2 SHA1 f091efa4f1d2c88e713cafea0011c3c19d6dc77f SHA256 2e6c531c05dfe53224e2c834e8fa016c347077c3331e825b1d5cbf774fa442c2
+MD5 997e5d25d65cf25cadd75bffd92f0e3a dazuko-2.3.1-r1.ebuild 1169
+RMD160 82d2fca89bc34eac081188814c36de101f03b8d2 dazuko-2.3.1-r1.ebuild 1169
+SHA256 2e6c531c05dfe53224e2c834e8fa016c347077c3331e825b1d5cbf774fa442c2 dazuko-2.3.1-r1.ebuild 1169
 EBUILD dazuko-2.3.1.ebuild 1094 RMD160 d9f6d0a38c8e0dbbafff3d3414d864fe3c39217d SHA1 c55b8f51dcf217a784ba71f709c75a6114f92a89 SHA256 7fa71348c942729731e59294353b849da53a9ba5037fd092bb26a26ca6ee7851
 MD5 75cee2dc54b7e1609f3f6433452aa684 dazuko-2.3.1.ebuild 1094
 RMD160 d9f6d0a38c8e0dbbafff3d3414d864fe3c39217d dazuko-2.3.1.ebuild 1094
 SHA256 7fa71348c942729731e59294353b849da53a9ba5037fd092bb26a26ca6ee7851 dazuko-2.3.1.ebuild 1094
-MISC ChangeLog 1070 RMD160 2ac3513e2c096b8d39305fc2a19ce71bd390442a SHA1 264979734be520945d6b68336d0485494d1ace08 SHA256 7ee362a7e1259e8df12d6540e79165a1cba7c1852f438287c17aea9d8e9af9e2
-MD5 e20954b1b97b2c75476b3c2c0730447c ChangeLog 1070
-RMD160 2ac3513e2c096b8d39305fc2a19ce71bd390442a ChangeLog 1070
-SHA256 7ee362a7e1259e8df12d6540e79165a1cba7c1852f438287c17aea9d8e9af9e2 ChangeLog 1070
+MISC ChangeLog 1247 RMD160 48b1a1502fcff331a290f112c6d20b9c369bde78 SHA1 d4ca8d64a528a7e010af64a8cd5d74b01d3a4a30 SHA256 bca93bdd61520987d48594c1bf4cb2afb699363af766b4eff078d0cbd9d35272
+MD5 0d2ae08be15590279f3174e787683e1b ChangeLog 1247
+RMD160 48b1a1502fcff331a290f112c6d20b9c369bde78 ChangeLog 1247
+SHA256 bca93bdd61520987d48594c1bf4cb2afb699363af766b4eff078d0cbd9d35272 ChangeLog 1247
 MISC metadata.xml 980 RMD160 dfaf2070e4ef1023e90175d32fa626f334a56c07 SHA1 25e746478812c9b3c448ff3dd922a2bbc6129662 SHA256 c9a35d5cae928315a49ceb533066c2c41cf54e4fe4fa1529159b91e22274b022
 MD5 e0a4db020fd5c28ea5a62ecefe8f1ec6 metadata.xml 980
 RMD160 dfaf2070e4ef1023e90175d32fa626f334a56c07 metadata.xml 980
@@ -38,3 +46,6 @@ SHA256 e22a1d783310869355eeac6be4ce1a2aa7c412b977f9efac0f34abf15e610ecb files/di
 MD5 8f31c47adb977f4c0cb7f4ad7e2b87c3 files/digest-dazuko-2.3.1 238
 RMD160 43768b3180d16f70a1471c29b42d7940846360cf files/digest-dazuko-2.3.1 238
 SHA256 b21a17d99c6614c80a558bbe8e36974b36a9a79097167631b7f57c0fa504fb72 files/digest-dazuko-2.3.1 238
+MD5 8f31c47adb977f4c0cb7f4ad7e2b87c3 files/digest-dazuko-2.3.1-r1 238
+RMD160 43768b3180d16f70a1471c29b42d7940846360cf files/digest-dazuko-2.3.1-r1 238
+SHA256 b21a17d99c6614c80a558bbe8e36974b36a9a79097167631b7f57c0fa504fb72 files/digest-dazuko-2.3.1-r1 238
diff --git a/sys-fs/dazuko/dazuko-2.3.1-r1.ebuild b/sys-fs/dazuko/dazuko-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..604d8c0eab02
--- /dev/null
+++ b/sys-fs/dazuko/dazuko-2.3.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/dazuko-2.3.1-r1.ebuild,v 1.1 2006/11/08 18:41:51 alonbl Exp $
+
+inherit linux-mod
+
+DESCRIPTION="Linux kernel module and interface providing file access control"
+MY_P="${P/_/-}" # for -preN versions
+SRC_URI="http://www.dazuko.org/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.dazuko.org"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND=">=virtual/linux-sources-2.2"
+S="${WORKDIR}/${MY_P}"
+
+# kernel settings
+CONFIG_CHECK="SECURITY_CAPABILITIES"
+MODULE_NAMES="dazuko(misc:)"
+BUILD_TARGETS="dummy_rule"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-suspend2.patch"
+}
+
+src_compile() {
+	./configure \
+		--without-dep \
+		--kernelsrcdir="${KERNEL_DIR}" \
+		|| die "configure failed"
+	convert_to_m Makefile
+	linux-mod_src_compile
+
+	cd library
+	emake || die
+	cd ..
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dolib.a library/libdazuko.a
+	insinto /usr/include
+	doins dazukoio.h
+
+	dodoc COPYING
+	dodoc README
+	dodoc README.linux26
+	dodoc README.trusted
+}
+
diff --git a/sys-fs/dazuko/files/dazuko-2.3.1-suspend2.patch b/sys-fs/dazuko/files/dazuko-2.3.1-suspend2.patch
new file mode 100644
index 000000000000..b54e2c043d6a
--- /dev/null
+++ b/sys-fs/dazuko/files/dazuko-2.3.1-suspend2.patch
@@ -0,0 +1,69 @@
+diff -urNp dazuko-2.3.1.org/configure dazuko-2.3.1/configure
+--- dazuko-2.3.1.org/configure	2006-10-04 00:48:18.000000000 +0200
++++ dazuko-2.3.1/configure	2006-11-08 15:11:38.000000000 +0200
+@@ -590,21 +590,20 @@ do_linux26()
+ 		then
+ 			LINUX26_USE_SUSPEND=1
+ 		fi
++	fi
++
++	SRC_PATH_END="/include/linux/freezer.h"
++	get_src_path
+ 
+-		grep "try_todo_list.*(.*void.*)" "$SRC_PATH" > /dev/null 2>&1
++	if [ -f "$SRC_PATH" ]
++	then
++		grep "try_to_freeze.*(.*void.*)" "$SRC_PATH" > /dev/null 2>&1
+ 		if [ $? -eq 0 ]
+ 		then
+-			LINUX26_USE_SUSPEND=2
++			LINUX26_USE_SUSPEND=1
+ 		fi
+ 	fi
+ 
+-	if [ $LINUX26_USE_SUSPEND -eq 2 ]
+-	then
+-		echo "ok (suspend2)"
+-	else
+-		echo "ok (suspend1)"
+-	fi
+-
+ 	if [ $LOCAL_DPATH -eq 2 ]
+ 	then
+ 		LOCAL_DPATH=1
+@@ -705,11 +704,6 @@ do_linux26()
+ 		echo "EXTRA_CFLAGS += -DUSE_TRYTOFREEZEVOID" >> Makefile
+ 	fi
+ 
+-	if [ ${LINUX26_USE_SUSPEND} -eq 2 ]
+-	then
+-		echo "EXTRA_CFLAGS += -DUSE_SUSPEND2" >> Makefile
+-	fi
+-
+ 	if [ ${LINUX26_USE_CLASS} -eq 1 ]
+ 	then
+ 		echo "EXTRA_CFLAGS += -DUSE_CLASS" >> Makefile
+diff -urNp dazuko-2.3.1.org/dazuko_linux26.c dazuko-2.3.1/dazuko_linux26.c
+--- dazuko-2.3.1.org/dazuko_linux26.c	2006-07-29 12:13:03.000000000 +0300
++++ dazuko-2.3.1/dazuko_linux26.c	2006-11-08 15:15:25.000000000 +0200
+@@ -37,7 +37,7 @@
+ #include <linux/devfs_fs_kernel.h>
+ #endif
+ #include <linux/device.h>
+-#if !defined(USE_TRYTOFREEZEVOID) && !defined(USE_SUSPEND2)
++#if !defined(USE_TRYTOFREEZEVOID)
+ #include <linux/suspend.h>
+ #endif
+ #include <asm/uaccess.h>
+@@ -178,10 +178,7 @@ inline int xp_wait_until_condition(struc
+ 		{
+ 			ret = wait_event_interruptible(queue->queue, cfunction(cparam) != 0);
+ 
+-#ifdef USE_SUSPEND2
+-			if (try_todo_list() == 0)
+-				break;
+-#elif defined (USE_TRYTOFREEZEVOID)
++#if defined (USE_TRYTOFREEZEVOID)
+ 			if (try_to_freeze() == 0)
+ 				break;
+ #else
diff --git a/sys-fs/dazuko/files/digest-dazuko-2.3.1-r1 b/sys-fs/dazuko/files/digest-dazuko-2.3.1-r1
new file mode 100644
index 000000000000..4478b3fc29d0
--- /dev/null
+++ b/sys-fs/dazuko/files/digest-dazuko-2.3.1-r1
@@ -0,0 +1,3 @@
+MD5 7f8373d4b429a9e454aa556a8f2e40fb dazuko-2.3.1.tar.gz 176944
+RMD160 cc527bf0f251cfa96ec79ddbcc8e6ad49247dbef dazuko-2.3.1.tar.gz 176944
+SHA256 9481875699e6fefd80f40b945159df55815408f76f9fd511656c55a52499fc8e dazuko-2.3.1.tar.gz 176944