sys-fs/aufs3: Drop broken patch

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 23 insertions, 113 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index cb53c187bde0..4790dbabec33 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.73 2013/10/22 10:53:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.74 2013/10/22 13:10:14 jlec Exp $
+
+  22 Oct 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131007.ebuild,
+  aufs3-3_p20131014.ebuild, -files/pax-3.8.patch:
+  Drop broken patch
 
   22 Oct 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131007.ebuild,
   aufs3-3_p20131014.ebuild, +files/pax-3.8.patch, +files/pax-3.11.patch:
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 3eca0cea6f2b..2b62fce1c864 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -2,28 +2,27 @@
 Hash: SHA512
 
 AUX pax-3.11.patch 2722 SHA256 133d80384de031c73d989a36b4e88571a5b1084c51366cfec3f5234e7e1ef446 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 WHIRLPOOL e329ea70448d30510b5dc64ba9eca54c969c6781dc75ed326714ad0de90d10f43844e62e840cf1bfaed0ebb166b9f8a3cdef295ff06f5b38b4e5d75857e3fb46
-AUX pax-3.8.patch 2719 SHA256 719f5b227bba050ba514d67ce5925f3a8b571507c2eed3757226893b6c30c224 SHA512 de7345f10edd63d27523472f3745898680797c6e194dd22ec154318f7b50cc1e8e861c5e84cde2e1fdc776fcb4c48d4d886d3489033870c618da30b027a57b6b WHIRLPOOL 6fc9e6b2112d98419154117064d3d8ebd63244340f87147f2da4b1ff8a3a060283b51166e9d003c37e894171af2bca7d130bbe6f71ea33e0f9440246a62509c6
 AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
 DIST aufs3-standalone-3_p20131007.tar.xz 1953352 SHA256 3916a1c34a604a688e92a3c1d58d83e712fbb89748c4f4d0cdce591a22ab1cfc SHA512 e304e1be74553c4160a7db5695e680b50becee061fd7809318468d3aebfa442a75468bc36add14058bcf765b8fa77b88631c17cb7c4997f3ad8a7ca556cc450d WHIRLPOOL b2d04bdd7b03e400589fe906616c9c894eddf21ba10c1029982a26c5e5b10169b9002aeaca3a3fe1a301edb1b8d392e6f3d4a79815f45a3b2b0802e4a31298fa
 DIST aufs3-standalone-3_p20131014.tar.xz 1505556 SHA256 257211ecb9288f0f547418353d5bca7811b0e40b935730bc370fd7e98aacacd3 SHA512 b03417e370077bdb3e42634402d1eef5a934058fbf8b84ca96729d5eab31e5cf3a3e0d67ced40daa295b1719c5c2d89fba166c8e7469e36c196f2865ee4b5d34 WHIRLPOOL 6ebc782b517f7116e428c48fd1a35f8eb6ed29cd0387332efb95d051abb108f3c839f6d1f20c920832337afc6a8ab619b30426b53a043d8dd50cd1c2a24fed90
