Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/fcron/PKGBUILD
	community/glob2/PKGBUILD
	community/gnash/PKGBUILD
	core/file/PKGBUILD
	core/findutils/PKGBUILD
	core/texinfo/PKGBUILD
	core/which/PKGBUILD
	extra/boost/PKGBUILD
	extra/libpst/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/samba/PKGBUILD
	libre/linux-libre/PKGBUILD

4 files changed, 27 insertions, 36 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3e2e25aef..299fb4094 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,9 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.7
-_sublevel=4
+_sublevel=5
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
+_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -29,7 +30,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'fat-3.6.x.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${pkgver}-gnu_0loongsonlibre_mipsel.tar.bz2"{,.sign})
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
+         '9de11fba7c68f3588ce01f03f48ff395'
+         'f4f17ac556ed20dda63804fa359c730c'
+         'dc6058f50e3a64e5fe8e7f4b2d07ba80'
+         'e49ac236dfeef709f91a3d993ea7b62c'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         '88d501404f172dac6fcb248978251560'
+         'b65ff9dd54d2b2743a3b51c716d8745d')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -401,30 +413,3 @@ for _p in ${pkgname[@]}; do
 done
 
 # vim:set ts=8 sts=2 sw=2 et:
-md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '3f4d630f49a12079598a3601dd2adb24'
-         'e4a3a4677e1fac6ecf0e0fb44c41ca08'
-         '68fc36a4efb6ade0eca409b9444fef0c'
-         'e49ac236dfeef709f91a3d993ea7b62c'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '670931649c60fcb3ef2e0119ed532bd4'
-         '8a71abc4224f575008f974a099b5cf6f'
-         '4909a0271af4e5f373136b382826717f'
-         '1dd80f353c705fef988346a8ef05d13f')
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
-         '4bbf97d6e7e8dc3bff2730dd6406cf63'
-         '0ce6896b7069cb5aaf444318d8db3885'
-         '1fbe34126c97dbf1da67f1da22379029'
-         '741f96278cbf12996166128a4657ce58'
-         '0665c18c1ba3abbea5cd4cde91300854'
-         'e49ac236dfeef709f91a3d993ea7b62c'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '88d501404f172dac6fcb248978251560'
-         'b65ff9dd54d2b2743a3b51c716d8745d'
-         '41ceeacdc468e9bfe1a1ca2961b3d6f8')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 5c6f3f62a..ce3d7e082 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -503,7 +503,8 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@@ -5142,7 +5143,8 @@ CONFIG_VT6656=m
 CONFIG_DX_SEP=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
+# CONFIG_ZCACHE is not set
+CONFIG_ZCACHE2=y
 CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
@@ -5439,7 +5441,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
+CONFIG_RAMSTER=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index c213f8707..80f5fe993 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -497,7 +497,8 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@@ -4909,7 +4910,8 @@ CONFIG_VT6656=m
 CONFIG_DX_SEP=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
+# CONFIG_ZCACHE is not setup
+CONFIG_ZCACHE2=y
 CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
@@ -5207,7 +5209,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
+CONFIG_RAMSTER=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 155eefe9f..32f947f56 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.7.4-1-LIBRE
+KERNEL_VERSION=3.7.5-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'