[arch-commits] Commit in zsh/trunk (PKGBUILD modules.patch)

[Pierre Schmitz]

    Date: Sunday, June 19, 2011 @ 07:12:41
  Author: pierre
Revision: 127893

upgpkg: zsh 4.3.12-2
fix kernel module handling

Added:
  zsh/trunk/modules.patch
Modified:
  zsh/trunk/PKGBUILD

---------------+
 PKGBUILD      |    9 ++++++---
 modules.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-19 10:56:34 UTC (rev 127892)
+++ PKGBUILD	2011-06-19 11:12:41 UTC (rev 127893)
@@ -3,18 +3,21 @@
 
 pkgname=zsh
 pkgver=4.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
 license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
 install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811')
+source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch')
+md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811'
+         'b367c1398b60242f7044a93a837227f9')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	# upstream patch to fix handling of compressed kernel modules
+	patch -p1 -i ${srcdir}/modules.patch
 	# FS#16360
 	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
 				 Doc/zsh.texi \

Added: modules.patch
===================================================================
--- modules.patch	                        (rev 0)
+++ modules.patch	2011-06-19 11:12:41 UTC (rev 127893)
@@ -0,0 +1,11 @@
+--- a/Completion/Linux/Command/_modutils
++++ b/Completion/Linux/Command/_modutils
+@@ -107,7 +107,7 @@ case "$state" in
+       ! _retrieve_cache modules-$kver;
+     then 
+       # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough?
+-      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) )
++      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) )
+       _store_cache modules-$kver modules
+     fi
+