-EBUILD aufs3-3_p20131007.ebuild 4763 SHA256 3b29db1c1913204b62722132d5239da592228d571c8fdc8d72224f72271be0cf SHA512 29827ad6ca391b05e19699cd9993468db2d9ce3d02e29996c44deffa169f36fea822838206bd67f47c55c1c63f2ba64e247ee4c255d47388caab6a80f8312753 WHIRLPOOL 65ea424e81bc854105e0c8714f56b86755cdf096b8f553419aee43ce0cfd837ae9549d37f9f6ac10f54674f4bcbd10bb181f4a94fc83e747216eea7a7322c4e8
-EBUILD aufs3-3_p20131014.ebuild 4763 SHA256 6f993a73fcc118eb1f025d730cb0ff36fa0659388053414008a46ea06af8a5e1 SHA512 5eb2db3bec70fb025c90848de19ec53595552ca5992d1967b32daf485d750be4129624266ca7795533fb80444d8c4d5e3792ea33881c6abd35b071ce32558412 WHIRLPOOL 9c2606127f225df2802d5d61ebf72b07fde4bf596244447ff60098acd16c84de02c421f27b259250ab07f963914b803666e6b489be0a6b9f1ab486559316b866
-MISC ChangeLog 20495 SHA256 82e733c0c0290cba5f6892af07222f16d73b0bbd690ecf07da329dea090dfd0d SHA512 6bc19e767520d9da238f55d68bfb7021f3c003683f211f2a7fc2934db27561692ff90c2dd71e7ac82fc4579a90d1a498ee53b0677a3e3e1b7ed736302d39c62b WHIRLPOOL 5369127b1dfb51d97d37f1a1b599da1c42c5f812d1f30fbb06cb9eb33262e54696ab53c1bd5435abc17e3833654d59e5fb4831c68a688b40326c42926f53a466
+EBUILD aufs3-3_p20131007.ebuild 4698 SHA256 9f443498a9de7e6c238aebc2bd9be4353686c11878f1ffe46c53f7c1f082b710 SHA512 0f38101a85be0724f599e357ca1a9721fa127b5523acb0a2a704a665adb7118cc6eb13f55a89f39ab1e30713e85afab0fe5b5f3b5186e80282eab08d74776889 WHIRLPOOL 23c597f3dc1cc736a77792906b64fcaed150b998fa2c7c93ef8190615a9ff7711738ca7b2cdf8e749265ba467dd6af6d9bf6c810ac43123afa770d0e2452bef3
+EBUILD aufs3-3_p20131014.ebuild 4698 SHA256 ffcd8421f15e90df7e79f0a799b594b2a6e4d1f843ad4f571091077931972dd0 SHA512 acfb8d87f742da0418b43ffaa79390a1d374b64da3ed31652a67a57cddb94d63df6a144fe13cbdfbb9e4f08f02f1c318f44b07bee3faa936d5699f871b7567fb WHIRLPOOL 3bee56dee7da38fd55af4493a7400e336e0521e9780dd2bf791b22bbeec66870243102e718d7cde4689f25a00ce461c9ed1318a80e810680c9fcd33580805e5d
+MISC ChangeLog 20639 SHA256 2d8f2b3112a076df8c48f173bf70d73ccf9aff44f54516f6ceb8c5ad3ad907a6 SHA512 66892fb1be0792c736d82117b2980f2d3b79482f99b36ed7e27059f52d576fe1eccf4cd5967ddda0a0f40363f04108be6a8c55f12e2d8948b87aac157ddab1aa WHIRLPOOL 4e8635944bb09b171e22c7af6998eae7827d4558513d5340a0e5ccbd6a59a59f8d13449cdc4b1fc6d400a9d08b41bd9d9eb048f1bb4627c827990945ce530bca
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZlktAAoJELnU8jG9FVirHukP/2iWCL8DtoteEVHTuP+T4+9Q
-WKxyb62wgzs4GRchO4GfR9vbOmxDf5TmbxbC8m2iL79KFP25TbZsZRdwPOxuDyq8
-Na8auEwIE0A7Q+5a3FIfFfbDL16zxW/p4/Fvf9Yr1FgMJe/Y0DCAipRsPZtTUiCq
-52CuLZu9QfejjHKIcZ6NmTM0asEhQYe6+SCk7ZWoOZzvmSwMTJVZGfPsdUvpkmoC
-EE/+L108IPIG/uwVYuKacWZyNTj+3yDMLmJJ9QwZZExFQnSsPJKB0yN08SrfnYN9
-ZAAT2CgmqExdoNCl8JYJmkNDB5Ipa//1q1xeZfJ9GLbpK/oeqLw19HSWh5v4Nlo7
-ViV/5MCA3yWLwcSTm6SDRIEkACXNlyR1QY+uSYAmHJr4BBo9kq4/uetuHAi/Mj9N
-rpCoulrrlvNqFBDO+TW2wOavMifQJxDZSb+jKSDJRWIGKkpfNbQtceBS6g1DwobU
-ioI/mQIDQfEd7WCuzgZrHjvm8BA9lMwqYp9kHw0JEi4r0PqtxwEG9eNFbD4SVGJk
-NWjJMW+wLAygSFtwaoV94THBk8n8ue1gLK+Rwh12FMvuDbXnUgvnR49i0V3HSmkv
-oI/fc9ESiV/0hbCqFQvAb3vs8Sr84BqcTHAgSaqrQbvzjo8jyfgyN20DVsLlxFRg
-h4DVnvhwAL2hVyTdX24o
-=itM1
+iQIcBAEBCgAGBQJSZnk3AAoJELnU8jG9FVirSucQAId4G5dqGapAAjVcs9bce6+O
+Xv/TmbUf4B2g5po5jw+BzBxNQXARSfJLnPPeAznr05dH7MN+UH/12eG9gDhswyGR
+y7StBqKnRcL6jxs8LbricAFDZCNyCAySRw5Chy0ZCJ67W9XddzFohAR6Wxg8ETaw
+9ocqsjOE8zTwxq7OKcfjVcz0RpD2QIV9cQtbB82vWps40RQwFU6Y9XA3QwAiM/3H
+WvCsw2X2Jgkrf4+RXEkVVW+MIMMmL9U8MKNOofJmZElyTExGOqo+HhUX/FKfrl0K
+V7J8LX0cRXblEZVheccktRjvNqHa0rSN9VJjniOg7iAjF2ZY212qDBbp+X51LrNL
+R45VeiZz9XngTvOWh1KjRLjw7c2QrJJCp/sctyntprpumLZlRF1m5FosXVifbRGr
+5i4l64kqTn6vqFru9FosAyFMLJn+fY1qcLb7Hc9GDwfeQMWJwWIkhd4qzGaEPeOj
+sKgoEv3Y10pk5qNoqEgfvJMAAYm11GMmMtccOXvayQ/pa3hjYSe4/f4cx4zxbIo/
+rv0UFdjhjYBtWon4EiqEZGkVGArRb717c4LRzHCVmD02+iNsEVZuCcDp46rl7KX1
+8wSefzoi6lIVnPTb1QukEEw4XP7KVtVgxqg85BI+6Y8KYDvRvcx/RwtZefE65Esx
+Pmu/Ap9CXsoa9zT9DmO9
+=4OSr
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20131007.ebuild b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
index 7e3dc4c3c454..9ad2347678c2 100644
--- a/sys-fs/aufs3/aufs3-3_p20131007.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131007.ebuild,v 1.4 2013/10/22 10:53:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131007.ebuild,v 1.5 2013/10/22 13:10:14 jlec Exp $
 
 EAPI=5
 
