From 1d6b28c731fc1e1a2dc108187df51571537c5f16 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Tue, 12 Dec 2006 12:04:38 +0000 Subject: [PATCH] suspend2+2.6.19 fixups Package-Manager: portage-2.1.1-r2 --- sys-fs/dazuko/ChangeLog | 9 ++- sys-fs/dazuko/Manifest | 37 +++++-------- ...2.3.2-r1.ebuild => dazuko-2.3.2-r2.ebuild} | 2 +- sys-fs/dazuko/dazuko-2.3.2.ebuild | 55 ------------------- .../dazuko/files/dazuko-2.3.1-suspend2.patch | 41 ++++++++------ sys-fs/dazuko/files/digest-dazuko-2.3.2 | 3 - ...dazuko-2.3.2-r1 => digest-dazuko-2.3.2-r2} | 0 7 files changed, 48 insertions(+), 99 deletions(-) rename sys-fs/dazuko/{dazuko-2.3.2-r1.ebuild => dazuko-2.3.2-r2.ebuild} (91%) delete mode 100644 sys-fs/dazuko/dazuko-2.3.2.ebuild delete mode 100644 sys-fs/dazuko/files/digest-dazuko-2.3.2 rename sys-fs/dazuko/files/{digest-dazuko-2.3.2-r1 => digest-dazuko-2.3.2-r2} (100%) diff --git a/sys-fs/dazuko/ChangeLog b/sys-fs/dazuko/ChangeLog index da17c65d9924..c0d10d71a5e2 100644 --- a/sys-fs/dazuko/ChangeLog +++ b/sys-fs/dazuko/ChangeLog @@ -1,6 +1,13 @@ # 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.11 2006/12/09 18:41:37 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/ChangeLog,v 1.12 2006/12/12 12:01:03 alonbl Exp $ + +*dazuko-2.3.2-r2 (12 Dec 2006) + + 12 Dec 2006; Alon Bar-Lev + files/dazuko-2.3.1-suspend2.patch, -dazuko-2.3.2.ebuild, + -dazuko-2.3.2-r1.ebuild, +dazuko-2.3.2-r2.ebuild: + suspend2+2.6.19 fixups *dazuko-2.3.2-r1 (09 Dec 2006) diff --git a/sys-fs/dazuko/Manifest b/sys-fs/dazuko/Manifest index 7b40dcfc5f12..38ac8554f97a 100644 --- a/sys-fs/dazuko/Manifest +++ b/sys-fs/dazuko/Manifest @@ -1,7 +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 +AUX dazuko-2.3.1-suspend2.patch 1958 RMD160 43262ede5c7e66bb32b95ad4e3af773c2953113a SHA1 2e9affd853d849ad32457f73f6b7b3cd4b5b58e6 SHA256 e70fbaebd5d68c886362b56ea21fa9780fd842104dcc9fdaabe62229c7970569 +MD5 5c6bc834bd024ecebf764edfd7dc80aa files/dazuko-2.3.1-suspend2.patch 1958 +RMD160 43262ede5c7e66bb32b95ad4e3af773c2953113a files/dazuko-2.3.1-suspend2.patch 1958 +SHA256 e70fbaebd5d68c886362b56ea21fa9780fd842104dcc9fdaabe62229c7970569 files/dazuko-2.3.1-suspend2.patch 1958 DIST dazuko-2.1.0.tar.gz 159456 DIST dazuko-2.1.1.tar.gz 162359 DIST dazuko-2.2.0.tar.gz 162903 @@ -28,18 +28,14 @@ EBUILD dazuko-2.3.1.ebuild 1094 RMD160 d9f6d0a38c8e0dbbafff3d3414d864fe3c39217d MD5 75cee2dc54b7e1609f3f6433452aa684 dazuko-2.3.1.ebuild 1094 RMD160 d9f6d0a38c8e0dbbafff3d3414d864fe3c39217d dazuko-2.3.1.ebuild 1094 SHA256 7fa71348c942729731e59294353b849da53a9ba5037fd092bb26a26ca6ee7851 dazuko-2.3.1.ebuild 1094 -EBUILD dazuko-2.3.2-r1.ebuild 1337 RMD160 ab633a2d9ab944b04d547aac22f602de81396e7a SHA1 2297ae64845605f2ced95f7ac2a581296cb59984 SHA256 59ffe8ed7e38cf772089f12ce40ddb07e6f21650166d0c8be39884f21406f03e -MD5 e019423f2c3de494ba217acd348616b7 dazuko-2.3.2-r1.ebuild 1337 -RMD160 ab633a2d9ab944b04d547aac22f602de81396e7a dazuko-2.3.2-r1.ebuild 1337 -SHA256 59ffe8ed7e38cf772089f12ce40ddb07e6f21650166d0c8be39884f21406f03e dazuko-2.3.2-r1.ebuild 1337 -EBUILD dazuko-2.3.2.ebuild 1211 RMD160 88489df5dd7a27a52f7d127c361e0b174f8b50e0 SHA1 b055574d02f5da806dd168909b93601fb57c3848 SHA256 222f953f6ef189d7473b54943aeed6440e46c996e0eb4ecfa0d308dc48f5659c -MD5 6c532c3cab5789e801f51a0834489bdf dazuko-2.3.2.ebuild 1211 -RMD160 88489df5dd7a27a52f7d127c361e0b174f8b50e0 dazuko-2.3.2.ebuild 1211 -SHA256 222f953f6ef189d7473b54943aeed6440e46c996e0eb4ecfa0d308dc48f5659c dazuko-2.3.2.ebuild 1211 -MISC ChangeLog 1623 RMD160 a97788bf8604bbb6d9e85f43aa3c31f87bf5812c SHA1 a73fb7da5a26eec8f4ec17cac95a0f72e1b87269 SHA256 f9842deb6127a86629dde5e2842f4287b83ba541fa397e4bea8c665018a45579 -MD5 127b6e4abf4f51bc74d3d99b8d842fb3 ChangeLog 1623 -RMD160 a97788bf8604bbb6d9e85f43aa3c31f87bf5812c ChangeLog 1623 -SHA256 f9842deb6127a86629dde5e2842f4287b83ba541fa397e4bea8c665018a45579 ChangeLog 1623 +EBUILD dazuko-2.3.2-r2.ebuild 1337 RMD160 5689b2097f72c1e9f2011dfeb9cbc8afd80a904d SHA1 5da079b14456355ec44275b2af03bbc52f2b79a8 SHA256 1aff2a7ed0c26149cf1ef649d996d2847e00c87a05eab49a68255343ef7e96b1 +MD5 842300fb0ba94eaa0f3360e96f6f0330 dazuko-2.3.2-r2.ebuild 1337 +RMD160 5689b2097f72c1e9f2011dfeb9cbc8afd80a904d dazuko-2.3.2-r2.ebuild 1337 +SHA256 1aff2a7ed0c26149cf1ef649d996d2847e00c87a05eab49a68255343ef7e96b1 dazuko-2.3.2-r2.ebuild 1337 +MISC ChangeLog 1840 RMD160 6e501271736c2a1c5395855bb02bec16ed07e78b SHA1 01a448fb64b051053d61cb815fb2a25ff73d1aea SHA256 85e121e0c8ba7a1365b610b55a53a9b878b601c3c17599ce5f50b50299719c11 +MD5 6984643223233d5eb89403fa9d1abc54 ChangeLog 1840 +RMD160 6e501271736c2a1c5395855bb02bec16ed07e78b ChangeLog 1840 +SHA256 85e121e0c8ba7a1365b610b55a53a9b878b601c3c17599ce5f50b50299719c11 ChangeLog 1840 MISC metadata.xml 980 RMD160 dfaf2070e4ef1023e90175d32fa626f334a56c07 SHA1 25e746478812c9b3c448ff3dd922a2bbc6129662 SHA256 c9a35d5cae928315a49ceb533066c2c41cf54e4fe4fa1529159b91e22274b022 MD5 e0a4db020fd5c28ea5a62ecefe8f1ec6 metadata.xml 980 RMD160 dfaf2070e4ef1023e90175d32fa626f334a56c07 metadata.xml 980 @@ -59,9 +55,6 @@ SHA256 b21a17d99c6614c80a558bbe8e36974b36a9a79097167631b7f57c0fa504fb72 files/di 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 -MD5 f9f54352941af145b8444188df816523 files/digest-dazuko-2.3.2 238 -RMD160 4ae20268dd95b194559ec29500243e6325cc6042 files/digest-dazuko-2.3.2 238 -SHA256 6c47094d5881ad4123cafda2bcc0574ccb1284c24643a190c440256ca4637cb6 files/digest-dazuko-2.3.2 238 -MD5 17b72cb4bbd996aa51c5a7e4e456b6ca files/digest-dazuko-2.3.2-r1 518 -RMD160 588203f5d747d496147e72a519ba266ebe25cb7c files/digest-dazuko-2.3.2-r1 518 -SHA256 a5393833af7e8def4923cbbc3d9b865dbf5594fd2ce8c4291e01c394fc8aca02 files/digest-dazuko-2.3.2-r1 518 +MD5 17b72cb4bbd996aa51c5a7e4e456b6ca files/digest-dazuko-2.3.2-r2 518 +RMD160 588203f5d747d496147e72a519ba266ebe25cb7c files/digest-dazuko-2.3.2-r2 518 +SHA256 a5393833af7e8def4923cbbc3d9b865dbf5594fd2ce8c4291e01c394fc8aca02 files/digest-dazuko-2.3.2-r2 518 diff --git a/sys-fs/dazuko/dazuko-2.3.2-r1.ebuild b/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild similarity index 91% rename from sys-fs/dazuko/dazuko-2.3.2-r1.ebuild rename to sys-fs/dazuko/dazuko-2.3.2-r2.ebuild index 36c230fbab9d..256634c691b7 100644 --- a/sys-fs/dazuko/dazuko-2.3.2-r1.ebuild +++ b/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild @@ -1,6 +1,6 @@ # 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.2-r1.ebuild,v 1.1 2006/12/09 18:41:37 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild,v 1.1 2006/12/12 12:01:03 alonbl Exp $ inherit linux-mod diff --git a/sys-fs/dazuko/dazuko-2.3.2.ebuild b/sys-fs/dazuko/dazuko-2.3.2.ebuild deleted file mode 100644 index 54dba2b71cbd..000000000000 --- a/sys-fs/dazuko/dazuko-2.3.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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.2.ebuild,v 1.2 2006/12/02 16:02:44 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}/${PN}-2.3.1-suspend2.patch" -} - -src_compile() { - ./configure \ - --without-dep \ - --kernelsrcdir="${KERNEL_DIR}" \ - --kernelobjdir="${KBUILD_OUTPUT}" \ - || 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 index b54e2c043d6a..fa4df44c4830 100644 --- a/sys-fs/dazuko/files/dazuko-2.3.1-suspend2.patch +++ b/sys-fs/dazuko/files/dazuko-2.3.1-suspend2.patch @@ -1,6 +1,6 @@ -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 +diff -urNp dazuko-2.3.2.org/configure dazuko-2.3.2/configure +--- dazuko-2.3.2.org/configure 2006-10-04 00:48:18.000000000 +0200 ++++ dazuko-2.3.2/configure 2006-12-12 13:49:04.000000000 +0200 @@ -590,21 +590,20 @@ do_linux26() then LINUX26_USE_SUSPEND=1 @@ -16,8 +16,7 @@ diff -urNp dazuko-2.3.1.org/configure dazuko-2.3.1/configure + grep "try_to_freeze.*(.*void.*)" "$SRC_PATH" > /dev/null 2>&1 if [ $? -eq 0 ] then -- LINUX26_USE_SUSPEND=2 -+ LINUX26_USE_SUSPEND=1 + LINUX26_USE_SUSPEND=2 fi fi @@ -31,22 +30,25 @@ diff -urNp dazuko-2.3.1.org/configure dazuko-2.3.1/configure if [ $LOCAL_DPATH -eq 2 ] then LOCAL_DPATH=1 -@@ -705,11 +704,6 @@ do_linux26() +@@ -700,12 +699,12 @@ do_linux26() + echo "EXTRA_CFLAGS += -DNO_CAPABILITIES" >> Makefile + fi + +- if [ ${LINUX26_USE_SUSPEND} -eq 1 ] ++ if [ -n "${LINUX26_USE_SUSPEND}" ] + then 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 ] ++ if [ "${LINUX26_USE_SUSPEND}" -eq 2 ] 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 @@ + echo "EXTRA_CFLAGS += -DUSE_SUSPEND2" >> Makefile + fi +diff -urNp dazuko-2.3.2.org/dazuko_linux26.c dazuko-2.3.2/dazuko_linux26.c +--- dazuko-2.3.2.org/dazuko_linux26.c 2006-11-15 10:11:20.000000000 +0200 ++++ dazuko-2.3.2/dazuko_linux26.c 2006-12-12 13:51:04.000000000 +0200 +@@ -37,9 +37,12 @@ #include #endif #include @@ -54,8 +56,13 @@ diff -urNp dazuko-2.3.1.org/dazuko_linux26.c dazuko-2.3.1/dazuko_linux26.c +#if !defined(USE_TRYTOFREEZEVOID) #include #endif ++#if USE_SUSPEND2 ++#include ++#endif #include -@@ -178,10 +178,7 @@ inline int xp_wait_until_condition(struc + + +@@ -178,10 +181,7 @@ inline int xp_wait_until_condition(struc { ret = wait_event_interruptible(queue->queue, cfunction(cparam) != 0); diff --git a/sys-fs/dazuko/files/digest-dazuko-2.3.2 b/sys-fs/dazuko/files/digest-dazuko-2.3.2 deleted file mode 100644 index 186742590861..000000000000 --- a/sys-fs/dazuko/files/digest-dazuko-2.3.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bb32e24ad60a31dbfc419d3341287f68 dazuko-2.3.2.tar.gz 177134 -RMD160 57fd3dd45a61609a18829467966657ef658ed500 dazuko-2.3.2.tar.gz 177134 -SHA256 b396fc344cf1bad0d7dfb6675573a8ca189f34867fe1256c7f31c8ec9aab45bb dazuko-2.3.2.tar.gz 177134 diff --git a/sys-fs/dazuko/files/digest-dazuko-2.3.2-r1 b/sys-fs/dazuko/files/digest-dazuko-2.3.2-r2 similarity index 100% rename from sys-fs/dazuko/files/digest-dazuko-2.3.2-r1 rename to sys-fs/dazuko/files/digest-dazuko-2.3.2-r2 -- 2.26.2