Merge branch 'master' of ssh://gparabola/abslibre

15 files changed, 356 insertions, 127 deletions

diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index c84aa9217..b9572d2ad 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # B
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
-pkgver=${_basekernel}.7
+pkgver=${_basekernel}.8
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
@@ -26,16 +26,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-	'i915-gpu-finish.patch')
+        'i915-gpu-finish.patch'
+        'ext4-options.patch')
 md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         '37a0fdc7ad19c9489faf09925b4fae5b'
-         'a56e949b6c872d0d40ee3fd6969e0352'
-         '6685fcb15d021dff6e02667c60113577'
+         'a97a83d5b003b3c9d87250e4eace45ce'
+         '1149b265c194f243c9249372602f0ac8'
+         'e3a0f760de97df1f8852893507a0eef4'
          '67463f7a6e88305d7cd14a430e9efe92'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-	 '4cd79aa147825837dc8bc9f6b736c0a0')
+         '4cd79aa147825837dc8bc9f6b736c0a0'
+         'c8299cf750a84e12d60b372c8ca7e1e8')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -63,6 +65,10 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix ext4 module to mount ext3/2 correct
+  # https://bugs.archlinux.org/task/28653
+  patch -Np1 -i "${srcdir}/ext4-options.patch"
+
   cat "${srcdir}/config.${CARCH}" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686
