diff options
author | Christian Andreetta <satya@gentoo.org> | 2006-04-04 08:41:09 +0000 |
---|---|---|
committer | Christian Andreetta <satya@gentoo.org> | 2006-04-04 08:41:09 +0000 |
commit | 20124bacc474e7037d8486bc557eba600505aa36 (patch) | |
tree | 6f4c40f75fee656166a63bf5f1713b5015c9229b /sys-fs/unionfs | |
parent | Add ~x86-fbsd keyword for sancho 0.11. (diff) | |
download | historical-20124bacc474e7037d8486bc557eba600505aa36.tar.gz historical-20124bacc474e7037d8486bc557eba600505aa36.tar.bz2 historical-20124bacc474e7037d8486bc557eba600505aa36.zip |
Old ebuilds spring cleanings. unionfs-1.1.3 kernel lock patch: semaphores<=2.6.15, mutex>2.6.15 (bug #127073: thanks to Norberto Bensa and diegob80[at]yahoo.it)
Package-Manager: portage-2.1_pre7-r1
Diffstat (limited to 'sys-fs/unionfs')
-rw-r--r-- | sys-fs/unionfs/ChangeLog | 15 | ||||
-rw-r--r-- | sys-fs/unionfs/Manifest | 48 | ||||
-rw-r--r-- | sys-fs/unionfs/files/digest-unionfs-1.0.11 | 1 | ||||
-rw-r--r-- | sys-fs/unionfs/files/digest-unionfs-1.0.12a | 1 | ||||
-rw-r--r-- | sys-fs/unionfs/files/digest-unionfs-1.0.13 | 1 | ||||
-rw-r--r-- | sys-fs/unionfs/files/digest-unionfs-1.1.1 | 3 | ||||
-rw-r--r-- | sys-fs/unionfs/files/digest-unionfs-1.1.3-r1 | 3 | ||||
-rw-r--r-- | sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch | 20 | ||||
-rw-r--r-- | sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch | 10 | ||||
-rw-r--r-- | sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch | 20 | ||||
-rw-r--r-- | sys-fs/unionfs/files/unionfs-1.1.3-15-kernel_mutex.patch | 318 | ||||
-rw-r--r-- | sys-fs/unionfs/unionfs-1.0.11.ebuild | 49 | ||||
-rw-r--r-- | sys-fs/unionfs/unionfs-1.0.12a.ebuild | 49 | ||||
-rw-r--r-- | sys-fs/unionfs/unionfs-1.0.13.ebuild | 49 | ||||
-rw-r--r-- | sys-fs/unionfs/unionfs-1.1.3-r1.ebuild (renamed from sys-fs/unionfs/unionfs-1.1.1.ebuild) | 5 |
15 files changed, 349 insertions, 243 deletions
diff --git a/sys-fs/unionfs/ChangeLog b/sys-fs/unionfs/ChangeLog index deb17bc42664..9fc826a0f8a7 100644 --- a/sys-fs/unionfs/ChangeLog +++ b/sys-fs/unionfs/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for sys-fs/unionfs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.18 2006/02/21 11:37:52 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.19 2006/04/04 08:41:09 satya Exp $ + +*unionfs-1.1.3-r1 (04 Apr 2006) + + 04 Apr 2006; Christian Andreetta <satya@gentoo.org> + -files/unionfs-1.0.11-amd64.patch, + -files/unionfs-1.0.13-delbranch-fix.patch, + -files/unionfs-1.1.1-10-nfs.patch, + +files/unionfs-1.1.3-15-kernel_mutex.patch, -unionfs-1.0.11.ebuild, + -unionfs-1.0.12a.ebuild, -unionfs-1.0.13.ebuild, -unionfs-1.1.1.ebuild, + +unionfs-1.1.3-r1.ebuild: + Old ebuilds spring cleanings. + unionfs-1.1.3 kernel lock patch: semaphores<=2.6.15, mutex>2.6.15 (bug + #127073: thanks to Norberto Bensa and diegob80[at]yahoo.it) *unionfs-1.1.3 (21 Feb 2006) diff --git a/sys-fs/unionfs/Manifest b/sys-fs/unionfs/Manifest index c7e2d2a8bcae..2e58b993a0ca 100644 --- a/sys-fs/unionfs/Manifest +++ b/sys-fs/unionfs/Manifest @@ -1,63 +1,39 @@ -MD5 c0269eabb91181b000419173448bc930 ChangeLog 3733 -RMD160 e2234dc9e7bcc26ff97ef70d304e30378c529cff ChangeLog 3733 -SHA256 b7bdd9c784b8818eef154795d164cfa28f96a30d66ab8598357150228d5d78cb ChangeLog 3733 -MD5 2410ef6f38ddf9737cbb13bfe0325c9a files/digest-unionfs-1.0.11 66 -RMD160 311b75718d381cea294a5c830d9d9a09e11cc81a files/digest-unionfs-1.0.11 66 -SHA256 4d05d50e01a972b677a359fd745f2198ea48f9c5f0737fa74322ce574dbfcee5 files/digest-unionfs-1.0.11 66 -MD5 a437f2bf3da231ea3a2a2835949d3a37 files/digest-unionfs-1.0.12a 67 -RMD160 8262ebc09604bc094238b0504802bb7d93445ff8 files/digest-unionfs-1.0.12a 67 -SHA256 efb5e1c39383e3e6e7d4579e930e4d15ff0af4a15d9d1c42a84713923404fc0f files/digest-unionfs-1.0.12a 67 -MD5 c2f37c6131dd9b96868aa3762fa444be files/digest-unionfs-1.0.13 66 -RMD160 725fe1d4a75a9cad7a7e3188e627fe2ad4be71b4 files/digest-unionfs-1.0.13 66 -SHA256 5cba9d5073d6381058e7f4df92557aa6233f2b793e27fb1bc74ed21f36bb5018 files/digest-unionfs-1.0.13 66 +MD5 478c72b7dee2de377d370fbfbbfb5f48 ChangeLog 4279 +RMD160 278181df6db10d7f6e5b02a63cc94380afcaea00 ChangeLog 4279 +SHA256 aa77b644d25edc9721e24467768358b8a2f17f9a50163328d45f577a5ddd26bf ChangeLog 4279 MD5 a8d7fc6d22b85ab4bf8a36a7a1462ca7 files/digest-unionfs-1.0.14 66 RMD160 a36bfb55d7d93874f483a6664a7284e7792c5ca1 files/digest-unionfs-1.0.14 66 SHA256 0b16689d9c44105e47f90d13802c59a55c29b3558085271ca557482f12224153 files/digest-unionfs-1.0.14 66 -MD5 133a3cd0fa7248e858bfdad536e47a0f files/digest-unionfs-1.1.1 241 -RMD160 93c8ada69192e2bfe77d2ffc42ac3459fc9ddfd9 files/digest-unionfs-1.1.1 241 -SHA256 7872525da240066ad94966fec2894687ab47a93901e2ca7d340aac51f0572d5f files/digest-unionfs-1.1.1 241 MD5 fbd38667466c2e1f59ba6da8df0807d2 files/digest-unionfs-1.1.2 241 RMD160 f858fa4d566875116c0d907b8037f6f5fa0377b4 files/digest-unionfs-1.1.2 241 SHA256 f340d87b2bbaac0ce5a0ebeb855f944d33f4f5cecf742baa27e060580850c25c files/digest-unionfs-1.1.2 241 MD5 4cf95843061974d0590543add4cf169d files/digest-unionfs-1.1.3 241 RMD160 927668c7bc97a65abb61124bdc648d608b346be7 files/digest-unionfs-1.1.3 241 SHA256 a8119940d7f1e6c387ef4f594a8d5dcbd35bfda130ccdb326f0c6f7b16743e04 files/digest-unionfs-1.1.3 241 -MD5 f9a155123bfab53c81cb6c454492b797 files/unionfs-1.0.11-amd64.patch 586 -RMD160 a36c627298d309ea6821dff64dd38b61ca109ee5 files/unionfs-1.0.11-amd64.patch 586 -SHA256 ceea07689955f530e0fb23130bf20d3c63bb9611a1ac740d528d286368512e64 files/unionfs-1.0.11-amd64.patch 586 +MD5 4cf95843061974d0590543add4cf169d files/digest-unionfs-1.1.3-r1 241 +RMD160 927668c7bc97a65abb61124bdc648d608b346be7 files/digest-unionfs-1.1.3-r1 241 +SHA256 a8119940d7f1e6c387ef4f594a8d5dcbd35bfda130ccdb326f0c6f7b16743e04 files/digest-unionfs-1.1.3-r1 241 MD5 733bc242378499ba766283fa6441f5cb files/unionfs-1.0.13-amd64.patch 685 RMD160 33a1b89f870138018ccd7a03d75b3d9a12abeda0 files/unionfs-1.0.13-amd64.patch 685 SHA256 3dbfb59db79dc6f759acab6cfc7d23f13b6c2240676fcb1d7e27657f37b9e256 files/unionfs-1.0.13-amd64.patch 685 -MD5 f0868138a13d17e35615d074edc5f5d3 files/unionfs-1.0.13-delbranch-fix.patch 356 -RMD160 6a78e0ab5cd8409e10537a33bd3e00ae09cf23b9 files/unionfs-1.0.13-delbranch-fix.patch 356 -SHA256 f5f5ba8cd7ec45682c8bb70f29b2e4cccaddb091dd17f18c5d03a8862dffa3bf files/unionfs-1.0.13-delbranch-fix.patch 356 MD5 2a23c7c6731b07884a03707903fc13d5 files/unionfs-1.0.14-remove_call_to_ctags.patch 435 RMD160 0b4fbce6b60e027704646c6e2806de31c38e3a7d files/unionfs-1.0.14-remove_call_to_ctags.patch 435 SHA256 668d626631cb59fec05b27fd95ac678d78f37c064d273d4489285b13f057f96e files/unionfs-1.0.14-remove_call_to_ctags.patch 435 -MD5 5eba7d426c373210d62be3a1450bb9d9 files/unionfs-1.1.1-10-nfs.patch 944 -RMD160 f78ca5729c11b8ce8c9003415acc758c55c62abb files/unionfs-1.1.1-10-nfs.patch 944 -SHA256 64c6fd10b96f6168365b6b7df79391a394539c299fe879ee2e8ccbdb7de5d589 files/unionfs-1.1.1-10-nfs.patch 944 +MD5 2fbd5fa8c13724ce61134def6f4ee11c files/unionfs-1.1.3-15-kernel_mutex.patch 9295 +RMD160 3d7d9fa6a364bf0c5ed667f1a4e00d4db8a95144 files/unionfs-1.1.3-15-kernel_mutex.patch 9295 +SHA256 2fd343a08f720acff48fa97dde5835e5509056d7eedc7777d2e22a456ce2299f files/unionfs-1.1.3-15-kernel_mutex.patch 9295 MD5 96d407682dea1c353b3c90b68bdc340b metadata.xml 265 RMD160 93c485660165e3e9cb74956c943001e9fc592b73 metadata.xml 265 SHA256 f2594ac72cd2f0b78ff765edd2ec0047c4de0b37a046150932047f3a9061c46f metadata.xml 265 -MD5 376c326368cd6cadf7e6b0ded8e03eb8 unionfs-1.0.11.ebuild 1341 -RMD160 11c9249ac4d88cc18eb7f7e6788f516c6da6f633 unionfs-1.0.11.ebuild 1341 -SHA256 b97c202407512b6a429c92c7af34aa102669b67c995ed13e4a3b145bcc7d54df unionfs-1.0.11.ebuild 1341 -MD5 1ff5f88f02335771fec32a90579f38a6 unionfs-1.0.12a.ebuild 1358 -RMD160 7872a77bcefd70577cc0152f5ccbe94cfeabf604 unionfs-1.0.12a.ebuild 1358 -SHA256 85ee8594e367acf3fc2d2b1d6e4b5c32eda775b7a412935f1e0ff333ab0344ef unionfs-1.0.12a.ebuild 1358 -MD5 efcb306b78f98f3a30d53d6d977a7118 unionfs-1.0.13.ebuild 1350 -RMD160 e38e54a28c8dc2efd709503e9f43ad3e570d6246 unionfs-1.0.13.ebuild 1350 -SHA256 a76594dc5a5cad26b560fec5a56f185611b854ed6fb2343e55a02b955e9000b7 unionfs-1.0.13.ebuild 1350 MD5 3262d5486fbdc93bf0ec35f815046896 unionfs-1.0.14.ebuild 1380 RMD160 638c88ed3a30dbb869be33dbb5e797243b87e5a6 unionfs-1.0.14.ebuild 1380 SHA256 241b993a63f479857e1605a314cec0af4394904f9d5109bb60be30e9f8c9b41b unionfs-1.0.14.ebuild 1380 -MD5 d663f8b16451354518093269b23b5baf unionfs-1.1.1.ebuild 1402 -RMD160 128a035ea9c3354c8e81f021dc7789d7cfccc453 unionfs-1.1.1.ebuild 1402 -SHA256 8aa271081e4a4c2b2a94e3fc35a47d5b4d3f6afe03ac61e43bd8a72ce234be30 unionfs-1.1.1.ebuild 1402 MD5 d1b5bd50f8e4538d9709d643bcd45d9d unionfs-1.1.2.ebuild 1354 RMD160 650312e0a00f4ba03a4428dcd4c490018beca3d6 unionfs-1.1.2.ebuild 1354 SHA256 4c15091cac72fb566a61b2deb1a7189d31d4f4d6718544a6aa36ce29b96ebd87 unionfs-1.1.2.ebuild 1354 +MD5 db9a177cbafc2d665ba12eb054524c1f unionfs-1.1.3-r1.ebuild 1413 +RMD160 b685edb5c3b4bba7dfb538a1af3b1ac0025df625 unionfs-1.1.3-r1.ebuild 1413 +SHA256 459b15c7b771d2e8d5bb33f97494752542a3e0fdffed89a1a41ef6c47ab59a57 unionfs-1.1.3-r1.ebuild 1413 MD5 335aaf738017fbbfe1974a748ae21a14 unionfs-1.1.3.ebuild 1354 RMD160 632d97c5e592751d7ef52618e180fddb623b9e74 unionfs-1.1.3.ebuild 1354 SHA256 6f84f0e1012f2086a50ff4144a737ab7bc906279a25bef1960e1170959ce1a2a unionfs-1.1.3.ebuild 1354 diff --git a/sys-fs/unionfs/files/digest-unionfs-1.0.11 b/sys-fs/unionfs/files/digest-unionfs-1.0.11 deleted file mode 100644 index 9a3f0ad9b893..000000000000 --- a/sys-fs/unionfs/files/digest-unionfs-1.0.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 494651fe0cf724c093b4be80e35e857f unionfs-1.0.11.tar.gz 109648 diff --git a/sys-fs/unionfs/files/digest-unionfs-1.0.12a b/sys-fs/unionfs/files/digest-unionfs-1.0.12a deleted file mode 100644 index 9d16d7e5e89d..000000000000 --- a/sys-fs/unionfs/files/digest-unionfs-1.0.12a +++ /dev/null @@ -1 +0,0 @@ -MD5 6d7f0b7e111d40cd8799510c6a9eca92 unionfs-1.0.12a.tar.gz 120853 diff --git a/sys-fs/unionfs/files/digest-unionfs-1.0.13 b/sys-fs/unionfs/files/digest-unionfs-1.0.13 deleted file mode 100644 index d7407e115654..000000000000 --- a/sys-fs/unionfs/files/digest-unionfs-1.0.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 1dca48ff260dacf890b8040a3cea55b3 unionfs-1.0.13.tar.gz 136808 diff --git a/sys-fs/unionfs/files/digest-unionfs-1.1.1 b/sys-fs/unionfs/files/digest-unionfs-1.1.1 deleted file mode 100644 index f6551dcadfd0..000000000000 --- a/sys-fs/unionfs/files/digest-unionfs-1.1.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7fd4922cf9d5be9ee4301aae14827a3e unionfs-1.1.1.tar.gz 144244 -RMD160 efb384c20201e440b37e0aff90f00e70967abed9 unionfs-1.1.1.tar.gz 144244 -SHA256 40639e3a7d2ea1ee37e7af4247c32534f849071ed0e08dfab8de46676dd4d55f unionfs-1.1.1.tar.gz 144244 diff --git a/sys-fs/unionfs/files/digest-unionfs-1.1.3-r1 b/sys-fs/unionfs/files/digest-unionfs-1.1.3-r1 new file mode 100644 index 000000000000..3d378e45bef3 --- /dev/null +++ b/sys-fs/unionfs/files/digest-unionfs-1.1.3-r1 @@ -0,0 +1,3 @@ +MD5 90f0c972b7bc91baa4cd791ce196d347 unionfs-1.1.3.tar.gz 151630 +RMD160 d94ffe6a5262c530af50740bcb23e26248f644e5 unionfs-1.1.3.tar.gz 151630 +SHA256 35c7a410ae847bb49e492110810d4c80956529631b3176e18d6503cd4a511399 unionfs-1.1.3.tar.gz 151630 diff --git a/sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch b/sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch deleted file mode 100644 index ae1564d546ca..000000000000 --- a/sys-fs/unionfs/files/unionfs-1.0.11-amd64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- unionfs-1.0.11/file.c 2005-03-24 03:25:47.000000000 +0000 -+++ unionfs-1.0.11_malc/file.c 2005-03-26 21:32:16.000000000 +0000 -@@ -22,6 +22,7 @@ - #include "fist.h" - #include "unionfs.h" - #include <linux/dcache.h> -+#include <linux/compat.h> - - /******************* - * File Operations * ---- unionfs-1.0.11/locks.c 2005-03-24 03:25:47.000000000 +0000 -+++ unionfs-1.0.11_malc/locks.c 2005-03-26 21:33:10.000000000 +0000 -@@ -22,6 +22,7 @@ - #endif /* HAVE_CONFIG_H */ - #include "fist.h" - #include "unionfs.h" -+#include <linux/compat.h> - - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) diff --git a/sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch b/sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch deleted file mode 100644 index c354a56b8302..000000000000 --- a/sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /var/tmp/portage/unionfs-1.0.13/work/unionfs-1.0.13/xattr.c 2005-07-22 19:16:48.000000000 +0200 -+++ ../xattr.c 2005-08-04 15:24:16.543918797 +0200 -@@ -133,7 +133,6 @@ - /* Call the ioctl function */ - err = - unionfs_ioctl_delbranch(dentry->d_inode, -- NULL, - UNIONFS_IOCTL_DELBRANCH, - ival); - goto out; diff --git a/sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch b/sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch deleted file mode 100644 index e895589be0ed..000000000000 --- a/sys-fs/unionfs/files/unionfs-1.1.1-10-nfs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- inode.c.orig 2005-10-27 10:01:48.000000000 +0200 -+++ inode.c 2005-10-27 10:02:50.000000000 +0200 -@@ -826,7 +826,7 @@ - - /* Basically copied from the kernel vfs permission(), but we've changed - * the following: (1) the IS_RDONLY check is skipped, and (2) if you define -- * -DNFS_SECURITY_HOLE, we assume that -EACCESS means that the export is -+ * -DNFS_SECURITY_HOLE, we assume that -EACCES means that the export is - * read-only and we should check standard Unix permissions. This means - * that NFS ACL checks (or other advanced permission features) are bypassed. - */ -@@ -856,7 +856,7 @@ - retval = inode->i_op->permission(inode, submask, nd); - #ifdef NFS_SECURITY_HOLE - #define IS_NFS(inode) (strcmp("nfs", (inode)->i_sb->s_type->s_name)) -- if ((retval == -EACCESS) && (submask & MAY_WRITE) && -+ if ((retval == -EACCES) && (submask & MAY_WRITE) && - IS_NFS(inode)) { - retval = generic_permission(inode, submask, NULL); - } diff --git a/sys-fs/unionfs/files/unionfs-1.1.3-15-kernel_mutex.patch b/sys-fs/unionfs/files/unionfs-1.1.3-15-kernel_mutex.patch new file mode 100644 index 000000000000..dfcb0ce79fa1 --- /dev/null +++ b/sys-fs/unionfs/files/unionfs-1.1.3-15-kernel_mutex.patch @@ -0,0 +1,318 @@ +diff -urN unionfs-1.1.3.old/copyup.c unionfs-1.1.3.new/copyup.c +--- unionfs-1.1.3.old/copyup.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/copyup.c 2006-04-03 22:35:26.413786991 -0300 +@@ -64,7 +64,11 @@ + name_list_orig = name_list; + while (*name_list) { + ssize_t size; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&old_hidden_dentry->d_inode->i_mutex); ++#else + down(&old_hidden_dentry->d_inode->i_sem); ++#endif + err = security_inode_getxattr(old_hidden_dentry, name_list); + if (err) + size = err; +@@ -73,7 +77,11 @@ + old_hidden_dentry->d_inode->i_op-> + getxattr(old_hidden_dentry, name_list, attr_value, + XATTR_SIZE_MAX); ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&old_hidden_dentry->d_inode->i_mutex); ++#else + up(&old_hidden_dentry->d_inode->i_sem); ++#endif + if (size < 0) { + err = size; + goto out; +@@ -84,7 +92,11 @@ + goto out; + } + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&new_hidden_dentry->d_inode->i_mutex); ++#else + down(&new_hidden_dentry->d_inode->i_sem); ++#endif + + err = + security_inode_setxattr(old_hidden_dentry, name_list, +@@ -101,7 +113,11 @@ + attr_value, size, + 0); + } ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&new_hidden_dentry->d_inode->i_mutex); ++#else + up(&new_hidden_dentry->d_inode->i_sem); ++#endif + + if (err < 0) + goto out; +diff -urN unionfs-1.1.3.old/dentry.c unionfs-1.1.3.new/dentry.c +--- unionfs-1.1.3.old/dentry.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/dentry.c 2006-04-03 22:35:36.633885836 -0300 +@@ -108,7 +108,12 @@ + interpose_flag = INTERPOSE_REVAL_NEG; + if (positive) { + interpose_flag = INTERPOSE_REVAL; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&dentry->d_inode->i_mutex); ++#else + down(&dentry->d_inode->i_sem); ++#endif ++ + bstart = ibstart(dentry->d_inode); + bend = ibend(dentry->d_inode); + if (bstart >= 0) { +@@ -126,7 +131,11 @@ + itohi_ptr(dentry->d_inode) = NULL; + ibstart(dentry->d_inode) = -1; + ibend(dentry->d_inode) = -1; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&dentry->d_inode->i_mutex); ++#else + up(&dentry->d_inode->i_sem); ++#endif + } + + result = unionfs_lookup_backend(dentry, interpose_flag); +diff -urN unionfs-1.1.3.old/dirhelper.c unionfs-1.1.3.new/dirhelper.c +--- unionfs-1.1.3.old/dirhelper.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/dirhelper.c 2006-04-03 22:35:45.579217856 -0300 +@@ -78,11 +78,19 @@ + continue; + } + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_dir_dentry->d_inode->i_mutex); ++#else + down(&hidden_dir_dentry->d_inode->i_sem); ++#endif + err = + vfs_unlink(hidden_dir_dentry->d_inode, + hidden_dentry); +- up(&hidden_dir_dentry->d_inode->i_sem); ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex); ++#else ++ down(&hidden_dir_dentry->d_inode->i_sem); ++#endif + DPUT(hidden_dentry); + + if (err && !IS_COPYUP_ERR(err)) +diff -urN unionfs-1.1.3.old/file.c unionfs-1.1.3.new/file.c +--- unionfs-1.1.3.old/file.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/file.c 2006-04-03 22:42:17.319560146 -0300 +@@ -264,10 +264,18 @@ + if (!hidden_file->f_op || !hidden_file->f_op->fsync) + goto out; + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_file->f_dentry->d_inode->i_mutex); ++#else + down(&hidden_file->f_dentry->d_inode->i_sem); ++#endif + err = hidden_file->f_op->fsync(hidden_file, hidden_file->f_dentry, + datasync); ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_file->f_dentry->d_inode->i_mutex); ++#else + up(&hidden_file->f_dentry->d_inode->i_sem); ++#endif + + out: + print_exit_status(err); +diff -urN unionfs-1.1.3.old/inode.c unionfs-1.1.3.new/inode.c +--- unionfs-1.1.3.old/inode.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/inode.c 2006-04-03 22:42:17.346555567 -0300 +@@ -81,7 +81,11 @@ + struct dentry *hidden_dir_dentry; + struct iattr newattrs; + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&whiteout_dentry->d_inode->i_mutex); ++#else + down(&whiteout_dentry->d_inode->i_sem); ++#endif + newattrs.ia_valid = ATTR_CTIME | ATTR_MODE | ATTR_ATIME + | ATTR_MTIME | ATTR_UID | ATTR_GID | ATTR_FORCE + | ATTR_KILL_SUID | ATTR_KILL_SGID; +@@ -97,7 +101,11 @@ + + err = notify_change(whiteout_dentry, &newattrs); + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&whiteout_dentry->d_inode->i_mutex); ++#else + up(&whiteout_dentry->d_inode->i_sem); ++#endif + + if (err) + printk(KERN_WARNING +@@ -594,10 +602,20 @@ + err = PTR_ERR(whiteout_dentry); + goto out; + } ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++#else + down(&hidden_dentry->d_inode->i_sem); ++#endif ++ + err = vfs_create(hidden_dentry->d_inode, + whiteout_dentry, 0600, NULL); ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); ++#else + up(&hidden_dentry->d_inode->i_sem); ++#endif ++ + DPUT(whiteout_dentry); + + if (err) { +diff -urN unionfs-1.1.3.old/main.c unionfs-1.1.3.new/main.c +--- unionfs-1.1.3.old/main.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/main.c 2006-04-03 22:42:17.365552345 -0300 +@@ -103,7 +103,12 @@ + } + } + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&inode->i_mutex); ++#else + down(&inode->i_sem); ++#endif ++ + if (atomic_read(&inode->i_count) > 1) + goto skip; + +@@ -172,7 +177,11 @@ + + fist_print_dentry("Leaving unionfs_interpose", dentry); + fist_print_inode("Leaving unionfs_interpose", inode); ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&inode->i_mutex); ++#else + up(&inode->i_sem); ++#endif + + out: + print_exit_status(err); +diff -urN unionfs-1.1.3.old/unionfs.h unionfs-1.1.3.new/unionfs.h +--- unionfs-1.1.3.old/unionfs.h 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/unionfs.h 2006-04-03 22:42:17.385548953 -0300 +@@ -776,13 +776,22 @@ + { + struct dentry *dir = DGET(dentry->d_parent); + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&dir->d_inode->i_mutex); ++#else + down(&dir->d_inode->i_sem); ++#endif ++ + return dir; + } + + static inline void unlock_dir(struct dentry *dir) + { ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&dir->d_inode->i_mutex); ++#else + up(&dir->d_inode->i_sem); ++#endif + DPUT(dir); + } + +diff -urN unionfs-1.1.3.old/xattr.c unionfs-1.1.3.new/xattr.c +--- unionfs-1.1.3.old/xattr.c 2006-02-20 19:47:06.000000000 -0300 ++++ unionfs-1.1.3.new/xattr.c 2006-04-03 22:42:17.394547426 -0300 +@@ -77,14 +77,22 @@ + + encoded_value = (char *)value; + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++#else + down(&hidden_dentry->d_inode->i_sem); ++#endif + /* lock_kernel() already done by caller. */ + err = + hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, + encoded_name, + encoded_value, size); + /* unlock_kernel() will be done by caller. */ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); ++#else + up(&hidden_dentry->d_inode->i_sem); ++#endif + + } + +@@ -112,12 +120,20 @@ + name, (unsigned long)size, flags); + + if (hidden_dentry->d_inode->i_op->setxattr) { ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++#else + down(&hidden_dentry->d_inode->i_sem); ++#endif + /* lock_kernel() already done by caller. */ + err = hidden_dentry->d_inode->i_op-> + setxattr(hidden_dentry, name, value, size, flags); + /* unlock_kernel() will be done by caller. */ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); ++#else + up(&hidden_dentry->d_inode->i_sem); ++#endif + } + + unlock_dentry(dentry); +@@ -143,13 +159,21 @@ + if (hidden_dentry->d_inode->i_op->removexattr) { + encoded_name = (char *)name; + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++#else + down(&hidden_dentry->d_inode->i_sem); ++#endif + /* lock_kernel() already done by caller. */ + err = + hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, + encoded_name); + /* unlock_kernel() will be done by caller. */ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); ++#else + up(&hidden_dentry->d_inode->i_sem); ++#endif + } + + unlock_dentry(dentry); +@@ -173,13 +197,21 @@ + + if (hidden_dentry->d_inode->i_op->listxattr) { + encoded_list = list; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++#else + down(&hidden_dentry->d_inode->i_sem); ++#endif + /* lock_kernel() already done by caller. */ + err = + hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, + encoded_list, size); + /* unlock_kernel() will be done by caller. */ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); ++#else + up(&hidden_dentry->d_inode->i_sem); ++#endif + } + + unlock_dentry(dentry); diff --git a/sys-fs/unionfs/unionfs-1.0.11.ebuild b/sys-fs/unionfs/unionfs-1.0.11.ebuild deleted file mode 100644 index c66e702e1123..000000000000 --- a/sys-fs/unionfs/unionfs-1.0.11.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.11.ebuild,v 1.4 2005/05/15 19:04:24 genstef Exp $ - -inherit eutils linux-mod - -DESCRIPTION="Stackable unification file system, which can appear to merge the contents of several directories" -HOMEPAGE="http://www.fsl.cs.sunysb.edu/project-unionfs.html" -SRC_URI="ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64 ~ppc" -#IUSE="acl debug" # 2005-03-20: satya: acl has issues that will be fixed upstream -IUSE="debug" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="unionfs(fs:)" - BUILD_TARGETS="all" - BUILD_PARAMS="LINUXSRC=${KV_DIR} KERNELVERSION=${KV_MAJOR}.${KV_MINOR}" -} - -src_unpack() { - local user_Makefile=fistdev.mk EXTRACFLAGS="" - - unpack ${A} - cd ${S} - - useq amd64 && epatch ${FILESDIR}/${P}-amd64.patch - - if ! useq debug; then - echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile} - EXTRACFLAGS="${EXTRACFLAGS} -DNODEBUG" - fi - - #useq acl && EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR -DFIST_SETXATTR_CONSTVOID" - - echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile} -} - -src_install() { - dosbin unionctl uniondbg - doman man/unionfs.4 man/unionctl.8 man/uniondbg.8 - - linux-mod_src_install - - dodoc INSTALL NEWS README ChangeLog -} - diff --git a/sys-fs/unionfs/unionfs-1.0.12a.ebuild b/sys-fs/unionfs/unionfs-1.0.12a.ebuild deleted file mode 100644 index 2db473fe81d4..000000000000 --- a/sys-fs/unionfs/unionfs-1.0.12a.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.12a.ebuild,v 1.2 2005/08/11 08:59:26 genstef Exp $ - -inherit eutils linux-mod - -DESCRIPTION="Stackable unification file system, which can appear to merge the contents of several directories" -HOMEPAGE="http://www.fsl.cs.sunysb.edu/project-unionfs.html" -SRC_URI="ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64 ~ppc" -#IUSE="acl debug" # 2005-03-20: satya: acl has issues that will be fixed upstream -IUSE="acl debug" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="unionfs(fs:)" - BUILD_TARGETS="all" - BUILD_PARAMS="LINUXSRC=${KV_DIR} KERNELVERSION=${KV_MAJOR}.${KV_MINOR}" -} - -src_unpack() { - local user_Makefile=fistdev.mk EXTRACFLAGS="" - - unpack ${A} - cd ${S} - - useq amd64 && epatch ${FILESDIR}/unionfs-1.0.11-amd64.patch - - if ! useq debug; then - echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile} - EXTRACFLAGS="${EXTRACFLAGS} -DNODEBUG" - fi - - useq acl && EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR" # -DFIST_SETXATTR_CONSTVOID" - - echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile} -} - -src_install() { - dosbin unionctl uniondbg - doman man/unionfs.4 man/unionctl.8 man/uniondbg.8 - - linux-mod_src_install - - dodoc INSTALL NEWS README ChangeLog -} - diff --git a/sys-fs/unionfs/unionfs-1.0.13.ebuild b/sys-fs/unionfs/unionfs-1.0.13.ebuild deleted file mode 100644 index c4a1a26711aa..000000000000 --- a/sys-fs/unionfs/unionfs-1.0.13.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.13.ebuild,v 1.2 2005/08/17 17:59:42 malc Exp $ - -inherit eutils linux-mod - -DESCRIPTION="Stackable unification file system, which can appear to merge the contents of several directories" -HOMEPAGE="http://www.fsl.cs.sunysb.edu/project-unionfs.html" -SRC_URI="ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="acl debug" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="unionfs(fs:)" - BUILD_TARGETS="all" - BUILD_PARAMS="LINUXSRC=${KV_DIR} KERNELVERSION=${KV_MAJOR}.${KV_MINOR}" -} - -src_unpack() { - local user_Makefile=fistdev.mk EXTRACFLAGS="" - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${P}-delbranch-fix.patch - epatch ${FILESDIR}/${P}-amd64.patch - - if ! use debug; then - echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile} - EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_NDEBUG" - fi - - use acl && EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR" # -DFIST_SETXATTR_CONSTVOID" - - echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile} -} - -src_install() { - dosbin unionctl uniondbg unionimap snapmerge - doman man/unionfs.4 man/unionctl.8 man/uniondbg.8 man/unionimap.8 - - linux-mod_src_install - - dodoc INSTALL NEWS README ChangeLog patch-kernel.sh -} - diff --git a/sys-fs/unionfs/unionfs-1.1.1.ebuild b/sys-fs/unionfs/unionfs-1.1.3-r1.ebuild index 44dd7a85cb68..fbce6807ddc4 100644 --- a/sys-fs/unionfs/unionfs-1.1.1.ebuild +++ b/sys-fs/unionfs/unionfs-1.1.3-r1.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/unionfs/unionfs-1.1.1.ebuild,v 1.1 2006/02/13 13:41:34 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.1.3-r1.ebuild,v 1.1 2006/04/04 08:41:09 satya Exp $ inherit eutils linux-mod @@ -24,8 +24,7 @@ src_unpack() { unpack ${A} cd ${S} - - epatch ${FILESDIR}/unionfs-1.1.1-10-nfs.patch + epatch ${FILESDIR}/unionfs-1.1.3-15-kernel_mutex.patch if ! use debug; then echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile} |