sys-fs/aufs3: Drop broken patch

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 7 insertions, 96 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/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++;
- 	}
- }