August 2006 - openSUSE Commits - openSUSE Mailing Lists

commit wl-xemacs
by root＠suse.de 31 Aug '06

31 Aug '06

Hello community, here is the log from the commit of package wl-xemacs checked in at Fri Sep 1 01:19:08 CEST 2006. -------- --- wl-xemacs/wl-xemacs.changes 2006-03-20 15:08:44.000000000 +0100 +++ wl-xemacs/wl-xemacs.changes 2006-08-31 15:55:21.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 31 15:54:36 CEST 2006 - mfabian(a)suse.de + +- convert all texinfo files to UTF-8 to get the .info files + created in UTF-8 encoding (texi2utf8 script copied from + xemacs-packages source directory). + +------------------------------------------------------------------- New: ---- info-utf8.patch texi2utf8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wl-xemacs.spec ++++++ --- /var/tmp/diff_new_pack.OQJ3oU/_old 2006-09-01 01:18:37.000000000 +0200 +++ /var/tmp/diff_new_pack.OQJ3oU/_new 2006-09-01 01:18:37.000000000 +0200 @@ -19,11 +19,13 @@ Requires: xemacs, flim-xemacs, semi-xemacs, apel-xemacs Autoreqprov: on Version: 2.12.0 -Release: 11 +Release: 19 URL: http://www.gohome.org/wl/ # original source is gzipped. Source0: ftp://ftp.gohome.org/wl/stable/wl-2.12.0.tar.bz2 +Source1: texi2utf8 Patch: wl-2.12.0.dif +Patch1: info-utf8.patch Summary: Wanderlust, Yet Another Message Interface On Emacsen BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -49,6 +51,10 @@ %prep %setup -q -n wl-%{version} %patch +%patch1 -p1 +rm *.orig +chmod 755 $RPM_SOURCE_DIR/texi2utf8 +$RPM_SOURCE_DIR/texi2utf8 make EMACS=xemacs check %build @@ -88,6 +94,10 @@ %{xemacs_package_dir}/etc/* %changelog -n wl-xemacs +* Thu Aug 31 2006 - mfabian(a)suse.de +- convert all texinfo files to UTF-8 to get the .info files + created in UTF-8 encoding (texi2utf8 script copied from + xemacs-packages source directory). * Mon Mar 20 2006 - mfabian(a)suse.de - Bugzilla #159494: generate auto-autoloads.el correctly. * Wed Jan 25 2006 - mls(a)suse.de ++++++ info-utf8.patch ++++++ diff -ru wl-2.12.0.orig/WL-MK wl-2.12.0/WL-MK --- wl-2.12.0.orig/WL-MK 2004-12-24 00:20:55.000000000 +0100 +++ wl-2.12.0/WL-MK 2006-08-31 17:39:56.000000000 +0200 @@ -394,7 +394,7 @@ (texinfo-format-buffer t) ;; Emacs20.2's default is 'raw-text-unix. (and (fboundp 'set-buffer-file-coding-system) - (set-buffer-file-coding-system wl-cs-local)) + (set-buffer-file-coding-system 'utf-8)) (save-buffer) (kill-buffer (current-buffer)) ;; info (kill-buffer obuf)) ;; texi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base
by root＠suse.de 31 Aug '06

31 Aug '06

Hello community, here is the log from the commit of package aaa_base checked in at Fri Sep 1 01:18:49 CEST 2006. -------- --- aaa_base/aaa_base.changes 2006-08-29 17:13:07.000000000 +0200 +++ aaa_base/aaa_base.changes 2006-08-31 21:56:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 31 21:55:18 CEST 2006 - sndirsch(a)suse.de + +- moved xdm init script and displaymanger sysconfig to xorg-x11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.8BvAik/_old 2006-09-01 01:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.8BvAik/_new 2006-09-01 01:17:38.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.2 -Release: 6 +Release: 7 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -88,9 +88,6 @@ # reset mail level sed -i -e "s/^MAIL_LEVEL=.*/MAIL_LEVEL=\"warn\"/" \ $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.suseconfig - # require root password for shutdown - #sed -i -e "s/^DISPLAYMANAGER_SHUTDOWN=.*/DISPLAYMANAGER_SHUTDOWN=\"root\"/" \ - # $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager %endif # ## do SLES specific settings END @@ -148,6 +145,8 @@ %defattr(-,root,root) %changelog -n aaa_base +* Thu Aug 31 2006 - sndirsch(a)suse.de +- moved xdm init script and displaymanger sysconfig to xorg-x11 * Tue Aug 29 2006 - ro(a)suse.de - removed ash from requires (old for mkinitrd) (#202074) - added net-tools to requires (for boot.localnet) (#202078) ++++++ aaa_base.post ++++++ --- aaa_base/aaa_base.post 2006-08-07 14:46:14.000000000 +0200 +++ aaa_base/aaa_base.post 2006-08-31 21:46:05.000000000 +0200 @@ -89,7 +89,7 @@ # # Initialize runlevel links # -%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single xdm nfs} +%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single nfs} %{fillup_and_insserv -psy boot.crypto START_CRYPTO_FILESYSTEMS} %{insserv_force_if_yast etc/init.d/boot.loadmodules etc/init.d/boot.cleanup etc/init.d/boot.rootfsck} ## powerfail probably needs empty header ... @@ -109,7 +109,6 @@ fi %{remove_and_set -n security CONSOLE_SHUTDOWN} %{remove_and_set -n suseconfig CHECK_INITTAB} -%{remove_and_set -n displaymanager KDM_SHUTDOWN} %{remove_and_set -n suseconfig HALT_SOUND} if ! [ -d etc/sysconfig ] ; then @@ -119,20 +118,11 @@ if [ ! -f etc/sysconfig/language -a -f etc/rc.config.d/lang.rc.config ] ; then mv etc/rc.config.d/lang.rc.config etc/sysconfig/language fi -for i in language backup boot displaymanager kernel \ +for i in language backup boot kernel \ suseconfig clock proxy windowmanager sysctl mail \ cron news shutdown ; do %{fillup_only -n $i} done -# migrate KDM_SHUTDOWN value if set before -if [ -n "$KDM_SHUTDOWN" -a "$KDM_SHUTDOWN" != "no" ] ; then - if [ "$KDM_SHUTDOWN" = "local" ] ; then - KDM_SHUTDOWN=all - fi - sed -e "s|^DISPLAYMANAGER_SHUTDOWN=.*|DISPLAYMANAGER_SHUTDOWN=\"$KDM_SHUTDOWN\"|" \ - etc/sysconfig/displaymanager > etc/sysconfig/displaymanager.new \ - && mv etc/sysconfig/displaymanager.new etc/sysconfig/displaymanager -fi # migrate HALT_SOUND value if set before if [ -n "$HALT_SOUND" -a "$HALT_SOUND" != "no" ] ; then sed -e "s|^HALT_SOUND=.*|HALT_SOUND=\"$HALT_SOUND\"|" \ ++++++ aaa_base.specialfilelist ++++++ --- aaa_base/aaa_base.specialfilelist 2005-09-01 15:20:14.000000000 +0200 +++ aaa_base/aaa_base.specialfilelist 2006-08-31 21:43:35.000000000 +0200 @@ -33,7 +33,6 @@ %config /etc/init.d/routed %config /etc/init.d/serial %config /etc/init.d/single -%config /etc/init.d/xdm %config /sbin/quick_halt %ghost /var/adm/fillup-templates/passwd.aaa_base %ghost /var/adm/fillup-templates/group.aaa_base ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/xdm new/aaa_base/etc/init.d/xdm --- old/aaa_base/etc/init.d/xdm 2006-08-19 11:46:55.000000000 +0200 +++ new/aaa_base/etc/init.d/xdm 1970-01-01 01:00:00.000000000 +0100 @@ -1,184 +0,0 @@ -#! /bin/bash -# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. -# All rights reserved. -# -# Author: Florian La Roche, 1996 -# Werner Fink <werner(a)suse.de>, 1996,98,99 -# Martin Scherbaum, 1997 -# Reinhard Max <max(a)suse.de>, 1997 -# -# Please send feedback to http://www.suse.de/feedback -# -# /etc/init.d/xdm -# -### BEGIN INIT INFO -# Provides: xdm -# Required-Start: $remote_fs -# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlykdm -# Required-Stop: -# Default-Start: 5 -# Default-Stop: -# Description: X Display Manager -### END INIT INFO - -. /etc/rc.status -. /etc/sysconfig/displaymanager -. /etc/sysconfig/language -. /etc/sysconfig/windowmanager -test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile -test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh - -locale_vars=" \ -LANG \ -LC_CTYPE \ -LC_NUMERIC \ -LC_TIME \ -LC_COLLATE \ -LC_MONETARY \ -LC_MESSAGES \ -LC_PAPER \ -LC_NAME \ -LC_ADDRESS \ -LC_TELEPHONE \ -LC_MEASUREMENT \ -LC_IDENTIFICATION \ -LC_ALL" - -unset LC_ALL -for lc in $locale_vars -do - eval val="\$RC_$lc" - if test -n "$val"; then - eval $lc="\$RC_$lc" - export $lc - fi -done -unset lc val - -test -z "$DEFAULT_WM" && DEFAULT_WM=twm -SAVEPATH=$PATH -PATH=$PATH:/usr/X11R6/bin:/opt/gnome/bin:/usr/openwin/bin -WINDOWMANAGER="`type -p ${DEFAULT_WM##*/}`" -PATH=$SAVEPATH -export WINDOWMANAGER -unset DEFAULT_WM SAVEPATH - -PIDFILE="/var/run/xdm.pid" -KDEROOTHOME=/root/.kdm -export KDEROOTHOME -XDMDIR=/etc/X11/xdm -if [ -x /usr/bin/xdm ]; then - XDM_BIN=/usr/bin/xdm -else - XDM_BIN=/usr/X11R6/bin/xdm -fi - - -case "${DISPLAYMANAGER##*/}" in - kdm|kde|KDM|KDE) DISPLAYMANAGER=/opt/kde3/bin/kdm - PIDFILE="/var/run/kdm.pid" - ;; - xdm) DISPLAYMANAGER=$XDM_BIN - ;; - gdm|GDM|Gnome|GNOME) DISPLAYMANAGER=/opt/gnome/sbin/gdm - PIDFILE="/var/run/gdm.pid" - ;; - wdm|WDM) DISPLAYMANAGER=/usr/X11R6/bin/wdm - ;; - console) exit 0 - ;; - *) DISPLAYMANAGER=$XDM_BIN - if test -x /opt/kde3/bin/kdm; then - DISPLAYMANAGER=/opt/kde3/bin/kdm - PIDFILE="/var/run/kdm.pid" - fi - ;; -esac -test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN - -DM=${DISPLAYMANAGER##*/} - -rc_reset -case "$1" in - start) - # Avoid duplicated messages when earlykdm is in use - if test "$DISPLAYMANAGER" = /opt/kde3/bin/kdm && \ - test -s /var/run/kdm.pid && \ - /sbin/checkproc -p /var/run/kdm.pid /opt/kde3/bin/kdm; then - rc_exit 0 - fi - - test -x /etc/X11/xdm/SuSEconfig.xdm && /etc/X11/xdm/SuSEconfig.xdm - - echo -n "Starting service $DM" - # Don't start xdm if no Xserver is configured and xdm is not - # configured for remote access - if [ ! -x /usr/bin/X -a ! -x /usr/X11R6/bin/X -a \ - "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ]; then - rc_status -u - rc_exit - fi - if [ "$DISPLAYMANAGER" = "/opt/gnome/sbin/gdm" -a \ - "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" -a \ - "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then - XDMOPTIONS="--no-console" - fi - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed - # After a crash or a kill signal we may have - # a wrong owner ship of /dev/xconsole - if rc_status ; then - if test -x $XDMDIR/TakeDevices ; then - $XDMDIR/TakeDevices - else - chown root:tty /dev/xconsole /dev/tty0 - chmod 622 /dev/xconsole /dev/tty0 - fi - fi - rc_status -v - ;; - stop) - echo -n "Shutting down service $DM" - # - # killproc(8) sleep upto five seconds and sends - # SIGKILL if xdm does not terminate within - # - killproc -p $PIDFILE -TERM $DISPLAYMANAGER - rc_status -v - ;; - restart) - $0 stop - $0 start - rc_status - ;; - reload|force-reload) - test -x /etc/X11/xdm/SuSEconfig.xdm && /etc/X11/xdm/SuSEconfig.xdm - echo -n "Reload service $DM" - killproc -p $PIDFILE -HUP $DISPLAYMANAGER - rc_status -v - ;; - status|check) - echo -n "Checking for service ${DM}: " - checkproc -p $PIDFILE $DISPLAYMANAGER - rc_status -v - ;; - probe) - if test $XDMDIR/xdm-config -nt $PIDFILE -o \ - $XDMDIR/Xservers -nt $PIDFILE - then - echo reload - fi - ;; - try-restart|condrestart) - $0 status - if test $? = 0; then - $0 restart - else - rc_reset - fi - rc_status - ;; - *) - echo "Usage: $0 {start|stop|status|restart|reload|force-reload|probe|try-restart}" - exit 1 -esac -rc_exit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/usr/sbin/rcxdm new/aaa_base/usr/sbin/rcxdm --- old/aaa_base/usr/sbin/rcxdm 2006-09-01 01:17:38.000000000 +0200 +++ new/aaa_base/usr/sbin/rcxdm 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to /etc/init.d/xdm ++++++ arch_special.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arch_special/s390/sysconfig-displaymanager.diff new/arch_special/s390/sysconfig-displaymanager.diff --- old/arch_special/s390/sysconfig-displaymanager.diff 2004-04-28 20:01:04.000000000 +0200 +++ new/arch_special/s390/sysconfig-displaymanager.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ ---- var/adm/fillup-templates/sysconfig.displaymanager -+++ var/adm/fillup-templates/sysconfig.displaymanager -@@ -18,1 +18,1 @@ --DISPLAYMANAGER_REMOTE_ACCESS="no" -+DISPLAYMANAGER_REMOTE_ACCESS="yes" -@@ -34,1 +34,1 @@ --DISPLAYMANAGER_STARTS_XSERVER="yes" -+DISPLAYMANAGER_STARTS_XSERVER="no" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arch_special/s390x/sysconfig-displaymanager.diff new/arch_special/s390x/sysconfig-displaymanager.diff --- old/arch_special/s390x/sysconfig-displaymanager.diff 2006-09-01 01:17:39.000000000 +0200 +++ new/arch_special/s390x/sysconfig-displaymanager.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to ../s390/sysconfig-displaymanager.diff ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.displaymanager new/sysconfig_parts/sysconfig.displaymanager --- old/sysconfig_parts/sysconfig.displaymanager 2006-05-10 10:50:53.000000000 +0200 +++ new/sysconfig_parts/sysconfig.displaymanager 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -## Path: Desktop/Display manager -## Description: settings to generate a proper displaymanager config -## Config: xdm,kdm,gdm - -## Type: string(kdm,xdm,gdm,wdm,console) -## Default: "" -# -# Here you can set the default Display manager (kdm/xdm/gdm/wdm/console). -# all changes in this file require a restart of the displaymanager -# -DISPLAYMANAGER="" - -## Type: yesno -## Default: no -# -# Allow remote access (XDMCP) to your display manager (xdm/kdm/gdm). Please note -# that a modified kdm or xdm configuration, e.g. by KDE control center -# will not be changed. For gdm, values will be updated after change. -# XDMCP service should run only on trusted networks and you have to disable -# firewall for interfaces, where you want to provide this service. -# -DISPLAYMANAGER_REMOTE_ACCESS="no" - -## Type: yesno -## Default: no -# -# Allow remote access of the user root to your display manager. Note -# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and -# System/Security/Permissions/PERMISSION_SECURITY is "paranoid" -# -DISPLAYMANAGER_ROOT_LOGIN_REMOTE="no" - -## Type: yesno -## Default: yes -# -# Let the displaymanager start a local Xserver. -# Set to "no" for remote-access only. -# Set to "no" on architectures without any Xserver (e.g. s390/s390x). -# -DISPLAYMANAGER_STARTS_XSERVER="yes" - -## Type: yesno -## Default: no -# -# TCP port 6000 of Xserver. When set to "no" (default) Xserver is -# started with "-nolisten tcp". Only set this to "yes" if you really -# need to. Remote X service should run only on trusted networks and -# you have to disable firewall for interfaces, where you want to -# provide this service. Use ssh X11 port forwarding whenever possible. -# -DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN="no" - -## Type: string -## Default: -# -# Define the user whom should get logged in without request. If string -# is empty, display standard login dialog. -# -DISPLAYMANAGER_AUTOLOGIN="" - -## Type: yesno -## Default: no -# -# Allow all users to login without password, but ask for the user, if -# DISPLAYMANAGER_AUTOLOGIN is empty. -# -DISPLAYMANAGER_PASSWORD_LESS_LOGIN="no" - -## Type: yesno -## Default: no -# -# Display a combobox for Active Directory domains. -# -DISPLAYMANAGER_AD_INTEGRATION="no" - -## Type: list(root,all,none,auto) -## Default: auto -# -# Determine who will be able to shutdown or reboot the system in kdm -# and gdm. Valid values are: "root" (only root can shutdown), "all" -# (everybody can shutdown), "none" (nobody can shutdown from -# displaymanager), "auto" (follow -# System/Security/Permissions/PERMISSION_SECURITY to decide: "easy -# local" is equal to "all", everything else is equal to "root"). Note -# that remote user can never shutdown in GDM. -# -DISPLAYMANAGER_SHUTDOWN="auto" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghostscript-cjk
by root＠suse.de 31 Aug '06

31 Aug '06

Hello community, here is the log from the commit of package ghostscript-cjk checked in at Fri Sep 1 01:17:01 CEST 2006. -------- --- ghostscript-cjk/ghostscript-cjk.changes 2006-02-28 18:57:28.000000000 +0100 +++ ghostscript-cjk/ghostscript-cjk.changes 2006-08-31 18:43:25.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 31 18:42:51 CEST 2006 - mfabian(a)suse.de + +- adapt paths in cidfont-x11-config to X11R7 (fonts are now in + /usr/share/fonts/). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-cjk.spec ++++++ --- /var/tmp/diff_new_pack.UUdzz6/_old 2006-09-01 01:16:17.000000000 +0200 +++ /var/tmp/diff_new_pack.UUdzz6/_new 2006-09-01 01:16:17.000000000 +0200 @@ -16,7 +16,7 @@ Autoreqprov: on Provides: locale(ghostscript-library:ja;ko;zh) Version: 20050315 -Release: 12 +Release: 22 Requires: ghostscript-library >= 8.15, ft2demos Obsoletes: CMap-Adobe-Identity,CMap-Adobe-Japan2,CMap-Adobe-Korea1,CMap-Adobe-GB1,CMap-Adobe-CNS1,CMap-Adobe-Japan1 URL: http://www.gyve.org/gs-cjk/ @@ -94,6 +94,9 @@ %{_mandir}/*/* %changelog -n ghostscript-cjk +* Thu Aug 31 2006 - mfabian(a)suse.de +- adapt paths in cidfont-x11-config to X11R7 (fonts are now in + /usr/share/fonts/). * Tue Feb 28 2006 - mfabian(a)suse.de - add "Provides: locale(ghostscript-library:ja;ko;zh)". * Wed Jan 25 2006 - mls(a)suse.de ++++++ cidfont-x11-config ++++++ --- ghostscript-cjk/cidfont-x11-config 2006-02-28 18:57:27.000000000 +0100 +++ ghostscript-cjk/cidfont-x11-config 2006-08-31 18:30:04.000000000 +0200 @@ -17,9 +17,9 @@ Searches for CID keyed fonts in I</usr/share/ghostscript/Resource/CIDFont> and configures them for use with X11 by creating some sub-directories, -files and symbolic links in I</usr/X11R6/lib/X11/fonts/CID>. It also automatically -generates I</usr/X11R6/lib/X11/fonts/CID/fonts.scale.auto> which is -then merged into I</usr/X11R6/lib/X11/fonts/CID/fonts.scale> by SuSEconfig. +files and symbolic links in I</usr/share/fonts/CID>. It also automatically +generates I</usr/share/fonts/CID/fonts.scale.auto> which is +then merged into I</usr/share/fonts/CID/fonts.scale> by SuSEconfig. =head1 OPTIONS @@ -33,11 +33,11 @@ Force the update of the generated files even if all directories in I</usr/share/ghostscript/Resource/> have the same time stamp -as I</usr/X11R6/lib/X11/fonts/CID/fonts.scale.auto>. +as I</usr/share/fonts/CID/fonts.scale.auto>. When this script is finished, it gives all directories in I</usr/share/ghostscript/Resource/> the same timestamp as -I</usr/X11R6/lib/X11/fonts/CID/fonts.scale.auto> in order to avoid +I</usr/share/fonts/CID/fonts.scale.auto> in order to avoid wasting time doing useless updates when nothing has changed below I</usr/share/ghostscript/Resource/> anyway. @@ -79,9 +79,15 @@ exit 1; } -$x11_cid_dir = "/usr/X11R6/lib/X11/fonts/CID"; -$fonts_scale_file = "$x11_cid_dir/fonts.scale.auto"; -$gs_resource_dir = "/usr/share/ghostscript/Resource"; +my $x11_cid_dir = "/usr/X11R6/lib/X11/fonts/CID"; +if (-d "/usr/share/fonts/encodings") { # we have X11R7, fonts are in /usr/share/fonts + $x11_cid_dir = "/usr/share/fonts/CID"; +} +if (! -d "$x11_cid_dir" ) { + mkdir("$x11_cid_dir") || die "can't create directory $x11_cid_dir: $!"; +} +my $fonts_scale_file = "$x11_cid_dir/fonts.scale.auto"; +my $gs_resource_dir = "/usr/share/ghostscript/Resource"; $registry = "Adobe"; @orderings = ("Japan1", "Japan2", "Korea1", "CNS1", "GB1"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 squid
by root＠suse.de 31 Aug '06

31 Aug '06

