March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Tue Mar 24 20:25:31 CET 2009. -------- --- kernel-source/kernel-debug.changes 2009-03-17 12:12:20.000000000 +0100 +++ kernel-source/kernel-debug.changes 2009-03-24 17:53:12.768418000 +0100 @@ -1,0 +2,27 @@ +Tue Mar 24 15:37:54 CET 2009 - jeffm(a)suse.de + +- Update to 2.6.29-final. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Fri Mar 20 09:41:41 CET 2009 - jbeulich(a)novell.com + +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. + +------------------------------------------------------------------- +Wed Mar 18 15:10:32 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. + +------------------------------------------------------------------- +Tue Mar 17 16:14:08 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) + +------------------------------------------------------------------- kernel-default.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 Old: ---- linux-2.6.28.tar.bz2 New: ---- linux-2.6.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:18.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:18.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -130,7 +130,7 @@ %endif %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -213,12 +213,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-debug-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -235,12 +235,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -275,7 +275,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-debug +KERNELRELEASE=2.6.29-$RELEASE-debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -290,7 +290,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -342,7 +342,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -501,8 +501,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \ @@ -567,37 +567,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-debug.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-debug.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-debug/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -623,13 +592,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -730,8 +692,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -773,8 +735,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -802,8 +764,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-debug-man @@ -812,6 +774,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:19.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -146,7 +146,7 @@ %endif %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -228,12 +228,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-default-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -250,12 +250,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -290,7 +290,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-default +KERNELRELEASE=2.6.29-$RELEASE-default EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -305,7 +305,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -357,7 +357,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -516,8 +516,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-default} \ @@ -582,37 +582,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-default.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-default.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-default/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -638,13 +607,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -744,8 +706,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -786,8 +748,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -814,8 +776,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-default-man @@ -824,6 +786,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:19.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-kdump Summary: kernel for kdump Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -124,7 +124,7 @@ %ifarch ppc64 %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -209,12 +209,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-kdump-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -231,12 +231,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -271,7 +271,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-kdump +KERNELRELEASE=2.6.29-$RELEASE-kdump EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -286,7 +286,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -338,7 +338,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -497,8 +497,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \ @@ -563,37 +563,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-kdump.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-kdump.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-kdump/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -619,13 +588,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -728,8 +690,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -773,8 +735,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -804,8 +766,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-kdump-man @@ -814,6 +776,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:20.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:20.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -121,7 +121,7 @@ Provides: kernel = 2.6.29-%source_rel Provides: k_smp4G kernel-bigsmp Obsoletes: k_smp4G kernel-bigsmp -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -210,12 +210,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-pae-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -232,12 +232,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -272,7 +272,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-pae +KERNELRELEASE=2.6.29-$RELEASE-pae EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -287,7 +287,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -339,7 +339,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -498,8 +498,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-pae} \ @@ -564,37 +564,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-pae.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-pae.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-pae/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -620,13 +589,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -733,8 +695,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -782,8 +744,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -817,8 +779,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-pae-man @@ -827,6 +789,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:20.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:20.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -126,7 +126,7 @@ %ifarch ppc64 %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -222,12 +222,12 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-ppc64-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -244,12 +244,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -284,7 +284,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-ppc64 +KERNELRELEASE=2.6.29-$RELEASE-ppc64 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -299,7 +299,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -351,7 +351,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -510,8 +510,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \ @@ -576,37 +576,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-ppc64.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-ppc64.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-ppc64/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -632,13 +601,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -752,8 +714,8 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -808,8 +770,8 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -850,8 +812,8 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-ppc64-man @@ -860,6 +822,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:20.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:20.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -119,7 +119,7 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = 2.6.29-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -204,12 +204,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-ps3-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -226,12 +226,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -266,7 +266,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-ps3 +KERNELRELEASE=2.6.29-$RELEASE-ps3 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -281,7 +281,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -333,7 +333,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -492,8 +492,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-ps3} \ @@ -558,37 +558,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-ps3.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-ps3.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-ps3/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -614,13 +583,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -720,8 +682,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -762,8 +724,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -793,8 +755,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-ps3-man @@ -803,6 +765,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:21.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:21.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -121,7 +121,7 @@ Provides: kernel = 2.6.29-%source_rel Provides: kernel-32bit k_deflt Obsoletes: kernel-32bit k_deflt -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -203,12 +203,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-s390-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -225,12 +225,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -265,7 +265,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-s390 +KERNELRELEASE=2.6.29-$RELEASE-s390 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -280,7 +280,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -332,7 +332,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -491,8 +491,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \ @@ -557,37 +557,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-s390.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-s390.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-s390/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -613,13 +582,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -719,8 +681,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -761,8 +723,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -789,8 +751,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-s390-man @@ -799,6 +761,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:21.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:21.000000000 +0100 @@ -30,7 +30,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -44,7 +44,7 @@ Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source1: source-pre.sh Source2: source-post.sh Source3: kernel-source.rpmlintrc @@ -116,13 +116,13 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then - echo "Please get a copy of linux-2.6.28.tar.bz2 from" \ +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then + echo "Please get a copy of linux-2.6.29.tar.bz2 from" \ "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/." fi echo "Architecture symbol(s): %symbols" @@ -135,7 +135,7 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.29-rc8-$RELEASE +KERNELRELEASE=2.6.29-$RELEASE case kernel-source in (*-rt) variant=-rt @@ -155,9 +155,9 @@ ln -sf linux$variant linux$variant # dummy symlink mkdir linux-obj # Unpack the vanilla kernel sources -bzip2 -cd %_sourcedir/linux-2.6.28.tar.bz2 \ +bzip2 -cd %_sourcedir/linux-2.6.29.tar.bz2 \ | tar xf - -mv linux-2.6.28 linux-$KERNELRELEASE$variant +mv linux-2.6.29 linux-$KERNELRELEASE$variant cd linux-$KERNELRELEASE$variant chmod -x arch/arm/mach-at91/board-yl-9200.c # executable by accident (fixed in 2.6.27) %_sourcedir/guards $variant_symbols %symbols < %_sourcedir/series.conf \ @@ -291,6 +291,21 @@ %files -f kernel-source.files %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:21.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:21.000000000 +0100 @@ -29,7 +29,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -91,8 +91,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep @@ -136,9 +136,6 @@ cp -p $file $(dirname $RPM_BUILD_ROOT$symvers) done done - for symsets in /boot/symsets-*-$flavor.tar.gz; do - cp -p --parents $symsets $RPM_BUILD_ROOT/ - done for file in /lib/modules/*-$flavor/build; do cp -pd --parents $file $RPM_BUILD_ROOT/ done @@ -147,10 +144,24 @@ %files %defattr(-, root, root) /usr/src/linux-*-obj -/boot/symsets-*-*.tar.gz /lib/modules/*/build %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:22.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:22.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -127,7 +127,7 @@ %endif %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -215,12 +215,12 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-trace-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -237,12 +237,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -277,7 +277,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-trace +KERNELRELEASE=2.6.29-$RELEASE-trace EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -292,7 +292,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -344,7 +344,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -503,8 +503,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-trace} \ @@ -569,37 +569,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-trace.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-trace.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-trace/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -625,13 +594,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -735,8 +697,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -781,8 +743,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -815,8 +777,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-trace-man @@ -825,6 +787,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:22.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:22.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.29 -Release: 5 +Release: 6 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -143,7 +143,7 @@ %endif %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -225,12 +225,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-vanilla-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -247,12 +247,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -287,7 +287,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-vanilla +KERNELRELEASE=2.6.29-$RELEASE-vanilla EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -302,7 +302,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -354,7 +354,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -513,8 +513,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-vanilla} \ @@ -579,37 +579,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-vanilla.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-vanilla.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-vanilla/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -635,13 +604,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -739,8 +701,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -779,8 +741,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -807,8 +769,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-vanilla-man @@ -817,6 +779,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:22.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:22.000000000 +0100 @@ -63,7 +63,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.29 -Release: 3 +Release: 4 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -124,7 +124,7 @@ %ifarch x86_64 %endif %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 Source10: preun.sh Source11: postun.sh Source12: pre.sh @@ -209,12 +209,12 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %prep -if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then +if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then echo "The kernel-xen-2.6.29.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-2.6.29.src.rpm." exit 1 @@ -231,12 +231,12 @@ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ | sed -e 's:$: '"$how"':' done -} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported +} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported # Create grep pattern file for the modules to end up in the base package comm -2 -3 <(supported_conf base) <(supported_conf) \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ > %my_builddir/grep-for-base-modules -cd linux-2.6.28 +cd linux-2.6.29 # Apply the patches needed for this architecture. %if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do @@ -271,7 +271,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.29-rc8-$RELEASE-xen +KERNELRELEASE=2.6.29-$RELEASE-xen EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -286,7 +286,7 @@ %build source .rpm-defs -cd linux-2.6.28 +cd linux-2.6.29 cp .config .config.orig %if %{tolerate_unknown_new_config_options} MAKE_ARGS="$MAKE_ARGS -k" @@ -338,7 +338,7 @@ # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes -cd linux-2.6.28 +cd linux-2.6.29 mkdir %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE @@ -497,8 +497,8 @@ # $(uname -m) to the ARCH directory. [ -e %buildroot/$obj_dir/%_target_cpu ] \ || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu - # We were building in %my_builddir/linux-2.6.28, but the sources will - # later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the + # We were building in %my_builddir/linux-2.6.29, but the sources will + # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the # build symlink. rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \ @@ -563,37 +563,6 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif - # generate symsets - mkdir -p %my_builddir/{base,main,extra}-symsets - for f in %my_builddir/{base,main,unsupported}-modules; do - if [ -f "$f" ]; then - sed 's:^/:%buildroot/:' "$f" - fi > "$f-br" - done - reference= - if test -e %my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz; then - tar xzf %my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz -C \ - %my_builddir/kabi/$cpu_arch - reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-xen/" - fi - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --symvers=Module.symvers \ - --modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/base-symsets -%if %split_packages - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/main-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --output-dir=%my_builddir/main-symsets - %_sourcedir/symsets.pl --generate-symsets \ - $reference \ - --modules=%my_builddir/unsupported-modules-br \ - --required-modules=%my_builddir/base-modules-br \ - --required-modules=%my_builddir/main-modules-br \ - --output-dir=%my_builddir/extra-symsets -%endif # check for kabi changes KABI=0 if [ -n "$reference" ]; then @@ -619,13 +588,6 @@ # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi - symsets=%my_builddir/symsets-$KERNELRELEASE - mkdir -p $symsets - find %my_builddir/{base,main,extra}-symsets -type f \ - | xargs --replace='{}' cp '{}' $symsets/ - tar c -C ${symsets%/*} ${symsets##*/} \ - | gzip -9 \ - > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames \ @@ -728,8 +690,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun base -f preun-base.sh @@ -773,8 +735,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %preun extra -f preun-extra.sh @@ -804,8 +766,8 @@ -Source Timestamp: 2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +Source Timestamp: 2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master %files -n kernel-xen-man @@ -814,6 +776,21 @@ %endif %changelog +* Tue Mar 24 2009 jeffm(a)suse.de +- Update to 2.6.29-final. + - Eliminated 4 patches. +* Fri Mar 20 2009 jbeulich(a)novell.com +- Update Xen config files. +- Update Xen patches to 2.6.29-rc8 and c/s 821. +* Wed Mar 18 2009 mmarek(a)suse.cz +- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>" + to the release, breaks plain rpmbuild. +* Tue Mar 17 2009 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't generate symsets +- rpm/kernel-syms.spec.in: don't package symsets +- rpm/find-provides: disable symset provides +- rpm/macros.kernel-source: don't check for /boot/symsets* + (fate#305945) * Tue Mar 17 2009 knikanth(a)suse.de - patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers2: Delete. ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:23.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:23.000000000 +0100 @@ -1,3 +1,3 @@ -2009-03-17 12:11:53 +0100 -GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 +2009-03-24 15:38:18 +0100 +GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db GIT Branch: master ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2009-03-13 23:38:34.000000000 +0100 +++ new/config/i386/debug 2009-03-24 15:38:18.000000000 +0100 @@ -1077,6 +1077,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1792,6 +1793,7 @@ CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1914,6 +1916,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -2959,6 +2962,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default --- old/config/i386/default 2009-03-13 23:38:34.000000000 +0100 +++ new/config/i386/default 2009-03-24 15:38:18.000000000 +0100 @@ -1086,6 +1086,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1788,6 +1789,7 @@ CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1913,6 +1915,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -2953,6 +2956,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2009-03-13 23:38:34.000000000 +0100 +++ new/config/i386/pae 2009-03-24 15:38:18.000000000 +0100 @@ -1097,6 +1097,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1800,6 +1801,7 @@ CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1922,6 +1924,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -2962,6 +2965,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2009-03-13 23:38:34.000000000 +0100 +++ new/config/i386/trace 2009-03-24 15:38:18.000000000 +0100 @@ -1072,6 +1072,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1774,6 +1775,7 @@ CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1899,6 +1901,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -2939,6 +2942,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2009-03-13 23:38:34.000000000 +0100 +++ new/config/i386/vanilla 2009-03-24 15:38:18.000000000 +0100 @@ -1054,6 +1054,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1752,6 +1753,7 @@ CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1875,6 +1877,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -2913,6 +2916,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2009-03-13 23:38:34.000000000 +0100 +++ new/config/i386/xen 2009-03-24 15:38:18.000000000 +0100 @@ -365,6 +365,7 @@ CONFIG_PCI_REASSIGN=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_GUESTDEV=y CONFIG_PCI_STUB=m CONFIG_ISA_DMA_API=y CONFIG_SCx200=m @@ -953,6 +954,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1598,6 +1600,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1703,6 +1706,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_IBMLS=m @@ -2697,6 +2701,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ia64/debug 2009-03-24 15:38:18.000000000 +0100 @@ -859,6 +859,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1478,6 +1479,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1578,6 +1580,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2476,6 +2479,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ia64/default 2009-03-24 15:38:18.000000000 +0100 @@ -858,6 +858,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1465,6 +1466,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1565,6 +1567,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2457,6 +2460,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ia64/trace 2009-03-24 15:38:18.000000000 +0100 @@ -852,6 +852,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1461,6 +1462,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1561,6 +1563,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2457,6 +2460,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ia64/vanilla 2009-03-24 15:38:18.000000000 +0100 @@ -818,6 +818,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1423,6 +1424,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1523,6 +1525,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2416,6 +2419,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc/default 2009-03-24 15:38:18.000000000 +0100 @@ -902,6 +902,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1354,6 +1355,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1451,6 +1453,7 @@ CONFIG_BNX2X=m CONFIG_QLGE=m CONFIG_SFC=m +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_IBMLS=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc/kdump new/config/ppc/kdump --- old/config/ppc/kdump 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc/kdump 2009-03-24 15:38:18.000000000 +0100 @@ -771,6 +771,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1170,6 +1171,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1259,6 +1261,7 @@ CONFIG_BNX2X=m CONFIG_QLGE=m CONFIG_SFC=m +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc/ppc64 2009-03-24 15:38:18.000000000 +0100 @@ -234,6 +234,7 @@ CONFIG_PS3_DISK=m CONFIG_PS3_ROM=m CONFIG_PS3_FLASH=m +CONFIG_PS3_VRAM=m CONFIG_PS3_LPM=m CONFIG_PPC_CELL=y CONFIG_PPC_CELL_COMMON=y @@ -869,6 +870,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -967,7 +969,6 @@ # CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -CONFIG_MTD_PS3VRAM=m # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLOCK2MTD is not set @@ -1369,6 +1370,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1464,6 +1466,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc/ps3 new/config/ppc/ps3 --- old/config/ppc/ps3 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc/ps3 2009-03-24 15:38:18.000000000 +0100 @@ -405,6 +405,7 @@ CONFIG_WIRELESS_EXT=y # CONFIG_WIRELESS_EXT_SYSFS is not set CONFIG_LIB80211=y +# CONFIG_LIB80211_DEBUG is not set # CONFIG_MAC80211 is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc/vanilla 2009-03-24 15:38:18.000000000 +0100 @@ -894,6 +894,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1341,6 +1342,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1438,6 +1440,7 @@ CONFIG_BNX2X=m CONFIG_QLGE=m CONFIG_SFC=m +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_IBMLS=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc64/debug 2009-03-24 15:38:18.000000000 +0100 @@ -234,6 +234,7 @@ CONFIG_PS3_DISK=m CONFIG_PS3_ROM=m CONFIG_PS3_FLASH=m +CONFIG_PS3_VRAM=m CONFIG_PS3_LPM=m CONFIG_PPC_CELL=y CONFIG_PPC_CELL_COMMON=y @@ -827,6 +828,7 @@ CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -933,7 +935,6 @@ # CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -CONFIG_MTD_PS3VRAM=m # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLOCK2MTD is not set @@ -1333,6 +1334,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1427,6 +1429,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc64/default 2009-03-24 15:38:18.000000000 +0100 @@ -234,6 +234,7 @@ CONFIG_PS3_DISK=m CONFIG_PS3_ROM=m CONFIG_PS3_FLASH=m +CONFIG_PS3_VRAM=m CONFIG_PS3_LPM=m CONFIG_PPC_CELL=y CONFIG_PPC_CELL_COMMON=y @@ -827,6 +828,7 @@ CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -923,7 +925,6 @@ # CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -CONFIG_MTD_PS3VRAM=m # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLOCK2MTD is not set @@ -1323,6 +1324,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1417,6 +1419,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc64/kdump new/config/ppc64/kdump --- old/config/ppc64/kdump 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc64/kdump 2009-03-24 15:38:18.000000000 +0100 @@ -771,6 +771,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1170,6 +1171,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1259,6 +1261,7 @@ CONFIG_BNX2X=m CONFIG_QLGE=m CONFIG_SFC=m +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc64/ppc64 2009-03-24 15:38:18.000000000 +0100 @@ -234,6 +234,7 @@ CONFIG_PS3_DISK=m CONFIG_PS3_ROM=m CONFIG_PS3_FLASH=m +CONFIG_PS3_VRAM=m CONFIG_PS3_LPM=m CONFIG_PPC_CELL=y CONFIG_PPC_CELL_COMMON=y @@ -869,6 +870,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -967,7 +969,6 @@ # CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -CONFIG_MTD_PS3VRAM=m # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLOCK2MTD is not set @@ -1369,6 +1370,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1464,6 +1466,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2009-03-13 23:38:34.000000000 +0100 +++ new/config/ppc64/vanilla 2009-03-24 15:38:18.000000000 +0100 @@ -230,6 +230,7 @@ CONFIG_PS3_DISK=m CONFIG_PS3_ROM=m CONFIG_PS3_FLASH=m +CONFIG_PS3_VRAM=m CONFIG_PS3_LPM=m CONFIG_PPC_CELL=y CONFIG_PPC_CELL_COMMON=y @@ -858,6 +859,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -955,7 +957,6 @@ # CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -CONFIG_MTD_PS3VRAM=m # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLOCK2MTD is not set @@ -1352,6 +1353,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set CONFIG_TULIP=m @@ -1447,6 +1449,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m # CONFIG_3C359 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2009-03-13 23:38:34.000000000 +0100 +++ new/config/x86_64/debug 2009-03-24 15:38:18.000000000 +0100 @@ -1060,6 +1060,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1707,6 +1708,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1812,6 +1814,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2759,6 +2762,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2009-03-13 23:38:34.000000000 +0100 +++ new/config/x86_64/default 2009-03-24 15:38:18.000000000 +0100 @@ -1061,6 +1061,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1698,6 +1699,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1803,6 +1805,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2775,6 +2778,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2009-03-13 23:38:34.000000000 +0100 +++ new/config/x86_64/trace 2009-03-24 15:38:18.000000000 +0100 @@ -1052,6 +1052,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1689,6 +1690,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1794,6 +1796,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2747,6 +2750,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2009-03-13 23:38:34.000000000 +0100 +++ new/config/x86_64/vanilla 2009-03-24 15:38:18.000000000 +0100 @@ -1034,6 +1034,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1667,6 +1668,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1770,6 +1772,7 @@ CONFIG_QLGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2732,6 +2735,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2009-03-13 23:38:34.000000000 +0100 +++ new/config/x86_64/xen 2009-03-24 15:38:18.000000000 +0100 @@ -349,6 +349,7 @@ CONFIG_PCI_REASSIGN=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_GUESTDEV=y CONFIG_PCI_STUB=m CONFIG_ISA_DMA_API=y CONFIG_K8_NB=y @@ -945,6 +946,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m # @@ -1577,6 +1579,7 @@ CONFIG_TYPHOON=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1682,6 +1685,7 @@ CONFIG_SFC_DRIVERLINK=y CONFIG_SFC_RESOURCE=m CONFIG_SFC_MTD=y +CONFIG_BE2NET=m CONFIG_TR=y CONFIG_IBMOL=m CONFIG_3C359=m @@ -2648,6 +2652,7 @@ CONFIG_VIDEO_VP27SMPX=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m ++++++ find-provides ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:26.000000000 +0100 @@ -2,7 +2,6 @@ # these are updated by the spec file sourcedir=${0%/*} -builddir="$sourcedir/../BUILD" filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX) trap "rm -f $filelist" EXIT @@ -11,34 +10,19 @@ /usr/lib/rpm/find-provides "$@" <"$filelist" -# HACK: find out what subpackage is this and just print the symsets -# computed in %build. We need to do it this way because the provided -# symsets are computed from the modules AND the reference symsets, which -# we don't see here. -subpack= - -samemodules() +( + grep '\.ko$' "$filelist" | \ + xargs -r $sourcedir/symsets.pl --list-exported-symbols; + grep '/Module\.symvers$' "$filelist" | while read f; do + $sourcedir/symsets.pl --list-exported-symbols --symvers-file="$f" + done +) | awk -v flavor="$flavor" ' { - cmp -s <(sed -rn 's:.*/([^/]*\.ko)$:\1:p' "$1" | sort) \ - <(sed -rn 's:.*/([^/]*\.ko)$:\1:p' "$2" | sort) -} - -if ! grep -q '\.ko$' "$filelist"; then - # no modules, no symsets - exit 0 -fi -if samemodules "$builddir"/base-modules "$filelist"; then - subpack=base -elif samemodules "$builddir"/main-modules "$filelist"; then - subpack=main -elif samemodules "$builddir"/unsupported-modules "$filelist"; then - subpack=extra -else - echo "find-provides: failed to determine which subpackage is this" >&2 - exit 1 -fi - -ls "$builddir/$subpack-symsets" | sed -rn 's/^(.+)\.([a-z0-9]{16})/kernel('$flavor':\1) = \2/p' + sub(/^0x0*/, "", $1); + if (!$1) + $1 = "0"; + printf "ksym(%s:%s) = %s\n", flavor, $2, $1 +}' exit 0 ++++++ get_release_number.sh ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:26.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -prefix=rc8. +prefix= suffix= -commit=808de9df +commit=4bf28205 [ -n "$suffix" ] || suffix=$2 while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do suffix=${suffix#[^0-9]*.} ++++++ linux-2.6.28.tar.bz2 -> linux-2.6.29.tar.bz2 ++++++ kernel-source/linux-2.6.28.tar.bz2 kernel-source/linux-2.6.29.tar.bz2 differ: byte 11, line 1 ++++++ macros.kernel-source ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:28.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:28.000000000 +0100 @@ -18,7 +18,6 @@ esac \ krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \ kver=${krel%%-*} \ - [ -e /boot/symsets-$kver-$flavor.tar.gz ] || continue \ flavors_to_build="$flavors_to_build $flavor" \ echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name}-kmp -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} $flavor $kver" \ done \ ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:28.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:28.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:28.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:28.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libfc-handle-rrq-exch-timeout.diff new/patches.drivers/libfc-handle-rrq-exch-timeout.diff --- old/patches.drivers/libfc-handle-rrq-exch-timeout.diff 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/libfc-handle-rrq-exch-timeout.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -From: Vasu Dev <vasu.dev(a)intel.com> -Subject: libfc: handle RRQ exch timeout -References: bnc #465596 - -Cleanup exchange held due to RRQ when RRQ exch times out, in this case the -ABTS is already done causing RRQ req therefore proceeding with cleanup in -fc_exch_rrq_resp should be okay to restore exch resource. - -Signed-off-by: Vasu Dev <vasu.dev(a)intel.com> -Acked-by: Bernhard Walle <bwalle(a)suse.de> ---- - - drivers/scsi/libfc/fc_exch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - ---- a/drivers/scsi/libfc/fc_exch.c -+++ b/drivers/scsi/libfc/fc_exch.c -@@ -1607,7 +1607,7 @@ static void fc_exch_rrq_resp(struct fc_s - if (IS_ERR(fp)) { - int err = PTR_ERR(fp); - -- if (err == -FC_EX_CLOSED) -+ if (err == -FC_EX_CLOSED || err == -FC_EX_TIMEOUT) - goto cleanup; - FC_DBG("Cannot process RRQ, because of frame error %d\n", err); - return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff new/patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff --- old/patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -From: Abhijeet Joglekar <abjoglek(a)cisco.com> -Subject: libfc: Pass lport in exch_mgr_reset -References: bnc #465596 - -fc_exch_mgr structure is private to fc_exch.c. To export exch_mgr_reset to -transport, transport needs access to the exch manager. Change -exch_mgr_reset to use lport param which is the shared structure between -libFC and transport. - -Alternatively, fc_exch_mgr definition can be moved to libfc.h so that lport -can be accessed from mp*. - -Signed-off-by: Abhijeet Joglekar <abjoglek(a)cisco.com> -Acked-by: Bernhard Walle <bwalle(a)suse.de> ---- - - drivers/scsi/libfc/fc_exch.c | 3 ++- - drivers/scsi/libfc/fc_lport.c | 4 ++-- - drivers/scsi/libfc/fc_rport.c | 4 ++-- - include/scsi/libfc.h | 4 ++-- - 4 files changed, 8 insertions(+), 7 deletions(-) - - ---- a/drivers/scsi/libfc/fc_exch.c -+++ b/drivers/scsi/libfc/fc_exch.c -@@ -1480,10 +1480,11 @@ static void fc_exch_reset(struct fc_exch - * If sid is non-zero, reset only exchanges we source from that FID. - * If did is non-zero, reset only exchanges destined to that FID. - */ --void fc_exch_mgr_reset(struct fc_exch_mgr *mp, u32 sid, u32 did) -+void fc_exch_mgr_reset(struct fc_lport *lp, u32 sid, u32 did) - { - struct fc_exch *ep; - struct fc_exch *next; -+ struct fc_exch_mgr *mp = lp->emp; - - spin_lock_bh(&mp->em_lock); - restart: ---- a/drivers/scsi/libfc/fc_lport.c -+++ b/drivers/scsi/libfc/fc_lport.c -@@ -663,7 +663,7 @@ int fc_lport_destroy(struct fc_lport *lp - { - lport->tt.frame_send = fc_frame_drop; - lport->tt.fcp_abort_io(lport); -- lport->tt.exch_mgr_reset(lport->emp, 0, 0); -+ lport->tt.exch_mgr_reset(lport, 0, 0); - return 0; - } - EXPORT_SYMBOL(fc_lport_destroy); -@@ -973,7 +973,7 @@ static void fc_lport_enter_reset(struct - - lport->tt.disc_stop(lport); - -- lport->tt.exch_mgr_reset(lport->emp, 0, 0); -+ lport->tt.exch_mgr_reset(lport, 0, 0); - fc_host_fabric_name(lport->host) = 0; - fc_host_port_id(lport->host) = 0; - ---- a/drivers/scsi/libfc/fc_rport.c -+++ b/drivers/scsi/libfc/fc_rport.c -@@ -1285,7 +1285,7 @@ void fc_rport_terminate_io(struct fc_rpo - struct fc_rport_libfc_priv *rdata = rport->dd_data; - struct fc_lport *lport = rdata->local_port; - -- lport->tt.exch_mgr_reset(lport->emp, 0, rport->port_id); -- lport->tt.exch_mgr_reset(lport->emp, rport->port_id, 0); -+ lport->tt.exch_mgr_reset(lport, 0, rport->port_id); -+ lport->tt.exch_mgr_reset(lport, rport->port_id, 0); - } - EXPORT_SYMBOL(fc_rport_terminate_io); ---- a/include/scsi/libfc.h -+++ b/include/scsi/libfc.h -@@ -472,7 +472,7 @@ struct libfc_function_template { - * If s_id is non-zero, reset only exchanges originating from that FID. - * If d_id is non-zero, reset only exchanges sending to that FID. - */ -- void (*exch_mgr_reset)(struct fc_exch_mgr *, -+ void (*exch_mgr_reset)(struct fc_lport *, - u32 s_id, u32 d_id); - - void (*rport_flush_queue)(void); -@@ -916,7 +916,7 @@ struct fc_seq *fc_seq_start_next(struct - * If s_id is non-zero, reset only exchanges originating from that FID. - * If d_id is non-zero, reset only exchanges sending to that FID. - */ --void fc_exch_mgr_reset(struct fc_exch_mgr *, u32 s_id, u32 d_id); -+void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id); - - /* - * Functions for fc_functions_template diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libfc-when-rport-goes-away-re.diff new/patches.drivers/libfc-when-rport-goes-away-re.diff --- old/patches.drivers/libfc-when-rport-goes-away-re.diff 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/libfc-when-rport-goes-away-re.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -From: Abhijeet Joglekar <abjoglek(a)cisco.com> -Subject: libfc: when rport goes away (re-plogi), clean up exchanges to/from rport -References: bnc #465596 - -When a rport goes away, libFC does a plogi which will reset exchanges - at the rport. Clean exchanges at our end, both in transport and libFC. - If transport hooks into exch_mgr_reset, it will call back into - fc_exch_mgr_reset() to clean up libFC exchanges. - -Signed-off-by: Abhijeet Joglekar <abjoglek(a)cisco.com> -Acked-by: Bernhard Walle <bwalle(a)suse.de> ---- - - drivers/scsi/libfc/fc_rport.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - - ---- a/drivers/scsi/libfc/fc_rport.c -+++ b/drivers/scsi/libfc/fc_rport.c -@@ -214,6 +214,7 @@ static void fc_rport_state_enter(struct - - static void fc_rport_work(struct work_struct *work) - { -+ u32 port_id; - struct fc_rport_libfc_priv *rdata = - container_of(work, struct fc_rport_libfc_priv, event_work); - enum fc_rport_event event; -@@ -279,8 +280,12 @@ static void fc_rport_work(struct work_st - rport_ops->event_callback(lport, rport, event); - if (trans_state == FC_PORTSTATE_ROGUE) - put_device(&rport->dev); -- else -+ else { -+ port_id = rport->port_id; - fc_remote_port_delete(rport); -+ lport->tt.exch_mgr_reset(lport, 0, port_id); -+ lport->tt.exch_mgr_reset(lport, port_id, 0); -+ } - } else - mutex_unlock(&rdata->rp_mutex); - } ++++++ patches.kabi.tar.bz2 ++++++ ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1 ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/dm-block-integrity new/patches.suse/dm-block-integrity --- old/patches.suse/dm-block-integrity 2009-03-13 23:38:34.000000000 +0100 +++ new/patches.suse/dm-block-integrity 1970-01-01 01:00:00.000000000 +0100 @@ -1,252 +0,0 @@ -From: Kiyoshi Ueda <k-ueda(a)ct.jp.nec.com> -Subject: Block integrity support for DM and MD -References: FATE#304345 - -This patch adds Data integrity support to DM and MD. -It has been reworked to support request-based multipathing. - -Update Jan 19 2009 jeffm: -- Merged against 2.6.29-rc2 - -Signed-off-by: Kiyoshi Ueda <k-ueda(a)ct.jp.nec.com> -Signed-off-by: Jun'ichi Nomura <j-nomura(a)ce.jp.nec.com> -Cc: Martin K. Petersen <martin.petersen(a)oracle.com> -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - ---- - drivers/md/dm-table.c | 37 +++++++++++++++++++++++++++++++++++++ - drivers/md/dm.c | 21 +++++++++++++++++++++ - drivers/md/dm.h | 1 + - drivers/md/md.c | 34 ++++++++++++++++++++++++++++++++++ - fs/bio-integrity.c | 5 +++-- - fs/bio.c | 2 +- - include/linux/bio.h | 4 ++-- - 7 files changed, 99 insertions(+), 5 deletions(-) - ---- a/drivers/md/dm-table.c -+++ b/drivers/md/dm-table.c -@@ -975,6 +975,43 @@ void dm_table_set_restrictions(struct dm - queue_flag_set_unlocked(QUEUE_FLAG_STACKABLE, q); - } - -+void dm_table_set_integrity(struct dm_table *t, struct mapped_device *md) -+{ -+ struct list_head *devices = dm_table_get_devices(t); -+ struct dm_dev_internal *prev, *cur; -+ -+ /* -+ * Run through all devices to ensure they have matching -+ * integrity profile -+ */ -+ cur = prev = NULL; -+ -+ list_for_each_entry(cur, devices, list) { -+ -+ if (prev && blk_integrity_compare(prev->dm_dev.bdev->bd_disk, -+ cur->dm_dev.bdev->bd_disk) < 0) { -+ printk(KERN_ERR "%s: %s %s Integrity mismatch!\n", -+ __func__, prev->dm_dev.bdev->bd_disk->disk_name, -+ cur->dm_dev.bdev->bd_disk->disk_name); -+ return; -+ } -+ prev = cur; -+ } -+ -+ /* Register dm device as being integrity capable */ -+ if (prev && bdev_get_integrity(prev->dm_dev.bdev)) { -+ struct gendisk *disk = dm_disk(md); -+ -+ if (blk_integrity_register(dm_disk(md), -+ bdev_get_integrity(prev->dm_dev.bdev))) -+ printk(KERN_ERR "%s: %s Could not register integrity!\n", -+ __func__, disk->disk_name); -+ else -+ printk(KERN_INFO "Enabling data integrity on %s\n", -+ disk->disk_name); -+ } -+} -+ - unsigned int dm_table_get_num_targets(struct dm_table *t) - { - return t->num_targets; ---- a/drivers/md/dm.c -+++ b/drivers/md/dm.c -@@ -1017,6 +1017,12 @@ static struct bio *split_bvec(struct bio - clone->bi_io_vec->bv_len = clone->bi_size; - clone->bi_flags |= 1 << BIO_CLONED; - -+ if (bio_integrity(bio)) { -+ bio_integrity_clone(clone, bio, GFP_NOIO, bs); -+ bio_integrity_trim(clone, -+ bio_sector_offset(bio, idx, offset), len); -+ } -+ - return clone; - } - -@@ -1038,6 +1044,14 @@ static struct bio *clone_bio(struct bio - clone->bi_size = to_bytes(len); - clone->bi_flags &= ~(1 << BIO_SEG_VALID); - -+ if (bio_integrity(bio)) { -+ bio_integrity_clone(clone, bio, GFP_NOIO, bs); -+ -+ if (idx != bio->bi_idx || clone->bi_size < bio->bi_size) -+ bio_integrity_trim(clone, -+ bio_sector_offset(bio, idx, 0), len); -+ } -+ - return clone; - } - -@@ -1362,6 +1376,11 @@ static int clone_request_bios(struct req - } - - __bio_clone(clone_bio, bio); -+ if (bio_integrity(bio)) -+ if (bio_integrity_clone(clone_bio, bio, GFP_ATOMIC, -+ md->bs) < 0) -+ goto free_and_out; -+ - clone_bio->bi_destructor = dm_bio_destructor; - clone_bio->bi_end_io = end_clone_bio; - info->rq = clone; -@@ -1836,6 +1855,7 @@ static void free_dev(struct mapped_devic - mempool_destroy(md->io_pool); - if (md->bs) - bioset_free(md->bs); -+ blk_integrity_unregister(md->disk); - del_gendisk(md->disk); - free_minor(minor); - -@@ -1913,6 +1933,7 @@ static int __bind(struct mapped_device * - write_lock(&md->map_lock); - md->map = t; - dm_table_set_restrictions(t, q); -+ dm_table_set_integrity(t, md); - if (!(dm_table_get_mode(t) & FMODE_WRITE)) { - set_disk_ro(md->disk, 1); - } else { ---- a/drivers/md/dm.h -+++ b/drivers/md/dm.h -@@ -49,6 +49,7 @@ void dm_table_event_callback(struct dm_t - struct dm_target *dm_table_get_target(struct dm_table *t, unsigned int index); - struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector); - void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q); -+void dm_table_set_integrity(struct dm_table *t, struct mapped_device *md); - struct list_head *dm_table_get_devices(struct dm_table *t); - void dm_table_presuspend_targets(struct dm_table *t); - void dm_table_postsuspend_targets(struct dm_table *t); ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -1438,6 +1438,38 @@ static int match_mddev_units(mddev_t *md - - static LIST_HEAD(pending_raid_disks); - -+static void md_integrity_check(mdk_rdev_t *rdev, mddev_t *mddev) -+{ -+ struct mdk_personality *pers = mddev->pers; -+ struct gendisk *disk = mddev->gendisk; -+ struct blk_integrity *bi_rdev = bdev_get_integrity(rdev->bdev); -+ struct blk_integrity *bi_mddev = blk_get_integrity(disk); -+ -+ /* Data integrity passthrough not supported on RAID 4, 5 and 6 */ -+ if (pers && pers->level >= 4 && pers->level <= 6) -+ return; -+ -+ /* If rdev is integrity capable, register profile for mddev */ -+ if (!bi_mddev && bi_rdev) { -+ if (blk_integrity_register(disk, bi_rdev)) -+ printk(KERN_ERR "%s: %s Could not register integrity!\n", -+ __func__, disk->disk_name); -+ else -+ printk(KERN_NOTICE "Enabling data integrity on %s\n", -+ disk->disk_name); -+ return; -+ } -+ -+ /* Check that mddev and rdev have matching profiles */ -+ if (blk_integrity_compare(disk, rdev->bdev->bd_disk) < 0) { -+ printk(KERN_ERR "%s: %s/%s integrity mismatch!\n", __func__, -+ disk->disk_name, rdev->bdev->bd_disk->disk_name); -+ printk(KERN_NOTICE "Disabling data integrity on %s\n", -+ disk->disk_name); -+ blk_integrity_unregister(disk); -+ } -+} -+ - static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) - { - char b[BDEVNAME_SIZE]; -@@ -1508,6 +1540,7 @@ static int bind_rdev_to_array(mdk_rdev_t - - /* May as well allow recovery to be retried once */ - mddev->recovery_disabled = 0; -+ md_integrity_check(rdev, mddev); - return 0; - - fail: -@@ -4129,6 +4162,7 @@ static int do_md_stop(mddev_t * mddev, i - printk(KERN_INFO "md: %s switched to read-only mode.\n", - mdname(mddev)); - err = 0; -+ blk_integrity_unregister(disk); - md_new_event(mddev); - sysfs_notify_dirent(mddev->sysfs_state); - out: ---- a/fs/bio-integrity.c -+++ b/fs/bio-integrity.c -@@ -685,19 +685,20 @@ EXPORT_SYMBOL(bio_integrity_split); - * bio_integrity_clone - Callback for cloning bios with integrity metadata - * @bio: New bio - * @bio_src: Original bio -+ * @gfp_mask: Memory allocation mask - * @bs: bio_set to allocate bip from - * - * Description: Called to allocate a bip when cloning a bio - */ - int bio_integrity_clone(struct bio *bio, struct bio *bio_src, -- struct bio_set *bs) -+ gfp_t gfp_mask, struct bio_set *bs) - { - struct bio_integrity_payload *bip_src = bio_src->bi_integrity; - struct bio_integrity_payload *bip; - - BUG_ON(bip_src == NULL); - -- bip = bio_integrity_alloc_bioset(bio, GFP_NOIO, bip_src->bip_vcnt, bs); -+ bip = bio_integrity_alloc_bioset(bio, gfp_mask, bip_src->bip_vcnt, bs); - - if (bip == NULL) - return -EIO; ---- a/fs/bio.c -+++ b/fs/bio.c -@@ -462,7 +462,7 @@ struct bio *bio_clone(struct bio *bio, g - if (bio_integrity(bio)) { - int ret; - -- ret = bio_integrity_clone(b, bio, fs_bio_set); -+ ret = bio_integrity_clone(b, bio, gfp_mask, fs_bio_set); - - if (ret < 0) - return NULL; ---- a/include/linux/bio.h -+++ b/include/linux/bio.h -@@ -533,7 +533,7 @@ extern void bio_integrity_endio(struct b - extern void bio_integrity_advance(struct bio *, unsigned int); - extern void bio_integrity_trim(struct bio *, unsigned int, unsigned int); - extern void bio_integrity_split(struct bio *, struct bio_pair *, int); --extern int bio_integrity_clone(struct bio *, struct bio *, struct bio_set *); -+extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t, struct bio_set *); - extern int bioset_integrity_create(struct bio_set *, int); - extern void bioset_integrity_free(struct bio_set *); - extern void bio_integrity_init_slab(void); -@@ -544,7 +544,7 @@ extern void bio_integrity_init_slab(void - #define bioset_integrity_create(a, b) (0) - #define bio_integrity_prep(a) (0) - #define bio_integrity_enabled(a) (0) --#define bio_integrity_clone(a, b, c) (0) -+#define bio_integrity_clone(a, b, c, d) (0) - #define bioset_integrity_free(a) do { } while (0) - #define bio_integrity_free(a, b) do { } while (0) - #define bio_integrity_endio(a, b) do { } while (0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rq-based-multipath new/patches.suse/rq-based-multipath --- old/patches.suse/rq-based-multipath 2009-03-13 23:38:34.000000000 +0100 +++ new/patches.suse/rq-based-multipath 2009-03-24 15:38:18.000000000 +0100 @@ -33,7 +33,7 @@ } @@ -1066,6 +1072,13 @@ static int table_load(struct dm_ioctl *p - dm_table_put(t); + dm_table_destroy(t); goto out; } + @@ -570,7 +570,7 @@ { struct mapped_device *md = io->md; @@ -602,6 +640,266 @@ static void clone_endio(struct bio *bio, - free_tio(md, tio); + dec_pending(io, error); } +/* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/SoN-30-nfs-swap_ops.patch new/patches.suse/SoN-30-nfs-swap_ops.patch --- old/patches.suse/SoN-30-nfs-swap_ops.patch 2009-03-13 23:38:34.000000000 +0100 +++ new/patches.suse/SoN-30-nfs-swap_ops.patch 2009-03-24 15:38:18.000000000 +0100 @@ -262,7 +262,7 @@ + unsigned long pflags = current->flags; int err, status = -EIO; - if (xprt->shutdown || !xprt_bound(xprt)) + if (xprt->shutdown) goto out; + if (xprt->swapper) @@ -286,7 +286,7 @@ + unsigned long pflags = current->flags; int err, status = -EIO; - if (xprt->shutdown || !xprt_bound(xprt)) + if (xprt->shutdown) goto out; + if (xprt->swapper) @@ -304,8 +304,8 @@ /* @@ -1648,6 +1709,8 @@ static int xs_tcp_finish_connecting(stru - write_unlock_bh(&sk->sk_callback_lock); - } + if (!xprt_bound(xprt)) + return -ENOTCONN; + xs_set_memalloc(xprt); + @@ -319,7 +319,7 @@ + unsigned long pflags = current->flags; int err, status = -EIO; - if (xprt->shutdown || !xprt_bound(xprt)) + if (xprt->shutdown) goto out; + if (xprt->swapper) @@ -343,7 +343,7 @@ + unsigned long pflags = current->flags; int err, status = -EIO; - if (xprt->shutdown || !xprt_bound(xprt)) + if (xprt->shutdown) goto out; + if (xprt->swapper) ++++++ patches.xen.tar.bz2 ++++++ ++++ 27512 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.oL8689/_old 2009-03-24 20:15:38.000000000 +0100 +++ /var/tmp/diff_new_pack.oL8689/_new 2009-03-24 20:15:38.000000000 +0100 @@ -27,14 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-2.6.29-rc1 - patches.kernel.org/patch-2.6.29-rc1-rc2 - patches.kernel.org/patch-2.6.29-rc2-rc3 - patches.kernel.org/patch-2.6.29-rc3-rc4 - patches.kernel.org/patch-2.6.29-rc4-rc5 - patches.kernel.org/patch-2.6.29-rc5-rc6 - patches.kernel.org/patch-2.6.29-rc6-rc7 - patches.kernel.org/patch-2.6.29-rc7-rc8 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -501,11 +493,6 @@ +needs_update patches.drivers/cxgb3i-fixed-offload-array-size +needs_update patches.fixes/disable-lro-per-default - patches.drivers/libfc-handle-rrq-exch-timeout.diff - patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff - patches.drivers/libfc-when-rport-goes-away-re.diff - - ######################################################## # PCI and PCI hotplug ######################################################## @@ -572,7 +559,6 @@ patches.suse/dm-mpath-queue-length-load-balancing patches.suse/dm-mpath-tracking-nr-bytes patches.suse/dm-mpath-service-time-load-balancing - patches.suse/dm-block-integrity ######################################################## # md @@ -784,6 +770,7 @@ patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch patches.xen/ipv6-no-autoconf patches.xen/pci-reassign-resources + patches.xen/pci-guestdev patches.xen/sfc-driverlink patches.xen/sfc-resource-driver patches.xen/sfc-driverlink-conditional @@ -806,18 +793,6 @@ patches.xen/xen3-fixup-xen # newer changeset backports - patches.xen/735-balloon-exit.patch - patches.xen/737-kexec-free.patch - patches.xen/740-blkback-resource-leak.patch - patches.xen/746-pirq-status-page.patch - patches.xen/747-x86-undo-mfn-limit.patch - patches.xen/748-x86-ioapic-cleanup.patch - patches.xen/761-highpte.patch - patches.xen/762-xencons-hvc.patch - patches.xen/764-netback-foreign-pages.patch - patches.xen/769-evtchn-CPU-offline.patch - patches.xen/782-netback-error-handling.patch - patches.xen/791-x86-pcifront-register-pirq.patch # changes outside arch/{i386,x86_64}/xen patches.xen/xen3-fixup-kconfig @@ -841,6 +816,7 @@ patches.xen/xen3-patch-2.6.29-rc4-rc5 patches.xen/xen3-patch-2.6.29-rc5-rc6 patches.xen/xen3-patch-2.6.29-rc6-rc7 + patches.xen/xen3-patch-2.6.29-rc7-rc8 patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-rwlocks-enable-interrupts patches.xen/xen3-x86-mark_rodata_rw.patch @@ -862,7 +838,6 @@ patches.xen/xen-scsifront-block-timeout-update patches.xen/xen-op-packet patches.xen/xen-blkfront-cdrom - patches.xen/xen-blkfront-map-sg patches.xen/xen-sections patches.xen/xen-swiotlb-heuristics patches.xen/xen-kconfig-compat @@ -874,7 +849,6 @@ patches.xen/xen-configurable-guest-devices patches.xen/xen-netback-nr-irqs patches.xen/xen-netback-notify-multi - patches.xen/xen-S3-MSI patches.xen/xen-x86-panic-no-reboot patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-consistent-nmi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4 for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Tue Mar 24 19:59:05 CET 2009. -------- --- KDE/kdelibs4/kdelibs4.changes 2009-02-27 00:20:30.000000000 +0100 +++ kdelibs4/kdelibs4.changes 2009-03-15 20:13:48.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Mar 15 20:13:23 CET 2009 - coolo(a)suse.de + +- update 4_2_BRANCH.diff for some khtml fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.rN5249/_old 2009-03-24 19:58:39.000000000 +0100 +++ /var/tmp/diff_new_pack.rN5249/_new 2009-03-24 19:58:39.000000000 +0100 @@ -33,7 +33,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.2.1 -Release: 1 +Release: 2 %if %suse_version > 1010 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) %else @@ -414,6 +414,8 @@ /usr/share/mime/packages/kde.xml %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff for some khtml fixes * Fri Feb 27 2009 dmueller(a)suse.de - update to 4.2.1 * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php ++++++ 4_2_BRANCH.diff ++++++ ++++ 9159 lines (skipped) ++++ between KDE/kdelibs4/4_2_BRANCH.diff ++++ and kdelibs4/4_2_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit coreutils for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at Tue Mar 24 19:58:24 CET 2009. -------- --- coreutils/coreutils.changes 2009-02-22 10:51:35.000000000 +0100 +++ coreutils/coreutils.changes 2009-03-23 17:36:57.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 23 15:34:29 CET 2009 - pth(a)suse.de + +- Add .ogv to dircolors (bnc#487561). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- coreutils-add_ogv.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.wa1974/_old 2009-03-24 19:57:22.000000000 +0100 +++ /var/tmp/diff_new_pack.wa1974/_new 2009-03-24 19:57:22.000000000 +0100 @@ -24,7 +24,7 @@ License: GNU Free Documentation License, Version 1.2 (GFDL 1.2); GPL v2 or later; GPL v3 or later Group: System/Base Version: 7.1 -Release: 1 +Release: 2 Provides: fileutils sh-utils stat textutils mktemp Obsoletes: fileutils sh-utils stat textutils mktemp Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 @@ -48,6 +48,7 @@ Patch22: coreutils-5.3.0-sbin4su.diff Patch23: coreutils-getaddrinfo.diff Patch25: coreutils-cifs-afs.diff +Patch26: coreutils-add_ogv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -118,6 +119,7 @@ %patch22 %patch23 -p1 %patch25 +%patch26 %build #AUTOPOINT=true autoreconf -fi @@ -186,6 +188,8 @@ %defattr(-,root,root) %changelog +* Mon Mar 23 2009 pth(a)suse.de +- Add .ogv to dircolors (bnc#487561). * Sun Feb 22 2009 schwab(a)suse.de - Update to coreutils 7.1. ** New features ++++++ coreutils-add_ogv.patch ++++++ --- src/dircolors.hin +++ src/dircolors.hin @@ -151,6 +151,7 @@ .m2v 01;35 .mkv 01;35 .ogm 01;35 +.ogv 01:35 .mp4 01;35 .m4v 01;35 .mp4v 01;35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openldap2 for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Tue Mar 24 19:56:29 CET 2009. -------- --- openldap2/openldap2.changes 2009-01-07 11:24:18.000000000 +0100 +++ openldap2/openldap2.changes 2009-03-20 15:10:44.000000000 +0100 @@ -1,0 +2,39 @@ +Fri Mar 20 14:00:20 CET 2009 - rhafer(a)suse.de + +- Update to 2.4.15. Most important changes: + * Fixed slapd bconfig conversion again (ITS#5346) + * Fixed slapd behavior with superior objectClasses again (ITS#5517) + * Fixed slapd RFC4512 behavior with same attr in RDN (ITS#5968) + * Fixed slapd corrupt contextCSN (ITS#5947) + * Fixed slapd syncrepl order to match on add/delete (ITS#5954) + * Fixed slapd adding rdn with other values (ITS#5965) + * Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956) + * Fixed slapd-ldap/meta with entries with invalid attrs (ITS#5959) + * Fixed slapo-pcache caching invalid entries (ITS#5927) + * Fixed slapo-syncprov csn updates (ITS#5969) + * Added libldap option to disable SASL host canonicalization (ITS#5812) + * Fixed libldap chasing multiple referrals (ITS#5853) + * Fixed libldap setuid usage with .ldaprc (ITS#4750) + * Fixed libldap deref handling (ITS#5768) + * Fixed libldap NULL pointer deref (ITS#5934) + * Fixed libldap peer cert memory leak (ITS#5849) + * Fixed libldap intermediate response behavior (ITS#5896) + * Fixed libldap IPv6 address handling (ITS#5937) + * Fixed libldap_r deref building (ITS#5768) + * Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841) + * Fixed slapd acl checks on ADD (ITS#4556,ITS#5723) + * Fixed slapd acl application to newly created backends (ITS#5572) + * Fixed slapd bconfig to return error codes (ITS#5867) + * Fixed slapd bconfig encoding incorrectly (ITS#5897) + * Fixed slapd bconfig dangling pointers (ITS#5924) + * Fixed slapd epoll handling (ITS#5886) + * Fixed slapd glue with MMR (ITS#5925) + * Fixed slapd listener comparison (ITS#5613) + * Fixed various syncrepl issues (ITS#5809,ITS#5850, ITS#5843, + ITS#5866, ITS#5901, ITS#5881, ITS#5935, ITS#5710, + ITS#5781, ITS#5809, ITS#5798, ITS#5826) + * Fixed slapd-bdb/hdb dncachesize handling (ITS#5860) + * Fixed slapd-bdb/hdb trickle task usage (ITS#5864) + * Fixed slapd-hdb idlcache with empty suffix (ITS#5859) + +------------------------------------------------------------------- openldap2-client.changes: same change calling whatdependson for head-i586 Old: ---- libldap_ctrl_lderrno.dif libldap_r-tpool-resume-ITS5841.diff openldap-2.4.12.tar.bz2 secpatch.dif slapadd-no-trickle.dif slapd-bdb-stop-checkpoint.dif slapd-db-close-error-its5745.dif slapd-privdb-config-its5736.dif slapo-chain-dangling-its5742.dif slapo-syncprov-skip-its5709.dif New: ---- openldap-2.4.15.tar.bz2 slapd_getaddrinfo_dupl.dif slapd-ldap_back_entry_get_rw-ITS6003.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.H27483/_old 2009-03-24 19:53:23.000000000 +0100 +++ /var/tmp/diff_new_pack.H27483/_new 2009-03-24 19:53:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.12) +# spec file for package openldap2-client (Version 2.4.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,13 @@ Name: openldap2-client BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel %if %sles_version == 9 -BuildRequires: -libopenssl-devel -pwdutils openssl-devel +BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif %if %sles_version == 10 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif -Version: 2.4.12 -Release: 7 +Version: 2.4.15 +Release: 1 Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -52,7 +52,6 @@ Source5: README.update Source100: openldap-2.3.37.tar.bz2 Patch: openldap2.dif -Patch1: secpatch.dif Patch2: slapd_conf.dif Patch3: ldap_conf.dif Patch4: ldapi_url.dif @@ -60,16 +59,10 @@ Patch7: pie-compile.dif Patch9: openldap2-add-gnu-source.diff Patch11: slapd-bconfig-del-db.dif -Patch13: slapd-bdb-stop-checkpoint.dif Patch14: slapo-collect-include.dif -Patch15: libldap_ctrl_lderrno.dif -Patch16: slapd-privdb-config-its5736.dif -Patch17: slapo-chain-dangling-its5742.dif -Patch18: slapd-db-close-error-its5745.dif -Patch19: slapo-syncprov-skip-its5709.dif -Patch20: slapadd-no-trickle.dif -Patch21: libldap_r-tpool-resume-ITS5841.diff +Patch15: slapd-ldap_back_entry_get_rw-ITS6003.diff Patch100: openldap-2.3.37.dif +Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -132,7 +125,11 @@ %endif # Conflicts: openldap-devel +%if %suse_version >= 1110 Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel +%else +Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel openssl-devel +%endif Group: Development/Libraries/C and C++ %description -n openldap2-devel @@ -165,7 +162,6 @@ %prep %setup -q -n openldap-%{version} -a1 -a2 -b100 %patch -%patch1 %patch2 %patch3 %patch4 @@ -175,18 +171,14 @@ %endif %patch9 -p1 %patch11 -%patch13 %patch14 -p1 %patch15 -%patch16 -%patch17 -%patch18 -%patch19 -%patch20 -p1 -%patch21 cp %{SOURCE5} . cd ../openldap-2.3.37 %patch100 +%if %suse_version == 1100 +%patch200 -p1 +%endif %build %{?suse_update_config:%{suse_update_config -f build}} @@ -361,6 +353,7 @@ /usr/bin/ldapmodrdn /usr/bin/ldapsearch /usr/bin/ldappasswd +/usr/bin/ldapurl /usr/bin/ldapwhoami %doc %{_mandir}/man1/ldap* %doc %{_mandir}/man5/ldap.conf* @@ -545,6 +538,42 @@ %endif %changelog +* Fri Mar 20 2009 rhafer(a)suse.de +- Update to 2.4.15. Most important changes: + * Fixed slapd bconfig conversion again (ITS#5346) + * Fixed slapd behavior with superior objectClasses again (ITS#5517) + * Fixed slapd RFC4512 behavior with same attr in RDN (ITS#5968) + * Fixed slapd corrupt contextCSN (ITS#5947) + * Fixed slapd syncrepl order to match on add/delete (ITS#5954) + * Fixed slapd adding rdn with other values (ITS#5965) + * Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956) + * Fixed slapd-ldap/meta with entries with invalid attrs (ITS#5959) + * Fixed slapo-pcache caching invalid entries (ITS#5927) + * Fixed slapo-syncprov csn updates (ITS#5969) + * Added libldap option to disable SASL host canonicalization (ITS#5812) + * Fixed libldap chasing multiple referrals (ITS#5853) + * Fixed libldap setuid usage with .ldaprc (ITS#4750) + * Fixed libldap deref handling (ITS#5768) + * Fixed libldap NULL pointer deref (ITS#5934) + * Fixed libldap peer cert memory leak (ITS#5849) + * Fixed libldap intermediate response behavior (ITS#5896) + * Fixed libldap IPv6 address handling (ITS#5937) + * Fixed libldap_r deref building (ITS#5768) + * Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841) + * Fixed slapd acl checks on ADD (ITS#4556,ITS#5723) + * Fixed slapd acl application to newly created backends (ITS#5572) + * Fixed slapd bconfig to return error codes (ITS#5867) + * Fixed slapd bconfig encoding incorrectly (ITS#5897) + * Fixed slapd bconfig dangling pointers (ITS#5924) + * Fixed slapd epoll handling (ITS#5886) + * Fixed slapd glue with MMR (ITS#5925) + * Fixed slapd listener comparison (ITS#5613) + * Fixed various syncrepl issues (ITS#5809,ITS#5850, ITS#5843, + ITS#5866, ITS#5901, ITS#5881, ITS#5935, ITS#5710, + ITS#5781, ITS#5809, ITS#5798, ITS#5826) + * Fixed slapd-bdb/hdb dncachesize handling (ITS#5860) + * Fixed slapd-bdb/hdb trickle task usage (ITS#5864) + * Fixed slapd-hdb idlcache with empty suffix (ITS#5859) * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Fri Dec 12 2008 rhafer(a)suse.de ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.H27483/_old 2009-03-24 19:53:23.000000000 +0100 +++ /var/tmp/diff_new_pack.H27483/_new 2009-03-24 19:53:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openldap2 (Version 2.4.12) +# spec file for package openldap2 (Version 2.4.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,13 @@ Name: openldap2 BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel %if %sles_version == 9 -BuildRequires: -libopenssl-devel -pwdutils openssl-devel +BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif %if %sles_version == 10 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif -Version: 2.4.12 -Release: 7 +Version: 2.4.15 +Release: 1 Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -52,7 +52,6 @@ Source5: README.update Source100: openldap-2.3.37.tar.bz2 Patch: openldap2.dif -Patch1: secpatch.dif Patch2: slapd_conf.dif Patch3: ldap_conf.dif Patch4: ldapi_url.dif @@ -60,16 +59,10 @@ Patch7: pie-compile.dif Patch9: openldap2-add-gnu-source.diff Patch11: slapd-bconfig-del-db.dif -Patch13: slapd-bdb-stop-checkpoint.dif Patch14: slapo-collect-include.dif -Patch15: libldap_ctrl_lderrno.dif -Patch16: slapd-privdb-config-its5736.dif -Patch17: slapo-chain-dangling-its5742.dif -Patch18: slapd-db-close-error-its5745.dif -Patch19: slapo-syncprov-skip-its5709.dif -Patch20: slapadd-no-trickle.dif -Patch21: libldap_r-tpool-resume-ITS5841.diff +Patch15: slapd-ldap_back_entry_get_rw-ITS6003.diff Patch100: openldap-2.3.37.dif +Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,7 +128,11 @@ %endif # Conflicts: openldap-devel +%if %suse_version >= 1110 Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel +%else +Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel openssl-devel +%endif Group: Development/Libraries/C and C++ %description -n openldap2-devel @@ -168,7 +165,6 @@ %prep %setup -q -n openldap-%{version} -a1 -a2 -b100 %patch -%patch1 %patch2 %patch3 %patch4 @@ -178,18 +174,14 @@ %endif %patch9 -p1 %patch11 -%patch13 %patch14 -p1 %patch15 -%patch16 -%patch17 -%patch18 -%patch19 -%patch20 -p1 -%patch21 cp %{SOURCE5} . cd ../openldap-2.3.37 %patch100 +%if %suse_version == 1100 +%patch200 -p1 +%endif %build %{?suse_update_config:%{suse_update_config -f build}} @@ -364,6 +356,7 @@ /usr/bin/ldapmodrdn /usr/bin/ldapsearch /usr/bin/ldappasswd +/usr/bin/ldapurl /usr/bin/ldapwhoami %doc %{_mandir}/man1/ldap* %doc %{_mandir}/man5/ldap.conf* @@ -548,6 +541,42 @@ %endif %changelog +* Fri Mar 20 2009 rhafer(a)suse.de +- Update to 2.4.15. Most important changes: + * Fixed slapd bconfig conversion again (ITS#5346) + * Fixed slapd behavior with superior objectClasses again (ITS#5517) + * Fixed slapd RFC4512 behavior with same attr in RDN (ITS#5968) + * Fixed slapd corrupt contextCSN (ITS#5947) + * Fixed slapd syncrepl order to match on add/delete (ITS#5954) + * Fixed slapd adding rdn with other values (ITS#5965) + * Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956) + * Fixed slapd-ldap/meta with entries with invalid attrs (ITS#5959) + * Fixed slapo-pcache caching invalid entries (ITS#5927) + * Fixed slapo-syncprov csn updates (ITS#5969) + * Added libldap option to disable SASL host canonicalization (ITS#5812) + * Fixed libldap chasing multiple referrals (ITS#5853) + * Fixed libldap setuid usage with .ldaprc (ITS#4750) + * Fixed libldap deref handling (ITS#5768) + * Fixed libldap NULL pointer deref (ITS#5934) + * Fixed libldap peer cert memory leak (ITS#5849) + * Fixed libldap intermediate response behavior (ITS#5896) + * Fixed libldap IPv6 address handling (ITS#5937) + * Fixed libldap_r deref building (ITS#5768) + * Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841) + * Fixed slapd acl checks on ADD (ITS#4556,ITS#5723) + * Fixed slapd acl application to newly created backends (ITS#5572) + * Fixed slapd bconfig to return error codes (ITS#5867) + * Fixed slapd bconfig encoding incorrectly (ITS#5897) + * Fixed slapd bconfig dangling pointers (ITS#5924) + * Fixed slapd epoll handling (ITS#5886) + * Fixed slapd glue with MMR (ITS#5925) + * Fixed slapd listener comparison (ITS#5613) + * Fixed various syncrepl issues (ITS#5809,ITS#5850, ITS#5843, + ITS#5866, ITS#5901, ITS#5881, ITS#5935, ITS#5710, + ITS#5781, ITS#5809, ITS#5798, ITS#5826) + * Fixed slapd-bdb/hdb dncachesize handling (ITS#5860) + * Fixed slapd-bdb/hdb trickle task usage (ITS#5864) + * Fixed slapd-hdb idlcache with empty suffix (ITS#5859) * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Fri Dec 12 2008 rhafer(a)suse.de ++++++ openldap-2.4.12.tar.bz2 -> openldap-2.4.15.tar.bz2 ++++++ ++++ 95663 lines of diff (skipped) ++++++ slapd-bconfig-del-db.dif ++++++ --- /var/tmp/diff_new_pack.H27483/_old 2009-03-24 19:53:33.000000000 +0100 +++ /var/tmp/diff_new_pack.H27483/_new 2009-03-24 19:53:33.000000000 +0100 @@ -1,27 +1,19 @@ Index: servers/slapd/bconfig.c =================================================================== -RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/bconfig.c,v -retrieving revision 1.342 -retrieving revision 1.344 -diff -u -r1.342 -r1.344 ---- servers/slapd/bconfig.c 4 Sep 2008 11:56:31 -0000 1.342 -+++ servers/slapd/bconfig.c 4 Sep 2008 15:12:07 -0000 1.344 -@@ -5245,15 +5245,28 @@ - if ( last ) - rs->sr_matched = last->ce_entry->e_name.bv_val; +--- servers/slapd/bconfig.c.orig ++++ servers/slapd/bconfig.c +@@ -5379,13 +5379,26 @@ config_back_delete( Operation *op, SlapR rs->sr_err = LDAP_NO_SUCH_OBJECT; -- } else if ( ce->ce_kids ) { -+ } else if ( ce->ce_kids ) { + } else if ( ce->ce_kids ) { rs->sr_err = LDAP_UNWILLING_TO_PERFORM; - } else if ( ce->ce_type == Cft_Overlay ){ + } else if ( ce->ce_type == Cft_Overlay || ce->ce_type == Cft_Database ){ char *iptr; - int count, ixold, rc; + int count, ixold; ldap_pvt_thread_pool_pause( &connection_pool ); -- + - overlay_remove( ce->ce_be, (slap_overinst *)ce->ce_bi ); -+ + if ( ce->ce_type == Cft_Overlay ){ + overlay_remove( ce->ce_be, (slap_overinst *)ce->ce_bi ); + } else { /* Cft_Database*/ @@ -39,7 +31,7 @@ /* remove CfEntryInfo from the siblings list */ if ( ce->ce_parent->ce_kids == ce ) { -@@ -5315,6 +5328,7 @@ +@@ -5447,6 +5460,7 @@ config_back_delete( Operation *op, SlapR #else rs->sr_err = LDAP_UNWILLING_TO_PERFORM; #endif /* SLAP_CONFIG_DELETE */ ++++++ slapd_getaddrinfo_dupl.dif ++++++ Index: openldap-2.4.7/servers/slapd/daemon.c =================================================================== --- openldap-2.4.7.orig/servers/slapd/daemon.c +++ openldap-2.4.7/servers/slapd/daemon.c @@ -1120,7 +1120,8 @@ slap_get_listener_addresses( { #ifdef HAVE_GETADDRINFO struct addrinfo hints, *res, *sai; - int n, err; + struct sockaddr **sap2; + int n, err, cmpres; char serv[7]; memset( &hints, '\0', sizeof(hints) ); @@ -1146,43 +1147,60 @@ slap_get_listener_addresses( *sap = NULL; for ( sai=res; sai; sai=sai->ai_next ) { + cmpres=1; if( sai->ai_addr == NULL ) { Debug( LDAP_DEBUG_ANY, "slap_get_listener_addresses: " "getaddrinfo ai_addr is NULL?\n", 0, 0, 0 ); freeaddrinfo(res); goto errexit; } - - switch (sai->ai_family) { -# ifdef LDAP_PF_INET6 - case AF_INET6: - *sap = ch_malloc(sizeof(struct sockaddr_in6)); - if (*sap == NULL) { - freeaddrinfo(res); - goto errexit; + /* check for duplicates */ + for ( sap2 = *sal; sap && *sap2; sap2++ ){ + if ( sai->ai_family == (*sap2)->sa_family ) { + if (sai->ai_family == AF_INET6) { + cmpres = memcmp(sai->ai_addr, *sap2, + sizeof(struct sockaddr_in6)); + } else if (sai->ai_family == AF_INET) { + cmpres = memcmp(sai->ai_addr, *sap2, + sizeof(struct sockaddr_in)); + } + if (! cmpres ){ + break; + } } - *(struct sockaddr_in6 *)*sap = - *((struct sockaddr_in6 *)sai->ai_addr); - break; + } + if (cmpres){ + switch (sai->ai_family) { +# ifdef LDAP_PF_INET6 + case AF_INET6: + *sap = ch_malloc(sizeof(struct sockaddr_in6)); + if (*sap == NULL) { + freeaddrinfo(res); + goto errexit; + } + *(struct sockaddr_in6 *)*sap = + *((struct sockaddr_in6 *)sai->ai_addr); + break; # endif /* LDAP_PF_INET6 */ - case AF_INET: - *sap = ch_malloc(sizeof(struct sockaddr_in)); - if (*sap == NULL) { - freeaddrinfo(res); - goto errexit; + case AF_INET: + *sap = ch_malloc(sizeof(struct sockaddr_in)); + if (*sap == NULL) { + freeaddrinfo(res); + goto errexit; + } + *(struct sockaddr_in *)*sap = + *((struct sockaddr_in *)sai->ai_addr); + break; + default: + *sap = NULL; + break; } - *(struct sockaddr_in *)*sap = - *((struct sockaddr_in *)sai->ai_addr); - break; - default: - *sap = NULL; - break; - } - if (*sap != NULL) { - (*sap)->sa_family = sai->ai_family; - sap++; - *sap = NULL; + if (*sap != NULL) { + (*sap)->sa_family = sai->ai_family; + sap++; + *sap = NULL; + } } } ++++++ slapd-ldap_back_entry_get_rw-ITS6003.diff ++++++ Index: servers/slapd/back-ldap/search.c =================================================================== RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-ldap/search.c,v retrieving revision 1.201.2.20 retrieving revision 1.201.2.21 diff -u -r1.201.2.20 -r1.201.2.21 --- servers/slapd/back-ldap/search.c 5 Mar 2009 18:22:14 -0000 1.201.2.20 +++ servers/slapd/back-ldap/search.c 6 Mar 2009 07:14:56 -0000 1.201.2.21 @@ -929,8 +929,8 @@ /* TODO: timeout? */ rc = ldap_pvt_search_s( lc->lc_ld, ndn->bv_val, LDAP_SCOPE_BASE, filter, - attrp, 0, ctrls, NULL, - NULL, LDAP_NO_LIMIT, op->ors_deref, &result ); + attrp, LDAP_DEREF_NEVER, ctrls, NULL, + NULL, LDAP_NO_LIMIT, 0, &result ); if ( rc != LDAP_SUCCESS ) { if ( rc == LDAP_SERVER_DOWN && do_retry ) { do_retry = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysconfig for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Tue Mar 24 19:50:43 CET 2009. -------- --- sysconfig/sysconfig.changes 2009-03-09 21:49:52.000000000 +0100 +++ sysconfig/sysconfig.changes 2009-03-24 14:42:11.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 24 14:05:44 CET 2009 - mt(a)suse.de + +- version 0.71.15 +- Added /etc/modprobe.d/50-ipv6.conf config (noreplace install) + with IPv6 enabled by default; added renaming of yast2-network + created ipv6 file to 50-ipv6.conf in post-install (bnc#485947). +- Fixed overlapping messages in rcnetwork output (bnc#406887). +- Fixed ifup-wireless to not set nick by default that breaks + several drivers (bnc#478513). +- Fixed ifup-wireless to set ap to 'off' instead to 'any' for + the madwifi driver that does not support 'any' (bnc#402438). +- Fixed network scripts to handle dummy interfaces (bnc#436857). +- Fixed ifroute script parsing of final lines without EOL in + ifroute files (bnc#467165). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysconfig-0.71.14.tar.bz2 sysconfig-blacklist-chsc_sch.diff sysconfig-blacklist-fb-moules.bnc468964.diff sysconfig-convert-dns-networkmanager-info.bnc471785.diff sysconfig-create-automount-iscsi-blkdev.bnc457252.diff sysconfig-fixup-zfcp-rules.bnc471400.diff sysconfig-hwcfg2rules-ctc-module-rename sysconfig-hwcfg2rules-iucv-sbin-modprobe.bnc440570.diff sysconfig-ibchild-via-ifup-infiniband.bnc423046.diff sysconfig-ifup-dhcp-status-code.bnc460093.diff sysconfig-rcnetwork-shouldstart-openibd.bnc469600.diff New: ---- sysconfig-0.71.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.O13953/_old 2009-03-24 19:46:35.000000000 +0100 +++ /var/tmp/diff_new_pack.O13953/_new 2009-03-24 19:46:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.71.14) +# spec file for package sysconfig (Version 0.71.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: sysconfig -Version: 0.71.14 -Release: 14 +Version: 0.71.15 +Release: 1 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -30,16 +30,6 @@ BuildRequires: sysfsutils BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch1: sysconfig-blacklist-fb-moules.bnc468964.diff -Patch2: sysconfig-rcnetwork-shouldstart-openibd.bnc469600.diff -Patch3: sysconfig-ibchild-via-ifup-infiniband.bnc423046.diff -Patch4: sysconfig-fixup-zfcp-rules.bnc471400.diff -Patch5: sysconfig-create-automount-iscsi-blkdev.bnc457252.diff -Patch6: sysconfig-ifup-dhcp-status-code.bnc460093.diff -Patch7: sysconfig-hwcfg2rules-iucv-sbin-modprobe.bnc440570.diff -Patch8: sysconfig-blacklist-chsc_sch.diff -Patch9: sysconfig-convert-dns-networkmanager-info.bnc471785.diff -Patch10: sysconfig-hwcfg2rules-ctc-module-rename %description This package provides the SuSE system configuration scheme. @@ -60,16 +50,6 @@ %prep %setup -n sysconfig-%{version} -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p0 -%patch7 -p0 -%patch8 -p0 -%patch9 -p0 -%patch10 -p1 %build autoreconf --force --install @@ -100,9 +80,6 @@ mv $RPM_BUILD_ROOT/sbin/udevmountd $RPM_BUILD_ROOT/lib/udev # remove template dir rm -rf $RPM_BUILD_ROOT/etc/sysconfig/network/ifservices.template/ -# rename modprobe config to match new module-init-tools -mv $RPM_BUILD_ROOT/etc/modprobe.d/blacklist \ - $RPM_BUILD_ROOT/etc/modprobe.d/50-blacklist.conf %files %defattr(-,root,root) @@ -123,6 +100,7 @@ /lib/udev/udevmountd %dir /etc/modprobe.d %config /etc/modprobe.d/50-blacklist.conf +%config(noreplace) /etc/modprobe.d/50-ipv6.conf /etc/sysconfig/network/ifcfg.template /etc/sysconfig/network/scripts/* /etc/sysconfig/hardware @@ -263,6 +241,13 @@ done # erroneous move from network/dhcp to network/config while 11.1 beta sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS +# +# * update to >= 11.2 +# +# move ipv6 settings created by yast2-network before 11.2 +if test -f etc/modprobe.d/ipv6 ; then + mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf +fi %postun %{insserv_cleanup} @@ -272,6 +257,19 @@ %{stop_on_removal network} %changelog +* Tue Mar 24 2009 mt(a)suse.de +- version 0.71.15 +- Added /etc/modprobe.d/50-ipv6.conf config (noreplace install) + with IPv6 enabled by default; added renaming of yast2-network + created ipv6 file to 50-ipv6.conf in post-install (bnc#485947). +- Fixed overlapping messages in rcnetwork output (bnc#406887). +- Fixed ifup-wireless to not set nick by default that breaks + several drivers (bnc#478513). +- Fixed ifup-wireless to set ap to 'off' instead to 'any' for + the madwifi driver that does not support 'any' (bnc#402438). +- Fixed network scripts to handle dummy interfaces (bnc#436857). +- Fixed ifroute script parsing of final lines without EOL in + ifroute files (bnc#467165). * Mon Mar 09 2009 mmarek(a)suse.cz - renamed modprobe config to /etc/modprobe.d/50-blacklist.conf (required by new module-init-tools). ++++++ sysconfig-0.71.14.tar.bz2 -> sysconfig-0.71.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/ChangeLog new/sysconfig-0.71.15/ChangeLog --- old/sysconfig-0.71.14/ChangeLog 2009-01-23 18:09:36.000000000 +0100 +++ new/sysconfig-0.71.15/ChangeLog 2009-03-24 14:38:40.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------------ +r1838 | mt | 2009-01-23 18:08:12 +0100 (Fri, 23 Jan 2009) | 2 lines +Changed paths: + M /trunk/scripts/network-remotefs + +- Fixed malformed-line-in-lsb-comment-block (because of tabs?) + +------------------------------------------------------------------------ +r1835 | mt | 2009-01-23 17:54:52 +0100 (Fri, 23 Jan 2009) | 2 lines +Changed paths: + M /trunk/package/sysconfig.changes + +- Added bug number to last change. + +------------------------------------------------------------------------ r1832 | mt | 2009-01-23 17:50:09 +0100 (Fri, 23 Jan 2009) | 2 lines Changed paths: M /trunk/VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/config/hardware/50-blacklist.conf new/sysconfig-0.71.15/config/hardware/50-blacklist.conf --- old/sysconfig-0.71.14/config/hardware/50-blacklist.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.71.15/config/hardware/50-blacklist.conf 2009-03-24 14:36:42.000000000 +0100 @@ -0,0 +1,222 @@ +# +# $Id: 50-blacklist.conf 1846 2009-03-24 13:36:41Z mt $ +# +# Listing a module here prevents modprobe from loading it via modalias (only +# aliases from /lib/modules/*/modules.alias). You may still load it explicitely. +# We blacklist some modules becaus they may harm on certain devices or they +# prevent other modules from grabbing the device. +# +# Syntax: blacklist <driver name> +# See 'man modprobe'. +# + +# uhci ... usb-uhci handles the same pci class +blacklist uhci +# usbcore ... module is loaded implicitly, ignore it otherwise +blacklist usbcore + +# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices +blacklist de4x5 +# At least 2.4.3 and later xircom_tulip doesn't have that conflict +# xircom_tulip_cb +blacklist dmfe + +# list all framebuffer drivers, some of them tend to crash during boot +# they are either compiled into the kernel, or vesafb is active +# X works fine without them, rcfbset can load them if really required +# sed -e '/\/drivers\/video\/.*\.$o\|ko$$/{s@^.*/@@;s@\..*$@@;p};d' +blacklist aty128fb +blacklist atyfb +blacklist clgenfb +blacklist cyber2000fb +# cyblafb, bug 466280 +blacklist cyblafb +blacklist encode-big5 +blacklist encode-gb +blacklist encode-gbk +blacklist encode-jis +blacklist encode-kscm +blacklist fbcon-afb +blacklist fbcon-cfb2 +blacklist fbcon-cfb4 +blacklist fbcon-hga +blacklist fbcon-ilbm +blacklist fbcon-iplan2p2 +blacklist fbcon-iplan2p4 +blacklist fbcon-iplan2p8 +blacklist fbcon-mac +blacklist fbcon-mfb +blacklist fbcon-vga +blacklist fbcon-vga-planes +blacklist fbgen +blacklist g450_pll +blacklist hgafb +blacklist i2c-matroxfb +blacklist i810fb +blacklist intelfbdrv +blacklist intelfbhw +blacklist matroxfb_accel +blacklist matroxfb_base +blacklist matroxfb_crtc2 +blacklist matroxfb_DAC1064 +blacklist matroxfb_g450 +blacklist matroxfb_maven +blacklist matroxfb_misc +blacklist matroxfb_proc +blacklist matroxfb_Ti3026 +blacklist mdacon +blacklist neofb +blacklist pm2fb +blacklist pm3fb +blacklist radeonfb +blacklist rivafb +blacklist sisfb +blacklist sstfb +blacklist tdfxfb +blacklist tridentfb +blacklist unikey +blacklist vga16fb +blacklist vgastate +blacklist vmware +# for kyrofb see Bug 35810 +blacklist kyrofb +# list was not complete (bug 106715) +blacklist arcfb +blacklist backlight +blacklist lcd +blacklist cirrusfb +blacklist gx1fb +blacklist intelfb +blacklist macmodes +blacklist nvidiafb +blacklist s1d13xxxfb +blacklist savagefb +# additional modules since SLE11, bug 468964 +blacklist arkfb +blacklist carminefb +blacklist gxfb +blacklist hecubafb +blacklist lxfb +blacklist s3fb +blacklist sm501fb +blacklist viafb +blacklist vmlfb +blacklist vt8623fb + + +# ISDN modules are load from /lib/udev/isdn.sh +blacklist fcusb +blacklist fcusb2 +blacklist fxusb +blacklist fxusb_CZ +blacklist fcdslusb +blacklist fcdslusb2 +blacklist fcdslusba +blacklist fcdslslusb +blacklist fcdslslusb2 +blacklist e2220pc +blacklist e5520pc +blacklist bfusb +blacklist b1isa +blacklist b1pci +blacklist b1pcmcia +blacklist c4 +blacklist t1isa +blacklist t1pci +blacklist divas +blacklist act2000 +blacklist hfc_usb +blacklist hisax +blacklist hisax_fcpcipnp +blacklist hisax_st5481 +blacklist hysdn +blacklist icn +blacklist pcbit +blacklist sc +blacklist tpam +blacklist fcpci +blacklist fcclassic +blacklist fcdsl +blacklist fcdsl2 + +# OSS PCI sound modules +blacklist ad1889 +blacklist ali5455 +blacklist btaudio +blacklist cmpci +blacklist cs4281 +blacklist emu10k1 +blacklist es1370 +blacklist es1371 +blacklist esssolo1 +blacklist forte +blacklist i810_audio +blacklist maestro +blacklist maestro3 +blacklist nm256_audio +blacklist opl3sa2 # Bug 219758 +blacklist rme96xx +blacklist sonicvibes +blacklist trident +blacklist via82cxxx_audio +blacklist ymfpci + +# If you really need firewire direct networking, then remove this entry +blacklist eth1394 + +# this is a debugging module which should only be loaded manually +blacklist evbug + +# These mtd drivers should be loaded manually. +blacklist scb2_flash +blacklist ich2rom +blacklist pci +blacklist l440gx +blacklist amd76xrom + +# job of rcdvb +blacklist snd_bt87x +blacklist snd-bt87x + +# HP Touch Screen usb input driver. breaks all other mouse input devices +blacklist tsdev + +# https://bugzilla.novell.com/show_bug.cgi?id=115132 +blacklist slamr +blacklist slusb + +# This module seems to be good for nothing. See bug 129301. +blacklist dpt_i2o + +# This driver is obsolete and should never be loaded as default. +# See https://bugzilla.novell.com/show_bug.cgi?id=146728 +blacklist eepro100 + +# This driver is obsolete and should never be loaded as default. +# See https://bugzilla.novell.com/show_bug.cgi?id=146930 +blacklist sk98lin + +# This driver is rarely needed and causes trouble when scanning devices. +# See: https://bugzilla.novell.com/show_bug.cgi?id=144623 +blacklist stradis + +# These devices have bt878 chip without PCI Subsystem ID. Without that info bttv +# does not know how to treat them properly. Therefore we disable autoloading of +# modules for these devices. +# See https://bugzilla.novell.com/show_bug.cgi?id=149588 +# To enable your device create a hardware configuration file for your device. +# See man hwup for details. +# You will probably have to specify an option to identify your card. Have a +# look in /usr/src/linux/Documentation/video4linux/CARDLIST.bttv. +alias pci:v0000109Ed0000036Esv00000000sd00000000bc04sc00i00 bttv_skip_it +alias pci:v0000109Ed00000878sv00000000sd00000000bc04sc80i00 bttv_skip_it +install bttv_skip_it /bin/echo "module alias skipped (bt878 chip without PCI Subsystem ID)" + +# For some bridges both intel-agp and i82875p_edac are loaded. If i82875p_edac +# is loaded first it will grab the device. Then intel-agp doesn't work. +# Therefore we disable automatic loading of 82875p_edac. (Bug 213840) +blacklist i82875p_edac +# +# Blacklist the IBM s390 module for I/O dynamic configuration support +# Bug bnc#478601 +blacklist chsc_sch diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/config/hardware/50-ipv6.conf new/sysconfig-0.71.15/config/hardware/50-ipv6.conf --- old/sysconfig-0.71.14/config/hardware/50-ipv6.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.71.15/config/hardware/50-ipv6.conf 2009-03-24 14:25:24.000000000 +0100 @@ -0,0 +1,3 @@ +# Comment out to disable IPv6: +#install ipv6 /bin/true + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/config/hardware/blacklist new/sysconfig-0.71.15/config/hardware/blacklist --- old/sysconfig-0.71.14/config/hardware/blacklist 2009-01-23 15:54:47.000000000 +0100 +++ new/sysconfig-0.71.15/config/hardware/blacklist 1970-01-01 01:00:00.000000000 +0100 @@ -1,205 +0,0 @@ -# -# $Id: blacklist 1828 2009-01-23 14:54:46Z mt $ -# -# Listing a module here prevents modprobe from loading it via modalias (only -# aliases from /lib/modules/*/modules.alias). You may still load it explicitely. -# We blacklist some modules becaus they may harm on certain devices or they -# prevent other modules from grabbing the device. -# -# Syntax: blacklist <driver name> -# See 'man modprobe'. -# - -# uhci ... usb-uhci handles the same pci class -blacklist uhci -# usbcore ... module is loaded implicitly, ignore it otherwise -blacklist usbcore - -# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices -blacklist de4x5 -# At least 2.4.3 and later xircom_tulip doesn't have that conflict -# xircom_tulip_cb -blacklist dmfe - -# list all framebuffer drivers, some of them tend to crash during boot -# they are either compiled into the kernel, or vesafb is active -# X works fine without them, rcfbset can load them if really required -# sed -e '/\/drivers\/video\/.*\.$o\|ko$$/{s@^.*/@@;s@\..*$@@;p};d' -blacklist aty128fb -blacklist atyfb -blacklist clgenfb -blacklist cyber2000fb -blacklist cyblafb -blacklist encode-big5 -blacklist encode-gb -blacklist encode-gbk -blacklist encode-jis -blacklist encode-kscm -blacklist fbcon-afb -blacklist fbcon-cfb2 -blacklist fbcon-cfb4 -blacklist fbcon-hga -blacklist fbcon-ilbm -blacklist fbcon-iplan2p2 -blacklist fbcon-iplan2p4 -blacklist fbcon-iplan2p8 -blacklist fbcon-mac -blacklist fbcon-mfb -blacklist fbcon-vga -blacklist fbcon-vga-planes -blacklist fbgen -blacklist g450_pll -blacklist hgafb -blacklist i2c-matroxfb -blacklist i810fb -blacklist intelfbdrv -blacklist intelfbhw -blacklist matroxfb_accel -blacklist matroxfb_base -blacklist matroxfb_crtc2 -blacklist matroxfb_DAC1064 -blacklist matroxfb_g450 -blacklist matroxfb_maven -blacklist matroxfb_misc -blacklist matroxfb_proc -blacklist matroxfb_Ti3026 -blacklist mdacon -blacklist neofb -blacklist pm2fb -blacklist pm3fb -blacklist radeonfb -blacklist rivafb -blacklist sisfb -blacklist sstfb -blacklist tdfxfb -blacklist tridentfb -blacklist unikey -blacklist vga16fb -blacklist vgastate -blacklist vmware -# for kyrofb see Bug 35810 -blacklist kyrofb -# list was not complete (bug 106715) -blacklist arcfb -blacklist backlight -blacklist lcd -blacklist cirrusfb -blacklist gx1fb -blacklist intelfb -blacklist macmodes -blacklist nvidiafb -blacklist s1d13xxxfb -blacklist savagefb - -# ISDN modules are load from /lib/udev/isdn.sh -blacklist fcusb -blacklist fcusb2 -blacklist fxusb -blacklist fxusb_CZ -blacklist fcdslusb -blacklist fcdslusb2 -blacklist fcdslusba -blacklist fcdslslusb -blacklist fcdslslusb2 -blacklist e2220pc -blacklist e5520pc -blacklist bfusb -blacklist b1isa -blacklist b1pci -blacklist b1pcmcia -blacklist c4 -blacklist t1isa -blacklist t1pci -blacklist divas -blacklist act2000 -blacklist hfc_usb -blacklist hisax -blacklist hisax_fcpcipnp -blacklist hisax_st5481 -blacklist hysdn -blacklist icn -blacklist pcbit -blacklist sc -blacklist tpam -blacklist fcpci -blacklist fcclassic -blacklist fcdsl -blacklist fcdsl2 - -# OSS PCI sound modules -blacklist ad1889 -blacklist ali5455 -blacklist btaudio -blacklist cmpci -blacklist cs4281 -blacklist emu10k1 -blacklist es1370 -blacklist es1371 -blacklist esssolo1 -blacklist forte -blacklist i810_audio -blacklist maestro -blacklist maestro3 -blacklist nm256_audio -blacklist opl3sa2 # Bug 219758 -blacklist rme96xx -blacklist sonicvibes -blacklist trident -blacklist via82cxxx_audio -blacklist ymfpci - -# If you really need firewire direct networking, then remove this entry -blacklist eth1394 - -# this is a debugging module which should only be loaded manually -blacklist evbug - -# These mtd drivers should be loaded manually. -blacklist scb2_flash -blacklist ich2rom -blacklist pci -blacklist l440gx -blacklist amd76xrom - -# job of rcdvb -blacklist snd_bt87x -blacklist snd-bt87x - -# HP Touch Screen usb input driver. breaks all other mouse input devices -blacklist tsdev - -# https://bugzilla.novell.com/show_bug.cgi?id=115132 -blacklist slamr -blacklist slusb - -# This module seems to be good for nothing. See bug 129301. -blacklist dpt_i2o - -# This driver is obsolete and should never be loaded as default. -# See https://bugzilla.novell.com/show_bug.cgi?id=146728 -blacklist eepro100 - -# This driver is obsolete and should never be loaded as default. -# See https://bugzilla.novell.com/show_bug.cgi?id=146930 -blacklist sk98lin - -# This driver is rarely needed and causes trouble when scanning devices. -# See: https://bugzilla.novell.com/show_bug.cgi?id=144623 -blacklist stradis - -# These devices have bt878 chip without PCI Subsystem ID. Without that info bttv -# does not know how to treat them properly. Therefore we disable autoloading of -# modules for these devices. -# See https://bugzilla.novell.com/show_bug.cgi?id=149588 -# To enable your device create a hardware configuration file for your device. -# See man hwup for details. -# You will probably have to specify an option to identify your card. Have a -# look in /usr/src/linux/Documentation/video4linux/CARDLIST.bttv. -alias pci:v0000109Ed0000036Esv00000000sd00000000bc04sc00i00 bttv_skip_it -alias pci:v0000109Ed00000878sv00000000sd00000000bc04sc80i00 bttv_skip_it -install bttv_skip_it /bin/echo "module alias skipped (bt878 chip without PCI Subsystem ID)" - -# For some bridges both intel-agp and i82875p_edac are loaded. If i82875p_edac -# is loaded first it will grab the device. Then intel-agp doesn't work. -# Therefore we disable automatic loading of 82875p_edac. (Bug 213840) -blacklist i82875p_edac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/config/hardware/Makefile.am new/sysconfig-0.71.15/config/hardware/Makefile.am --- old/sysconfig-0.71.14/config/hardware/Makefile.am 2008-12-11 17:35:56.000000000 +0100 +++ new/sysconfig-0.71.15/config/hardware/Makefile.am 2009-03-24 14:26:01.000000000 +0100 @@ -5,8 +5,7 @@ udevrules_DATA = 81-mount.rules -modprobe_DATA = blacklist +modprobe_DATA = 50-blacklist.conf 50-ipv6.conf -EXTRA_DIST = $(modprobe_DATA) \ - $(udevrules_DATA) +EXTRA_DIST = $(modprobe_DATA) $(udevrules_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/config/hardware/Makefile.in new/sysconfig-0.71.15/config/hardware/Makefile.in --- old/sysconfig-0.71.14/config/hardware/Makefile.in 2009-01-23 18:09:20.000000000 +0100 +++ new/sysconfig-0.71.15/config/hardware/Makefile.in 2009-03-24 14:38:09.000000000 +0100 @@ -179,10 +179,8 @@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in udevrules_DATA = 81-mount.rules -modprobe_DATA = blacklist -EXTRA_DIST = $(modprobe_DATA) \ - $(udevrules_DATA) - +modprobe_DATA = 50-blacklist.conf 50-ipv6.conf +EXTRA_DIST = $(modprobe_DATA) $(udevrules_DATA) all: all-am .SUFFIXES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/configure new/sysconfig-0.71.15/configure --- old/sysconfig-0.71.14/configure 2009-01-23 18:09:19.000000000 +0100 +++ new/sysconfig-0.71.15/configure 2009-03-24 14:38:08.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for sysconfig 0.71.14. +# Generated by GNU Autoconf 2.63 for sysconfig 0.71.15. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -746,8 +746,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.71.14' -PACKAGE_STRING='sysconfig 0.71.14' +PACKAGE_VERSION='0.71.15' +PACKAGE_STRING='sysconfig 0.71.15' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' ac_unique_file="scripts/ifup" @@ -1478,7 +1478,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.71.14 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.71.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1548,7 +1548,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.71.14:";; + short | recursive ) echo "Configuration of sysconfig 0.71.15:";; esac cat <<\_ACEOF @@ -1648,7 +1648,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.71.14 +sysconfig configure 0.71.15 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1662,7 +1662,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.71.14, which was +It was created by sysconfig $as_me 0.71.15, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -12589,7 +12589,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.71.14, which was +This file was extended by sysconfig $as_me 0.71.15, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12643,7 +12643,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -sysconfig config.status 0.71.14 +sysconfig config.status 0.71.15 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/package/sysconfig.spec.in new/sysconfig-0.71.15/package/sysconfig.spec.in --- old/sysconfig-0.71.14/package/sysconfig.spec.in 2009-01-23 15:31:46.000000000 +0100 +++ new/sysconfig-0.71.15/package/sysconfig.spec.in 2009-03-24 14:29:02.000000000 +0100 @@ -99,7 +99,8 @@ %dir /lib/udev /lib/udev/udevmountd %dir /etc/modprobe.d -%config /etc/modprobe.d/blacklist +%config /etc/modprobe.d/50-blacklist.conf +%config(noreplace) /etc/modprobe.d/50-ipv6.conf /etc/sysconfig/network/ifcfg.template /etc/sysconfig/network/scripts/* /etc/sysconfig/hardware @@ -194,7 +195,7 @@ fi # pushd /etc/sysconfig/hardware > /dev/null -for cfg in hwcfg-*-ccw-* ; do +for cfg in hwcfg-*-ccw-* hwcfg-*-iucv-* ; do [ -f $cfg ] && bash ./hwcfg2rules $cfg done popd > /dev/null @@ -240,6 +241,13 @@ done # erroneous move from network/dhcp to network/config while 11.1 beta sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS +# +# * update to >= 11.2 +# +# move ipv6 settings created by yast2-network before 11.2 +if test -f etc/modprobe.d/ipv6 ; then + mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf +fi %postun %{insserv_cleanup} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/convert_to_netconfig_dns new/sysconfig-0.71.15/scripts/convert_to_netconfig_dns --- old/sysconfig-0.71.14/scripts/convert_to_netconfig_dns 2008-12-11 17:34:42.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/convert_to_netconfig_dns 2009-03-24 13:54:48.000000000 +0100 @@ -72,7 +72,7 @@ has_networkmanager_info() { - test -n "$1" -a -f "$1" && grep -qs '#.*NetworkManager' "$1" 2>/dev/null + test -n "$1" -a -f "$1" && grep -qs '^# generated by NetworkManager' "$1" 2>/dev/null } has_netconfig_info() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/functions new/sysconfig-0.71.15/scripts/functions --- old/sysconfig-0.71.14/scripts/functions 2009-01-23 15:40:56.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/functions 2009-03-24 14:36:42.000000000 +0100 @@ -23,7 +23,7 @@ # Mads Martin Joergensen <mmj(a)suse.de> # Marius Tomaschewski <mt(a)suse.de> # -# $Id: functions 1821 2009-01-23 14:40:56Z mt $ +# $Id: functions 1846 2009-03-24 13:36:41Z mt $ # . /etc/sysconfig/network/scripts/functions.common @@ -102,6 +102,7 @@ ippp*|isdn*|modem*|dsl*|ppp*) return 0 ;; ipip*|sit*|gre*|tun*|tap*) return 0 ;; ib*.*|vlan*) return 0 ;; + dummy*) return 0 ;; esac test "${SCRIPTNAME%%-*}" = ifdown -a \ "$MODE" = hotplug && return 0 @@ -128,7 +129,7 @@ [ -x /usr${ethtool} ] && ethtool="/usr${ethtool}" || return 1 fi local key val - $ethtool -i "$IF" 2>/dev/null | + $ethtool -i "$1" 2>/dev/null | while read key val ; do case "$key" in driver:) printf 'ETHTOOL_DRV_NAME=%q\n' "$val" ;; @@ -151,11 +152,16 @@ test -f /proc/net/vlan/$IF && TYPE=vlan test -d /sys/class/net/$IF/bonding && TYPE=bond test -d /sys/devices/virtual/net/$IF && { - eval local x `get_ethtool_drv_info $IF` - test "$ETHTOOL_DRV_NAME" == "tun" && \ - TYPE="$ETHTOOL_DRV_BUS_INFO" || \ - case $IF in tap*) TYPE=tap ;; esac - # may be another virtual eth iface + eval local ETHTOOL_DRV_NAME="" \ + ETHTOOL_DRV_BUS_INFO="" \ + `get_ethtool_drv_info $IF` + test "$ETHTOOL_DRV_NAME" = "tun" && \ + TYPE="${ETHTOOL_DRV_BUS_INFO:-$TYPE}" || \ + case $IF in + (tap*) TYPE=tap ;; + (dummy*) TYPE=dummy ;; + esac + # may be another virtual eth iface ... } ;; 24) TYPE=eth ;; # firewire ;; # IEEE 1394 IPv4 - RFC 2734 @@ -237,6 +243,7 @@ if [ -z "$TYPE" ] ; then case $IF in lo) TYPE=lo;; + dummy*) TYPE=dummy;; ib*) TYPE=ib;; ip6tnl*) TYPE=ip6tnl;; mip6mnha*) TYPE=mip6mnha;; @@ -266,7 +273,7 @@ local result=1 # remote-fs requirement as default case $IFTYPE in "") result=2 ;; - lo) result=0 ;; + lo|dummy) result=0 ;; eth|tr) result=0 ;; ib|ibchild) result=0 ;; vlan|bridge|bond) result=0 ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/hardware/hwcfg2rules new/sysconfig-0.71.15/scripts/hardware/hwcfg2rules --- old/sysconfig-0.71.14/scripts/hardware/hwcfg2rules 2009-01-23 15:41:46.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/hardware/hwcfg2rules 2009-03-24 13:54:48.000000000 +0100 @@ -24,25 +24,6 @@ cat >> $file <<EOF ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$busid", IMPORT{program}="collect $busid %k $busid zfcp" ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="zfcp", IMPORT{program}="collect $busid %k $busid zfcp" -EOF - for lun in $ZFCP_LUNS ; do - set -- $(IFS=: ; echo $lun) - tmpwwpn=$1 - for wwpn in $wwpn_list ; do - if [ "$wwpn" == "$1" ] ; then - tmpwwpn= - fi - done - if [ -n "$tmpwwpn" ] ; then - wwpn_list="$wwpn_list $tmpwwpn" - fi - done - for wwpn in $wwpn_list ; do - cat >> $file <<EOF -ACTION=="add", ENV{COLLECT_$busid}=="0", ATTR{[ccw/$busid]port_add}="$wwpn" -EOF - done - cat >> $file <<EOF ACTION=="add", ENV{COLLECT_$busid}=="0", ATTR{[ccw/$busid]online}="1" EOF for lunid in $ZFCP_LUNS ; do @@ -50,7 +31,7 @@ wwpn=$1 lun=$2 cat >> $file <<EOF -ACTION=="add", SUBSYSTEMS=="ccw", KERNELS=="$busid", TEST=="[ccw/$busid]$wwpn", ATTR{[ccw/$busid]$wwpn/unit_add}="$lun" +ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$busid", ATTR{[ccw/$busid]$wwpn/unit_add}="$lun" EOF done @@ -62,30 +43,30 @@ echo "# Rules converted from $cfgname" > $file cat >> $file <<EOF -ACTION=="add", SUBSYSTEM=="subsystem", KERNEL=="iucv", RUN+="modprobe netiucv" +ACTION=="add", SUBSYSTEM=="subsystem", KERNEL=="iucv", RUN+="/sbin/modprobe netiucv" ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="netiucv", ATTR{connection}="$id" EOF } write_ctc_rules () { - local file=$UDEVDIR/$RULE-$type-${busid}.rules + local file=$UDEVDIR/$RULE-$subtype-${busid}.rules local attr echo "# Rules converted from $cfgname" > $file - cat >> $file <<EOF -ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$ccwtype", IMPORT{program}="collect $busid %k $CCW_CHAN_IDS $ccwtype" -EOF for chan in $CCW_CHAN_IDS ; do cat >> $file <<EOF -ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", RUN+="/sbin/modprobe --quiet $MODULE" -ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", IMPORT{program}="collect $busid %k $CCW_CHAN_IDS $ccwtype" +ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", RUN+="/sbin/modprobe --quiet $subtype" +ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", IMPORT{program}="collect $busid %k $CCW_CHAN_IDS $subtype" EOF done + cat >> $file <<EOF +ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$subtype", IMPORT{program}="collect $busid %k $CCW_CHAN_IDS $subtype" +EOF attr=$(echo $CCW_CHAN_IDS | sed 's/ /,/g') cat >> $file <<EOF -TEST=="[ccwgroup/$busid]", GOTO="$type-${busid}_end" -ACTION=="add", SUBSYSTEM=="$bus", ENV{COLLECT_$busid}=="0", ATTR{[drivers/ccwgroup:$type]group}="$attr" -ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$ccwtype", ENV{COLLECT_$busid}=="0", ATTR{[drivers/ccwgroup:$type]group}="$attr" +TEST=="[ccwgroup/$busid]", GOTO="$type-${busid}-end" +ACTION=="add", SUBSYSTEM=="$bus", ENV{COLLECT_$busid}=="0", ATTR{[drivers/ccwgroup:$subtype]group}="$attr" +ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$subtype", ENV{COLLECT_$busid}=="0", ATTR{group}="$attr" EOF if [ "$CCW_CHAN_MODE" -ne 0 ] ; then cat >> $file <<EOF @@ -93,7 +74,7 @@ EOF fi cat >> $file <<EOF -LABEL="$type-${busid}_end" +LABEL="$type-${busid}-end" ACTION=="add", SUBSYSTEM=="ccwgroup", KERNEL=="$busid", ATTR{online}="1" EOF } @@ -241,19 +222,19 @@ 3088/08) # Channel To Channel ccwtype="cu3088" - subtype="ctc" + subtype="ctcm" CCW_CHAN_NUM=2 ;; 3088/1e) # FICON adapter ccwtype="cu3088" - subtype="ctc" + subtype="ctcm" CCW_CHAN_NUM=2 ;; 3088/1f) # ESCON adapter (I.e. hardware CTC device) ccwtype="cu3088" - subtype="ctc" + subtype="ctcm" CCW_CHAN_NUM=2 ;; 3088/60) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/ifup new/sysconfig-0.71.15/scripts/ifup --- old/sysconfig-0.71.14/scripts/ifup 2008-12-11 18:03:05.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/ifup 2009-03-24 14:36:42.000000000 +0100 @@ -26,7 +26,7 @@ # Marius Tomaschewski <mt(a)suse.de> # Bjoern Jacke # -# $Id: ifup 1812 2008-12-11 17:03:04Z mt $ +# $Id: ifup 1846 2009-03-24 13:36:41Z mt $ # usage () { @@ -696,7 +696,7 @@ scripts/${SCRIPTNAME}-802.1q $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} test "$?" -ne 0 && exit ;; - ib) + ib|ibchild) # Frob ib interface scripts/${SCRIPTNAME}-infiniband $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} test "$?" -ne 0 && exit @@ -1135,7 +1135,7 @@ scripts/${SCRIPTNAME}-802.1q $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} test "$?" -ne 0 && exit ;; - ib) + ib|ibchild) # Frob ib interface scripts/${SCRIPTNAME}-infiniband $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} test "$?" -ne 0 && exit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/ifup-dhcp new/sysconfig-0.71.15/scripts/ifup-dhcp --- old/sysconfig-0.71.14/scripts/ifup-dhcp 2009-01-23 15:20:00.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/ifup-dhcp 2009-03-24 14:36:42.000000000 +0100 @@ -18,7 +18,7 @@ # Author: Christian Zoz <zoz(a)suse.de>, 2002-2006 # Peter Poeml <poeml(a)suse.de>, 2002-2006 # -# $Id: ifup-dhcp 1818 2008-12-19 13:08:57Z mt $ +# $Id: ifup-dhcp 1846 2009-03-24 13:36:41Z mt $ # usage () { @@ -476,16 +476,16 @@ DHCP4_STATUS=$R_DHCP_BG if test "$RUN_FROM_RC" = yes; then print_mesg mesg "DHCP4 client is already running" - while read a b c d e f g h i; do - case "$d" in - 169.254.*) continue ;; - esac - print_mesg mesg "IP address: $d" - DHCP4_STATUS=$R_SUCCESS - done < <(ip -o -4 addr show $INTERFACE) else mesg "DHCP4 client is already running on $INTERFACE" fi + while read a b c d e f g h i; do + case "$d" in + 169.254.*) continue ;; + esac + print_mesg mesg "IP address: $d" + DHCP4_STATUS=$R_SUCCESS + done < <(ip -o -4 addr show $INTERFACE) fi #fi ;; @@ -499,16 +499,16 @@ DHCP6_STATUS=$R_DHCP_BG if test "$RUN_FROM_RC" = yes; then print_mesg mesg "DHCP6 client is already running" - while read a b c d rest; do - case "$d" in - fe80::*) continue ;; - esac - print_mesg mesg "IP address: $d" - DHCP6_STATUS=$R_SUCCESS - done < <(ip -o -6 addr show $INTERFACE) else mesg "DHCP6 client is already running on $INTERFACE" fi + while read a b c d rest; do + case "$d" in + fe80::*) continue ;; + esac + print_mesg mesg "IP address: $d" + DHCP6_STATUS=$R_SUCCESS + done < <(ip -o -6 addr show $INTERFACE) fi #fi ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/ifup-route new/sysconfig-0.71.15/scripts/ifup-route --- old/sysconfig-0.71.14/scripts/ifup-route 2009-01-23 15:43:23.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/ifup-route 2009-03-24 14:36:42.000000000 +0100 @@ -18,7 +18,7 @@ # Based on rcroute: Burchard Steinbild <bs(a)suse.de>, 1996 # Werner Fink <werner(a)suse.de>, 1996-2000 # -# $Id: ifup-route 1825 2009-01-23 14:43:23Z mt $ +# $Id: ifup-route 1846 2009-03-24 13:36:41Z mt $ # usage () { @@ -295,7 +295,7 @@ test -z "$MASK" && MASK=- test -z "$IFACE" -o "$IFACE" = "-" && IFACE="$INTERFACE" echo $DEST $GWAY $MASK $IFACE $IPOPTS - done < $1 + done < <(cat "$1" ; echo) } # for status we need to prepare the output of ip route and store it in diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/ifup-wireless new/sysconfig-0.71.15/scripts/ifup-wireless --- old/sysconfig-0.71.14/scripts/ifup-wireless 2008-11-07 17:30:31.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/ifup-wireless 2009-03-24 14:36:42.000000000 +0100 @@ -19,7 +19,7 @@ # # Author: Joachim Gleissner <jg(a)suse.de>, 2005 # -# $Id: ifup-wireless 1657 2008-05-19 15:11:50Z mt $ +# $Id: ifup-wireless 1846 2009-03-24 13:36:41Z mt $ # usage () { @@ -276,13 +276,9 @@ { # Mode need to be first : some settings apply only in a specific mode ! run_iw_tool config mode $WIRELESS_MODE - # This is a bit hackish, but should do the job right... - if [ -n "$WIRELESS_ESSID" -o -n "$WIRELESS_MODE" ] ; then - test -z "$WIRELESS_NICK" && WIRELESS_NICK=`/bin/hostname` - fi # Regular stuff... while read OPT ARG; do - run_iw_tool config $OPT "$ARG" + ${OPT:+run_iw_tool config "$OPT" "$ARG"} done <<-EOL nick $WIRELESS_NICK nwid $WIRELESS_NWID @@ -337,15 +333,25 @@ # set AP address when requested in $WIRELESS_AP. # At last mac80211 based drivers need this as signal to start # scanning for an appropriate cell, so we set it to 'any' when - # $WIRELESS_AP is empty in Managed and Ad-Hoc modes. + # $WIRELESS_AP is empty in Managed and Ad-Hoc modes, except we + # have the madwifi (ath_pci) driver, which does not like it... # It is required to set up the interface before doing that. - ip link set up dev $INTERFACE 2>/dev/null case "$WIRELESS_MODE" in - [M,m]anaged|[A,a]d-[H,h]oc|"") - test -z "$WIRELESS_AP" && WIRELESS_AP='any' + ([M,m]anaged|[A,a]d-[H,h]oc|"") + case "${DRIVER}" in + (ath_pci) + test -z "$WIRELESS_AP" && WIRELESS_AP='off' + ;; + (*) + test -z "$WIRELESS_AP" && WIRELESS_AP='any' + ;; + esac ;; esac - test -n "$WIRELESS_AP" && run_iw_tool config ap "$WIRELESS_AP" + if test -n "$WIRELESS_AP" ; then + ip link set up dev $INTERFACE 2>/dev/null + run_iw_tool config ap "$WIRELESS_AP" + fi } setup_wlanngdev() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/scripts/network new/sysconfig-0.71.15/scripts/network --- old/sysconfig-0.71.14/scripts/network 2009-01-23 15:40:22.000000000 +0100 +++ new/sysconfig-0.71.15/scripts/network 2009-03-24 14:36:42.000000000 +0100 @@ -24,16 +24,16 @@ # Mads Martin J�rgensen <mmj(a)suse.de> # Marius Tomaschewski <mt(a)suse.de> # -# $Id: network 1820 2009-01-23 14:40:21Z mt $ +# $Id: network 1846 2009-03-24 13:36:41Z mt $ # # /etc/init.d/network # ### BEGIN INIT INFO # Provides: network # Required-Start: $local_fs dbus -# Should-Start: isdn SuSEfirewall2_init +# Should-Start: isdn openibd SuSEfirewall2_init # Required-Stop: $local_fs dbus -# Should-Stop: isdn SuSEfirewall2_init +# Should-Stop: isdn openibd SuSEfirewall2_init # Default-Start: 2 3 5 # Default-Stop: # Short-Description: Configure the localfs depending network interfaces @@ -424,6 +424,9 @@ TUNNEL_IFACES="$TUNNEL_IFACES $b" add_to_wordlist VIRTUAL_IFACES $b ;; + dummy) + add_to_wordlist VIRTUAL_IFACES $b + ;; *) add_to_wordlist VIRTUAL_IFACES $b @@ -670,7 +673,8 @@ for IFACE in $@; do $FAKE /sbin/ifstatus $CONFIG $IFACE -o rc $CHECK $MODE RET=$? - debug && printf " %-9s returned %s\n" $IFACE $RET + debug && printf " %-9s returned %s\n" $IFACE $RET || \ + printf " %-9s\n" $IFACE case $RET in $R_SUCCESS|$R_BUSY) # : $((R++)) @@ -740,7 +744,8 @@ done $FAKE ifup $CONFIG $IFACE -o rc $MODE RET=$? - debug && printf " %-9s returned %s\n" $IFACE $RET + debug && printf " %-9s returned %s\n" $IFACE $RET || \ + printf " %-9s\n" $IFACE case "$RET" in $R_SUCCESS) SUCCESS_IFACES="$SUCCESS_IFACES $IFACE" @@ -864,7 +869,8 @@ done $FAKE ifup $CONFIG $IFACE -o rc $MODE RET=$? - debug && printf " %-9s returned %s\n" $IFACE $RET + debug && printf " %-9s returned %s\n" $IFACE $RET || \ + printf " %-9s\n" $IFACE case "$RET" in $R_SUCCESS) SUCCESS_IFACES="$SUCCESS_IFACES $IFACE" @@ -933,7 +939,8 @@ # printf " %-9s " $IFACE $FAKE ifdown $CONFIG $IFACE -o rc $MODE RET=$? - debug && printf " %-9s returned %s\n" $IFACE $RET + debug && printf " %-9s returned %s\n" $IFACE $RET || \ + printf " %-9s\n" $IFACE rc_failed $RET case "$RET" in $R_NODEV|$R_NOTCONFIGURED|$R_INACTIVE) @@ -980,7 +987,8 @@ fi $FAKE ifdown $CONFIG $IFACE -o rc $MODE RET=$? - debug && printf " %-9s returned %s\n" $IFACE $RET + debug && printf " %-9s returned %s\n" $IFACE $RET || \ + printf " %-9s\n" $IFACE rc_failed $RET case "$RET" in $R_NODEV|$R_NOTCONFIGURED|$R_INACTIVE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/tools/udevmountd.c new/sysconfig-0.71.15/tools/udevmountd.c --- old/sysconfig-0.71.14/tools/udevmountd.c 2008-12-11 17:35:56.000000000 +0100 +++ new/sysconfig-0.71.15/tools/udevmountd.c 2009-03-24 13:54:48.000000000 +0100 @@ -602,19 +602,19 @@ if (stat(dev, &stbuf) < 0) { fprintf(stderr,"Cannot stat '%s': %d\n", dev, errno); - return -1; + return -ENODEV; } if (!S_ISBLK(stbuf.st_mode)) { fprintf(stderr,"Not a block device\n"); - return -1; + return -ENOTBLK; } if (stbuf.st_rdev != makedev(major,minor)) { fprintf(stdout, "Invalid device (fstab %d:%d, event %d:%d)\n", major(stbuf.st_rdev), minor(stbuf.st_rdev), major, minor); - return 1; + return -EINVAL; } return 0; } @@ -783,8 +783,13 @@ /* Check for matching device */ err = check_dev(); - if (err != 0) - return err < 0? EINVAL : ENODEV; + if (err < 0) { + if (err == -ENODEV && op == MOUNT_CHECK) { + fprintf(stdout,"FSCK_STATE=unknown\n"); + return 0; + } + return -err; + } /* Check if the device is mounted */ err = check_mnt(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.14/VERSION new/sysconfig-0.71.15/VERSION --- old/sysconfig-0.71.14/VERSION 2009-01-23 17:40:25.000000000 +0100 +++ new/sysconfig-0.71.15/VERSION 2009-03-24 14:06:43.000000000 +0100 @@ -1 +1 @@ -0.71.14 +0.71.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghostscript-library for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package ghostscript-library for openSUSE:Factory checked in at Tue Mar 24 19:33:56 CET 2009. -------- --- ghostscript-library/ghostscript-library.changes 2009-02-12 20:38:12.000000000 +0100 +++ ghostscript-library/ghostscript-library.changes 2009-03-12 11:54:58.848501614 +0100 @@ -1,0 +2,6 @@ +Thu Mar 12 11:53:25 CET 2009 - werner(a)suse.de + +- Add fix for ICC library integer overflows (bnc#483303, + CVE-2009-0583, CVE-2009-0584) + +------------------------------------------------------------------- --- ghostscript-library/ghostscript-mini.changes 2008-08-02 01:01:32.000000000 +0200 +++ ghostscript-library/ghostscript-mini.changes 2009-03-12 11:55:40.720001750 +0100 @@ -1,0 +2,17 @@ +Thu Mar 12 11:53:25 CET 2009 - werner(a)suse.de + +- Add fix for ICC library integer overflows (bnc#483303, + CVE-2009-0583, CVE-2009-0584) + +------------------------------------------------------------------- +Thu Feb 12 20:37:53 CET 2009 - coolo(a)suse.de + +- sort the output of find, so the build result is reproducible + +------------------------------------------------------------------- +Thu Jan 8 16:13:06 CET 2009 - werner(a)suse.de + +- Fix Mannufacturer within PPD of omni (bnc#464435) +- Add workaround vor bnc#429345 to make cups able to find omni libs + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ghostscript-CVE-2009-0583.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.C12830/_old 2009-03-24 19:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.C12830/_new 2009-03-24 19:32:41.000000000 +0100 @@ -59,7 +59,7 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.62 -Release: 63 +Release: 64 License: GPL v2 or later Source0: ghostscript-8.62.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-st… @@ -117,6 +117,7 @@ Patch32: gimp-print-4.2.7-epson_horizontal_adjustment.patch Patch33: gimp-print-4.2.7-debug.dif Patch34: gimp-print-4.2.7-nb.dif +Patch50: ghostscript-CVE-2009-0583.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1010 %define xfontdir /usr/share/fonts @@ -316,7 +317,7 @@ %package -n libgimpprint License: GPL v2 or later Version: 4.2.7 -Release: 304 +Release: 305 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -332,7 +333,7 @@ %package -n libgimpprint-devel License: GPL v2 or later Version: 4.2.7 -Release: 304 +Release: 305 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -408,6 +409,7 @@ rename no nb gimp-print-4.2.7/po/no.* # # Main ghostscript +%patch50 -p0 -b .CVE20090583 %patch1 -p0 -b .pdf %patch2 -p0 -b .sgirdb %patch3 -p0 -b .x11 @@ -1337,6 +1339,9 @@ %endif %changelog +* Thu Mar 12 2009 werner(a)suse.de +- Add fix for ICC library integer overflows (bnc#483303, + CVE-2009-0583, CVE-2009-0584) * Thu Feb 12 2009 coolo(a)suse.de - sort the output of find, so the build result is reproducible * Thu Jan 08 2009 werner(a)suse.de ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.C12830/_old 2009-03-24 19:32:42.000000000 +0100 +++ /var/tmp/diff_new_pack.C12830/_new 2009-03-24 19:32:42.000000000 +0100 @@ -59,7 +59,7 @@ Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript) %endif Version: 8.62 -Release: 42 +Release: 43 License: GPL v2 or later Source0: ghostscript-8.62.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-st… @@ -117,6 +117,7 @@ Patch32: gimp-print-4.2.7-epson_horizontal_adjustment.patch Patch33: gimp-print-4.2.7-debug.dif Patch34: gimp-print-4.2.7-nb.dif +Patch50: ghostscript-CVE-2009-0583.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1010 %define xfontdir /usr/share/fonts @@ -309,7 +310,7 @@ %package -n libgimpprint License: GPL v2 or later Version: 4.2.7 -Release: 304 +Release: 305 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -325,7 +326,7 @@ %package -n libgimpprint-devel License: GPL v2 or later Version: 4.2.7 -Release: 304 +Release: 305 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -401,6 +402,7 @@ rename no nb gimp-print-4.2.7/po/no.* # # Main ghostscript +%patch50 -p0 -b .CVE20090583 %patch1 -p0 -b .pdf %patch2 -p0 -b .sgirdb %patch3 -p0 -b .x11 @@ -1330,6 +1332,14 @@ %endif %changelog +* Thu Mar 12 2009 werner(a)suse.de +- Add fix for ICC library integer overflows (bnc#483303, + CVE-2009-0583, CVE-2009-0584) +* Thu Feb 12 2009 coolo(a)suse.de +- sort the output of find, so the build result is reproducible +* Thu Jan 08 2009 werner(a)suse.de +- Fix Mannufacturer within PPD of omni (bnc#464435) +- Add workaround vor bnc#429345 to make cups able to find omni libs * Tue Jul 29 2008 werner(a)suse.de - Fix crash in bjc driver (bnc#412523) * Thu Jul 24 2008 werner(a)suse.de @@ -1813,7 +1823,7 @@ - Be sure that _all_ stuff is compiled with -fno-strict-aliasing - Enable FLAGS even for all trees - Make aclocal.m4 of Omni more upto date -* Mon Jan 19 2004 meissner(a)suse.de +* Sun Jan 18 2004 meissner(a)suse.de - Fixed some losssage from last autoconf upgrade by removing AC_OUTPUT for directories that are not present. * Wed Jan 14 2004 werner(a)suse.de ++++++ ghostscript-CVE-2009-0583.patch ++++++ ++++ 1018 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package mysql for openSUSE:Factory checked in at Tue Mar 24 19:32:23 CET 2009. -------- --- mysql/mysql.changes 2009-01-07 11:09:04.000000000 +0100 +++ mysql/mysql.changes 2009-03-03 02:19:47.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 3 02:15:37 CET 2009 - crrodriguez(a)suse.de + +- use --disable-static, note that this will only + remove static libraries that have shared counterparts, those + in static form only remain available as usual (saves around 6MB) +- remove "la" files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.d17542/_old 2009-03-24 18:43:44.000000000 +0100 +++ /var/tmp/diff_new_pack.d17542/_new 2009-03-24 18:43:44.000000000 +0100 @@ -23,7 +23,7 @@ License: GPL v2 only Group: Productivity/Databases/Servers Version: 5.0.67 -Release: 13 +Release: 15 # required by rcmysql Requires: mysql-client = %{version} # bug437293 @@ -313,9 +313,9 @@ suffix="$1"; shift mkdir _build$suffix pushd _build$suffix - export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" + export CFLAGS="$RPM_OPT_FLAGS -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" - ../configure \ + ../configure --disable-static --with-pic\ --enable-assembler \ --without-readline \ --enable-large-files \ @@ -487,6 +487,7 @@ install -m 700 %_sourcedir/sysconfig.mysql ${RPM_BUILD_ROOT}/var/adm/fillup-templates # not needed, replaced by mysql_upgrade.c rm %buildroot/usr/bin/mysql_upgrade_shell +find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + %pre /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : @@ -569,7 +570,7 @@ %defattr(-, root, root) /usr/include/mysql %dir %{_libdir}/mysql -%{_libdir}/mysql/*.*a +%{_libdir}/mysql/*.a %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so %{_libdir}/mysql/libmysqlclient.so @@ -609,6 +610,11 @@ %files tools -f mysql-tools.files %changelog +* Tue Mar 03 2009 crrodriguez(a)suse.de +- use --disable-static, note that this will only + remove static libraries that have shared counterparts, those + in static form only remain available as usual (saves around 6MB) +- remove "la" files * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Thu Oct 23 2008 mmarek(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Tue Mar 24 18:42:23 CET 2009. -------- --- alsa/alsa.changes 2009-03-05 08:15:51.000000000 +0100 +++ alsa/alsa.changes 2009-03-23 12:30:24.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 23 12:29:29 CET 2009 - tiwai(a)suse.de + +- fix a typo in joystick init script (bnc#480714) +- add route_policy copy to mono capture hd-audio config +- add sysfs files contents to alsa-info output + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.VP8585/_old 2009-03-24 18:40:40.000000000 +0100 +++ /var/tmp/diff_new_pack.VP8585/_new 2009-03-24 18:40:40.000000000 +0100 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.19 -Release: 1 +Release: 2 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -244,6 +244,10 @@ %{_datadir}/alsa %changelog +* Mon Mar 23 2009 tiwai(a)suse.de +- fix a typo in joystick init script (bnc#480714) +- add route_policy copy to mono capture hd-audio config +- add sysfs files contents to alsa-info output * Thu Mar 05 2009 tiwai(a)suse.de - Doh, forgot to bump the rpm version number... * Wed Mar 04 2009 tiwai(a)suse.de ++++++ alsa-info.sh ++++++ --- /var/tmp/diff_new_pack.VP8585/_old 2009-03-24 18:40:40.000000000 +0100 +++ /var/tmp/diff_new_pack.VP8585/_new 2009-03-24 18:40:40.000000000 +0100 @@ -214,6 +214,33 @@ fi } +withsysfs() { + local i f + local printed="" + for i in /sys/class/sound/*; do + case "$i" in + */hwC?D?) + if [ -f $i/init_pin_configs ]; then + if [ -z "$printed" ]; then + echo "!!Sysfs Files" >> $FILE + echo "!!-----------" >> $FILE + echo "" >> $FILE + fi + for f in init_pin_configs driver_pin_configs user_pin_configs init_verbs; do + echo "$i/$f:" >> $FILE + cat $i/$f >> $FILE + echo >> $FILE + done + printed=yes + fi + ;; + esac + done + if [ -n "$printed" ]; then + echo "" >> $FILE + fi +} + #Run checks to make sure the programs we need are installed. LSPCI=$(which lspci 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); @@ -522,6 +549,7 @@ withamixer withalsactl withlsmod + withsysfs pbcheck ;; --update) @@ -536,6 +564,7 @@ withamixer withalsactl withlsmod + withsysfs ;; --debug) echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted" @@ -547,6 +576,7 @@ withamixer withalsactl withlsmod + withsysfs ;; --with-all) withdevices @@ -555,6 +585,7 @@ withamixer withalsactl withlsmod + withsysfs ;; --with-aplay) withaplay ++++++ alsa-lib-git-fixes.diff ++++++ --- /var/tmp/diff_new_pack.VP8585/_old 2009-03-24 18:40:41.000000000 +0100 +++ /var/tmp/diff_new_pack.VP8585/_new 2009-03-24 18:40:41.000000000 +0100 @@ -136,12 +136,15 @@ - mmap_emulation on -} diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf -index bcbcb9b..800281e 100644 +index bcbcb9b..d3ac002 100644 --- a/src/conf/cards/HDA-Intel.conf +++ b/src/conf/cards/HDA-Intel.conf -@@ -58,6 +58,7 @@ HDA-Intel.pcm.default { +@@ -57,7 +57,10 @@ HDA-Intel.pcm.default { + max_dB 30.0 resolution 121 } ++ # to avoid possible phase inversions with digital mics ++ route_policy copy } + hint.device 0 } ++++++ joystick ++++++ --- /var/tmp/diff_new_pack.VP8585/_old 2009-03-24 18:40:41.000000000 +0100 +++ /var/tmp/diff_new_pack.VP8585/_new 2009-03-24 18:40:41.000000000 +0100 @@ -11,7 +11,7 @@ # Required-Stop: alsasound # Default-Start: 2 3 5 # Default-Stop: -# Short-Description: Set up analog josysticks +# Short-Description: Set up analog joysticks # Description: Loading joystick drivers ### END INIT INFO ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysfsutils for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package sysfsutils for openSUSE:Factory checked in at Tue Mar 24 18:40:32 CET 2009. -------- --- sysfsutils/sysfsutils.changes 2009-01-07 14:04:27.000000000 +0100 +++ sysfsutils/sysfsutils.changes 2009-03-24 15:29:29.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 24 15:28:47 CET 2009 - crrodriguez(a)suse.de + +- remove static libraries + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysfsutils.spec ++++++ --- /var/tmp/diff_new_pack.q30562/_old 2009-03-24 18:38:54.000000000 +0100 +++ /var/tmp/diff_new_pack.q30562/_new 2009-03-24 18:38:54.000000000 +0100 @@ -21,7 +21,7 @@ Name: sysfsutils Summary: System Utilities Package / Libsysfs Version: 2.1.0 -Release: 127 +Release: 129 License: LGPL v2.1 or later Group: System/Libraries Url: http://linux-diag.sourceforge.net @@ -49,25 +49,19 @@ Mohan Kumar <mohan(a)in.ibm.com> %prep -%setup +%setup -q %build -CFLAGS="-fPIC $RPM_OPT_FLAGS" \ -./configure \ - --prefix=%{_prefix} \ - --libdir=/%{_lib} \ - --infodir=%{_infodir} \ - --mandir=%{_mandir} -make +%configure --disable-static --with-pic --libdir=/%{_lib} +%{__make} %{?jobs:-j%jobs} %install make install DESTDIR=%{buildroot} # create devel symlink in /usr mkdir -p %{buildroot}%{_libdir} -(cd %{buildroot}%{_libdir} && ln -s ../../%{_lib}/libsysfs.so.? libsysfs.so) -(cd %{buildroot} && mv %{_lib}/libsysfs.a %{buildroot}%{_libdir}) -(cd %{buildroot} && rm -f %{_lib}/libsysfs.la) -(cd %{buildroot} && rm -f %{_lib}/libsysfs.so) +%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libsysfs.so) %{buildroot}%{_libdir}/libsysfs.so +%{__rm} -v %{buildroot}/%{_lib}/libsysfs.so +%{__rm} -v %{buildroot}/%{_lib}/libsysfs.la # don't install the tools rm -f %{buildroot}/%{_bindir}/dlist_test rm -f %{buildroot}/%{_bindir}/get_device @@ -75,11 +69,9 @@ rm -f %{buildroot}/%{_bindir}/get_module rm -f %{buildroot}/%{_bindir}/testlibsysfs -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -93,10 +85,11 @@ %dir %{_includedir}/sysfs %{_includedir}/sysfs/libsysfs.h %{_includedir}/sysfs/dlist.h -%{_libdir}/libsysfs.a %{_libdir}/libsysfs.so %changelog +* Tue Mar 24 2009 crrodriguez(a)suse.de +- remove static libraries * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Tue May 27 2008 hare(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit udev for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at Tue Mar 24 18:38:46 CET 2009. -------- --- udev/udev.changes 2009-03-03 21:03:14.000000000 +0100 +++ udev/udev.changes 2009-03-24 03:17:32.062379000 +0100 @@ -1,0 +2,12 @@ +Tue Mar 24 03:14:36 CET 2009 - kay.sievers(a)novell.com + +- new upstream release 140 + udevadm settle - add --seq-start= --seq-end= + +------------------------------------------------------------------- +Mon Mar 9 21:46:30 CET 2009 - mmarek(a)suse.cz + +- renamed /etc/modprobe.d/pnp-aliases.conf to 50-pnp-aliases.conf + so that 99-local.conf comes last + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pnp-aliases.conf udev-139.tar.bz2 New: ---- 50-pnp-aliases.conf udev-140.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.h25717/_old 2009-03-24 18:36:44.000000000 +0100 +++ /var/tmp/diff_new_pack.h25717/_new 2009-03-24 18:36:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package udev (Version 139) +# spec file for package udev (Version 140) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -Version: 139 +Version: 140 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -33,7 +33,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.… Source60: boot.udev Source61: boot.udev_retry -Source62: pnp-aliases.conf +Source62: 50-pnp-aliases.conf %description udev's main task is to create and remove device nodes in /dev when a @@ -148,7 +148,7 @@ cp rules/suse/*.rules $RPM_BUILD_ROOT/lib/udev/rules.d/ install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev install -m755 -D %{S:61} $RPM_BUILD_ROOT/etc/init.d/boot.udev_retry -install -m644 -D %{S:62} $RPM_BUILD_ROOT/etc/modprobe.d/pnp-aliases.conf +install -m644 -D %{S:62} $RPM_BUILD_ROOT/etc/modprobe.d/50-pnp-aliases.conf # install initial /dev + static devices (nodes are in the files section below) mkdir -p $RPM_BUILD_ROOT/lib/udev/devices mkdir -p $RPM_BUILD_ROOT/lib/udev/devices/pts @@ -233,7 +233,7 @@ %config(noreplace) %{_sysconfdir}/udev/udev.conf %config(noreplace) %{_sysconfdir}/scsi_id.config %dir %{_sysconfdir}/modprobe.d/ -%{_sysconfdir}/modprobe.d/pnp-aliases.conf +%{_sysconfdir}/modprobe.d/50-pnp-aliases.conf %{_mandir}/man?/*.[0-9]* %doc docs/writing_udev_rules # static devices, copied to /dev at every bootup @@ -296,6 +296,12 @@ /%{_lib}/libvolume_id.so.* %changelog +* Tue Mar 24 2009 kay.sievers(a)novell.com +- new upstream release 140 + udevadm settle - add --seq-start= --seq-end= +* Mon Mar 09 2009 mmarek(a)suse.cz +- renamed /etc/modprobe.d/pnp-aliases.conf to 50-pnp-aliases.conf + so that 99-local.conf comes last * Tue Mar 03 2009 kay.sievers(a)novell.com - new upstream release 139 fixes for the block device monitor ++++++ 50-pnp-aliases.conf ++++++ # do not edit this file, it will be overwritten on update # installed by udev alias acpi*:PNP0700:* floppy ++++++ udev-139.tar.bz2 -> udev-140.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/ChangeLog new/udev-140/ChangeLog --- old/udev-139/ChangeLog 2009-02-26 23:28:11.000000000 +0100 +++ new/udev-140/ChangeLog 2009-03-13 13:13:55.000000000 +0100 @@ -1,3 +1,30 @@ +Summary of changes from v139 to v140 +============================================ + +Harald Hoyer (1): + libvolume_id: bump age + +Kay Sievers (12): + version bump + update TODO + volume_id: ntfs - fix uuid setting + update TODO + rules: Fedora update + libudev: queue - use lstat() to check existence of symlink + udevadm: settle - add --seq-start= --seq-end= + udevd: switch watch symlinks to devpath + udevadm: add text for new options to command and man page + update TODO + libudev: ctrl - return error after sending ctrl message + udevadm: settle - use timeout signal, instead of loop counter + +Michael Prokop (1): + fix compile error in debug mode + +Scott James Remnant (1): + udevadm: settle - synchronise with the udev daemon + + Summary of changes from v138 to v139 ============================================ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/configure new/udev-140/configure --- old/udev-139/configure 2009-02-26 14:16:09.000000000 +0100 +++ new/udev-140/configure 2009-03-11 13:29:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for udev 139. +# Generated by GNU Autoconf 2.63 for udev 140. # # Report bugs to <linux-hotplug(a)vger.kernel.org>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='udev' PACKAGE_TARNAME='udev' -PACKAGE_VERSION='139' -PACKAGE_STRING='udev 139' +PACKAGE_VERSION='140' +PACKAGE_STRING='udev 140' PACKAGE_BUGREPORT='linux-hotplug(a)vger.kernel.org' ac_unique_file="udev/udevd.c" @@ -1484,7 +1484,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures udev 139 to adapt to many kinds of systems. +\`configure' configures udev 140 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of udev 139:";; + short | recursive ) echo "Configuration of udev 140:";; esac cat <<\_ACEOF @@ -1659,7 +1659,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -udev configure 139 +udev configure 140 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1673,7 +1673,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by udev $as_me 139, which was +It was created by udev $as_me 140, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2391,7 +2391,7 @@ # Define the identity of the package. PACKAGE='udev' - VERSION='139' + VERSION='140' cat >>confdefs.h <<_ACEOF @@ -11625,16 +11625,16 @@ test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix= -LIBUDEV_LT_CURRENT=0 -LIBUDEV_LT_REVISION=9 -LIBUDEV_LT_AGE=0 +LIBUDEV_LT_CURRENT=1 +LIBUDEV_LT_REVISION=0 +LIBUDEV_LT_AGE=1 -VOLID_LT_CURRENT=1 -VOLID_LT_REVISION=9 -VOLID_LT_AGE=0 +VOLID_LT_CURRENT=2 +VOLID_LT_REVISION=0 +VOLID_LT_AGE=1 @@ -12362,7 +12362,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by udev $as_me 139, which was +This file was extended by udev $as_me 140, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12425,7 +12425,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -udev config.status 139 +udev config.status 140 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/configure.ac new/udev-140/configure.ac --- old/udev-139/configure.ac 2009-02-26 14:15:52.000000000 +0100 +++ new/udev-140/configure.ac 2009-03-11 13:23:02.000000000 +0100 @@ -1,5 +1,5 @@ AC_INIT([udev], - [139], + [140], [linux-hotplug(a)vger.kernel.org] AC_PREREQ(2.60) AC_CONFIG_SRCDIR([udev/udevd.c]) @@ -15,17 +15,17 @@ test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix= dnl /* libudev version */ -LIBUDEV_LT_CURRENT=0 -LIBUDEV_LT_REVISION=9 -LIBUDEV_LT_AGE=0 +LIBUDEV_LT_CURRENT=1 +LIBUDEV_LT_REVISION=0 +LIBUDEV_LT_AGE=1 AC_SUBST(LIBUDEV_LT_CURRENT) AC_SUBST(LIBUDEV_LT_REVISION) AC_SUBST(LIBUDEV_LT_AGE) dnl /* libvolume_id version */ -VOLID_LT_CURRENT=1 -VOLID_LT_REVISION=9 -VOLID_LT_AGE=0 +VOLID_LT_CURRENT=2 +VOLID_LT_REVISION=0 +VOLID_LT_AGE=1 AC_SUBST(VOLID_LT_CURRENT) AC_SUBST(VOLID_LT_REVISION) AC_SUBST(VOLID_LT_AGE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/extras/volume_id/lib/ntfs.c new/udev-140/extras/volume_id/lib/ntfs.c --- old/udev-139/extras/volume_id/lib/ntfs.c 2008-11-13 21:42:56.000000000 +0100 +++ new/udev-140/extras/volume_id/lib/ntfs.c 2009-03-03 13:21:08.000000000 +0100 @@ -97,6 +97,7 @@ int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size) { + uint8_t volume_serial[8]; unsigned int sector_size; unsigned int cluster_size; uint64_t mft_cluster; @@ -119,7 +120,7 @@ if (memcmp(ns->oem_id, "NTFS", 4) != 0) return -1; - volume_id_set_uuid(id, ns->volume_serial, 0, UUID_64BIT_LE); + memcpy(volume_serial, ns->volume_serial, sizeof(volume_serial)); sector_size = le16_to_cpu(ns->bytes_per_sector); if (sector_size < 0x200) @@ -193,6 +194,7 @@ } } + volume_id_set_uuid(id, volume_serial, 0, UUID_64BIT_LE); volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); id->type = "ntfs"; /* we think this is ntfs, but we make sure no other signatures are found */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/NEWS new/udev-140/NEWS --- old/udev-139/NEWS 2009-02-26 23:06:58.000000000 +0100 +++ new/udev-140/NEWS 2009-03-13 13:16:08.000000000 +0100 @@ -1,3 +1,10 @@ +udev 140 +======== +Bugfixes. + +"udevadm settle" now optionally accepts a range of events to wait for, +instead of waiting for "all" events. + udev 139 ======== Bugfixes. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/rules/redhat/95-pam-console.rules new/udev-140/rules/redhat/95-pam-console.rules --- old/udev-139/rules/redhat/95-pam-console.rules 2008-10-16 18:03:43.000000000 +0200 +++ new/udev-140/rules/redhat/95-pam-console.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/rules/rules.d/50-udev-default.rules new/udev-140/rules/rules.d/50-udev-default.rules --- old/udev-139/rules/rules.d/50-udev-default.rules 2009-01-15 17:04:59.000000000 +0100 +++ new/udev-140/rules/rules.d/50-udev-default.rules 2009-03-04 15:54:24.000000000 +0100 @@ -1,4 +1,5 @@ # do not edit this file, it will be overwritten on update +# initramfs:default SUBSYSTEM=="block", SYMLINK+="block/%M:%m" SUBSYSTEM!="block", SYMLINK+="char/%M:%m" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/TODO new/udev-140/TODO --- old/udev-139/TODO 2009-01-21 11:33:12.000000000 +0100 +++ new/udev-140/TODO 2009-03-13 13:13:45.000000000 +0100 @@ -1,11 +1,12 @@ - o add scsi:t-0x09* to ch and remove modprobe rule + o drop modprobe floppy alias (SUSE), it will be in the module (2.6.30) + o drop the DVB shell script rule (2.6.29) + o remove MMC rules, they got a modalias now (2.6.30) + o add scsi:t-0x09* to "ch" and remove modprobe rule o switch device mapper rules to: dmsetup info -c --nameprefixes --unquoted --rows --noheadings \ -o name,uuid,suspended,readonly,major,minor,open,tables_loaded - o implement path_id with libudev + o implement path_id in C with libudev (?) o convert firmware.sh to C (?) - o drop the DVB shell script rule (2.6.29+) o "udevadm control" commands will only accept the --<command> syntax o symlink names to udevadm will no longer be resolved to old command names - o get distros to agree on a default set of rules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/lib/libudev-ctrl.c new/udev-140/udev/lib/libudev-ctrl.c --- old/udev-139/udev/lib/libudev-ctrl.c 2008-11-01 20:11:26.000000000 +0100 +++ new/udev-140/udev/lib/libudev-ctrl.c 2009-03-12 13:00:56.000000000 +0100 @@ -42,6 +42,7 @@ UDEV_CTRL_SET_ENV, UDEV_CTRL_SET_MAX_CHILDS, UDEV_CTRL_SET_MAX_CHILDS_RUNNING, + UDEV_CTRL_SETTLE, }; struct udev_ctrl_msg_wire { @@ -58,6 +59,7 @@ int refcount; struct udev_ctrl *uctrl; struct udev_ctrl_msg_wire ctrl_msg_wire; + pid_t pid; }; struct udev_ctrl { @@ -168,38 +170,37 @@ int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority) { - ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL); - return 0; + return ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL); } int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl) { - ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL); - return 0; + return ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL); } int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl) { - ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL); - return 0; + return ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL); } int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl) { - ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL); - return 0; + return ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL); } int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key) { - ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key); - return 0; + return ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key); } int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count) { - ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL); - return 0; + return ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL); +} + +int udev_ctrl_send_settle(struct udev_ctrl *uctrl) +{ + return ctrl_send(uctrl, UDEV_CTRL_SETTLE, 0, NULL); } struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl) @@ -245,6 +246,8 @@ goto err; } + uctrl_msg->pid = cred->pid; + if (uctrl_msg->ctrl_msg_wire.magic != UDEV_CTRL_MAGIC) { err(uctrl->udev, "message magic 0x%08x doesn't match, ignore it\n", uctrl_msg->ctrl_msg_wire.magic); goto err; @@ -317,3 +320,10 @@ return ctrl_msg->ctrl_msg_wire.intval; return -1; } + +pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg) +{ + if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SETTLE) + return ctrl_msg->pid; + return -1; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/lib/libudev-private.h new/udev-140/udev/lib/libudev-private.h --- old/udev-139/udev/lib/libudev-private.h 2009-02-23 21:20:59.000000000 +0100 +++ new/udev-140/udev/lib/libudev-private.h 2009-03-12 13:00:56.000000000 +0100 @@ -109,6 +109,7 @@ extern int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl); extern int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl); extern int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl); +extern int udev_ctrl_send_settle(struct udev_ctrl *uctrl); extern int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key); extern int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count); struct udev_ctrl_msg; @@ -120,6 +121,7 @@ extern int udev_ctrl_get_stop_exec_queue(struct udev_ctrl_msg *ctrl_msg); extern int udev_ctrl_get_start_exec_queue(struct udev_ctrl_msg *ctrl_msg); extern int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg); +extern pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg); extern const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg); extern int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/lib/libudev-queue.c new/udev-140/udev/lib/libudev-queue.c --- old/udev-139/udev/lib/libudev-queue.c 2008-11-06 19:33:57.000000000 +0100 +++ new/udev-140/udev/lib/libudev-queue.c 2009-03-04 23:28:44.000000000 +0100 @@ -194,7 +194,7 @@ } snprintf(filename, sizeof(filename), "%s/.udev/queue/%llu", udev_get_dev_path(udev_queue->udev), seqnum); - if (stat(filename, &statbuf) == 0) + if (lstat(filename, &statbuf) == 0) return 0; dbg(udev_queue->udev, "seqnum: %llu finished\n", seqnum); return 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm.8 new/udev-140/udev/udevadm.8 --- old/udev-139/udev/udevadm.8 2009-02-26 14:14:05.000000000 +0100 +++ new/udev-140/udev/udevadm.8 2009-03-07 02:22:41.000000000 +0100 @@ -335,6 +335,16 @@ Maximum number of seconds to wait for the event queue to become empty\&. The default value is 180 seconds\&. A value of 0 will check if the queue is empty and always return immediately\&. .RE .PP +\fB\-\-seq\-start=\fR\fB\fIseqnum\fR\fR +.RS 4 +Wait only for events after the given sequence number\&. +.RE +.PP +\fB\-\-seq\-end=\fR\fB\fIseqnum\fR\fR +.RS 4 +Wait only for events before the given sequence number\&. +.RE +.PP \fB\-\-quiet\fR .RS 4 Do not print any output, like the remaining queue entries when reaching the timeout\&. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm-info.c new/udev-140/udev/udevadm-info.c --- old/udev-139/udev/udevadm-info.c 2009-02-26 22:53:54.000000000 +0100 +++ new/udev-140/udev/udevadm-info.c 2009-03-07 02:31:38.000000000 +0100 @@ -387,8 +387,7 @@ " of parent devices\n" " --device-id-of-file=<file> print major:minor of device containing this file\n" " --export-db export the content of the udev database\n" - " --help print this text\n" - "\n"); + " --help\n\n"); goto exit; default: goto exit; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm-monitor.c new/udev-140/udev/udevadm-monitor.c --- old/udev-139/udev/udevadm-monitor.c 2008-10-16 18:03:45.000000000 +0200 +++ new/udev-140/udev/udevadm-monitor.c 2009-03-07 02:30:11.000000000 +0100 @@ -104,7 +104,7 @@ " --env print the whole event environment\n" " --kernel print kernel uevents\n" " --udev print udev events\n" - " --help print this help text\n\n"); + " --help\n\n"); default: goto out; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm-settle.c new/udev-140/udev/udevadm-settle.c --- old/udev-139/udev/udevadm-settle.c 2009-01-31 20:00:56.000000000 +0100 +++ new/udev-140/udev/udevadm-settle.c 2009-03-12 22:36:43.000000000 +0100 @@ -1,5 +1,7 @@ /* * Copyright (C) 2006-2008 Kay Sievers <kay(a)vrfy.org> + * Copyright (C) 2009 Canonical Ltd. + * Copyright (C) 2009 Scott James Remnant <scott(a)netsplit.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +27,7 @@ #include <fcntl.h> #include <syslog.h> #include <getopt.h> +#include <signal.h> #include <sys/stat.h> #include <sys/types.h> @@ -33,31 +36,61 @@ #define DEFAULT_TIMEOUT 180 #define LOOP_PER_SECOND 20 +static int volatile is_timeout; + +static void asmlinkage sig_handler(int signum) +{ + switch (signum) { + case SIGALRM: + is_timeout = 1; + case SIGUSR1: + ; + } +} + int udevadm_settle(struct udev *udev, int argc, char *argv[]) { static const struct option options[] = { + { "seq-start", required_argument, NULL, 's' }, + { "seq-end", required_argument, NULL, 'e' }, { "timeout", required_argument, NULL, 't' }, { "quiet", no_argument, NULL, 'q' }, { "help", no_argument, NULL, 'h' }, {} }; - int timeout = DEFAULT_TIMEOUT; + unsigned long long start = 0; + unsigned long long end = 0; int quiet = 0; + int timeout = 0; + struct sigaction act; struct udev_queue *udev_queue = NULL; - int loop; int rc = 0; dbg(udev, "version %s\n", VERSION); + /* set signal handlers */ + memset(&act, 0x00, sizeof(act)); + act.sa_handler = (void (*)(int)) sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = 0; + sigaction(SIGALRM, &act, NULL); + sigaction(SIGUSR1, &act, NULL); + while (1) { int option; int seconds; - option = getopt_long(argc, argv, "t:qh", options, NULL); + option = getopt_long(argc, argv, "s:e:t:qh", options, NULL); if (option == -1) break; switch (option) { + case 's': + start = strtoull(optarg, NULL, 0); + break; + case 'e': + end = strtoull(optarg, NULL, 0); + break; case 't': seconds = atoi(optarg); if (seconds >= 0) @@ -70,23 +103,98 @@ quiet = 1; break; case 'h': - printf("Usage: udevadm settle [--help] [--timeout=<seconds>] [--quiet]\n\n"); + printf("Usage: udevadm settle OPTIONS\n" + " --timeout=<seconds> maximum time to wait for events\n" + " --seq-start=<seqnum> first seqnum to wait for\n" + " --seq-end=<seqnum> last seqnum to wait for\n" + " --quiet do not print list after timeout\n" + " --help\n\n"); goto exit; } } + if (timeout > 0) + alarm(timeout); + else + alarm(DEFAULT_TIMEOUT); + udev_queue = udev_queue_new(udev); if (udev_queue == NULL) goto exit; - loop = timeout * LOOP_PER_SECOND; - while (loop--) { + + if (start > 0) { + unsigned long long kernel_seq; + + kernel_seq = udev_queue_get_kernel_seqnum(udev_queue); + + /* unless specified, the last event is the current kernel seqnum */ + if (end == 0) + end = udev_queue_get_kernel_seqnum(udev_queue); + + if (start > end) { + err(udev, "seq-start larger than seq-end, ignoring\n"); + fprintf(stderr, "seq-start larger than seq-end, ignoring\n"); + start = 0; + end = 0; + } + + if (start > kernel_seq || end > kernel_seq) { + err(udev, "seq-start or seq-end larger than current kernel value, ignoring\n"); + fprintf(stderr, "seq-start or seq-end larger than current kernel value, ignoring\n"); + start = 0; + end = 0; + } + info(udev, "start=%llu end=%llu current=%llu\n", start, end, kernel_seq); + } else { + if (end > 0) { + err(udev, "seq-end needs seq-start parameter, ignoring\n"); + fprintf(stderr, "seq-end needs seq-start parameter, ignoring\n"); + end = 0; + } + } + + /* guarantee that the udev daemon isn't pre-processing */ + if (getuid() == 0) { + struct udev_ctrl *uctrl; + + uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH); + if (uctrl != NULL) { + sigset_t mask, oldmask; + + sigemptyset(&mask); + sigaddset(&mask, SIGUSR1); + sigaddset(&mask, SIGALRM); + sigprocmask(SIG_BLOCK, &mask, &oldmask); + if (udev_ctrl_send_settle(uctrl) > 0) + sigsuspend(&oldmask); + udev_ctrl_unref(uctrl); + } + } + + while (!is_timeout) { + /* exit if queue is empty */ if (udev_queue_get_queue_is_empty(udev_queue)) break; + + /* if asked for, wait for a specific sequence of events */ + if (start > 0) { + unsigned long long seq; + int finished; + + finished = 0; + for (seq = start; seq <= end; seq++) { + finished = udev_queue_get_seqnum_is_finished(udev_queue, seq); + if (!finished) + break; + } + if (finished) + break; + } usleep(1000 * 1000 / LOOP_PER_SECOND); } /* if we reached the timeout, print the list of remaining events */ - if (loop <= 0) { + if (is_timeout) { struct udev_list_entry *list_entry; if (!quiet) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm-test.c new/udev-140/udev/udevadm-test.c --- old/udev-139/udev/udevadm-test.c 2009-02-24 14:44:51.000000000 +0100 +++ new/udev-140/udev/udevadm-test.c 2009-03-07 02:30:29.000000000 +0100 @@ -64,7 +64,7 @@ case 'h': printf("Usage: udevadm test OPTIONS <syspath>\n" " --action=<string> set action string\n" - " --help print this help text\n\n"); + " --help\n\n"); exit(0); default: exit(1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm-trigger.c new/udev-140/udev/udevadm-trigger.c --- old/udev-139/udev/udevadm-trigger.c 2008-10-20 18:09:59.000000000 +0200 +++ new/udev-140/udev/udevadm-trigger.c 2009-03-07 02:32:03.000000000 +0100 @@ -180,8 +180,7 @@ " --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n" " --attr-match=<file[=<value>]> trigger devices with a matching attribute\n" " --attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n" - " --help print this text\n" - "\n"); + " --help\n\n"); goto exit; default: goto exit; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevadm.xml new/udev-140/udev/udevadm.xml --- old/udev-139/udev/udevadm.xml 2009-01-16 21:32:25.000000000 +0100 +++ new/udev-140/udev/udevadm.xml 2009-03-07 02:22:39.000000000 +0100 @@ -225,6 +225,18 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--seq-start=<replaceable>seqnum</replaceable></option></term> + <listitem> + <para>Wait only for events after the given sequence number.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--seq-end=<replaceable>seqnum</replaceable></option></term> + <listitem> + <para>Wait only for events before the given sequence number.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--quiet</option></term> <listitem> <para>Do not print any output, like the remaining queue entries when reaching the timeout.</para> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udevd.c new/udev-140/udev/udevd.c --- old/udev-139/udev/udevd.c 2009-02-24 15:05:51.000000000 +0100 +++ new/udev-140/udev/udevd.c 2009-03-12 13:00:56.000000000 +0100 @@ -1,6 +1,8 @@ /* * Copyright (C) 2004-2008 Kay Sievers <kay.sievers(a)vrfy.org> * Copyright (C) 2004 Chris Friesen <chris_friesen(a)sympatico.ca> + * Copyright (C) 2009 Canonical Ltd. + * Copyright (C) 2009 Scott James Remnant <scott(a)netsplit.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,6 +71,7 @@ static volatile int udev_exit; static volatile int reload_config; static volatile int signal_received; +static volatile pid_t settle_pid; static int run_exec_q; static int stop_exec_q; static int max_childs; @@ -513,6 +516,11 @@ info(udev, "udevd message (SET_MAX_CHILDS) received, max_childs=%i\n", i); max_childs = i; } + + settle_pid = udev_ctrl_get_settle(ctrl_msg); + if (settle_pid > 0) { + info(udev, "udevd message (SETTLE) received\n"); + } udev_ctrl_msg_unref(ctrl_msg); } @@ -1023,6 +1031,11 @@ if (!stop_exec_q) event_queue_manager(udev); } + + if (settle_pid > 0) { + kill(settle_pid, SIGUSR1); + settle_pid = 0; + } } cleanup_queue_dir(udev); rc = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udev-rules.c new/udev-140/udev/udev-rules.c --- old/udev-139/udev/udev-rules.c 2009-02-25 11:15:34.000000000 +0100 +++ new/udev-140/udev/udev-rules.c 2009-03-03 17:27:00.000000000 +0100 @@ -363,7 +363,7 @@ token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode); break; case TK_A_INOTIFY_WATCH: - dbg(rules->udev, "%s %u\n", token_str(type), token->key.i); + dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch); break; case TK_A_NUM_FAKE_PART: dbg(rules->udev, "%s %u\n", token_str(type), token->key.num_fake_part); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/udev-139/udev/udev-watch.c new/udev-140/udev/udev-watch.c --- old/udev-139/udev/udev-watch.c 2009-02-24 14:53:04.000000000 +0100 +++ new/udev-140/udev/udev-watch.c 2009-03-05 00:34:23.000000000 +0100 @@ -85,6 +85,7 @@ while ((ent = readdir(dir)) != NULL) { char path[UTIL_PATH_SIZE]; char buf[UTIL_PATH_SIZE]; + ssize_t syslen; ssize_t len; struct udev_device *dev; @@ -95,13 +96,13 @@ util_strlcat(path, "/", sizeof(path)); util_strlcat(path, ent->d_name, sizeof(path)); - len = readlink(path, buf, sizeof(buf)); - if (len <= 0) { + syslen = util_strlcpy(buf, udev_get_sys_path(udev), sizeof(buf)); + len = readlink(path, &buf[syslen], sizeof(buf)-syslen); + if (len <= 0 || len >= (ssize_t)(sizeof(buf)-syslen)) { unlink(path); continue; } - - buf[len] = '\0'; + buf[syslen + len] = '\0'; dbg(udev, "old watch to '%s' found\n", buf); dev = udev_device_new_from_syspath(udev, buf); if (dev == NULL) { @@ -142,7 +143,7 @@ snprintf(filename, sizeof(filename), "%s/.udev/watch/%d", udev_get_dev_path(udev), wd); util_create_path(udev, filename); unlink(filename); - symlink(udev_device_get_syspath(dev), filename); + symlink(udev_device_get_devpath(dev), filename); udev_device_set_watch_handle(dev, wd); } @@ -172,16 +173,17 @@ { char filename[UTIL_PATH_SIZE]; char buf[UTIL_PATH_SIZE]; + ssize_t syslen; ssize_t len; if (inotify_fd < 0 || wd < 0) return NULL; snprintf(filename, sizeof(filename), "%s/.udev/watch/%d", udev_get_dev_path(udev), wd); - len = readlink(filename, buf, sizeof(buf)); - if (len > 0) { - buf[len] = '\0'; - + syslen = util_strlcpy(buf, udev_get_sys_path(udev), sizeof(buf)); + len = readlink(filename, &buf[syslen], sizeof(buf)-syslen); + if (len > 0 || len < (ssize_t)(sizeof(buf)-syslen)) { + buf[syslen + len] = '\0'; return udev_device_new_from_syspath(udev, buf); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0