Mailinglist Archive: opensuse-commit (1116 mails)
| < Previous | Next > |
commit module-init-tools for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 12 Feb 2009 22:09:29 +0100
- Message-id: <20090212210930.4C7C1678166@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package module-init-tools for
openSUSE:Factory
checked in at Thu Feb 12 22:09:29 CET 2009.
--------
--- module-init-tools/module-init-tools.changes 2009-02-09 17:43:43.000000000
+0100
+++ module-init-tools/module-init-tools.changes 2009-02-11 14:29:01.000000000
+0100
@@ -1,0 +2,6 @@
+Wed Feb 11 14:28:47 CET 2009 - mmarek@xxxxxxx
+
+- updated to 3.7-pre1
+ * more patches got merged
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
depmod-abort-on-oom.patch
depmod-fix-is_higher_priority.patch
index_fix_copy_paste_error.patch
modprobe__fallback_to_text_files_if_binary_index_has_wrong_magic.patch
module-init-tools-3.6.tar.bz2
module-init-tools-eintr.diff
module-init-tools-insmod-zlib.diff
module-init-tools-manpages-3.6.tar.gz
module-init-tools-options-priority.diff
modules-order.patch
New:
----
module-init-tools-3.7-pre1.tar.bz2
module-init-tools-manpages-3.7-pre1.tar.gz
revert-search-all-config-files.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.k11677/_old 2009-02-12 22:07:50.000000000 +0100
+++ /var/tmp/diff_new_pack.k11677/_new 2009-02-12 22:07:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package module-init-tools (Version 3.6)
+# spec file for package module-init-tools (Version 3.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,8 +24,9 @@
%if ! %prebuilt_manpages
BuildRequires: docbook-utils
%endif
-Version: 3.6
+Version: 3.7
Release: 1
+%define real_version 3.7-pre1
License: GPL v2 or later
Group: System/Kernel
# for grepping /etc/SUSE-release
@@ -40,9 +41,9 @@
AutoReqProv: on
Summary: Utilities to Load Modules into the Kernel
Url: http://www.kerneltools.org/
-Source0:
http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-init-tools-%version.tar.bz2
+Source0:
http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-init-tools-%real_version.tar.bz2
%if %prebuilt_manpages
-Source1: module-init-tools-manpages-%version.tar.gz
+Source1: module-init-tools-manpages-%real_version.tar.gz
%endif
Source2: package-manpages.sh
Source4: README.SUSE
@@ -52,18 +53,12 @@
Source9: weak-modules
Source10: weak-modules2
# upstream patches
-Patch1: index_fix_copy_paste_error.patch
-Patch2:
modprobe__fallback_to_text_files_if_binary_index_has_wrong_magic.patch
-Patch3: modules-order.patch
+# (none)
# suse patches
-Patch11: module-init-tools-insmod-zlib.diff
-Patch12: module-init-tools-eintr.diff
-Patch13: module-init-tools-options-priority.diff
-Patch14: modprobe-different-exit-codes.patch
-Patch15: mit-unsupported-modules.patch
-Patch16: mit-zlibsupport-use-mmap.patch
-Patch17: depmod-abort-on-oom.patch
-Patch18: depmod-fix-is_higher_priority.patch
+Patch10: revert-search-all-config-files.patch
+Patch11: mit-zlibsupport-use-mmap.patch
+Patch12: modprobe-different-exit-codes.patch
+Patch13: mit-unsupported-modules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -83,21 +78,14 @@
Jon Masters <jcm@xxxxxxxxxxxxxx>
%prep
-%setup -q -a6
+%setup -q -n %name-%real_version -a6
%if %prebuilt_manpages
-%setup -q -TD -b1
+%setup -q -n %name-%real_version -TD -b1
%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch10 -p1
%patch11
%patch12
%patch13
-%patch14
-%patch15
-%patch16
-%patch17
-%patch18 -p1
%if %prebuilt_manpages
# don't try to regenerate the patched manpages (patch5)
touch modprobe.conf.5 modprobe.8
@@ -155,10 +143,11 @@
# obsolete
rm /etc/sysconfig/hardware/config
fi
- # if this is a _new_ SLES install, don't allow unsupported modules
+ # don't change the setting during upgrade
if test "$1" != 1; then
return
fi
+ # on SLES, the default is not to allow unsupported modules
if grep -qs "Enterprise Server" /etc/SuSE-release; then
allow=0
else
@@ -199,6 +188,9 @@
/etc/modprobe.d
%changelog
+* Wed Feb 11 2009 mmarek@xxxxxxx
+- updated to 3.7-pre1
+ * more patches got merged
* Mon Feb 09 2009 mmarek@xxxxxxx
- allow unsupported modules on SLES if the installation was started
with oem-modules=1 or the kernel is already tainted with
++++++ mit-unsupported-modules.patch ++++++
--- /var/tmp/diff_new_pack.k11677/_old 2009-02-12 22:07:50.000000000 +0100
+++ /var/tmp/diff_new_pack.k11677/_new 2009-02-12 22:07:50.000000000 +0100
@@ -18,7 +18,7 @@
extern long init_module(void *, unsigned long, const char *);
extern long delete_module(const char *, unsigned int);
-@@ -567,6 +570,23 @@ static void clear_magic(struct module *m
+@@ -566,6 +569,23 @@ static void clear_magic(struct module *m
}
}
@@ -42,7 +42,7 @@
struct module_options
{
struct module_options *next;
-@@ -900,6 +920,16 @@ static void insmod(struct list_head *lis
+@@ -904,6 +924,16 @@ static void insmod(struct list_head *lis
goto out_unlock;
}
@@ -59,7 +59,7 @@
/* Rename it? */
if (newname)
rename_module(mod, map, len, newname);
-@@ -1287,6 +1317,18 @@ static int read_config_file(const char *
+@@ -1286,6 +1316,18 @@ static int read_config_file(const char *
if (strcmp(tmp, "no") == 0)
use_binary_indexes = 0;
}
@@ -78,7 +78,7 @@
} else
grammar(cmd, filename, linenum);
-@@ -1595,6 +1637,7 @@ static struct option options[] = { { "ve
+@@ -1592,6 +1634,7 @@ static struct option options[] = { { "ve
{ "dirname", 1, NULL, 'd' },
{ "first-time", 0, NULL, 3 },
{ "dump-modversions", 0, NULL, 4 },
@@ -86,7 +86,7 @@
{ "use-blacklist", 0, NULL, 'b' },
{ NULL, 0, NULL, 0 } };
-@@ -1617,6 +1660,7 @@ int main(int argc, char *argv[])
+@@ -1614,6 +1657,7 @@ int main(int argc, char *argv[])
int first_time = 0;
int dump_modver = 0;
int use_blacklist = 0;
@@ -94,7 +94,7 @@
unsigned int i, num_modules;
char *type = NULL;
const char *config = NULL;
-@@ -1717,6 +1761,9 @@ int main(int argc, char *argv[])
+@@ -1714,6 +1758,9 @@ int main(int argc, char *argv[])
case 4:
dump_modver = 1;
break;
@@ -104,7 +104,7 @@
default:
print_usage(argv[0]);
}
-@@ -1797,6 +1844,16 @@ int main(int argc, char *argv[])
+@@ -1794,6 +1841,16 @@ int main(int argc, char *argv[])
/* Returns the resolved alias, options */
read_toplevel_config(config, modulearg, 0,
remove, &modoptions, &commands, &aliases, &blacklist);
@@ -125,7 +125,7 @@
===================================================================
--- doc/modprobe.sgml.orig
+++ doc/modprobe.sgml
-@@ -432,9 +432,28 @@
+@@ -435,9 +435,28 @@
</para>
</listitem>
</varlistentry>
++++++ mit-zlibsupport-use-mmap.patch ++++++
--- /var/tmp/diff_new_pack.k11677/_old 2009-02-12 22:07:50.000000000 +0100
+++ /var/tmp/diff_new_pack.k11677/_new 2009-02-12 22:07:50.000000000 +0100
@@ -2,18 +2,20 @@
zlibsupport.c | 137
++++++++++++++++++++++++++++++++--------------------------
1 file changed, 77 insertions(+), 60 deletions(-)
+Index: zlibsupport.c
+===================================================================
--- zlibsupport.c.orig
+++ zlibsupport.c
-@@ -11,80 +11,44 @@
+@@ -12,6 +12,8 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/mman.h>
+#include <stdio.h>
+#include <string.h>
-+#include <errno.h>
#include "zlibsupport.h"
- #include "testing.h"
+ #include "logging.h"
+@@ -19,69 +21,35 @@
#ifdef CONFIG_USE_ZLIB
#include <zlib.h>
@@ -22,33 +24,21 @@
-void *grab_contents(gzFile *gzfd, unsigned long *size)
-{
- unsigned int max = 16384;
-- void *buffer = malloc(max);
+- void *buffer = NOFAIL(malloc(max));
- int ret;
-
-- if (!buffer)
-- return NULL;
--
- *size = 0;
- while ((ret = gzread(gzfd, buffer + *size, max - *size)) > 0) {
- *size += ret;
-- if (*size == max) {
-- void *p;
--
-- p = realloc(buffer, max *= 2);
-- if (!p)
-- goto out_err;
--
-- buffer = p;
-- }
+- if (*size == max)
+- buffer = NOFAIL(realloc(buffer, max *= 2));
+- }
+- if (ret < 0) {
+- free(buffer);
+- buffer = NULL;
- }
-- if (ret < 0)
-- goto out_err;
-
- return buffer;
--
--out_err:
-- free(buffer);
-- return NULL;
-}
-
-void *grab_fd(int fd, unsigned long *size)
@@ -58,8 +48,11 @@
- gzFile gzfd;
-
- gzfd = gzdopen(fd, "rb");
-- if (!gzfd)
+- if (!gzfd) {
+- if (errno == ENOMEM)
+- fatal("Memory allocation failure in gzdopen\n");
- return NULL;
+- }
+ unsigned char magic[2];
- /* gzclose(gzfd) would close fd, which would drop locks.
@@ -82,17 +75,16 @@
- void *buffer;
+ static char *TMPDIR;
+- errno = 0;
- gzfd = gzopen(filename, "rb");
-- if (!gzfd)
+- if (!gzfd) {
+- if (errno == ENOMEM)
+- fatal("Memory allocation failure in gzopen\n");
- return NULL;
+- }
- buffer = grab_contents(gzfd, size);
- gzclose(gzfd);
- return buffer;
--}
--
--void release_file(void *data, unsigned long size)
--{
-- free(data);
+ if (TMPDIR)
+ return TMPDIR;
+ TMPDIR = getenv("TMPDIR");
@@ -100,15 +92,20 @@
+ TMPDIR = "/tmp";
+ return TMPDIR;
}
--#else /* ... !CONFIG_USE_ZLIB */
+#endif
+-void release_file(void *data, unsigned long size)
+-{
+- free(data);
+-}
+-#else /* ... !CONFIG_USE_ZLIB */
+-
-void *grab_fd(int fd, unsigned long *size)
-+static void *do_grab_fd(int fd, unsigned long *size)
++void *do_grab_fd(int fd, unsigned long *size)
{
struct stat st;
void *map;
-@@ -100,6 +64,59 @@ void *grab_fd(int fd, unsigned long *siz
+@@ -97,6 +65,60 @@ void *grab_fd(int fd, unsigned long *siz
return map;
}
@@ -126,13 +123,14 @@
+ int r, w;
+ void *ret = NULL;
+
-+ template = malloc(strlen(tmpdir()) + sizeof("/m-i-t.XXXXXX"));
-+ if (!template)
-+ return ret;
++ template = NOFAIL(malloc(strlen(tmpdir()) +
sizeof("/m-i-t.XXXXXX")));
+ sprintf(template, "%s/m-i-t.XXXXXX", tmpdir());
+ gzfd = gzdopen(dup(fd), "rb");
-+ if (!gzfd)
++ if (!gzfd) {
++ if (errno == ENOMEM)
++ fatal("Memory allocation failure in gzdopen\n");
+ goto out_template;
++ }
+ tmp = mkstemp(template);
+ if (tmp == -1)
+ goto out_template;
@@ -168,7 +166,7 @@
void *grab_file(const char *filename, unsigned long *size)
{
int fd;
-@@ -117,4 +134,4 @@ void release_file(void *data, unsigned l
+@@ -114,4 +136,4 @@ void release_file(void *data, unsigned l
{
munmap(data, size);
}
++++++ modprobe.conf.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/modprobe.conf/modprobe.conf.last
new/modprobe.conf/modprobe.conf.last
--- old/modprobe.conf/modprobe.conf.last 2008-02-05 18:33:06.000000000
+0100
+++ new/modprobe.conf/modprobe.conf.last 2009-02-10 16:07:06.000000000
+0100
@@ -1,3 +1,3 @@
-# please keep this at the end and add local modifications to modules.conf.local
+# please keep this at the end and add local modifications to
modprobe.conf.local
include /etc/modprobe.d
include /etc/modprobe.conf.local
++++++ modprobe-different-exit-codes.patch ++++++
--- /var/tmp/diff_new_pack.k11677/_old 2009-02-12 22:07:50.000000000 +0100
+++ /var/tmp/diff_new_pack.k11677/_new 2009-02-12 22:07:50.000000000 +0100
@@ -35,6 +35,6 @@
+/* Exit code returned by fatal() */
+extern int fatal_exit_code;
+
- void fatal(const char *fmt, ...);
- void warn(const char *fmt, ...);
+ extern void fatal(const char *fmt, ...);
+ extern void warn(const char *fmt, ...);
++++++ revert-search-all-config-files.patch ++++++
Revert "search all config files by default rather than stopping after the first"
This reverts commit 8200486d20ea638845e7ac540193812d9172829f.
With this change, it is impossible to include /etc/modprobe.conf.local
as the last config file.
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
Index: module-init-tools-3.7-pre1/depmod.c
===================================================================
--- module-init-tools-3.7-pre1.orig/depmod.c
+++ module-init-tools-3.7-pre1/depmod.c
@@ -1267,8 +1267,9 @@ static void read_toplevel_config(const c
/* Try defaults. */
for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
- read_config(default_configs[i], basedir, kernelversion,
- search, overrides);
+ if (read_config(default_configs[i], basedir, kernelversion,
+ search, overrides))
+ return;
}
}
Index: module-init-tools-3.7-pre1/modprobe.c
===================================================================
--- module-init-tools-3.7-pre1.orig/modprobe.c
+++ module-init-tools-3.7-pre1/modprobe.c
@@ -1408,8 +1408,9 @@ static void read_toplevel_config(const c
/* Try defaults. */
for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
- read_config(default_configs[i], name, dump_only, removing,
- options, commands, aliases, blacklist);
+ if (read_config(default_configs[i], name, dump_only, removing,
+ options, commands, aliases, blacklist))
+ return;
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |