- update to rpm-4.11.1

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=275

findksyms.diff

@@ -1,109 +1,43 @@
 SUSE specific kernel provides/requires scripts
 
---- scripts/find-provides.ksyms
-+++ scripts/find-provides.ksyms
-@@ -0,0 +1,41 @@
-+#! /bin/sh
-+
-+IFS=$'\n'
-+
-+case "$1" in
-+kernel-module-*)    ;; # Fedora kernel module package names start with
-+		       # kernel-module.
-+kernel*)	    kernel_flavor=${1#kernel-} ;;
-+esac
-+
-+trap 'rm -f "$tmp"' EXIT
-+tmp=$(mktemp)
-+while read f; do
-+    test -e "$f" || continue
-+    case "$f" in
-+    *.debug)
-+        continue
-+        ;;
-+    */lib/modules/*/*.ko | */lib/modules/*/*.ko.gz | */boot/vmlinu[xz]*)
-+        ;;
-+    *)
-+        continue
-+    esac
-+    unzip=false
-+    case "$f" in
-+    *.gz | */boot/vmlinuz*)
-+        unzip=true
-+    esac
-+    if $unzip && gzip -cd "$f" >"$tmp"; then
-+        f=$tmp
-+    fi
-+    flavor=$(/sbin/modinfo -F vermagic "$f")
-+    flavor=${flavor%% *}
-+    flavor=${flavor##*-}
-+    if test -z "$flavor"; then
-+        flavor=$kernel_flavor
-+    fi
-+    nm "$f" \
-+    | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p"
-+done \
-+| sort -u
---- scripts/find-requires.ksyms
-+++ scripts/find-requires.ksyms
-@@ -0,0 +1,57 @@
+--- scripts/find-provides.ksyms.orig	2013-07-12 14:08:40.000000000 +0000
++++ scripts/find-provides.ksyms	2013-07-12 14:08:54.000000000 +0000
+@@ -0,0 +1,17 @@
 +#! /bin/bash
 +
 +IFS=$'\n'
 +
-+case "$1" in
-+kernel-module-*)    ;; # Fedora kernel module package names start with
-+		       # kernel-module.
-+kernel*)	    is_kernel_package=1 ;;
-+esac
++while read f; do
++    test -e "$f" || continue
++    case "$f" in
++    *.debug)
++        ;;
++    */boot/vmlinu[xz]-*)
++	flavor=${f##*/vmlinu[xz]-}
++	flavor=${flavor%.gz}
++	echo "kernel-uname-r = $flavor"
++        ;;
++    esac
++done \
++| sort -u
+--- scripts/find-requires.ksyms.orig	2013-07-12 14:08:45.000000000 +0000
++++ scripts/find-requires.ksyms	2013-07-12 14:08:33.000000000 +0000
+@@ -0,0 +1,15 @@
++#! /bin/bash
 +
-+all_provides() {
-+    for module in "$@"; do
-+	nm "$module"
-+    done \
-+    | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \
-+    | sort -t $'\t' -k2 -u
-+}
++IFS=$'\n'
 +
-+all_requires() {
-+    for module in "$@"; do
-+	set -- $(/sbin/modinfo -F vermagic "$module" | sed -e 's: .*::' -e q)
-+	/sbin/modprobe --dump-modversions "$module" \
-+	    | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':'
-+    done \
-+    | sort -t $'\t' -k2 -u
-+}
-+
-+if ! [ -z "$is_kernel_package" -a -e /sbin/modinfo -a -e /sbin/modprobe ]; then
-+    cat > /dev/null
-+    exit 0
-+fi
-+
-+modules=($(grep -E '/lib/modules/.+\.ko$'))
-+if [ ${#modules[@]} -gt 0 ]; then
-+    symset_table=$(mktemp -t ${0##*/}.XXXXX)
-+    /usr/lib/rpm/symset-table | sort -t $'\t' -k 1,1 > $symset_table
-+
-+    join -t $'\t' -j 1 -a 2 $symset_table <(
-+	# Filter out requirements that we fulfill ourself.
-+	join -t $'\t' -j 2 -v 1 \
-+	    <(all_requires "${modules[@]}") \
-+	    <(all_provides "${modules[@]}") \
-+	| awk '
-+	BEGIN { FS = "\t" ; OFS = "\t" }
-+	{ print $3 "/" $2 "/" $1 }
-+	' \
-+	| sort -t $'\t' -k 1,1 -u) \
-+    | sort -u \
-+    | awk '
-+    { FS = "\t" ; OFS = "\t" }
-+	    { split($1, arr, "/")
-+	      flavor = gensub(/.*-/, "", "", arr[1]) }
-+    NF == 3 { print "kernel(" flavor ":" $2 ") = " $3
-+	      next }
-+	    { print "ksym(" flavor ":" arr[3] ") = " arr[2] }
-+    '
-+fi
++while read f; do
++    test -e "$f" || continue
++    case "$f" in
++    */lib/modules/*/*.ko | */lib/modules/*/*.ko.gz)
++	flavor=${f#*/lib/modules/}
++	flavor=${f%%/*}
++	echo "kernel-uname-r = $flavor"
++        ;;
++    esac
++done \
++| sort -u
 --- scripts/Makefile.am
 +++ scripts/Makefile.am
 @@ -15,6 +15,7 @@