index 0e11985ee..b2a825481 100644
--- a/kernels/linux-libre-xen/config.i686
+++ b/kernels/linux-libre-xen/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.7-libre Kernel Configuration
+# Linux/i386 3.2.8-libre Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64
index 7bc5bd2e7..2899a7467 100644
--- a/kernels/linux-libre-xen/config.x86_64
+++ b/kernels/linux-libre-xen/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.7-libre Kernel Configuration
+# Linux/x86_64 3.2.8-libre Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch
new file mode 100644
index 000000000..812b05f04
--- /dev/null
+++ b/kernels/linux-libre-xen/ext4-options.patch
@@ -0,0 +1,49 @@
+Report: https://bbs.archlinux.org/profile.php?id=33804
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+Cc: Thomas Baechler <thomas@archlinux.org>
+Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
+Cc: Dave Reisner <d@falconindy.com>
+---
+ fs/ext4/super.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 502c61f..30de9cd 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1333,6 +1333,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
++	{Opt_nocheck, "nocheck"},
++	{Opt_reservation, "reservation"},
++	{Opt_noreservation, "noreservation"},
++	{Opt_journal_inum, "journal=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1904,6 +1909,16 @@ set_qf_format:
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
++#ifdef CONFIG_EXT4_USE_FOR_EXT23
++		case Opt_nocheck:
++		case Opt_reservation:
++		case Opt_noreservation:
++		case Opt_journal_inum:
++			ext4_msg(sb, KERN_WARNING,
++			       "ext3 mount option \"%s\" ignored "
++			       "by ext4 module", p);
++			break;
++#endif
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
\ No newline at end of file
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 16b877724..b73d4aa77 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.2.7-1-LIBRE-XEN
+KERNEL_VERSION=3.2.8-1-LIBRE-XEN
 
 post_install () {
   # updating module dependencies
diff --git a/libre/icecat-i18n/.directory b/libre/icecat-i18n/.directory
new file mode 100644
index 000000000..98ec279ed
--- /dev/null
+++ b/libre/icecat-i18n/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,2,21,19,19
diff --git a/libre/icecat-i18n/.gitignore b/libre/icecat-i18n/.gitignore
new file mode 100644
index 000000000..3987fdafb
--- /dev/null
+++ b/libre/icecat-i18n/.gitignore
@@ -0,0 +1,3 @@
+index.html
+langpacks.txt
+*.xpi
diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile
new file mode 100644
index 000000000..d1aaf7bff
--- /dev/null
+++ b/libre/icecat-i18n/Makefile
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - grep
+#  - pacman
+#  - sed
+#  - wget
+
+# Variables:
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+
+# Guts: ##############################################################
+
+default: PHONY all
+all: PHONY PKGBUILD
+
+index.html: Makefile
+	rm -f $@
+	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
+langpacks.txt: index.html Makefile
+	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
+	sed \
+	  -e 's/@_PKGVER@/$(_pkgver)/' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/md5sums/,$$d' \
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
+
+clean: PHONY
+	rm -f index.html langpacks.txt *.xpi
+
+.PHONY: PHONY FORCE
diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD
index 36a55c0e6..f995939da 100644
--- a/libre/icecat-i18n/PKGBUILD
+++ b/libre/icecat-i18n/PKGBUILD
@@ -1,23 +1,24 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Contributor: emulatorman <andre.paulista@adinet.com.uy>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
-# - run the two commands below to get list of language packs
-# - change version in pkgver and _path
-# - replace md5sums with output of makepkg -g
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
 
-# wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
-# echo $(egrep -o '[^>".]+\.xpi' index.html | sort -u | sed 's/\.xpi//')
 _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase='icecat-i18n'
 pkgname=($(for lang in ${_langpacks[@]}
         do echo icecat-i18n-$lang | tr A-Z a-z
         done))
-pkgver=6.0
-pkgrel=2
-pkgdesc="Language packs for IceCat"
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+pkgdesc="Language packs for GNUzilla IceCat."
 arch=('any')
 license=('MPL')
 url="http://www.gnu.org/software/gnuzilla/"
@@ -33,95 +34,97 @@ build() {
   cd "${srcdir}"
 }
 
-_path="/usr/lib/icecat-6.0/extensions/"
+_path="/usr/lib/icecat-$_pkgver/extensions/"
 
 for lang in ${_langpacks[@]}
 do
-    eval 'package_icecat-i18n-'$(echo $lang | tr A-Z a-z)'() {
-  install -Dm644 "'"$srcdir/$lang.xpi"'" "${pkgdir}'"${_path}langpack-$lang@firefox.mozilla.org.xpi"'"
-}'
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
 done
 
-md5sums=('591c7337853eedb77b86dede0c5bdf54'
-         '2b0c067f8387fb582b419dfca57d422e'
-         'f3f6870d4b01bd64d80ac4de1db513f0'
-         'd4f56954f7ad955481bda5503ecbc512'
-         '765d3c03355029434bbb65d121f67089'
-         '9e079762110ad2fcedc993bb87c44963'
-         '66a95194e65db2153e594fab871f5cd3'
-         '6ee12336d42c9ff23ec2b7864f44e38f'
-         '945f3c38961572b12148bc4f1c8bd283'
-         '9325c0178bff267cf4bb0583cf1d6c36'
-         '72c776ab5cd92cbaf7e3bda8d6f0d0d5'
-         '3e2a8386e6c56808a38ea749fd06d796'
-         '8a44d5a3c358bc510feccf917879baea'
-         '73574a44a75d52cfab87c3e10b2ebbb1'
-         '7486a690a30f348f07a2fec8478f3d1d'
-         '4c41dc44ff3e3b64e5a15aa2c1184660'
-         '6fde110c1244662eaf31d517ae2c9690'
-         'b37ce2233807458f5b3835114f04c6df'
-         '8fa56995459873b5dcd03b06ee4a179c'
-         'bfe86fdf0111d7d7d02fb689e197bdd3'
-         'e97fe3f85ac1fc9c1c61edd56527ab25'
-         '5a51f4072f1c7f43832ac1c41a7135fd'
-         'b13e8d2e54bbe35f9da43239cb4a2a16'
-         '71dd0c6257b419f986127db2600851a7'
-         '80a081a31a991fa63af8c26aebbaf8b3'
-         'db7a91026ba03d4bfaadf23c4508ecf2'
-         'a839ad07724553aefb76aa48c988ca3f'
-         'b1e6859da4b078530fa00783c2fc8621'
-         '40abf8376133162a9f7c7ec44e5e06e6'
-         'c4f62ffabe72ae87a096025998887bf9'
-         '1f58d2fbbaf449b4e05a83feddaa7f4e'
-         '9a54443791d8aa7004d085d79e4db1ea'
-         '948138c58a07b5fcb5c254bca5399e22'
-         '8889732de77e9e51bb43c744300a8b10'
-         'fcc0c92d1c1aae27881cba21cd81d15c'
-         'df3946f758bed44d30068bda21aa1af5'
-         'e8b8fbc055f64c0b23a1c5c0ff21c603'
-         'b358b06641cdfff8c8c500679aa632d3'
-         'f7e67fa44a737f9b3a80abb9c3915ce5'
-         '2ee78734669c9e92a103db8c41614cca'
-         'c0605e37d16869969b37b5936e28ff5e'
-         '51371731e61bc1369f47fd9ef263c63e'
-         '37eeb62381928a226472a916fec56844'
-         'a22816fda39678927ca34437da1519b9'
-         'd5910852f9ff4e142b5ad124f2135e59'
-         '3cbe3eb40bb57e6ff11d6377d966a8fc'
-         '64ce138c00140e553689d4265f018898'
-         'c37d831b598ac6e5b0e3e49ec605ff7b'
-         '546deebbe1f27122ff21fbe85dd9ecfd'
-         '1bcacee0782d62298883426a41830531'
-         '69584792a5d7eba4ff80e85456d647c6'
-         '4515b31f20fd2f20bce55f4a1f6c0ec8'
-         '6357aeaf62d7867506c20b38bd2478a3'
-         '54da09a50365fea562b804b4cf2be2c4'
-         '0a8750cc238982882c7872edf2989341'
-         '136d2c2b747e7227207ed7dbb79b294e'
-         '43ae45dae8693c119a8cf703a0bb132a'
-         '3627b7ab8670a3741a48786df22ed2c0'
-         'e4d3db69c334d1021b1982ab87a10d42'
-         '31c7e16225a379dc1fdabc211cd99079'
-         '142e02f1ab3db4f97b37adbf4e3a9138'
-         '617e895568a02588a168c54347f372e6'
-         '093b71d87d5e04311dab30b7a566d708'
-         'e30278d7ac6ca5d09cb688420a221cc0'
-         '3ba61614b3ddbcf3dda18279e199afcd'
-         'eaa1f41fa0ed45a5a3a0ab5b7b9e49d5'
-         '62999792ecd62689855651082d19d167'
-         '05a46c2dd966fd666f13e8db06441cf3'
-         'fdf997b09ab54da41fccc590dba5201e'
-         'bac1fc01d3bede7b4bb14a2290c33040'
-         '08c12984597bbe198329378fc59bacfb'
-         '587cb4938f8eac86e7ad05e7be4b0f9a'
-         '84914182cdb315e1a3a2062993f5cc00'
-         '15abeab9563a56bb0a061714f94bb1c5'
-         '05b190869d198992fda1624feb216a09'
-         '5885e96955025acf86f4186aaba5b794'
-         '37bddedad6898bac58987effeccadfad'
-         '49c0fbe9e0cbf66e24919eb99a612a43'
-         '9333d449ddbc8a3463d5aabacef39956'
-         'ede65b0a4ba01afc53ba8035dc6a054c'
-         'fe40e393535cc3106041592b626995f7'
-         'a5941ca6a2271e0e1b4de3f9e7df5571'
-         '84da1f02c05066fe779e4813befc062e')
+md5sums=('6d4c69921bbdfe92c0fd31873983d426'
+         '4e994c70c93e4d266d273d2358f7acf3'
+         'd783c592edfa96d6abecd1efa1aa1b5e'
+         '70b8badcddb6d5cf6b226c0f0141b463'
+         'bcfe52114b1c0f5346594452117bec5d'
+         '7d8900839fcf5972a91c4ce1a1bdd7c6'
+         'd9720bf726a8f6fde0dc94e6e73863a9'
+         'ce61734ab226dc041b55e95c9b6f9d92'
+         '965c2ec576ac41e7351e159f516ec65f'
+         '4feb78e0dd79606f416b8ab46432ad41'
+         '61989146fe89320c847e4de6261a06ff'
+         '260f3abb8612248493060e2dec6f0a22'
+         '6b49d830c47717001250236c9cc933a5'
+         '338137d425c8e6ae98796f3cc9a0550f'
+         '4ddf33cc1af9d3ad483d8fc47609aee3'
+         'e04918865a21260b8eaf27b3dc84ade5'
+         '59961e347c4fe3816f809f456bc9a2b8'
+         '262ad46f6c6e8a89eb29b590cc092eb9'
+         'e9452d83d914605f06c055c00325bf6b'
+         'ae652d7db9b3cd3cba85306d16a7a599'
+         '04fec5cd927a57ac6c9780a9f42444e1'
+         '70ba3ec972f01e75b144e106afacd8ac'
+         'f1ee7deccf3c73083b51c5741722b120'
+         'ca5566a24ee4fd38a3a907bfb5d72975'
+         'd4717e5c3e44fbaebe4eaf99f0195120'
+         '907c42bdaa3af02c39bef5d83198f8a9'
+         '7afa1ac8645657722cdf3415244e4686'
+         'd3d780b6c8d179c68065d9bec19dce48'
+         '09fae6ea53f5435ccfdbf41f660378ee'
+         '043306182ec497280b3ea78dcbd7b7d3'
+         '8a481d0d41f22d5bc65ed7844a0d7c27'
+         '2a8648998f2aafd307511e043cd8564d'
+         'e7fbc4b7364d151edac9840b90949f56'
+         'e2ea49277375825f612bcfb225dcb0a0'
+         '9fb2a20a2222a0d814a3f48d7208d820'
+         '88976bac6b9e647f4d17ab1638f12601'
+         'a6a39406914459deaefb3403e94dfa39'
+         'd3acecff63909d946fb549520785ef99'
+         'a8327a1a525330ca9ef8e3f9d50ca5f8'
+         'ba3ad9e8843b0de408a72896183985d6'
+         '3dfb48ecea5eda9f0e3e05295eb3c82b'
+         '95a1e7e2ec604409b54f1ded4ee7accf'
+         '69ebeb59c7ff4e0452c9f0998db65ef0'
+         '7bdf97288cef0d14ff1521db063cd20c'
+         '8f50cfa1e8c788b7b839273848dc2834'
+         '3aa0631dc6a53581cf53d559b27a0ee3'
+         '45e7238e0d0e427df04d3ba91ca045cd'
+         'b992cfa2b0440486cd70fd6ab9e32deb'
+         '3a9fac821e039556f7d009080daec643'
+         '6872abed4f4d4b81cf5f0b7b656846c7'
+         'eb44e902c6a6186c85dca8aff1d5b95f'
+         '21f5aeacbb233167218ab7f1b34efdce'
+         'b97e29d866ae1ed422d0a1c4327cfd49'
+         '5cce41015e73c36944224f827ac5a8d1'
+         'a13ac7293acc75015f0034d77ddb0f30'
+         '38c84e214af65ed6f059ad524c923dc9'
+         '66c8d82875f55f67167048e3d6888d8f'
+         '4ec423b8e34a4de058b115fd5918e0b2'
+         '0026e20db1bad1eaf692bd0b2043c038'
+         '31f029a6665ccae9b4c8cac9eda06c6f'
+         'e72ffe020543ca0ad4f8be2aad9e90a9'
+         '7b75e8fb1cd8ae34023b312d2214029a'
+         '88b1a96268e08f65579b2fe6d7677b73'
+         '4418d687e4dcb313fd59247844eab93c'
+         'b200a045163b7c09cde85b82013fec98'
+         '263f6ff19491b68865bcab4309dff0a8'
+         '80d0fb352eb1f252c355d3b8388d3513'
+         'dd79b0c4d959f46852e1e23b0cc984af'
+         'db51a6767331bb3a8c0a1e0f5f35d968'
+         '3155d4cafe5f90ec83336ddd07183629'
+         'b9246693498e1ec3c5b4dffa8145d04e'
+         '770bf78f2a0c6522e641e61e44617b40'
+         'aadf3a6f9517c76e2b37867cb1a654c6'
+         '3530c75b3c2311d8127f20df7bd724da'
+         'ef3bfc5db8197edb095da10390d8e058'
+         '46b701b2db7415b30b82023bb707e1dc'
+         '24da3bee4042e31da5781b02dc089499'
+         'b3faadcabfd6d738a41ee4c12696adcd'
+         '9938f231ce13202d040c24783c95c35b'
+         '04894f460b81525d29367f1ed1504f5e'
+         'c6049613b48eaaa71c45df2e44db1087'
+         '7e7e81ca9c6d44913d37159b4627967c'
+         '1a80a20da9cc26e2edd942d77a35c824')
diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in
new file mode 100644
index 000000000..90c901e31
--- /dev/null
+++ b/libre/icecat-i18n/PKGBUILD.in
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=@LANGPACKS@
+
+pkgbase='icecat-i18n'
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo icecat-i18n-$lang | tr A-Z a-z
+        done))
+_pkgver=@_PKGVER@
+pkgver=@PKGVER@
+pkgrel=@PKGREL@
+pkgdesc="Language packs for GNUzilla IceCat."
+arch=('any')
+license=('MPL')
+url="http://www.gnu.org/software/gnuzilla/"
+depends=("icecat=${pkgver}")
+source=($(for lang in ${_langpacks[@]}
+        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+        done))
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+}
+
+_path="/usr/lib/icecat-$_pkgver/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index e0220e8fd..c9a93613f 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -4,14 +4,17 @@
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 
 pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
