wok-current rev 7897

Up: module-init-tools 1.12
author Antoine Bodin <gokhlayeh@slitaz.org>
date Sun Jan 09 14:07:48 2011 +0100 (2011-01-09)
parents 20ec1b757fe7
children f534b662cde5
files depmod/receipt module-init-tools/receipt module-init-tools/stuff/lzlib.u
line diff
     1.1 --- a/depmod/receipt	Sun Jan 09 14:02:54 2011 +0100
     1.2 +++ b/depmod/receipt	Sun Jan 09 14:07:48 2011 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="depmod"
     1.7 -VERSION="3.11.1"
     1.8 +VERSION="3.12"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Kernel modules dependancy tool."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/module-init-tools/receipt	Sun Jan 09 14:02:54 2011 +0100
     2.2 +++ b/module-init-tools/receipt	Sun Jan 09 14:07:48 2011 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="module-init-tools"
     2.7 -VERSION="3.11.1"
     2.8 +VERSION="3.12"
     2.9  CATEGORY="base-system"
    2.10  SHORT_DESC="Kernel modules manipulation tools."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -24,6 +24,10 @@
    2.13  		patch -p1 < ../stuff/$patch_file.u || return 1
    2.14  		touch done.$patch_file
    2.15  	done
    2.16 +
    2.17 +	# Don't generate manpages to avoid failure.
    2.18 +	echo '.so man5/modprobe.conf.5' > modprobe.d.5
    2.19 +
    2.20  	./configure --enable-zlib --prefix=/usr \
    2.21  	--sbindir=/sbin --bindir=/bin --sysconfdir=/etc \
    2.22  	--infodir=/usr/share/info --mandir=/usr/share/man \
     3.1 --- a/module-init-tools/stuff/lzlib.u	Sun Jan 09 14:02:54 2011 +0100
     3.2 +++ b/module-init-tools/stuff/lzlib.u	Sun Jan 09 14:07:48 2011 +0100
     3.3 @@ -1,6 +1,6 @@
     3.4  --- module-init-tools-3.10/zlibsupport.c
     3.5  +++ module-init-tools-3.10/zlibsupport.c
     3.6 -@@ -18,60 +18,40 @@
     3.7 +@@ -18,43 +18,23 @@
     3.8   #include "testing.h"
     3.9   
    3.10   #ifdef CONFIG_USE_ZLIB
    3.11 @@ -27,28 +27,6 @@
    3.12  -}
    3.13  +#include <lzlib.h>
    3.14   
    3.15 - void *grab_fd(int fd, unsigned long *size)
    3.16 - {
    3.17 --	gzFile gzfd;
    3.18 -+	lzFile lzfd;
    3.19 - 
    3.20 --	gzfd = gzdopen(fd, "rb");
    3.21 --	if (!gzfd) {
    3.22 -+	lzfd = lzdopen(fd, "rb");
    3.23 -+	if (!lzfd) {
    3.24 - 		if (errno == ENOMEM)
    3.25 - 			fatal("Memory allocation failure in gzdopen\n");
    3.26 - 		return NULL;
    3.27 - 	}
    3.28 - 
    3.29 --	/* gzclose(gzfd) would close fd, which would drop locks.
    3.30 -+	/* lzclose(lzfd) would close fd, which would drop locks.
    3.31 - 	   Don't blame zlib: POSIX locking semantics are so horribly
    3.32 - 	   broken that they should be ripped out. */
    3.33 --	return grab_contents(gzfd, size);
    3.34 -+	return lzgrab(lzfd, size);
    3.35 - }
    3.36 - 
    3.37   /* gzopen handles uncompressed files transparently. */
    3.38   void *grab_file(const char *filename, unsigned long *size)
    3.39   {