From b205ef01be7c69bc2331cf4a7a0dbd052f669e15 Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Mon, 5 Apr 2010 12:37:30 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.2_rc67-r3/cvs/Linux x86_64 --- sys-fs/aufs2/ChangeLog | 10 ++- sys-fs/aufs2/Manifest | 24 +++-- ...091214.ebuild => aufs2-0_p20100405.ebuild} | 10 +-- sys-fs/aufs2/files/aufs2-standalone-31.patch | 69 +++++++++++++++ sys-fs/aufs2/files/aufs2-standalone-32.patch | 88 ++++++++++++++++++- sys-fs/aufs2/files/aufs2-standalone-33.patch | 69 +++++++++++++++ 6 files changed, 256 insertions(+), 14 deletions(-) rename sys-fs/aufs2/{aufs2-0_p20091214.ebuild => aufs2-0_p20100405.ebuild} (90%) diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index bd6627cb41b7..32d2d6301645 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -1,6 +1,14 @@ # 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.17 2010/03/17 15:42:57 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.18 2010/04/05 12:37:30 tommy Exp $ + +*aufs2-0_p20100405 (05 Apr 2010) + + 05 Apr 2010; Thomas Sachau (Tommy[D]) + -aufs2-0_p20091214.ebuild, +aufs2-0_p20100405.ebuild, + files/aufs2-standalone-31.patch, files/aufs2-standalone-32.patch, + files/aufs2-standalone-33.patch: + Version bump 17 Mar 2010; Sebastian Pipping aufs2-0_p20091214.ebuild, aufs2-0_p20100308.ebuild: diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest index 352786f336d1..b012c7ed4c0a 100644 --- a/sys-fs/aufs2/Manifest +++ b/sys-fs/aufs2/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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 @@ -8,13 +11,22 @@ AUX aufs2-standalone-27.patch 7441 RMD160 754f282fb14e1c8be0e1f4e84c131c4bdb50f1 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 6418 RMD160 53415fb890b17a972504ece963064a3f4dfe603b SHA1 368042b96fe1366152d0ab8a295b10a157907c38 SHA256 bac42a36c3fc8da97f9feb354d0a81fff3f02734434deb5c0ba14f009a223de0 -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 aufs2-standalone-31.patch 8573 RMD160 62ccf355504e99a4bdcc2e66eb4ef6426a6bcea4 SHA1 965e181bd2121d8d10ec71fcabc14999e8adcc37 SHA256 d0cc154608cb65523671d16f3a301ff82fb03b3a36889d86802b6bb246641a1f +AUX aufs2-standalone-32.patch 8573 RMD160 47958e632664dd24dab86102b11cd897dc1a3e43 SHA1 72bb326aa6dfd166f09d4f180dd0d3704e0a6743 SHA256 aea4df11245b7f6cc9fa981840c7ebcc7f21d27e20fd0e569c249a08a8b7ceef +AUX aufs2-standalone-33.patch 8629 RMD160 948926f2067e122a075a5aa03d5a4d5b2d3cf11a SHA1 510fc63ab879377227f036f73841f69b411f79ad SHA256 ce3414ac7976ac2a357d0a20ccd0c5a0d5d1a4a1154b4c24f017ded3aebb8341 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62 -DIST aufs2-0_p20091214.tar.bz2 4253193 RMD160 df114f6e040bb3fb9a319e39313b59b5190742b7 SHA1 f8d1efa056fd657318b212e1b3b5bd344d0648d8 SHA256 2a9c6b4f69bb1d3fbab1ab403ad446af8efb5c794c451ec40166841dfd40b297 DIST aufs2-0_p20100308.tar.bz2 5279852 RMD160 d9399bcaf02037c0e6b9cff2c0e2c5430a4bb174 SHA1 d9e69bd75b7290dd661eebfea7c3e6e9643a13c5 SHA256 6216f67753dddb42fdcc5c54267be151e9acb9ee76d409f3a322128a12e91057 -EBUILD aufs2-0_p20091214.ebuild 2887 RMD160 78cce2948f24161ed78c68c2816c13395865b8a1 SHA1 60b2fa2ba0256d240b965dc27973ad78820b0d89 SHA256 7f97ac80c59c984f0d2678e960cc29bb678a70df1bffc3075b55bfaf3fc9e6ce +DIST aufs2-0_p20100405.tar.bz2 7105573 RMD160 69c638543e247730cb6be3de3741d18db20be08b SHA1 ccbe21cab7bf67c63e9986d620f2d037557242ea SHA256 8d09d5c101186f01a49bd40acf83f97c9161b5c26e307f0592f55fd0b88a5701 EBUILD aufs2-0_p20100308.ebuild 2928 RMD160 b1cad9e075cfdc73c2620031d0c44d3ccc8514dd SHA1 f9706098e2da6fe799bdae446ec26531eff437a6 SHA256 cd4cd8dd09f19151c3acdecbbe6cab5d80461312de52b587f706221f29fae0d9 -MISC ChangeLog 3885 RMD160 ba3c27332d1588ee467fbf2dfe63d8312eea31d2 SHA1 af250299bf5cadd94b7b20cdd569112e07893147 SHA256 d04acf29dc15d44ff9070e8f9ac022d08df16c54b4a9f7eb3c55d1de437d5761 +EBUILD aufs2-0_p20100405.ebuild 2928 RMD160 474598e2d711f929fd9e0044e892d55c85e85dd2 SHA1 ddb7b11e92b309063c3b832a3ebb192a72e5667d SHA256 c4abfe8f18fdc94f819560136fbb38f743f161c7bfd0b8226ced89103db57f74 +MISC ChangeLog 4153 RMD160 5f5dd728ec86ac932eb03444d160181583b8c207 SHA1 5f48cdb6fcb31868980ad1b62b76a461cccb3666 SHA256 ed9a74b5b4e1de023879004ffdd92300c1d5fda16c50221b01ea404826e22d1d MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAku52ZkACgkQG7kqcTWJkGcs2gP8D6ciIPKo4CCPoXM2Hr1IN2ro +54Fb0xVf9OoKu+uPA0sjCnu3gslN3DuFqnTHFNuuRTsMJa6MRwZYOfuxJivol1YC +jnMzpDUVuEA64fYaX6RE65N4gHIrSYsGldIuKylo27V2isL9QCCtmyAz2ahu+BgK +mmhIoUZnDulmQ+dLH2M= +=Hhcw +-----END PGP SIGNATURE----- diff --git a/sys-fs/aufs2/aufs2-0_p20091214.ebuild b/sys-fs/aufs2/aufs2-0_p20100405.ebuild similarity index 90% rename from sys-fs/aufs2/aufs2-0_p20091214.ebuild rename to sys-fs/aufs2/aufs2-0_p20100405.ebuild index 0e94165ba69a..23442a49ef1b 100644 --- a/sys-fs/aufs2/aufs2-0_p20091214.ebuild +++ b/sys-fs/aufs2/aufs2-0_p20100405.ebuild @@ -1,10 +1,10 @@ # 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_p20091214.ebuild,v 1.2 2010/03/17 15:42:57 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100405.ebuild,v 1.1 2010/04/05 12:37:30 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" @@ -25,7 +25,7 @@ MODULE_NAMES="aufs(misc:${S})" pkg_setup() { get_version kernel_is lt 2 6 27 && die "kernel too old" - kernel_is gt 2 6 32 && 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 @@ -50,9 +50,6 @@ pkg_setup() { src_prepare() { local branch=origin/aufs2-${KV_PATCH} - if [[ $KV_PATCH == 33 ]] ; then - branch=origin/aufs2 - fi git checkout -q $branch || die if ! use debug; then sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die @@ -66,6 +63,7 @@ src_prepare() { cd "${WORKDIR}"/${PN}-util sed -i "/LDFLAGS += -static -s/d" Makefile || die + sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die } src_compile() { diff --git a/sys-fs/aufs2/files/aufs2-standalone-31.patch b/sys-fs/aufs2/files/aufs2-standalone-31.patch index d9b492284011..44f8e59ebf91 100644 --- a/sys-fs/aufs2/files/aufs2-standalone-31.patch +++ b/sys-fs/aufs2/files/aufs2-standalone-31.patch @@ -40,6 +40,75 @@ index 7230787..8269b66 100644 static int event; static DEFINE_IDA(mnt_id_ida); +diff --git a/fs/notify/group.c b/fs/notify/group.c +index 0e16771..3fab10a 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include "fsnotify.h" +@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + fsnotify_recalc_global_mask(); + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Simply run the fsnotify_groups list and find a group which matches +@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, + + return group; + } ++EXPORT_SYMBOL(fsnotify_obtain_group); +diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c +index c8a07c6..c5a229b 100644 +--- a/fs/notify/inode_mark.c ++++ b/fs/notify/inode_mark.c +@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) + if (atomic_dec_and_test(&entry->refcnt)) + entry->free_mark(entry); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Recalculate the mask of events relevant to a given inode locked. +@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); + + /* + * Given a group, destroy all of the marks associated with that group. +@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou + } + return NULL; + } ++EXPORT_SYMBOL(fsnotify_find_mark_entry); + + /* + * Nothing fancy, just initialize lists and locks and counters. +@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, + entry->inode = NULL; + entry->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + /* + * Attach an initialized mark entry to a given group and inode. +@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /** + * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. diff --git a/fs/open.c b/fs/open.c index dd98e80..04b9aad 100644 --- a/fs/open.c diff --git a/sys-fs/aufs2/files/aufs2-standalone-32.patch b/sys-fs/aufs2/files/aufs2-standalone-32.patch index 1780b91e0616..5409830688ec 100644 --- a/sys-fs/aufs2/files/aufs2-standalone-32.patch +++ b/sys-fs/aufs2/files/aufs2-standalone-32.patch @@ -40,6 +40,75 @@ index bdc3cb4..a2cadcf 100644 static int event; static DEFINE_IDA(mnt_id_ida); +diff --git a/fs/notify/group.c b/fs/notify/group.c +index 0e16771..3fab10a 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include "fsnotify.h" +@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + fsnotify_recalc_global_mask(); + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Simply run the fsnotify_groups list and find a group which matches +@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, + + return group; + } ++EXPORT_SYMBOL(fsnotify_obtain_group); +diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c +index 3165d85..4586162 100644 +--- a/fs/notify/inode_mark.c ++++ b/fs/notify/inode_mark.c +@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) + if (atomic_dec_and_test(&entry->refcnt)) + entry->free_mark(entry); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Recalculate the mask of events relevant to a given inode locked. +@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); + + /* + * Given a group, destroy all of the marks associated with that group. +@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou + } + return NULL; + } ++EXPORT_SYMBOL(fsnotify_find_mark_entry); + + /* + * Nothing fancy, just initialize lists and locks and counters. +@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, + entry->inode = NULL; + entry->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + /* + * Attach an initialized mark entry to a given group and inode. +@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /** + * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. diff --git a/fs/open.c b/fs/open.c index 4f01e06..ef09031 100644 --- a/fs/open.c @@ -72,6 +141,15 @@ index 77184f0..8479d95 100644 /** * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/commoncap.c b/security/commoncap.c +index fe30751..813108d 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -1014,3 +1014,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 @@ -97,7 +175,7 @@ index b85e61b..a23fad4 100644 /** * ima_bprm_check - based on policy, collect/store measurement. diff --git a/security/security.c b/security/security.c -index c4c6732..854d15c 100644 +index c4c6732..092cd90 100644 --- a/security/security.c +++ b/security/security.c @@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode) @@ -180,3 +258,11 @@ index c4c6732..854d15c 100644 int security_file_alloc(struct file *file) { +@@ -641,6 +651,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, + { + return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only); + } ++EXPORT_SYMBOL(security_file_mmap); + + int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, + unsigned long prot) diff --git a/sys-fs/aufs2/files/aufs2-standalone-33.patch b/sys-fs/aufs2/files/aufs2-standalone-33.patch index 8ea735b788f2..c945ba15edcd 100644 --- a/sys-fs/aufs2/files/aufs2-standalone-33.patch +++ b/sys-fs/aufs2/files/aufs2-standalone-33.patch @@ -40,6 +40,75 @@ index c768f73..0fd78c3 100644 static int event; static DEFINE_IDA(mnt_id_ida); +diff --git a/fs/notify/group.c b/fs/notify/group.c +index 0e16771..3fab10a 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include "fsnotify.h" +@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + fsnotify_recalc_global_mask(); + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Simply run the fsnotify_groups list and find a group which matches +@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, + + return group; + } ++EXPORT_SYMBOL(fsnotify_obtain_group); +diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c +index 3165d85..4586162 100644 +--- a/fs/notify/inode_mark.c ++++ b/fs/notify/inode_mark.c +@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) + if (atomic_dec_and_test(&entry->refcnt)) + entry->free_mark(entry); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Recalculate the mask of events relevant to a given inode locked. +@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); + + /* + * Given a group, destroy all of the marks associated with that group. +@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou + } + return NULL; + } ++EXPORT_SYMBOL(fsnotify_find_mark_entry); + + /* + * Nothing fancy, just initialize lists and locks and counters. +@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, + entry->inode = NULL; + entry->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + /* + * Attach an initialized mark entry to a given group and inode. +@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /** + * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. diff --git a/fs/open.c b/fs/open.c index 040cef7..453b782 100644 --- a/fs/open.c -- 2.26.2