packages: module-init-tools/module-init-tools-insmod-zlib.patch, module-ini...

qboosh qboosh at pld-linux.org
Sun Aug 15 10:13:39 CEST 2010 

Author: qboosh                       Date: Sun Aug 15 08:13:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.12
- updated insmod-zlib,modprobe_d patches
- release 0.1: see initrd todo (this problem is related to current zlib+glibc, not this update)

---- Files affected:
packages/module-init-tools:
   module-init-tools-insmod-zlib.patch (1.9 -> 1.10) , module-init-tools-modprobe_d.patch (1.8 -> 1.9) , module-init-tools.spec (1.84 -> 1.85) , module-init-tools-ac.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/module-init-tools/module-init-tools-insmod-zlib.patch
diff -u packages/module-init-tools/module-init-tools-insmod-zlib.patch:1.9 packages/module-init-tools/module-init-tools-insmod-zlib.patch:1.10
--- packages/module-init-tools/module-init-tools-insmod-zlib.patch:1.9	Tue Aug 11 09:06:29 2009
+++ packages/module-init-tools/module-init-tools-insmod-zlib.patch	Sun Aug 15 10:13:33 2010
@@ -1,5 +1,5 @@
---- module-init-tools-3.4/insmod.c.orig	2007-10-07 23:51:46.000000000 +0200
-+++ module-init-tools-3.4/insmod.c	2008-08-24 00:27:48.322128443 +0200
+--- module-init-tools-3.12/insmod.c.orig	2010-03-10 08:37:08.000000000 +0100
++++ module-init-tools-3.12/insmod.c	2010-08-15 08:59:31.010816591 +0200
 @@ -28,6 +28,7 @@
  #include <errno.h>
  #include <asm/unistd.h>
@@ -8,7 +8,7 @@
  #include "util.h"
  #include "testing.h"
  
-@@ -57,48 +58,6 @@
+@@ -56,50 +57,6 @@
  	}
  }
  
@@ -16,9 +16,7 @@
 -{
 -	unsigned int max = 16384;
 -	int ret, fd, err_save;
--	void *buffer = malloc(max);
--	if (!buffer)
--		return NULL;
+-	void *buffer;
 -
 -	if (streq(filename, "-"))
 -		fd = dup(STDIN_FILENO);
@@ -27,6 +25,10 @@
 -
 -	if (fd < 0)
 -		return NULL;
+-
+-	buffer = malloc(max);
+-	if (!buffer)
+-		goto out_error;
 -
 -	*size = 0;
 -	while ((ret = read(fd, buffer + *size, max - *size)) > 0) {

================================================================
Index: packages/module-init-tools/module-init-tools-modprobe_d.patch
diff -u packages/module-init-tools/module-init-tools-modprobe_d.patch:1.8 packages/module-init-tools/module-init-tools-modprobe_d.patch:1.9
--- packages/module-init-tools/module-init-tools-modprobe_d.patch:1.8	Tue Aug 11 09:56:22 2009
+++ packages/module-init-tools/module-init-tools-modprobe_d.patch	Sun Aug 15 10:13:33 2010
@@ -1,7 +1,6 @@
-diff -Nur module-init-tools-3.2.2/modprobe.c module-init-tools-3.2.2.modprobe_d/modprobe.c
---- module-init-tools-3.2.2/modprobe.c	2005-12-02 00:42:09.000000000 +0100
-+++ module-init-tools-3.2.2.modprobe_d/modprobe.c	2006-01-21 03:11:18.000000000 +0100
-@@ -73,6 +74,8 @@
+--- module-init-tools-3.12/modprobe.c.orig	2010-05-04 07:19:27.000000000 +0200
++++ module-init-tools-3.12/modprobe.c	2010-08-15 09:15:37.990822457 +0200
+@@ -82,6 +82,8 @@
  
  } modprobe_flags_t;
  
@@ -10,7 +9,7 @@
  #ifndef MODULE_DIR
  #define MODULE_DIR "/lib/modules"
  #endif
-@@ -867,19 +870,27 @@
+@@ -1065,19 +1067,27 @@
  		/* sort files from directory into list */
  		while ((i = readdir(dir)) != NULL) {
  			size_t len;
@@ -40,23 +39,22 @@
  			fe = malloc(sizeof(struct file_entry) + len + 1);
  			if (fe == NULL)
  				continue;
-@@ -940,6 +951,11 @@
+@@ -1129,6 +1139,10 @@
  		warn("Deprecated config file /etc/modprobe.conf, "
  		      "all config files belong into /etc/modprobe.d/.\n");
  
 +	/* kernel ver based config */
 +	if ( modprobe_d_ver != NULL )
-+			parse_config_scan(modprobe_d_ver, name, dump_only, removing,
-+							options, commands, aliases, blacklist);
++			parse_config_scan(modprobe_d_ver, conf, dump_only, removing);
 +
  	/* default config */
- 	parse_config_scan("/etc/modprobe.d", name, dump_only, removing,
- 			  options, commands, aliases, blacklist);
-@@ -1509,6 +1525,7 @@
+ 	parse_config_scan("/etc/modprobe.d", conf, dump_only, removing);
+ }
+@@ -1815,6 +1829,7 @@
  		print_usage(argv[0]);
  
  	nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release);
 +	nofail_asprintf(&modprobe_d_ver, "/etc/modprobe.d/%s", buf.release);
