aufs: Update to aufs3.12-20131111 (no functional change)

svn path=/dists/trunk/linux/; revision=20840
This commit is contained in:
Ben Hutchings 2013-12-02 05:01:41 +00:00
parent e10fc52041
commit 2d8387abc3
6 changed files with 23 additions and 22 deletions

1
debian/changelog vendored
View File

@ -21,6 +21,7 @@ linux (3.12.2-1~exp1) UNRELEASED; urgency=low
* ipv6: fix headroom calculation in udp6_ufo_fragment (CVE-2013-4563)
* [s390,s390x] qeth: avoid buffer overflow in snmp ioctl (CVE-2013-6381)
* xfs: underflow bug in xfs_attrlist_by_handle() (CVE-2013-6382)
* aufs: Update to aufs3.12-20131111 (no functional change)
[ Bastian Blank ]
* Use compiler name instead of Linux version in compiler meta-packages.

View File

@ -1,7 +1,7 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Oct 31 22:12:22 2013 +0900
Subject: aufs3.x-rcN-20131104
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/f1b435357e96ad15a4a034e000d5e33bde427cc9/tree/
Date: Tue Nov 5 13:13:07 2013 +0900
Subject: aufs3.12-20131111
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/4a7364f2f7c6db8bb880d7aefbeb34efc1d66ad4/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch generated by debian/patches/features/all/aufs3/gen-patch
@ -31614,7 +31614,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
+++ b/include/uapi/linux/aufs_type.h 2013-11-03 20:29:04.119645964 +0000
+++ b/include/uapi/linux/aufs_type.h 2013-12-02 05:00:47.765020019 +0000
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -31658,7 +31658,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+#include <linux/limits.h>
+
+#define AUFS_VERSION "3.x-rcN-20131104"
+#define AUFS_VERSION "3.12-20131111"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Oct 31 22:12:22 2013 +0900
Subject: aufs3.x-rcN base patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/f1b435357e96ad15a4a034e000d5e33bde427cc9/tree/
Date: Tue Nov 5 13:13:07 2013 +0900
Subject: aufs3.12 base patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/4a7364f2f7c6db8bb880d7aefbeb34efc1d66ad4/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN base patch
aufs3.12 base patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 40e7155..6e43ab0 100644

View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Sep 14 01:15:30 2013 +0900
Subject: aufs3.x-rcN kbuild patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/f1b435357e96ad15a4a034e000d5e33bde427cc9/tree/
Date: Tue Nov 5 13:13:07 2013 +0900
Subject: aufs3.12 kbuild patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/4a7364f2f7c6db8bb880d7aefbeb34efc1d66ad4/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN kbuild patch
aufs3.12 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index c229f82..397b473 100644

View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Oct 31 22:12:22 2013 +0900
Subject: aufs3.x-rcN mmap patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/f1b435357e96ad15a4a034e000d5e33bde427cc9/tree/
Date: Tue Nov 5 13:13:07 2013 +0900
Subject: aufs3.12 mmap patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/4a7364f2f7c6db8bb880d7aefbeb34efc1d66ad4/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN mmap patch
aufs3.12 mmap patch
diff --git a/fs/buffer.c b/fs/buffer.c
index 6024877..95bbf13 100644
@ -261,7 +261,7 @@ index 539eeb9..5e700b1 100644
return error;
}
diff --git a/mm/memory.c b/mm/memory.c
index 1311f26..ff5a749 100644
index d176154..49cafa9 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2745,7 +2745,7 @@ reuse:

View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Oct 31 22:12:22 2013 +0900
Subject: aufs3.x-rcN standalone patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/f1b435357e96ad15a4a034e000d5e33bde427cc9/tree/
Date: Tue Nov 5 13:13:07 2013 +0900
Subject: aufs3.12 standalone patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/4a7364f2f7c6db8bb880d7aefbeb34efc1d66ad4/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN standalone patch
aufs3.12 standalone patch
diff --git a/fs/file_table.c b/fs/file_table.c
index ccd02ee..710c617 100644