Hello community, here is the log from the commit of package squid checked in at Thu Aug 31 14:44:22 CEST 2006. -------- --- squid/squid.changes 2006-08-23 13:43:16.000000000 +0200 +++ squid/squid.changes 2006-08-30 16:06:38.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 30 16:06:15 CEST 2006 - kssingvo(a)suse.de + +- fix for buffer size in ncsa auth (bugzilla#202249) + +------------------------------------------------------------------- New: ---- squid-2.6.STABLE3-ncsa_buffer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.GpPYLC/_old 2006-08-31 14:44:03.000000000 +0200 +++ /var/tmp/diff_new_pack.GpPYLC/_new 2006-08-31 14:44:03.000000000 +0200 @@ -17,7 +17,7 @@ %endif Summary: Squid WWW proxy server Version: 2.6.STABLE3 -Release: 1 +Release: 2 License: GPL URL: http://www.squid-cache.org Group: Productivity/Networking/Web/Proxy @@ -108,6 +108,7 @@ Patch100: squid_ldapauth-%{squid_ldapauth_version}.dif Patch101: %{name}-2.5.STABLE10-64bit.patch Patch102: %{name}-2.6.STABLE2-ldflags.patch +Patch103: %{name}-2.6.STABLE3-ncsa_buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define squidconfdir /etc/squid @@ -196,6 +197,7 @@ ) %patch101 -p1 %patch102 -p1 +%patch103 -p1 %build %{?suse_update_config:%{suse_update_config}} @@ -399,6 +401,8 @@ %doc README.ip_user %changelog -n squid +* Wed Aug 30 2006 - kssingvo(a)suse.de +- fix for buffer size in ncsa auth (bugzilla#202249) * Wed Aug 23 2006 - kssingvo(a)suse.de - upgrade to version 2.6.STABLE3: * src/dst acl parsing changed to not attempt to guess a netmask ++++++ squid-2.6.STABLE3-ncsa_buffer.patch ++++++ --- squid-2.6.STABLE3/helpers/basic_auth/NCSA/crypt_md5.c.orig 2006-08-30 16:02:07.000000000 +0200 +++ squid-2.6.STABLE3/helpers/basic_auth/NCSA/crypt_md5.c 2006-08-30 17:19:34.000000000 +0200 @@ -186,7 +186,7 @@ for(idx=0;idx<16;idx++) sprintf(&sum[idx*2],"%02x",digest[idx]); - sum[33]='\0'; + sum[32]='\0'; /* Don't leave anything around in vm they could use. */ memset(digest, 0, sizeof digest); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pure-ftpd
by root＠suse.de 31 Aug '06

31 Aug '06

Hello community, here is the log from the commit of package pure-ftpd checked in at Thu Aug 31 14:43:55 CEST 2006. -------- --- pure-ftpd/pure-ftpd.changes 2006-08-21 21:31:55.000000000 +0200 +++ pure-ftpd/pure-ftpd.changes 2006-08-31 09:23:21.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Aug 31 07:59:18 CEST 2006 - mskibbe(a)suse.de + +- update to version 1.0.21 which + o includes patch pure-ftpd-1.0.20-abort-transfer.patch + o Rendezvous has been renamed Bonjour + o The old PAM sample has been removed + o -F option added to pure-pw + o MAX_USER_LENGTH has been bumped to 127 due to popular demand + o pam/* can now be used if security/* doesn't exist + o simplify() simplifies paths ending by /. and /.. + o Experimental support for RFC2640 (UTF-8 filename encoding) + o The LDAP schema has been changed: FTPStatus should be a boolean + o OPTS MLST has been implemented + o SITE UTIME has been implemented + o TCP_CORK is on by default again. A new configure switch, + --without-cork, can disable it + o Correctly format %c and %% in fakesprintf() + o The connection socket is now created with the Nagle algorithm + disabled. It was the trick to dramatically improve performance + when transfering a lot of small files + o Use CLIENT_MULTI_STATEMENTS while connecting to a MySQL server + + +------------------------------------------------------------------- Old: ---- pure-ftpd-1.0.20-abort-transfer.patch pure-ftpd-1.0.20.tar.bz2 New: ---- pure-ftpd-1.0.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.ISquyJ/_old 2006-08-31 14:41:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ISquyJ/_new 2006-08-31 14:41:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pure-ftpd (Version 1.0.20) +# spec file for package pure-ftpd (Version 1.0.21) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: pure-ftpd BuildRequires: mysql-devel openldap2-devel pam-devel postgresql-devel -Version: 1.0.20 -Release: 24 +Version: 1.0.21 +Release: 1 URL: http://www.pureftpd.org Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2 Source1: %{name}.init @@ -22,7 +22,6 @@ Patch: %{name}-1.0.20_config.patch Patch1: %{name}-1.0.20_doc.patch Patch2: %{name}-1.0.20_virtualhosts.patch -Patch3: %{name}-1.0.20-abort-transfer.patch Patch4: pure-ftpd-1.0.20_config_minuid.patch Patch5: pure-ftpd-1.0.20_ftpwho_path.patch Group: Productivity/Networking/Ftp/Servers @@ -49,7 +48,6 @@ %patch %patch1 %patch2 -%patch3 %patch4 %patch5 @@ -132,6 +130,26 @@ %config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd %changelog -n pure-ftpd +* Thu Aug 31 2006 - mskibbe(a)suse.de +- update to version 1.0.21 which + o includes patch pure-ftpd-1.0.20-abort-transfer.patch + o Rendezvous has been renamed Bonjour + o The old PAM sample has been removed + o -F option added to pure-pw + o MAX_USER_LENGTH has been bumped to 127 due to popular demand + o pam/* can now be used if security/* doesn't exist + o simplify() simplifies paths ending by /. and /.. + o Experimental support for RFC2640 (UTF-8 filename encoding) + o The LDAP schema has been changed: FTPStatus should be a boolean + o OPTS MLST has been implemented + o SITE UTIME has been implemented + o TCP_CORK is on by default again. A new configure switch, +--without-cork, can disable it + o Correctly format %%c and %% in fakesprintf() + o The connection socket is now created with the Nagle algorithm + disabled. It was the trick to dramatically improve performance + when transfering a lot of small files + o Use CLIENT_MULTI_STATEMENTS while connecting to a MySQL server * Mon Aug 21 2006 - kukuk(a)suse.de - Reorder auth section of PAM config file to make sure all modules will always be evaluated. ++++++ pure-ftpd-1.0.20_doc.patch ++++++ ++++ 877 lines (skipped) ++++ between pure-ftpd/pure-ftpd-1.0.20_doc.patch ++++ and pure-ftpd/pure-ftpd-1.0.20_doc.patch ++++++ pure-ftpd-1.0.20.tar.bz2 -> pure-ftpd-1.0.21.tar.bz2 ++++++ ++++ 32619 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 pdsh
by root＠suse.de 31 Aug '06

31 Aug '06

Hello community, here is the log from the commit of package pdsh checked in at Thu Aug 31 14:41:38 CEST 2006. -------- --- pdsh/pdsh.changes 2006-07-13 14:46:41.000000000 +0200 +++ pdsh/pdsh.changes 2006-08-31 08:07:51.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 31 08:05:38 CEST 2006 - mskibbe(a)suse.de + +- update to version 2.10 which + o allow rcmd modules to set rcmd-specific options + o Add test for "," in host range. Increase version number + o Add COPYING to docs. Remove -n from %setup + o Add support for command history in interactive mode when using + readline (History file is placed in ~/.pdsh/history) + o Change mini shell script so -S hack will work + +------------------------------------------------------------------- Old: ---- pdsh-2.9.tar.bz2 New: ---- pdsh-2.10.patch pdsh-2.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdsh.spec ++++++ --- /var/tmp/diff_new_pack.c5yNKE/_old 2006-08-31 14:41:24.000000000 +0200 +++ /var/tmp/diff_new_pack.c5yNKE/_new 2006-08-31 14:41:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pdsh (Version 2.9) +# spec file for package pdsh (Version 2.10) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,13 +13,14 @@ Name: pdsh BuildRequires: dejagnu openssh readline-devel rsh URL: http://www.llnl.gov/linux/pdsh/ -Version: 2.9 +Version: 2.10 Release: 1 Summary: Parallel remote shell program License: GPL Group: Productivity/Clustering/Computing Source: %{name}-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch: %{name}-%{version}.patch # Prereq: # Set this to 1 to build with genders support and framework for # running Elan jobs. @@ -38,6 +39,7 @@ %prep %setup -q +%patch %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -62,6 +64,14 @@ %_libdir/pdsh %changelog -n pdsh +* Thu Aug 31 2006 - mskibbe(a)suse.de +- update to version 2.10 which + o allow rcmd modules to set rcmd-specific options + o Add test for "," in host range. Increase version number + o Add COPYING to docs. Remove -n from %%setup + o Add support for command history in interactive mode when using + readline (History file is placed in ~/.pdsh/history) + o Change mini shell script so -S hack will work * Thu Jul 13 2006 - mskibbe(a)suse.de - update to version 2.9 which o Remove unneeded .la and .a files in packages ++++++ pdsh-2.10.patch ++++++ --- src/common/split.c +++ src/common/split.c @@ -24,6 +24,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ #include <string.h> +#include <stdio.h> #include "xmalloc.h" #include "split.h" ++++++ pdsh-2.9.tar.bz2 -> pdsh-2.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/ChangeLog new/pdsh-2.10/ChangeLog --- old/pdsh-2.9/ChangeLog 2006-03-16 01:12:12.000000000 +0100 +++ new/pdsh-2.10/ChangeLog 2006-03-22 22:30:11.000000000 +0100 @@ -1,3 +1,32 @@ +2006-03-22 Mark Grondona <mgrondona(a)llnl.gov> + * src/common/split.c, src/common/split.h, src/pdsh/opt.c : + Move list_join() from pdsh/opt.c to common/split.c. + + * src/pdsh/rcmd.h, src/pdsh/rcmd.c, src/pdsh/dsh.c, + src/pdsh/opt.c, src/modules/sshcmd.c, src/modules/genders.c : + Missing updates from rcmd-rewrite branch. Allow user@ + to be specified in -w host spec. Add rcmd_opt_set() to + allow rcmd modules to set rcmd-specific options (e.g. resolve_hosts). + + * testsuite/pdsh.test/pdsh.exp : + Add test for "," in host range. Increase version number. + + * pdsh.spec : Add COPYING to docs. Remove -n from %setup. + + * : tag pdsh-2.10. + +2006-03-21 Mark Grondona <mgrondona(a)llnl.gov> + + * src/pdsh/main.c (_interactive_dsh) : + Add support for command history in interactive mode when using + readline. History file is placed in ~/.pdsh/history. + Original patch from Sebastien Cabaniols <Sebastian.Cabaniols(a)hp.com>. + +2006-03-16 Jim Garlick <garlick(a)llnl.gov> + + * src/modules/xcpucmd.c : Add support support for signals. + Change mini shell script so -S hack will work. + 2006-03-15 Mark Grondona <mgrondona(a)llnl.gov> * src/pdsh/mod.c : Remove error message when loading duplicate module in pdsh. This is OK since we removed code which diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/META new/pdsh-2.10/META --- old/pdsh-2.9/META 2006-03-16 18:10:35.000000000 +0100 +++ new/pdsh-2.10/META 2006-03-27 23:13:20.000000000 +0200 @@ -1,4 +1,4 @@ meta: 1 name: pdsh release: 1 - version: 2.9 + version: 2.10 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/NEWS new/pdsh-2.10/NEWS --- old/pdsh-2.9/NEWS 2006-03-16 01:12:12.000000000 +0100 +++ new/pdsh-2.10/NEWS 2006-03-22 22:30:11.000000000 +0100 @@ -1,6 +1,15 @@ This file describes changes in recent versions of pdsh. It primarily documents thos changes that are of interest to users and admins. +* Changes in pdsh-2.10 (2006-03-22) +=================================== + -- Fix for -w hosts parsing bug. + -- Fix missing support for "-w user@hosts" in pdsh-2.9. + -- Add support for command history in interactive mode with readline. + Command history file is ~/.pdsh/history. + -- (xcpu) Support for signals and -S. + + * Changes in pdsh-2.9 (2006-03-15) =================================== -- Add netgroup module which provides -g/-X groupname option to read @@ -133,4 +142,4 @@ -- Nominal support for Elan multirail jobs (largely untested). See qshell and mqshell `-r railmask' option. -$Id: NEWS 1027 2006-03-16 00:12:12Z grondo $ +$Id: NEWS 1039 2006-03-22 21:30:11Z grondo $ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/doc/pdsh.1.in new/pdsh-2.10/doc/pdsh.1.in --- old/pdsh-2.9/doc/pdsh.1.in 2006-03-15 19:52:17.000000000 +0100 +++ new/pdsh-2.10/doc/pdsh.1.in 2006-03-17 11:49:19.000000000 +0100 @@ -1,4 +1,4 @@ -\." $Id: pdsh.1.in 1023 2006-03-15 18:52:17Z garlick $ +\." $Id: pdsh.1.in 1030 2006-03-17 10:49:19Z garlick $ .\" .\" .TH "@PACKAGE@" "1" "@host_os@" "@PDSH_VERSION@" @@ -258,7 +258,7 @@ and if no nodes have been selected, the module will attempt to read a running jobid from the SLURM_JOBID environment variable (which is set when running under a SLURM allocation). If SLURM_JOBID -references an invlalid job, it will be silently ignored. +references an invalid job, it will be silently ignored. .TP .I "-j jobid[,jobid,...]" Target list of nodes allocated to the SLURM job \fIjobid\fR. This option diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/pdsh.spec new/pdsh-2.10/pdsh.spec --- old/pdsh-2.9/pdsh.spec 2006-03-16 18:10:35.000000000 +0100 +++ new/pdsh-2.10/pdsh.spec 2006-03-27 23:13:20.000000000 +0200 @@ -1,5 +1,5 @@ Name: pdsh -Version: 2.9 +Version: 2.10 Release: 1 Summary: Parallel remote shell program @@ -7,7 +7,7 @@ License: GPL Url: http://sourceforge.net/projects/pdsh Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-2.9.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-2.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -234,7 +234,7 @@ ############################################################################## %prep -%setup -n pdsh-2.9 +%setup -n pdsh-2.10 ############################################################################## %build @@ -301,7 +301,8 @@ %files %defattr(-,root,root) -%doc README ChangeLog NEWS DISCLAIMER README.KRB4 README.modules README.QsNet +%doc COPYING README ChangeLog NEWS DISCLAIMER +%doc README.KRB4 README.modules README.QsNet %{_bindir}/pdsh %{_bindir}/pdcp %{_bindir}/dshbak @@ -444,7 +445,7 @@ - removed change of attributes of pdsh and pcp in files section - removed .a files from packages. -* Wed Feb 22 2006 Ben Woodard <woodard(a)redhat.com> +* Wed Feb 22 2006 Ben Woodard <woodard(a)redhat.com> - add parameters to make - replace etc with _sysconfdir in most places - remove post section with unexplained removing of cached man pages. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/common/Makefile.am new/pdsh-2.10/src/common/Makefile.am --- old/pdsh-2.9/src/common/Makefile.am 2005-12-22 21:14:32.000000000 +0100 +++ new/pdsh-2.10/src/common/Makefile.am 2006-03-22 21:27:02.000000000 +0100 @@ -1,5 +1,5 @@ ##***************************************************************************** -## $Id: Makefile.am 981 2005-12-22 20:14:32Z grondo $ +## $Id: Makefile.am 1034 2006-03-22 20:27:02Z grondo $ ##***************************************************************************** ## Process this file with automake to produce Makefile.in. ##***************************************************************************** @@ -22,8 +22,8 @@ hostlist.h \ list.c \ list.h \ - split.c \ - split.h \ + split.c \ + split.h \ xmalloc.c \ xmalloc.h \ xpoll.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/common/split.c new/pdsh-2.10/src/common/split.c --- old/pdsh-2.9/src/common/split.c 2006-03-15 01:02:20.000000000 +0100 +++ new/pdsh-2.10/src/common/split.c 2006-03-22 21:26:37.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: split.c 1022 2006-03-15 00:02:20Z grondo $ + * $Id: split.c 1033 2006-03-22 20:26:37Z grondo $ ***************************************************************************** * Copyright (C) 2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -88,3 +88,31 @@ } +char * list_join(const char *sep, List l) +{ + char *str = NULL; + char *result = NULL; + ListIterator i; + + if (list_count(l) == 0) + return NULL; + + i = list_iterator_create(l); + while ((str = list_next(i))) { + char buf[1024]; + snprintf(buf, 1024, "%s%s", str, sep); + xstrcat(&result, buf); + } + list_iterator_destroy(i); + + /* + * Delete final separator + */ + result[strlen(result) - strlen(sep)] = '\0'; + + return result; +} + +/* vi: ts=4 sw=4 expandtab + */ + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/common/split.h new/pdsh-2.10/src/common/split.h --- old/pdsh-2.9/src/common/split.h 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/common/split.h 2006-03-22 21:26:37.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: err.c 868 2004-06-23 16:42:11Z grondo $ + * $Id$ ***************************************************************************** * Copyright (C) 2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -30,4 +30,6 @@ List list_split (char *sep, char *str); +char * list_join (const char *sep, List l); + #endif /* !_SPLIT_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/modules/genders.c new/pdsh-2.10/src/modules/genders.c --- old/pdsh-2.9/src/modules/genders.c 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/modules/genders.c 2006-03-22 21:36:00.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: genders.c 1009 2006-02-14 16:11:43Z grondo $ + * $Id: genders.c 1035 2006-03-22 20:36:00Z grondo $ ***************************************************************************** * Copyright (C) 2001-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -548,7 +548,7 @@ rc = attrval_by_altname (gh, host, rcmd_attr, val, sizeof (val)); if (rc > 0) - rcmd_register_default_module (host, val); + rcmd_register_defaults (host, val, NULL); free (host); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/modules/sshcmd.c new/pdsh-2.10/src/modules/sshcmd.c --- old/pdsh-2.9/src/modules/sshcmd.c 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/modules/sshcmd.c 2006-03-22 21:36:00.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: sshcmd.c 1009 2006-02-14 16:11:43Z grondo $ + * $Id: sshcmd.c 1035 2006-03-22 20:36:00Z grondo $ ***************************************************************************** * Copyright (C) 2001-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -154,16 +154,6 @@ err("%p: Cannot specify -t with \"-R ssh\"\n"); return 1; } - - /* - * Don't need hostname resolution for ssh - */ - opt->resolve_hosts = false; - - /* - * Set the signal mask for the "main" thread to block - * SIGCHLD so the ssh_reaper can collect exit codes - */ } return 0; } @@ -177,6 +167,12 @@ sshcmd_args_init (); + /* + * Do not resolve hostnames in pdsh when using ssh + */ + if (rcmd_opt_set (RCMD_OPT_RESOLVE_HOSTS, 0) < 0) + errx ("%p: sshcmd_init: rcmd_opt_set: %m\n"); + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/modules/xcpucmd.c new/pdsh-2.10/src/modules/xcpucmd.c --- old/pdsh-2.9/src/modules/xcpucmd.c 2006-03-15 19:52:17.000000000 +0100 +++ new/pdsh-2.10/src/modules/xcpucmd.c 2006-03-17 12:03:51.000000000 +0100 @@ -61,7 +61,10 @@ #include "src/pdsh/mod.h" #include "src/pdsh/privsep.h" -#define RSH_PORT 514 +struct xcpu_info_struct { + char *hostname; + int sid; +}; #if STATIC_MODULES # define pdsh_module_info xcpucmd_module_info @@ -72,6 +75,7 @@ static int xcpucmd_init(opt_t *); static int xcpucmd_signal(int, void *, int); +static int xcpucmd_destroy(struct xcpu_info_struct *); static int xcpucmd(char *, char *, char *, char *, char *, int, int *, void **); /* @@ -91,8 +95,11 @@ (RcmdInitF) xcpucmd_init, (RcmdSigF) xcpucmd_signal, (RcmdF) xcpucmd, + (RcmdDestroyF) xcpucmd_destroy, }; + + /* * Export module options */ @@ -121,14 +128,10 @@ return 0; } -static int xcpucmd_signal(int efd, void *arg, int signum) -{ - /* not implemented */ - return 0; -} +#define CLONE_TMPL "/mnt/xcpu/%s/xcpu/clone" +#define SESSFILE_TMPL "/mnt/xcpu/%s/xcpu/%x/%s" -#define PREFIX "/mnt/xcpu" -#define SCRIPT "#!/bin/bash\nexec $*\nexit 1\n" +#define SCRIPT "#!/bin/bash\neval $*\nexit $?\n" static FILE * openclone(char *hostname, int *sidp) @@ -136,7 +139,7 @@ char path[MAXPATHLEN]; FILE *f; - sprintf(path, "%s/%s/xcpu/clone", PREFIX, hostname); + sprintf(path, CLONE_TMPL, hostname); f = fopen(path, "r"); if (f == NULL) err("%s: %m\n", path); @@ -155,7 +158,7 @@ char path[MAXPATHLEN]; int fd; - sprintf(path, "%s/%s/xcpu/%x/%s", PREFIX, hostname, sid, name); + sprintf(path, SESSFILE_TMPL, hostname, sid, name); fd = open(path, mode); if (fd < 0) err("%s: %m\n", path); @@ -170,7 +173,7 @@ FILE *f; int res = 0; - sprintf(path, "%s/%s/xcpu/%x/%s", PREFIX, hostname, sid, name); + sprintf(path, SESSFILE_TMPL, hostname, sid, name); f = fopen(path, "w"); if (f == NULL) { err("%s: %m\n", path); @@ -188,7 +191,7 @@ } static int -_xcpucmd(char *hostname, char *cmd, int *fd2p) +_xcpucmd(char *hostname, char *cmd, int *fd2p, int *sidp) { int sid; FILE *fclone = NULL; @@ -224,30 +227,57 @@ Free((void **)&argstr); if (fclone) fclose(fclone); + if (fd >= 0) + *sidp = sid; return fd; /* session goes away when fd is closed */ } -/* - * The xcpucmd call itself. - * ahost (IN) remote hostname - * addr (IN) 4 byte internet address - * locuser (IN) local username - * remuser (IN) remote username - * cmd (IN) command to execute - * rank (IN) MPI rank for this process - * fd2p (IN/OUT) if non-NULL, open stderr backchannel on this fd - * s (RETURN) socket for stdout or -1 on failure - */ +static int +xcpucmd_signal(int efd, void *arg, int signum) +{ + char cmd[256]; + struct xcpu_info_struct *x = (struct xcpu_info_struct *)arg; + + sprintf(cmd, "signal %d", signum); + (void) writefile(x->hostname, x->sid, "ctl", cmd); + + return 0; +} + +static int +xcpucmd_destroy(struct xcpu_info_struct *x) +{ + if (x) { + if (x->hostname) + Free((void **)&x->hostname); + Free((void **)&x); + } + + /* XXX Insert retreival of exit status here when we have a wait file. */ + + return 0; +} + static int xcpucmd(char *ahost, char *addr, char *locuser, char *remuser, char *cmd, int rank, int *fd2p, void **arg) { + int sid, fd; + struct xcpu_info_struct *x; + if (strcmp(locuser, remuser) != 0) { err("remote user must match local user for xcpu rcmd method\n"); return -1; } - return _xcpucmd(ahost, cmd, fd2p); + fd = _xcpucmd(ahost, cmd, fd2p, &sid); + if (fd >= 0) { + x = Malloc(sizeof(struct xcpu_info_struct)); + x->hostname = Strdup(ahost); + x->sid = sid; + *arg = x; + } + return fd; } /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/pdsh/dsh.c new/pdsh-2.10/src/pdsh/dsh.c --- old/pdsh-2.9/src/pdsh/dsh.c 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/pdsh/dsh.c 2006-03-22 21:36:00.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: dsh.c 1009 2006-02-14 16:11:43Z grondo $ + * $Id: dsh.c 1035 2006-03-22 20:36:00Z grondo $ ***************************************************************************** * Copyright (C) 2001-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -596,16 +596,16 @@ _int_block(); /* block SIGINT */ #if HAVE_MTSAFE_GETHOSTBYNAME - if (a->resolve_hosts) + if (a->rcmd->opts->resolve_hosts) _gethost(a->host, a->addr); #endif a->start = time(NULL); a->state = DSH_RCMD; - a->rcmd = rcmd_create (a->host, a->addr, a->luser, a->ruser, - a->cmd, a->nodeid, a->dsh_sopt); + rcmd_connect (a->rcmd, a->host, a->addr, a->luser, a->ruser, + a->cmd, a->nodeid, a->dsh_sopt); - if (a->rcmd == NULL || a->rcmd->fd == -1) + if (a->rcmd->fd == -1) result = DSH_FAILED; else { a->connect = time(NULL); @@ -760,7 +760,7 @@ a->start = time(NULL); #if HAVE_MTSAFE_GETHOSTBYNAME - if (a->resolve_hosts) + if (a->rcmd->opts->resolve_hosts) _gethost(a->host, a->addr); #endif _xsignal (SIGPIPE, SIG_BLOCK); @@ -768,14 +768,10 @@ /* establish the connection */ a->state = DSH_RCMD; - a->rcmd = rcmd_create(a->host, a->addr, a->luser, a->ruser, - a->cmd, a->nodeid, a->dsh_sopt); + rcmd_connect (a->rcmd, a->host, a->addr, a->luser, a->ruser, + a->cmd, a->nodeid, a->dsh_sopt); - /* - * Copy stdout/stderr to local stdout/stderr, - * appropriately tagged. - */ - if (a->rcmd == NULL || a->rcmd->fd == -1) { + if (a->rcmd->fd == -1) { result = DSH_FAILED; /* connect failed */ } else { /* connected: update status for watchdog thread */ @@ -959,7 +955,6 @@ th->ruser = opt->ruser; th->state = DSH_NEW; th->labels = opt->labels; - th->rcmd = NULL; th->nodeid = i; th->cmd = opt->cmd; th->dsh_sopt = opt->separate_stderr; /* dsh-specific */ @@ -972,11 +967,13 @@ th->kill_on_fail = opt->kill_on_fail; th->outbuf = cbuf_create (64, 8192); th->errbuf = cbuf_create (64, 8192); - th->resolve_hosts = opt->resolve_hosts; + + th->rcmd = rcmd_create (th->host); + #if !HAVE_MTSAFE_GETHOSTBYNAME /* if MT-safe, do it in parallel in rsh/rcp threads */ /* gethostbyname_r is not very portable so skip it */ - if (opt->resolve_hosts) + if (th->rcmd->opts->resolve_hosts) _gethost(th->host, th->addr); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/pdsh/main.c new/pdsh-2.10/src/pdsh/main.c --- old/pdsh-2.9/src/pdsh/main.c 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/pdsh/main.c 2006-03-22 19:29:42.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: main.c 1009 2006-02-14 16:11:43Z grondo $ + * $Id: main.c 1032 2006-03-22 18:29:42Z grondo $ ***************************************************************************** * Copyright (C) 2001-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -31,6 +31,7 @@ #include <signal.h> #include <errno.h> #include <sys/types.h> +#include <sys/param.h> #if HAVE_UNISTD_H #include <unistd.h> /* setuid */ #endif @@ -42,6 +43,9 @@ #if HAVE_READLINE #include <readline/readline.h> #include <readline/history.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #endif #include "src/common/err.h" @@ -121,18 +125,128 @@ #if HAVE_READLINE -/* Warning: Running setuid root! */ +static int _history_file_create (char *path, size_t len) +{ + char * home; + struct stat sbuf; + int fd; + int rc; + int n; + + memset (path, 0, len); + + if (!(home = getenv ("HOME"))) { + err ("%p: Unable to read HOME env var\n"); + return (-1); + } + + n = snprintf (path, len, "%s/.pdsh", home); + if ((n < 0) || (n >= len)) { + err ("%p: Unable to open %s/.pdsh: path too long\n", home); + return (-1); + } + + /* Check for ~/.pdsh directory + * and create if it does not exist + */ + if (lstat (path, &sbuf) < 0) { + if (errno == ENOENT) { + if (mkdir (path, 0700) < 0) { + err ("%p: Unable to create ~/.pdsh: %m\n"); + return (-1); + } + } else { + err ("%p: Couldn't find ~/.pdsh: %m\n"); + return (-1); + } + } else if (!(S_ISDIR (sbuf.st_mode))) { + err ("%p: ~/.pdsh exists but is not a directory\n"); + return (-1); + } + + /* Now should have ~/.pdsh/, + * create ~/.pdsh/history if it does not exist. + */ + n = snprintf (path, len, "%s/.pdsh/history", home); + if ((n < 0) || (n >= len)) { + err ("%p: Unable to open %s/.pdsh/history: path too long\n", home); + return (-1); + } + + if ((fd = open (path, O_CREAT, 00600)) < 0) { + err ("%p: Error: Unable to create history file \"%s\": %m\n", path); + return (-1); + } + + close (fd); + + if ((rc = read_history (path))) { + err ("%p: Warning: Unable to read history file \"%s\": %s\n", + path, strerror (rc)); + return (-1); + } + + return (0); +} + +static void _history_list (void) +{ + HIST_ENTRY **list; + int i; + + if (!(list = history_list ())) + return; + + for (i = 0; list[i]; i++) { + out ("%p: %d: %s\n", i + history_base, list[i]->line); + } + return; +} + +/* Warning: May be running setuid root! */ static void _interactive_dsh(opt_t * opt) { pid_t pid; char prompt[64]; + char history_filename[MAXPATHLEN]; char *cmd = NULL; + int got_history_file = 1; + int len; snprintf(prompt, sizeof(prompt), "%s> ", opt->progname); -/*rl_bind_key('\t', rl_insert); *//* disable tab filename expansion */ + using_history (); + + len = sizeof (history_filename); + + if (_history_file_create (history_filename, len) < 0) { + got_history_file = 0; + } while ((cmd = readline(prompt)) != NULL) { + int errnum; + char *expansion; + + if ((errnum = history_expand (cmd, &expansion))) { + err ("%p: %s\n", expansion); + } + + free (cmd); + + if ((errnum < 0) || (errnum == 2)) { + free (expansion); + continue; + } + + cmd = expansion; + + if (!strcmp(cmd, "history")) { + _history_list (); + continue; + } + + add_history (cmd); + if (strlen(cmd) == 0) { /* empty line */ free(cmd); continue; @@ -141,7 +255,9 @@ free(cmd); /* quit or exit */ break; } - add_history(cmd); + + if ((strlen(cmd) != 0) && (got_history_file)) + append_history (1, history_filename); /* * fork dsh so we can ignore SIGINT in prompt loop @@ -162,7 +278,7 @@ break; } - free(cmd); + free (cmd); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/pdsh/opt.c new/pdsh-2.10/src/pdsh/opt.c --- old/pdsh-2.9/src/pdsh/opt.c 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/pdsh/opt.c 2006-03-22 21:39:20.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: opt.c 1009 2006-02-14 16:11:43Z grondo $ + * $Id: opt.c 1036 2006-03-22 20:39:20Z grondo $ ***************************************************************************** * Copyright (C) 2001-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -481,7 +481,7 @@ */ if (opt->rcmd_name == NULL) opt->rcmd_name = Strdup(rcmd_get_default_module ()); - if (rcmd_register_default_module(NULL, opt->rcmd_name) < 0) + if (rcmd_register_default_rcmd(opt->rcmd_name) < 0) exit(1); /* DSH: build command */ @@ -629,31 +629,6 @@ #define ALLOCSTR(x) (x == ALLOC_BLOCK ? "ALLOC_BLOCK" : \ (x == ALLOC_CYCLIC ? "ALLOC_CYCLIC" : "<Unknown>")) -static char * _list_join(const char *sep, List l) -{ - char *str = NULL; - char *result = NULL; - ListIterator i; - - if (list_count(l) == 0) - return NULL; - - i = list_iterator_create(l); - while ((str = list_next(i))) { - char buf[1024]; - snprintf(buf, 1024, "%s%s", str, sep); - xstrcat(&result, buf); - } - list_iterator_destroy(i); - - /* - * Delete final separator - */ - result[strlen(result) - strlen(sep)] = '\0'; - - return result; -} - /* * List the current options. * opt (IN) option list @@ -673,7 +648,7 @@ out("Command: %s\n", STRORNULL(opt->cmd)); } else { out("-- PCP-specific options --\n"); - infile_str = _list_join(", ", opt->infile_names); + infile_str = list_join(", ", opt->infile_names); if (infile_str) { out("Infile(s) %s\n", infile_str); Free((void **) &infile_str); @@ -756,7 +731,7 @@ return NULL; l = mod_get_module_names(type); - names = _list_join(",", l); + names = list_join(",", l); list_destroy(l); return names; @@ -832,23 +807,38 @@ } /* - * Take a string `hosts' possibly of form "rcmd_type:hostlist" and + * Take a string `hosts' possibly of form "rcmd_type:user@hostlist" and * place the hostlist part of the string in *hptr and the rcmd part * of the string in rptr. Returns nonzero if an rcmd_type was found, * zero otherwise (in which case rptr is not touched). */ -static int get_host_rcmd_type (char *hosts, char **rptr, char **hptr) +static int get_host_rcmd_type (char *hosts, char **rptr, char **hptr, + char **uptr) { - if (!(*hptr = strchr (hosts, ':'))) { - *hptr = hosts; - return (0); + char *p = hosts; + char *q; + *uptr = NULL; + *rptr = NULL; + *hptr = hosts; + + p = strchr (hosts, ':'); + q = strchr (hosts, '@'); + + if (p && q && p > q) + errx ("Host spec \"%s\" not of form [rcmd_type:][user@]hosts\n", hosts); + + if (p) { + *rptr = *hptr; + *p++ = '\0'; + *hptr = p; + } + + if (q) { + *uptr = *hptr; + *q++ = '\0'; + *hptr = q; } - /* - * Nullify ':' and advance hptr to host part of string - */ - *(*hptr)++ = '\0'; - *rptr = hosts; return (1); } @@ -856,40 +846,35 @@ static void wcoll_append (opt_t *opt, char *str) { - List l = list_split (",", str); - ListIterator i; + hostlist_t hl = hostlist_create (str); char *rcmd_type = NULL; char *tok; - if (!l) + if (!hl) return; if (!opt->wcoll) opt->wcoll = hostlist_create (NULL); - i = list_iterator_create (l); + while ((tok = hostlist_shift (hl))) { + char *hosts, *user; - while ((tok = list_next (i))) { - char *hosts; - - get_host_rcmd_type (tok, &rcmd_type, &hosts); + get_host_rcmd_type (tok, &rcmd_type, &hosts, &user); hostlist_push (opt->wcoll, hosts); - if (rcmd_type) { - if (rcmd_register_default_module (hosts, rcmd_type) < 0) + if (rcmd_type || user) { + if (rcmd_register_defaults (hosts, rcmd_type, user) < 0) errx ("Failed to register rcmd module \"%s\" for hosts \"%s\"\n", rcmd_type, hosts); } - } - list_destroy (l); + hostlist_destroy (hl); return; } - /* * vi:tabstop=4 shiftwidth=4 expandtab */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/pdsh/rcmd.c new/pdsh-2.10/src/pdsh/rcmd.c --- old/pdsh-2.9/src/pdsh/rcmd.c 2006-03-14 23:30:32.000000000 +0100 +++ new/pdsh-2.10/src/pdsh/rcmd.c 2006-03-22 21:36:00.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: rcmd.c 1016 2006-03-14 22:30:32Z garlick $ + * $Id: rcmd.c 1035 2006-03-22 20:36:00Z grondo $ ***************************************************************************** * Copyright (C) 2005-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -30,6 +30,7 @@ #include <assert.h> #include <string.h> #include <stdlib.h> +#include <errno.h> #include "src/common/err.h" #include "src/common/xmalloc.h" @@ -47,16 +48,18 @@ { "mrsh", "rsh", "ssh", "krb4", "qsh", "mqsh", "xcpu", NULL }; struct rcmd_module { - char * name; - mod_t mod; - RcmdInitF init; - RcmdSigF signal; - RcmdF rcmd; - RcmdDestroyF rcmd_destroy; + char * name; + mod_t mod; + struct rcmd_options options; + RcmdInitF init; + RcmdSigF signal; + RcmdF rcmd; + RcmdDestroyF rcmd_destroy; }; struct node_rcmd_info { char *hostname; + char *username; struct rcmd_module *rmod; }; @@ -64,9 +67,10 @@ static List rcmd_module_list = NULL; static struct rcmd_module *default_rcmd_module = NULL; +static struct rcmd_module *current_rcmd_module = NULL; static struct node_rcmd_info * -node_rcmd_info_create (char *hostname, struct rcmd_module *module) +node_rcmd_info_create (char *hostname, char *user, struct rcmd_module *module) { struct node_rcmd_info *n = Malloc (sizeof (*n)); @@ -74,6 +78,7 @@ return NULL; n->hostname = Strdup (hostname); + n->username = Strdup (user); n->rmod = module; return (n); @@ -85,6 +90,8 @@ return; Free ((void **)&n->hostname); + if (n->username) + Free ((void **)&n->username); Free ((void **)&n); } @@ -118,6 +125,8 @@ */ rmod->rcmd_destroy = (RcmdDestroyF) mod_get_rcmd_destroy (mod); + rmod->options.resolve_hosts = 1; + return (rmod); fail: @@ -140,15 +149,12 @@ return (strcmp (x->hostname, hostname) == 0); } -static struct rcmd_module * host_rcmd_module (char *host) +static struct node_rcmd_info * host_rcmd_info (char *host) { - struct node_rcmd_info *n = NULL; - - if ( host_info_list && - (n = list_find_first (host_info_list, (ListFindF) find_host, host))) - return (n->rmod); + if (host_info_list == NULL) + return (NULL); - return (default_rcmd_module); + return (list_find_first (host_info_list, (ListFindF) find_host, host)); } static struct rcmd_module * rcmd_module_register (char *name) @@ -182,7 +188,8 @@ return (rmod); } -static int hostlist_register_rcmd (const char *hosts, struct rcmd_module *rmod) +static int hostlist_register_rcmd (const char *hosts, struct rcmd_module *rmod, + char *user) { hostlist_t hl = hostlist_create (hosts); char * host; @@ -204,7 +211,7 @@ if (list_find_first (host_info_list, (ListFindF) find_host, host)) continue; - if ((n = node_rcmd_info_create (host, rmod)) == NULL) + if ((n = node_rcmd_info_create (host, user, rmod)) == NULL) errx ("Failed to create rcmd info for host \"%s\"\n", host); list_append (host_info_list, n); @@ -222,6 +229,7 @@ /* * Walk through list of default candidate modules, starting at head, * and return the first module that is loaded. + * Unless rcmd_default_module is already registered. */ char * rcmd_get_default_module (void) { @@ -229,20 +237,29 @@ int i = 0; const char *name = NULL; + if (default_rcmd_module != NULL) + return (default_rcmd_module->name); + while ((name = rcmd_rank[i++]) && !mod) mod = mod_get_module ("rcmd", name); return mod ? mod_get_name (mod) : NULL; } -int rcmd_register_default_module (char *hosts, char *rcmd_name) +int rcmd_register_default_rcmd (char *rcmd_name) { struct rcmd_module *rmod = NULL; + if (!(rmod = rcmd_module_register (rcmd_name))) + return (-1); + default_rcmd_module = rmod; + return (0); +} - if (rcmd_name == NULL) - rcmd_name = rcmd_get_default_module (); +int rcmd_register_defaults (char *hosts, char *rcmd_name, char *user) +{ + struct rcmd_module *rmod = NULL; - if (!(rmod = rcmd_module_register (rcmd_name))) + if (rcmd_name && !(rmod = rcmd_module_register (rcmd_name))) return (-1); /* If host list is NULL, we are registering a new global default @@ -253,25 +270,26 @@ return (0); } - if (hostlist_register_rcmd (hosts, rmod) < 0) + if (hostlist_register_rcmd (hosts, rmod, user) < 0) return (-1); return (0); } -struct rcmd_info * rcmd_info_create (int fd, int efd, struct rcmd_module *rmod, - void *arg) +struct rcmd_info * rcmd_info_create (struct rcmd_module *rmod) { struct rcmd_info *r = Malloc (sizeof (*r)); if (r == NULL) return (NULL); - r->fd = fd; - r->efd = efd; + r->fd = -1; + r->efd = -1; r->rmod = rmod; - r->arg = arg; + r->opts = &rmod->options; + r->arg = NULL; + r->ruser = NULL; return (r); } @@ -281,34 +299,49 @@ Free ((void **) &r); } - -struct rcmd_info * rcmd_create (char *ahost, char *addr, char *locuser, - char *remuser, char *cmd, int nodeid, - bool error_fd) +struct rcmd_info * rcmd_create (char *host) { - int fd, efd = -1; - void *arg; struct rcmd_info *rcmd = NULL; struct rcmd_module *rmod = NULL; + struct node_rcmd_info *n = NULL; - if ((rmod = host_rcmd_module (ahost)) == NULL) - return (NULL); - - fd = (*rmod->rcmd) (ahost, addr, locuser, remuser, cmd, nodeid, - error_fd ? &efd : NULL, &arg); + if ((n = host_rcmd_info (host))) { + rmod = n->rmod; + } - if (fd < 0) - return (NULL); + /* + * If no rcmd module use default + */ + if (rmod == NULL) + rmod = default_rcmd_module; - if ((rcmd = rcmd_info_create (fd, efd, rmod, arg)) == NULL) { - err ("%p: Unable to create rcmd info for \"%s\"\n", ahost); - (*rmod->rcmd_destroy) (arg); + if ((rcmd = rcmd_info_create (rmod)) == NULL) { + err ("%p: Unable to allocate rcmd info for \"%s\"\n", host); return (NULL); } + if (n != NULL && n->username) + rcmd->ruser = n->username; + return (rcmd); } + +int rcmd_connect (struct rcmd_info *rcmd, char *ahost, char *addr, + char *locuser, char *remuser, char *cmd, int nodeid, + bool error_fd) +{ + /* + * rcmd->ruser overrides default + */ + if (rcmd->ruser) + remuser = rcmd->ruser; + + rcmd->fd = (*rcmd->rmod->rcmd) (ahost, addr, locuser, remuser, cmd, nodeid, + error_fd ? &rcmd->efd : NULL, &rcmd->arg); + return (rcmd->fd); +} + int rcmd_destroy (struct rcmd_info *rcmd) { int rc = 0; @@ -330,19 +363,25 @@ return (*rcmd->rmod->signal) (rcmd->efd, rcmd->arg, signum); } + int rcmd_init (opt_t *opt) { struct rcmd_module *r = NULL; ListIterator i; if (!rcmd_module_list) { + current_rcmd_module = default_rcmd_module; (*default_rcmd_module->init) (opt); + current_rcmd_module = NULL; return (0); } i = list_iterator_create (rcmd_module_list); - while ((r = list_next (i))) + while ((r = list_next (i))) { + current_rcmd_module = r; (*r->init) (opt); + current_rcmd_module = NULL; + } list_iterator_destroy (i); @@ -359,6 +398,25 @@ return (0); } +int rcmd_opt_set (int id, void * value) +{ + if (current_rcmd_module == NULL) { + errno = ESRCH; + return (-1); + } + + switch (id) { + case RCMD_OPT_RESOLVE_HOSTS: + current_rcmd_module->options.resolve_hosts = (int) value; + break; + default: + errno = EINVAL; + return (-1); + } + + return (0); +} + /* * vi: ts=4 sw=4 expandtab */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/src/pdsh/rcmd.h new/pdsh-2.10/src/pdsh/rcmd.h --- old/pdsh-2.9/src/pdsh/rcmd.h 2006-02-14 17:11:43.000000000 +0100 +++ new/pdsh-2.10/src/pdsh/rcmd.h 2006-03-22 21:36:00.000000000 +0100 @@ -1,5 +1,5 @@ /*****************************************************************************\ - * $Id: rcmd.h 1009 2006-02-14 16:11:43Z grondo $ + * $Id: rcmd.h 1035 2006-03-22 20:36:00Z grondo $ ***************************************************************************** * Copyright (C) 2001-2006 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). @@ -29,29 +29,57 @@ #include "opt.h" +struct rcmd_options { + bool resolve_hosts; +}; + +#define RCMD_OPT_RESOLVE_HOSTS 0x1 + struct rcmd_info { - int fd; - int efd; - struct rcmd_module *rmod; - void *arg; + int fd; + int efd; + struct rcmd_module *rmod; + struct rcmd_options *opts; + char *ruser; + void *arg; }; + /* - * Register a new default rcmd connect module for the hosts in - * string "hosts". + * Register default rcmd parameters for hosts in hostlist string "hosts." + * rcmd_type - if non-NULL set default rcmd connect module for "hosts." + * user - if non-NULL set default remote username for "hosts." + * + * The first call to this function "wins," i.e. later calls to register + * will not override existing defaults. This is done because currently + * in pdsh, command line options are processed *before* configuration + * type files (i.e. genders) since these files are processed by pdsh + * modules. */ -int rcmd_register_default_module (char *hosts, char *rcmd_type); +int rcmd_register_defaults (char *hosts, char *rcmd_type, char *user); + +/* + * Register default rcmd type + */ +int rcmd_register_default_rcmd (char *rcmd_name); /* * Return default rcmd module name. */ char * rcmd_get_default_module (void); + /* - * Create rcmd connect info structure for a given host + * Create and rcmd_info object for specified host */ -struct rcmd_info * rcmd_create (char *host, char *addr, char *locuser, - char *remuser, char *cmd, int nodeid, bool err); +struct rcmd_info * rcmd_create (char *host); + +/* + * Connect using rcmd_info rcmd + */ +int rcmd_connect (struct rcmd_info *rcmd, char *host, char *addr, + char *locuser, char *remuser, char *cmd, int nodeid, + bool err); /* * Destroy rcmd connections @@ -59,7 +87,7 @@ int rcmd_destroy (struct rcmd_info *); /* - * Send a signal of the specified remote connection + * Send a signal over the specified remote connection */ int rcmd_signal (struct rcmd_info *, int signum); @@ -70,4 +98,13 @@ */ int rcmd_exit (void); +/* + * Called by rcmd module during "init" function to set various + * rcmd-specific options. (see rcmd_options structure above) + * + * Returns -1 with errno set to ESRCH if called from anywhere but + * module's rcmd_init function. + */ +int rcmd_opt_set (int id, void * value); + #endif /* !_HAVE_RCMD_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pdsh-2.9/testsuite/pdsh.test/pdsh.exp new/pdsh-2.10/testsuite/pdsh.test/pdsh.exp --- old/pdsh-2.9/testsuite/pdsh.test/pdsh.exp 2006-03-16 01:11:12.000000000 +0100 +++ new/pdsh-2.10/testsuite/pdsh.test/pdsh.exp 2006-03-22 22:04:11.000000000 +0100 @@ -12,7 +12,7 @@ set test "pdsh: version (if this fails beware that testsuite is outdated)" spawn $pdsh -V expect { - -re "pdsh-2.9" { pass "$test" } + -re "pdsh-2.10" { pass "$test" } eof { fail "$test" } } @@ -46,6 +46,13 @@ eof { fail "$test" } } +set test "pdsh: hostname range expansion works with ',' embedded in range" +spawn $pdsh -Qw foo\[0-2,4\] +expect { + -re "foo0,foo1,foo2,foo4" { pass "$test" } + eof { fail "$test" } +} + set test "pdsh: -x option works" spawn $pdsh -Qw foo\[9-11\] -x foo10 expect { @@ -67,6 +74,7 @@ eof { fail "$test" } } + set test "pdsh: ranges can be embedded in wcoll files" spawn $pdsh -Qw- send "foo\[9-11\]\n" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 goffice
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package goffice checked in at Thu Aug 31 01:55:11 CEST 2006. -------- --- GNOME/goffice/goffice.changes 2006-01-25 21:31:59.000000000 +0100 +++ /work/users/ro/STABLE/goffice/goffice.changes 2006-08-31 01:52:54.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 31 01:52:01 CEST 2006 - ro(a)suse.de + +- make it build (undef GTK_DISABLE_DEPRECATED in go-combo-box.c) + +------------------------------------------------------------------- New: ---- goffice-undeprecate.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goffice.spec ++++++ --- /var/tmp/diff_new_pack.OwbSBF/_old 2006-08-31 01:55:02.000000000 +0200 +++ /var/tmp/diff_new_pack.OwbSBF/_new 2006-08-31 01:55:02.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package goffice (Version 0.1.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,25 +13,26 @@ Name: goffice BuildRequires: gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgsf-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files Version: 0.1.2 -Release: 1 +Release: 17 URL: http://www.gnumeric.org/ Group: System/GUI/GNOME License: GPL -Summary: GLib/GTK+ Set of Document Centric Objects and Utilities +Summary: GLib/GTK+ Set of Document-Centric Objects and Utilities Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.1/%{name}-%{version}.tar.bz2 +Patch: goffice-undeprecate.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -There are common operations for document centric applications that +These are common operations for document-centric applications that are conceptually simple, but complex to implement fully. - - plugins + Plug-ins -- load/save documents +- Load and save documents -- undo/redo +- Undo and redo -GOffice is a GLib/GTK+ set of document centric objects and utilities. +GOffice is a GLib/GTK+ set of document-centric objects and utilities. @@ -71,6 +72,7 @@ %prep %setup +%patch rm po/no.* sed -i 's/$en_GB.* $no /\1/' configure.in @@ -113,6 +115,8 @@ /opt/gnome/include/* %changelog -n goffice +* Thu Aug 31 2006 - ro(a)suse.de +- make it build (undef GTK_DISABLE_DEPRECATED in go-combo-box.c) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Nov 16 2005 - sbrabec(a)suse.cz ++++++ goffice-undeprecate.patch ++++++ --- goffice/gtk/go-combo-box.c +++ goffice/gtk/go-combo-box.c @@ -23,6 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA. */ +#undef GTK_DISABLE_DEPRECATED #include <goffice/goffice-config.h> #include "go-combo-box.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package yast2 checked in at Wed Aug 30 23:43:43 CEST 2006. -------- --- yast2/yast2.changes 2006-08-23 16:55:26.000000000 +0200 +++ yast2/yast2.changes 2006-08-30 15:24:49.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 30 15:23:33 CEST 2006 - locilka(a)suse.cz + +- DnsServerPunycode module moved from yast2-dns-server to yast2 + as Punycode module. +- 2.13.78 + +------------------------------------------------------------------- Old: ---- yast2-2.13.77.tar.bz2 New: ---- yast2-2.13.78.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.C13Z5A/_old 2006-08-30 23:43:35.000000000 +0200 +++ /var/tmp/diff_new_pack.C13Z5A/_new 2006-08-30 23:43:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.77) +# spec file for package yast2 (Version 2.13.78) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2 -Version: 2.13.77 +Version: 2.13.78 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.77.tar.bz2 +Source0: yast2-2.13.78.tar.bz2 prefix: /usr Patch: yast2.xversion.patch Patch1: yast2.kernel-package.patch @@ -99,7 +99,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.13.77 +%setup -n yast2-2.13.78 %if 0%{?suse_version} <= 1010 %else %patch0 @@ -204,6 +204,10 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Wed Aug 30 2006 - locilka(a)suse.cz +- DnsServerPunycode module moved from yast2-dns-server to yast2 + as Punycode module. +- 2.13.78 * Wed Aug 23 2006 - jsrain(a)suse.cz - added release-specific Xvnc parameters - 2.13.77 ++++++ yast2-2.13.77.tar.bz2 -> yast2-2.13.78.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.77/VERSION new/yast2-2.13.78/VERSION --- old/yast2-2.13.77/VERSION 2006-08-23 16:43:20.000000000 +0200 +++ new/yast2-2.13.78/VERSION 2006-08-30 15:23:01.000000000 +0200 @@ -1 +1 @@ -2.13.77 +2.13.78 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.77/configure new/yast2-2.13.78/configure --- old/yast2-2.13.77/configure 2006-08-23 16:53:09.000000000 +0200 +++ new/yast2-2.13.78/configure 2006-08-30 15:28:21.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2 2.13.77. +# Generated by GNU Autoconf 2.59 for yast2 2.13.78. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.13.77' -PACKAGE_STRING='yast2 2.13.77' +PACKAGE_VERSION='2.13.78' +PACKAGE_STRING='yast2 2.13.78' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,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 2.13.77 to adapt to many kinds of systems. +\`configure' configures yast2 2.13.78 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.13.77:";; + short | recursive ) echo "Configuration of yast2 2.13.78:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.13.77 +yast2 configure 2.13.78 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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 $as_me 2.13.77, which was +It was created by yast2 $as_me 2.13.78, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.13.77' + VERSION='2.13.78' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.77" +VERSION="2.13.78" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2797,7 +2797,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2 $as_me 2.13.77, which was +This file was extended by yast2 $as_me 2.13.78, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2852,7 +2852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.13.77 +yast2 config.status 2.13.78 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.77/configure.in new/yast2-2.13.78/configure.in --- old/yast2-2.13.77/configure.in 2006-08-23 16:52:59.000000000 +0200 +++ new/yast2-2.13.78/configure.in 2006-08-30 15:28:15.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.77, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.13.78, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.77" +VERSION="2.13.78" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.77/library/modules/Version.ycp new/yast2-2.13.78/library/modules/Version.ycp --- old/yast2-2.13.77/library/modules/Version.ycp 2006-08-23 16:53:40.000000000 +0200 +++ new/yast2-2.13.78/library/modules/Version.ycp 2006-08-30 15:28:32.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.77"; +global string yast2 = "2.13.78"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.77/library/types/src/Punycode.ycp new/yast2-2.13.78/library/types/src/Punycode.ycp --- old/yast2-2.13.77/library/types/src/Punycode.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.13.78/library/types/src/Punycode.ycp 2006-08-30 15:26:52.000000000 +0200 @@ -0,0 +1,374 @@ +/** + * File: modules/Punycode.ycp + * Package: Main yast package + * Summary: DNS Punycode Handling + * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> + * Tags: Unstable + * + * $Id:$ + * + */ + +{ + + module "Punycode"; + textdomain "base"; + + string tmp_dir = nil; + + // string, matching this regexp, is not cached + string not_cached_regexp = "^[0123456789\.]*$"; + + // + // Encoded string in cache has the same index + // as its Decoded format in the second list. + // + + // list of encoded strings to be cached (Punycode or Unicode) + list <string> cache_encoded = []; + // list of decoded strings to be cached (Unicode or Punycode) + list <string> cache_decoded = []; + + integer current_cache_index = 0; + + // cached amount of data should be controled + integer current_cache_size = 0; + integer maximum_cache_size = 32768; + + /** + * Returns the maximum cache size (sum of already converted + * strings). + * + * @return integer maximum_cache_size + * @see SetMaximumCacheSize() + */ + global define integer GetMaximumCacheSize () { + return maximum_cache_size; + } + + /** + * Offers to set the maximum cache size (sum of already + * converted strings). + * + * @param integer new_max_size + * @see GetMaximumCacheSize() + */ + global define void SetMaximumCacheSize (integer new_max_size) { + if (new_max_size != nil) { + maximum_cache_size = new_max_size; + } else { + y2error("Cannot set MaximumCacheSize to nil!"); + } + } + + /** + * Adds new cache records for encoded and decoded strings. + * + * @params string decoded + * @params string encoded + */ + define void CreateNewCacheRecord (string decoded, string encoded) { + // Erroneous cache record + if (decoded == nil || encoded == nil) return; + + // Already cached + if (contains(cache_decoded, decoded)) return; + + integer decoded_size = size(decoded); + integer encoded_size = size(encoded); + + // Do not store this record if the cache would exceed maximum + if ((current_cache_size + decoded_size + encoded_size) > maximum_cache_size) return; + + current_cache_size = current_cache_size + decoded_size + encoded_size; + cache_decoded[current_cache_index] = decoded; + cache_encoded[current_cache_index] = encoded; + current_cache_index = current_cache_index + 1; + } + + /** + * Returns string encoded in Punycode if it has been + * already cached. Returns nil if not found. + * + * @param string decoded_string (Unicode) + * @return string encoded_string (Punycode) + */ + define string GetEncodedCachedString (string decoded_string) { + string ret = nil; + + // numbers and empty strings are not converted + if (regexpmatch(decoded_string, not_cached_regexp)) { + return decoded_string; + } + + integer counter = -1; + // searching through decoded strings to find the index + foreach (string cached_string, cache_decoded, { + counter = counter + 1; + if (cached_string == decoded_string) { + // returning encoded representation + ret = cache_encoded[counter]:nil; + break; + } + }); + + return ret; + } + + /** + * Returns string encoded in Punycode if it has been + * already cached. Returns nil if not found. + * + * @param string encoded_string (Punycode) + * @return string decoded_string (Unicode) + */ + define string GetDecodedCachedString (string encoded_string) { + string ret = nil; + + // numbers and empty strings are not converted + if (regexpmatch(encoded_string, not_cached_regexp)) { + return encoded_string; + } + + integer counter = -1; + // searching through encoded strings to find the index + foreach (string cached_string, cache_encoded, { + counter = counter + 1; + if (cached_string == encoded_string) { + // returning decoded representation + ret = cache_decoded[counter]:nil; + break; + } + }); + + return ret; + } + + /** + * Returns the current temporary directory. + * Lazy loading for the initialization is used. + */ + define string GetTmpDirectory () { + if (tmp_dir == nil) { + tmp_dir = (string) SCR::Read(.target.tmpdir); + } + + return tmp_dir; + } + + /** + * Function takes the list of strings and returns them in the converted + * format. Unicode to Punycode or Punycode to Unicode (param to_punycode). + * It uses a cache of already-converted strings. + */ + define list <string> ConvertBackAndForth (list <string> strings_in, boolean to_punycode) { + // list of returned strings + list <string> strings_out = []; + + // Some (or maybe all) strings needn't be cached + list <string> not_cached = []; + + // Check the cache for already entered strings + integer current_index = -1; + map <string, string> test_cached = listmap (string string_in, strings_in, { + string string_out = nil; + + // Numbers, IPs and empty strings are not converted + if (regexpmatch(string_in, not_cached_regexp)) { + string_out = string_in; + } else { + if (to_punycode) { + string_out = GetEncodedCachedString(string_in); + } else { + string_out = GetDecodedCachedString(string_in); + } + } + + if (string_out == nil) { + current_index = current_index + 1; + not_cached[current_index] = string_in; + } + + return $[string_in : string_out]; + }); + + list <string> converted_not_cached = []; + + // There is something not cached, converting them at once + if (not_cached != []) { + string tmp_in = GetTmpDirectory() + "/tmp-idnconv-in.ycp"; + string tmp_out = GetTmpDirectory() + "/tmp-idnconv-out.ycp"; + + SCR::Write(.target.ycp, tmp_in, not_cached); + string convert_command = sformat( + "/usr/bin/idnconv %1 %2 > %3", + (to_punycode ? "":"-reverse"), tmp_in, tmp_out + ); + + if ((integer) SCR::Execute(.target.bash, convert_command) != 0) { + y2error("Conversion failed!"); + } else { + converted_not_cached = (list <string>) SCR::Read(.target.ycp, tmp_out); + // Parsing the YCP file failed + if (converted_not_cached == nil) { + y2error("Erroneous YCP file: %1", SCR::Read(.target.string, tmp_out)); + } + } + } + + // Listing through the given list and adjusting the return list + current_index = -1; + integer found_index = -1; + foreach (string string_in, strings_in, { + current_index = current_index + 1; + + // Already cached string + if (test_cached[string_in]:nil != nil) { + strings_out[current_index] = test_cached[string_in]:""; + + // Recently converted strings + } else { + found_index = found_index + 1; + strings_out[current_index] = converted_not_cached[found_index]:""; + + // Adding converted strings to cache + if (to_punycode) { + CreateNewCacheRecord(string_in, converted_not_cached[found_index]:""); + } else { + CreateNewCacheRecord(converted_not_cached[found_index]:"", string_in); + } + } + }); + + return strings_out; + } + + /** + * Converts list of UTF-8 strings into their Punycode + * ASCII repserentation. + * + * @param list <string> punycode_strings + * @return list <string> encoded_strings + */ + global define list <string> EncodePunycodes (list <string> punycode_strings) { + return ConvertBackAndForth(punycode_strings, true); + } + + /** + * Converts list of Punycode strings into their UTF-8 + * representation. + * + * @param list <string> punycode_strings + * @return list <string> decoded_strings + */ + global define list <string> DecodePunycodes (list <string> punycode_strings) { + return ConvertBackAndForth(punycode_strings, false); + } + + /** + * Encodes the domain name (relative or FQDN) to the Punycode. + * + * @param string decoded domain_name + * @return string encoded domain_name + * + * @example + * EncodeDomainName("žížala.jůlinka.go.home") + * -> "xn--ala-qma83eb.xn--jlinka-3mb.go.home" + */ + global define string EncodeDomainName (string decoded_domain_name) { + return mergestring( + EncodePunycodes( + splitstring(decoded_domain_name, ".") + ), + "." + ); + } + + /** + * Decodes the domain name (relative or FQDN) from the Punycode. + * + * @param string encoded_domain_name + * @return string decoded domain_name + * + * @example + * DecodeDomainName("xn--ala-qma83eb.xn--jlinka-3mb.go.home") + * -> "žížala.jůlinka.go.home" + */ + global define string DecodeDomainName (string encoded_domain_name) { + return mergestring( + DecodePunycodes( + splitstring(encoded_domain_name, ".") + ), + "." + ); + } + + /** + * Decodes the list of domain names to their Unicode representation. + * This function is similar to DecodePunycodes but it works with every + * string as a domain name (that means every domain name is parsed + * by dots and separately evaluated). + * + * @param list <string> encoded_domain_names + * @return list <string> decoded_domain_names + * + * @example + * DocodeDomainNames(["mx1.example.org", "xp3.example.org.", "xn--ala-qma83eb.org.example."]) + * -> ["mx1.example.org", "xp3.example.org.", "žížala.org.example."] + */ + global define list <string> DocodeDomainNames (list <string> encoded_domain_names) { + list <string> decoded_domain_names = []; + list <string> strings_to_decode = []; + + // $[0 : [0, 2], 1 : [3, 5]] + map <integer, list <integer> > backward_map_of_conversion = $[]; + + integer current_domain_index = -1; + integer current_domain_item = 0; + + // parsing all domain names one by one + foreach (string one_domain_name, encoded_domain_names, { + current_domain_index = current_domain_index + 1; + integer start = current_domain_item; + + // parsing the domain name by dots + foreach (string domain_item, splitstring(one_domain_name, "."), { + strings_to_decode[current_domain_item] = domain_item; + current_domain_item = current_domain_item + 1; + }); + // creating backward index + backward_map_of_conversion[current_domain_index] = [start, (current_domain_item-1)]; + }); + + // Transformating strings to the decoded format + strings_to_decode = DecodePunycodes(strings_to_decode); + + current_domain_index = -1; + foreach (string one_encoded, encoded_domain_names, { + current_domain_index = current_domain_index + 1; + + // Where the current string starts and ends + integer current = backward_map_of_conversion[current_domain_index, 0]:nil; + integer end = backward_map_of_conversion[current_domain_index, 1]:nil; + + // error? + if (current == nil || end == nil) { + y2error("Cannot find start/end for %1 in %2", + one_encoded, backward_map_of_conversion[current_domain_index]:nil + ); + decoded_domain_names[current_domain_index] = one_encoded; + } else { + // create a list of items of the current domain (translated) + list <string> decoded_domain = []; + while (current <= end) { + decoded_domain = add(decoded_domain, strings_to_decode[current]:""); + current = current + 1; + } + // create a domain name from these strings + decoded_domain_names[current_domain_index] = mergestring(decoded_domain, "."); + } + }); + + return decoded_domain_names; + } +} ++++++ yast2.xversion.patch ++++++ --- /var/tmp/diff_new_pack.C13Z5A/_old 2006-08-30 23:43:38.000000000 +0200 +++ /var/tmp/diff_new_pack.C13Z5A/_new 2006-08-30 23:43:38.000000000 +0200 @@ -30,4 +30,4 @@ +Xstartpath="" +Xdriverpath="/usr/lib/xorg/modules/drivers" +Xdriver64path="/usr/lib64/xorg/modules/drivers" -+Xvncparam="-rfbauth" ++Xvncparam="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wireless-tools
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package wireless-tools checked in at Wed Aug 30 23:43:37 CEST 2006. -------- --- wireless-tools/wireless-tools.changes 2006-05-17 16:30:15.000000000 +0200 +++ wireless-tools/wireless-tools.changes 2006-08-30 14:57:17.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Aug 30 14:50:52 CEST 2006 - jg(a)suse.de + +- update to version 29pre10, changes (shortened): + * Check event stream 'point' payload size to avoid overflow [iwlib] + * Make all users of event stream 'point' safe to NULL [iwlist/iwevent] + * 'iwconfig txpower 1dBm' should not be 'mW' [iwconfig] + * Forward compat. to WE-21 : essid len is strlen, not +1 [iwconfig] + * Update definition of 'ap' and 'sens' to reflect reality [man] + * Add WE-20 headers, compile with that as default + * Add new power value : 'power saving' [iwconfig/iwlist/iwlib] + * Optimise getting iwrange when setting TxPower [iwconfig] + * Add support for unicast and broadcast bitrates [iwconfig/iwlist] + * Drop 'domain' alias for 'nwid'. Obsolete. [iwconfig] + * Update manpages with new features above [man] + * Add temp variable to sscanf() to fix 64 bits issues [iwconfig] + * Add 'last' scan option for left-over scan [iwlist] + * Add 'essid' scan option for directed scan [iwlist] + * Fix segfault on setting bitrate (parse wrong arg) [iwconfig] + * More WPA support : iwlist auth/wpakeys/genie [iwlist] +- added README.ipw3945 (bug 170124) + +------------------------------------------------------------------- Old: ---- wireless_tools.28.pre13.tar.bz2 New: ---- README.ipw3945 wireless_tools.29.pre10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-tools.spec ++++++ --- /var/tmp/diff_new_pack.Rd0CUc/_old 2006-08-30 23:43:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Rd0CUc/_new 2006-08-30 23:43:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wireless-tools (Version 28pre13) +# spec file for package wireless-tools (Version 29pre10) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,20 +13,21 @@ Name: wireless-tools BuildRequires: openssl-devel Summary: Tools for a wireless LAN -Version: 28pre13 -Release: 22 +Version: 29pre10 +Release: 1 %define wlanng_version 0.2.2 Group: Hardware/Other License: LGPL, Unknown BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html Autoreqprov: on -Source: wireless_tools.28.pre13.tar.bz2 +Source: wireless_tools.29.pre10.tar.bz2 Patch: wireless_tools.dif Patch1: iwlib.patch Source2: suse-files.tar.gz Source3: prism2.modprobe Source4: ipw2200.modprobe +Source5: README.ipw3945 Source30: linux-wlan-ng-%{wlanng_version}.tar.bz2 Patch30: linux-wlan-ng.dif Patch31: linux-wlan-ng-2.6.14.dif @@ -52,7 +53,7 @@ %patch32 -p1 cp %{SOURCE31} config.mk cp %{SOURCE32} mkversionh.sh -%setup -q -n wireless_tools.28 +%setup -q -n wireless_tools.29 %patch %patch1 -p0 @@ -97,6 +98,7 @@ echo "# disable ipw2100 on x86_64 (module broken)" echo "install ipw2100 /bin/true" >> %{buildroot}/etc/modprobe.d/ipw2100 %endif +cp -a %{SOURCE5} . %clean test -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT @@ -112,6 +114,25 @@ %doc CHANGELOG.h INSTALL PCMCIA.txt README* ../wlan-ng %changelog -n wireless-tools +* Wed Aug 30 2006 - jg(a)suse.de +- update to version 29pre10, changes (shortened): + * Check event stream 'point' payload size to avoid overflow [iwlib] + * Make all users of event stream 'point' safe to NULL [iwlist/iwevent] + * 'iwconfig txpower 1dBm' should not be 'mW' [iwconfig] + * Forward compat. to WE-21 : essid len is strlen, not +1 [iwconfig] + * Update definition of 'ap' and 'sens' to reflect reality [man] + * Add WE-20 headers, compile with that as default + * Add new power value : 'power saving' [iwconfig/iwlist/iwlib] + * Optimise getting iwrange when setting TxPower [iwconfig] + * Add support for unicast and broadcast bitrates [iwconfig/iwlist] + * Drop 'domain' alias for 'nwid'. Obsolete. [iwconfig] + * Update manpages with new features above [man] + * Add temp variable to sscanf() to fix 64 bits issues [iwconfig] + * Add 'last' scan option for left-over scan [iwlist] + * Add 'essid' scan option for directed scan [iwlist] + * Fix segfault on setting bitrate (parse wrong arg) [iwconfig] + * More WPA support : iwlist auth/wpakeys/genie [iwlist] +- added README.ipw3945 (bug 170124) * Wed May 17 2006 - jg(a)suse.de - install_intersil_firmware: fixed URL of PrismGT firmware package (bug 173875) ++++++ wireless_tools.28.pre13.tar.bz2 -> wireless_tools.29.pre10.tar.bz2 ++++++ ++++ 9361 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 kernel-source
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package kernel-source checked in at Wed Aug 30 23:43:24 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-08-28 22:45:48.000000000 +0200 +++ kernel-source/kernel-bigsmp.changes 2006-08-30 14:50:49.000000000 +0200 @@ -1,0 +2,102 @@ +Wed Aug 30 14:39:14 CEST 2006 - olh(a)suse.de + +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion + +------------------------------------------------------------------- +Wed Aug 30 14:34:22 CEST 2006 - olh(a)suse.de + +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) + +------------------------------------------------------------------- +Wed Aug 30 03:21:52 CEST 2006 - tonyj(a)suse.de + +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags + +------------------------------------------------------------------- +Wed Aug 30 02:31:45 CEST 2006 - gregkh(a)suse.de + +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. + +------------------------------------------------------------------- +Tue Aug 29 23:17:59 CEST 2006 - gregkh(a)suse.de + +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. + +------------------------------------------------------------------- +Tue Aug 29 21:01:47 CEST 2006 - olh(a)suse.de + +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog + +------------------------------------------------------------------- +Tue Aug 29 17:55:51 CEST 2006 - jeffm(a)suse.de + +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs + +------------------------------------------------------------------- +Tue Aug 29 14:07:42 CEST 2006 - axboe(a)suse.de + +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. + +------------------------------------------------------------------- +Tue Aug 29 10:09:38 CEST 2006 - gregkh(a)suse.de + +- patches.arch/s390-raw-device: Delete. + +------------------------------------------------------------------- +Tue Aug 29 09:53:28 CEST 2006 - okir(a)suse.de + +- patches.fixes/ipv6-init-fail-cleanup: Delete. + +------------------------------------------------------------------- +Tue Aug 29 08:33:31 CEST 2006 - ak(a)suse.de + +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments + +------------------------------------------------------------------- +Tue Aug 29 08:08:32 CEST 2006 - gregkh(a)suse.de + +- patches.suse/acpi-oldboot: Delete. + +------------------------------------------------------------------- +Tue Aug 29 05:07:50 CEST 2006 - gregkh(a)suse.de + +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. + +------------------------------------------------------------------- +Tue Aug 29 03:27:39 CEST 2006 - gregkh(a)suse.de + +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). + +------------------------------------------------------------------- +Tue Aug 29 01:10:37 CEST 2006 - jeffm(a)suse.de + +- Took ownership of mason's patches without patch-mainline tags. + +------------------------------------------------------------------- +Tue Aug 29 01:05:34 CEST 2006 - gregkh(a)suse.de + +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:33.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.18_rc5 -Release: 1 +Release: 2 Summary: Kernel with Multiprocessor Support and PAE License: GPL Group: System/Kernel @@ -119,7 +119,7 @@ -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %prep if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then @@ -463,6 +463,60 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel Version: 2.6.18_rc5 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %install @@ -40,6 +40,60 @@ /etc/dummy %changelog -n kernel-dummy +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.18_rc5 -Release: 1 +Release: 2 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -120,7 +120,7 @@ -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %prep if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then @@ -464,6 +464,60 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) kernel-kdump.spec: same change ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: python %endif Version: 2.6.18_rc5 -Release: 1 +Release: 2 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -134,7 +134,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %prep if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then @@ -478,6 +478,60 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.18_rc5 -Release: 1 +Release: 2 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -117,7 +117,7 @@ -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %prep if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then @@ -461,6 +461,60 @@ %files -f kernel.files %changelog -n kernel-s390 +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -25,7 +25,7 @@ %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status Version: 2.6.18_rc5 -Release: 1 +Release: 2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -92,7 +92,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %prep if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then @@ -274,6 +274,60 @@ %files -f kernel-source.files %changelog -n kernel-source +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -49,7 +49,7 @@ Summary: Kernel Symbol Versions (modversions) Group: Development/Sources Version: 2.6.18_rc5 -Release: 1 +Release: 2 Requires: linux Requires: kernel-source = 2.6.18_rc5-%release Source11: arch-symbols @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %install @@ -127,6 +127,60 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.18_rc5 -Release: 1 +Release: 2 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -125,7 +125,7 @@ -Source Timestamp: 2006/08/28 11:47:00 UTC +Source Timestamp: 2006/08/30 12:40:00 UTC %prep if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then @@ -469,6 +469,60 @@ %files -f kernel.files %changelog -n kernel-um +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.suse/floppy-printk.patch + dont print anything if there is no floppy to avoid hwinfo confusion +* Wed Aug 30 2006 - olh(a)suse.de +- add patches.arch/ppc-update_gtod-race.patch + fix timebase overflow on ppc32 (202146) +* Wed Aug 30 2006 - tonyj(a)suse.de +- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags +- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags +* Wed Aug 30 2006 - gregkh(a)suse.de +- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working + on the migration tools for the upgrade issues. +- patches.drivers/smbfs-sendqueue-backoff: Delete. +- patches.drivers/smbfs-request-counting: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/rcu-remote: Delete. +- patches.suse/rcu-scale: Delete. +* Tue Aug 29 2006 - olh(a)suse.de +- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch + drop patches.arch/ppc-kdump-shutdown-interrupts.patch + merged in mainline + drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch + sysrq is broken on pmac_zilog +* Tue Aug 29 2006 - jeffm(a)suse.de +- Merged patches.suse/initramfs-before-acpi.patch into + patches.suse/acpi_dsdt_initrd_initramfs +* Tue Aug 29 2006 - axboe(a)suse.de +- patches.drivers/sis5513-support-sis-965l: Delete. +- patches.fixes/libata-increase-timeout-for-resume: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/s390-raw-device: Delete. +* Tue Aug 29 2006 - okir(a)suse.de +- patches.fixes/ipv6-init-fail-cleanup: Delete. +* Tue Aug 29 2006 - ak(a)suse.de +- patches.arch/x86_64-nmi-watchdog-timeout: Delete. +- patches.suse/bh-cache-option: Delete. +- patches.arch/i386-default-max-mp-busses: Fix comments +- patches.arch/disable-apic-error: Fix comments +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.suse/acpi-oldboot: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- Removed unused patches from the tree +- patches.fixes/kdb-missing-export.diff: Delete. +- patches.fixes/nfsd-setuser-fix: Delete. +- patches.rpmify/suse-extmod-legacy: Delete. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.fixes/nfsv4-setclientid: Delete. +- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive + SAMSUNG SFD-321U/EP detected 8 times (117643). +* Tue Aug 29 2006 - jeffm(a)suse.de +- Took ownership of mason's patches without patch-mainline tags. +* Tue Aug 29 2006 - gregkh(a)suse.de +- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete. +- patches.fixes/tulip-down-race: Delete. * Mon Aug 28 2006 - olh(a)suse.de - add patches.suse/mv643xx_eth.hwinfo.patch load the driver via the PCI bridge id until hwinfo is fixed (199112) kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-08-28 22:45:41.000000000 +0200 +++ kernel-source/build-source-timestamp 2006-08-30 14:50:46.000000000 +0200 @@ -1 +1 @@ -2006/08/28 11:47:00 UTC +2006/08/30 12:40:00 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default --- old/config/alpha/default 2006-08-28 09:59:05.000000000 +0200 +++ new/config/alpha/default 2006-08-30 14:52:41.000000000 +0200 @@ -3050,9 +3050,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/bigsmp new/config/i386/bigsmp --- old/config/i386/bigsmp 2006-08-28 20:03:28.000000000 +0200 +++ new/config/i386/bigsmp 2006-08-30 14:52:41.000000000 +0200 @@ -3389,9 +3389,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2006-08-28 20:03:28.000000000 +0200 +++ new/config/i386/debug 2006-08-30 14:52:41.000000000 +0200 @@ -3383,9 +3383,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default --- old/config/i386/default 2006-08-28 20:03:28.000000000 +0200 +++ new/config/i386/default 2006-08-30 14:52:41.000000000 +0200 @@ -3382,9 +3382,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/kdump new/config/i386/kdump --- old/config/i386/kdump 2006-08-28 20:03:29.000000000 +0200 +++ new/config/i386/kdump 2006-08-30 14:52:41.000000000 +0200 @@ -3414,9 +3414,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/um new/config/i386/um --- old/config/i386/um 2006-08-28 20:03:29.000000000 +0200 +++ new/config/i386/um 2006-08-30 14:52:41.000000000 +0200 @@ -917,9 +917,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2006-08-28 20:03:29.000000000 +0200 +++ new/config/i386/xen 2006-08-30 14:52:41.000000000 +0200 @@ -3098,9 +3098,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae --- old/config/i386/xenpae 2006-08-28 20:03:29.000000000 +0200 +++ new/config/i386/xenpae 2006-08-30 14:52:41.000000000 +0200 @@ -3100,9 +3100,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2006-08-28 20:03:29.000000000 +0200 +++ new/config/ia64/debug 2006-08-30 14:52:41.000000000 +0200 @@ -2832,9 +2832,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2006-08-28 20:03:29.000000000 +0200 +++ new/config/ia64/default 2006-08-30 14:52:41.000000000 +0200 @@ -2831,9 +2831,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default --- old/config/powerpc/default 2006-08-28 20:03:29.000000000 +0200 +++ new/config/powerpc/default 2006-08-30 14:52:41.000000000 +0200 @@ -2186,7 +2186,6 @@ CONFIG_JBD_DEBUG=y CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=y -# CONFIG_REISERFS_CC_REDUCE_OPTIMZE is not set # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y CONFIG_REISERFS_FS_XATTR=y @@ -2294,9 +2293,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/iseries64 new/config/powerpc/iseries64 --- old/config/powerpc/iseries64 2006-08-28 20:03:29.000000000 +0200 +++ new/config/powerpc/iseries64 2006-08-30 14:52:41.000000000 +0200 @@ -1185,8 +1185,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump --- old/config/powerpc/kdump 2006-08-28 20:03:29.000000000 +0200 +++ new/config/powerpc/kdump 2006-08-30 14:52:41.000000000 +0200 @@ -168,7 +168,9 @@ CONFIG_CRASH_DUMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_PPC_SPLPAR=y +CONFIG_EEH=y CONFIG_LPARCFG=y +# CONFIG_NUMA is not set CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -1734,8 +1736,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64 --- old/config/powerpc/ppc64 2006-08-28 20:03:29.000000000 +0200 +++ new/config/powerpc/ppc64 2006-08-30 14:52:41.000000000 +0200 @@ -2052,8 +2052,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default --- old/config/s390/default 2006-08-28 20:03:29.000000000 +0200 +++ new/config/s390/default 2006-08-30 14:52:41.000000000 +0200 @@ -613,8 +613,6 @@ # CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=2048 -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=4096 CONFIG_HANGCHECK_TIMER=m # @@ -857,9 +855,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2006-08-28 20:03:29.000000000 +0200 +++ new/config/s390/s390 2006-08-30 14:52:41.000000000 +0200 @@ -608,8 +608,6 @@ # CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=2048 -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=4096 CONFIG_HANGCHECK_TIMER=m # @@ -852,9 +850,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y 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 2006-08-28 20:03:29.000000000 +0200 +++ new/config/x86_64/debug 2006-08-30 14:52:41.000000000 +0200 @@ -3005,9 +3005,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y 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 2006-08-28 20:03:29.000000000 +0200 +++ new/config/x86_64/default 2006-08-30 14:52:41.000000000 +0200 @@ -3005,9 +3005,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/kdump new/config/x86_64/kdump --- old/config/x86_64/kdump 2006-08-28 20:03:29.000000000 +0200 +++ new/config/x86_64/kdump 2006-08-30 14:52:41.000000000 +0200 @@ -3019,9 +3019,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/um new/config/x86_64/um --- old/config/x86_64/um 2006-08-28 20:03:29.000000000 +0200 +++ new/config/x86_64/um 2006-08-30 14:52:41.000000000 +0200 @@ -879,9 +879,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=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 2006-08-28 20:03:30.000000000 +0200 +++ new/config/x86_64/xen 2006-08-30 14:52:41.000000000 +0200 @@ -2932,9 +2932,7 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp850" +# CONFIG_SMB_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y ++++++ kabi.tar.bz2 ++++++ ++++ 8050 lines of diff (skipped) ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/disable-apic-error new/patches.arch/disable-apic-error --- old/patches.arch/disable-apic-error 2006-03-23 23:34:27.000000000 +0100 +++ new/patches.arch/disable-apic-error 2006-08-29 18:25:49.000000000 +0200 @@ -1,10 +1,15 @@ From: ak(a)suse.de Subject: Disable APIC error printing References: 156576 +Patch-mainline: not planned ATI chipsets currently do this all the time. It's probably mostly harmless +We keep it enabled in mainline to make sure the (hardware?) bug +is tracked down, but don't bother in the distribution kernels +with it. + Index: linux-2.6.16/arch/i386/kernel/apic.c =================================================================== --- linux-2.6.16.orig/arch/i386/kernel/apic.c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i386-default-max-mp-busses new/patches.arch/i386-default-max-mp-busses --- old/patches.arch/i386-default-max-mp-busses 2006-01-23 10:35:47.000000000 +0100 +++ new/patches.arch/i386-default-max-mp-busses 2006-08-29 18:25:50.000000000 +0200 @@ -1,6 +1,7 @@ From: ak(a)suse.de Subject: Increase MAX_MP_BUSSES in default kernel to match generic Suse-bugzilla: 57179 +Patch-mainline: Should be in 2.6.19 Index: linux-2.6.15/include/asm-i386/mach-default/mach_mpspec.h =================================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ia64-export-node-to-cpu-mask.patch new/patches.arch/ia64-export-node-to-cpu-mask.patch --- old/patches.arch/ia64-export-node-to-cpu-mask.patch 2006-06-15 08:04:10.000000000 +0200 +++ new/patches.arch/ia64-export-node-to-cpu-mask.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -From: Greg Banks <gnb(a)sgi.com> -Subject: export node_to_cpu_mask to allow SGI access to it. -Patch-mainline: never -References: 182109 - -Why don't people ever submit their external modules to mainline so we -don't have to worry about little things like this... - -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - arch/ia64/kernel/numa.c | 1 + - 1 files changed, 1 insertion(+) - ---- linux-2.6.16.orig/arch/ia64/kernel/numa.c -+++ linux-2.6.16/arch/ia64/kernel/numa.c -@@ -29,6 +29,7 @@ u8 cpu_to_node_map[NR_CPUS] __cacheline_ - EXPORT_SYMBOL(cpu_to_node_map); - - cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; -+EXPORT_SYMBOL_GPL(node_to_cpu_mask); - - /** - * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-disable-eeh-and-numa.patch new/patches.arch/ppc-kdump-disable-eeh-and-numa.patch --- old/patches.arch/ppc-kdump-disable-eeh-and-numa.patch 2006-08-01 20:10:19.000000000 +0200 +++ new/patches.arch/ppc-kdump-disable-eeh-and-numa.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -Subject: hide EEH and NUMA support for crashdump kernel builds -From: olh(a)suse.de -References: 175754 - LTC23902, 149586 - LTC21304 - ---- - arch/powerpc/Kconfig | 2 +- - arch/powerpc/platforms/pseries/Kconfig | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: linux-2.6.16/arch/powerpc/platforms/pseries/Kconfig -=================================================================== ---- linux-2.6.16.orig/arch/powerpc/platforms/pseries/Kconfig -+++ linux-2.6.16/arch/powerpc/platforms/pseries/Kconfig -@@ -11,7 +11,7 @@ config PPC_SPLPAR - - config EEH - bool "PCI Extended Error Handling (EEH)" if EMBEDDED -- depends on PPC_PSERIES -+ depends on PPC_PSERIES && !CRASH_DUMP - default y if !EMBEDDED - - config SCANLOG -Index: linux-2.6.16/arch/powerpc/Kconfig -=================================================================== ---- linux-2.6.16.orig/arch/powerpc/Kconfig -+++ linux-2.6.16/arch/powerpc/Kconfig -@@ -615,7 +615,7 @@ source "arch/powerpc/platforms/pseries/K - - config NUMA - bool "NUMA support" -- depends on PPC64 -+ depends on PPC64 && !CRASH_DUMP - default y if SMP && PPC_PSERIES - - config ARCH_SELECT_MEMORY_MODEL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-shutdown-interrupts.patch new/patches.arch/ppc-kdump-shutdown-interrupts.patch --- old/patches.arch/ppc-kdump-shutdown-interrupts.patch 2006-08-01 20:10:19.000000000 +0200 +++ new/patches.arch/ppc-kdump-shutdown-interrupts.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -Subject: [PATCH] powerpc: Disable and EOI interrupts in machine_crash_shutdown() -From: Michael Ellerman <michael(a)ellerman.id.au> -Date: Tue, 04 Apr 2006 13:43:01 +0200 -Message-Id: <20060404114306.8DC0F679EF(a)ozlabs.org> - -Bug 152932 - LTC21954 - kdump: js20 stuck after "Brought up 2 CPUs" -Bug 152925 - LTC21956 - kdump: no input accepted on power5 hvc console - -We've seen several bugs caused by interrupt weirdness in the kdump kernel. -Panicking from an interrupt handler means we fail to EOI the interrupt, and -so the second kernel never gets that interrupt ever again. We also see hangs -on JS20 where we take interrupts in the second kernel early during boot. - -This patch fixes both those problems, and although it adds more code to the -crash path I think it is the best solution. - -Signed-off-by: Michael Ellerman <michael(a)ellerman.id.au> -Signed-off-by: Olaf Hering <olh(a)suse.de> - ---- - arch/powerpc/kernel/crash.c | 2 ++ - 1 files changed, 2 insertions(+) - ---- linux-2.6.17.orig/arch/powerpc/kernel/crash.c -+++ linux-2.6.17/arch/powerpc/kernel/crash.c -@@ -249,6 +249,8 @@ void crash_kexec_secondary(struct pt_reg - #else - static void crash_kexec_prepare_cpus(int cpu) - { -+ unsigned int irq; -+ - /* - * move the secondarys to us so that we can copy - * the new kernel 0-0x100 safely diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-xmon-stop-cpu.patch new/patches.arch/ppc-kdump-xmon-stop-cpu.patch --- old/patches.arch/ppc-kdump-xmon-stop-cpu.patch 2006-04-13 13:49:13.000000000 +0200 +++ new/patches.arch/ppc-kdump-xmon-stop-cpu.patch 2006-08-30 14:52:41.000000000 +0200 @@ -2,6 +2,7 @@ From: David Wilder <dwilder(a)us.ibm.com> Date: Mon, 10 Apr 2006 15:32:21 -0700 Message-ID: <443ADCF5.60702(a)us.ibm.com> +Patch-mainline: 2.6.19 ? Bug 149545 - LTC21344-kdump boot panic when a CPU hangs in the first kernel Bug 149557 - LTC21346-kdump panicks during the system hang when the xmon is enabled diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-reiserfs-cc-optimize.patch new/patches.arch/ppc-reiserfs-cc-optimize.patch --- old/patches.arch/ppc-reiserfs-cc-optimize.patch 2005-08-27 12:38:37.000000000 +0200 +++ new/patches.arch/ppc-reiserfs-cc-optimize.patch 2006-08-30 14:52:41.000000000 +0200 @@ -1,46 +1,27 @@ -From: olh(a)suse.de Subject: only compile with -O1 if the compiler is broken +From: Olaf Hering <olh(a)suse.de> +Only compile with -O1 if the (very old) compiler is broken. We use +reiserfs alot since SLES9 on ppc64, and it was never seen with gcc33. +Assume the broken gcc is gcc-3.4 or older. -Index: linux-2.6.12-rc3-olh/fs/reiserfs/Makefile -=================================================================== ---- linux-2.6.12-rc3-olh.orig/fs/reiserfs/Makefile -+++ linux-2.6.12-rc3-olh/fs/reiserfs/Makefile -@@ -21,13 +21,7 @@ ifeq ($(CONFIG_REISERFS_FS_POSIX_ACL),y) - reiserfs-objs += xattr_acl.o - endif - --# gcc -O2 (the kernel default) is overaggressive on ppc32 when many inline --# functions are used. This causes the compiler to advance the stack --# pointer out of the available stack space, corrupting kernel space, --# and causing a panic. Since this behavior only affects ppc32, this ifeq --# will work around it. If any other architecture displays this behavior, --# add it here. --ifeq ($(CONFIG_PPC32),y) -+ifeq ($(CONFIG_REISERFS_CC_REDUCE_OPTIMZE),y) - EXTRA_CFLAGS := -O1 +Signed-off-by: Olaf Hering <olh(a)suse.de> +Signed-off-by: Andrew Morton <akpm(a)osdl.org> +--- + + fs/reiserfs/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff -puN fs/reiserfs/Makefile~use-gcc-o1-in-fs-reiserfs-only-for-ancient-gcc-versions fs/reiserfs/Makefile +--- a/fs/reiserfs/Makefile~use-gcc-o1-in-fs-reiserfs-only-for-ancient-gcc-versions ++++ a/fs/reiserfs/Makefile +@@ -28,7 +28,7 @@ endif + # will work around it. If any other architecture displays this behavior, + # add it here. + ifeq ($(CONFIG_PPC32),y) +-EXTRA_CFLAGS := -O1 ++EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1) endif -Index: linux-2.6.12-rc3-olh/fs/Kconfig -=================================================================== ---- linux-2.6.12-rc3-olh.orig/fs/Kconfig -+++ linux-2.6.12-rc3-olh/fs/Kconfig -@@ -186,6 +186,18 @@ config REISERFS_FS - If you like it, you can pay us to add new features to it that you - need, buy a support contract, or pay us to port it to another OS. - -+config REISERFS_CC_REDUCE_OPTIMZE -+ bool "Reduce CC optimization level to workaround compiler bugs" -+ depends on PPC32 -+ default n -+ help -+ gcc -O2 (the kernel default) is overaggressive on ppc32 when many inline -+ functions are used. This causes the compiler to advance the stack -+ pointer out of the available stack space, corrupting kernel space, -+ and causing a panic. Since this behavior only affects ppc32, this ifeq -+ will work around it. If any other architecture displays this behavior, -+ add it here. -+ - config REISERFS_CHECK - bool "Enable reiserfs debug mode" - depends on REISERFS_FS + TAGS: +_ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-update_gtod-race.patch new/patches.arch/ppc-update_gtod-race.patch --- old/patches.arch/ppc-update_gtod-race.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-update_gtod-race.patch 2006-08-30 14:35:32.000000000 +0200 @@ -0,0 +1,145 @@ +Subject: fix gettimeofday vs. update_gtod race +From: Paul Mackerras <paulus(a)samba.org> +References: 197699 , LTC24884 , 202146 + +breaks ppc32, so make it 64bit only for the time being: + + +Userspace can (very, very) occasionally get bogus time values due to +a tiny race between powerpc's do_gettimeofday and timer interrupt: + +1. do_gettimeofday does get_tb() + +2. decrementer exception on boot cpu which runs timer_recalc_offset, + which also samples the timebase and updates the do_gtod structure + with a greater timebase value. + +3. do_gettimeofday calls __do_gettimeofday, which leads to the + negative result from tb_val - temp_varp->tb_orig_stamp. + +The fix is to ensure that do_gettimeofday samples the timebase only +after loading do_gtod.varp. + + +Signed-off-by: Nathan Lynch <ntl(a)pobox.com> +Signed-off-by: Olaf Hering <olh(a)suse.de> + + + +This patch should fix it. The problem was that I was comparing a +32-bit quantity with a 64-bit quantity, and consequently time wasn't +advancing. This makes us use a 64-bit quantity on all platforms, +which ends up simplifying the code since we can now get rid of the +tb_last_stamp variable (which actually fixes another bug that Ben H +and I noticed while going carefully through the code). + +This works fine on my G4 tibook. Let me know how it goes on your +machines. + +Paul. + +--- + arch/powerpc/kernel/time.c | 25 ++++++++----------------- + include/asm-powerpc/time.h | 4 ---- + 2 files changed, 8 insertions(+), 21 deletions(-) + +Index: linux-2.6.17/arch/powerpc/kernel/time.c +=================================================================== +--- linux-2.6.17.orig/arch/powerpc/kernel/time.c ++++ linux-2.6.17/arch/powerpc/kernel/time.c +@@ -125,15 +125,8 @@ static long timezone_offset; + unsigned long ppc_proc_freq; + unsigned long ppc_tb_freq; + +-u64 tb_last_jiffy __cacheline_aligned_in_smp; +-unsigned long tb_last_stamp; +- +-/* +- * Note that on ppc32 this only stores the bottom 32 bits of +- * the timebase value, but that's enough to tell when a jiffy +- * has passed. +- */ +-DEFINE_PER_CPU(unsigned long, last_jiffy); ++static u64 tb_last_jiffy __cacheline_aligned_in_smp; ++static DEFINE_PER_CPU(u64, last_jiffy); + + #ifdef CONFIG_VIRT_CPU_ACCOUNTING + /* +@@ -458,7 +451,7 @@ void do_gettimeofday(struct timeval *tv) + do { + seq = read_seqbegin_irqsave(&xtime_lock, flags); + sec = xtime.tv_sec; +- nsec = xtime.tv_nsec + tb_ticks_since(tb_last_stamp); ++ nsec = xtime.tv_nsec + tb_ticks_since(tb_last_jiffy); + } while (read_seqretry_irqrestore(&xtime_lock, seq, flags)); + usec = nsec / 1000; + while (usec >= 1000000) { +@@ -700,7 +693,6 @@ void timer_interrupt(struct pt_regs * re + tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy; + if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) { + tb_last_jiffy = tb_next_jiffy; +- tb_last_stamp = per_cpu(last_jiffy, cpu); + do_timer(regs); + timer_recalc_offset(tb_last_jiffy); + timer_check_rtc(); +@@ -749,7 +741,7 @@ void __init smp_space_timers(unsigned in + int i; + unsigned long half = tb_ticks_per_jiffy / 2; + unsigned long offset = tb_ticks_per_jiffy / max_cpus; +- unsigned long previous_tb = per_cpu(last_jiffy, boot_cpuid); ++ u64 previous_tb = per_cpu(last_jiffy, boot_cpuid); + + /* make sure tb > per_cpu(last_jiffy, cpu) for all cpus always */ + previous_tb -= tb_ticks_per_jiffy; +@@ -830,7 +822,7 @@ int do_settimeofday(struct timespec *tv) + * and therefore the (jiffies - wall_jiffies) computation + * has been removed. + */ +- tb_delta = tb_ticks_since(tb_last_stamp); ++ tb_delta = tb_ticks_since(tb_last_jiffy); + tb_delta = mulhdu(tb_delta, do_gtod.varp->tb_to_xs); /* in xsec */ + new_nsec -= SCALE_XSEC(tb_delta, 1000000000); + +@@ -950,8 +942,7 @@ void __init time_init(void) + if (__USE_RTC()) { + /* 601 processor: dec counts down by 128 every 128ns */ + ppc_tb_freq = 1000000000; +- tb_last_stamp = get_rtcl(); +- tb_last_jiffy = tb_last_stamp; ++ tb_last_jiffy = get_rtcl(); + } else { + /* Normal PowerPC with timebase register */ + ppc_md.calibrate_decr(); +@@ -959,7 +950,7 @@ void __init time_init(void) + ppc_tb_freq / 1000000, ppc_tb_freq % 1000000); + printk(KERN_DEBUG "time_init: processor frequency = %lu.%.6lu MHz\n", + ppc_proc_freq / 1000000, ppc_proc_freq % 1000000); +- tb_last_stamp = tb_last_jiffy = get_tb(); ++ tb_last_jiffy = get_tb(); + } + + tb_ticks_per_jiffy = ppc_tb_freq / HZ; +@@ -1036,7 +1027,7 @@ void __init time_init(void) + do_gtod.varp = &do_gtod.vars[0]; + do_gtod.var_idx = 0; + do_gtod.varp->tb_orig_stamp = tb_last_jiffy; +- __get_cpu_var(last_jiffy) = tb_last_stamp; ++ __get_cpu_var(last_jiffy) = tb_last_jiffy; + do_gtod.varp->stamp_xsec = (u64) xtime.tv_sec * XSEC_PER_SEC; + do_gtod.tb_ticks_per_sec = tb_ticks_per_sec; + do_gtod.varp->tb_to_xs = tb_to_xs; +Index: linux-2.6.17/include/asm-powerpc/time.h +=================================================================== +--- linux-2.6.17.orig/include/asm-powerpc/time.h ++++ linux-2.6.17/include/asm-powerpc/time.h +@@ -30,10 +30,6 @@ extern unsigned long tb_ticks_per_usec; + extern unsigned long tb_ticks_per_sec; + extern u64 tb_to_xs; + extern unsigned tb_to_us; +-extern unsigned long tb_last_stamp; +-extern u64 tb_last_jiffy; +- +-DECLARE_PER_CPU(unsigned long, last_jiffy); + + struct rtc_time; + extern void to_tm(int tim, struct rtc_time * tm); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-raw-device new/patches.arch/s390-raw-device --- old/patches.arch/s390-raw-device 2006-05-19 16:57:15.000000000 +0200 +++ new/patches.arch/s390-raw-device 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -From: ihno(a)suse.de -Subject: [PATCH] raw module is no enabled on s390/s390x - -The raw module is not enabled on s390/ss390x -The patch fixes that - -Signed-off-by: Ihno Krumreich <ihno(a)suse.de> ---- - drivers/s390/Kconfig | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -Index: linux-2.6.16/drivers/s390/Kconfig -=================================================================== ---- linux-2.6.16.orig/drivers/s390/Kconfig -+++ linux-2.6.16/drivers/s390/Kconfig -@@ -51,6 +51,26 @@ config UNIX98_PTY_COUNT - When not in use, each additional set of 256 PTYs occupy - approximately 8 KB of kernel memory on 32-bit architectures. - -+config RAW_DRIVER -+ tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)" -+ help -+ The raw driver permits block devices to be bound to /dev/raw/rawN. -+ Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. -+ See the raw(8) manpage for more details. -+ -+ The raw driver is deprecated and may be removed from 2.7 -+ kernels. Applications should simply open the device (eg /dev/hda1) -+ with the O_DIRECT flag. -+ -+config MAX_RAW_DEVS -+ int "Maximum number of RAW devices to support (1-8192)" -+ depends on RAW_DRIVER -+ default "256" -+ help -+ The maximum number of RAW devices that are supported. -+ Default is 256. Increase this number in case you need lots of -+ raw devices. -+ - config HANGCHECK_TIMER - tristate "Hangcheck timer" - help diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-nmi-watchdog-timeout new/patches.arch/x86_64-nmi-watchdog-timeout --- old/patches.arch/x86_64-nmi-watchdog-timeout 2006-03-31 14:37:54.000000000 +0200 +++ new/patches.arch/x86_64-nmi-watchdog-timeout 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -From: ak(a)suse.de -Patch-mainline: never -Subject: Increase NMI watchdog timeout to 30s -Patch-mainline: never - -Be a bit more tolerant to broken drivers. -Defensive programming for enterprises. - -diff -u linux-2.6.15/arch/x86_64/kernel/nmi.c-o linux-2.6.15/arch/x86_64/kernel/nmi.c ---- linux-2.6.15/arch/x86_64/kernel/nmi.c-o 2005-10-30 16:09:03.000000000 +0100 -+++ linux-2.6.15/arch/x86_64/kernel/nmi.c 2006-01-09 17:28:39.000000000 +0100 -@@ -479,10 +479,10 @@ - if (!touched && __get_cpu_var(last_irq_sum) == sum) { - /* - * Ayiee, looks like this CPU is stuck ... -- * wait a few IRQs (5 seconds) before doing the oops ... -+ * wait a few IRQs (30 seconds) before doing the oops ... - */ - local_inc(&__get_cpu_var(alert_counter)); -- if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz) { -+ if (local_read(&__get_cpu_var(alert_counter)) == 30*nmi_hz) { - if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT) - == NOTIFY_STOP) { - local_set(&__get_cpu_var(alert_counter), 0); ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/sis5513-support-sis-965l new/patches.drivers/sis5513-support-sis-965l --- old/patches.drivers/sis5513-support-sis-965l 2006-08-01 20:10:20.000000000 +0200 +++ new/patches.drivers/sis5513-support-sis-965l 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -From: Rudolph Pereira <rudolph(a)faex.net> -Subject: Add sis 965l suppor for the sis5513 ide driver -Patch-mainline: 2.6.17 -References: 122015 - -Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz(a)elka.pw.edu.pl> -Signed-off-by: Andrew Morton <akpm(a)osdl.org> -Acked-by: Jens Axboe <axboe(a)suse.de> - ---- - - drivers/ide/pci/sis5513.c | 6 ++++++ - 1 files changed, 6 insertions(+) - -diff -puN drivers/ide/pci/sis5513.c~sis5513-support-sis-965l drivers/ide/pci/sis5513.c ---- devel/drivers/ide/pci/sis5513.c~sis5513-support-sis-965l 2005-09-15 21:11:05.000000000 -0700 -+++ devel-akpm/drivers/ide/pci/sis5513.c 2005-09-15 21:11:43.000000000 -0700 -@@ -777,7 +777,12 @@ static unsigned int __devinit init_chips - pci_write_config_dword(dev, 0x54, idemisc | 0x40000000); - printk(KERN_INFO "SIS5513: Switching to 5513 register mapping\n"); - } -+ } else if (trueid == 0x180) { /* sis965L */ -+ chipset_family = ATA_133; -+ printk(KERN_INFO "SIS5513: SiS 965 IDE " -+ "UDMA133 controller\n"); - } -+ - } - - if (!chipset_family) { /* Belongs to pci-quirks */ -@@ -952,6 +957,7 @@ static int __devinit sis5513_init_one(st - static struct pci_device_id sis5513_pci_tbl[] = { - { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, -+ { PCI_VENDOR_ID_SI, 0x180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { 0, }, - }; - MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl); -_ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/smbfs-request-counting new/patches.drivers/smbfs-request-counting --- old/patches.drivers/smbfs-request-counting 2004-06-09 15:34:54.000000000 +0200 +++ new/patches.drivers/smbfs-request-counting 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -Index: linux-2.6.5/fs/smbfs/request.c -=================================================================== ---- linux-2.6.5.orig/fs/smbfs/request.c 2004-06-09 15:20:07.000000000 +0200 -+++ linux-2.6.5/fs/smbfs/request.c 2004-06-09 15:20:59.000000000 +0200 -@@ -112,6 +112,7 @@ - #else - /* FIXME: we want something like nfs does above, but that - requires changes to all callers and can wait. */ -+ atomic_dec(&server->nr_requests); - break; - #endif - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/smbfs-sendqueue-backoff new/patches.drivers/smbfs-sendqueue-backoff --- old/patches.drivers/smbfs-sendqueue-backoff 2005-02-24 11:19:36.000000000 +0100 +++ new/patches.drivers/smbfs-sendqueue-backoff 1970-01-01 01:00:00.000000000 +0100 @@ -1,175 +0,0 @@ -Subject: smbfs: back off sending when TCP buffers are full -From: Olaf Kirch <okir(a)suse.de> -References: SUSE41343 - LTC8669 - -This patch makes sure we gracefully back off if the TCP send buffer -is full, or if TCP was unable to allocate an skb. Otherwise, smbiod -would spin endlessly, and never release the CPU. - -Index: linux-2.6.5/fs/smbfs/proc.c -=================================================================== ---- linux-2.6.5.orig/fs/smbfs/proc.c 2004-03-12 12:17:25.000000000 +0100 -+++ linux-2.6.5/fs/smbfs/proc.c 2004-06-08 14:40:43.000000000 +0200 -@@ -901,6 +901,7 @@ - - /* chain into the data_ready callback */ - server->data_ready = xchg(&sk->sk_data_ready, smb_data_ready); -+ server->write_space = xchg(&sk->sk_write_space, smb_write_space); - - /* check if we have an old smbmount that uses seconds for the - serverzone */ -Index: linux-2.6.5/fs/smbfs/proto.h -=================================================================== ---- linux-2.6.5.orig/fs/smbfs/proto.h 2004-02-04 04:43:57.000000000 +0100 -+++ linux-2.6.5/fs/smbfs/proto.h 2004-06-08 14:39:40.000000000 +0200 -@@ -48,6 +48,7 @@ - extern int smb_fill_cache(struct file *filp, void *dirent, filldir_t filldir, struct smb_cache_control *ctrl, struct qstr *qname, struct smb_fattr *entry); - /* sock.c */ - extern void smb_data_ready(struct sock *sk, int len); -+extern void smb_write_space(struct sock *sk); - extern int smb_valid_socket(struct inode *inode); - extern void smb_close_socket(struct smb_sb_info *server); - extern int smb_recv_available(struct smb_sb_info *server); -Index: linux-2.6.5/fs/smbfs/request.c -=================================================================== ---- linux-2.6.5.orig/fs/smbfs/request.c 2004-03-12 12:17:25.000000000 +0100 -+++ linux-2.6.5/fs/smbfs/request.c 2004-06-08 14:34:15.000000000 +0200 -@@ -316,7 +316,7 @@ - if (server->state == CONN_VALID) { - if (list_empty(&server->xmitq)) - result = smb_request_send_req(req); -- if (result < 0) { -+ if (result < 0 && result != -EAGAIN) { - /* Connection lost? */ - server->conn_error = result; - server->state = CONN_INVALID; -@@ -394,7 +394,6 @@ - if (result < 0 && result != -EAGAIN) - goto out; - -- result = 0; - if (!(req->rq_flags & SMB_REQ_TRANSMITTED)) - goto out; - -@@ -431,7 +430,7 @@ - return 0; - - result = smb_request_send_req(req); -- if (result < 0) { -+ if (result < 0 && result != -EAGAIN) { - server->conn_error = result; - list_del_init(&req->rq_queue); - list_add(&req->rq_queue, &server->xmitq); -Index: linux-2.6.5/fs/smbfs/smbiod.c -=================================================================== ---- linux-2.6.5.orig/fs/smbfs/smbiod.c 2004-03-12 12:17:25.000000000 +0100 -+++ linux-2.6.5/fs/smbfs/smbiod.c 2004-06-08 14:56:32.000000000 +0200 -@@ -45,7 +45,9 @@ - static LIST_HEAD(smb_servers); - static spinlock_t servers_lock = SPIN_LOCK_UNLOCKED; - --#define SMBIOD_DATA_READY (1<<0) -+#define SMBIOD_DATA_READY 0 -+#define SMBIOD_BACKOFF 1 -+ - static long smbiod_flags; - - static int smbiod(void *); -@@ -268,6 +270,18 @@ - - do { - result = smb_request_send_server(server); -+ if (result == -EAGAIN) { -+ /* TCP was unable to allocate memory. -+ * Set the backoff flag, but *not* DATA_READY. -+ * If there are no new requests in the queue, -+ * this will cause smbiod to back off and -+ * not retry until -+ * a) we receive a write_space callback from TCP -+ * b) we slept for one second. -+ */ -+ set_bit(SMBIOD_BACKOFF, &smbiod_flags); -+ goto out; -+ } - if (result < 0) { - server->state = CONN_INVALID; - smbiod_retry(server); -@@ -300,9 +314,28 @@ - struct smb_sb_info *server; - struct list_head *pos, *n; - -- /* FIXME: Use poll? */ -- wait_event_interruptible(smbiod_wait, -- test_bit(SMBIOD_DATA_READY, &smbiod_flags)); -+ /* smbiod should use a more sophisticated approach -+ * to polling the socket... this is an ugly hack. -+ */ -+ if (test_bit(SMBIOD_BACKOFF, &smbiod_flags)) { -+ /* We tried to transmit some requests, but received -+ * EAGAIN. Either the TCP send queue is full, or -+ * we're low on memory. Go to sleep. -+ * If this was due to a full receive queue, the -+ * write_space callback handler will wake us. -+ * -+ * If it was low memory, we'll just sleep a little -+ * to let the VM do its job. -+ */ -+ wait_event_interruptible_timeout(smbiod_wait, -+ test_bit(SMBIOD_DATA_READY, &smbiod_flags), -+ HZ); -+ clear_bit(SMBIOD_BACKOFF, &smbiod_flags); -+ } else { -+ wait_event_interruptible(smbiod_wait, -+ test_bit(SMBIOD_DATA_READY, &smbiod_flags)); -+ } -+ - if (signal_pending(current)) { - spin_lock(&servers_lock); - smbiod_state = SMBIOD_DEAD; -Index: linux-2.6.5/fs/smbfs/sock.c -=================================================================== ---- linux-2.6.5.orig/fs/smbfs/sock.c 2004-04-05 11:09:50.000000000 +0200 -+++ linux-2.6.5/fs/smbfs/sock.c 2004-06-08 14:44:10.000000000 +0200 -@@ -84,6 +84,25 @@ - smbiod_wake_up(); - } - -+/* -+ * Called when there's room in the TCP send queue. -+ * Just wake up smbiod so it can retry sending. -+ */ -+void -+smb_write_space(struct sock *sk) -+{ -+ struct smb_sb_info *server = server_from_socket(sk->sk_socket); -+ void (*write_space)(struct sock *) = server->write_space; -+ -+ /* Invoke the original sk_write_space callback. -+ * I don't think we actually need to do this, but I'll -+ * do that for symmetry with smb_data_ready above. -+ */ -+ write_space(sk); -+ VERBOSE("(%p)\n", sk); -+ smbiod_wake_up(); -+} -+ - int - smb_valid_socket(struct inode * inode) - { -Index: linux-2.6.5/include/linux/smb_fs_sb.h -=================================================================== ---- linux-2.6.5.orig/include/linux/smb_fs_sb.h 2004-02-04 04:44:44.000000000 +0100 -+++ linux-2.6.5/include/linux/smb_fs_sb.h 2004-06-08 14:42:02.000000000 +0200 -@@ -68,8 +68,10 @@ - u32 smb_len; - u32 smb_read; - -- /* We use our own data_ready callback, but need the original one */ -+ /* We use our own data_ready and write_space callbacks, -+ * but need the original ones */ - void *data_ready; -+ void *write_space; - - /* nls pointers for codepage conversions */ - struct nls_table *remote_nls; - ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ia64-put-user-size new/patches.fixes/ia64-put-user-size --- old/patches.fixes/ia64-put-user-size 2005-11-21 15:57:02.000000000 +0100 +++ new/patches.fixes/ia64-put-user-size 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -Subject: Fix asm constraint -From: schwab(a)suse.de - ---- linux-2.6.14/include/asm-ia64/uaccess.h.~1~ 2005-10-28 02:02:08.000000000 +0200 -+++ linux-2.6.14/include/asm-ia64/uaccess.h 2005-11-20 18:15:46.559296784 +0100 -@@ -154,10 +154,10 @@ do { \ - # define __put_user_size(val, addr, n, err) \ - do { \ - register long __pu_r8 asm ("r8") = 0; \ -- asm volatile ("\n[1:]\tst"#n" %1=%r2%P1\t// %0 gets overwritten by exception handler\n" \ -+ asm volatile ("\n[1:]\tst"#n" [%1]=%r2\t// %0 gets overwritten by exception handler\n" \ - "\t.xdata4 \"__ex_table\", 1b-., 1f-.\n" \ - "[1:]" \ -- : "=r"(__pu_r8) : "m"(__m(addr)), "rO"(val), "0"(__pu_r8)); \ -+ : "=r"(__pu_r8) : "r"(addr), "rO"(val), "0"(__pu_r8)); \ - (err) = __pu_r8; \ - } while (0) - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ignore-aix-disk-label.patch new/patches.fixes/ignore-aix-disk-label.patch --- old/patches.fixes/ignore-aix-disk-label.patch 2006-08-01 20:10:20.000000000 +0200 +++ new/patches.fixes/ignore-aix-disk-label.patch 2006-08-30 14:52:41.000000000 +0200 @@ -1,6 +1,7 @@ Subject: ignore partition table on disks with AIX label From: olh(a)suse.de References: 175995 +Patch-mainline: 2.6.19 ? The on-disk data structures from AIX are not known, also the filesystem layout is not known. There is a msdos partition signature at the end of diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-add-addr-install-dstentry new/patches.fixes/ipv6-add-addr-install-dstentry --- old/patches.fixes/ipv6-add-addr-install-dstentry 2006-06-19 11:48:51.000000000 +0200 +++ new/patches.fixes/ipv6-add-addr-install-dstentry 2006-08-29 18:25:50.000000000 +0200 @@ -14,9 +14,14 @@ Acked-by: jbeulich(a)novell.com Acked-by: okir(a)suse.de ---- linux-2.6.16.13-old/net/ipv6/addrconf.c 2006-05-02 22:38:44.000000000 +0100 -+++ linux-2.6.16.13-new/net/ipv6/addrconf.c 2006-06-18 10:16:50.000000000 +0100 -@@ -549,6 +549,8 @@ + net/ipv6/addrconf.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +Index: build/net/ipv6/addrconf.c +=================================================================== +--- build.orig/net/ipv6/addrconf.c ++++ build/net/ipv6/addrconf.c +@@ -578,6 +578,8 @@ ipv6_add_addr(struct inet6_dev *idev, co ifa->flags = flags | IFA_F_TENTATIVE; ifa->cstamp = ifa->tstamp = jiffies; @@ -25,7 +30,7 @@ ifa->idev = idev; in6_dev_hold(idev); /* For caller */ -@@ -575,8 +577,6 @@ +@@ -603,8 +605,6 @@ ipv6_add_addr(struct inet6_dev *idev, co } #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-init-fail-cleanup new/patches.fixes/ipv6-init-fail-cleanup --- old/patches.fixes/ipv6-init-fail-cleanup 2005-11-11 11:05:15.000000000 +0100 +++ new/patches.fixes/ipv6-init-fail-cleanup 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -From: Olaf Kirch <okir(a)suse.de> -Subject: inet6_init: cleanup after failed initialization -References: 132894 - - When initialization fails in inet6_init(), we need to - unregister the PF_INET6 socket ops. - -Signed-off-by: Olaf Kirch <okir(a)suse.de> - -Index: linux-2.6.14/net/ipv6/af_inet6.c -=================================================================== ---- linux-2.6.14.orig/net/ipv6/af_inet6.c -+++ linux-2.6.14/net/ipv6/af_inet6.c -@@ -797,6 +797,7 @@ icmp_fail: - #endif - cleanup_ipv6_mibs(); - out_unregister_raw_proto: -+ sock_unregister(PF_INET6); - proto_unregister(&rawv6_prot); - out_unregister_udp_proto: - proto_unregister(&udpv6_prot); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/libata-increase-timeout-for-resume new/patches.fixes/libata-increase-timeout-for-resume --- old/patches.fixes/libata-increase-timeout-for-resume 2006-08-01 20:10:20.000000000 +0200 +++ new/patches.fixes/libata-increase-timeout-for-resume 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -From: Mark Lord <lkml(a)rtr.ca> -Subject: Increase BSY/DRQ clear to avoid timeout on resume -Patch-mainline: 2.6.17 -References: - -Acked-by: -Signed-off-by: Jens Axboe <axboe(a)suse.de> - -diff -u --recursive --new-file --exclude='.*' linux-2.6.15-rc2/include/linux/libata.h linux/include/linux/libata.h ---- linux-2.6.15-rc2/include/linux/libata.h 2005-11-21 12:11:53.000000000 -0500 -+++ linux/include/linux/libata.h 2005-11-21 12:11:19.000000000 -0500 -@@ -634,7 +634,7 @@ - - static inline u8 ata_wait_idle(struct ata_port *ap) - { -- u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); -+ u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 100000); /* 1000msec */ - - if (status & (ATA_BUSY | ATA_DRQ)) { - unsigned long l = ap->ioaddr.status_addr; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfsv4-setclientid new/patches.fixes/nfsv4-setclientid --- old/patches.fixes/nfsv4-setclientid 2006-06-27 00:50:28.000000000 +0200 +++ new/patches.fixes/nfsv4-setclientid 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -From: NeilBrown <neilb(a)suse.de> -Subject: Improve unqiueness of client id sent by NFSv4 -Patch-mainline: not yet -References: 167953 - -When the NFS client creates locking state on the server, it used -SETCLIENTID which requires the creation of a unique identifier for -the client. - -To handle cases where the server might claim an identifer is already -in use, the client has a numerical 'uniquifier' which is incremented -on failure. -Because buffer available for this unique name is only 31 chars, -and because the uniquifier is at the end, it can sometimes -be left off thus making it completely useless. - -This patch moves the uniquifier to the start so it will always have -a valuable effect. - -Normally the uniquifier should not be needed as the client's IP address -is already in the string. However on (some?) suse clients, the -IP address is determined to be 127.0.0.2, which isn't very useful. - -We could make the buffer larger (the protocol limit is 1024) but -this seems like a smaller change. - -IP address comes from the 'mount' program and it should be enhanced to -make a better attempt at getting a good IP address. Work is proceeding -on that. However this patch is simple and reasonably effective. - -Without this patch, multiple clients can end up being serialised causing -incredibly slow throughput. - -Signed-off-by: Neil Brown <neilb(a)suse.de> - -Index: linux-2.6.16/fs/nfs/nfs4proc.c -=================================================================== ---- linux-2.6.16.orig/fs/nfs/nfs4proc.c 2006-06-20 12:43:19.000000000 +1000 -+++ linux-2.6.16/fs/nfs/nfs4proc.c 2006-06-20 12:44:38.000000000 +1000 -@@ -2873,10 +2873,10 @@ - - for(;;) { - setclientid.sc_name_len = scnprintf(setclientid.sc_name, -- sizeof(setclientid.sc_name), "%s/%u.%u.%u.%u %s %u", -+ sizeof(setclientid.sc_name), "%u %s/%u.%u.%u.%u %s", -+ clp->cl_id_uniquifier, - clp->cl_ipaddr, NIPQUAD(clp->cl_addr.s_addr), -- cred->cr_ops->cr_name, -- clp->cl_id_uniquifier); -+ cred->cr_ops->cr_name); - setclientid.sc_netid_len = scnprintf(setclientid.sc_netid, - sizeof(setclientid.sc_netid), "tcp"); - setclientid.sc_uaddr_len = scnprintf(setclientid.sc_uaddr, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/parport-mutex new/patches.fixes/parport-mutex --- old/patches.fixes/parport-mutex 2005-11-16 13:57:37.000000000 +0100 +++ new/patches.fixes/parport-mutex 2006-08-29 18:25:50.000000000 +0200 @@ -16,14 +16,18 @@ The patch below simply protects that code with the port_mutex in order to protect against simultaneous calls to lp_read/lp_write. -Similar protection may be required for ioctl(LPRESET). +Similar protection is probably required for ioctl(LPRESET). Signed-off-by: okir(a)suse.de -diff -urNp linux-2.6.5/drivers/char/lp.c linux-2.6.5.SUSE/drivers/char/lp.c ---- linux-2.6.5/drivers/char/lp.c 2004-04-04 05:36:14.000000000 +0200 -+++ linux-2.6.5.SUSE/drivers/char/lp.c 2004-11-09 11:22:58.516929048 +0100 -@@ -608,9 +608,12 @@ static int lp_ioctl(struct inode *inode, + drivers/char/lp.c | 3 +++ + 1 files changed, 3 insertions(+) + +Index: build/drivers/char/lp.c +=================================================================== +--- build.orig/drivers/char/lp.c ++++ build/drivers/char/lp.c +@@ -616,9 +616,12 @@ static int lp_ioctl(struct inode *inode, return -EFAULT; break; case LPGETSTATUS: @@ -34,5 +38,5 @@ lp_release_parport (&lp_table[minor]); + up (&lp_table[minor].port_mutex); - if (copy_to_user((int *) arg, &status, sizeof(int))) + if (copy_to_user(argp, &status, sizeof(int))) return -EFAULT; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/samsung-unusual-floppy new/patches.fixes/samsung-unusual-floppy --- old/patches.fixes/samsung-unusual-floppy 2005-10-27 14:22:17.000000000 +0200 +++ new/patches.fixes/samsung-unusual-floppy 2006-08-29 18:25:50.000000000 +0200 @@ -1,11 +1,14 @@ From: juergen.mell(a)t-online.de Subject: USB floppy drive SAMSUNG SFD-321U/EP detected 8 times -Patch-mainline: no +Patch-mainline: 2.6.19 References: 117643 USB floppy drive SAMSUNG SFD-321U/EP detected 8 times +Is in gregkh's USB tree and the -mm release + Acked-by: mantel(a)suse.de +Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> diff -urNp linux-2.6.13/drivers/usb/storage/unusual_devs.h linux-2.6.13.SUSE/drivers/usb/storage/unusual_devs.h --- linux-2.6.13/drivers/usb/storage/unusual_devs.h 2005-10-27 14:16:25.369102521 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tulip-down-race new/patches.fixes/tulip-down-race --- old/patches.fixes/tulip-down-race 2006-06-02 15:58:06.000000000 +0200 +++ new/patches.fixes/tulip-down-race 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -From: Grant Grundler -Subject: Fix MCA in tulip driver -Patch-mainline: yes -References: 163975 - -This patch fixes a race condition in the tulip driver, which is exposed -when yoyo-ing the NIC (ie rapidly upping/downing the device). - -Acked-by: okir(a)suse.de -Acked-by: gregkh(a)suse.de - - drivers/net/tulip/tulip_core.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -Index: linux-2.6.16/drivers/net/tulip/tulip_core.c -=================================================================== ---- linux-2.6.16.orig/drivers/net/tulip/tulip_core.c -+++ linux-2.6.16/drivers/net/tulip/tulip_core.c -@@ -18,11 +18,11 @@ - - #define DRV_NAME "tulip" - #ifdef CONFIG_TULIP_NAPI --#define DRV_VERSION "1.1.13-NAPI" /* Keep at least for test */ -+#define DRV_VERSION "1.1.14-NAPI" /* Keep at least for test */ - #else --#define DRV_VERSION "1.1.13" -+#define DRV_VERSION "1.1.14" - #endif --#define DRV_RELDATE "May 11, 2002" -+#define DRV_RELDATE "May 31, 2006" - - - #include <linux/module.h> -@@ -774,14 +774,13 @@ static int tulip_close (struct net_devic - int i; - - netif_stop_queue (dev); -- -+ free_irq (dev->irq, dev); /* don't let IRQs race w/tulip_down() */ - tulip_down (dev); - - if (tulip_debug > 1) - printk (KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n", - dev->name, ioread32 (ioaddr + CSR5)); - -- free_irq (dev->irq, dev); - - /* Free all the skbuffs in the Rx queue. */ - for (i = 0; i < RX_RING_SIZE; i++) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tulip-quad-NIC-ifdown new/patches.fixes/tulip-quad-NIC-ifdown --- old/patches.fixes/tulip-quad-NIC-ifdown 2005-02-24 11:19:36.000000000 +0100 +++ new/patches.fixes/tulip-quad-NIC-ifdown 2006-08-29 18:25:50.000000000 +0200 @@ -8,11 +8,14 @@ Acked-by: Olaf Kirch <okir(a)suse.de> -Index: linux-2.6.9/drivers/net/tulip/tulip_core.c + drivers/net/tulip/tulip_core.c | 4 ++++ + 1 files changed, 4 insertions(+) + +Index: build/drivers/net/tulip/tulip_core.c =================================================================== ---- linux-2.6.9.orig/drivers/net/tulip/tulip_core.c 2005-01-03 12:33:08.000000000 +0100 -+++ linux-2.6.9/drivers/net/tulip/tulip_core.c 2005-01-03 12:34:58.000000000 +0100 -@@ -1770,6 +1771,10 @@ static void __devexit tulip_remove_one ( +--- build.orig/drivers/net/tulip/tulip_core.c ++++ build/drivers/net/tulip/tulip_core.c +@@ -1795,6 +1795,10 @@ static void __devexit tulip_remove_one ( return; tp = netdev_priv(dev); @@ -23,4 +26,3 @@ unregister_netdev(dev); pci_free_consistent (pdev, sizeof (struct tulip_rx_desc) * RX_RING_SIZE + - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/acpi-oldboot new/patches.suse/acpi-oldboot --- old/patches.suse/acpi-oldboot 2006-08-02 23:03:01.000000000 +0200 +++ new/patches.suse/acpi-oldboot 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -Subject: make acpi=oldboot an alias for acpi=ht for compatibility with SLES8 - -diff -u linux/arch/i386/kernel/setup.c-o linux/arch/i386/kernel/setup.c ---- linux/arch/i386/kernel/setup.c-o 2004-05-18 10:55:53.000000000 +0200 -+++ linux/arch/i386/kernel/setup.c 2004-05-24 13:07:28.000000000 +0200 -@@ -602,7 +602,7 @@ - } - - /* Limit ACPI just to boot-time to enable HT */ -- else if (!memcmp(from, "acpi=ht", 7)) { -+ else if (!memcmp(from, "acpi=ht", 7) || !memcmp(from,"acpi=oldboot",12)) { - if (!acpi_force) - disable_acpi(); - acpi_ht = 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/acpi_dsdt_initrd_initramfs new/patches.suse/acpi_dsdt_initrd_initramfs --- old/patches.suse/acpi_dsdt_initrd_initramfs 2006-08-01 20:10:21.000000000 +0200 +++ new/patches.suse/acpi_dsdt_initrd_initramfs 2006-08-29 18:25:50.000000000 +0200 @@ -7,14 +7,14 @@ ("INITRDDSDT123DSDT123"). Once a DSDT in the initramfs or initrd is found the DSDT provided by BIOS is replaced. ---- - drivers/acpi/Kconfig | 13 +++++++ - drivers/acpi/osl.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 95 insertions(+), 5 deletions(-) +In order for the data to be available, populate_rootfs() +should be called prior to acpi_early_init(). Then, +the ACPI code can just call sys_open() to get the DSDT. ---- linux-2.6.17.orig/drivers/acpi/Kconfig -+++ linux-2.6.17/drivers/acpi/Kconfig -@@ -364,6 +364,19 @@ config ACPI_SBS +diff -ruNpX dontdiff linux-2.6.17/drivers/acpi/Kconfig linux-2.6.17.acpi/drivers/acpi/Kconfig +--- linux-2.6.17/drivers/acpi/Kconfig 2006-08-29 11:47:54.000000000 -0400 ++++ linux-2.6.17.acpi/drivers/acpi/Kconfig 2006-08-29 11:48:45.000000000 -0400 +@@ -362,6 +362,19 @@ config ACPI_SBS A "Smart Battery" is quite old and quite rare compared to today's ACPI "Control Method" battery. @@ -34,9 +34,10 @@ endif # ACPI endmenu ---- linux-2.6.17.orig/drivers/acpi/osl.c -+++ linux-2.6.17/drivers/acpi/osl.c -@@ -44,6 +44,8 @@ +diff -ruNpX dontdiff linux-2.6.17/drivers/acpi/osl.c linux-2.6.17.acpi/drivers/acpi/osl.c +--- linux-2.6.17/drivers/acpi/osl.c 2006-08-29 11:48:01.000000000 -0400 ++++ linux-2.6.17.acpi/drivers/acpi/osl.c 2006-08-29 11:48:45.000000000 -0400 +@@ -43,6 +43,8 @@ #include <asm/uaccess.h> #include <linux/efi.h> @@ -45,7 +46,7 @@ #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl") -@@ -229,6 +231,79 @@ acpi_os_predefined_override(const struct +@@ -218,6 +220,79 @@ acpi_os_predefined_override(const struct return AE_OK; } @@ -125,7 +126,7 @@ acpi_status acpi_os_table_override(struct acpi_table_header * existing_table, -@@ -237,14 +312,16 @@ acpi_os_table_override(struct acpi_table +@@ -226,14 +301,16 @@ acpi_os_table_override(struct acpi_table if (!existing_table || !new_table) return AE_BAD_PARAMETER; @@ -147,3 +148,43 @@ return AE_OK; } +diff -ruNpX dontdiff linux-2.6.17/init/main.c linux-2.6.17.acpi/init/main.c +--- linux-2.6.17/init/main.c 2006-08-29 11:48:02.000000000 -0400 ++++ linux-2.6.17.acpi/init/main.c 2006-08-29 11:48:45.000000000 -0400 +@@ -613,8 +613,6 @@ asmlinkage void __init start_kernel(void + + check_bugs(); + +- acpi_early_init(); /* before LAPIC and SMP init */ +- + /* Do the rest non-__init'ed, we're now alive */ + rest_init(); + } +@@ -731,6 +729,14 @@ static int init(void * unused) + */ + child_reaper = current; + ++ /* ++ * Do this before initcalls, because some drivers want to access ++ * firmware files. ++ */ ++ populate_rootfs(); ++ ++ acpi_early_init(); /* before LAPIC and SMP init */ ++ + smp_prepare_cpus(max_cpus); + + do_pre_smp_initcalls(); +@@ -740,12 +746,6 @@ static int init(void * unused) + + cpuset_init_smp(); + +- /* +- * Do this before initcalls, because some drivers want to access +- * firmware files. +- */ +- populate_rootfs(); +- + do_basic_setup(); + + /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/apparmor-mmapexec.patch new/patches.suse/apparmor-mmapexec.patch --- old/patches.suse/apparmor-mmapexec.patch 2006-06-01 02:36:59.000000000 +0200 +++ new/patches.suse/apparmor-mmapexec.patch 2006-08-30 14:52:41.000000000 +0200 @@ -2,6 +2,7 @@ From: Tony Jones <tonyj(a)suse.de> Subject: Profile access allows essentially execute permission when only read access is granted via usage of mmap system call References: 175388 +Patch-mainline: no Add a new 'm' qualifier to indicate executable mapping [mmap(PROT_EXEC)]. This allows policy intent to be maintained across multiple policy revisions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/apparmor-secureexec.patch new/patches.suse/apparmor-secureexec.patch --- old/patches.suse/apparmor-secureexec.patch 2006-06-01 02:36:59.000000000 +0200 +++ new/patches.suse/apparmor-secureexec.patch 2006-08-30 14:52:41.000000000 +0200 @@ -2,6 +2,7 @@ From: Tony Jones <tonyj(a)suse.de> Subject: LD_PRELOAD can be exploited to change the execution path across exec transitions References: 172061 +Patch-mainline: no Use the LSM secure_exec framework which flags the ELF loader such that libc scrubs the environment. In addition, two new 'safe' qualifiers U and P are diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/bh-cache-option new/patches.suse/bh-cache-option --- old/patches.suse/bh-cache-option 2006-06-08 14:36:15.000000000 +0200 +++ new/patches.suse/bh-cache-option 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -From: ak(a)suse.de -References: 175797 -Subject: Add option to disable per CPU buffer LRU - -It causes real time hickups on large systems. - -Index: linux-2.6.16/fs/buffer.c -=================================================================== ---- linux-2.6.16.orig/fs/buffer.c -+++ linux-2.6.16/fs/buffer.c -@@ -1339,6 +1339,8 @@ static DEFINE_PER_CPU(struct bh_lru, bh_ - #define bh_lru_unlock() preempt_enable() - #endif - -+static int lru_disabled __read_mostly; -+ - static inline void check_irqs_on(void) - { - #ifdef irqs_disabled -@@ -1354,6 +1356,9 @@ static void bh_lru_install(struct buffer - struct buffer_head *evictee = NULL; - struct bh_lru *lru; - -+ if (lru_disabled) -+ return; -+ - check_irqs_on(); - bh_lru_lock(); - lru = &__get_cpu_var(bh_lrus); -@@ -1398,6 +1403,9 @@ lookup_bh_lru(struct block_device *bdev, - struct bh_lru *lru; - int i; - -+ if (lru_disabled) -+ return ret; -+ - check_irqs_on(); - bh_lru_lock(); - lru = &__get_cpu_var(bh_lrus); -@@ -1519,7 +1527,8 @@ static void invalidate_bh_lru(void *arg) - - static void invalidate_bh_lrus(void) - { -- on_each_cpu(invalidate_bh_lru, NULL, 1, 1); -+ if (!lru_disabled) -+ on_each_cpu(invalidate_bh_lru, NULL, 1, 1); - } - - void set_bh_page(struct buffer_head *bh, -@@ -3184,6 +3193,9 @@ static void buffer_exit_cpu(int cpu) - int i; - struct bh_lru *b = &per_cpu(bh_lrus, cpu); - -+ if (lru_disabled) -+ return; -+ - for (i = 0; i < BH_LRU_SIZE; i++) { - brelse(b->bhs[i]); - b->bhs[i] = NULL; -@@ -3218,6 +3230,13 @@ void __init buffer_init(void) - hotcpu_notifier(buffer_cpu_notify, 0); - } - -+static int __init disable_buffer_lru(char *s) -+{ -+ lru_disabled = 1; -+ return 0; -+} -+__setup("disable_buffer_lru", disable_buffer_lru); -+ - EXPORT_SYMBOL(__bforget); - EXPORT_SYMBOL(__brelse); - EXPORT_SYMBOL(__wait_on_buffer); -Index: linux-2.6.16/Documentation/kernel-parameters.txt -=================================================================== ---- linux-2.6.16.orig/Documentation/kernel-parameters.txt -+++ linux-2.6.16/Documentation/kernel-parameters.txt -@@ -1693,6 +1693,10 @@ running once the system is up. - norandmaps Don't use address space randomization - Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space - -+ disable_buffer_lru -+ Disable per CPU LRU in the buffer cache. -+ This might avoid some real time hickups on large systems. -+ - - ______________________________________________________________________ - Changelog: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/connector-read-mostly new/patches.suse/connector-read-mostly --- old/patches.suse/connector-read-mostly 2006-01-24 21:20:11.000000000 +0100 +++ new/patches.suse/connector-read-mostly 2006-08-29 18:25:50.000000000 +0200 @@ -3,6 +3,8 @@ This will lower the fast path costs of the userland connector code. +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + diff -r 61ab85753515 drivers/connector/cn_proc.c --- a/drivers/connector/cn_proc.c Tue Jan 24 14:14:58 2006 -0500 +++ b/drivers/connector/cn_proc.c Tue Jan 24 14:32:23 2006 -0500 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/cramfs-PageUptodate.patch new/patches.suse/cramfs-PageUptodate.patch --- old/patches.suse/cramfs-PageUptodate.patch 2006-06-03 11:29:15.000000000 +0200 +++ new/patches.suse/cramfs-PageUptodate.patch 2006-08-30 14:52:41.000000000 +0200 @@ -1,6 +1,6 @@ Subject: cramfs corruption after BLKFLSBUF on loop device From: Olaf Hering <olh(a)suse.de> -References: 175432 - LTC23853 +References: 175432 - LTC23853 , 195509 This script will cause cramfs decompression errors, on SMP at least: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ext2-fsync-err new/patches.suse/ext2-fsync-err --- old/patches.suse/ext2-fsync-err 2006-08-01 11:07:47.000000000 +0200 +++ new/patches.suse/ext2-fsync-err 2006-08-29 18:25:50.000000000 +0200 @@ -7,6 +7,8 @@ writes that happen through the normal async mechanisms might hit errors without reporting them back to the application. +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + --- fs/ext2/fsync.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ext3-barrier-default new/patches.suse/ext3-barrier-default --- old/patches.suse/ext3-barrier-default 2006-02-06 21:25:39.000000000 +0100 +++ new/patches.suse/ext3-barrier-default 2006-08-29 18:25:50.000000000 +0200 @@ -9,6 +9,8 @@ It should be safe, but some extra review would be appreciated. +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + diff -r b1d8075ee99b fs/ext3/fsync.c --- a/fs/ext3/fsync.c Mon Feb 6 14:42:44 2006 -0500 +++ b/fs/ext3/fsync.c Mon Feb 6 14:43:14 2006 -0500 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/fat-o-flush new/patches.suse/fat-o-flush --- old/patches.suse/fat-o-flush 2006-08-01 20:10:21.000000000 +0200 +++ new/patches.suse/fat-o-flush 2006-08-29 18:25:50.000000000 +0200 @@ -5,6 +5,8 @@ FS to write things to disk as quickly as possible. It is like -o sync, but much faster (and not as safe). +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + --- fs/fat/file.c | 18 ++++++++++++++++++ fs/fat/inode.c | 9 +++++++-- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/floppy-printk.patch new/patches.suse/floppy-printk.patch --- old/patches.suse/floppy-printk.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/floppy-printk.patch 2006-08-30 14:40:00.000000000 +0200 @@ -0,0 +1,50 @@ +Subject: [PATCH] exit early in floppy_init when no floppy exists +From: Olaf Hering <olaf(a)aepfle.de> +References: 504 Gateway Time-Out + +modprobe -v floppy on a Apple G5 writes incorrect stuff to dmesg: + +Floppy drive(s): fd0 is 2.88M + +The reason is that the legacy io check happens very late, +when part of the floppy stuff is already initialized. +check_legacy_ioport() returns either -ENODEV right away, or it walks +the device-tree looking for a floppy node. + + + +Signed-off-by: Olaf Hering <olaf(a)aepfle.de> +--- + drivers/block/floppy.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +Index: linux-2.6.18-rc4/drivers/block/floppy.c +=================================================================== +--- linux-2.6.18-rc4.orig/drivers/block/floppy.c ++++ linux-2.6.18-rc4/drivers/block/floppy.c +@@ -4177,6 +4177,11 @@ static int __init floppy_init(void) + int i, unit, drive; + int err, dr; + ++#if defined(CONFIG_PPC_MERGE) ++ if (check_legacy_ioport(FDC1)) ++ return -ENODEV; ++#endif ++ + raw_cmd = NULL; + + for (dr = 0; dr < N_DRIVE; dr++) { +@@ -4234,13 +4239,6 @@ static int __init floppy_init(void) + } + + use_virtual_dma = can_use_virtual_dma & 1; +-#if defined(CONFIG_PPC_MERGE) +- if (check_legacy_ioport(FDC1)) { +- del_timer(&fd_timeout); +- err = -ENODEV; +- goto out_unreg_region; +- } +-#endif + fdc_state[0].address = FDC1; + if (fdc_state[0].address == -1) { + del_timer(&fd_timeout); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/initramfs-before-acpi.patch new/patches.suse/initramfs-before-acpi.patch --- old/patches.suse/initramfs-before-acpi.patch 2006-08-01 20:10:21.000000000 +0200 +++ new/patches.suse/initramfs-before-acpi.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -Subject: Call populate_rootfs() prior to acpi_early_init() -From: Hannes Reinecke <hare(a)suse.de> -Patch-Mainline: no - -populate_rootfs should be called prior to acpi_early_init() -if we ever want to be able to use a custom DSDT from initramfs. -Having done this, rootfs is available during acpi_early_init() -and the ACPI code can just call sys_open() to load a custom -DSDT. - - - init/main.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - ---- linux-2.6.15.orig/init/main.c 2006-02-10 10:52:10.000000000 -0800 -+++ linux-2.6.15/init/main.c 2006-02-10 10:53:33.000000000 -0800 -@@ -572,8 +572,6 @@ - - check_bugs(); - -- acpi_early_init(); /* before LAPIC and SMP init */ -- - /* Do the rest non-__init'ed, we're now alive */ - rest_init(); - } -@@ -700,6 +698,14 @@ - */ - child_reaper = current; - -+ /* -+ * Do this before initcalls, because some drivers want to access -+ * firmware files. -+ */ -+ populate_rootfs(); -+ -+ acpi_early_init(); /* before LAPIC and SMP init */ -+ - smp_prepare_cpus(max_cpus); - - do_pre_smp_initcalls(); -@@ -710,12 +716,6 @@ - - cpuset_init_smp(); - -- /* -- * Do this before initcalls, because some drivers want to access -- * firmware files. -- */ -- populate_rootfs(); -- - do_basic_setup(); - - /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/osync-error new/patches.suse/osync-error --- old/patches.suse/osync-error 2006-01-15 19:09:15.000000000 +0100 +++ new/patches.suse/osync-error 2006-08-29 18:25:50.000000000 +0200 @@ -5,6 +5,8 @@ Make sure to honor the error status of synchronous writeback during O_SYNC writes +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + Index: linux-2.5/mm/filemap.c=================================================================== RCS file: /home/andrea/crypto/cvs/linux-2.5/mm/filemap.c,v retrieving revision 1.270 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rcu-remote new/patches.suse/rcu-remote --- old/patches.suse/rcu-remote 2006-08-01 20:10:21.000000000 +0200 +++ new/patches.suse/rcu-remote 1970-01-01 01:00:00.000000000 +0100 @@ -1,444 +0,0 @@ -From: SGI -Subject: allow specific cpus to run rcu -References: 147431 -Patch-mainline: obsolete - -Now SN2 specific - -Acked-by: mason(a)suse.com - -diff -r b0ad5debd26c include/linux/rcupdate.h ---- a/include/linux/rcupdate.h Sun Jun 04 16:14:21 2006 -0400 -+++ b/include/linux/rcupdate.h Sun Jun 04 16:17:35 2006 -0400 -@@ -108,6 +108,10 @@ struct rcu_data { - struct rcu_head barrier; - #ifdef CONFIG_SMP - long last_rs_qlen; /* qlen during the last resched */ -+#ifdef CONFIG_IA64 -+ spinlock_t rmlock; /* for use with remote callback */ -+ short batch_stat; /* indicate processing being done */ -+#endif - #endif - }; - -@@ -270,6 +274,10 @@ extern void synchronize_rcu(void); - extern void synchronize_rcu(void); - void synchronize_idle(void); - extern void rcu_barrier(void); -+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64) -+extern int rcu_set_remote_rcu(int cpu); -+extern int rcu_clear_remote_rcu(int cpu); -+#endif - - #endif /* __KERNEL__ */ - #endif /* __LINUX_RCUPDATE_H */ -diff -r b0ad5debd26c kernel/rcupdate.c ---- a/kernel/rcupdate.c Sun Jun 04 16:14:21 2006 -0400 -+++ b/kernel/rcupdate.c Sun Jun 04 16:17:35 2006 -0400 -@@ -67,6 +67,8 @@ DEFINE_PER_CPU(struct rcu_data, rcu_bh_d - - /* Fake initialization required by compiler */ - static DEFINE_PER_CPU(struct tasklet_struct, rcu_tasklet) = {NULL}; -+/* Tasklet for processing rcu callbacks remotely */ -+static DEFINE_PER_CPU(struct tasklet_struct, rcu_remote_tasklet) = {NULL}; - static int blimit = 10; - static int qhimark = 10000; - static int qlowmark = 100; -@@ -105,6 +107,185 @@ static inline void force_quiescent_state - } - #endif - -+/* -+ * Variables and routines for remote rcu callback processing -+ * -+ * Remote callback processing allows specified (configured) cpus to have -+ * their list of rcu callbacks processed by other (non-configured) cpus, -+ * thus reducing the amount of overhead and latency seen by configured -+ * cpus. -+ * -+ * This is accomplished by having non-configured cpus process the donelist -+ * of the configured cpus from tasklet context. The remote cpu donelists -+ * are processed in a round-robin fashion, one list per cpu. Since only -+ * donelist processing is affected, other rcu list and quiescent state -+ * processing is unaffected. -+ * -+ * Configuration of a cpu for remote callback processing is done via the -+ * rcu_set_remote_rcu() and rcu_clear_remote_rcu() routines. -+ */ -+#define RCU_BATCH_IDLE 0 -+#define RCU_BATCH_LOCAL 1 -+#define RCU_BATCH_REMOTE 2 -+ -+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64) -+#define remote_rcu_callbacks 1 -+ -+/* cpus configured for remote callback processing, this rarely changes */ -+static cpumask_t __read_mostly cpu_remotercu_map = CPU_MASK_NONE; -+ -+/* next cpu for which we need to do remote callback processing */ -+static int cpu_remotercu_next = -1; -+ -+/* lock cpu_remotercu_next and changes to cpu_remotercu_map */ -+static DEFINE_SPINLOCK(cpu_remotercu_lock); -+ -+/* -+ * Return a mask of online cpus configured for remote rcu processing. -+ */ -+static void rcu_remote_cpus(cpumask_t * mask) -+{ -+ cpus_and(*mask, cpu_remotercu_map, cpu_online_map); -+} -+ -+/* -+ * Is this cpu configured for remote rcu callback processing? -+ */ -+static int rcu_callbacks_processed_remotely(int cpu) -+{ -+ cpumask_t mask; -+ -+ rcu_remote_cpus(&mask); -+ return(cpu_isset(cpu, mask)); -+} -+ -+/* -+ * Should this cpu be processing rcu callbacks for cpus configured as such? -+ */ -+static int rcu_process_remote(int cpu) -+{ -+ cpumask_t mask; -+ -+ rcu_remote_cpus(&mask); -+ /* -+ * If the system has some cpus configured for remote callbacks and -+ * this cpu is not one of those, then this cpu processes remote rcu -+ * callbacks. -+ */ -+ return (!cpus_empty(mask) && !cpu_isset(cpu, mask)); -+} -+ -+/* -+ * Get the next cpu on which to do remote rcu callback processing -+ * We simply round-robin across all cpus configured for remote callbacks. -+ */ -+static int rcu_next_remotercu(void) -+{ -+ cpumask_t mask; -+ unsigned long flags; -+ int cpu; -+ -+ rcu_remote_cpus(&mask); -+ if (unlikely(cpus_empty(mask))) -+ return -1; -+ spin_lock_irqsave(&cpu_remotercu_lock, flags); -+ cpu_remotercu_next = next_cpu(cpu_remotercu_next, mask); -+ if (cpu_remotercu_next >= NR_CPUS) -+ cpu_remotercu_next = first_cpu(mask); -+ cpu = cpu_remotercu_next; -+ spin_unlock_irqrestore(&cpu_remotercu_lock, flags); -+ -+ return cpu; -+} -+ -+static void rcu_rm_lock(struct rcu_data *rdp) -+{ -+ spin_lock_irq(&rdp->rmlock); -+} -+ -+static void rcu_rm_unlock(struct rcu_data *rdp) -+{ -+ spin_unlock_irq(&rdp->rmlock); -+} -+ -+static void rcu_set_batch_stat(struct rcu_data *rdp, short stat) -+{ -+ rdp->batch_stat = stat; -+} -+ -+/* -+ * Update the batch processing status only if no current callback processing. -+ */ -+static short rcu_setcmp_batch_stat(struct rcu_data *rdp, short stat) -+{ -+ return cmpxchg(&rdp->batch_stat, RCU_BATCH_IDLE, stat) == RCU_BATCH_IDLE; -+} -+ -+/* -+ * Update qlen and return the new value. -+ */ -+static long rcu_updated_qlen(struct rcu_data *rdp) -+{ -+ long old, new; -+ -+ /* Update qlen safely if configured for remote callbacks */ -+ if (unlikely(rcu_callbacks_processed_remotely(smp_processor_id()))) { -+ do { -+ old = rdp->qlen; -+ new = old + 1; -+ } while (cmpxchg(&rdp->qlen, old, new) != old); -+ return new; -+ } else -+ return ++rdp->qlen; -+} -+ -+/* -+ * Configure a cpu for remote rcu callback processing. -+ */ -+int rcu_set_remote_rcu(int cpu) -+{ -+ unsigned long flags; -+ -+ if (cpu_online(cpu)) { -+ spin_lock_irqsave(&cpu_remotercu_lock, flags); -+ cpu_set(cpu, cpu_remotercu_map); -+ spin_unlock_irqrestore(&cpu_remotercu_lock, flags); -+ return 0; -+ } else -+ return -1; -+} -+EXPORT_SYMBOL_GPL(rcu_set_remote_rcu); -+ -+/* -+ * Configure a cpu for standard rcu callback processing. -+ */ -+int rcu_clear_remote_rcu(int cpu) -+{ -+ unsigned long flags; -+ -+ if (cpu_online(cpu)) { -+ spin_lock_irqsave(&cpu_remotercu_lock, flags); -+ cpu_clear(cpu, cpu_remotercu_map); -+ spin_unlock_irqrestore(&cpu_remotercu_lock, flags); -+ return 0; -+ } else -+ return -1; -+} -+EXPORT_SYMBOL_GPL(rcu_clear_remote_rcu); -+#else -+#define remote_rcu_callbacks 0 -+static int rcu_callbacks_processed_remotely(int cpu) { return 0; } -+static int rcu_process_remote(int cpu) { return 0; } -+static void rcu_rm_lock(struct rcu_data *rdp) {} -+static void rcu_rm_unlock(struct rcu_data *rdp) {} -+static void rcu_set_batch_stat(struct rcu_data *rdp, short stat) {} -+static int rcu_setcmp_batch_stat(struct rcu_data *rdp, short stat) { return 1; } -+static long rcu_updated_qlen(struct rcu_data *rdp) -+{ -+ return ++rdp->qlen; -+} -+static void rcu_clear_remote_rcu(int cpu) {} -+#endif - /** - * call_rcu - Queue an RCU callback for invocation after a grace period. - * @head: structure to be used for queueing the RCU updates. -@@ -128,7 +309,7 @@ void fastcall call_rcu(struct rcu_head * - rdp = &__get_cpu_var(rcu_data); - *rdp->nxttail = head; - rdp->nxttail = &head->next; -- if (unlikely(++rdp->qlen > qhimark)) { -+ if (unlikely(rcu_updated_qlen(rdp) > qhimark)) { - rdp->blimit = INT_MAX; - force_quiescent_state(rdp, &rcu_ctrlblk); - } -@@ -164,7 +345,7 @@ void fastcall call_rcu_bh(struct rcu_hea - *rdp->nxttail = head; - rdp->nxttail = &head->next; - -- if (unlikely(++rdp->qlen > qhimark)) { -+ if (unlikely(rcu_updated_qlen(rdp) > qhimark)) { - rdp->blimit = INT_MAX; - force_quiescent_state(rdp, &rcu_bh_ctrlblk); - } -@@ -385,6 +566,8 @@ static void rcu_offline_cpu(int cpu) - struct rcu_data *this_rdp = &get_cpu_var(rcu_data); - struct rcu_data *this_bh_rdp = &get_cpu_var(rcu_bh_data); - -+ rcu_clear_remote_rcu(cpu); -+ - __rcu_offline_cpu(this_rdp, &rcu_ctrlblk, - &per_cpu(rcu_data, cpu)); - __rcu_offline_cpu(this_bh_rdp, &rcu_bh_ctrlblk, -@@ -392,6 +575,7 @@ static void rcu_offline_cpu(int cpu) - put_cpu_var(rcu_data); - put_cpu_var(rcu_bh_data); - tasklet_kill_immediate(&per_cpu(rcu_tasklet, cpu), cpu); -+ tasklet_kill_immediate(&per_cpu(rcu_remote_tasklet, cpu), cpu); - } - - #else -@@ -408,9 +592,26 @@ static void __rcu_process_callbacks(stru - static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp, - struct rcu_data *rdp) - { -+ int cpu = smp_processor_id(); -+ - if (rdp->curlist && !rcu_batch_before(rcp->completed, rdp->batch)) { -- *rdp->donetail = rdp->curlist; -- rdp->donetail = rdp->curtail; -+ /* -+ * If this cpu is configured for remote rcu callback -+ * processing, grab the lock to protect donelist from -+ * changes done by remote callback processing. -+ * -+ * Remote callback processing should only try this lock, -+ * then move on, so contention should be minimal. -+ */ -+ if (unlikely(rcu_callbacks_processed_remotely(cpu))) { -+ rcu_rm_lock(rdp); -+ *rdp->donetail = rdp->curlist; -+ rdp->donetail = rdp->curtail; -+ rcu_rm_unlock(rdp); -+ } else { -+ *rdp->donetail = rdp->curlist; -+ rdp->donetail = rdp->curtail; -+ } - rdp->curlist = NULL; - rdp->curtail = &rdp->curlist; - } -@@ -445,8 +646,15 @@ static void __rcu_process_callbacks(stru - local_irq_enable(); - } - rcu_check_quiescent_state(rcp, rdp); -- if (rdp->donelist) -+ if (remote_rcu_callbacks) { -+ if (rdp->donelist && !rcu_callbacks_processed_remotely(cpu) && -+ rcu_setcmp_batch_stat(rdp, RCU_BATCH_LOCAL)) { -+ rcu_do_batch(rdp); -+ rcu_set_batch_stat(rdp, RCU_BATCH_IDLE); -+ } -+ } else if (rdp->donelist) { - rcu_do_batch(rdp); -+ } - } - - static void rcu_process_callbacks(unsigned long unused) -@@ -454,6 +662,97 @@ static void rcu_process_callbacks(unsign - __rcu_process_callbacks(&rcu_ctrlblk, &__get_cpu_var(rcu_data)); - __rcu_process_callbacks(&rcu_bh_ctrlblk, &__get_cpu_var(rcu_bh_data)); - } -+ -+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64) -+/* -+ * Do callback processing for cpus marked as such. -+ * -+ * This will only be run on systems with cpus configured for remote -+ * callback processing, but only on cpus not configured as such. -+ * -+ * We process both regular and bh donelists for only one cpu at a -+ * time. -+ */ -+static void rcu_process_remote_callbacks(unsigned long unused) -+{ -+ struct rcu_data *rdp, *rdp_bh; -+ struct rcu_head * list = NULL; -+ struct rcu_head * list_bh = NULL; -+ int cpu; -+ long old, new, cnt; -+ -+ /* Get the cpu for which we will process the donelists */ -+ cpu = rcu_next_remotercu(); -+ if (unlikely(cpu == -1)) -+ return; -+ -+ /* -+ * We process whatever remote callbacks we can at this moment for -+ * this cpu. If the list protection locks are held, we move on, -+ * as we don't want contention. -+ */ -+ rdp = &per_cpu(rcu_data, cpu); -+ if (spin_trylock_irq(&rdp->rmlock)) { -+ /* -+ * batch_stat ensures cpu isn't still running rcu_do_batch. -+ * This can happen if we've just configured on the fly. -+ */ -+ if (rcu_setcmp_batch_stat(rdp, RCU_BATCH_REMOTE)) { -+ list = xchg(&rdp->donelist, NULL); -+ if (list != NULL) -+ rdp->donetail = &rdp->donelist; -+ } -+ spin_unlock_irq(&rdp->rmlock); -+ } -+ -+ rdp_bh = &per_cpu(rcu_bh_data, cpu); -+ if (spin_trylock_irq(&rdp_bh->rmlock)) { -+ if (rcu_setcmp_batch_stat(rdp_bh, RCU_BATCH_REMOTE)) { -+ list_bh = xchg(&rdp_bh->donelist, NULL); -+ if (list_bh != NULL) -+ rdp_bh->donetail = &rdp_bh->donelist; -+ } -+ spin_unlock_irq(&rdp_bh->rmlock); -+ } -+ -+ /* Process the donelists */ -+ cnt = 0; -+ while (list) { -+ list->func(list); -+ list = list->next; -+ cnt++; -+ } -+ -+ /* Safely update qlen without lock contention */ -+ if (cnt) { -+ do { -+ old = rdp->qlen; -+ new = old - cnt; -+ } while (cmpxchg(&rdp->qlen, old, new) != old); -+ } -+ -+ if (rdp->batch_stat == RCU_BATCH_REMOTE) -+ rcu_set_batch_stat(rdp, RCU_BATCH_IDLE); -+ -+ cnt = 0; -+ while (list_bh) { -+ list_bh->func(list_bh); -+ list_bh = list_bh->next; -+ cnt++; -+ } -+ -+ if (cnt) { -+ do { -+ old = rdp_bh->qlen; -+ new = old - cnt; -+ } while (cmpxchg(&rdp_bh->qlen, old, new)!=old); -+ } -+ if (rdp_bh->batch_stat == RCU_BATCH_REMOTE) -+ rcu_set_batch_stat(rdp_bh, RCU_BATCH_IDLE); -+} -+#else -+static void rcu_process_remote_callbacks(unsigned long unused) {} -+#endif - - static int __rcu_pending(struct rcu_ctrlblk *rcp, struct rcu_data *rdp) - { -@@ -486,6 +785,13 @@ static int __rcu_pending(struct rcu_ctrl - */ - int rcu_pending(int cpu) - { -+ /* -+ * Schedule remote callback processing on this cpu only if -+ * there are cpus set up for remote callback processing, and -+ * this one is not. -+ */ -+ if (unlikely(rcu_process_remote(cpu))) -+ tasklet_schedule(&per_cpu(rcu_remote_tasklet, cpu)); - return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) || - __rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu)); - } -@@ -527,6 +833,9 @@ static void rcu_init_percpu_data(int cpu - rdp->qs_pending = 0; - rdp->cpu = cpu; - rdp->blimit = blimit; -+#if defined(CONFIG_SMP) && defined(CONFIG_IA64) -+ spin_lock_init(&rdp->rmlock); -+#endif - } - - static void __devinit rcu_online_cpu(int cpu) -@@ -537,6 +846,8 @@ static void __devinit rcu_online_cpu(int - rcu_init_percpu_data(cpu, &rcu_ctrlblk, rdp); - rcu_init_percpu_data(cpu, &rcu_bh_ctrlblk, bh_rdp); - tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL); -+ tasklet_init(&per_cpu(rcu_remote_tasklet, cpu), -+ rcu_process_remote_callbacks, 0UL); - } - - static int __devinit rcu_cpu_notify(struct notifier_block *self, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rcu-scale new/patches.suse/rcu-scale --- old/patches.suse/rcu-scale 2006-08-01 11:44:09.000000000 +0200 +++ new/patches.suse/rcu-scale 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -From: SGI -Subject: slow down rcu processing on big machines -References: 181202 -Patch-mainline: obsolete - -Acked-by: mason(a)suse.com - ---- - arch/ia64/sn/kernel/setup.c | 12 ++++++++++++ - include/linux/sysctl.h | 1 + - kernel/rcupdate.c | 17 +++++++++++++++++ - kernel/sysctl.c | 10 ++++++++++ - 4 files changed, 40 insertions(+) - ---- linux-2.6.17.orig/arch/ia64/sn/kernel/setup.c -+++ linux-2.6.17/arch/ia64/sn/kernel/setup.c -@@ -684,6 +684,18 @@ void __init sn_cpu_init(void) - (volatile unsigned long *)GLOBAL_MMR_ADDR(nasid, - SH1_PI_CAM_CONTROL); - } -+ -+/* -+ * This is a hack to fix a RCU scaling problems on insanely large systems. This fix -+ * is specific to 2.6.16-based kernel. -+ */ -+ { -+ extern int rcu_mask; -+ if (cpuid == 512) -+ rcu_mask = 1; -+ else if (cpuid == 768) -+ rcu_mask = 3; -+ } - } - - /* ---- linux-2.6.17.orig/include/linux/sysctl.h -+++ linux-2.6.17/include/linux/sysctl.h -@@ -149,6 +149,7 @@ enum - KERN_MAX_LOCK_DEPTH=74, - KERN_UNSUPPORTED=75, /* int: allow loading of unsupported modules */ - KERN_KDB=76, /* int: kdb on/off */ -+ KERN_RCU_MASK=77, /* int: mask for slow rcu callback processing */ - }; - - ---- linux-2.6.17.orig/kernel/rcupdate.c -+++ linux-2.6.17/kernel/rcupdate.c -@@ -48,6 +48,7 @@ - #include <linux/rcupdate.h> - #include <linux/cpu.h> - #include <linux/mutex.h> -+#include <linux/jiffies.h> - - /* Definition for rcupdate control block. */ - static struct rcu_ctrlblk rcu_ctrlblk = { -@@ -66,6 +67,19 @@ static struct rcu_ctrlblk rcu_bh_ctrlblk - DEFINE_PER_CPU(struct rcu_data, rcu_data) = { 0L }; - DEFINE_PER_CPU(struct rcu_data, rcu_bh_data) = { 0L }; - -+/* -+ * Set the following to 1, 3, 7, 15, ... to slow down the rate at which RCU -+ * callbacks are processed. WARNING - make sure the value is 2**n-1 -+ */ -+int rcu_mask = 0; -+ -+/* Is it time to process a batch on this cpu */ -+static inline int rcu_time(int cpu) -+{ -+ return (((jiffies - cpu) & rcu_mask) == 0); -+} -+ -+ - /* Fake initialization required by compiler */ - static DEFINE_PER_CPU(struct tasklet_struct, rcu_tasklet) = {NULL}; - /* Tasklet for processing rcu callbacks remotely */ -@@ -821,6 +835,9 @@ int rcu_needs_cpu(int cpu) - - void rcu_check_callbacks(int cpu, int user) - { -+ if (!rcu_time(cpu)) -+ return; -+ - if (user || - (idle_cpu(cpu) && !in_softirq() && - hardirq_count() <= (1 << HARDIRQ_SHIFT))) { ---- linux-2.6.17.orig/kernel/sysctl.c -+++ linux-2.6.17/kernel/sysctl.c -@@ -163,6 +163,8 @@ extern ctl_table inotify_table[]; - int sysctl_legacy_va_layout; - #endif - -+extern int rcu_mask; -+ - /* /proc declarations: */ - - #ifdef CONFIG_PROC_FS -@@ -307,6 +309,14 @@ static ctl_table kern_table[] = { - .mode = 0444, - .proc_handler = &proc_dointvec, - }, -+ { -+ .ctl_name = KERN_RCU_MASK, -+ .procname = "rcu_mask", -+ .data = &rcu_mask, -+ .maxlen = sizeof(int), -+ .mode = 0644, -+ .proc_handler = &proc_dointvec, -+ }, - #ifdef CONFIG_MODULES - { - .ctl_name = KERN_UNSUPPORTED, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-barrier-default new/patches.suse/reiserfs-barrier-default --- old/patches.suse/reiserfs-barrier-default 2005-07-13 09:04:43.000000000 +0200 +++ new/patches.suse/reiserfs-barrier-default 2006-08-29 18:25:50.000000000 +0200 @@ -6,6 +6,9 @@ fs/reiserfs/super.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + + Index: linux-2.6.12/fs/reiserfs/super.c =================================================================== --- linux-2.6.12.orig/fs/reiserfs/super.c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-nobarrier-fsync new/patches.suse/reiserfs-nobarrier-fsync --- old/patches.suse/reiserfs-nobarrier-fsync 2005-07-13 09:04:43.000000000 +0200 +++ new/patches.suse/reiserfs-nobarrier-fsync 2006-08-29 18:25:50.000000000 +0200 @@ -4,6 +4,8 @@ make sure that reiserfs_fsync only triggers barriers when mounted with -o barrier=flush +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + fs/reiserfs/file.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-periodic-flush-latency new/patches.suse/reiserfs-periodic-flush-latency --- old/patches.suse/reiserfs-periodic-flush-latency 2006-05-08 04:25:53.000000000 +0200 +++ new/patches.suse/reiserfs-periodic-flush-latency 2006-08-29 18:25:50.000000000 +0200 @@ -13,6 +13,8 @@ if a bad decision is made, it just means a slightly longer journal replay after a crash. +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + diff -r f5fbf9aa254c fs/reiserfs/journal.c --- a/fs/reiserfs/journal.c Fri Apr 14 13:10:47 2006 -0400 +++ b/fs/reiserfs/journal.c Sun May 07 22:07:38 2006 -0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/shmall-bigger new/patches.suse/shmall-bigger --- old/patches.suse/shmall-bigger 2006-02-12 02:25:58.000000000 +0100 +++ new/patches.suse/shmall-bigger 2006-08-29 18:25:50.000000000 +0200 @@ -4,6 +4,8 @@ The defaults are too small for most users. +Acked-by: Jeff Mahoney <jeffm(a)suse.com> + diff -r bc44f8e6757b include/linux/msg.h --- a/include/linux/msg.h Sat Feb 11 12:48:44 2006 -0500 +++ b/include/linux/msg.h Sat Feb 11 20:10:10 2006 -0500 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch new/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch --- old/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch 2005-11-25 14:35:54.000000000 +0100 +++ new/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -Subject: [PATCH] Fix pmac_zilog as console -From: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> - -http://linux.bkbits.net:8080/linux-2.6/gnupatch@418eeaabEopKEhWRlJFrp5KeVLAtag -... -By default, BREAK is used for sysrq, though some -Apple zilog's seem to have non-working BREAK detection logic, thus the -driver has a #define option you can manually enable when debugging to do -SYSRQ with ctrl-O instead (like pSeries virtual consoles). -... - -Signed-off-by: Olaf Hering <olh(a)suse.de> - - drivers/serial/pmac_zilog.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) - -Index: linux-2.6.15-rc2-olh/drivers/serial/pmac_zilog.c -=================================================================== ---- linux-2.6.15-rc2-olh.orig/drivers/serial/pmac_zilog.c -+++ linux-2.6.15-rc2-olh/drivers/serial/pmac_zilog.c -@@ -40,7 +40,7 @@ - - #undef DEBUG - #undef DEBUG_HARD --#undef USE_CTRL_O_SYSRQ -+#define USE_CTRL_O_SYSRQ - - #include <linux/config.h> - #include <linux/module.h> ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-08-28 22:45:29.000000000 +0200 +++ kernel-source/series.conf 2006-08-30 14:50:48.000000000 +0200 @@ -26,8 +26,9 @@ patches.kernel.org/patch-2.6.18-rc3-rc4 patches.kernel.org/patch-2.6.18-rc4-rc5 + patches.arch/ppc-update_gtod-race.patch + patches.fixes/setuid-dumpable-wrongdir -# patches.fixes/kbuild-fix-external-module ######################################################## # @@ -40,7 +41,6 @@ patches.rpmify/rpm-kernel-config patches.rpmify/buildhost patches.rpmify/cloneconfig.diff -# patches.rpmify/suse-extmod-legacy ??? patches.rpmify/build-timestamp # every patch below is optional @@ -59,8 +59,6 @@ # ia64 patches.arch/stack-limit - patches.arch/ia64-export-node-to-cpu-mask.patch - patches.fixes/ia64-put-user-size # i386 patches.arch/i386-apic-auto @@ -69,7 +67,6 @@ # 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T' # x64 # "the architecture with too many names" - patches.arch/x86_64-nmi-watchdog-timeout # for i386/x86-64 @@ -79,7 +76,6 @@ patches.suse/suse-ppc-legacy-io.patch patches.arch/ppc-tumbler-active_state.patch patches.suse/mv643xx_eth.hwinfo.patch - patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch patches.suse/suse-ppc32-mol.patch patches.suse/suse-ppc32-mol-kbuild.patch patches.suse/suse-ppc32-mol-mm-context @@ -89,9 +85,7 @@ patches.suse/suse-ppc64-branding patches.arch/ppc64-xmon-autobacktrace.patch patches.arch/ppc64-xmon-dmesg-printing.patch - patches.arch/ppc-kdump-shutdown-interrupts.patch patches.arch/ppc-kdump-xmon-stop-cpu.patch - patches.arch/ppc-kdump-disable-eeh-and-numa.patch patches.fixes/ignore-aix-disk-label.patch # KDB v4.4 @@ -117,9 +111,7 @@ # ACPI patches # ######################################################## - patches.suse/initramfs-before-acpi.patch patches.suse/acpi_dsdt_initrd_initramfs - patches.suse/acpi-oldboot patches.arch/acpi_export_syms # Specific support for vendor-specific features @@ -183,10 +175,8 @@ patches.suse/lockd-suse-config ######################################################## - # cifs and smbfs patches + # cifs patches ######################################################## - patches.drivers/smbfs-sendqueue-backoff - patches.drivers/smbfs-request-counting ######################################################## # ext3 @@ -229,7 +219,6 @@ ######################################################## # Networking, IPv6 ######################################################## - patches.fixes/ipv6-init-fail-cleanup patches.fixes/ipv6-add-addr-install-dstentry patches.fixes/ipv6-no-autoconf @@ -254,6 +243,7 @@ ######################################################## # Storage ######################################################## + patches.suse/floppy-printk.patch # Remaining SCSI patches (garloff) patches.suse/scsi-scan-inq-ppc64-dflt patches.suse/scsi-error-test-unit-ready-timeout @@ -262,7 +252,6 @@ # Network ######################################################## patches.fixes/tulip-quad-NIC-ifdown - patches.fixes/tulip-down-race patches.suse/prism-defaultmac patches.suse/nameif-track-rename.patch patches.suse/rtnetlink-atomic2.patch @@ -321,7 +310,6 @@ # patches.drivers/libata-acpi-suspend # patches.drivers/libata-acpi-suspend-doc-fix patches.fixes/dm-suspend-resume-events - patches.fixes/libata-increase-timeout-for-resume ######################################################## @@ -332,8 +320,6 @@ # Patches for S/390 from SUSE which don't rely on IBM's # patches: ######################################################## - # Enable RAW devices - patches.arch/s390-raw-device # bootsplash -- now duwe's job patches.suse/bootsplash @@ -411,8 +397,6 @@ patches.suse/readahead-tune patches.suse/ide-probe-delay - patches.drivers/sis5513-support-sis-965l - patches.suse/osync-error patches.suse/connector-read-mostly @@ -421,10 +405,6 @@ patches.suse/shmall-bigger patches.fixes/grab-swap-token-oops - patches.suse/rcu-remote - - # still need? -# patches.fixes/nfsd-setuser-fix patches.arch/disable-apic-error patches.fixes/dm_check_device_area.diff @@ -439,13 +419,10 @@ patches.fixes/nfsd-dmapi-aware patches.suse/smtnice-disable - patches.suse/rcu-scale patches.suse/filp-slab-rcu patches.suse/ext2-fsync-err patches.fixes/remount-no-shrink-dcache - patches.suse/bh-cache-option patches.suse/sysctl-add-affinity_load_balancing - patches.fixes/nfsv4-setclientid patches.fixes/ipmi-unload-crash patches.fixes/loop-barriers ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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