rpms/module-init-tools/devel .cvsignore, 1.14, 1.15 module-init-tools-allconf.patch, 1.6, 1.7 module-init-tools-dump_modversions.patch, 1.4, 1.5 module-init-tools-noescape.patch, 1.4, 1.5 module-init-tools.spec, 1.58, 1.59 sources, 1.16, 1.17
Jon Masters (jcm)
fedora-extras-commits at redhat.com
Sun Oct 7 22:34:24 UTC 2007
Author: jcm
Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29376
Modified Files:
.cvsignore module-init-tools-allconf.patch
module-init-tools-dump_modversions.patch
module-init-tools-noescape.patch module-init-tools.spec
sources
Log Message:
Update to latest upstream release, rebase, usual jazz.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 22 Mar 2007 19:10:18 -0000 1.14
+++ .cvsignore 7 Oct 2007 22:33:51 -0000 1.15
@@ -1 +1,2 @@
-module-init-tools-3.3-pre11.tar.bz2
+module-init-tools-3.4.tar.bz2
+module-init-tools-3.4.tar.bz2.sign
module-init-tools-allconf.patch:
Index: module-init-tools-allconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools-allconf.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- module-init-tools-allconf.patch 22 Mar 2007 19:10:18 -0000 1.6
+++ module-init-tools-allconf.patch 7 Oct 2007 22:33:51 -0000 1.7
@@ -1,6 +1,6 @@
-diff -urNp module-init-tools-3.3-pre11_orig/depmod.c module-init-tools-3.3-pre11/depmod.c
---- module-init-tools-3.3-pre11_orig/depmod.c 2007-03-22 03:36:02.000000000 -0400
-+++ module-init-tools-3.3-pre11/depmod.c 2007-03-22 12:36:02.000000000 -0400
+diff -urNp module-init-tools-3.4_orig/depmod.c module-init-tools-3.4/depmod.c
+--- module-init-tools-3.4_orig/depmod.c 2007-10-07 17:51:46.000000000 -0400
++++ module-init-tools-3.4/depmod.c 2007-10-07 18:18:14.000000000 -0400
@@ -1053,8 +1053,7 @@ static void read_toplevel_config(const c
/* Try defaults. */
@@ -11,10 +11,10 @@
}
}
-diff -urNp module-init-tools-3.3-pre11_orig/modprobe.c module-init-tools-3.3-pre11/modprobe.c
---- module-init-tools-3.3-pre11_orig/modprobe.c 2007-03-22 03:36:02.000000000 -0400
-+++ module-init-tools-3.3-pre11/modprobe.c 2007-03-22 12:36:02.000000000 -0400
-@@ -1250,9 +1250,8 @@ static void read_toplevel_config(const c
+diff -urNp module-init-tools-3.4_orig/modprobe.c module-init-tools-3.4/modprobe.c
+--- module-init-tools-3.4_orig/modprobe.c 2007-10-07 17:57:23.000000000 -0400
++++ module-init-tools-3.4/modprobe.c 2007-10-07 18:18:14.000000000 -0400
+@@ -1251,9 +1251,8 @@ static void read_toplevel_config(const c
/* Try defaults. */
for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
module-init-tools-dump_modversions.patch:
Index: module-init-tools-dump_modversions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools-dump_modversions.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- module-init-tools-dump_modversions.patch 22 Mar 2007 19:10:18 -0000 1.4
+++ module-init-tools-dump_modversions.patch 7 Oct 2007 22:33:51 -0000 1.5
@@ -1,7 +1,7 @@
-diff -urNp module-init-tools-3.3-pre11_orig/modprobe.c module-init-tools-3.3-pre11/modprobe.c
---- module-init-tools-3.3-pre11_orig/modprobe.c 2007-03-22 12:36:02.000000000 -0400
-+++ module-init-tools-3.3-pre11/modprobe.c 2007-03-22 15:08:52.000000000 -0400
-@@ -976,6 +976,67 @@ nonexistent_module:
+diff -urNp module-init-tools-3.4_orig/modprobe.c module-init-tools-3.4/modprobe.c
+--- module-init-tools-3.4_orig/modprobe.c 2007-10-07 18:20:12.000000000 -0400
++++ module-init-tools-3.4/modprobe.c 2007-10-07 18:26:54.000000000 -0400
+@@ -977,6 +977,67 @@ nonexistent_module:
goto remove_rest;
}
@@ -69,7 +69,7 @@
/* Does path contain directory(s) subpath? */
static int type_matches(const char *path, const char *subpath)
{
-@@ -1384,6 +1445,7 @@ static struct option options[] = { { "ve
+@@ -1387,6 +1448,7 @@ static struct option options[] = { { "ve
{ "set-version", 1, NULL, 'S' },
{ "show-depends", 0, NULL, 'D' },
{ "first-time", 0, NULL, 3 },
@@ -77,7 +77,7 @@
{ "use-blacklist", 0, NULL, 'b' },
{ NULL, 0, NULL, 0 } };
-@@ -1421,6 +1483,7 @@ int main(int argc, char *argv[])
+@@ -1424,6 +1486,7 @@ int main(int argc, char *argv[])
int strip_modversion = 0;
int ignore_proc = 0;
int first_time = 0;
@@ -85,7 +85,7 @@
int use_blacklist = 0;
unsigned int i, num_modules;
char *type = NULL;
-@@ -1537,6 +1600,9 @@ int main(int argc, char *argv[])
+@@ -1544,6 +1607,9 @@ int main(int argc, char *argv[])
case 3:
first_time = 1;
break;
@@ -95,7 +95,7 @@
default:
print_usage(argv[0]);
}
-@@ -1602,6 +1668,11 @@ int main(int argc, char *argv[])
+@@ -1609,6 +1675,11 @@ int main(int argc, char *argv[])
LIST_HEAD(list);
char *modulearg = argv[optind + i];
module-init-tools-noescape.patch:
Index: module-init-tools-noescape.patch
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools-noescape.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- module-init-tools-noescape.patch 22 Mar 2007 19:10:18 -0000 1.4
+++ module-init-tools-noescape.patch 7 Oct 2007 22:33:51 -0000 1.5
@@ -1,6 +1,6 @@
-diff -urNp module-init-tools-3.3-pre11_orig/depmod.c module-init-tools-3.3-pre11/depmod.c
---- module-init-tools-3.3-pre11_orig/depmod.c 2007-03-22 12:36:02.000000000 -0400
-+++ module-init-tools-3.3-pre11/depmod.c 2007-03-22 15:07:15.000000000 -0400
+diff -urNp module-init-tools-3.4_orig/depmod.c module-init-tools-3.4/depmod.c
+--- module-init-tools-3.4_orig/depmod.c 2007-10-07 18:20:12.000000000 -0400
++++ module-init-tools-3.4/depmod.c 2007-10-07 18:20:43.000000000 -0400
@@ -701,13 +701,8 @@ static void filename2modname(char *modna
else
afterslash++;
Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- module-init-tools.spec 22 Mar 2007 19:10:18 -0000 1.58
+++ module-init-tools.spec 7 Oct 2007 22:33:51 -0000 1.59
@@ -1,12 +1,11 @@
-%define preversion -pre11
Summary: Kernel module management utilities.
Name: module-init-tools
-Version: 3.3
-Release: 0.pre11.1.0%{?dist}
+Version: 3.4
+Release: 0%{?dist}
License: GPL
Group: System Environment/Kernel
-Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
-Source1: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2.sign
+Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}.tar.bz2
+Source1: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
Source2: modprobe.conf.dist
Source3: blacklist-compat
Source4: weak-modules
@@ -104,6 +103,9 @@
%ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
%changelog
+* Sun Oct 7 2007 Jon Masters <jcm at redhat.com> - 3.4
+- Rebase to latest upstream release.
+
* Thu Mar 22 2007 Jon Masters <jcm at redhat.com> - 3.3-0.pre11.1.0
- Rebase to latest upstream release.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 22 Mar 2007 19:10:18 -0000 1.16
+++ sources 7 Oct 2007 22:33:51 -0000 1.17
@@ -1 +1,2 @@
-1c00b41c66647731ed8eb0cd102f451f module-init-tools-3.3-pre11.tar.bz2
+db6ac059e80e8dd4389dbe81ee61f3c6 module-init-tools-3.4.tar.bz2
+b649560d1a66b2383d3e47762bbea60e module-init-tools-3.4.tar.bz2.sign
More information about the fedora-extras-commits
mailing list