# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1294578468 -3600
# Node ID d2d594c8804db018d611c323338af661eb0030e2
# Parent  20ec1b757fe75adb23f6a328c86ad612c5ae12e2
Up: module-init-tools 1.12

diff -r 20ec1b757fe7 -r d2d594c8804d depmod/receipt
--- a/depmod/receipt	Sun Jan 09 14:02:54 2011 +0100
+++ b/depmod/receipt	Sun Jan 09 14:07:48 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="depmod"
-VERSION="3.11.1"
+VERSION="3.12"
 CATEGORY="base-system"
 SHORT_DESC="Kernel modules dependancy tool."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 20ec1b757fe7 -r d2d594c8804d module-init-tools/receipt
--- a/module-init-tools/receipt	Sun Jan 09 14:02:54 2011 +0100
+++ b/module-init-tools/receipt	Sun Jan 09 14:07:48 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="module-init-tools"
-VERSION="3.11.1"
+VERSION="3.12"
 CATEGORY="base-system"
 SHORT_DESC="Kernel modules manipulation tools."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -24,6 +24,10 @@
 		patch -p1 < ../stuff/$patch_file.u || return 1
 		touch done.$patch_file
 	done
+
+	# Don't generate manpages to avoid failure.
+	echo '.so man5/modprobe.conf.5' > modprobe.d.5
+
 	./configure --enable-zlib --prefix=/usr \
 	--sbindir=/sbin --bindir=/bin --sysconfdir=/etc \
 	--infodir=/usr/share/info --mandir=/usr/share/man \
diff -r 20ec1b757fe7 -r d2d594c8804d module-init-tools/stuff/lzlib.u
--- a/module-init-tools/stuff/lzlib.u	Sun Jan 09 14:02:54 2011 +0100
+++ b/module-init-tools/stuff/lzlib.u	Sun Jan 09 14:07:48 2011 +0100
@@ -1,6 +1,6 @@
 --- module-init-tools-3.10/zlibsupport.c
 +++ module-init-tools-3.10/zlibsupport.c
-@@ -18,60 +18,40 @@
+@@ -18,43 +18,23 @@
  #include "testing.h"
  
  #ifdef CONFIG_USE_ZLIB
@@ -27,28 +27,6 @@
 -}
 +#include <lzlib.h>
  
- void *grab_fd(int fd, unsigned long *size)
- {
--	gzFile gzfd;
-+	lzFile lzfd;
- 
--	gzfd = gzdopen(fd, "rb");
--	if (!gzfd) {
-+	lzfd = lzdopen(fd, "rb");
-+	if (!lzfd) {
- 		if (errno == ENOMEM)
- 			fatal("Memory allocation failure in gzdopen\n");
- 		return NULL;
- 	}
- 
--	/* gzclose(gzfd) would close fd, which would drop locks.
-+	/* lzclose(lzfd) would close fd, which would drop locks.
- 	   Don't blame zlib: POSIX locking semantics are so horribly
- 	   broken that they should be ripped out. */
--	return grab_contents(gzfd, size);
-+	return lzgrab(lzfd, size);
- }
- 
  /* gzopen handles uncompressed files transparently. */
  void *grab_file(const char *filename, unsigned long *size)
  {