diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-04-02 07:21:11 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-04-02 07:21:11 +0000 |
commit | f70cf22981ddb57fbc0b5f0b86f2437f7df0e260 (patch) | |
tree | 6991f94085f08db945189634324608309b7e7a04 /sys-fs/aufs3 | |
parent | New addition, ebuild after submission by Gustavo Sverzut Barbieri, Lucian Mur... (diff) | |
download | historical-f70cf22981ddb57fbc0b5f0b86f2437f7df0e260.tar.gz historical-f70cf22981ddb57fbc0b5f0b86f2437f7df0e260.tar.bz2 historical-f70cf22981ddb57fbc0b5f0b86f2437f7df0e260.zip |
Version BUmp
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/aufs3')
-rw-r--r-- | sys-fs/aufs3/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/aufs3/Manifest | 14 | ||||
-rw-r--r-- | sys-fs/aufs3/aufs3-3_p20120402.ebuild | 144 | ||||
-rw-r--r-- | sys-fs/aufs3/files/aufs3-base-x-rcN.patch | 10 | ||||
-rw-r--r-- | sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch | 48 |
5 files changed, 188 insertions, 36 deletions
diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog index 1bb304df2b01..986d0d5ea91c 100644 --- a/sys-fs/aufs3/ChangeLog +++ b/sys-fs/aufs3/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/aufs3 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.8 2012/03/29 07:48:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.9 2012/04/02 07:21:11 jlec Exp $ + +*aufs3-3_p20120402 (02 Apr 2012) + + 02 Apr 2012; Justin Lecher <jlec@gentoo.org> files/aufs3-base-x-rcN.patch, + files/aufs3-standalone-x-rcN.patch, +aufs3-3_p20120402.ebuild: + Version BUmp *aufs3-3_p20120329 (29 Mar 2012) diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest index 61b005b10cea..2d1469b3e324 100644 --- a/sys-fs/aufs3/Manifest +++ b/sys-fs/aufs3/Manifest @@ -6,13 +6,13 @@ AUX aufs3-base-0.patch 2711 RMD160 bf3995e925b25d97c02673dfad596ea35ee4f0f5 SHA1 AUX aufs3-base-1.patch 2734 RMD160 cccc14c5711a120616d51573042ac32dfbf952f9 SHA1 5656c4f8728d9bad63a8c8652107e0b8e61b9273 SHA256 70c4c17b12ad6edb7e7f29f1643c0348fd8a961fc7f960740cb4d17f3e380e08 AUX aufs3-base-2.patch 2734 RMD160 fcefe81d9b434818384c5be063d0e33c35dae122 SHA1 c3885798cd739fd233c6dc73358adef1048dfd2f SHA256 2635ca013f170d4381826ec5b3aba3c15bfabd567df435df2c522c8ccd07ccb4 AUX aufs3-base-3.patch 2734 RMD160 0ab24baec94e800f1ccb46b036bbd656edb13156 SHA1 b975f3937b3082c38632172a4857df122e5fa0cd SHA256 60f619c05540a42115044ba5bc752c1a5a8be905c55fbad3fd839114578c69c5 -AUX aufs3-base-x-rcN.patch 2738 RMD160 4359520664ea91d16c784bb40721a05892bccb4a SHA1 0581a233c78b6c4da03f0b854f0b39a788fbb424 SHA256 981f9dffcc70b09b9620812a31abb8aaca0c7f59a0be0e3be54aaaf56eb90e80 +AUX aufs3-base-x-rcN.patch 2738 RMD160 5fc2c122a1146b82fafff31d266c294cc0b29338 SHA1 faf2733be0938540260f6469d3cc2b095eb9c7c0 SHA256 33d319358f4adbcd8326024afe526218b2fb13a5b2c3cc65a860810cc7873d02 AUX aufs3-fix-export-__devcgroup_inode_permission.patch 231 RMD160 d26cc80dd9d54429e4f244f51f54b7d6df074c55 SHA1 a588e94d58063faa3b239bf7a5eeff81b4963a25 SHA256 e2e18629401ecc1d8a89cc21f911c11c5e451161570cf36bff942a54ac523053 AUX aufs3-standalone-0.patch 7666 RMD160 0ae360744503d5628d74e57b093738d0377c347d SHA1 919caef16a4c277633c6ab6e79e1167eefd3736d SHA256 53a2613f6da1d418d55e20e5b3f020c3382be0789260a312b7ce97334939f203 AUX aufs3-standalone-1.patch 7510 RMD160 d227bb98522a39317f7e573f2667625282978af5 SHA1 20dd3049f775d8eb60aed1a70d85b35766312856 SHA256 63b08742aef9f34132fb7cc0caf107a9c7162665d24401573f12f8f96ad1407f AUX aufs3-standalone-2.patch 7722 RMD160 2199a16b50fa785798dc92a139ca010d75965a6e SHA1 e6a2434c50855e41d899698c0519cfa7c7b3d837 SHA256 eb7f414f2a9f07e09c2c0eae9972b21a51ada5718a17e978aea1f39dd32bb0b3 AUX aufs3-standalone-3.patch 7671 RMD160 4487131557b3e34cf06bba6642b4aab3e397e611 SHA1 3b91044c58416cd24123ac5d767a66e7e1535559 SHA256 e450fa66ebf041d10db5a594c87f83e47a39e29f6054310d6e56b44e31ad0971 -AUX aufs3-standalone-x-rcN.patch 7675 RMD160 f25f6c78ce929f061fa0cbf5041a103e1bab40d4 SHA1 613c8936eb89f498790d849d7bd61e8f99f41ae1 SHA256 3467439a8ccb6b6abb815ed33fa596470b2d8f3d69bdf9ba2cd5aa8753d2be03 +AUX aufs3-standalone-x-rcN.patch 7675 RMD160 b37485d763562e9a97e0ce8861ee7bfc0bae3e5b SHA1 770303ea353ee43affe46e8bbade825bd861020b SHA256 12c0003bbad1d6c1032fcd52c65baa7a34c5db4b5be4b0510d340397552b22a1 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad DIST aufs3-3_p20110815.tar.xz 391672 RMD160 f99b997401f1d983cb46ceb355445b94e6103c56 SHA1 f1d91e872cc75ee8bb76f6f4a08ddbe3c3a9c6b8 SHA256 e7d71097ba949c9a42b726f0e13ada8bed41f3630a4749f46a0eb7823851e337 DIST aufs3-3_p20111031.tar.xz 432796 RMD160 1321f3233578ac563d998fac5430b78e0c74eab3 SHA1 18c5244bb3ca28babd09a6350df42bc53a3a8bd0 SHA256 c9d9332fe9fab6c8cdadfa890591ef872cdf68ea1091cbaf60e79cdfb2113355 @@ -21,6 +21,7 @@ DIST aufs3-3_p20111205.tar.xz 478084 RMD160 33a545ec241a855b5e1d675334da6cc77417 DIST aufs3-3_p20120109.tar.xz 572140 RMD160 0e36afa641ea51bb1d102a6b4381573f6deb71a7 SHA1 5ad014f188b1673eaf1dba08d90ab56f9b88a392 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444 DIST aufs3-3_p20120319.tar.xz 699072 RMD160 ffed47615fbbbe4b0746d1e5957737832b2f2e03 SHA1 a33d019c73a1b5a919b02bbb563700ebc4072ea9 SHA256 4eb25133344c329926813586adf6736dfe57ce2c64a940115dc71a1a2cc03da8 DIST aufs3-3_p20120329.tar.xz 981864 RMD160 deea937b4f209282135fcb0dc139f7e89f250109 SHA1 b20ae435c2b70d933191f6336e7649fb709be2fd SHA256 e3de219bc7018c3e245131e85aa62f60230f654788c2eb72753c3c7e3d9a7004 +DIST aufs3-3_p20120402.tar.xz 1042724 RMD160 dfe8ae1b4676daa8b1341bd872b20d89db01735c SHA1 36289be6e75dd9787479144cedee395999bd6ef7 SHA256 8ff21ed0f5e472ffb1c5954188fd45ec5758c16856e7cac21b61496af2d455c8 EBUILD aufs3-3_p20110815.ebuild 3924 RMD160 3b62654d7c66a13a9b3c2a8ed7b0ab57d9d6699d SHA1 d1293e727a590619a42706cf6d63975681f14116 SHA256 1b83d7bc7f5a2779ddb0de7bcd19c9daae64278af9106cb41949be4c5bab51c0 EBUILD aufs3-3_p20111031.ebuild 4064 RMD160 ae385f7895de0b58d892e5a84669c8993a999417 SHA1 b871613ac5c22a410979edaef2d19c10ceed2941 SHA256 56405349d2dc3dad6eb4028d6048ff3e5b6b96c45fe7b7b5a68c2c474369b43f EBUILD aufs3-3_p20111114.ebuild 4023 RMD160 ce04630f37c94af8b8bcd0311e497f9d1725b722 SHA1 6a197abdb447826b471262ba0b66fd3a8ece3a4d SHA256 d74a55ddb45e996ef1c853487e925d5d1e350a8b1b9cc51c04ec36bd6b0fabae @@ -28,12 +29,13 @@ EBUILD aufs3-3_p20111205-r1.ebuild 4613 RMD160 0cbca3ae3b89b66f57e97597ffb050e72 EBUILD aufs3-3_p20120109.ebuild 4610 RMD160 8f00fed5ca889b0a25b030ffaf5fdc5b4bd52750 SHA1 e6ace683cf41cd75f661552337b3ab89625ce94c SHA256 3951e04934f088cbf9ca97af9a8252618f592e03bb245d80a0bb12c20224a687 EBUILD aufs3-3_p20120319.ebuild 4486 RMD160 86910cd1b5d7af00f676224cb9309454c7b27165 SHA1 62c2f309d735862bd4c53f6acb086edb75e9da32 SHA256 5b6b41eff4a94ce64866e85c35981992abf768948304e7907efab80961f9b495 EBUILD aufs3-3_p20120329.ebuild 4486 RMD160 49d3edb3d2f9036859ca4e1d0a944377570b445f SHA1 218d777e311ec20253a14beaa3a16a3c6bc79922 SHA256 803b3700ab3b596488cb57b845411f8b07070f4b02ee600ba76bd38224b30480 -MISC ChangeLog 2781 RMD160 4c6d307e830312cf84103e979db09d135201f4a0 SHA1 862b195487f10dae756ebd3af94ab738703d523c SHA256 d385eb7a426acfa9c406429b992bd043cbbf7978752cb86c30ac40fe4980051c +EBUILD aufs3-3_p20120402.ebuild 4486 RMD160 3477cf6dbdd44ec8bd1f6c75b853c798fd3a085c SHA1 5f0d8927b6b994c59d8bac35dba323666eafd69f SHA256 7da9d211f06e06c207c210a91da2cd6d47e0fe43fc9342ce3dfce7dbc571761a +MISC ChangeLog 2973 RMD160 93b9485f20d63bba8f1d7fb8cf35434d3ecb5108 SHA1 db37a95432d5bbabe7d3e1d472484a5230dd48bd SHA256 486d63f44b5da1dfd194b91717d8859e903c30a390ec14c4fbf98ac249700ce4 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREKAAYFAk90E+QACgkQgAnW8HDreRbxdwCeNX/puzKnAnRqCcyCO9Hk2iBw -+pMAnRzDGL3EjvDe2V4ZWFwDzKrtszuY -=UFdT +iEYEAREKAAYFAk95U2wACgkQgAnW8HDreRbsQgCfea+xU/jL4vfG4jRjLFN7ZO5H +tRIAnAtfxjYnPvKex9izNGg+NuhdalO8 +=o6eu -----END PGP SIGNATURE----- diff --git a/sys-fs/aufs3/aufs3-3_p20120402.ebuild b/sys-fs/aufs3/aufs3-3_p20120402.ebuild new file mode 100644 index 000000000000..8081ebf32d2d --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20120402.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120402.ebuild,v 1.1 2012/04/02 07:21:11 jlec Exp $ + +EAPI=4 + +inherit linux-mod multilib toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +PATCH_MAX_VER="3" +UTIL_MAX_VER="0" + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" + +DEPEND="dev-vcs/git" +RDEPEND=" + !sys-fs/aufs + !sys-fs/aufs2" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" + use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" + use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" + use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" + use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" + + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" + kernel_is gt 3 3 99 && die "kernel too new" + + linux-mod_pkg_setup + + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then + PATCH_BRANCH="x-rcN" + else + PATCH_BRANCH="${KV_MINOR}" + fi + + if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then + UTIL_BRANCH="x-rcN" + elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then + UTIL_BRANCH="${UTIL_MAX_VER}" + else + UTIL_BRANCH="${KV_MINOR}" + fi + + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \ + patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null + epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and" + eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local module_branch=origin/${PN}.${PATCH_BRANCH} + local util_branch=origin/${PN}.${UTIL_BRANCH} + + einfo "Using for module creation branch ${module_branch}" + git checkout -q -b local-gentoo ${module_branch} || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && use amd64 && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + use pax_kernel && epatch "${FILESDIR}"/pax.patch + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die + sed -i "s:__user::g" include/linux/aufs_type.h || die + + cd "${WORKDIR}"/${PN/3}-util + + einfo "Using for utils building branch ${util_branch}" + git checkout -b local-gentoo ${util_branch} || die + 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() { + local ARCH=x86 + + emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} + + cd "${WORKDIR}"/${PN/3}-util + emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + dodoc README + + cd "${WORKDIR}"/${PN/3}-util + emake DESTDIR="${D}" KDIR=${KV_DIR} install + + newdoc README README-utils +} diff --git a/sys-fs/aufs3/files/aufs3-base-x-rcN.patch b/sys-fs/aufs3/files/aufs3-base-x-rcN.patch index c33659cda5c1..280d36761285 100644 --- a/sys-fs/aufs3/files/aufs3-base-x-rcN.patch +++ b/sys-fs/aufs3/files/aufs3-base-x-rcN.patch @@ -1,10 +1,10 @@ aufs3.x-rcN base patch diff --git a/fs/namei.c b/fs/namei.c -index e2ba628..fde8ea2 100644 +index e615ff3..b9b8b85 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1781,7 +1781,7 @@ static struct dentry *__lookup_hash(struct qstr *name, +@@ -1904,7 +1904,7 @@ static struct dentry *__lookup_hash(struct qstr *name, * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -14,10 +14,10 @@ index e2ba628..fde8ea2 100644 return __lookup_hash(&nd->last, nd->path.dentry, nd); } diff --git a/fs/splice.c b/fs/splice.c -index 1ec0493..c599f73 100644 +index 5f883de..4f786e3 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); +@@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ @@ -28,7 +28,7 @@ index 1ec0493..c599f73 100644 { ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); -@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -1109,9 +1109,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. */ diff --git a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch index a828dd1222e2..10517f5036fb 100644 --- a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch +++ b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch @@ -1,10 +1,10 @@ aufs3.x-rcN standalone patch diff --git a/fs/file_table.c b/fs/file_table.c -index 20002e3..6d792ad 100644 +index 70f2a0f..146a3d7 100644 --- a/fs/file_table.c +++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) +@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file) } } @@ -14,10 +14,10 @@ index 20002e3..6d792ad 100644 /* diff --git a/fs/inode.c b/fs/inode.c -index d3ebdbe..6db6251 100644 +index 9f4f5fe..bb0f3ba 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -66,6 +66,7 @@ static struct hlist_head *inode_hashtable __read_mostly; +@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); @@ -26,10 +26,10 @@ index d3ebdbe..6db6251 100644 /* * Empty aops. Can be used for the cases where the user does not diff --git a/fs/namei.c b/fs/namei.c -index fde8ea2..62f2302 100644 +index b9b8b85..0fa6752 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1785,6 +1785,7 @@ struct dentry *lookup_hash(struct nameidata *nd) +@@ -1908,6 +1908,7 @@ struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd); } @@ -123,10 +123,10 @@ index 77becc0..f634f02 100644 static long do_sys_truncate(const char __user *pathname, loff_t length) { diff --git a/fs/splice.c b/fs/splice.c -index c599f73..00303ba 100644 +index 4f786e3..84e5c7b 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -1105,6 +1105,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } @@ -134,7 +134,7 @@ index c599f73..00303ba 100644 /* * Attempt to initiate a splice from a file to a pipe. -@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, +@@ -1131,6 +1132,7 @@ long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } @@ -143,16 +143,16 @@ index c599f73..00303ba 100644 /** * splice_direct_to_actor - splices data directly between two non-pipes diff --git a/security/commoncap.c b/security/commoncap.c -index 7ce191e..19a95be 100644 +index 0cf4b53..6ba43f6 100644 --- a/security/commoncap.c +++ b/security/commoncap.c -@@ -965,3 +965,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, +@@ -966,3 +966,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 8b5b5d8..911850c 100644 +index c43a332..0c37289 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -7,6 +7,7 @@ @@ -163,7 +163,7 @@ index 8b5b5d8..911850c 100644 #include <linux/list.h> #include <linux/uaccess.h> #include <linux/seq_file.h> -@@ -501,6 +502,7 @@ found: +@@ -499,6 +500,7 @@ found: return -EPERM; } @@ -172,10 +172,10 @@ index 8b5b5d8..911850c 100644 int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/security.c b/security/security.c -index d754249..1aa6154 100644 +index bf619ff..60b996a 100644 --- a/security/security.c +++ b/security/security.c -@@ -392,6 +392,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) +@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) return 0; return security_ops->path_rmdir(dir, dentry); } @@ -183,7 +183,7 @@ index d754249..1aa6154 100644 int security_path_unlink(struct path *dir, struct dentry *dentry) { -@@ -408,6 +409,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, +@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, return 0; return security_ops->path_symlink(dir, dentry, old_name); } @@ -191,7 +191,7 @@ index d754249..1aa6154 100644 int security_path_link(struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -416,6 +418,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, +@@ -404,6 +406,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); } @@ -199,7 +199,7 @@ index d754249..1aa6154 100644 int security_path_rename(struct path *old_dir, struct dentry *old_dentry, struct path *new_dir, struct dentry *new_dentry) -@@ -434,6 +437,7 @@ int security_path_truncate(struct path *path) +@@ -422,6 +425,7 @@ int security_path_truncate(struct path *path) return 0; return security_ops->path_truncate(path); } @@ -207,7 +207,7 @@ index d754249..1aa6154 100644 int security_path_chmod(struct path *path, umode_t mode) { -@@ -441,6 +445,7 @@ int security_path_chmod(struct path *path, umode_t mode) +@@ -429,6 +433,7 @@ int security_path_chmod(struct path *path, umode_t mode) return 0; return security_ops->path_chmod(path, mode); } @@ -215,7 +215,7 @@ index d754249..1aa6154 100644 int security_path_chown(struct path *path, uid_t uid, gid_t gid) { -@@ -448,6 +453,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) +@@ -436,6 +441,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) return 0; return security_ops->path_chown(path, uid, gid); } @@ -223,7 +223,7 @@ index d754249..1aa6154 100644 int security_path_chroot(struct path *path) { -@@ -524,6 +530,7 @@ int security_inode_readlink(struct dentry *dentry) +@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry) return 0; return security_ops->inode_readlink(dentry); } @@ -231,7 +231,7 @@ index d754249..1aa6154 100644 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) { -@@ -538,6 +545,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return security_ops->inode_permission(inode, mask); } @@ -239,7 +239,7 @@ index d754249..1aa6154 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -653,6 +661,7 @@ int security_file_permission(struct file *file, int mask) +@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } @@ -247,7 +247,7 @@ index d754249..1aa6154 100644 int security_file_alloc(struct file *file) { -@@ -680,6 +689,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, +@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, return ret; return ima_file_mmap(file, prot); } |