April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Sun Apr 25 18:42:31 CEST 2010. -------- --- kernel-source/kernel-debug.changes 2010-04-19 21:26:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-04-23 07:00:19.000000000 +0200 @@ -1,0 +2,50 @@ +Thu Apr 22 21:18:11 CEST 2010 - jeffm(a)suse.com + +- patches.suse/s390-Kerntypes.diff: Fix slab.h vs slab_def.h + include ordering in kerntypes.c + +------------------------------------------------------------------- +Thu Apr 22 09:47:57 CEST 2010 - mmarek(a)suse.cz + +- rpm/kernel-*.spec.in: Provide %name = %version-%source_rel in + all spec files (bnc#598453). + +------------------------------------------------------------------- +Thu Apr 22 09:32:19 CEST 2010 - tiwai(a)suse.de + +- Update config files: Fix remaining CONFIG_LEDS_CLASS=m + +------------------------------------------------------------------- +Thu Apr 22 08:24:58 CEST 2010 - tiwai(a)suse.de + +- patches.drivers/input-Add-LED-support-to-Synaptics-device: + Refresh. Fix dependency with LED class. +- Update config files. + +------------------------------------------------------------------- +Wed Apr 21 16:44:28 CEST 2010 - tiwai(a)suse.de + +- patches.drivers/input-Add-LED-support-to-Synaptics-device: + input: Add LED support to Synaptics device + (bnc#547370,bnc#582529,bnc#589014). +- patches.drivers/input-Add-support-of-Synaptics-Clickpad-device: + input: Add support of Synaptics Clickpad device + (bnc#547370,bnc#582529,bnc#589014). +- patches.drivers/synaptics-hp-clickpad: Delete. + +------------------------------------------------------------------- +Wed Apr 21 03:01:21 CEST 2010 - jeffm(a)suse.com + +- Update to 2.6.34-rc5. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Tue Apr 20 00:25:54 CEST 2010 - jack(a)suse.de + +- patches.fixes/novfs-LFS-initialization: fs: novfs: Initialize + super-block with standard macros. +- patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir: + fs: novfs: Return ENOTEMPTY when tyring to delete a non-empty + folder (bnc#583964). + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-net.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-vmi.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:21.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:21.000000000 +0200 @@ -17,7 +17,7 @@ # norootforbuild -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %include %_sourcedir/kernel-spec-macros @@ -29,10 +29,11 @@ Group: Documentation/Man AutoReqProv: on Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif +Provides: %name = %version-%source_rel Summary: Kernel Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:21.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase ++++++ kernel-net.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-net Summary: Minimal kernel with disk and net support Version: 2.6.34 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -24,7 +24,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) @@ -53,6 +53,7 @@ Requires: kernel-xen-devel = %version-%source_rel %endif Provides: multiversion(kernel) +Provides: %name = %version-%source_rel Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase kernel-vanilla.spec: same change kernel-vmi.spec: same change kernel-xen.spec: same change ++++++ 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 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/debug 2010-04-22 09:32:45.000000000 +0200 @@ -2558,6 +2558,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -4283,7 +4284,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/default 2010-04-22 09:32:45.000000000 +0200 @@ -2528,6 +2528,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -4253,7 +4254,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/desktop 2010-04-22 09:32:45.000000000 +0200 @@ -2436,6 +2436,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/pae 2010-04-22 09:32:45.000000000 +0200 @@ -2456,6 +2456,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/trace 2010-04-22 09:32:45.000000000 +0200 @@ -2456,6 +2456,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vmi new/config/i386/vmi --- old/config/i386/vmi 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/vmi 2010-04-22 09:32:45.000000000 +0200 @@ -2456,6 +2456,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/xen 2010-04-22 09:32:45.000000000 +0200 @@ -2308,6 +2308,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -3955,7 +3956,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ia64/debug 2010-04-22 09:32:45.000000000 +0200 @@ -2080,6 +2080,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ia64/default 2010-04-22 09:32:45.000000000 +0200 @@ -2066,6 +2066,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ia64/trace 2010-04-22 09:32:45.000000000 +0200 @@ -2069,6 +2069,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc/default 2010-04-22 09:32:45.000000000 +0200 @@ -1940,6 +1940,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc/ppc64 2010-04-22 09:32:45.000000000 +0200 @@ -1929,6 +1929,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/debug 2010-04-22 09:32:45.000000000 +0200 @@ -1949,6 +1949,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/default 2010-04-22 09:32:45.000000000 +0200 @@ -1938,6 +1938,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/ppc64 2010-04-22 09:32:45.000000000 +0200 @@ -1987,6 +1987,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace --- old/config/ppc64/trace 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/trace 2010-04-22 09:32:45.000000000 +0200 @@ -1987,6 +1987,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2010-04-15 15:13:46.000000000 +0200 +++ new/config/s390x/vanilla 2010-04-22 09:32:45.000000000 +0200 @@ -1032,7 +1032,6 @@ # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m -# CONFIG_MAX63XX_WATCHDOG is not set CONFIG_ZVM_WATCHDOG=m # CONFIG_REGULATOR is not set CONFIG_MEMSTICK=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/default new/config/sparc64/default --- old/config/sparc64/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/sparc64/default 2010-04-22 09:32:45.000000000 +0200 @@ -2079,6 +2079,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y @@ -4162,6 +4163,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -4198,6 +4200,9 @@ # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y @@ -4233,7 +4238,6 @@ # CONFIG_KGDB_TESTS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_DCFLUSH is not set -# CONFIG_STACK_DEBUG is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/net new/config/sparc64/net --- old/config/sparc64/net 2010-04-15 15:13:46.000000000 +0200 +++ new/config/sparc64/net 2010-04-22 09:32:45.000000000 +0200 @@ -860,6 +860,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y @@ -1598,6 +1599,9 @@ # CONFIG_LATENCYTOP is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y @@ -1607,7 +1611,6 @@ # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_STACK_DEBUG is not set # # Security options 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 2010-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/debug 2010-04-22 09:32:45.000000000 +0200 @@ -2415,6 +2415,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -4049,7 +4050,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers 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 2010-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/default 2010-04-22 09:32:45.000000000 +0200 @@ -2406,6 +2406,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2010-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/desktop 2010-04-22 09:32:45.000000000 +0200 @@ -2386,6 +2386,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y 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 2010-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/trace 2010-04-22 09:32:45.000000000 +0200 @@ -2406,6 +2406,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y 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 2010-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/xen 2010-04-22 09:32:45.000000000 +0200 @@ -2278,6 +2278,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -3903,7 +3904,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:23.000000000 +0200 @@ -69,6 +69,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:23.000000000 +0200 @@ -34,6 +34,7 @@ %else Release: @RELEASE_PREFIX@0 %endif +Provides: %name = %version-%source_rel Summary: Kernel Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-syms.spec.in ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:23.000000000 +0200 @@ -37,6 +37,7 @@ BuildRequires: coreutils @REQUIRES@ Provides: multiversion(kernel) +Provides: %name = %version-%source_rel Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:24.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:24.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/input-Add-LED-support-to-Synaptics-device new/patches.drivers/input-Add-LED-support-to-Synaptics-device --- old/patches.drivers/input-Add-LED-support-to-Synaptics-device 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/input-Add-LED-support-to-Synaptics-device 2010-04-22 08:25:27.000000000 +0200 @@ -0,0 +1,218 @@ +From: Takashi Iwai <tiwai(a)suse.de> +Subject: [PATCH 2/2] input: Add LED support to Synaptics device +Patch-mainline: Submitted +References: bnc#547370,bnc#582529,bnc#589014 + +The new Synaptics devices have an LED on the top-left corner. +This patch adds a new LED class device to control it. It's created +dynamically upon synaptics device probing. + +The LED is controlled via the command 0x0a with parameters 0x88 or 0x10. +This seems only on/off control although other value might be accepted. + +The detection of the LED isn't clear yet. It should have been the new +capability bits that indicate the presence, but on real machines, it +doesn't fit. So, for the time being, the driver checks the product id +in the ext capability bits and assumes that LED exists on the known +devices. + +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + drivers/input/mouse/Kconfig | 9 +++ + drivers/input/mouse/synaptics.c | 111 ++++++++++++++++++++++++++++++++++++++++ + drivers/input/mouse/synaptics.h | 3 + + 3 files changed, 123 insertions(+) + +--- a/drivers/input/mouse/Kconfig ++++ b/drivers/input/mouse/Kconfig +@@ -19,6 +19,7 @@ + select SERIO_LIBPS2 + select SERIO_I8042 if X86 + select SERIO_GSCPS2 if GSC ++ select LEDS_CLASS if MOUSE_PS2_SYNAPICS_LED + help + Say Y here if you have a PS/2 mouse connected to your system. This + includes the standard 2 or 3-button PS/2 mouse, as well as PS/2 +@@ -67,6 +68,14 @@ + + If unsure, say Y. + ++config MOUSE_PS2_SYNAPTICS_LED ++ bool "Support embedded LED on Synaptics devices" ++ depends on MOUSE_PS2_SYNAPTICS ++ select NEW_LEDS ++ help ++ Say Y here if you have a Synaptics device with an embedded LED. ++ This will enable LED class driver to control the LED device. ++ + config MOUSE_PS2_LIFEBOOK + bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED + default y +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -28,6 +28,7 @@ + #include <linux/input.h> + #include <linux/serio.h> + #include <linux/libps2.h> ++#include <linux/leds.h> + #include <linux/slab.h> + #include "psmouse.h" + #include "synaptics.h" +@@ -335,6 +336,110 @@ + serio_register_port(serio); + } + ++#ifdef CONFIG_MOUSE_PS2_SYNAPTICS_LED ++/* ++ * LED handling: ++ * Some Synaptics devices have an embeded LED at the top-left corner. ++ */ ++ ++struct synaptics_led { ++ struct psmouse *psmouse; ++ struct work_struct work; ++ struct led_classdev cdev; ++}; ++ ++static void synaptics_set_led(struct psmouse *psmouse, int on) ++{ ++ int i; ++ unsigned char cmd = on ? 0x88 : 0x10; ++ ++ ps2_begin_command(&psmouse->ps2dev); ++ if (__ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11)) ++ goto out; ++ for (i = 6; i >= 0; i -= 2) { ++ unsigned char d = (cmd >> i) & 3; ++ if (__ps2_command(&psmouse->ps2dev, &d, PSMOUSE_CMD_SETRES)) ++ goto out; ++ } ++ cmd = 0x0a; ++ __ps2_command(&psmouse->ps2dev, &cmd, PSMOUSE_CMD_SETRATE); ++ out: ++ ps2_end_command(&psmouse->ps2dev); ++} ++ ++static void synaptics_led_work(struct work_struct *work) ++{ ++ struct synaptics_led *led; ++ ++ led = container_of(work, struct synaptics_led, work); ++ synaptics_set_led(led->psmouse, led->cdev.brightness); ++} ++ ++static void synaptics_led_cdev_brightness_set(struct led_classdev *cdev, ++ enum led_brightness value) ++{ ++ struct synaptics_led *led; ++ ++ led = container_of(cdev, struct synaptics_led, cdev); ++ schedule_work(&led->work); ++} ++ ++static void synaptics_sync_led(struct psmouse *psmouse) ++{ ++ struct synaptics_data *priv = psmouse->private; ++ ++ if (priv->led) ++ synaptics_set_led(psmouse, priv->led->cdev.brightness); ++} ++ ++static int synaptics_init_led(struct psmouse *psmouse) ++{ ++ struct synaptics_data *priv = psmouse->private; ++ struct synaptics_led *led; ++ int err; ++ ++ /* FIXME: LED is supposedly detectable in cap0c[1] 0x20, but it seems ++ * not working on real machines. ++ * So we check the product id to be sure. ++ */ ++ if (!priv->ext_cap_0c || SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0xe4) ++ return 0; ++ ++ printk(KERN_INFO "synaptics: support LED control\n"); ++ led = kzalloc(sizeof(struct synaptics_led), GFP_KERNEL); ++ if (!led) ++ return -ENOMEM; ++ led->psmouse = psmouse; ++ INIT_WORK(&led->work, synaptics_led_work); ++ led->cdev.name = "psmouse::synaptics"; ++ led->cdev.brightness_set = synaptics_led_cdev_brightness_set; ++ led->cdev.flags = LED_CORE_SUSPENDRESUME; ++ err = led_classdev_register(NULL, &led->cdev); ++ if (err < 0) { ++ kfree(led); ++ return err; ++ } ++ priv->led = led; ++ return 0; ++} ++ ++static void synaptics_free_led(struct psmouse *psmouse) ++{ ++ struct synaptics_data *priv = psmouse->private; ++ ++ if (!priv->led) ++ return; ++ cancel_work_sync(&priv->led->work); ++ synaptics_set_led(psmouse, 0); ++ led_classdev_unregister(&priv->led->cdev); ++ kfree(priv->led); ++} ++#else ++#define synaptics_init_led(ps) 0 ++#define synaptics_free_led(ps) do {} while (0) ++#define synaptics_sync_led(ps) do {} while (0) ++#endif ++ + /***************************************************************************** + * Functions to interpret the absolute mode packets + ****************************************************************************/ +@@ -622,6 +727,7 @@ + + static void synaptics_disconnect(struct psmouse *psmouse) + { ++ synaptics_free_led(psmouse); + synaptics_reset(psmouse); + kfree(psmouse->private); + psmouse->private = NULL; +@@ -653,6 +759,8 @@ + return -1; + } + ++ synaptics_sync_led(psmouse); ++ + return 0; + } + +@@ -727,6 +835,9 @@ + SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), + priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c); + ++ if (synaptics_init_led(psmouse) < 0) ++ goto init_fail; ++ + set_input_params(psmouse->dev, priv); + + /* +--- a/drivers/input/mouse/synaptics.h ++++ b/drivers/input/mouse/synaptics.h +@@ -94,6 +94,8 @@ + signed char scroll; + }; + ++struct synaptics_led; ++ + struct synaptics_data { + /* Data read from the touchpad */ + unsigned long int model_id; /* Model-ID */ +@@ -107,6 +109,7 @@ + unsigned char pkt_type; /* packet type - old, new, etc */ + unsigned char mode; /* current mode byte */ + int scroll; ++ struct synaptics_led *led; + }; + + void synaptics_module_init(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device new/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device --- old/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device 2010-04-22 08:25:27.000000000 +0200 @@ -0,0 +1,129 @@ +From: Takashi Iwai <tiwai(a)suse.de> +Subject: input: Add support of Synaptics Clickpad device +Patch-mainline: Submitted, likely in 2.6.34-rc6 +References: bnc#547370,bnc#582529,bnc#589014 + +The new type of touchpads can be detected via a new query command 0x0c. +The clickpad flags are in cap[0]:4 and cap[1]:0 bits. + +When the device is detected, the driver now reports only the left +button as the supported buttons so that X11 driver can detect that +the device is Clickpad. A Clickpad device gives the button events +only as the middle button. The kernel driver morphs to the left +button. The real handling of Clickpad is done rather in X driver +side. + +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> +Signed-off-by: Dmitry Torokhov <dtor(a)mail.ru> + +--- + drivers/input/mouse/synaptics.c | 33 +++++++++++++++++++++++++++++---- + drivers/input/mouse/synaptics.h | 4 ++++ + 2 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index 026df60..c7b5285 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -137,7 +137,8 @@ static int synaptics_capability(struct psmouse *psmouse) + if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap)) + return -1; + priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2]; +- priv->ext_cap = 0; ++ priv->ext_cap = priv->ext_cap_0c = 0; ++ + if (!SYN_CAP_VALID(priv->capabilities)) + return -1; + +@@ -162,6 +163,16 @@ static int synaptics_capability(struct psmouse *psmouse) + priv->ext_cap &= 0xff0fff; + } + } ++ ++ if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 4) { ++ if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB_0C, cap)) { ++ printk(KERN_ERR "Synaptics claims to have extended capability 0x0c," ++ " but I'm not able to read it."); ++ } else { ++ priv->ext_cap_0c = (cap[0] << 16) | (cap[1] << 8) | cap[2]; ++ } ++ } ++ + return 0; + } + +@@ -348,7 +359,15 @@ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data + hw->left = (buf[0] & 0x01) ? 1 : 0; + hw->right = (buf[0] & 0x02) ? 1 : 0; + +- if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) { ++ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { ++ /* ++ * Clickpad's button is transmitted as middle button, ++ * however, since it is primary button, we will report ++ * it as BTN_LEFT. ++ */ ++ hw->left = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; ++ ++ } else if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) { + hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; + if (hw->w == 2) + hw->scroll = (signed char)(buf[1]); +@@ -593,6 +612,12 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) + + dev->absres[ABS_X] = priv->x_res; + dev->absres[ABS_Y] = priv->y_res; ++ ++ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { ++ /* Clickpads report only left button */ ++ __clear_bit(BTN_RIGHT, dev->keybit); ++ __clear_bit(BTN_MIDDLE, dev->keybit); ++ } + } + + static void synaptics_disconnect(struct psmouse *psmouse) +@@ -697,10 +722,10 @@ int synaptics_init(struct psmouse *psmouse) + + priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS; + +- printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n", ++ printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n", + SYN_ID_MODEL(priv->identity), + SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), +- priv->model_id, priv->capabilities, priv->ext_cap); ++ priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c); + + set_input_params(psmouse->dev, priv); + +diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h +index f0f40a3..ae37c5d 100644 +--- a/drivers/input/mouse/synaptics.h ++++ b/drivers/input/mouse/synaptics.h +@@ -18,6 +18,7 @@ + #define SYN_QUE_SERIAL_NUMBER_SUFFIX 0x07 + #define SYN_QUE_RESOLUTION 0x08 + #define SYN_QUE_EXT_CAPAB 0x09 ++#define SYN_QUE_EXT_CAPAB_0C 0x0c + + /* synatics modes */ + #define SYN_BIT_ABSOLUTE_MODE (1 << 7) +@@ -48,6 +49,8 @@ + #define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47) + #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) + #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) ++#define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) ++#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100100) + + /* synaptics modes query bits */ + #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7)) +@@ -96,6 +99,7 @@ struct synaptics_data { + unsigned long int model_id; /* Model-ID */ + unsigned long int capabilities; /* Capabilities */ + unsigned long int ext_cap; /* Extended Capabilities */ ++ unsigned long int ext_cap_0c; /* Ext Caps from 0x0c query */ + unsigned long int identity; /* Identification */ + int x_res; /* X resolution in units/mm */ + int y_res; /* Y resolution in units/mm */ +-- +1.7.0.4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/synaptics-hp-clickpad new/patches.drivers/synaptics-hp-clickpad --- old/patches.drivers/synaptics-hp-clickpad 2010-03-21 23:34:57.000000000 +0100 +++ new/patches.drivers/synaptics-hp-clickpad 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -From: Takashi Iwai <tiwai(a)suse.de> -Subject: Input: Add support of clickpad mode to synaptics mouse driver -Patch-mainline: -References: bnc#547370 -Patch-mainline: not yet - -Add the experimental support of Synatpics Clickpad on new HP laptops. - -Right now only "ClickZone" mode is implemented. That is, the buttons -are emulated as clicks in the bottom button zone. Clicking the narrow -middle point in the button zone gives a middle click. - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - drivers/input/mouse/synaptics.c | 48 ++++++++++++++++++++++++++++++++++++++++ - drivers/input/mouse/synaptics.h | 3 ++ - 2 files changed, 51 insertions(+) - ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -327,6 +327,45 @@ static void synaptics_pt_create(struct p - * Functions to interpret the absolute mode packets - ****************************************************************************/ - -+/* left and right clickpad button ranges; -+ * the gap between them is interpreted as a middle-button click -+ */ -+#define CLICKPAD_LEFT_BTN_X \ -+ ((XMAX_NOMINAL - XMIN_NOMINAL) * 2 / 5 + XMIN_NOMINAL) -+#define CLICKPAD_RIGHT_BTN_X \ -+ ((XMAX_NOMINAL - XMIN_NOMINAL) * 3 / 5 + XMIN_NOMINAL) -+ -+/* handle clickpad events */ -+static void clickpad_process_packet(struct synaptics_data *priv, -+ struct synaptics_hw_state *hw) -+{ -+ /* clickpad mode reports Y range from 0 to YMAX_NOMINAL, -+ * where the area Y < YMIN_NOMINAL is used as click buttons -+ */ -+ if (hw->y < YMIN_NOMINAL) { -+ /* button area */ -+ hw->z = 0; /* don't move pointer */ -+ /* clickpad reports only the middle button, and we need -+ * to fake left/right buttons depending on the touch position -+ */ -+ if (hw->middle) { /* clicked? */ -+ hw->middle = 0; -+ if (hw->x < CLICKPAD_LEFT_BTN_X) -+ hw->left = 1; -+ else if (hw->x > CLICKPAD_RIGHT_BTN_X) -+ hw->right = 1; -+ else -+ hw->middle = 1; -+ } -+ } else if (hw->middle) { -+ /* dragging */ -+ hw->left = priv->prev_hw.left; -+ hw->right = priv->prev_hw.right; -+ hw->middle = priv->prev_hw.middle; -+ } -+ priv->prev_hw = *hw; -+} -+ - static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data *priv, struct synaptics_hw_state *hw) - { - memset(hw, 0, sizeof(struct synaptics_hw_state)); -@@ -407,6 +446,9 @@ static void synaptics_process_packet(str - - synaptics_parse_hw_state(psmouse->packet, priv, &hw); - -+ if (SYN_CAP_CLICKPAD(priv->ext_cap)) -+ clickpad_process_packet(priv, &hw); -+ - if (hw.scroll) { - priv->scroll += hw.scroll; - -@@ -701,6 +743,12 @@ int synaptics_init(struct psmouse *psmou - SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), - priv->model_id, priv->capabilities, priv->ext_cap); - -+ if (SYN_CAP_CLICKPAD(priv->ext_cap)) { -+ printk(KERN_INFO "Synaptics: Clickpad mode enabled\n"); -+ /* force to enable the middle button */ -+ priv->capabilities |= (1 << 18); -+ } -+ - set_input_params(psmouse->dev, priv); - - /* ---- a/drivers/input/mouse/synaptics.h -+++ b/drivers/input/mouse/synaptics.h -@@ -48,6 +48,8 @@ - #define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47) - #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) - #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) -+#define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) -+#define SYN_CAP_CLICKPAD(ec) (SYN_CAP_PRODUCT_ID(ec) == 0xe4) - - /* synaptics modes query bits */ - #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7)) -@@ -103,6 +105,7 @@ struct synaptics_data { - unsigned char pkt_type; /* packet type - old, new, etc */ - unsigned char mode; /* current mode byte */ - int scroll; -+ struct synaptics_hw_state prev_hw; - }; - - void synaptics_module_init(void); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hibernation-fix-s2disk.patch new/patches.fixes/hibernation-fix-s2disk.patch --- old/patches.fixes/hibernation-fix-s2disk.patch 2010-04-19 21:21:36.000000000 +0200 +++ new/patches.fixes/hibernation-fix-s2disk.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -From 182220e26134122e6bf12ea24c68f1a022c8da9e Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby(a)suse.cz> -Date: Thu, 8 Apr 2010 23:38:56 +0200 -Subject: PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling -References: bko#15728 -Patch-mainline: on-the-way - -When CONFIG_DEBUG_BLOCK_EXT_DEVT is set we decode the device -improperly by old_decode_dev and it results in an error while -hibernating with s2disk. - -All users already passes the new device number, so switch to -new_decode_dev. - -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> -Cc: "Rafael J. Wysocki" <rjw(a)sisk.pl> -Cc: Pavel Machek <pavel(a)ucw.cz> ---- - kernel/power/user.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/kernel/power/user.c b/kernel/power/user.c -index 9eafb8c..6ca76a6 100644 ---- a/kernel/power/user.c -+++ b/kernel/power/user.c -@@ -593,7 +593,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, - * User space encodes device types as two-byte values, - * so we need to recode them - */ -- swdev = old_decode_dev(swap_area.dev); -+ swdev = new_decode_dev(swap_area.dev); - if (swdev) { - offset = swap_area.offset; - data->swap = swap_type_of(swdev, offset, NULL); --- -1.7.0.3 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-LFS-initialization new/patches.fixes/novfs-LFS-initialization --- old/patches.fixes/novfs-LFS-initialization 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-LFS-initialization 2010-04-20 00:26:03.000000000 +0200 @@ -0,0 +1,26 @@ +From: Sankar P <psankar(a)novell.com> +Subject: fs: novfs: Initialize super-block with standard macros +Patch-mainline: no + +Initialize the super block's maxbytes with MAX_LFS_FILESIZE macro. + +Signed-off-by: Sankar P <psankar(a)novell.com> +Signed-off-by: Samrat Kannikar <ksamrat(a)novell.com> +Acked-by: Jan Kara <jack(a)suse.cz> + +diff --git a/fs/novfs/inode.c b/fs/novfs/inode.c +index e33a5f8..1c17f7f 100644 +--- a/fs/novfs/inode.c ++++ b/fs/novfs/inode.c +@@ -3826,7 +3826,7 @@ int novfs_fill_super(struct super_block *SB, void *Data, int Silent) + + SB->s_blocksize = PAGE_CACHE_SIZE; + SB->s_blocksize_bits = PAGE_CACHE_SHIFT; +- SB->s_maxbytes = 0xFFFFFFFFFFFFFFFFULL; /* Max file size */ ++ SB->s_maxbytes = MAX_LFS_FILESIZE; /* Max file size */ + SB->s_op = &novfs_ops; + SB->s_flags |= (MS_NODIRATIME | MS_NODEV | MS_POSIXACL); + SB->s_magic = NOVFS_MAGIC; +-- +1.6.4.2 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir new/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir --- old/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir 2010-04-20 00:26:03.000000000 +0200 @@ -0,0 +1,42 @@ +From: Sankar P <psankar(a)novell.com> +Subject: fs: novfs: Return ENOTEMPTY when tyring to delete a non-empty folder +References: bnc#583964 +Patch-mainline: no + +The patch returns the ENOTEMPTY error code, when an user issues +delete command on a non-empty folder. This fix makes Nautilus +behave correctly in novfs, just like other file-systems. + +Signed-off-by: Sankar P <psankar(a)novell.com> +Acked-by: Jan Kara <jack(a)suse.cz> +--- + tmp/linux-2.6.32-sle11-sp1/fs/novfs/file.c | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/fs/novfs/file.c b/fs/novfs/file.c +index b7033ff..5da32ca 100644 +--- a/fs/novfs/file.c ++++ b/fs/novfs/file.c +@@ -1569,11 +1569,16 @@ int novfs_delete(unsigned char * Path, int DirectoryFlag, struct novfs_schandle + if (reply) { + retCode = 0; + if (reply->Reply.ErrorCode) { +- if ((reply->Reply.ErrorCode & 0xFFFF) == 0x0006) { /* Access Denied Error */ ++ ++ /* Refer to the file ncp.c, in xtier's ++ * NCP89_08 Function for various error codes */ ++ ++ if ((reply->Reply.ErrorCode & 0xFFFF) == 0x0006) + retCode = -EACCES; +- } else { ++ else if ((reply->Reply.ErrorCode & 0xFFFF) == 0x0513) ++ retCode = -ENOTEMPTY; ++ else + retCode = -EIO; +- } + } + kfree(reply); + } +-- +1.6.4.2 + ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1 ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SoN-25-nfs-swapcache.patch new/patches.suse/SoN-25-nfs-swapcache.patch --- old/patches.suse/SoN-25-nfs-swapcache.patch 2010-04-14 22:25:09.000000000 +0200 +++ new/patches.suse/SoN-25-nfs-swapcache.patch 2010-04-22 21:18:20.000000000 +0200 @@ -162,7 +162,7 @@ + struct inode *inode = page_file_mapping(page)->host; struct nfs_server *nfss = NFS_SERVER(inode); - if (atomic_long_inc_return(&nfss->writeback) > + page_cache_get(page); @@ -212,7 +212,7 @@ static int nfs_set_page_writeback(struct static void nfs_end_page_writeback(struct page *page) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/s390-Kerntypes.diff new/patches.suse/s390-Kerntypes.diff --- old/patches.suse/s390-Kerntypes.diff 2010-04-14 22:25:09.000000000 +0200 +++ new/patches.suse/s390-Kerntypes.diff 2010-04-22 21:18:20.000000000 +0200 @@ -96,6 +96,7 @@ +#include <linux/module.h> +#include <linux/sched.h> +#include <linux/mm.h> ++#include <linux/slab.h> +#ifdef CONFIG_SLUB + #include <linux/slub_def.h> +#endif @@ -105,7 +106,6 @@ +#ifdef CONFIG_SLQB + #include <linux/slqb_def.h> +#endif -+#include <linux/slab.h> +#include <linux/bio.h> +#include <linux/bitmap.h> +#include <linux/bitops.h> ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:25.000000000 +0200 @@ -31,6 +31,7 @@ patches.kernel.org/patch-2.6.34-rc1-rc2 patches.kernel.org/patch-2.6.34-rc2-rc3 patches.kernel.org/patch-2.6.34-rc3-rc4 + patches.kernel.org/patch-2.6.34-rc4-rc5 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -107,8 +108,6 @@ patches.fixes/make-note_interrupt-fast.diff patches.fixes/twl6030-fix-note_interrupt-call - patches.fixes/hibernation-fix-s2disk.patch - ######################################################## # Architecture-specific patches. These used to be all @@ -390,6 +389,8 @@ patches.fixes/novfs-truncate-fix patches.fixes/novfs-fix-oops-in-scope-finding patches.fixes/novfs-dentry-cache-limit.patch + patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir + patches.fixes/novfs-LFS-initialization ######################################################## # other filesystem stuff @@ -555,7 +556,8 @@ patches.suse/bootsplash-console-fix patches.drivers/elousb.patch patches.fixes/input-add-acer-aspire-5710-to-nomux.patch - patches.drivers/synaptics-hp-clickpad + patches.drivers/input-Add-support-of-Synaptics-Clickpad-device + patches.drivers/input-Add-LED-support-to-Synaptics-device ########################################################## # Sound ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:25.000000000 +0200 @@ -1,3 +1,3 @@ -2010-04-19 21:21:36 +0200 -GIT Revision: edfae1aa21950bd4200dd722852583ed4d4f08cd +2010-04-22 21:18:20 +0200 +GIT Revision: 72f7d49ac45380c1b71bd38e86c3bbf74577b9f6 GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Sun Apr 25 18:42:17 CEST 2010. -------- --- sysvinit/sysvinit.changes 2010-04-14 09:51:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2010-04-14 09:49:45.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 13 18:27:02 CEST 2010 - werner(a)suse.de + +- Add patch to make last(1) knowing latest IPv6 specs + +------------------------------------------------------------------- @@ -9,0 +15,88 @@ +- Update to sysvinit (2.88dsf) world; urgency=low + + * Mention new home on Savannah in README. + * Revert change from Fedora/RedHat where the now obsolete command + INIT_CMD_CHANGECONS was introduced. Based on feedback and patch + from Bill Nottingham. + * Adjust makefile to make sure the install directories are created + before files are copied into them. + * Simplify build rules, based on patch from Mike Frysinger and Gentoo. + * Fix minor bug in optimizing of argument parsing. Based on + report from jakemus on freshmeat. + * Add casts to get rid of compiler warning about signed/unsigned issues. + * Change tty handling in init to make sure the UTF-8 flag is not cleared + on boot. Patch from Samuel Thibault. + * Add Makefile in toplevel directory. + * Print usage information when shutdown is used by non-root user. + Patch from Mike Frysinger and Gentoo. + * Sync shutdown manual page and usage information. Patch from Mike + Frysinger and Gentoo. + * Fix race condition in utmp writing. Patch from Gil Kloepfer via + Mike Frysinger and Gentoo. + * Rewrite findtty() in bootlogd to recursively search /dev/ for the + correct device, to handle terminal devices for example in /dev/pty/. + Patch from Debian. + * Make sure bootlogd findpty() returns an error value when it fails to + find a usable pty. Patch from Rob Leslie via Debian. + * Make sure bootlogd fflush() every line, even if asked not to flush + to disk using fdatasync(). Patch from Scott Gifford via Debian. + * Add compatibility code to handle old path "/etc/powerstatus" for a + while. + * Incude definition for MNT_DETACH which is missing in older GNU libc + headers. + * Do not strip binaries before installing them, to make it easier to + get binaries with debug information installed. + * Add the comment from Andrea Arcangeli about the correct + place of setting the default childhandler within spawn(). + * Make sure that newline is printed out for last(1) even + if an utmp record entry is truncated. + * Check if utmp not only exists but also is writable and delay + writing out of the utmp runlevel record if utmp is not writable. + * Be able to find libcrypt also on 64 bit based architectures. + * Add option -w to the last command to display the full user and + domain names in the output. Patch from Petr Lautrbach. + * Add a manual page for utmpdump as this tool is sometimes + very useful even if not intended for normal use. + * Use paths.h macros for wall + * Change path "/etc/powerstatus" to "/var/run/powerstatus" + * Detected also removable block devices at halt/reboot to be able + to flush data and send them the ATA standby command. This should + avoid data loss on USB sticks and other removable block devices. + * Flush block devices on halt/reboot if not done by the kernel. + * Set SHELL to /bin/sh in the environmant of shutdown. + * Retry to write out shutdown messages if interrupted. + * pidof/killall5 - make omit pid list a dynamic one. + * pidof - provide '-n' to skip stat(2) syscall on network based FS. + * init - avoid compiler warnings + * init - initialize console by using the macros from ttydefaults.h + * init - add the possiblity to ignore further interrupts from keyboard + * init - add the possiblity to set sane terminal line settings + * sulogin - add the possibility to reset the terminal io + * Fix some minor problems + * init - enable is_selinux_enabled() to detect selinuxfs + * Add fix for Debian bug #536574 -- Can be enabled by -DACCTON_OFF + * Add helper program fstab-decode to make it easier to handle + /etc/mtab content. Patch by Miloslav Trmac and Fedora. + * Add fix for Debian bug #335023 - Make sure TERM is set on FreeBSD. + * Add fix for Debian bug #374038 - Make it clear that shutdown -c can + only cancel a waiting shutdown, not an active one. + * Add note to pidof manual page about the use of readlink(2). Patch by + Bill Nottingham and Fedora. + * Add PAM patch contrib/notify-pam-dead.patch based on Debian bug + #68621, which will add PAM support for programs spawned by init on + the console like sulogin. Based on patch by Topi Miettinen. This + patch is not applied by default yet while we review its + usefullness. It is only helpful for session handling, as sulogin + do not use and will not use a PAM conv() function. The current + sulogin is able to handle DES as well as MD5, SHA, and Blowfish + encrypted passwords due using getpwnam(3). + * Move utmp/wtmp before the execvp() in spawn() to be sure to + use the correct pid even on a controlling tty + * Remaining problem is that the pid of the second fork() for + getting a controlling tty isn't that reported by spawn() + * Re-enable writting utmp/wtmp for boot scripts + * Extend sulogin to support additional encryption algorithms + * Re-enable maintenance message of sulogin + * Enable the sulogin fallback password check to handle MD5, SHA, and + Blowfish encrypted passwords in case of getpwnam(3) fails. + * sulogin picking the SELinux context was broken. Patch by Daniel Walsh @@ -14,0 +108,67 @@ + +------------------------------------------------------------------- +Tue Mar 23 17:21:06 CET 2010 - werner(a)suse.de + +- Test out sysvinit (2.88dsf) UNRELEASED; urgency=low +- Update to sysvinit (2.87dsf) world; urgency=low + + * Document -e and -t options for telinit in init(8). + * Document in halt(8) that -n might not disable all syncing. + Patch by Bill Nottingham and Fedora + * Adjust output from "last -x". In reboot lines, print endpoint + of uptime too. In shutdown lines print downtimes rather than + the time between downs. Fix typo in string compare in last.c. + Patch by Thomas Hood. + * Improve handling of IPv6 addresses in last. Patch from Fedora. + * Add new option -F to last, to output full date string instead + of the short form provided by default. Patch from Olaf Dabrunz + and SuSe. + * Fix utmp/wtmp updating on 64-bit platforms. Patch by Bill + Nottingham and Fedora. + * Avoid unchecked return value from malloc() in utmpdump. + Patch from Christian 'Dr. Disk' Hechelmann and Fedora. + * Make sure to use execle and no execl when passing environment to + the new process. Patch from RedHat. + * Correct init to make sure the waiting status is preserved across + re-exec. Patch from RedHat. + * Correct init to avoid race condition when starting programs during + boot. Patch from SuSe. + * Allow 'telinit u' in runlevels 0 and 6. Patch from Thomas Hood. + * Improve error message from init if fork() fail. Patch found in Suse. + * Add support for SE Linux capability handling. Patch from Manoj + Srivastava, adjusted to avoid aborting if SE policy was loaded in + the initrd with patch from Bill Nottingham and Fedora. + * Add -c option to pidof for only matching processes with the same + process root. Ignore -c when not running as root. Patch from + Thomas Woerner and Fedora. + * Add usleep in killall5 after killing processes, to force the kernel + to reschedule. Patch from SuSe. + * Modify pidof to not print empty line if no pid was found. + * Modify init and sulogin to fix emergency mode's tty, making sure ^C + and ^Z work when booting with 'emergency' kernel option. Patch from + Samuel Thibault. + * Modify init to allow some time for failed opens to resolve themselves. + Patch from Bill Nottingham and Fedora. + * Modify init to shut down IDE, SCSI and SATA disks properly. Patches + from Sebastian Reichelt, Werner Fink and SuSe. + * Modify wall to use UT_LINESIZE from <utmp.h> instead of hardcoded + string lengths. Patch from SuSe. + * Change wall to make halt include hostname in output. + * Change killall to avoid killing init by mistake. Patch from SuSe. + * Change killall5 to use the exit value to report if it found any + processes to kill. Patch from Debian. + * Add option -o opmitpid to killall5, to make it possible to skip + some pids during shutdown. Based on patch from Colin Watson and + Ubuntu. + * Modify killall to work better with user space file system, by + changing cwd to /proc when stopping and killing processes, and + avoiding stat() when the value isn't used. Also, lock process + pages in memory to avoid paging when user processes are stopped. + Patch from Debian and Goswin von Brederlow with changes by Kel + Modderman. + * Change shutdown to only accept flags -H and -P with the -h flag, + and document this requirement in the manual page. + * Change reboot/halt to work properly when used as a login shell. + Patch by Dale R. Worley and Fedora. + * Let sulogin fall back to the staticly linked /bin/sash if both roots + shell and /bin/sh fail to execute. calling whatdependson for head-i586 Old: ---- sysvinit-2.82-multiline.patch sysvinit-2.85-paths.patch sysvinit-2.85-suse.patch sysvinit-2.86-full-time.patch sysvinit-2.86-fuse-no-kill.patch sysvinit-2.86-hddown.patch sysvinit-2.86-lib64.patch sysvinit-2.86-mdmon-no-kill.patch sysvinit-2.86-nfs4pidof.patch sysvinit-2.86-race.patch sysvinit-2.86-selinux.patch sysvinit-2.86-sulogin.patch sysvinit-2.86-usage-message.patch sysvinit-2.86-utmp.patch sysvinit-2.86.dif sysvinit-2.86.tar.bz2 New: ---- notify-pam-dead.patch sysvinit-2.88dsf-no-kill.patch sysvinit-2.88dsf-suse.patch sysvinit-2.88dsf.dif sysvinit-2.88dsf.tar.bz2 sysvinit-last-ipv6-heuristic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.ohPIpK/_old 2010-04-25 18:42:06.000000000 +0200 +++ /var/tmp/diff_new_pack.ohPIpK/_new 2010-04-25 18:42:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sysvinit (Version 2.86) +# spec file for package sysvinit (Version 2.88) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,17 +23,17 @@ %define PDVER 2.0.2 %define KPVER 2.16 %define SCVER 1.10 -%define SIVER 2.86 +%define SIVER 2.88 %define START 0.54 License: GPLv2+ Group: System/Base AutoReqProv: on -Version: 2.86 -Release: 223 +Version: 2.88 +Release: 1 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libselinux-devel libsepol-devel -Source: sysvinit-2.86.tar.bz2 +BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel +Source: http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 Source2: killproc-2.16.tar.bz2 Source3: powerd-2.0.2.tar.bz2 Source4: showconsole-1.10.tar.bz2 @@ -43,26 +43,16 @@ Source8: mkinitrd-boot.sh Source9: mkinitrd-kill1.sh Source10: mkinitrd-kill2.sh -Patch: sysvinit-2.86.dif -Patch1: sysvinit-2.86-nfs4pidof.patch -Patch2: powerd-2.0.2.dif -Patch3: killproc-2.16.dif -Patch5: sysvinit-2.86-sulogin.patch -Patch6: sysvinit-2.82-startstop.patch -Patch7: sysvinit-2.85-suse.patch -Patch8: sysvinit-2.85-paths.patch -Patch9: sysvinit-2.86-utmp.patch -Patch10: showconsole-1.10.dif -Patch11: sysvinit-2.86-race.patch -Patch12: sysvinit-2.86-lib64.patch -Patch13: sysvinit-2.82-multiline.patch -Patch14: startpar-0.54.dif -Patch15: sysvinit-2.86-usage-message.patch -Patch16: sysvinit-2.86-full-time.patch -Patch17: sysvinit-2.86-hddown.patch -Patch18: sysvinit-2.86-selinux.patch -Patch19: sysvinit-2.86-fuse-no-kill.patch -Patch20: sysvinit-2.86-mdmon-no-kill.patch +Patch: sysvinit-2.88dsf.dif +Patch1: sysvinit-2.82-startstop.patch +Patch2: sysvinit-2.88dsf-suse.patch +Patch3: sysvinit-2.88dsf-no-kill.patch +Patch4: notify-pam-dead.patch +Patch5: sysvinit-last-ipv6-heuristic.patch +Patch20: powerd-2.0.2.dif +Patch30: killproc-2.16.dif +Patch40: showconsole-1.10.dif +Patch50: startpar-0.54.dif Requires: sysvinit-tools Provides: sbin_init @@ -93,45 +83,34 @@ sysvinit package. %prep -%setup -q -b 2 -b 3 -b 4 -b 5 -%patch -P 1 -b .nfs4pidof -%patch -P 5 -b .sulogin -%patch -P 6 -b .ststdmn -%patch -P 7 -b .suse -%patch -P 8 -b .paths -%patch -P 9 -b .utmp -%patch -P 11 -b .race -%patch -P 12 -b .lib64 -%patch -P 13 -b .multiline -%patch -P 15 -b .usage -%patch -P 16 -b .fulltime -%patch -P 17 -b .hddown -%patch -P 18 -b .selinux -%patch -P 19 -b .fuse -%patch -P 20 -b .mdmon +%setup -n sysvinit-%{SIVER}dsf -q -b 2 -b 3 -b 4 -b 5 +%patch1 -p0 -b .startstop +%patch2 -p0 -b .suse +%patch3 -p0 -b .no-kill +%patch4 -p0 -b .pam +%patch5 -p2 -b .ipv6 %patch pushd ../powerd-%{PDVER} -%patch -P 2 +%patch20 popd pushd ../killproc-%{KPVER} -%patch -P 3 +%patch30 popd pushd ../showconsole-%{SCVER} -%patch -P 10 +%patch40 popd pushd ../startpar-%{START} -%patch -P 14 +%patch50 popd %_fixowner . %_fixgroup . /bin/chmod -Rf a+rX,g-w,o-w . %build - RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" - export RPM_OPT_FLAGS - CFLAGS="-Wall ${RPM_OPT_FLAGS} -D_GNU_SOURCE -D__NO_STRING_INLINES -pipe" + RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64 -pipe" CC=gcc - make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC" + export RPM_OPT_FLAGS CC + make %{?_smp_mflags} WITH_SELINUX=yes DISTRO=SuSE pushd ../showconsole-%{SCVER} make %{?_smp_mflags} popd @@ -143,7 +122,7 @@ ./configure --prefix= --bindir='$(DESTDIR)/sbin' \ --mandir='$(DESTDIR)%{_mandir}' \ --sbindir='$(DESTDIR)/sbin' - make %{?_smp_mflags} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS" + make %{?_smp_mflags} CFLAGS="-I../sysvinit-%{SIVER}dsf/src $RPM_OPT_FLAGS " %endif popd pushd ../startpar-%{START} @@ -162,7 +141,7 @@ mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 - make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT} + make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT} WITH_SELINUX=yes DISTRO=SuSE test -p ${RPM_BUILD_ROOT}/dev/initctl || { rm -f ${RPM_BUILD_ROOT}/dev/initctl mknod ${RPM_BUILD_ROOT}/dev/initctl p @@ -237,6 +216,7 @@ %files %defattr (-,root,root,755) +%config /etc/pam.d/init /sbin/halt /sbin/init /sbin/poweroff @@ -282,6 +262,7 @@ # /sbin/intr /sbin/blogger /sbin/blogd +/sbin/fstab-decode /sbin/showconsole /sbin/setconsole /sbin/isserial @@ -304,16 +285,14 @@ %doc %{_mandir}/man1/lastb.1.gz %doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/fsync.1.gz -%ifnarch s390 s390x -%doc %{_mandir}/man8/powerd.8.gz -%doc %{_mandir}/man8/detectups.8.gz -%endif # /usr/include/libblogger.h # /usr/lib/libblogger.a %doc %{_mandir}/man1/mountpoint.1.gz +%doc %{_mandir}/man1/utmpdump.1.gz # %doc %{_mandir}/man8/bootlogd.8.gz %doc %{_mandir}/man8/blogger.8.gz %doc %{_mandir}/man8/blogd.8.gz +%doc %{_mandir}/man8/fstab-decode.8.gz %doc %{_mandir}/man8/showconsole.8.gz %doc %{_mandir}/man8/setconsole.8.gz %doc %{_mandir}/man8/isserial.8.gz @@ -323,6 +302,10 @@ %doc %{_mandir}/man8/killall5.8.gz %doc %{_mandir}/man8/killproc.8.gz %doc %{_mandir}/man8/pidof.8.gz +%ifnarch s390 s390x +%doc %{_mandir}/man8/powerd.8.gz +%doc %{_mandir}/man8/detectups.8.gz +%endif %doc %{_mandir}/man8/startproc.8.gz %doc %{_mandir}/man8/start_daemon.8.gz %doc %{_mandir}/man8/startpar.8.gz ++++++ notify-pam-dead.patch ++++++ --- src/Makefile +++ src/Makefile 2010-04-13 00:00:00.000000000 +0000 @@ -8,7 +8,7 @@ # Version: @(#)Makefile 2.85-13 23-Mar-2004 miquels(a)cistron.nl # -CPPFLAGS = +CPPFLAGS = -DUSE_PAM CFLAGS ?= -ansi -O2 -fomit-frame-pointer override CFLAGS += -W -Wall -D_GNU_SOURCE STATIC = @@ -78,6 +78,13 @@ else endif # Additional libs for GNU libc. +ifneq ($(findstring -DUSE_PAM,$(CPPFLAGS)),) + INITLIBS += -lpam + PAMDOTD = /etc/pam.d + PAMINIT = $(PAMDOTD)/init +endif + +# Additional libs for GNU libc. ifneq ($(wildcard /usr/lib*/libcrypt.a),) SULOGINLIBS += -lcrypt endif @@ -149,6 +156,11 @@ install: for i in $(USRBIN); do \ $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \ done +ifneq ($(findstring -DUSE_PAM,$(CPPFLAGS)),) + $(INSTALL_DIR) $(ROOT)$(PAMDOTD) + test -s $(ROOT)$(PAMINIT) || \ + $(INSTALL_DATA) init.sample $(ROOT)$(PAMINIT) +endif # $(INSTALL_DIR) $(ROOT)/etc/ # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/ ln -sf halt $(ROOT)/sbin/reboot --- src/init.c +++ src/init.c 2010-04-13 00:00:00.000000000 +0000 @@ -79,6 +79,10 @@ #include "reboot.h" #include "set.h" +#ifdef USE_PAM +extern void notify_pam_dead_session(const char *id); +#endif + #ifndef SIGPWR # define SIGPWR SIGUSR2 #endif @@ -1132,6 +1136,9 @@ pid_t spawn(CHILD *ch, int *res) } dup(f); dup(f); +#ifdef USE_PAM + notify_pam_dead_session(ch->id); +#endif } /* @@ -1551,6 +1558,9 @@ void read_inittab(void) INITDBG(L_VB, "Updating utmp for pid %d [id %s]", ch->pid, ch->id); ch->flags &= ~RUNNING; +#ifdef USE_PAM + notify_pam_dead_session(ch->id); +#endif if (ch->process[0] != '+') write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL); } @@ -2012,6 +2022,9 @@ void re_exec(void) if (ch->flags & ZOMBIE) { INITDBG(L_VB, "Child died, PID= %d", ch->pid); ch->flags &= ~(RUNNING|ZOMBIE|WAITING); +#ifdef USE_PAM + notify_pam_dead_session(ch->id); +#endif if (ch->process[0] != '+') write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL); } @@ -2465,6 +2478,9 @@ void process_signals() if (ch->flags & ZOMBIE) { INITDBG(L_VB, "Child died, PID= %d", ch->pid); ch->flags &= ~(RUNNING|ZOMBIE|WAITING); +#ifdef USE_PAM + notify_pam_dead_session(ch->id); +#endif if (ch->process[0] != '+') write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL); } --- src/init.sample +++ src/init.sample 2010-04-13 00:00:00.000000000 +0000 @@ -0,0 +1,9 @@ +#%PAM-1.0 +# +# The PAM configuration file for /sbin/init +# Used for updating the lastlog logging file +# +auth sufficient pam_rootok.so +account include common-account +session include common-session +session requisite pam_lastlog.so silent --- src/utmp.c +++ src/utmp.c 2010-04-13 00:00:00.000000000 +0000 @@ -34,10 +34,18 @@ #include <string.h> #include <utmp.h> +#if defined(USE_PAM) && defined(INIT_MAIN) +# include <security/pam_appl.h> +# include <security/pam_misc.h> +#endif + #include "init.h" #include "initreq.h" #include "paths.h" +#ifndef _PATH_DEV +# define _PATH_DEV "/dev/" +#endif #if defined(__GLIBC__) # if (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0) && defined(__powerpc__) @@ -127,9 +135,9 @@ char *line) /* Which line is this */ strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); strncpy(utmp.ut_id , id , sizeof(utmp.ut_id )); strncpy(utmp.ut_line, line, sizeof(utmp.ut_line)); - - /* Put the OS version in place of the hostname */ - if (uname(&uname_buf) == 0) + + /* Put the OS version in place of the hostname */ + if (uname(&uname_buf) == 0) strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host)); #if HAVE_UPDWTMP @@ -262,3 +270,75 @@ char *line) /* LINE if used. */ write_wtmp(user, id, pid, type, line && line[0] ? line : oldline); } +#if defined(USE_PAM) && defined(INIT_MAIN) +static pam_handle_t *pamh = NULL; +# ifdef __GNUC__ +static int +null_conv(int num_msg, const struct pam_message **msgm, + struct pam_response **response __attribute__((unused)), + void *appdata_ptr __attribute__((unused))) +# else +static int +null_conv(int num_msg, const struct pam_message **msgm, + struct pam_response **response, void *appdata_ptr) +# endif +{ + int i; + for (i = 0; i < num_msg; i++) { + const struct pam_message *msg = msgm[i]; + if (msg == (const struct pam_message*)0) + continue; + if (msg->msg == (char*)0) + continue; + switch (msg->msg_style) { + case PAM_ERROR_MSG: + case PAM_TEXT_INFO: + initlog(L_VB, "pam_message %s", msg->msg); + default: + break; + } + } + return 0; +} +static const struct pam_conv conv = { null_conv, NULL }; +# define PAM_FAIL_CHECK(func, args...) \ + { \ + if ((pam_ret = (func)(args)) != PAM_SUCCESS) { \ + initlog(L_VB, "%s", pam_strerror(pamh, pam_ret)); \ + goto pam_error; \ + } \ + } + +void notify_pam_dead_session(const char *id) +{ + struct utmp *oldut, ut; + + setutent(); + + memset(&ut, 0, sizeof(ut)); + ut.ut_type = DEAD_PROCESS; + strncpy(ut.ut_id, id, sizeof(ut.ut_id)); + + if ((oldut = getutid(&ut)) && (oldut->ut_type == USER_PROCESS)) { + int pam_ret; + char tty[UT_LINESIZE+ strlen(_PATH_DEV) + 1]; + + if (strncmp(oldut->ut_line, _PATH_DEV, strlen(_PATH_DEV))) + snprintf(tty, sizeof(tty), _PATH_DEV "%.*s", + UT_LINESIZE, oldut->ut_line); + else + snprintf(tty, sizeof(tty), "%.*s", + UT_LINESIZE, oldut->ut_line); + + PAM_FAIL_CHECK(pam_start, "init", oldut->ut_user, &conv, &pamh); + PAM_FAIL_CHECK(pam_set_item, pamh, PAM_TTY, tty); + PAM_FAIL_CHECK(pam_set_item, pamh, PAM_RHOST, oldut->ut_host); + PAM_FAIL_CHECK(pam_close_session, pamh, PAM_SILENT); + pam_error: + pam_end(pamh, pam_ret); + } + + endutent(); +} +#endif /* USE_PAM && INIT_MAIN */ + ++++++ sysvinit-2.88dsf-no-kill.patch ++++++ --- src/killall5.c +++ src/killall5.c 2010-03-19 14:29:44.000000000 +0000 @@ -444,6 +444,38 @@ int readarg(FILE *fp, char *buf, int sz) } /* + * Scan the filedescriptors of pid for /dev/fuse + */ +int is_fuse(const char *pid) { + DIR *dir; + char path[256]; + char buf[256]; + struct dirent *d; + ssize_t len; + + /* Open /proc/pid/fd/ */ + snprintf(path, sizeof(path), "/proc/%s/fd", pid); + if ((dir = opendir(path)) != NULL) { + int dfd = dirfd(dir); + /* Walk through the directory. */ + while ((d = readdir(dir)) != NULL) { + if (*d->d_name == '.') + continue; + /* check for /dev/fuse */ + if ((len = readlinkat(dfd, d->d_name, buf, sizeof(buf))) > 0) { + buf[len] = '\0'; + if (strcmp("/dev/fuse", buf) == 0) + return 1; /* Fuse filesystem */ + } + } + closedir(dir); + } + + /* Not a fuse filesystem */ + return 0; +} + +/* * Read the proc filesystem. * CWD must be /proc to avoid problems if / is affected by the killing (ie depend on fuse). */ @@ -458,6 +490,7 @@ int readproc(int do_stat) char buf[PATH_MAX+1]; char *s, *q; unsigned long startcode, endcode; + ssize_t len; int pid, f; /* Open the /proc directory. */ @@ -608,6 +641,26 @@ int readproc(int do_stat) p->nfs = 0; switch (do_stat) { + case NO_STAT: + if ((len = readlink(path, buf, PATH_MAX)) < 0) + break; + buf[len] = '\0'; + + /* Check for uevent handler, mdmon, and for providers + of FUSE filesystems */ + if ((strncmp(buf, "/sbin/udevd", 11) == 0) || + (strncmp(buf, "/sbin/mdmon", 11) == 0) || + (is_fuse(d->d_name))) { + OMIT *restrict optr; + + xmemalign((void*)&optr, sizeof(void*), alignof(OMIT)); + optr->next = omit; + optr->prev = (OMIT*)0; + optr->pid = pid; + omit = optr; + } + + break; case DO_NETFS: if ((p->nfs = check4nfs(path, buf))) break; ++++++ sysvinit-2.88dsf-suse.patch ++++++ --- man/init.8 +++ man/init.8 2010-03-19 14:44:16.000000000 +0000 @@ -261,7 +261,7 @@ It activates the \fIkbrequest\fP action. .SH CONFORMING TO \fBInit\fP is compatible with the System V init. It works closely together with the scripts in the directories -\fI/etc/init.d\fP and \fI/etc/rc{runlevel}.d\fP. +\fI/etc/init.d\fP and \fI/etc/init.d/rc{runlevel}.d\fP. If your system uses this convention, there should be a \fIREADME\fP file in the directory \fI/etc/init.d\fP explaining how these scripts work. .\"}}} @@ -301,6 +301,7 @@ page by Michael Haardt (u31b3hs(a)pool.inf .\"}}} .\"{{{ See also .SH "SEE ALSO" +.BR init.d (7), .BR getty (1), .BR login (1), .BR sh (1), --- man/inittab.5 +++ man/inittab.5 2004-03-12 12:33:05.000000000 +0000 @@ -197,7 +197,7 @@ rc::bootwait:/etc/rc .fi .sp .RE -This inittab file executes \fB/etc/rc\fP during boot and starts gettys +This inittab file executes \fB/etc/rc\fP during boot and starts mingettys on tty1\-tty4. .PP A more elaborate \fBinittab\fP with different runlevels (see the comments @@ -205,23 +205,20 @@ inside): .RS .sp .nf -.ne 19 +.ne 41 # Level to run in id:2:initdefault: # Boot-time system configuration/initialization script. -si::sysinit:/etc/init.d/rcS +si:I:bootwait:/etc/init.d/boot -# What to do in single-user mode. -~:S:wait:/sbin/sulogin - -# /etc/init.d executes the S and K scripts upon change -# of runlevel. -# -# Runlevel 0 is halt. -# Runlevel 1 is single-user. -# Runlevels 2-5 are multi-user. -# Runlevel 6 is reboot. +# Runlevel 0 is System halt (Never use this as initdefault!) +# Runlevel 1 is Single user mode +# Runlevel 2 is Local multiuser without remote network (e.g. NFS) +# Runlevel 3 is Full multiuser with network +# Runlevel 4 is Not used +# Runlevel 5 is Full multiuser with network and xdm +# Runlevel 6 is System reboot (Never use this as initdefault!) l0:0:wait:/etc/init.d/rc 0 l1:1:wait:/etc/init.d/rc 1 @@ -231,17 +228,27 @@ l4:4:wait:/etc/init.d/rc 4 l5:5:wait:/etc/init.d/rc 5 l6:6:wait:/etc/init.d/rc 6 +# What to do in single-user mode +ls:S:wait:/etc/init.d/rc S +~~:S:respawn:/sbin/sulogin + # What to do at the "3 finger salute". -ca::ctrlaltdel:/sbin/shutdown -t1 -h now +ca::ctrlaltdel:/sbin/shutdown -t5 -h now -# Runlevel 2,3: getty on virtual consoles -# Runlevel 3: getty on terminal (ttyS0) and modem (ttyS1) -1:23:respawn:/sbin/getty tty1 VC linux -2:23:respawn:/sbin/getty tty2 VC linux -3:23:respawn:/sbin/getty tty3 VC linux -4:23:respawn:/sbin/getty tty4 VC linux -S0:3:respawn:/sbin/getty -L 9600 ttyS0 vt320 -S1:3:respawn:/sbin/mgetty -x0 -D ttyS1 +# Runlevel 2 upto 5: mingetty on console. +# level 2, 3, and 5 also getty on serial port S0. +1:2345:respawn:/sbin/mingetty --noclear tty1 +2:2345:respawn:/sbin/mingetty tty2 +3:2345:respawn:/sbin/mingetty tty3 +4:2345:respawn:/sbin/mingetty tty4 +5:2345:respawn:/sbin/mingetty tty5 +6:2345:respawn:/sbin/mingetty tty6 +S0:235:respawn:/sbin/agetty -L 9600 ttyS0 vt102 + +# modem getty(s), +# /dev/modem is a link to the modem device. +#mo:235:respawn:/usr/sbin/mgetty -s 38400 modem +mo:235:respawn:/sbin/uugetty modem M19200 .fi .sp @@ -261,5 +268,8 @@ by Michael Haardt (u31b3hs(a)pool.informat .\"{{{ See also .SH "SEE ALSO" .BR init (8), -.BR telinit (8) +.BR telinit (8), +.BR init.d (7), +.BR agetty (8), +.BR mgetty (8) .\"}}} --- man/killall5.8 +++ man/killall5.8 2010-03-19 14:43:25.000000000 +0000 @@ -44,6 +44,7 @@ process were killed, and 1 if it was una .SH SEE ALSO .BR halt (8), .BR reboot (8), -.BR pidof (8) +.BR pidof (8), +.BR killproc (8) .SH AUTHOR Miquel van Smoorenburg, miquels(a)cistron.nl --- man/pidof.8 +++ man/pidof.8 2004-03-12 12:26:35.000000000 +0000 @@ -83,6 +83,7 @@ that the executable name of running proc so symbolic links to executables will also match. .SH SEE ALSO +.BR pidofproc (8), .BR shutdown (8), .BR init (8), .BR halt (8), --- man/sulogin.8 +++ man/sulogin.8 2004-03-12 12:26:35.000000000 +0000 @@ -35,7 +35,7 @@ passes it the \fB\-b\fP option. .PP The user is prompted .IP "" .5i -Give root password for system maintenance +Give root password for system login .br (or type Control\-D for normal startup): .PP ++++++ sysvinit-2.88dsf.dif ++++++ --- src/Makefile +++ src/Makefile 2010-03-23 15:11:12.000000000 +0000 @@ -9,16 +9,16 @@ # CPPFLAGS = -DUSE_PAM -CFLAGS ?= -ansi -O2 -fomit-frame-pointer +CFLAGS ?= $(RPM_OPT_FLAGS) override CFLAGS += -W -Wall -D_GNU_SOURCE STATIC = # For some known distributions we do not build all programs, otherwise we do. BIN = SBIN = init halt shutdown runlevel killall5 fstab-decode -USRBIN = last mesg +USRBIN = last -MAN1 = last.1 lastb.1 mesg.1 +MAN1 = last.1 lastb.1 MAN5 = initscript.5 inittab.5 MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 MAN8 += shutdown.8 telinit.8 fstab-decode.8 @@ -170,7 +170,8 @@ endif ln -sf halt $(ROOT)/sbin/reboot ln -sf halt $(ROOT)/sbin/poweroff ln -sf init $(ROOT)/sbin/telinit - ln -sf /sbin/killall5 $(ROOT)/bin/pidof + ln -sf killall5 $(ROOT)/sbin/pidof + ln -sf ../sbin/killall5 $(ROOT)/bin/pidof if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ ln -sf last $(ROOT)/usr/bin/lastb; \ fi --- src/bootlogd.c +++ src/bootlogd.c 2006-08-18 12:45:28.000000000 +0000 @@ -241,7 +241,7 @@ int isconsole(char *s, char *res, int rl int consolename(char *res, int rlen) { #ifdef TIOCGDEV - unsigned int kdev; + kdev_t kdev; #endif struct stat st, st2; char buf[256]; @@ -555,7 +555,7 @@ int main(int argc, char **argv) } (void)ioctl(0, TIOCCONS, NULL); -#if 1 +#if 0 /* Work around bug in 2.1/2.2 kernels. Fixed in 2.2.13 and 2.3.18 */ if ((n = open("/dev/tty0", O_RDWR)) >= 0) { (void)ioctl(n, TIOCCONS, NULL); ++++++ sysvinit-last-ipv6-heuristic.patch ++++++ diff --git a/trunk/src/last.c b/trunk/src/last.c index 5003c7c..02103e0 100644 --- a/trunk/src/last.c +++ b/trunk/src/last.c @@ -318,30 +318,22 @@ int dns_lookup(char *result, int size, int useip, int32_t *a) struct sockaddr_in6 sin6; struct sockaddr *sa; int salen, flags; - unsigned int topnibble; - unsigned int azero = 0, sitelocal = 0; int mapped = 0; flags = useip ? NI_NUMERICHOST : 0; /* - * IPv4 or IPv6 ? We use 2 heuristics: - * 1. Current IPv6 range uses 2000-3fff or fec0-feff. - * Outside of that is illegal and must be IPv4. - * 2. If last 3 bytes are 0, must be IPv4 - * 3. If IPv6 in IPv4, handle as IPv4 + * IPv4 or IPv6 ? + * 1. If last 3 4bytes are 0, must be IPv4 + * 2. If IPv6 in IPv4, handle as IPv4 + * 3. Anything else is IPv6 * * Ugly. */ if (a[0] == 0 && a[1] == 0 && a[2] == (int32_t)htonl (0xffff)) mapped = 1; - topnibble = ntohl((unsigned int)a[0]) >> 28; - azero = ntohl((unsigned int)a[0]) >> 16; - sitelocal = (azero >= 0xfec0 && azero <= 0xfeff) ? 1 : 0; - - if (((topnibble < 2 || topnibble > 3) && (!sitelocal)) || mapped || - (a[1] == 0 && a[2] == 0 && a[3] == 0)) { + if (mapped || (a[1] == 0 && a[2] == 0 && a[3] == 0)) { /* IPv4 */ sin.sin_family = AF_INET; sin.sin_port = 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 yast2-update for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at Sun Apr 25 18:41:53 CEST 2010. -------- --- yast2-update/yast2-update.changes 2010-04-19 10:54:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2010-04-23 15:19:27.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 15:17:22 CEST 2010 - aschnell(a)suse.de + +- fixed namespace error in rootpart.ycp +- 2.19.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-update-2.19.0.tar.bz2 New: ---- yast2-update-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.S0CDf8/_old 2010-04-25 18:41:45.000000000 +0200 +++ /var/tmp/diff_new_pack.S0CDf8/_new 2010-04-25 18:41:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.19.0) +# spec file for package yast2-update (Version 2.19.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-update -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.19.0.tar.bz2 +Source0: yast2-update-2.19.1.tar.bz2 Prefix: /usr @@ -86,7 +86,7 @@ Use this component if you wish to update your system. %prep -%setup -n yast2-update-2.19.0 +%setup -n yast2-update-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-update-2.19.0.tar.bz2 -> yast2-update-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.19.0/VERSION new/yast2-update-2.19.1/VERSION --- old/yast2-update-2.19.0/VERSION 2010-04-19 10:51:33.000000000 +0200 +++ new/yast2-update-2.19.1/VERSION 2010-04-23 15:17:46.000000000 +0200 @@ -1 +1 @@ -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.19.0/configure new/yast2-update-2.19.1/configure --- old/yast2-update-2.19.0/configure 2010-04-19 14:14:31.000000000 +0200 +++ new/yast2-update-2.19.1/configure 2010-04-23 15:18:09.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-update 2.19.0. +# Generated by GNU Autoconf 2.63 for yast2-update 2.19.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='yast2-update 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='yast2-update 2.19.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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 yast2-update 2.19.0 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.19.0:";; + short | recursive ) echo "Configuration of yast2-update 2.19.1:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.19.0 +yast2-update configure 2.19.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.19.0, which was +It was created by yast2-update $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2419,7 +2419,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -2541,7 +2541,7 @@ -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3485,7 +3485,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.19.0, which was +This file was extended by yast2-update $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3535,7 +3535,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-update config.status 2.19.0 +yast2-update config.status 2.19.1 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/yast2-update-2.19.0/configure.in new/yast2-update-2.19.1/configure.in --- old/yast2-update-2.19.0/configure.in 2010-04-19 14:14:28.000000000 +0200 +++ new/yast2-update-2.19.1/configure.in 2010-04-23 15:18:07.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.19.0, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.19.1, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.19.0/src/include/rootpart.ycp new/yast2-update-2.19.1/src/include/rootpart.ycp --- old/yast2-update-2.19.0/src/include/rootpart.ycp 2009-07-21 16:38:01.000000000 +0200 +++ new/yast2-update-2.19.1/src/include/rootpart.ycp 2010-04-23 15:15:44.000000000 +0200 @@ -20,6 +20,7 @@ import "Report"; import "Update"; import "Installation"; +import "FileSystems"; // Returns boolean whether partition can be // a Linux 'root' file system @@ -30,7 +31,7 @@ } // possible_root_fs contains list of supported FSs - return contains (RootPart::possible_root_fs, partition_fs); + return contains (FileSystems::possible_root_fs, partition_fs); } // flavor is either `update or `boot ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 iputils for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at Sun Apr 25 18:41:32 CEST 2010. -------- --- iputils/iputils.changes 2009-12-22 22:22:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/iputils/iputils.changes 2010-04-23 16:30:46.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 16:16:33 CEST 2010 - ms(a)suse.de + +- ifenslave: fixed detach/attach code of bonds (bnc #595474) +- ifenslave: fixed output of the IP address - in hex: (bnc #595474) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iputils-ss021109-ifenslave-strncpy.diff New: ---- iputils-ifenslave-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.3nrFf7/_old 2010-04-25 18:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3nrFf7/_new 2010-04-25 18:40:53.000000000 +0200 @@ -21,13 +21,14 @@ Name: iputils Summary: IPv4and IPv6 Networking Utilities Version: ss021109 -Release: 293 +Release: 294 License: BSD3c ; GPLv2+ Group: Productivity/Networking/Other Provides: nkitb Obsoletes: nkitb Url: ftp://ftp.tux.org/people/alexey-kuznetsov/ip-routing Source: iputils-%{version}-try.tar.bz2 +Source1: iputils-ifenslave-1.1.0.tar.bz2 Patch: %name-%version.diff Patch1: %name-%version-rdisc-server.patch Patch2: %name-%version-sec-traceroute6-setuid-retvalcheck.diff @@ -47,7 +48,6 @@ Patch16: %name-ss021109-traceroute6-ttab.diff Patch17: %name-%version-open_max.diff Patch18: %name-%version-ping-interrupt.diff -Patch19: %name-%version-ifenslave-strncpy.diff Prefix: %_prefix BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,7 +62,7 @@ Alexey Kuznetsov <kuznet(a)ms2.inr.ac.ru> %prep -%setup -q -n %name +%setup -q -n %name -b1 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -82,7 +82,6 @@ %patch16 %patch17 -p1 %patch18 -%patch19 mkdir linux touch linux/autoconf.h ++++++ iputils-headers.patch ++++++ --- /var/tmp/diff_new_pack.3nrFf7/_old 2010-04-25 18:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3nrFf7/_new 2010-04-25 18:40:53.000000000 +0200 @@ -13,16 +13,6 @@ #include <sys/uio.h> #include <netdb.h> ---- ifenslave.c -+++ ifenslave.c -@@ -140,7 +140,6 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --#include <linux/if.h> - #include <net/if_arp.h> - #include <linux/if_ether.h> - #include <linux/if_bonding.h> --- rarpd.c +++ rarpd.c @@ -24,10 +24,11 @@ ++++++ iputils-ifenslave.patch ++++++ --- /var/tmp/diff_new_pack.3nrFf7/_old 2010-04-25 18:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3nrFf7/_new 2010-04-25 18:40:53.000000000 +0200 @@ -1,13 +1,13 @@ --- ifenslave.c +++ ifenslave.c -@@ -644,8 +644,8 @@ +@@ -520,8 +520,8 @@ static int if_getconfig(char *ifname) if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0) return -1; printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n", -- ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1], -- ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]); -+ ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3], -+ ifr.ifr_addr.sa_data[4], ifr.ifr_addr.sa_data[5]); +- ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1], +- ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]); ++ ifr.ifr_addr.sa_data[2] & 0xff, ifr.ifr_addr.sa_data[3] & 0xff, ++ ifr.ifr_addr.sa_data[4] & 0xff, ifr.ifr_addr.sa_data[5] & 0xff); strcpy(ifr.ifr_name, ifname); if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) ++++++ iputils-ss021109.diff ++++++ ++++ 788 lines (skipped) ++++ between iputils/iputils-ss021109.diff ++++ and /mounts/work_src_done/STABLE/iputils/iputils-ss021109.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 gdb for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package gdb for openSUSE:Factory checked in at Sun Apr 25 18:40:41 CEST 2010. -------- --- gdb/gdb.changes 2010-04-15 15:11:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdb/gdb.changes 2010-04-22 21:14:09.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 22 19:13:48 UTC 2010 - aj(a)suse.de + +- Add upstream change to fix build with -Werror + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gdb-7.1-werror.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdb.spec ++++++ --- /var/tmp/diff_new_pack.WMHRWq/_old 2010-04-25 18:40:09.000000000 +0200 +++ /var/tmp/diff_new_pack.WMHRWq/_new 2010-04-25 18:40:09.000000000 +0200 @@ -24,7 +24,7 @@ # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). Version: 7.1 -Release: 1 +Release: 2 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. @@ -433,6 +433,9 @@ Patch448: gdb-bz578250-avx-10of10.patch Patch449: gdb-bz578250-avx-10of10-ppc.patch +# Upstream patch to fix gcc -Werror +Patch500: gdb-7.1-werror.patch + # Fix readline 5.1 warnings Patch1000: readline-5.1-random.patch Patch1002: gdb-6.6-buildid-locate-rpm-suse.patch @@ -661,6 +664,7 @@ %patch447 -p1 %patch448 -p1 %patch449 -p1 +%patch500 -p0 %patch1000 %patch1002 -p1 ++++++ gdb-7.1-werror.patch ++++++ --- gdb/tui/tui-regs.c 2010-01-01 08:32:07.000000000 +0100 +++ gdb/tui/tui-regs.c 2010-04-20 09:23:59.000000000 +0200 @@ -541,7 +541,12 @@ int i; if (data->highlight) - wstandout (win_info->handle); + /* We ignore the return value, casting it to void in order to avoid + a compiler warning. The warning itself was introduced by a patch + to ncurses 5.7 dated 2009-08-29, changing this macro to expand + to code that causes the compiler to generate an unused-value + warning. */ + (void) wstandout (win_info->handle); wmove (win_info->handle, 0, 0); for (i = 1; i < win_info->width; i++) @@ -551,7 +556,12 @@ waddstr (win_info->handle, data->content); if (data->highlight) - wstandend (win_info->handle); + /* We ignore the return value, casting it to void in order to avoid + a compiler warning. The warning itself was introduced by a patch + to ncurses 5.7 dated 2009-08-29, changing this macro to expand + to code that causes the compiler to generate an unused-value + warning. */ + (void) wstandend (win_info->handle); tui_refresh_win (win_info); } } --- gdb/tui/tui-stack.c 2010-01-01 08:32:07.000000000 +0100 +++ gdb/tui/tui-stack.c 2010-04-20 09:23:59.000000000 +0200 @@ -256,10 +256,15 @@ string = tui_make_status_line (&element->which_element.locator); wmove (locator->handle, 0, 0); - wstandout (locator->handle); + /* We ignore the return value from wstandout and wstandend, casting + them to void in order to avoid a compiler warning. The warning + itself was introduced by a patch to ncurses 5.7 dated 2009-08-29, + changing these macro to expand to code that causes the compiler + to generate an unused-value warning. */ + (void) wstandout (locator->handle); waddstr (locator->handle, string); wclrtoeol (locator->handle); - wstandend (locator->handle); + (void) wstandend (locator->handle); tui_refresh_win (locator); wmove (locator->handle, 0, 0); xfree (string); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 m17n-lib for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package m17n-lib for openSUSE:Factory checked in at Sun Apr 25 18:39:54 CEST 2010. -------- --- m17n-lib/m17n-lib.changes 2008-10-27 16:10:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/m17n-lib/m17n-lib.changes 2010-04-22 17:41:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 22 17:38:25 CEST 2010 - tiwai(a)suse.de + +- updated to version 1.6.0: + requires the new libotf; plugin locations changed + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- m17n-lib-1.5.1.diff m17n-lib-1.5.3.tar.bz2 New: ---- m17n-lib-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m17n-lib.spec ++++++ --- /var/tmp/diff_new_pack.8yNOjY/_old 2010-04-25 18:39:44.000000000 +0200 +++ /var/tmp/diff_new_pack.8yNOjY/_new 2010-04-25 18:39:44.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package m17n-lib (Version 1.5.3) +# spec file for package m17n-lib (Version 1.6.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,10 @@ Name: m17n-lib BuildRequires: anthy-devel freetype2-devel fribidi-devel gd-devel ispell ispell-british libotf-devel libxml2 m17n-db pkgconfig wordcut-devel xorg-x11-devel -%if "%(xft-config --prefix)" == "/usr" %define appdefdir /usr/share/X11 -%else -%define appdefdir /usr/X11R6/lib/X11 -%endif -Version: 1.5.3 +Version: 1.6.0 Release: 1 -License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +License: GPLv2+ ; LGPLv2.1+ ; MIT Group: System/I18n/Japanese AutoReqProv: on Requires: m17n-db @@ -37,7 +33,6 @@ # cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-db Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-%{version}.tar.bz2 Source1: m17n-lib-rpmlintrc -Patch: m17n-lib-1.5.1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Multilingual Text Processing Library for the C Language @@ -54,7 +49,7 @@ Satoru Tomura <tomura(a)m17n.org> %package devel -License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +License: GPLv2+ ; LGPLv2.1+ ; MIT Summary: Multilingual text processing library for the C language Group: Development/Libraries/Other Requires: %{name} = %{version} glibc-devel xorg-x11-libX11-devel @@ -72,12 +67,11 @@ Satoru Tomura <tomura(a)m17n.org> %prep -%setup -q -n %{name}-%{version} -%patch +%setup -q #find . -name CVS -type d | xargs rm -rf %build -export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" +export SUSE_ASNEEDED=0 %configure --disable-static --with-pic %{__make} @@ -100,6 +94,7 @@ > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.SJIS/app-defaults/M17NEdit iconv -f EUC-JP -t UTF-8 < example/M17NEdit.ja \ > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit +rm -f %{buildroot}%{_libdir}/m17n/*/*.la rm -f %{buildroot}%{_libdir}/*.la %clean @@ -113,6 +108,7 @@ %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog %{_libdir}/lib*.so.* +%{_libdir}/m17n %{_bindir}/* %dir %{appdefdir}/?? %dir %{appdefdir}/??_* @@ -121,8 +117,8 @@ %files devel %defattr(-, root, root) +%{_includedir}/* %{_libdir}/lib*.so -/usr/include/* %{_libdir}/pkgconfig/*.pc %changelog ++++++ m17n-lib-1.5.3.tar.bz2 -> m17n-lib-1.6.0.tar.bz2 ++++++ ++++ 82350 lines of diff (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 libotf for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package libotf for openSUSE:Factory checked in at Sun Apr 25 18:39:50 CEST 2010. -------- --- libotf/libotf.changes 2009-12-17 20:48:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/libotf/libotf.changes 2010-04-22 17:17:51.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 22 17:11:06 CEST 2010 - tiwai(a)suse.de + +- updated to version 0.9.11: + * New OTF_* functions required for m17n-lib 1.6.0. + * Bug fixes +- Split libotf0 sub-package to follow shlib policy + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libotf-0.9.7.tar.bz2 New: ---- libotf-0.9.11.tar.bz2 libotf-warning-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libotf.spec ++++++ --- /var/tmp/diff_new_pack.dIFbvm/_old 2010-04-25 18:39:39.000000000 +0200 +++ /var/tmp/diff_new_pack.dIFbvm/_new 2010-04-25 18:39:39.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libotf (Version 0.9.7) +# spec file for package libotf (Version 0.9.11) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,8 +20,8 @@ Name: libotf BuildRequires: freetype2-devel xorg-x11-devel -Version: 0.9.7 -Release: 4 +Version: 0.9.11 +Release: 1 License: LGPLv2.1+ Group: System/I18n/Japanese AutoReqProv: on @@ -31,17 +31,20 @@ # cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co libotf Source0: http://www.m17n.org/libotf/libotf-%{version}.tar.bz2 Source1: baselibs.conf +Patch: libotf-warning-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Library for Handling OpenType Fonts %description Library for handling OpenType fonts. +%package -n libotf0 +License: LGPLv2.1+ +Summary: Shared library for libotf +Group: System/I18n/Japanese - -Authors: --------- - Kenichi Handa <handa(a)m17n.org> +%description -n libotf0 +Library for handling OpenType fonts. %package devel License: LGPLv2.1+ @@ -53,14 +56,9 @@ This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Kenichi Handa <handa(a)m17n.org> - %prep %setup -q +%patch -p1 %build ./autogen.sh @@ -75,14 +73,17 @@ %clean rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post -n libotf0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libotf0 -p /sbin/ldconfig %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog %{_bindir}/* + +%files -n libotf0 +%defattr(-, root, root) %{_libdir}/libotf.so.* %files devel ++++++ libotf-0.9.7.tar.bz2 -> libotf-0.9.11.tar.bz2 ++++++ ++++ 65655 lines of diff (skipped) ++++++ libotf-warning-fixes.diff ++++++ --- src/otfdrive.c | 1 + 1 file changed, 1 insertion(+) --- a/src/otfdrive.c +++ b/src/otfdrive.c @@ -1664,6 +1664,7 @@ else gstring->glyphs[i].glyph_id = lookupper (c, &enc->subtable); } + return 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 m17n-db for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package m17n-db for openSUSE:Factory checked in at Sun Apr 25 18:39:33 CEST 2010. -------- --- m17n-db/m17n-db.changes 2009-12-18 00:40:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/m17n-db/m17n-db.changes 2010-04-22 17:45:15.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 22 17:43:33 CEST 2010 - tiwai(a)suse.de + +- updated to version 1.6.1: + * corresponding to m17n-lib-1.6.0, a few bug fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- m17n-db-1.5.3.tar.bz2 New: ---- m17n-db-1.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m17n-db.spec ++++++ --- /var/tmp/diff_new_pack.2JnjdZ/_old 2010-04-25 18:39:22.000000000 +0200 +++ /var/tmp/diff_new_pack.2JnjdZ/_new 2010-04-25 18:39:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package m17n-db (Version 1.5.3) +# spec file for package m17n-db (Version 1.6.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ Name: m17n-db BuildRequires: glibc-i18ndata -Version: 1.5.3 -Release: 2 +Version: 1.6.1 +Release: 1 License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware ; MIT Group: System/I18n/Japanese AutoReqProv: on ++++++ m17n-db-1.5.3.tar.bz2 -> m17n-db-1.6.1.tar.bz2 ++++++ ++++ 33970 lines of diff (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 libapr1 for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at Sun Apr 25 18:39:26 CEST 2010. -------- --- libapr1/libapr1.changes 2009-12-15 12:26:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/libapr1/libapr1.changes 2010-04-24 23:01:38.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 24 21:01:24 UTC 2010 - coolo(a)novell.com + +- buildrequire pkg-config to fix provides + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr1.spec ++++++ --- /var/tmp/diff_new_pack.kdDgEh/_old 2010-04-25 18:39:20.000000000 +0200 +++ /var/tmp/diff_new_pack.kdDgEh/_new 2010-04-25 18:39:20.000000000 +0200 @@ -19,7 +19,7 @@ Name: libapr1 %if %{?suse_version:1}0 -BuildRequires: doxygen +BuildRequires: doxygen pkg-config %endif Url: http://apr.apache.org/ License: Other uncritical OpenSource License ; Apache Software License .. @@ -34,7 +34,7 @@ %endif # Version: 1.3.8 -Release: 2 +Release: 3 Summary: Apache Portable Runtime (APR) Library Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2: baselibs.conf @@ -58,12 +58,6 @@ The APR is used by both Open Source and Commercial projects, prominent examples being the Apache HTTP server. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %package devel License: Other uncritical OpenSource License ; Apache Software License .. Summary: Apache Portable Runtime (APR) Library @@ -92,12 +86,6 @@ The APR is used by both Open Source and Commercial projects, prominent examples being the Apache HTTP server. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %prep %setup -n apr-%{version} %patch1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Sun Apr 25 18:39:08 CEST 2010. -------- --- yast2-packager/yast2-packager.changes 2010-04-19 09:31:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2010-04-22 14:14:37.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 22 12:08:38 UTC 2010 - lslezak(a)suse.cz + +- properly format installation URL when installing from ISO + located at a SMB share (bnc#571648) +- 2.19.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.19.5.tar.bz2 New: ---- yast2-packager-2.19.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.9ShF6H/_old 2010-04-25 18:39:03.000000000 +0200 +++ /var/tmp/diff_new_pack.9ShF6H/_new 2010-04-25 18:39:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.19.5) +# spec file for package yast2-packager (Version 2.19.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.19.5 +Version: 2.19.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.19.5.tar.bz2 +Source0: yast2-packager-2.19.6.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.19.5 +%setup -n yast2-packager-2.19.6 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.19.5.tar.bz2 -> yast2-packager-2.19.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.5/VERSION new/yast2-packager-2.19.6/VERSION --- old/yast2-packager-2.19.5/VERSION 2010-04-19 09:28:22.000000000 +0200 +++ new/yast2-packager-2.19.6/VERSION 2010-04-22 14:11:15.000000000 +0200 @@ -1 +1 @@ -2.19.5 +2.19.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.5/configure new/yast2-packager-2.19.6/configure --- old/yast2-packager-2.19.5/configure 2010-04-12 14:43:02.000000000 +0200 +++ new/yast2-packager-2.19.6/configure 2010-04-22 14:14:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for yast2-packager 2.19.4. +# Generated by GNU Autoconf 2.65 for yast2-packager 2.19.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.19.4' -PACKAGE_STRING='yast2-packager 2.19.4' +PACKAGE_VERSION='2.19.6' +PACKAGE_STRING='yast2-packager 2.19.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1220,7 +1220,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 yast2-packager 2.19.4 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.19.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1291,7 +1291,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.19.4:";; + short | recursive ) echo "Configuration of yast2-packager 2.19.6:";; esac cat <<\_ACEOF @@ -1371,7 +1371,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.19.4 +yast2-packager configure 2.19.6 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1388,7 +1388,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.19.4, which was +It was created by yast2-packager $as_me 2.19.6, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2311,7 +2311,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.19.4' + VERSION='2.19.6' cat >>confdefs.h <<_ACEOF @@ -2433,7 +2433,7 @@ -VERSION="2.19.4" +VERSION="2.19.6" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3351,7 +3351,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.19.4, which was +This file was extended by yast2-packager $as_me 2.19.6, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3404,7 +3404,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.19.4 +yast2-packager config.status 2.19.6 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.5/configure.in new/yast2-packager-2.19.6/configure.in --- old/yast2-packager-2.19.5/configure.in 2010-04-12 14:42:58.000000000 +0200 +++ new/yast2-packager-2.19.6/configure.in 2010-04-22 14:13:55.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.19.4, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.19.6, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.4" +VERSION="2.19.6" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.5/src/modules/InstURL.ycp new/yast2-packager-2.19.6/src/modules/InstURL.ycp --- old/yast2-packager-2.19.5/src/modules/InstURL.ycp 2010-04-12 14:42:53.000000000 +0200 +++ new/yast2-packager-2.19.6/src/modules/InstURL.ycp 2010-04-22 14:13:51.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Convert /etc/install.inf data to URL * * - * $Id: InstURL.ycp 61670 2010-04-12 12:42:53Z lslezak $ + * $Id: InstURL.ycp 61822 2010-04-22 12:13:51Z lslezak $ */ { @@ -299,7 +299,12 @@ { // FIXME don't know why it is needed // Needed as a seperator between URL and options (!) - url_tokens["path"] = "/"; + // bnc#571648 - smb installation source: linuxrc path failed for YaST repositories + if (instmode == "smb" && (share != nil) && (share != "")) { + url_tokens["path"] = share + "/"; + } else { + url_tokens["path"] = "/"; + } } string port = Linuxrc::InstallInf("Port"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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