@@ -124,8 +124,6 @@ src_prepare() {
 	if use pax_kernel; then
 		if kernel_is ge 3 11; then
 			epatch "${FILESDIR}"/pax-3.11.patch
-		elif kernel_is 3 8; then
-			epatch "${FILESDIR}"/pax-3.8.patch
 		else
 			epatch "${FILESDIR}"/pax-3.patch
 		fi
diff --git a/sys-fs/aufs3/aufs3-3_p20131014.ebuild b/sys-fs/aufs3/aufs3-3_p20131014.ebuild
index 1f38ac97d36b..60be5744fbd1 100644
--- a/sys-fs/aufs3/aufs3-3_p20131014.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20131014.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131014.ebuild,v 1.2 2013/10/22 10:53:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131014.ebuild,v 1.3 2013/10/22 13:10:14 jlec Exp $
 
 EAPI=5
 
@@ -124,8 +124,6 @@ src_prepare() {
 	if use pax_kernel; then
 		if kernel_is ge 3 11; then
 			epatch "${FILESDIR}"/pax-3.11.patch
-		elif kernel_is 3 8; then
-			epatch "${FILESDIR}"/pax-3.8.patch
 		else
 			epatch "${FILESDIR}"/pax-3.patch
 		fi
diff --git a/sys-fs/aufs3/files/pax-3.8.patch b/sys-fs/aufs3/files/pax-3.8.patch
deleted file mode 100644
index bdf8692a980a..000000000000
--- a/sys-fs/aufs3/files/pax-3.8.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/fs/aufs/dynop.c	2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/dynop.c	2012-10-09 15:41:58.562989820 -0400
-@@ -149,9 +149,11 @@
- #define DySet(func, dst, src, h_op, h_sb) do {				\
- 	DyDbgInc(cnt);							\
- 	if (h_op->func) {						\
--		if (src.func)						\
--			dst.func = src.func;				\
--		else							\
-+		if (src.func) {						\
-+			pax_open_kernel();				\
-+			*(void **)&dst.func = src.func;			\
-+			pax_close_kernel();				\
-+		} else							\
- 			AuDbg("%s %s\n", au_sbtype(h_sb), #func);	\
- 	}								\
- } while (0)
-@@ -159,7 +161,9 @@
- #define DySetForce(func, dst, src) do {		\
- 	AuDebugOn(!src.func);			\
- 	DyDbgInc(cnt);				\
--	dst.func = src.func;			\
-+	pax_open_kernel();			\
-+	*(void **)&dst.func = src.func;		\
-+	pax_close_kernel();			\
- } while (0)
- 
- #define DySetAop(func) \
-@@ -266,15 +270,17 @@
-  */
- static void dy_adx(struct au_dyaop *dyaop, int do_dx)
- {
-+	pax_open_kernel();
- 	if (!do_dx) {
--		dyaop->da_op.direct_IO = NULL;
--		dyaop->da_op.get_xip_mem = NULL;
-+		*(void **)&dyaop->da_op.direct_IO = NULL;
-+		*(void **)&dyaop->da_op.get_xip_mem = NULL;
- 	} else {
--		dyaop->da_op.direct_IO = aufs_aop.direct_IO;
--		dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
-+		*(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO;
-+		*(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
- 		if (!dyaop->da_get_xip_mem)
--			dyaop->da_op.get_xip_mem = NULL;
-+			*(void **)&dyaop->da_op.get_xip_mem = NULL;
- 	}
-+	pax_close_kernel();
- }
- 
- static struct au_dyaop *dy_aget(struct au_branch *br,
---- a/fs/aufs/f_op_sp.c	2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/f_op_sp.c	2012-10-09 15:41:58.562989820 -0400
-@@ -104,7 +104,7 @@
- static int aufs_open_sp(struct inode *inode, struct file *file);
- static struct au_sp_fop {
- 	int			done;
--	struct file_operations	fop;	/* not 'const' */
-+	file_operations_no_const	fop;	/* not 'const' */
- 	spinlock_t		spin;
- } au_sp_fop[AuSp_Last] = {
- 	[AuSp_FIFO] = {
-@@ -157,8 +157,10 @@
- 		h_file = au_hf_top(file);
- 		spin_lock(&p->spin);
- 		if (!p->done) {
--			p->fop = *h_file->f_op;
-+			pax_open_kernel();
-+			memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop));
- 			p->fop.owner = THIS_MODULE;
-+			pax_close_kernel();
- 			if (p->fop.aio_read)
- 				p->fop.aio_read = aufs_aio_read_sp;
- 			if (p->fop.aio_write)
---- a/fs/aufs/sysfs.c	2013-10-21 14:25:10.170305511 +0400
-+++ b/fs/aufs/sysfs.c	2013-10-22 10:44:22.114513095 +0400
-@@ -233,8 +233,10 @@
- 	for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) {
- 		attr = &br_sysfs->attr;
- 		sysfs_attr_init(attr);
--		attr->name = br_sysfs->name;
--		attr->mode = S_IRUGO;
-+		pax_open_kernel();
-+		*(void **)&attr->name = br->br_name;
-+		*(void **)&attr->mode = S_IRUGO;
-+		pax_close_kernel();
- 		br_sysfs++;
- 	}
- }