Hello community, here is the log from the commit of package module-init-tools for openSUSE:Factory checked in at 2011-12-21 14:57:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/module-init-tools (Old) and /work/SRC/openSUSE:Factory/.module-init-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "module-init-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/module-init-tools/module-init-tools.changes 2011-09-23 02:13:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.module-init-tools.new/module-init-tools.changes 2011-12-21 14:57:32.000000000 +0100 @@ -1,0 +2,36 @@ +Tue Dec 20 21:18:26 CET 2011 - [email protected] + +- update to 3.15: + properly fix man page creation symlink handling + remove invalid multiple output files from docbook markup + fix the build process to be more modern + code formatting, documentation, and FSF mailing address corrections + fix code documentation for various functions + various cleanups to documentation for depmod + fix code documentation for various functions + update various todo items for depmod and modprobe, and overall also + +------------------------------------------------------------------- +Thu Dec 1 15:57:10 UTC 2011 - [email protected] + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Tue Nov 22 14:52:49 CET 2011 - [email protected] + +- modprobe.conf: Add more modules as dependencies of cifs.ko (bnc#730617 +- commit afd4f04 + +------------------------------------------------------------------- +Mon Nov 21 21:55:16 CET 2011 - [email protected] + +- Add the driver-check.sh script (bnc#731831) +- commit 48cf8bf + +------------------------------------------------------------------- +Wed Nov 16 11:23:31 CET 2011 - [email protected] + +- modprobe.conf: cifs.ko requires md4.ko in the initrd (bnc#730617) +- commit 6eac633 + +------------------------------------------------------------------- Old: ---- module-init-tools-3.13.tar.bz2 module-init-tools-manpages.diff New: ---- driver-check.sh module-init-tools-3.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.MTAgus/_old 2011-12-21 14:57:35.000000000 +0100 +++ /var/tmp/diff_new_pack.MTAgus/_new 2011-12-21 14:57:35.000000000 +0100 @@ -15,15 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: module-init-tools +BuildRequires: automake +BuildRequires: docbook-utils BuildRequires: zlib-devel -Version: 3.13 -Release: 1 -License: GPL v2 or later -Group: System/Kernel +Version: 3.15 +Release: 0 # for grepping /etc/SUSE-release PreReq: grep # nm and rpmsort (rpm) are required by the weak-modules script which is invoked @@ -35,19 +32,20 @@ Obsoletes: modules modutils # needed by 11.1 / SLE11 kernel Provides: module-init-tools_fix_bnc480524 -AutoReqProv: on Summary: Utilities to Load Modules into the Kernel +License: GPL-2.0+ +Group: System/Kernel Url: http://www.kerneltools.org/ -Source0: http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-init-tools-3.13.tar.bz2 +Source0: http://www.kernel.org/pub/linux/utils/kernel/%{name}/%{name}-%{version}.tar.bz2 Source1: README.SUSE Source2: modprobe.conf.tar.bz2 Source3: depmod-00-system.conf Source4: 10-unsupported-modules.conf Source5: weak-modules Source6: weak-modules2 +Source7: driver-check.sh # Patch1: module-init-tools-upstream.diff Patch2: module-init-tools-suse.diff -Patch3: module-init-tools-manpages.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,10 +65,9 @@ Jon Masters <[email protected]> %prep -%setup -q -n module-init-tools-3.13 -a2 +%setup -q -a2 # patch1 -p1 %patch2 -p1 -%patch3 -p1 %build autoreconf --force --install @@ -105,6 +102,7 @@ install -d -m 755 $RPM_BUILD_ROOT/usr/lib/%name #install -m 755 modindex $RPM_BUILD_ROOT/usr/lib/%name/ install -m 755 %_sourcedir/weak-modules{,2} $RPM_BUILD_ROOT/usr/lib/%name/ +install -m 755 %_sourcedir/driver-check.sh $RPM_BUILD_ROOT/usr/lib/%name/ %clean rm -rf $RPM_BUILD_ROOT ++++++ driver-check.sh ++++++ #!/bin/bash VERSION="0.5" MAINTAINER="Michal Marek <[email protected]>" USAGE="Usage: ${0##*/} [-o|--out output-file]" errors=0 warnings=0 trap 'rm -rf "$tmp"' EXIT tmp=$(mktemp -d) rpm() { # rpm tends to send localized error messages to stdout :-( LC_ALL=C command rpm "$@" } file_owner() { local f=$1 if (cd "$tmp/rpms"; grep -lFx "$f" *); then return fi rpm -qf "$f" } _explain_called=() explain() { local caller=${BASH_LINENO[0]} if test -n "${_explain_called[$caller]}"; then return fi _explain_called[$caller]=1 echo "$*" } error() { echo "ERROR: $*" let errors++ } warning() { echo "warning: $*" >&2 let warnings++ } check_system() { if test ! -x /usr/lib/module-init-tools/weak-modules2; then echo "This tool only works on SLE11 and later systems" >&2 exit 1 fi if ! zypper search >/dev/null; then echo "Cannot run zypper, please correct the above problem" >&2 exit 1 fi } check_rpm() { local rpm=$1 name=${1%-*-*} # ignore changes to %config and %doc files and ignore changed mtimes if rpm -V "$rpm" | grep -Ev '^[^ ]{8,} [cd] |^\.{7}T\.* '; then error "$rpm was not installed correctly (see above)" fi # this is ugly. Apparently zypper insist on the progress messages and # the ascii table, so grep for the table row. if ! LC_ALL=C zypper -A search -t package -u -s --match-exact "$name" \ | grep -qe ---; then error "$rpm: no update repositories found" fi } check_kernel_package() { local kernel=$1 if ! rpm -q --qf '%{description}\n' "$kernel" | grep -q '^GIT '; then error "$kernel does not look like a SUSE kernel package (no commit id)" fi if ! rpm -q --qf '%{postin}\n' "$kernel" | grep -q 'weak-modules2'; then error "$kernel does not look like a SUSE kernel package (wrong %post script)" fi } check_krel() { local krel=$1 system_map module_symvers msg res args bad=false local mit_version system_map="/boot/System.map-$krel" module_symvers="/boot/symvers-$krel.gz" if ! test -e "$system_map"; then error "$system_map not found" bad=true fi if ! test -e "$module_symvers"; then error "$module_symvers not found" bad=true fi if $bad; then explain "Each kernel must install /boot/System.map-\$version and /boot/symvers-\$version.gz to be able to check module dependencies." return fi set -- $(/sbin/depmod --version | sed -rn 's/.* ([0-9]+)\.([0-9]+)(\..*)?/\1 \2/p') if test -n "$1" -a -n "$2"; then let "mit_version = $1 * 100 + $2" else warning "Cannot determine module-init-tools version, this is a bug in the script" mit_version=0 fi # depmod -E was introduced in 3.10 if test "$mit_version" -ge 310; then gzip -cd <"$module_symvers" >"$tmp/symvers" args=(-E "$tmp/symvers") else args=(-F "$system_map") fi msg=$(/sbin/depmod -n -e "${args[@]}" "$krel" 2>&1 >/dev/null) res=$? if test -n "$msg" -o "$res" -ne 0; then echo "$msg" error "depmod $krel returned errors (exit code $res)" explain "depmod must pass without errors otherwise KMP scripts will break" fi } req_re='^(kernel\([^:]*:kernel[[:alnum:]_]*\)|ksym\([^:]*:(struct_module|module_layout)\)) = [0-9a-f]+' check_kmp() { local kmp=$1 prefix prev_krel krel path found_module=false if ! rpm -q --qf '%{postin}\n' "$kmp" | grep -q 'weak-modules2'; then error "$kmp does not look like a SUSE kernel module package (wrong %post)" fi if ! rpm -q -R "$kmp" | grep -Eq "$req_re"; then error "$kmp does not have proper dependencies" fi exec 3< <(sed -rn 's:^(/lib/modules)?/([^/]*)/(.*\.ko)$:\1 \2 \3:p' \ "$tmp/rpms/$kmp") while read prefix krel path <&3; do found_module=true if test "$prefix" != "/lib/modules"; then error "$kmp installs modules outside of /lib/modules" continue fi if test -z "$prev_krel"; then prev_krel=$krel elif test "$prev_krel" != "$krel"; then error "$kmp installs modules for multiple kernel versions" fi case "$path" in updates/* | extra/*) ;; weak-updates/*) error "$kmp installs modules in weak-updates/ instead of updates/ or extra/" explain "The weak-modules directory is reserved for automatically generated symlinks" ;; *) error "$kmp installs modules in an invalid directory" explain \ "KMPs must install modules in the updates/ or extra/ subdirectories for the weak-modules2 script to work" ;; esac done if ! $found_module; then error "$kmp does not contain any modules" explain \ "A KMP must contain it's modules in the rpm filelist, otherwise weak-modules2 will not work" fi } check_ko() { local ko=$1 kmp bad=false case "$ko" in */weak-updates/*) if test -L "$ko"; then return fi esac kmp=$(file_owner "$ko") case "$kmp" in kernel-* | *-kmp-*) ;; *not\ owned\ by\ any\ package) error "$ko is not owned by any package" bad=true ;; *) error "$ko is not packaged as a KMP" bad=true ;; esac if $bad; then explain \ "External kernel modules must be packaged as KMPs, see http://developer.novell.com/wiki/index.php/Kernel_Module_Packages_Manuals"; fi } options=$(getopt -n "${0##*/}" -o o:h --long out:,help -- "$@") if test "$?" -ne 0; then echo "$USAGE" >&2 exit 1 fi eval set -- "$options" logfile="driver-check-report.txt" while :; do case "$1" in -o | --out) logfile="$2" shift 2 ;; -h | --help) echo "${0##*/} $VERSION" echo "$USAGE" echo echo "Please report bugs and enhancement requests to $MAINTAINER" exit 0 ;; --) shift break ;; esac done if test $# -gt 0; then echo "Unrecognized arguments: $*" >&2 echo "$USAGE" >&2 exit 1 fi check_system # set up redirection if test $logfile != "-"; then if test -e "$logfile"; then mv -f "$logfile" "$logfile~" fi if test -e /proc/self; then exec 99> >(cat >"$logfile") exec 1>&99 exec 2> >(tee -a /proc/self/fd/99 >&2) else exec 1>"$logfile" exec 2>"$logfile" warning "/proc not mounted" fi fi echo "${0##*/} $VERSION started at $(date -R)" >&2 check_rpm $(rpm -q --qf '%{n}-%{v}-%{r}\n' module-init-tools) mkdir -p "$tmp/rpms" found_kernel=false for rpm in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' 'kernel-*' '*-kmp-*' | \ /usr/lib/rpm/rpmsort); do case "$rpm" in kernel-source-* | kernel-syms-* | kernel-*-debug* | kernel-*-man-* | \ kernel-*-devel-* | kernel-firmware-* | kernel-coverage-* | \ kernel-docs-* | kernel-devel-*) continue esac # store the filelist to speed up file_owner() rpm -ql "$rpm" >"$tmp/rpms/$rpm" check_rpm "$rpm" case "$rpm" in kernel-*) check_kernel_package "$rpm" found_kernel=true ;; *-kmp-*) check_kmp "$rpm" ;; esac done if ! $found_kernel; then warning "no kernel package found" fi for krel in /lib/modules/*/kernel; do krel=${krel%/kernel} krel=${krel##*/} check_krel "$krel" done modules=($(find /lib/modules/ -name '*.ko')) for module in "${modules[@]}"; do check_ko "$module" done echo "Found $errors error(s) and $warnings warning(s)" >&2 if test "$logfile" != -; then echo "Report written to $logfile at $(date -R)" >&2 else echo "Report finished at $(date -R)" >&2 fi if test $errors -eq 0; then exit 0 else exit 1 fi ++++++ modprobe.conf.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modprobe.conf/modprobe.conf.common new/modprobe.conf/modprobe.conf.common --- old/modprobe.conf/modprobe.conf.common 2009-11-04 21:17:38.000000000 +0100 +++ new/modprobe.conf/modprobe.conf.common 2011-11-22 14:56:21.000000000 +0100 @@ -75,6 +75,13 @@ # request_module("crc32c"), but that dependency is not seen by modpost/depmod # https://bugzilla.novell.com/552443 # SUSE INITRD: libcrc32c REQUIRES crc32c + +# likewise, cifs calls crypto_alloc_shash(...) for a couple of algorithms +# https://bugzilla.novell.com/730617 +# SUSE INITRD: cifs REQUIRES des ecb md4 md5 hmac arc4 +# It also calls load_nls() +# FIXME: determine the proper nls module based on fstab options instead +# SUSE INITRD: cifs REQUIRES nls_utf8 # end of common part for modprobe.conf ++++++ module-init-tools-3.13.tar.bz2 -> module-init-tools-3.15.tar.bz2 ++++++ ++++ 20858 lines of diff (skipped) ++++++ module-init-tools-suse.diff ++++++ --- /var/tmp/diff_new_pack.MTAgus/_old 2011-12-21 14:57:36.000000000 +0100 +++ /var/tmp/diff_new_pack.MTAgus/_new 2011-12-21 14:57:36.000000000 +0100 @@ -1,9 +1,9 @@ This patch contains suse-specific changes against upstream commit 768b9984b254d0dbb3f21f5a75adeb2a8bab1edf -diff --git a/doc/modprobe.conf.sgml b/doc/modprobe.conf.sgml -index 74fdb7c..45c3172 100644 ---- a/doc/modprobe.conf.sgml -+++ b/doc/modprobe.conf.sgml +Index: module-init-tools-3.15/doc/modprobe.conf.sgml +=================================================================== +--- module-init-tools-3.15.orig/doc/modprobe.conf.sgml ++++ module-init-tools-3.15/doc/modprobe.conf.sgml @@ -205,6 +205,19 @@ </para> </listitem> @@ -24,10 +24,10 @@ </variablelist> </refsect1> <refsect1> -diff --git a/doc/modprobe.sgml b/doc/modprobe.sgml -index 85330e1..31da55c 100644 ---- a/doc/modprobe.sgml -+++ b/doc/modprobe.sgml +Index: module-init-tools-3.15/doc/modprobe.sgml +=================================================================== +--- module-init-tools-3.15.orig/doc/modprobe.sgml ++++ module-init-tools-3.15/doc/modprobe.sgml @@ -441,9 +441,28 @@ </para> </listitem> @@ -57,10 +57,10 @@ <title>ENVIRONMENT</title> <para> The MODPROBE_OPTIONS environment variable can also be used to -diff --git a/logging.c b/logging.c -index 4330269..46257ff 100644 ---- a/logging.c -+++ b/logging.c +Index: module-init-tools-3.15/logging.c +=================================================================== +--- module-init-tools-3.15.orig/logging.c ++++ module-init-tools-3.15/logging.c @@ -57,13 +57,15 @@ void error(const char *fmt, ...) va_end(arglist); } @@ -78,10 +78,10 @@ } /* If we don't flush, then child processes print before we do */ -diff --git a/logging.h b/logging.h -index fb11df0..78b1600 100644 ---- a/logging.h -+++ b/logging.h +Index: module-init-tools-3.15/logging.h +=================================================================== +--- module-init-tools-3.15.orig/logging.h ++++ module-init-tools-3.15/logging.h @@ -10,6 +10,9 @@ extern int quiet; /* Do we want informative messages as well as errors? */ extern int verbose; @@ -92,12 +92,12 @@ #ifdef __GNUC__ #define _printf __attribute__((format(printf, 1, 2))) #else -diff --git a/modprobe.c b/modprobe.c -index 6d30f39..144af3e 100644 ---- a/modprobe.c -+++ b/modprobe.c -@@ -51,6 +51,9 @@ - +Index: module-init-tools-3.15/modprobe.c +=================================================================== +--- module-init-tools-3.15.orig/modprobe.c ++++ module-init-tools-3.15/modprobe.c +@@ -55,6 +55,9 @@ + /* NOTE: in the future, binary indexes will always be used */ static int use_binary_indexes = 1; /* default to enabled. */ +/* Allow loading of unsupported modules? */ @@ -106,7 +106,7 @@ /* Limit do_softdep/do_modprobe recursion. * This is a simple way to handle dependency loops * caused by poorly written softdep commands. -@@ -80,6 +83,7 @@ typedef enum +@@ -84,6 +87,7 @@ typedef enum mit_strip_modversion = 256, mit_resolve_alias = 512 @@ -114,7 +114,7 @@ } modprobe_flags_t; #ifndef MODULE_DIR -@@ -310,6 +314,23 @@ static void clear_magic(struct elf_file *module) +@@ -392,6 +396,23 @@ static void clear_magic(struct elf_file } } @@ -135,10 +135,10 @@ + return 0; +} + + /* keep track of module options from config file(s) */ struct module_options { - struct module_options *next; -@@ -946,6 +967,16 @@ static int parse_config_file(const char *filename, +@@ -1184,6 +1205,16 @@ static int parse_config_file(const char if (streq(tmp, "no")) use_binary_indexes = 0; } @@ -155,7 +155,7 @@ } else { syntax_error: grammar(cmd, filename, linenum); -@@ -1446,6 +1477,17 @@ static int insmod(struct list_head *list, +@@ -1778,6 +1809,17 @@ static int insmod(struct list_head *list strerror(errno)); goto out; } @@ -173,7 +173,7 @@ if (flags & mit_strip_modversion) module->ops->strip_section(module, "__versions"); if (flags & mit_strip_vermagic) -@@ -1630,6 +1672,17 @@ static int do_modprobe(const char *modname, +@@ -2008,6 +2050,17 @@ static int do_modprobe(const char *modna LIST_HEAD(list); int failed = 0; @@ -191,7 +191,7 @@ matching_aliases = find_aliases(conf->aliases, modname); /* No luck? Try symbol names, if starts with symbol:. */ -@@ -1733,6 +1786,7 @@ static const struct option options[] = { { "version", 0, NULL, 'V' }, +@@ -2113,6 +2166,7 @@ static const struct option options[] = { { "force-modversion", 0, NULL, 2 }, { "first-time", 0, NULL, 3 }, { "dump-modversions", 0, NULL, 4 }, @@ -199,7 +199,7 @@ { NULL, 0, NULL, 0 } }; int main(int argc, char *argv[]) -@@ -1839,6 +1893,9 @@ int main(int argc, char *argv[]) +@@ -2219,6 +2273,9 @@ int main(int argc, char *argv[]) case 4: dump_modver = 1; break; @@ -209,17 +209,17 @@ default: print_usage(argv[0]); } -diff --git a/modprobe.d.5 b/modprobe.d.5 -index d0ed026..a83566a 100644 ---- a/modprobe.d.5 -+++ b/modprobe.d.5 +Index: module-init-tools-3.15/modprobe.d.5 +=================================================================== +--- module-init-tools-3.15.orig/modprobe.d.5 ++++ module-init-tools-3.15/modprobe.d.5 @@ -1 +1 @@ -.so modprobe.conf.5 +.so man5/modprobe.conf.5 -diff --git a/zlibsupport.c b/zlibsupport.c -index 597820e..0f78524 100644 ---- a/zlibsupport.c -+++ b/zlibsupport.c +Index: module-init-tools-3.15/zlibsupport.c +=================================================================== +--- module-init-tools-3.15.orig/zlibsupport.c ++++ module-init-tools-3.15/zlibsupport.c @@ -12,6 +12,8 @@ #include <stdlib.h> #include <unistd.h> @@ -270,7 +270,8 @@ { - gzFile gzfd; - void *buffer; -- ++ static char *TMPDIR; + - errno = 0; - gzfd = gzopen(filename, "rb"); - if (!gzfd) { @@ -281,12 +282,6 @@ - buffer = grab_contents(gzfd, size); - gzclose(gzfd); - return buffer; --} -+ static char *TMPDIR; - --void release_file(void *data, unsigned long size) --{ -- free(data); + if (TMPDIR) + return TMPDIR; + TMPDIR = getenv("TMPDIR"); @@ -294,15 +289,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) +void *do_grab_fd(int fd, unsigned long *size) { struct stat st; void *map; -@@ -80,6 +65,60 @@ void *grab_fd(int fd, unsigned long *size) +@@ -80,6 +65,60 @@ void *grab_fd(int fd, unsigned long *siz return map; } @@ -363,7 +363,7 @@ void *grab_file(const char *filename, unsigned long *size) { int fd; -@@ -97,4 +136,4 @@ void release_file(void *data, unsigned long size) +@@ -97,4 +136,4 @@ void release_file(void *data, unsigned l { munmap(data, size); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