-pkgver=${_basekernel}.7
-pkgrel=1
+_sublevel=9
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -19,7 +22,6 @@ makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -29,19 +31,27 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'i915-gpu-finish.patch')
+        'i915-gpu-finish.patch'
+        'ext4-options.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
 md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         '37a0fdc7ad19c9489faf09925b4fae5b'
-         '690e6201d219638544d2fba3996dc822'
-         '79db8a444fd149e409f706830d8cee9a'
-         'e26dbcb367a2b48f5ed09560e2ae8fa0'
+         '8e601878ccdd37111cc84500ebd81387'
+         '921f108c7a4985f7f8b41d72ca9bf915'
+         'f18ac3f790b0daa43f21dda04cceb90b'
          'a8a3843046926eb7ab81312cd438c5c5'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '4cd79aa147825837dc8bc9f6b736c0a0')
+         '4cd79aa147825837dc8bc9f6b736c0a0'
+         'f36222e7ce20c8e4dc27376f9be60f6c'
+         '690e6201d219638544d2fba3996dc822')
+if [ "$CARCH" != "mips64el" ]; then
+    # Don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -71,18 +81,28 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix ext4 module to mount ext3/2 correct
+  # https://bugs.archlinux.org/task/28653
+  patch -Np1 -i "${srcdir}/ext4-options.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
     msg2 "Adding loongson-community patches"
     patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# and make USB storage support builtin (e.g. for booting from USB
