diff options
| -rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/linux-libre-lts/config.i686 | 2 | ||||
| -rw-r--r-- | libre/linux-libre-lts/config.x86_64 | 2 | ||||
| -rw-r--r-- | libre/linux-libre-lts/ecryptfs.patch | 37 |
4 files changed, 48 insertions, 6 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index c42c483f6..27ffee971 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre-lts _pkgbasever=4.4-gnu -_pkgver=4.4.15-gnu +_pkgver=4.4.16-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -42,6 +42,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' + 'ecryptfs.patch' '0001-sdhci-revert.patch' '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch' '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' @@ -60,7 +61,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0009-ARM-dts-dove-add-Dove-divider-clocks.patch') sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' - '54e296db4a120d966e24e3759ffd3218215eb8250eaf82531c1e64281dc39f1c' + '618dc2d7fec411675084b836d57aa36233df34e3554e7aab224f9aa34f5e30c0' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -68,11 +69,12 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' - 'd862f4829d8b8a7af0cb4ac9053a25941888b2c02c36fd70091cfa0cf8d10f6e' - '63680e592608c8d8640d2fb8c3389afa04ee2bed8f74b1c36aed7761448f54ba' + 'f820ffd8c6a31e97b0086c914415d52644ab8ef6d3b23c03e2cbe8313d383376' + '5bfc50836ec2dcb49497d156a03f24bb97bbaebb50514addceb1215efd4d6c78' 'c1842f9a6153eb5b38b4fd319585460a2f0e3a4b665952d8260283fbde064433' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + 'a2e240ab338f02ebde278131cf5810e9aa3846a8238e3d26dc235eace05ab4e7' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' 'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798' '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8' @@ -138,6 +140,9 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # https://bugs.archlinux.org/task/50126 - broken ecryptfs + patch -p1 -i "${srcdir}/ecryptfs.patch" + # revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91 # fixes #47778 sdhci broken on some boards # https://bugzilla.kernel.org/show_bug.cgi?id=106541 diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 2185e9510..cdcb94100 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1977,7 +1977,7 @@ CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m -CONFIG_INTEL_MEI_TXE=m +# CONFIG_INTEL_MEI_TXE is not set CONFIG_VMWARE_VMCI=m # diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 8214477d7..1116c9600 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1952,7 +1952,7 @@ CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m -CONFIG_INTEL_MEI_TXE=m +# CONFIG_INTEL_MEI_TXE is not set CONFIG_VMWARE_VMCI=m # diff --git a/libre/linux-libre-lts/ecryptfs.patch b/libre/linux-libre-lts/ecryptfs.patch new file mode 100644 index 000000000..c542789a8 --- /dev/null +++ b/libre/linux-libre-lts/ecryptfs.patch @@ -0,0 +1,37 @@ +From: Tyler Hicks <tyhicks <at> canonical.com> +Subject: [PATCH] eCryptfs: Fix directory open regression in linux-stable +Newsgroups: gmane.comp.file-systems.ecryptfs.general, gmane.linux.kernel.stable +Date: 2016-06-29 03:39:41 GMT (14 hours and 12 minutes ago) + +Cherry-picking mainline commit 2f36db71009304b3f0b95afacd8eba1f9f046b87 +introduces a regression in eCryptfs when mainline commit +6a480a7842545ec520a91730209ec0bae41694c1 (4.6+) is not present. The +regression causes all attempts at opening directory files to fail with +EMEDIUMTYPE when the lower filesystem's file_operations for directory +files do not implement mmap. + +This is a simple fix that allows the check for the lower file's mmap +implementation to be ignored if the lower file is a directory. + +Signed-off-by: Tyler Hicks <tyhicks <at> canonical.com> +Tested-by: Tyler Hicks <tyhicks <at> canonical.com> # 4.4.y, 3.18.y +Cc: <stable <at> vger.kernel.org> # 4.5- +--- + fs/ecryptfs/kthread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c +index e818f5a..b9faeab 100644 +--- a/fs/ecryptfs/kthread.c 2016-06-30 23:32:07.029678000 +0200 ++++ b/fs/ecryptfs/kthread.c 2016-06-30 23:34:13.022284475 +0200 +@@ -171,7 +171,7 @@ int ecryptfs_privileged_open(struct file + goto out; + } + have_file: +- if ((*lower_file)->f_op->mmap == NULL) { ++ if ((*lower_file)->f_op->mmap == NULL && !d_is_dir(lower_dentry)) { + fput(*lower_file); + *lower_file = NULL; + rc = -EMEDIUMTYPE; +-- +2.7.4 |