- 	nofail_asprintf(&aliasfilename, "%s/modules.alias", dirname);
- 	nofail_asprintf(&symfilename, "%s/modules.symbols", dirname);
  
+ 	/* Old-style -t xxx wildcard?  Only with -l. */
+ 	if (list_only) {

================================================================
Index: packages/module-init-tools/module-init-tools.spec
diff -u packages/module-init-tools/module-init-tools.spec:1.84 packages/module-init-tools/module-init-tools.spec:1.85
--- packages/module-init-tools/module-init-tools.spec:1.84	Sun Aug 15 08:49:34 2010
+++ packages/module-init-tools/module-init-tools.spec	Sun Aug 15 10:13:33 2010
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO:
+# - zlib-capable initrd insmod requires using glibc-static or separate zlib compiled for dietlibc
 #
 # Conditional build
 %bcond_without	initrd		# don't build initrd package
@@ -14,16 +16,15 @@
 Summary(tr.UTF-8):	Modül programları
 Summary(uk.UTF-8):	Утиліти для роботи з модулями ядра
 Name:		module-init-tools
-Version:	3.10
-Release:	2
+Version:	3.12
+Release:	0.1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
-# Source0-md5:	fcde0344ad07c4ae2ae6b40918fd092d
+# Source0-md5:	8b2257ce9abef74c4a44d825d23140f3
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
 Patch0:		%{name}-max.patch
-Patch1:		%{name}-ac.patch
 Patch2:		%{name}-insmod-zlib.patch
 Patch3:		%{name}-sparc.patch
 Patch4:		%{name}-modprobe_d.patch
@@ -70,7 +71,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 # huh?
 # %patch3 -p1
@@ -85,7 +85,7 @@
 %configure \
 	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -static"} \
 	%{!?with_dietlibc:CC="%{__cc} -static"} \
-	--enable-zlib
+	%{!?with_dietlibc:--enable-zlib}
 
 %{__make}
 
@@ -182,6 +182,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2010/08/15 08:13:33  qboosh
+- updated to 3.12
+- updated insmod-zlib,modprobe_d patches
+- release 0.1: see initrd todo (this problem is related to current zlib+glibc, not this update)
+
 Revision 1.84  2010/08/15 06:49:34  qboosh
 - added ac patch (update ax_enable_builddir.m4 to latest version - fixes build with current ac/am)
 - more docs, verbose files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools-insmod-zlib.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools-modprobe_d.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools.spec?r1=1.84&r2=1.85&f=u

More information about the pld-cvs-commit mailing list