# ChangeLog for sys-fs/aufs2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.14 2010/03/06 22:03:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.15 2010/03/14 20:23:43 tommy Exp $
+
+*aufs2-0_p20100308 (14 Mar 2010)
+
+ 14 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ -aufs2-0_p20090916-r1.ebuild, +aufs2-0_p20100308.ebuild,
+ -files/aufs2-0_p20090916-makefile.patch, +files/aufs2-base-33.patch,
+ +files/aufs2-standalone-33.patch:
+ Version bump, also fixes some QA issues
06 Mar 2010; Mark Loeser <halcy0n@gentoo.org> aufs2-0_p20090916-r1.ebuild,
+files/aufs2-0_p20090916-makefile.patch,
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX aufs2-0_p20090916-makefile.patch 320 RMD160 dac9d28782a6a701108076e96d4ce9d551ea03e6 SHA1 48858904490640cffbb81d7ed678b7b8dfdf8b66 SHA256 42b2db7a6c38989d98d82b89c5e15097b1fef32f3043d2966c102c9f7eed2110
AUX aufs2-base-28.patch 2895 RMD160 8055dd188e288ba4e66fafd11d78dcf5e97cae90 SHA1 ed691340ef5abce398f8b11e679b64db9bcee312 SHA256 d1869072da1a25d908a06dd34700cf8c5b03fde93b3d7ffef0d6a2948396430e
AUX aufs2-base-29.patch 2895 RMD160 bf89ba5f9f52ea1b9e320439e0bc18f8a006c8c3 SHA1 92a4aff3a945ea7a4a4509ed3539d0a3689c0737 SHA256 b4d8c9883f7f919f0d0a15792420e59f14d41bc1b0daab906ba7affc29485dac
AUX aufs2-base-30.patch 2895 RMD160 13d6fcb45135e4177d6dd506bc7a32fc6b2741fe SHA1 4845f3608540dbc0fa2fa5c914907eb14b51a0f0 SHA256 11f9061805e715c9d9a58dab04a32876ed27bced61c3157cde4e58a08dcdde51
AUX aufs2-base-31.patch 3086 RMD160 df84e409111526f48e5ffcf7b9d269aa6f9abce6 SHA1 e422dc0a95e3fe398d8ab178d7b34caaf8d0507f SHA256 c75e1f1d6d8320347f109535d65d36d4b3843cf95f3db2b0198b7f61c0f50948
AUX aufs2-base-32.patch 3088 RMD160 d2225a227dcee3ceb166dcbb52757c07da93621c SHA1 ce9f64ff2b3e173ab7caf226683a73e41cf58d91 SHA256 46522f1701f907e02776f5ae049802337b583fd6259f4e8468ff4a48cbf8d957
+AUX aufs2-base-33.patch 3049 RMD160 227353c3964819b745c57d404df80e5dea393bf9 SHA1 aaa0b1a41d513cd939db9e6d4369b188f25b79df SHA256 3e602dfd1791d21d9067b95698ab123c00b89b63e2147e8c2f62959c7d39c2ee
AUX aufs2-standalone-27.patch 7441 RMD160 754f282fb14e1c8be0e1f4e84c131c4bdb50f1a7 SHA1 6d38c1b43d5d2af37fd926a6cf7f9ab159733a5a SHA256 0eb880e1313c1a446bcdf63e7e8132d2c44efb47dc16c7f2c0c141dc8cc7b90e
AUX aufs2-standalone-28.patch 3930 RMD160 40c2efb98084887425e3de60e44c893624e05802 SHA1 a66d3cf45b66a71c3848f593ac8a9ca084945d29 SHA256 84e1f4afb7897551f72661b4c2c5e459147309c8cf29be13821b7b5e695a489f
AUX aufs2-standalone-29.patch 5748 RMD160 67fdda784ef736559e4b12038e625f5422351005 SHA1 8feb9ed859c239cda93863c8a965b3a13c563f71 SHA256 1b6d93c6b0fedbed48caa539ec231196f84cf697ca5bfe117f64a87aa17db33b
AUX aufs2-standalone-30.patch 5432 RMD160 4a9979bb29164ee81e25c920df0dadbb6c496698 SHA1 1bcebf7b22f784834e5d5f0a25467de31f12320f SHA256 c2972ecca3562b34a2b68800b2322801f614d1945923b6fe7da711392ec37484
AUX aufs2-standalone-31.patch 5826 RMD160 e7405edce064d3a163fccd390845442926b9c490 SHA1 e626a1632ba55b43b46449020b2a547e9572f417 SHA256 b6e61dd2cf5919879de6c668b8de6e0661dbaa0ac1ebe25868513360a6602601
AUX aufs2-standalone-32.patch 5828 RMD160 8d525c7155df964a933bf6ec01bb6904211a33e2 SHA1 b1ee87a3fdc2a204b141afbb390ce65698349fbd SHA256 adb37eddf529631e0fc9dc04b79e1988581fc10fbe1dd883f32ecdca6d541654
+AUX aufs2-standalone-33.patch 6474 RMD160 afc691a54f87e86154781d2d68b0c9fb90ab0ed8 SHA1 9c85979cca3e3dea1672583f8f96025476afec91 SHA256 34bdd3c07cf38e21aa0ab02a0a2b708df85eb91b3fe9f5cf720a352a8fa766a5
AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
-DIST aufs2-0_p20090916.tar.bz2 3239334 RMD160 619c1656514ddaf4b046b27d065208823d4c502e SHA1 aaae8f72a9388c40bca68ae2147afa32ad930ac7 SHA256 a68818cd382cf93ed7a32839a6ec6b23c0291b8125657db8b559659bbb89db10
DIST aufs2-0_p20091214.tar.bz2 4253193 RMD160 df114f6e040bb3fb9a319e39313b59b5190742b7 SHA1 f8d1efa056fd657318b212e1b3b5bd344d0648d8 SHA256 2a9c6b4f69bb1d3fbab1ab403ad446af8efb5c794c451ec40166841dfd40b297
-EBUILD aufs2-0_p20090916-r1.ebuild 2956 RMD160 69e5deec678ccbc3a92bd5f2f69497fb02eac37f SHA1 6149a0d8f16704b1cd5e97e569f28fed79e63af4 SHA256 49fefe29a35b99ce7a570b59da2d17e383f163cbfac4531e9dcf0f52b10e925f
+DIST aufs2-0_p20100308.tar.bz2 5279852 RMD160 d9399bcaf02037c0e6b9cff2c0e2c5430a4bb174 SHA1 d9e69bd75b7290dd661eebfea7c3e6e9643a13c5 SHA256 6216f67753dddb42fdcc5c54267be151e9acb9ee76d409f3a322128a12e91057
EBUILD aufs2-0_p20091214.ebuild 2888 RMD160 c2e96ffb0012186a7d26744e44fbb086d9b2cae9 SHA1 3259c4b2d853382882e10f567f396e5bc22bab56 SHA256 89e7fd4899301c9f601861282c89227c922e52ea2045c2477defd471c51edd3f
-MISC ChangeLog 3304 RMD160 cbb8a2b59b058f578909630e4f16d6748db07ee5 SHA1 db0897929aa1bf66277dd197dea1a82b6a328b6e SHA256 b44b3b14d13bad888e12aa41cd8041a495655271bc57c8a03ef7ebc96f92570c
+EBUILD aufs2-0_p20100308.ebuild 2929 RMD160 ddf26b35c829aa4d9747dbe98ba873b335d92975 SHA1 54eba4011657828fe0541e84e6f825e69bddf340 SHA256 63858e4169b38cf3cd2af727cd08a5fc18c364b40acde86f100fc9a0542ab891
+MISC ChangeLog 3604 RMD160 04c27489ef25910f6b209cb73470a58de746416d SHA1 c3bc8cdb280a5efe4e0d3daf6c678513ebdfaa38 SHA256 e267d12e8af8cd79bfb02cedb711535e083292ea101591d3867cef00ae8cbb99
MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkuS0TMACgkQCRZPokWLroQOtQCfWJBuGD1JqSaq8Jq3WqBpejei
-2tMAoMIbukF5/WYIrNQQOwlQkeajJsFN
-=vKAA
+iJwEAQECAAYFAkudRd0ACgkQG7kqcTWJkGcKcAP9Gw/uGHMFbJLI2HmSGSGsniHv
+KuQPVNmBX/HyThsP9ATOoSfIiCsZZ4dE0lREoudM13uZmFHOWh9hrtvXXuQOk/zU
++yENum7lxMnMnhx66+nv3pLcShQF11UmkZSrGMHMIMK+2S7LuRBMIL75Dd+7wpJA
+lMqsgTa9Z0Mf8rbnhwo=
+=R82s
-----END PGP SIGNATURE-----
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090916-r1.ebuild,v 1.3 2010/03/06 22:03:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100308.ebuild,v 1.1 2010/03/14 20:23:43 tommy Exp $
EAPI="2"
-inherit linux-mod toolchain-funcs
+inherit linux-mod multilib toolchain-funcs
DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
HOMEPAGE="http://aufs.sourceforge.net"
pkg_setup() {
get_version
kernel_is lt 2 6 27 && die "kernel too old"
- kernel_is gt 2 6 31 && die "kernel too new"
+ kernel_is gt 2 6 33 && die "kernel too new"
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then
src_prepare() {
local branch=origin/aufs2-${KV_PATCH}
- if [[ $KV_PATCH == 31 ]] ; then
- branch=origin/aufs2
- fi
git checkout -q $branch || die
if ! use debug; then
sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die
cd "${WORKDIR}"/${PN}-util
sed -i "/LDFLAGS += -static -s/d" Makefile || die
- epatch "${FILESDIR}"/{${P}-makefile.patch,utils-2.6.31.patch}
+ sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
}
src_compile() {
+++ /dev/null
-diff --git a/Makefile b/Makefile
-index 9b8dec7..cca9c4f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -44,6 +44,7 @@ ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
-
- ${LibUtilObj}: %.o: %.c ${LibUtilHdr}
- ${LibUtil}: ${LibUtil}(${LibUtilObj})
-+.NOTPARALLEL: ${LibUtil}
-
- # this is unnecessary on 64bit system?
- rdu64.c: rdu.c
--- /dev/null
+aufs2 base patch for linux-2.6.33
+
+diff --git a/fs/namei.c b/fs/namei.c
+index a4855af..1d12d37 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1207,7 +1207,7 @@ out:
+ * needs parent already locked. Doesn't follow mounts.
+ * SMP-safe.
+ */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ int err;
+
+@@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+
+-static int __lookup_one_len(const char *name, struct qstr *this,
++int __lookup_one_len(const char *name, struct qstr *this,
+ struct dentry *base, int len)
+ {
+ unsigned long hash;
+diff --git a/fs/splice.c b/fs/splice.c
+index 3920866..b13a9a2 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+ * Attempt to initiate a splice from pipe to file.
+ */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+- loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags)
+ {
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ loff_t *, size_t, unsigned int);
+@@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+ */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+- struct pipe_inode_info *pipe, size_t len,
+- unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+ {
+ ssize_t (*splice_read)(struct file *, loff_t *,
+ struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 05b441d..91bc74e 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ int (*open)(struct inode *, struct file *));
+
++extern struct dentry *lookup_hash(struct nameidata *nd);
++extern int __lookup_one_len(const char *name, struct qstr *this,
++ struct dentry *base, int len);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+
+ extern int follow_down(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 18e7c7c..8393b5c 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
+ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
+ splice_direct_actor *);
+
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags);
++
+ #endif
--- /dev/null
+aufs2 standalone patch for linux-2.6.33
+
+diff --git a/fs/namei.c b/fs/namei.c
+index 1d12d37..7cb8e5d 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -349,6 +349,7 @@ int deny_write_access(struct file * file)
+
+ return 0;
+ }
++EXPORT_SYMBOL(deny_write_access);
+
+ /**
+ * path_get - get a reference to a path
+@@ -1216,6 +1217,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ return ERR_PTR(err);
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+
+ int __lookup_one_len(const char *name, struct qstr *this,
+ struct dentry *base, int len)
+@@ -1238,6 +1240,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+ this->hash = end_name_hash(hash);
+ return 0;
+ }
++EXPORT_SYMBOL(__lookup_one_len);
+
+ /**
+ * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index c768f73..0fd78c3 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -39,6 +39,7 @@
+
+ /* spinlock for vfsmount related operations, inplace of dcache_lock */
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
++EXPORT_SYMBOL(vfsmount_lock);
+
+ static int event;
+ static DEFINE_IDA(mnt_id_ida);
+diff --git a/fs/open.c b/fs/open.c
+index 040cef7..453b782 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -226,6 +226,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+ mutex_unlock(&dentry->d_inode->i_mutex);
+ return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index b13a9a2..3931ee0 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1077,6 +1077,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+
+ return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+@@ -1103,6 +1104,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+
+ return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+
+ /**
+ * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index f800fdb..ea457bc 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -946,3 +946,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ }
+ return ret;
+ }
++EXPORT_SYMBOL(cap_file_mmap);
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index 6cf8fd2..008e0d8 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -514,6 +514,7 @@ found:
+
+ return -EPERM;
+ }
++EXPORT_SYMBOL(devcgroup_inode_permission);
+
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff --git a/security/security.c b/security/security.c
+index 122b748..a4a3d99 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -404,6 +404,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
+ return 0;
+ return security_ops->path_mkdir(path, dentry, mode);
+ }
++EXPORT_SYMBOL(security_path_mkdir);
+
+ int security_path_rmdir(struct path *path, struct dentry *dentry)
+ {
+@@ -411,6 +412,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry)
+ return 0;
+ return security_ops->path_rmdir(path, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+
+ int security_path_unlink(struct path *path, struct dentry *dentry)
+ {
+@@ -418,6 +420,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry)
+ return 0;
+ return security_ops->path_unlink(path, dentry);
+ }
++EXPORT_SYMBOL(security_path_unlink);
+
+ int security_path_symlink(struct path *path, struct dentry *dentry,
+ const char *old_name)
+@@ -426,6 +429,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry,
+ return 0;
+ return security_ops->path_symlink(path, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ struct dentry *new_dentry)
+@@ -434,6 +438,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ return 0;
+ return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ }
++EXPORT_SYMBOL(security_path_link);
+
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ struct path *new_dir, struct dentry *new_dentry)
+@@ -444,6 +449,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ return security_ops->path_rename(old_dir, old_dentry, new_dir,
+ new_dentry);
+ }
++EXPORT_SYMBOL(security_path_rename);
+
+ int security_path_truncate(struct path *path, loff_t length,
+ unsigned int time_attrs)
+@@ -452,6 +458,7 @@ int security_path_truncate(struct path *path, loff_t length,
+ return 0;
+ return security_ops->path_truncate(path, length, time_attrs);
+ }
++EXPORT_SYMBOL(security_path_truncate);
+
+ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ mode_t mode)
+@@ -460,6 +467,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ return 0;
+ return security_ops->path_chmod(dentry, mnt, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -467,6 +475,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ return 0;
+ return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+
+ int security_path_chroot(struct path *path)
+ {
+@@ -543,6 +552,7 @@ int security_inode_readlink(struct dentry *dentry)
+ return 0;
+ return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -557,6 +567,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ return 0;
+ return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -657,6 +668,7 @@ int security_file_permission(struct file *file, int mask)
+ {
+ return security_ops->file_permission(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+
+ int security_file_alloc(struct file *file)
+ {
+@@ -684,6 +696,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ return ret;
+ return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
projects / gentoo.git / commitdiff