+# disks without slowly loading an initramfs)
+    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
+        -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g"
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -116,7 +136,9 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -125,13 +147,19 @@ build() {
 package_linux-libre() {
   pkgdesc="The Linux-libre Kernel and modules"
   groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=$pkgver")
   conflicts=('kernel26' 'kernel26-libre' 'linux')
   replaces=('kernel26' 'kernel26-libre' 'linux')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
 
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -146,6 +174,7 @@ package_linux-libre() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index d2d688197..5a50c4e04 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -4053,7 +4053,7 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 80ea3030f..441d23e6f 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -3880,7 +3880,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre/ext4-options.patch b/libre/linux-libre/ext4-options.patch
new file mode 100644
index 000000000..ef1b2417d
--- /dev/null
+++ b/libre/linux-libre/ext4-options.patch
@@ -0,0 +1,49 @@
+Report: https://bbs.archlinux.org/profile.php?id=33804
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+Cc: Thomas Baechler <thomas@archlinux.org>
+Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
+Cc: Dave Reisner <d@falconindy.com>
+---
+ fs/ext4/super.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 502c61f..30de9cd 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1333,6 +1333,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
++	{Opt_nocheck, "nocheck"},
++	{Opt_reservation, "reservation"},
++	{Opt_noreservation, "noreservation"},
++	{Opt_journal_inum, "journal=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1904,6 +1909,16 @@ set_qf_format:
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
++#ifdef CONFIG_EXT4_USE_FOR_EXT23
++		case Opt_nocheck:
++		case Opt_reservation:
++		case Opt_noreservation:
++		case Opt_journal_inum:
++			ext4_msg(sb, KERN_WARNING,
++			       "ext3 mount option \"%s\" ignored "
++			       "by ext4 module", p);
++			break;
++#endif
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6e3e16986..62f5d13bc 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,14 +2,16 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.2.7-1-LIBRE
+KERNEL_VERSION=3.2.9-1-LIBRE
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if [ command -v mkinitcpio 2>&1 > /dev/null ]; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 
   # compat symlinks for the official kernels only
   if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -50,8 +52,10 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if [ command -v mkinitcpio 2>&1 > /dev/null ]; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 }
 
 post_remove() {