May 2010 - openSUSE Commits - openSUSE Mailing Lists

commit nagios for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at Fri May 7 15:57:56 CEST 2010. -------- --- nagios/nagios.changes 2010-04-06 12:50:01.000000000 +0200 +++ nagios/nagios.changes 2010-05-05 18:11:42.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 5 08:52:01 UTC 2010 - lars(a)linux-schulserver.de + +- fix broken files section +- init skript now handles /var/run on tmpfs +- small adaptions of init skript +- default pidfile now /var/run/nagios/nagios.pid +- add manpages from Debian package +- add Debian patches: + + nagios-fix_forced_servicechecks.patch + + nagios-fix_encoding_trends.cgi.patch + + nagios-fix_spurious_dollar_signs_added_to_command_lines.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nagios-fix_encoding_trends.cgi.patch nagios-fix_forced_servicechecks.patch nagios-fix_spurious_dollar_signs_added_to_command_lines.patch nagios.8 nagiosstats.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.5AqvXJ/_old 2010-05-07 15:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.5AqvXJ/_new 2010-05-07 15:52:59.000000000 +0200 @@ -15,10 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: nagios +Version: 3.2.1 +Release: 2 +Summary: The Nagios Network Monitor +Url: http://www.nagios.org/ +Group: System/Monitoring +License: GPLv2+ %define nsusr nagios %define nsgrp nagios %define cmdusr wwwrun @@ -28,30 +33,24 @@ %define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d # Macro that print mesages to syslog at package (un)install time %define nnmmsg logger -t %{name}/rpm -Summary: The Nagios Network Monitor -Version: 3.2.1 -Release: 1 -License: GPLv2+ -Group: System/Monitoring -Url: http://www.nagios.org/ Source0: %{name}-%{version}.tar.bz2 Source1: rc%{name} Source2: %{name}-rpmlintrc Source3: %{name}.sysconfig Source4: suse.de-nagios +Source5: nagios.8 +Source6: nagiosstats.8 Source10: %{name}-README.SuSE -# +# PATCH-FIX-UPSTREAM fix for missing expression in return statement bnc#395203 Patch1: nagios.run_async_service_check.return.patch +# PATCH-FIX-UPSTREAM Fixes the output of spurious $ signs in commandoutput (deb#480001) +Patch2: nagios-fix_spurious_dollar_signs_added_to_command_lines.patch +# PATCH-FIX-UPSTREAM unescape hex characters in CGI input - avoid addional '+' +Patch3: nagios-fix_encoding_trends.cgi.patch +# PATCH-FIX-UPSTREAM Fixes handling of forced checks +Patch4: nagios-fix_forced_servicechecks.patch +# PATCH-FIX-OPENSUSE openSUSE uses a special location for p1.pl Patch10: nagios-p1.pl-location.patch -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq -PreReq: %fillup_prereq -PreReq: /bin/logger -PreReq: coreutils -PreReq: grep -PreReq: pwdutils -PreReq: sed BuildRequires: apache2-devel BuildRequires: freetype2-devel BuildRequires: gd-devel @@ -62,6 +61,15 @@ BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: zlib-devel +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: /bin/logger +PreReq: coreutils +PreReq: grep +PreReq: pwdutils +PreReq: sed +# +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} < 1010 BuildRequires: XFree86-devel BuildRequires: XFree86-libs @@ -70,15 +78,16 @@ %else BuildRequires: libapr-util1-devel BuildRequires: xorg-x11-devel -Recommends: cron Recommends: %{name}-www +Recommends: cron # we enable nagios embedded perl, but if people disable it... Recommends: perl = %{perl_version} %endif %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Requires: mailx %{name}-plugins +Requires: %{name}-plugins +Requires: mailx %description Nagios is a program that will monitor hosts and services on your @@ -95,25 +104,21 @@ This package provide core programs for nagios. The web interface, documentation, and development files are built as separate packages - - -Authors: --------- - Ethan Galstad <nagios(a)nagios.org> - %package www License: GPLv2+ -Group: System/Monitoring Summary: Provides the HTML and CGI files for the Nagios web interface -Requires: %{name} = %{version} -Requires: gd php5 mod_php_any +Group: System/Monitoring +PreReq: /bin/logger PreReq: apache2 PreReq: coreutils +PreReq: gawk +PreReq: grep PreReq: pwdutils -PreReq: /bin/logger PreReq: sed -PreReq: grep -PreReq: gawk +Requires: %{name} = %{version} +Requires: gd +Requires: mod_php_any +Requires: php5 %description www Nagios is a program that will monitor hosts and services on your @@ -129,16 +134,10 @@ for the Nagios web interface. In addition, HTML documentation is included in this package. - - -Authors: --------- - Ethan Galstad <nagios(a)nagios.org> - %package devel License: GPLv2+ -Group: Development/Libraries/C and C++ Summary: Development files for nagios +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: gcc @@ -153,18 +152,18 @@ This package provides include files that Nagios-related applications may compile against. - - -Authors: --------- - Ethan Galstad <nagios(a)nagios.org> - %prep %setup -q %patch1 -p1 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 %patch10 find -name ".cvsignore" | xargs rm find -name ".gitignore" | xargs rm +# fix p1.pl pathname of mini_epn +sed -i 's|p1.pl|%{_prefix}/lib/%{name}/p1.pl|g' contrib/mini_epn.c +sed -i 's|p1.pl|%{_prefix}/lib/%{name}/p1.pl|g' contrib/new_mini_epn.c %build # if the following command fails, then apache dependencies are not met @@ -210,8 +209,8 @@ # # make daemonchk.cgi and event handlers # -make %{?_smp_mflags} all -make %{?_smp_mflags} -C contrib +make %{?jobs:-j%jobs} all +make %{?jobs:-j%jobs} -C contrib pushd contrib/eventhandlers 1>/dev/null for f in `find . -type f` ; do F=`mktemp temp.XXXXXX` @@ -227,30 +226,30 @@ popd 1>/dev/null %install -mkdir -p %buildroot/var/log/%name/archives -mkdir -p %buildroot/%_sbindir -mkdir -p %buildroot/%apache2_sysconfdir/ -mkdir -p %buildroot/%nslockfile_dir +mkdir -p %{buildroot}%{_localstatedir}/log/%name/archives +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%apache2_sysconfdir/ +mkdir -p %{buildroot}%nslockfile_dir %{__make} install install-commandmode install-config install-webconf \ - DESTDIR="%buildroot" \ + DESTDIR=%{buildroot} \ INSTALL_OPTS="" \ COMMAND_OPTS="" \ - CGICFGDIR="%_sysconfdir/%name" \ + CGICFGDIR="%{_sysconfdir}/%name" \ INIT_OPTS="" %{__make} install -C contrib \ - DESTDIR="%buildroot" \ + DESTDIR=%{buildroot} \ INSTALL_OPTS="" # install event handlers -%{__install} -d -m0755 %buildroot%_prefix/lib/%name/plugins/eventhandlers/ -%{__cp} -afpv contrib/eventhandlers/* %buildroot%_prefix/lib/%name/plugins/eventhandlers/ +%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%name/plugins/eventhandlers/ +%{__cp} -afpv contrib/eventhandlers/* %{buildroot}%{_prefix}/lib/%name/plugins/eventhandlers/ # install directory for event brokers like ndoutils -%{__install} -d -m0755 %buildroot%_prefix/lib/%name/brokers +%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%name/brokers # install headers for development package -%{__install} -d -m0755 %buildroot%_includedir/%name/ +%{__install} -d -m0755 %{buildroot}%{_includedir}/%name/ pushd include for file in *.h; do if test "x${file}" != "xconfig.h" -a "x${file}" != "xsnprintf.h" -a "x${file}" != "xcgiutils.h" ; then - install -m 644 $file %buildroot%_includedir/%name/ + install -m 644 $file %{buildroot}%{_includedir}/%name/ fi; done popd @@ -262,33 +261,39 @@ sed -e 's|command_file=.*|command_file=/var/spool/%name/nagios.cmd|g' \ -e 's|log_file=/var/lib/nagios/nagios.log|log_file=/var/log/nagios/nagios.log|g' \ -e 's|log_archive_path=/var/lib/nagios/archives|log_archive_path=/var/log/nagios/archives|g' \ - %buildroot/%_sysconfdir/%name/nagios.cfg > %buildroot/%_sysconfdir/%name/nagios.cfg.tmp -mv %buildroot/%_sysconfdir/%name/nagios.cfg.tmp %buildroot/%_sysconfdir/%name/nagios.cfg + -e 's|^lock_file=.*|lock_file=%nslockfile|g' \ + %{buildroot}%{_sysconfdir}/%name/nagios.cfg > %{buildroot}%{_sysconfdir}/%name/nagios.cfg.tmp +mv %{buildroot}%{_sysconfdir}/%name/nagios.cfg.tmp %{buildroot}%{_sysconfdir}/%name/nagios.cfg # # install SuSE specials # # README.SuSE file -sed -e 's@DATADIR@%_datadir/%name@g' -e 's@SYSCONFDIR@%_sysconfdir/%name@g' %{SOURCE10} > %_builddir/%name-%version/README.SuSE +sed -e 's@DATADIR@%{_datadir}/%name@g' -e 's@SYSCONFDIR@%{_sysconfdir}/%name@g' %{SOURCE10} > %_builddir/%name-%version/README.SuSE # init-script -%{__install} -D -m 0755 %{S:1} %buildroot/%_sysconfdir/init.d/%name -ln -sf ../../etc/init.d/%name %buildroot/%_sbindir/rc%name +%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%name +ln -sf ../../etc/init.d/%name %{buildroot}%{_sbindir}/rc%name # sysconfig script -%{__install} -D -m 0644 %{S:3} %buildroot/var/adm/fillup-templates/sysconfig.%name +%{__install} -D -m 0644 %{S:3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%name # install cronjob (gzip' the logfiles) -%{__install} -D -m 0640 %{S:4} %buildroot/%_sysconfdir/cron.weekly/%name +%{__install} -D -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%name # important ghost files -touch %buildroot%_sysconfdir/%name/htpasswd.users -touch %buildroot/var/lib/%name/retention.dat -touch %buildroot/var/lib/%name/status.dat -touch %buildroot/var/log/%name/config.err -touch %buildroot%nslockfile +touch %{buildroot}%{_sysconfdir}/%name/htpasswd.users +touch %{buildroot}%{_localstatedir}/lib/%name/retention.dat +touch %{buildroot}%{_localstatedir}/lib/%name/status.dat +touch %{buildroot}%{_localstatedir}/log/%name/config.err +touch %{buildroot}%nslockfile +# install manpages +install -Dm644 %{SOURCE5} %{buildroot}%{_mandir}/man8/%{name}.8 +install -Dm644 %{SOURCE6} %{buildroot}%{_mandir}/man8/nagiosstats.8 +# resource.cfg can contain passwords +chmod 0640 %{buildroot}%{_sysconfdir}/%name/resource.cfg # some rpmlint stuff %if 0%{?suse_version} > 1020 -%fdupes -s %buildroot +%fdupes -s %{buildroot} %endif %clean -%{__rm} -rf %buildroot +%{__rm} -rf %{buildroot} %pre # Create user and group on the system if necessary @@ -434,47 +439,50 @@ %files %defattr(-,root,root) %doc Changelog LEGAL LICENSE README README.SuSE sample-config/ -%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%name -%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/objects -%dir %attr(755,%nsusr,%nsgrp) /var/lib/%name -%dir %attr(755,%nsusr,%nsgrp) /var/log/%name -%dir %attr(755,%nsusr,%nsgrp) /var/log/%name/archives -%dir %attr(755,%nsusr,%nsgrp) %nslockfile_dir -%dir %attr(2775,%nsusr,%cmdgrp) /var/spool/%name -%attr(0755,root,root) %_sysconfdir/init.d/%name +%{_mandir}/man8/%{name}* +%_sysconfdir/init.d/%name +%ghost %config(missingok,noreplace) /var/log/%name/config.err +%config(noreplace) %_sysconfdir/%name/resource.cfg +%config(noreplace) %_sysconfdir/%name/cgi.cfg +%config(noreplace) %_sysconfdir/%name/%{name}.cfg +%config(noreplace) %_sysconfdir/%name/objects/*.cfg +%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%defattr(755,root,root) +%{_sysconfdir}/cron.weekly/* +%{_prefix}/lib/%name/ +%exclude %{_prefix}/lib/%name/cgi/* +%{_sbindir}/convertcfg +%{_sbindir}/mini_epn +%attr(0750,root,%{cmdgrp}) %{_sbindir}/%{name} +%attr(0750,root,%{cmdgrp}) %{_sbindir}/nagiostats +%{_sbindir}/new_mini_epn +%{_sbindir}/rc%name +# defattr change +%defattr(-,%{nsusr},%{cmdgrp}) +%dir %_sysconfdir/%name +%dir %_sysconfdir/%name/objects +%dir /var/spool/%name +# defattr change +%defattr(-,%{nsusr},%nsgrp) +%dir /var/lib/%name +%dir /var/log/%name +%dir /var/log/%name/archives +%dir %nslockfile_dir %attr(0644,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/%name/%name.pid %attr(0600,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%name/retention.dat %attr(0664,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%name/status.dat -%ghost %config(missingok,noreplace) /var/log/%name/config.err -%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/cgi.cfg -%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/%{name}.cfg -%config(noreplace) %attr(660,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/resource.cfg -%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%name/objects/*.cfg -/var/adm/fillup-templates/sysconfig.%{name} -# defattr change -%defattr(755,root,root) -%_sysconfdir/cron.weekly/* -%_prefix/lib/%name/ -%exclude %_prefix/lib/%name/cgi/* -%_sbindir/convertcfg -%_sbindir/mini_epn -%attr(0750,root,%{cmdgrp}) %_sbindir/%{name} -%attr(0750,root,%{cmdgrp}) %_sbindir/nagiostats -%_sbindir/new_mini_epn -%_sbindir/rc%name %files www %defattr(755,root,root) -%_prefix/lib/%name/cgi/* +%{_prefix}/lib/%name/cgi/* # defattr change %defattr(-,root,root) -%_datadir/%name/ +%{_datadir}/%name/ %config(noreplace) %{apache2_sysconfdir}/%name.conf -%attr(0640,root,%cmdgrp) %ghost %config(missingok,noreplace) %_sysconfdir/%name/htpasswd.users +%attr(0640,root,%cmdgrp) %ghost %config(missingok,noreplace) %{_sysconfdir}/%name/htpasswd.users %files devel %defattr(-,root,root) -%dir %_includedir/%name -%_includedir/%name/* +%{_includedir}/%name/ %changelog ++++++ nagios-fix_encoding_trends.cgi.patch ++++++ Index: cgi/getcgi.c =================================================================== --- cgi/getcgi.c.orig +++ cgi/getcgi.c @@ -96,6 +96,9 @@ void unescape_cgi_input(char *input){ break; else if(input[x]=='%'){ input[y]=hex_to_char(&input[x+1]); + if (input[y]=='+'){ + input[y]=' '; + } x+=2; } else ++++++ nagios-fix_forced_servicechecks.patch ++++++ Index: cgi/cmd.c =================================================================== --- cgi/cmd.c.orig +++ cgi/cmd.c @@ -2041,6 +2041,10 @@ int commit_command(int cmd){ break; case CMD_SCHEDULE_SVC_CHECK: + if(force_check==TRUE) + cmd=CMD_SCHEDULE_FORCED_SVC_CHECK; + result = cmd_submitf(cmd,"%s;%s;%lu",host_name,service_desc,start_time); + break; case CMD_SCHEDULE_FORCED_SVC_CHECK: if(force_check==TRUE) cmd=CMD_SCHEDULE_FORCED_SVC_CHECK; ++++++ nagios-fix_spurious_dollar_signs_added_to_command_lines.patch ++++++ Index: common/macros.c =================================================================== --- common/macros.c.orig +++ common/macros.c @@ -195,7 +195,8 @@ int process_macros(char *input_buffer, c *output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+strlen(temp_buffer)+3); strcat(*output_buffer,"$"); strcat(*output_buffer,temp_buffer); - strcat(*output_buffer,"$"); + if (buf_ptr!=NULL) + strcat(*output_buffer,"$"); } /* insert macro */ ++++++ nagios.8 ++++++ .TH nagios "8" "February 2006, May 2010" "sean finney, Lars Vogdt" "Nagios" .SH NAME Nagios \- network/systems status monitoring daemon .SH SYNOPSIS .B nagios [\-h] [\-v] [\-s] [\-d] <main_config_file> .br .SH DESCRIPTION .B nagios is a daemon program that monitors the status of various network accessible systems, devices, and more. For more information, please consult the online documentation available at http://www.nagios.org, or on your nagios server's web page. .SH OPTIONS .TP main_config_file The main configuration file. On openSUSE systems this defaults to /etc/nagios/nagios.cfg .TP \fB\-h\fR A helpful usage message .TP \fB\-v\fR Reads all data in the configuration files and performs a basic verification/sanity check. Always make sure you verify your config data before (re)starting Nagios. You can also use the Nagios init script to verify your configuration - try: rcnagios check_verbose .TP \fB\-s\fR Shows projected/recommended check scheduling information based on the current data in the configuration files. .TP \fB\-d\fR Starts Nagios in daemon mode (instead of as a foreground process). .SH FILES .TP .IP /etc/nagios Default configuration directory for nagios .SH AUTHOR Nagios is written and maintained by Ethan Galstad <nagios(a)nagios.org>. This manual page was written by sean finney <seanius(a)debian.org> for the Debian GNU/Linux operating system (but it may be freely used, modified, and redistributed by others) and adapted by Lars Vogdt for openSUSE. ++++++ nagiosstats.8 ++++++ .TH nagiosstats "8" "February 2006, May 2010" "sean finney, Lars Vogdt " "nagios" .SH NAME nagiosstats \- report statistics information from the Nagios system .SH SYNOPSIS .B nagiosstats [\-hVL] [\-c config] [\-m] [\-d] .br .SH DESCRIPTION .B nagiosstats is a program designed to provide information on the running Nagios system. It can provide a brief summary of information, or it can be used to export specific information about the Nagios system into an MRTG-compatible format. For more information please consult the Nagios online documentation available at http://www.nagios.org or the documentation available with your Nagios server's web page. .SH OPTIONS .TP \fB\-c\fR|\-\-config=FILE The main configuration file. On openSUSE systems this defaults to /etc/nagios/nagios.cfg .TP \fB\-m\fR|\-\-mrtg Print output in MRTG-compatible format. For more details run nagiosstats with \-\-help .TP \fB\-d\fR|\-\-data=VARS Comma-seperated list of variables to output in MRTG format. For more details run nagiosstats with \-\-help. .TP \fB\-h\fR|\-\-help A helpful usage message .TP \fB\-V\fR|\-\-version Print version information .TP \fB\-L\fR|\-\-license Print license details .SH FILES .TP .IP /etc/nagios Default configuration directory for Nagios .SH AUTHOR Nagios is written and maintained by Ethan Galstad <nagios(a)nagios.org>. This manual page was written by sean finney <seanius(a)debian.org> for the Debian GNU/Linux operating system (but it may be freely used, modified, and redistributed by others) and adapted for openSUSE by Lars Vogdt. ++++++ rcnagios ++++++ --- /var/tmp/diff_new_pack.5AqvXJ/_old 2010-05-07 15:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.5AqvXJ/_new 2010-05-07 15:53:00.000000000 +0200 @@ -2,6 +2,7 @@ # Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany. # 2002 SuSE Linux AG Nuernberg, Germany. # 2007 SuSE Linux GmbH Nuernberg, Germany. +# 2010 SUSE LINUX Products GmbH, Nuernberg, Germany # # Author: Wolfgang Rosenauer, Lars Vogdt # @@ -30,18 +31,19 @@ . /etc/rc.status -NAGIOS_BIN=/usr/sbin/nagios -NAGIOS_CFG=/etc/nagios/nagios.cfg -NAGIOS_SYSCONFIG=/etc/sysconfig/nagios -NAGIOS_CFG_ERR_LOG=/var/log/nagios/config.err +NAGIOS_BIN="/usr/sbin/nagios" +NAGIOS_CFG="/etc/nagios/nagios.cfg" +NAGIOS_PIDFILE="/var/run/nagios/nagios.pid" +NAGIOS_SYSCONFIG="/etc/sysconfig/nagios" +NAGIOS_CFG_ERR_LOG="/var/log/nagios/config.err" # Read config and log errors in logfile function config_check () { - $NAGIOS_BIN -v $NAGIOS_CFG > /dev/null 2>&1 + $NAGIOS_BIN -v "$NAGIOS_CFG" >/dev/null 2>&1 if [ $? -eq 0 ]; then return 0 else - $NAGIOS_BIN -v $NAGIOS_CFG > $NAGIOS_CFG_ERR_LOG 2>&1 + $NAGIOS_BIN -v "$NAGIOS_CFG" >"$NAGIOS_CFG_ERR_LOG" 2>&1 return 1 fi } @@ -51,7 +53,7 @@ if [ -n "$2" ]; then set -- `grep ^$1 $2 | sed 's@=@ @' | tr -d '[:cntrl:]'` else - set -- `grep ^$1 $NAGIOS_CFG | sed 's@=@ @' | tr -d '[:cntrl:]'` + set -- `grep ^$1 "$NAGIOS_CFG" | sed 's@=@ @' | tr -d '[:cntrl:]'` fi shift # remove first ARG => search-string echo $* @@ -59,38 +61,58 @@ # check some default files and directories function check_files() { - # set default access rights for files and directories - for file in $check_result_path $log_file $state_retention_file $status_file; do - if [ -e $file ]; then - touch $file - chown $nagios_user:$nagios_cmdgrp $file - fi - done - chmod 660 $resource_file - chown $nagios_user:$nagios_cmdgrp $resource_file # remove some perhaps left over files - for file in $command_file $lock_file $status_file $temp_file /var/lock/subsys/nagios; do - test -f $file && rm -f $file + for file in "$command_file" "$lock_file" "$status_file" "$temp_file" "/var/lock/subsys/nagios"; do + test -f "$file" && rm -f "$file" + done + # set default access rights for files and directories + for file in "$check_result_path" "$log_file" "$state_retention_file" "$status_file"; do + if [ -e "$file" ]; then + touch "$file" + chown $nagios_user:$nagios_cmdgrp "$file" + fi done + chmod 660 "$resource_file" + chown $nagios_user:$nagios_cmdgrp "$resource_file" +} + +function check_lock_file() { + PIDDIR=$(dirname $lock_file) + case "$PIDDIR" in + /var/run) + if [ x"$nagios_user" != x"root" ]; then + DATESTRING=`date +"%Y%m%d"` + mv -f "$NAGIOS_CFG" "$NAGIOS_CFG-$DATESTRING" + sed -e "s|^lock_file.*|pid_file=$NAGIOS_PIDFILE|g" "$NAGIOS_CFG-$DATESTRING" > "$NAGIOS_CFG" + /bin/logger -t rcnagios "Configured $lock_file in $NAGIOS_CFG moved to $NAGIOS_PIDFILE. Backup is $NAGIOS_CFG-$DATESTRING" + test -f "$lock_file" && rm -f "$lock_file" + install -d -m755 -o$nagios_user -g$nagios_cmdgrp $(dirname "$NAGIOS_PIDFILE") + else + test -d "$PIDDIR" || mkdir -p "$PIDDIR" + fi + ;; + *) + test -d $(dirname "$NAGIOS_PIDFILE") || install -d -m755 -o$nagios_user -g$nagios_cmdgrp $(dirname "$NAGIOS_PIDFILE") + esac } # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance -test -x $NAGIOS_BIN || { echo "$NAGIOS_BIN not installed"; +test -x "$NAGIOS_BIN" || { echo "$NAGIOS_BIN not installed or not executable."; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file -test -r $NAGIOS_CFG || { echo "$NAGIOS_CFG not existing"; +test -r "$NAGIOS_CFG" || { echo "$NAGIOS_CFG not existing or readable."; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Check for existence of sysconfig file and read it -test -r $NAGIOS_SYSCONFIG || { echo "$NAGIOS_SYSCONFIG not existing"; +test -r "$NAGIOS_SYSCONFIG" || { echo "$NAGIOS_SYSCONFIG not existing or readable."; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } -. $NAGIOS_SYSCONFIG +. "$NAGIOS_SYSCONFIG" # set values for sysconfig vars if [ -n "$NAGIOS_NICELEVEL" ]; then @@ -129,7 +151,7 @@ : ${status_file:=/var/log/nagios/status.dat} # files to remove : ${command_file:=/var/spool/nagios/nagios.cmd} -: ${lock_file:=/var/run/nagios.pid} +: ${lock_file:=/var/run/nagios/nagios.pid} : ${object_cache_file:=/var/lib/nagios/objects.cache} : ${temp_file:=/var/log/nagios/nagios.tmp} @@ -138,52 +160,52 @@ case "$1" in start) - echo -n "Starting nagios " + echo -n "Starting Nagios " config_check if [ $? -eq 0 ]; then # check if nagios is already running - NAGPID=$(pidof $NAGIOS_BIN) + NAGPID=$(pidof "$NAGIOS_BIN") if [ -n "$NAGPID" ]; then - echo "- Error: looks like nagios is still running with PID $NAGPID" - echo -n "- trying to kill previous nagios process" + echo "- Error: looks like Nagios is still running with PID $NAGPID" + echo -n "- trying to kill previous Nagios process" kill -9 $NAGPID sleep 2 fi check_files - startproc $NICELEVEL -p $lock_file $NAGIOS_BIN -d $NAGIOS_CFG + check_lock_file + startproc $NICELEVEL -p "$lock_file" "$NAGIOS_BIN" -d "$NAGIOS_CFG" else - echo "- Error in configuration files" - echo -n "- please read $NAGIOS_CFG_ERR_LOG" + echo "Error in configuration - please read $NAGIOS_CFG_ERR_LOG" rc_failed fi rc_status -v ;; stop) - echo -n "Shutting down nagios " + echo -n "Shutting down Nagios " # we have to wait for nagios to exit and remove its # own Lockfile, otherwise a following "start" could # happen, and then the exiting nagios will remove the # new Lockfile, allowing multiple nagios daemons # to (sooner or later) run - John Sellens - if checkproc $NAGIOS_BIN ; then - killproc -p $lock_file -TERM $NAGIOS_BIN + if checkproc "$NAGIOS_BIN" ; then + killproc -p "$lock_file" -TERM "$NAGIOS_BIN" sleep 1 - if [ -e $lock_file ]; then - echo "Warning - nagios did not exit in a timely manner. Waiting..." - while [ -e $lock_file ] && [ $NAGIOS_TIMEOUT -gt 0 ] ; do + if [ -e "$lock_file" ]; then + echo "Warning - Nagios did not exit in a timely manner. Waiting..." + while [ -e "$lock_file" ] && [ $NAGIOS_TIMEOUT -gt 0 ] ; do sleep 1 NAGIOS_TIMEOUT=$[$NAGIOS_TIMEOUT-1] echo -n '.' [ $NAGIOS_TIMEOUT -eq 41 ] && echo done fi - if checkproc $NAGIOS_BIN ; then - killproc -p $lock_file -SIGKILL $NAGIOS_BIN - echo -n "Warning: nagios killed" + if checkproc "$NAGIOS_BIN" ; then + killproc -p "$lock_file" -SIGKILL "$NAGIOS_BIN" + echo -n "Warning: Nagios killed" fi else - echo -n "nagios not running" + echo -n "Nagios not running" rc_failed 7 fi check_files @@ -192,15 +214,12 @@ ;; try-restart) ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi - # Remember status and be quiet rc_status ;; restart) @@ -209,11 +228,11 @@ rc_status ;; reload|force-reload) - echo -n "Reload service nagios " + echo -n "Reload service Nagios " config_check if [ $? -eq 0 ]; then echo -n "Passed configuration check - reloading..." - killproc -HUP -p $lock_file $NAGIOS_BIN + killproc -HUP -p "$lock_file" "$NAGIOS_BIN" else echo "- Error in configuration files" echo -n "- aborting reload - please read $NAGIOS_CFG_ERR_LOG" @@ -222,24 +241,27 @@ rc_status -v ;; status) - echo -n "Checking for nagios " - checkproc -p $lock_file $NAGIOS_BIN + echo -n "Checking for Nagios " + checkproc -p "$lock_file" "$NAGIOS_BIN" rc_status -v ;; check|check_verbose) - echo "Running configuration check..." + echo -n "Running configuration check... " config_check if [ $? -eq 0 ]; then echo -n "- Passed configuration check" - test -f $NAGIOS_CFG_ERR_LOG && rm $NAGIOS_CFG_ERR_LOG + test -f "$NAGIOS_CFG_ERR_LOG" && rm "$NAGIOS_CFG_ERR_LOG" rc_reset else echo "- Error in configuration files" - if [ $1 == "check_verbose" ]; then - cat $NAGIOS_CFG_ERR_LOG - else - echo -n "- please read $NAGIOS_CFG_ERR_LOG" - fi + case "$1" in + check_verbose) + cat "$NAGIOS_CFG_ERR_LOG" + ;; + *) + echo "Please read $NAGIOS_CFG_ERR_LOG" + ;; + esac rc_failed fi rc_status -v ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Fri May 7 15:52:12 CEST 2010. -------- --- kernel-source/kernel-debug.changes 2010-04-23 07:00:19.000000000 +0200 +++ kernel-source/kernel-debug.changes 2010-05-03 07:00:22.000000000 +0200 @@ -1,0 +2,108 @@ +Sun May 2 19:55:13 CEST 2010 - jeffm(a)suse.com + +- Update to 2.6.34-rc6. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Sun May 2 17:14:46 CEST 2010 - sjayaraman(a)suse.de + +- patches.fixes/cifs-fix-oops-due-to-null-nameidata: Allow null nd + (as nfs server uses) on create (bnc#593940). + +------------------------------------------------------------------- +Fri Apr 30 10:30:26 CEST 2010 - trenn(a)suse.de + +- patches.fixes/acpi_ensure_spec_correct_address_space_length.patch: + ACPI/x86/PCI: compute Address Space length rather than using + _LEN (bnc#598641). + +------------------------------------------------------------------- +Thu Apr 29 15:13:28 CEST 2010 - jbeulich(a)novell.com + +- Update -ec2 config files (X86_MSR=m again). + +------------------------------------------------------------------- +Thu Apr 29 15:09:43 CEST 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.34-rc5-git8 and c/s 1016. +- Update Xen config files. +- patches.xen/xen-kzalloc: use kzalloc() in favor of + kmalloc()+memset(). +- patches.xen/xen-fix_trace_power.patch: Rename to ... +- patches.xen/xen3-x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch: + ... this. + +------------------------------------------------------------------- +Thu Apr 29 13:11:21 CEST 2010 - knikanth(a)suse.de + +- patches.fixes/dm-release-map_lock-before-set_disk_ro: Refresh. + Fix patch to call dm_table_get directly instead of calling + dm_get_table unnecesarily. + +------------------------------------------------------------------- +Thu Apr 29 01:03:00 CEST 2010 - jeffm(a)suse.com + +- Update to 2.6.34-rc5-git8. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Wed Apr 28 14:10:41 CEST 2010 - trenn(a)suse.de + +- patches.xen/xen-fix_trace_power.patch: x86 cpufreq: Make + trace_power_frequency cpufreq driver independent (none). + +------------------------------------------------------------------- +Wed Apr 28 11:47:11 CEST 2010 - mmarek(a)suse.cz + +- Disable CONFIG_FIRMWARE_IN_KERNEL in all configs, we start udev + early enough in the initrd. + +------------------------------------------------------------------- +Wed Apr 28 10:39:04 CEST 2010 - trenn(a)suse.de + +- patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch: + acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification + (none). +- patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch: + x86 cpufreq: Make trace_power_frequency cpufreq driver + independent (none). + +------------------------------------------------------------------- +Wed Apr 28 10:34:23 CEST 2010 - trenn(a)suse.de + +- Update config files. + Unify X86_MSR and X86_CPUID configs: + - CONFIG_X86_CPUID=m + - CONFIG_X86_MSR=y + for all i386 and x86_64 flavors. + +------------------------------------------------------------------- +Mon Apr 26 15:45:19 CEST 2010 - jeffm(a)suse.com + +- Disabled CONFIG_TUNE_CELL on ppc64 (bnc#599045) + +------------------------------------------------------------------- +Mon Apr 26 03:08:10 CEST 2010 - jeffm(a)suse.com + +- Enabled CONFIG_FIREWIRE (bnc#586172) + - CONFIG_IEEE1394 is still enabled but deprecated. + +------------------------------------------------------------------- +Fri Apr 23 17:08:10 CEST 2010 - trenn(a)suse.de + +- patches.fixes/hp_wmi_add_media_key.patch: x86 platform drivers: + hp-wmi Add media key 0x20e8 (bnc#598059). + +------------------------------------------------------------------- +Fri Apr 23 16:54:33 CEST 2010 - trenn(a)suse.de + +- patches.fixes/hp-wmi_detect_keys.patch: x86 platform drivers: + hp-wmi Reorder event id processing (bnc#598059). +- patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch: x86 + platform drivers: hp-wmi Catch and log unkown event and key + codes correctly (bnc#598059). +- patches.fixes/hp_wmi_use_prefix_string.patch: x86 platform + drivers: hp-wmi Use consistent prefix string for messages + (bnc#598059). + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-net.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-vmi.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %endif kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -17,7 +17,7 @@ # norootforbuild -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %include %_sourcedir/kernel-spec-macros @@ -29,7 +29,7 @@ Group: Documentation/Man AutoReqProv: on Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %endif ++++++ kernel-net.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-net Summary: Minimal kernel with disk and net support Version: 2.6.34 -Release: 4 +Release: 5 %if %using_buildservice %else %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %endif kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.33 -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -24,7 +24,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:40.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:40.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc5 +%define patchversion 2.6.34-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.34 -Release: 6 +Release: 7 %if %using_buildservice %else %endif kernel-vanilla.spec: same change kernel-vmi.spec: same change kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ ++++ 2592 lines of diff (skipped) ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:44.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:44.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:44.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:44.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/e1000e-entropy-source.patch new/patches.drivers/e1000e-entropy-source.patch --- old/patches.drivers/e1000e-entropy-source.patch 2010-04-22 08:25:27.000000000 +0200 +++ new/patches.drivers/e1000e-entropy-source.patch 2010-05-02 19:55:56.000000000 +0200 @@ -20,7 +20,7 @@ --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -464,6 +464,7 @@ extern void e1000e_set_interrupt_capabil - extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter); + extern void e1000e_disable_aspm(struct pci_dev *pdev, u16 state); extern unsigned int copybreak; +extern int entropy; ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch new/patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch --- old/patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch 2010-05-02 17:14:51.000000000 +0200 @@ -0,0 +1,40 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification +Patch-Mainline: submitted - please revert after 2.6.35 +References: none + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: venki(a)google.com +CC: davej(a)redhat.com +CC: arjan(a)infradead.org +CC: davej(a)redhat.com +CC: linux-kernel(a)vger.kernel.org +--- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +index 4591680..c6de3a9 100644 +--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ++++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +@@ -391,7 +391,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, + + freqs.old = perf->states[perf->state].core_frequency * 1000; + freqs.new = data->freq_table[next_state].frequency; +- for_each_cpu(i, cmd.mask) { ++ for_each_cpu(i, policy->cpus) { + freqs.cpu = i; + cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); + } +@@ -407,7 +407,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, + } + } + +- for_each_cpu(i, cmd.mask) { ++ for_each_cpu(i, policy->cpus) { + freqs.cpu = i; + cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); + } +-- +1.6.3 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/block-blk_abort_request-lock-fix new/patches.fixes/block-blk_abort_request-lock-fix --- old/patches.fixes/block-blk_abort_request-lock-fix 2010-04-20 00:26:03.000000000 +0200 +++ new/patches.fixes/block-blk_abort_request-lock-fix 2010-05-02 17:14:51.000000000 +0200 @@ -9,36 +9,16 @@ Lack of this synchronization led to infinite loop on corrupt q->timeout_list. +Update: libata-eh chunk accepted for -rc6 as commit + fa41efdae7de61191a7bda3a00e88ef69afb5bb9 + Signed-off-by: Tejun Heo <teheo(a)suse.de> --- - drivers/ata/libata-eh.c | 4 ++++ + drivers/scsi/libsas/sas_ata.c | 4 ++++ drivers/scsi/libsas/sas_scsi_host.c | 4 ++++ - 3 files changed, 12 insertions(+) + 2 files changed, 8 insertions(+) -Index: linux-2.6.32-SLE11-SP1/drivers/ata/libata-eh.c -=================================================================== ---- linux-2.6.32-SLE11-SP1.orig/drivers/ata/libata-eh.c -+++ linux-2.6.32-SLE11-SP1/drivers/ata/libata-eh.c -@@ -870,6 +870,8 @@ static void ata_eh_set_pending(struct at - void ata_qc_schedule_eh(struct ata_queued_cmd *qc) - { - struct ata_port *ap = qc->ap; -+ struct request_queue *q = qc->scsicmd->device->request_queue; -+ unsigned long flags; - - WARN_ON(!ap->ops->error_handler); - -@@ -881,7 +883,9 @@ void ata_qc_schedule_eh(struct ata_queue - * Note that ATA_QCFLAG_FAILED is unconditionally set after - * this function completes. - */ -+ spin_lock_irqsave(q->queue_lock, flags); - blk_abort_request(qc->scsicmd->request); -+ spin_unlock_irqrestore(q->queue_lock, flags); - } - - /** Index: linux-2.6.32-SLE11-SP1/drivers/scsi/libsas/sas_ata.c =================================================================== --- linux-2.6.32-SLE11-SP1.orig/drivers/scsi/libsas/sas_ata.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/cifs-fix-oops-due-to-null-nameidata new/patches.fixes/cifs-fix-oops-due-to-null-nameidata --- old/patches.fixes/cifs-fix-oops-due-to-null-nameidata 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/cifs-fix-oops-due-to-null-nameidata 2010-05-02 17:14:51.000000000 +0200 @@ -0,0 +1,136 @@ +From: Steve French <sfrench(a)us.ibm.com> +Subject: [CIFS] Allow null nd (as nfs server uses) on create +References: bnc#593940 +Patch-mainline: queued (in cifs devel git) + +commit fa588e0c57048b3d4bfcd772d80dc0615f83fd35 in cifs-2.6.git + + While creating a file on a server which supports unix extensions + such as Samba, if a file is being created which does not supply + nameidata (i.e. nd is null), cifs client can oops when calling + cifs_posix_open. + +Signed-off-by: Shirish Pargaonkar <shirishp(a)us.ibm.com> +Signed-off-by: Steve French <sfrench(a)us.ibm.com> +Acked-by: Suresh Jayaraman <sjayaraman(a)suse.de> +--- + fs/cifs/cifsproto.h | 6 ++++-- + fs/cifs/dir.c | 20 ++++++++++++-------- + fs/cifs/file.c | 11 +++++++---- + 3 files changed, 23 insertions(+), 14 deletions(-) + +Index: linux-2.6.33-master/fs/cifs/cifsproto.h +=================================================================== +--- linux-2.6.33-master.orig/fs/cifs/cifsproto.h ++++ linux-2.6.33-master/fs/cifs/cifsproto.h +@@ -95,8 +95,10 @@ extern struct cifsFileInfo *cifs_new_fil + __u16 fileHandle, struct file *file, + struct vfsmount *mnt, unsigned int oflags); + extern int cifs_posix_open(char *full_path, struct inode **pinode, +- struct vfsmount *mnt, int mode, int oflags, +- __u32 *poplock, __u16 *pnetfid, int xid); ++ struct vfsmount *mnt, ++ struct super_block *sb, ++ int mode, int oflags, ++ __u32 *poplock, __u16 *pnetfid, int xid); + extern void cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, + FILE_UNIX_BASIC_INFO *info, + struct cifs_sb_info *cifs_sb); +Index: linux-2.6.33-master/fs/cifs/dir.c +=================================================================== +--- linux-2.6.33-master.orig/fs/cifs/dir.c ++++ linux-2.6.33-master/fs/cifs/dir.c +@@ -183,13 +183,14 @@ cifs_new_fileinfo(struct inode *newinode + } + + int cifs_posix_open(char *full_path, struct inode **pinode, +- struct vfsmount *mnt, int mode, int oflags, +- __u32 *poplock, __u16 *pnetfid, int xid) ++ struct vfsmount *mnt, struct super_block *sb, ++ int mode, int oflags, ++ __u32 *poplock, __u16 *pnetfid, int xid) + { + int rc; + FILE_UNIX_BASIC_INFO *presp_data; + __u32 posix_flags = 0; +- struct cifs_sb_info *cifs_sb = CIFS_SB(mnt->mnt_sb); ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); + struct cifs_fattr fattr; + + cFYI(1, ("posix open %s", full_path)); +@@ -242,7 +243,7 @@ int cifs_posix_open(char *full_path, str + + /* get new inode and set it up */ + if (*pinode == NULL) { +- *pinode = cifs_iget(mnt->mnt_sb, &fattr); ++ *pinode = cifs_iget(sb, &fattr); + if (!*pinode) { + rc = -ENOMEM; + goto posix_open_ret; +@@ -251,7 +252,8 @@ int cifs_posix_open(char *full_path, str + cifs_fattr_to_inode(*pinode, &fattr); + } + +- cifs_new_fileinfo(*pinode, *pnetfid, NULL, mnt, oflags); ++ if (mnt) ++ cifs_new_fileinfo(*pinode, *pnetfid, NULL, mnt, oflags); + + posix_open_ret: + kfree(presp_data); +@@ -315,13 +317,14 @@ cifs_create(struct inode *inode, struct + if (nd && (nd->flags & LOOKUP_OPEN)) + oflags = nd->intent.open.flags; + else +- oflags = FMODE_READ; ++ oflags = FMODE_READ | SMB_O_CREAT; + + if (tcon->unix_ext && (tcon->ses->capabilities & CAP_UNIX) && + (CIFS_UNIX_POSIX_PATH_OPS_CAP & + le64_to_cpu(tcon->fsUnixInfo.Capability))) { +- rc = cifs_posix_open(full_path, &newinode, nd->path.mnt, +- mode, oflags, &oplock, &fileHandle, xid); ++ rc = cifs_posix_open(full_path, &newinode, ++ nd ? nd->path.mnt : NULL, ++ inode->i_sb, mode, oflags, &oplock, &fileHandle, xid); + /* EIO could indicate that (posix open) operation is not + supported, despite what server claimed in capability + negotation. EREMOTE indicates DFS junction, which is not +@@ -678,6 +681,7 @@ cifs_lookup(struct inode *parent_dir_ino + (nd->flags & LOOKUP_OPEN) && !pTcon->broken_posix_open && + (nd->intent.open.flags & O_CREAT)) { + rc = cifs_posix_open(full_path, &newInode, nd->path.mnt, ++ parent_dir_inode->i_sb, + nd->intent.open.create_mode, + nd->intent.open.flags, &oplock, + &fileHandle, xid); +Index: linux-2.6.33-master/fs/cifs/file.c +=================================================================== +--- linux-2.6.33-master.orig/fs/cifs/file.c ++++ linux-2.6.33-master/fs/cifs/file.c +@@ -298,10 +298,12 @@ int cifs_open(struct inode *inode, struc + (CIFS_UNIX_POSIX_PATH_OPS_CAP & + le64_to_cpu(tcon->fsUnixInfo.Capability))) { + int oflags = (int) cifs_posix_convert_flags(file->f_flags); ++ oflags |= SMB_O_CREAT; + /* can not refresh inode info since size could be stale */ + rc = cifs_posix_open(full_path, &inode, file->f_path.mnt, +- cifs_sb->mnt_file_mode /* ignored */, +- oflags, &oplock, &netfid, xid); ++ inode->i_sb, ++ cifs_sb->mnt_file_mode /* ignored */, ++ oflags, &oplock, &netfid, xid); + if (rc == 0) { + cFYI(1, ("posix open succeeded")); + /* no need for special case handling of setting mode +@@ -513,8 +515,9 @@ reopen_error_exit: + int oflags = (int) cifs_posix_convert_flags(file->f_flags); + /* can not refresh inode info since size could be stale */ + rc = cifs_posix_open(full_path, NULL, file->f_path.mnt, +- cifs_sb->mnt_file_mode /* ignored */, +- oflags, &oplock, &netfid, xid); ++ inode->i_sb, ++ cifs_sb->mnt_file_mode /* ignored */, ++ oflags, &oplock, &netfid, xid); + if (rc == 0) { + cFYI(1, ("posix reopen succeeded")); + goto reopen_success; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dm-release-map_lock-before-set_disk_ro new/patches.fixes/dm-release-map_lock-before-set_disk_ro --- old/patches.fixes/dm-release-map_lock-before-set_disk_ro 2010-04-20 00:26:03.000000000 +0200 +++ new/patches.fixes/dm-release-map_lock-before-set_disk_ro 2010-05-02 17:14:51.000000000 +0200 @@ -16,15 +16,17 @@ drivers/md/dm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---- a/drivers/md/dm.c -+++ b/drivers/md/dm.c +Index: linux-2.6.33-master/drivers/md/dm.c +=================================================================== +--- linux-2.6.33-master.orig/drivers/md/dm.c ++++ linux-2.6.33-master/drivers/md/dm.c @@ -2102,12 +2102,15 @@ static struct dm_table *__bind(struct ma old_map = md->map; md->map = t; dm_table_set_restrictions(t, q, limits); + write_unlock_irqrestore(&md->map_lock, flags); + -+ dm_get_live_table(md); ++ dm_table_get(md->map); if (!(dm_table_get_mode(t) & FMODE_WRITE)) { set_disk_ro(md->disk, 1); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hp-wmi_detect_keys.patch new/patches.fixes/hp-wmi_detect_keys.patch --- old/patches.fixes/hp-wmi_detect_keys.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/hp-wmi_detect_keys.patch 2010-05-02 17:14:51.000000000 +0200 @@ -0,0 +1,110 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: x86 platform drivers: hp-wmi Reorder event id processing +References: bnc#598059 +Patch-Mainline: submitted + +Event id 0x4 defines the hotkey event. +No need (or even wrong) to query HPWMI_HOTKEY_QUERY if event id is != 0x4. + +Reorder the eventcode conditionals and use switch case instead of if/else. +Use an enum for the event ids cases. + + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: mjg(a)redhat.com +CC: linux-acpi(a)vger.kernel.org + +--- + drivers/platform/x86/hp-wmi.c | 51 ++++++++++++++++++++++++++---------------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +Index: linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +=================================================================== +--- linux-2.6.33-master.orig/drivers/platform/x86/hp-wmi.c ++++ linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +@@ -58,6 +58,12 @@ enum hp_wmi_radio { + HPWMI_WWAN = 2, + }; + ++enum hp_wmi_event_ids { ++ HPWMI_DOCK_EVENT = 1, ++ HPWMI_BEZEL_BUTTON = 4, ++ HPWMI_WIRELESS = 5, ++}; ++ + static int __devinit hp_wmi_bios_setup(struct platform_device *device); + static int __exit hp_wmi_bios_remove(struct platform_device *device); + static int hp_wmi_resume_handler(struct device *device); +@@ -338,7 +344,7 @@ static void hp_wmi_notify(u32 value, voi + struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; + static struct key_entry *key; + union acpi_object *obj; +- int eventcode; ++ int eventcode, key_code; + acpi_status status; + + status = wmi_get_event_data(value, &response); +@@ -357,28 +363,32 @@ static void hp_wmi_notify(u32 value, voi + + eventcode = *((u8 *) obj->buffer.pointer); + kfree(obj); +- if (eventcode == 0x4) +- eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0, +- 0); +- key = hp_wmi_get_entry_by_scancode(eventcode); +- if (key) { +- switch (key->type) { +- case KE_KEY: +- input_report_key(hp_wmi_input_dev, +- key->keycode, 1); +- input_sync(hp_wmi_input_dev); +- input_report_key(hp_wmi_input_dev, +- key->keycode, 0); +- input_sync(hp_wmi_input_dev); +- break; +- } +- } else if (eventcode == 0x1) { ++ switch (eventcode) { ++ case HPWMI_DOCK_EVENT: + input_report_switch(hp_wmi_input_dev, SW_DOCK, + hp_wmi_dock_state()); + input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE, + hp_wmi_tablet_state()); + input_sync(hp_wmi_input_dev); +- } else if (eventcode == 0x5) { ++ break; ++ case HPWMI_BEZEL_BUTTON: ++ key_code = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0, ++ 0); ++ key = hp_wmi_get_entry_by_scancode(key_code); ++ if (key) { ++ switch (key->type) { ++ case KE_KEY: ++ input_report_key(hp_wmi_input_dev, ++ key->keycode, 1); ++ input_sync(hp_wmi_input_dev); ++ input_report_key(hp_wmi_input_dev, ++ key->keycode, 0); ++ input_sync(hp_wmi_input_dev); ++ break; ++ } ++ } ++ break; ++ case HPWMI_WIRELESS: + if (wifi_rfkill) + rfkill_set_states(wifi_rfkill, + hp_wmi_get_sw_state(HPWMI_WIFI), +@@ -391,9 +401,12 @@ static void hp_wmi_notify(u32 value, voi + rfkill_set_states(wwan_rfkill, + hp_wmi_get_sw_state(HPWMI_WWAN), + hp_wmi_get_hw_state(HPWMI_WWAN)); +- } else ++ break; ++ default: + printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", + eventcode); ++ break; ++ } + } + + static int __init hp_wmi_input_setup(void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hp_wmi_add_media_key.patch new/patches.fixes/hp_wmi_add_media_key.patch --- old/patches.fixes/hp_wmi_add_media_key.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/hp_wmi_add_media_key.patch 2010-05-02 17:14:51.000000000 +0200 @@ -0,0 +1,25 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: x86 platform drivers: hp-wmi Add media key 0x20e8 +References: bnc#598059 +Patch-Mainline: submitted + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: mjg(a)redhat.com +CC: linux-acpi(a)vger.kernel.org + +--- + drivers/platform/x86/hp-wmi.c | 1 + + 1 file changed, 1 insertion(+) + +Index: linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +=================================================================== +--- linux-2.6.33-master.orig/drivers/platform/x86/hp-wmi.c ++++ linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +@@ -96,6 +96,7 @@ static struct key_entry hp_wmi_keymap[] + {KE_KEY, 0x02, KEY_BRIGHTNESSUP}, + {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, + {KE_KEY, 0x20e6, KEY_PROG1}, ++ {KE_KEY, 0x20e8, KEY_MEDIA}, + {KE_KEY, 0x2142, KEY_MEDIA}, + {KE_KEY, 0x213b, KEY_INFO}, + {KE_KEY, 0x2169, KEY_DIRECTION}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch new/patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch --- old/patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch 2010-05-02 17:14:51.000000000 +0200 @@ -0,0 +1,39 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: x86 platform drivers: hp-wmi Catch and log unkown event and key codes correctly +References: bnc#598059 +Patch-Mainline: submitted + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: mjg(a)redhat.com +CC: linux-acpi(a)vger.kernel.org + +--- + drivers/platform/x86/hp-wmi.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +Index: linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +=================================================================== +--- linux-2.6.33-master.orig/drivers/platform/x86/hp-wmi.c ++++ linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +@@ -386,7 +386,9 @@ static void hp_wmi_notify(u32 value, voi + input_sync(hp_wmi_input_dev); + break; + } +- } ++ } else ++ printk(KERN_INFO "HP WMI: Unknown key code - 0x%x\n", ++ key_code); + break; + case HPWMI_WIRELESS: + if (wifi_rfkill) +@@ -403,8 +405,8 @@ static void hp_wmi_notify(u32 value, voi + hp_wmi_get_hw_state(HPWMI_WWAN)); + break; + default: +- printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", +- eventcode); ++ printk(KERN_INFO "HP WMI: Unknown eventcode - %d\n", ++ eventcode); + break; + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hp_wmi_use_prefix_string.patch new/patches.fixes/hp_wmi_use_prefix_string.patch --- old/patches.fixes/hp_wmi_use_prefix_string.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/hp_wmi_use_prefix_string.patch 2010-05-02 17:14:51.000000000 +0200 @@ -0,0 +1,61 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: x86 platform drivers: hp-wmi Use consistent prefix string for messages. +References: bnc#598059 +Patch-Mainline: submitted + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: mjg(a)redhat.com +CC: linux-acpi(a)vger.kernel.org + +--- + drivers/platform/x86/hp-wmi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +Index: linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +=================================================================== +--- linux-2.6.33-master.orig/drivers/platform/x86/hp-wmi.c ++++ linux-2.6.33-master/drivers/platform/x86/hp-wmi.c +@@ -52,6 +52,8 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE9 + #define HPWMI_WIRELESS_QUERY 0x5 + #define HPWMI_HOTKEY_QUERY 0xc + ++#define PREFIX "HP WMI: " ++ + enum hp_wmi_radio { + HPWMI_WIFI = 0, + HPWMI_BLUETOOTH = 1, +@@ -349,14 +351,14 @@ static void hp_wmi_notify(u32 value, voi + + status = wmi_get_event_data(value, &response); + if (status != AE_OK) { +- printk(KERN_INFO "hp-wmi: bad event status 0x%x\n", status); ++ printk(KERN_INFO PREFIX "bad event status 0x%x\n", status); + return; + } + + obj = (union acpi_object *)response.pointer; + + if (!obj || obj->type != ACPI_TYPE_BUFFER || obj->buffer.length != 8) { +- printk(KERN_INFO "HP WMI: Unknown response received\n"); ++ printk(KERN_INFO PREFIX "Unknown response received\n"); + kfree(obj); + return; + } +@@ -387,7 +389,7 @@ static void hp_wmi_notify(u32 value, voi + break; + } + } else +- printk(KERN_INFO "HP WMI: Unknown key code - 0x%x\n", ++ printk(KERN_INFO PREFIX "Unknown key code - 0x%x\n", + key_code); + break; + case HPWMI_WIRELESS: +@@ -405,7 +407,7 @@ static void hp_wmi_notify(u32 value, voi + hp_wmi_get_hw_state(HPWMI_WWAN)); + break; + default: +- printk(KERN_INFO "HP WMI: Unknown eventcode - %d\n", ++ printk(KERN_INFO PREFIX "Unknown eventcode - %d\n", + eventcode); + break; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-fix-permissions-on-reiserfs_priv new/patches.fixes/reiserfs-fix-permissions-on-reiserfs_priv --- old/patches.fixes/reiserfs-fix-permissions-on-reiserfs_priv 2010-04-20 00:26:03.000000000 +0200 +++ new/patches.fixes/reiserfs-fix-permissions-on-reiserfs_priv 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] reiserfs: Fix permissions on .reiserfs_priv -References: bnc#593906 CVE-2010-1146 -Patch-mainline: Submitted 8 Apr 2010 - - Commit 677c9b2e393a0cd203bd54e9c18b012b2c73305a removed the magic - from the lookup code to hide the .reiserfs_priv directory since it - was getting loaded at mount-time instead. The intent was that the - entry would be hidden from the user via a poisoned d_compare, but - this was faulty. - - This introduced a security issue where unpriviledged users could - access and modify extended attributes or ACLs belonging to other - users, including root. - - This patch resolves the issue by properly hiding .reiserfs_priv. This - was the intent of the xattr poisoning code, but it appears to have - never worked as expected. This is fixed by using d_revalidate instead - of d_compare. - - This patch makes -oexpose_privroot a no-op. I'm fine leaving it this - way. The effort involved in working out the corner cases wrt permissions - and caching outweigh the benefit of the feature. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - - fs/reiserfs/dir.c | 2 -- - fs/reiserfs/xattr.c | 17 ++++------------- - 2 files changed, 4 insertions(+), 15 deletions(-) - ---- a/fs/reiserfs/dir.c -+++ b/fs/reiserfs/dir.c -@@ -45,8 +45,6 @@ static inline bool is_privroot_deh(struc - struct reiserfs_de_head *deh) - { - struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root; -- if (reiserfs_expose_privroot(dir->d_sb)) -- return 0; - return (dir == dir->d_parent && privroot->d_inode && - deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); - } ---- a/fs/reiserfs/xattr.c -+++ b/fs/reiserfs/xattr.c -@@ -972,21 +972,13 @@ int reiserfs_permission(struct inode *in - return generic_permission(inode, mask, NULL); - } - --/* This will catch lookups from the fs root to .reiserfs_priv */ --static int --xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name) -+static int xattr_hide_revalidate(struct dentry *dentry, struct nameidata *nd) - { -- struct dentry *priv_root = REISERFS_SB(dentry->d_sb)->priv_root; -- if (container_of(q1, struct dentry, d_name) == priv_root) -- return -ENOENT; -- if (q1->len == name->len && -- !memcmp(q1->name, name->name, name->len)) -- return 0; -- return 1; -+ return -EPERM; - } - - static const struct dentry_operations xattr_lookup_poison_ops = { -- .d_compare = xattr_lookup_poison, -+ .d_revalidate = xattr_hide_revalidate, - }; - - int reiserfs_lookup_privroot(struct super_block *s) -@@ -1000,8 +992,7 @@ int reiserfs_lookup_privroot(struct supe - strlen(PRIVROOT_NAME)); - if (!IS_ERR(dentry)) { - REISERFS_SB(s)->priv_root = dentry; -- if (!reiserfs_expose_privroot(s)) -- s->s_root->d_op = &xattr_lookup_poison_ops; -+ dentry->d_op = &xattr_lookup_poison_ops; - if (dentry->d_inode) - dentry->d_inode->i_flags |= S_PRIVATE; - } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt new/patches.fixes/x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt --- old/patches.fixes/x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt 2010-04-20 00:26:03.000000000 +0200 +++ new/patches.fixes/x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -From: Jacob Pan <jacob.jun.pan(a)linux.intel.com> -Subject: [PATCH] x86/apbt: conditionally register cpu hp notifier for apbt -Patch-mainline: Hopefully 2.6.34 -References: bko#15786 - -APB timer is used on Moorestown platforms but not on a standard PC. -If APB timer code is compiled in but not initialized at run-time due -to lack of FW reported SFI table, kernel would panic when the non-boot -CPUs are offlined and notifier is called. - -https://bugzilla.kernel.org/show_bug.cgi?id=15786 - -This patch ensures CPU hotplug notifier for APB timer is only registered -when the APBT timer block is initialized. - -Signed-off-by: Jacob Pan <jacob.jun.pan(a)linux.intel.com> -Acked-by: Jeff Mahoney <jeffm(a)suse.com> ---- - arch/x86/kernel/apb_timer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c -index ff469e4..a353475 100644 ---- a/arch/x86/kernel/apb_timer.c -+++ b/arch/x86/kernel/apb_timer.c -@@ -429,7 +429,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n, - - static __init int apbt_late_init(void) - { -- if (disable_apbt_percpu) -+ if (disable_apbt_percpu || !apb_timer_block_enabled) - return 0; - /* This notifier should be called after workqueue is ready */ - hotcpu_notifier(apbt_cpuhp_notify, -20); --- -1.5.6.5 - ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1 ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/xfs-dmapi-xfs-enable new/patches.suse/xfs-dmapi-xfs-enable --- old/patches.suse/xfs-dmapi-xfs-enable 2010-04-22 21:18:20.000000000 +0200 +++ new/patches.suse/xfs-dmapi-xfs-enable 2010-05-02 19:55:56.000000000 +0200 @@ -3768,9 +3768,9 @@ --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -259,6 +259,7 @@ typedef struct xfs_mount { - wait_queue_head_t m_wait_single_sync_task; __int64_t m_update_flags; /* sb flags we need to update on the next remount,rw */ + struct list_head m_mplist; /* inode shrinker mount list */ + struct vfsmount *m_vfsmount; } xfs_mount_t; ++++++ patches.trace.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch new/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch --- old/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch 2010-04-28 10:39:34.000000000 +0200 @@ -0,0 +1,247 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: x86 cpufreq: Make trace_power_frequency cpufreq driver independent +Patch-Mainline: submitted - please revert after 2.6.35 (whether it's in or not) +References: none + +and fix the broken case if a core's frequency depends on others. + +trace_power_frequency was only implemented in a rather ungeneric way +in acpi-cpufreq driver's target() function only. +-> Move the call to trace_power_frequency to + cpufreq.c:cpufreq_notify_transition() where CPUFREQ_POSTCHANGE + notifier is triggered. + This will support power frequency tracing by all cpufreq drivers + +trace_power_frequency did not trace frequency changes correctly when +the userspace governor was used or when CPU cores' frequency depend +on each other. +-> Moving this into the CPUFREQ_POSTCHANGE notifier and pass the cpu + which gets switched automatically fixes this. + +Robert Schoene provided some important fixes on top of my initial +quick shot version which are integrated in this patch: +- Forgot some changes in power_end trace (TP_printk/variable names) +- Variable dummy in power_end must now be cpu_id +- Use static 64 bit variable instead of unsigned int for cpu_id + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: davej(a)redhat.com +CC: arjan(a)infradead.org +CC: davej(a)redhat.com +CC: linux-kernel(a)vger.kernel.org +CC: robert.schoene(a)tu-dresden.de +Tested-by: robert.schoene(a)tu-dresden.de +--- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 --- + arch/x86/kernel/process.c | 8 ++++---- + drivers/cpufreq/cpufreq.c | 5 +++++ + drivers/cpuidle/cpuidle.c | 2 +- + include/trace/events/power.h | 27 +++++++++++++++------------ + tools/perf/builtin-timechart.c | 11 ++++++----- + 6 files changed, 31 insertions(+), 25 deletions(-) + +diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +index c6de3a9..9241402 100644 +--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ++++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +@@ -34,7 +34,6 @@ + #include <linux/compiler.h> + #include <linux/dmi.h> + #include <linux/slab.h> +-#include <trace/events/power.h> + + #include <linux/acpi.h> + #include <linux/io.h> +@@ -364,8 +363,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, + } + } + +- trace_power_frequency(POWER_PSTATE, data->freq_table[next_state].frequency); +- + switch (data->cpu_feature) { + case SYSTEM_INTEL_MSR_CAPABLE: + cmd.type = SYSTEM_INTEL_MSR_CAPABLE; +diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c +index 28ad9f4..bc3bbf6 100644 +--- a/arch/x86/kernel/process.c ++++ b/arch/x86/kernel/process.c +@@ -371,7 +371,7 @@ static inline int hlt_use_halt(void) + void default_idle(void) + { + if (hlt_use_halt()) { +- trace_power_start(POWER_CSTATE, 1); ++ trace_power_start(POWER_CSTATE, 1, smp_processor_id()); + current_thread_info()->status &= ~TS_POLLING; + /* + * TS_POLLING-cleared state must be visible before we +@@ -441,7 +441,7 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait); + */ + void mwait_idle_with_hints(unsigned long ax, unsigned long cx) + { +- trace_power_start(POWER_CSTATE, (ax>>4)+1); ++ trace_power_start(POWER_CSTATE, (ax>>4)+1, smp_processor_id()); + if (!need_resched()) { + if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR)) + clflush((void *)&current_thread_info()->flags); +@@ -457,7 +457,7 @@ void mwait_idle_with_hints(unsigned long ax, unsigned long cx) + static void mwait_idle(void) + { + if (!need_resched()) { +- trace_power_start(POWER_CSTATE, 1); ++ trace_power_start(POWER_CSTATE, 1, smp_processor_id()); + if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR)) + clflush((void *)&current_thread_info()->flags); + +@@ -478,7 +478,7 @@ static void mwait_idle(void) + */ + static void poll_idle(void) + { +- trace_power_start(POWER_CSTATE, 0); ++ trace_power_start(POWER_CSTATE, 0, smp_processor_id()); + local_irq_enable(); + while (!need_resched()) + cpu_relax(); +diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c +index 2d5d575..8ec1539 100644 +--- a/drivers/cpufreq/cpufreq.c ++++ b/drivers/cpufreq/cpufreq.c +@@ -29,6 +29,8 @@ + #include <linux/completion.h> + #include <linux/mutex.h> + ++#include <trace/events/power.h> ++ + #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, \ + "cpufreq-core", msg) + +@@ -354,6 +356,9 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state) + + case CPUFREQ_POSTCHANGE: + adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); ++ dprintk("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new, ++ (unsigned long)freqs->cpu); ++ trace_power_frequency(POWER_PSTATE, freqs->new, freqs->cpu); + srcu_notifier_call_chain(&cpufreq_transition_notifier_list, + CPUFREQ_POSTCHANGE, freqs); + if (likely(policy) && likely(policy->cpu == freqs->cpu)) +diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c +index 12fdd39..c672f4a 100644 +--- a/drivers/cpuidle/cpuidle.c ++++ b/drivers/cpuidle/cpuidle.c +@@ -95,7 +95,7 @@ static void cpuidle_idle_call(void) + /* give the governor an opportunity to reflect on the outcome */ + if (cpuidle_curr_governor->reflect) + cpuidle_curr_governor->reflect(dev); +- trace_power_end(0); ++ trace_power_end(smp_processor_id()); + } + + /** +diff --git a/include/trace/events/power.h b/include/trace/events/power.h +index c4efe9b..35a2a6e 100644 +--- a/include/trace/events/power.h ++++ b/include/trace/events/power.h +@@ -18,52 +18,55 @@ enum { + + DECLARE_EVENT_CLASS(power, + +- TP_PROTO(unsigned int type, unsigned int state), ++ TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), + +- TP_ARGS(type, state), ++ TP_ARGS(type, state, cpu_id), + + TP_STRUCT__entry( + __field( u64, type ) + __field( u64, state ) ++ __field( u64, cpu_id ) + ), + + TP_fast_assign( + __entry->type = type; + __entry->state = state; ++ __entry->cpu_id = cpu_id; + ), + +- TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state) ++ TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type, ++ (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) + ); + + DEFINE_EVENT(power, power_start, + +- TP_PROTO(unsigned int type, unsigned int state), ++ TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), + +- TP_ARGS(type, state) ++ TP_ARGS(type, state, cpu_id) + ); + + DEFINE_EVENT(power, power_frequency, + +- TP_PROTO(unsigned int type, unsigned int state), ++ TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), + +- TP_ARGS(type, state) ++ TP_ARGS(type, state, cpu_id) + ); + + TRACE_EVENT(power_end, + +- TP_PROTO(int dummy), ++ TP_PROTO(unsigned int cpu_id), + +- TP_ARGS(dummy), ++ TP_ARGS(cpu_id), + + TP_STRUCT__entry( +- __field( u64, dummy ) ++ __field( u64, cpu_id ) + ), + + TP_fast_assign( +- __entry->dummy = 0xffff; ++ __entry->cpu_id = cpu_id; + ), + +- TP_printk("dummy=%lu", (unsigned long)__entry->dummy) ++ TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id) + + ); + +diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c +index 0d4d8ff..7809bef 100644 +--- a/tools/perf/builtin-timechart.c ++++ b/tools/perf/builtin-timechart.c +@@ -306,8 +306,9 @@ struct trace_entry { + + struct power_entry { + struct trace_entry te; +- s64 type; +- s64 value; ++ u64 type; ++ u64 value; ++ u64 cpu_id; + }; + + #define TASK_COMM_LEN 16 +@@ -504,13 +505,13 @@ static int process_sample_event(event_t *event, struct perf_session *session) + return 0; + + if (strcmp(event_str, "power:power_start") == 0) +- c_state_start(data.cpu, data.time, pe->value); ++ c_state_start(pe->cpu_id, data.time, pe->value); + + if (strcmp(event_str, "power:power_end") == 0) +- c_state_end(data.cpu, data.time); ++ c_state_end(pe->cpu_id, data.time); + + if (strcmp(event_str, "power:power_frequency") == 0) +- p_state_change(data.cpu, data.time, pe->value); ++ p_state_change(pe->cpu_id, data.time, pe->value); + + if (strcmp(event_str, "sched:sched_wakeup") == 0) + sched_wakeup(data.cpu, data.time, data.pid, te); +-- +1.6.3 + ++++++ patches.xen.tar.bz2 ++++++ ++++ 23736 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:48.000000000 +0200 @@ -32,6 +32,7 @@ patches.kernel.org/patch-2.6.34-rc2-rc3 patches.kernel.org/patch-2.6.34-rc3-rc4 patches.kernel.org/patch-2.6.34-rc4-rc5 + patches.kernel.org/patch-2.6.34-rc5-rc6 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -152,7 +153,6 @@ patches.suse/x86-mark_rodata_rw.patch patches.fixes/dmar-fix-oops-with-no-dmar-table - patches.fixes/x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt ######################################################## # x86 MCE/MCA (Machine Check Error/Architecture) extensions @@ -280,6 +280,12 @@ patches.arch/acpi_srat-pxm-rev-ia64.patch patches.arch/acpi_srat-pxm-rev-x86-64.patch + # HP WMI patches + patches.fixes/hp-wmi_detect_keys.patch + patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch + patches.fixes/hp_wmi_use_prefix_string.patch + patches.fixes/hp_wmi_add_media_key.patch + ######################################################## # CPUFREQ ######################################################## @@ -296,6 +302,8 @@ # patches.suse/cpuidle-documentation patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch + patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch + ######################################################## # AGP, graphics related stuff ######################################################## @@ -331,6 +339,7 @@ ######################################################## # cifs patches ######################################################## + patches.fixes/cifs-fix-oops-due-to-null-nameidata ######################################################## # ext2/ext3 @@ -348,7 +357,6 @@ ######################################################## patches.suse/reiserfs-barrier-default patches.fixes/reiserfs-remove-2-tb-file-size-limit - patches.fixes/reiserfs-fix-permissions-on-reiserfs_priv ######################################################## # dlm @@ -714,6 +722,8 @@ patches.trace/utrace-core + patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch + +needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch @@ -824,12 +834,14 @@ patches.xen/xen3-patch-2.6.34-rc2 patches.xen/xen3-patch-2.6.34-rc2-rc3 patches.xen/xen3-patch-2.6.34-rc3-rc4 + patches.xen/xen3-patch-2.6.34-rc5-git8 patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-x86-mcp51-no-dac patches.xen/xen3-x86-mark_rodata_rw.patch patches.xen/xen3-kdb-x86 patches.xen/xen3-stack-unwind patches.xen/xen3-x86_64-unwind-annotations + patches.xen/xen3-x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch # bugfixes and enhancements patches.xen/xen-balloon-max-target @@ -858,9 +870,10 @@ patches.xen/xen-netback-multiple-tasklets patches.xen/xen-netback-kernel-threads patches.xen/xen-netfront-ethtool - patches.xen/xen-unpriv-build - patches.xen/xen-floppy patches.xen/xen-dcdbas + patches.xen/xen-floppy + patches.xen/xen-kzalloc + patches.xen/xen-unpriv-build patches.xen/xen-x86-panic-no-reboot patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-consistent-nmi @@ -874,4 +887,3 @@ patches.xen/xen-x86_64-pgd-alloc-order patches.xen/xen-x86_64-dump-user-pgt patches.xen/xen-x86_64-note-init-p2m - patches.xen/xen-x86_64-kern_addr_valid ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.N7nRNV/_old 2010-05-07 15:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.N7nRNV/_new 2010-05-07 15:42:48.000000000 +0200 @@ -1,3 +1,3 @@ -2010-04-22 21:18:20 +0200 -GIT Revision: 72f7d49ac45380c1b71bd38e86c3bbf74577b9f6 +2010-05-04 23:21:35 +0200 +GIT Revision: d88bb9f71e52b96b64962ad9581f008ae569dae6 GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xkeyboard-config for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at Fri May 7 15:51:42 CEST 2010. -------- --- xkeyboard-config/xkeyboard-config.changes 2009-12-04 21:15:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/xkeyboard-config/xkeyboard-config.changes 2010-05-06 07:06:34.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 6 06:58:38 CEST 2010 - sndirsch(a)suse.de + +- xkeyboard-config-commit-81d9313.diff + * Added several chars to hu layout (bnc #599318, bfo #27825) +- xkeyboard-config.inet.microsoftpro.patch + * fixed inet:media_common mapping (bnc #602129) + * changed inet:microsoftpro mapping to inet(microsoftprousb), + since inet(microsoftpro) no longer exists (bnc #602129) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xkeyboard-config-commit-81d9313.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.yzTGfD/_old 2010-05-07 15:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.yzTGfD/_new 2010-05-07 15:51:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xkeyboard-config (Version 1.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ PreReq: /bin/ln /bin/rm AutoReqProv: on Version: 1.7 -Release: 2 +Release: 3 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch4: xkeyboard-config.mainline-cvs.mac-es.patch @@ -42,6 +42,7 @@ Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff Patch115: xkeyboard-config.inet.microsoftpro.patch +Patch116: xkeyboard-config-commit-81d9313.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -73,6 +74,7 @@ %patch109 -p1 %patch110 %patch115 -p0 +%patch116 -p1 %build %configure --with-xkb-rules-symlink=xfree86,xorg \ ++++++ xkeyboard-config-commit-81d9313.diff ++++++ commit 81d931301ecdeadf2120e5f18b3df20824db6c9c Author: Sergey V. Udaltsov <svu(a)gnome.org> Date: Thu May 6 01:26:04 2010 +0100 Added several chars to hu layout https://bugs.freedesktop.org/show_bug.cgi?id=27825 diff --git a/symbols/hu b/symbols/hu index 4280098..e5abdf2 100644 --- a/symbols/hu +++ b/symbols/hu @@ -329,7 +329,7 @@ xkb_symbols "def_101" { // The standard Hungaryan qwertz layout hidden partial alphanumeric_keys xkb_symbols "def_qwertz" { - key <AD06> { [ z, Z ] }; + key <AD06> { [ z, Z, endash ] }; key <AB01> { [ y, Y, greater ] }; }; @@ -338,7 +338,7 @@ xkb_symbols "def_qwertz" { // The qwerty layout for people who familiar with the standard US layout hidden partial alphanumeric_keys xkb_symbols "def_qwerty" { - key <AD06> { [ y, Y ] }; + key <AD06> { [ y, Y, endash ] }; key <AB01> { [ z, Z, greater ] }; }; @@ -396,6 +396,8 @@ xkb_symbols "def_common" { key <AD02> { [ w, W, bar ] }; key <AD07> { [ u, U, EuroSign ] }; key <AD08> { [ i, I, Iacute, iacute ] }; + key <AD09> { [ o, O, doublelowquotemark ] }; + key <AD10> { [ p, P, rightdoublequotemark ] }; key <AD11> { [ odoubleacute, Odoubleacute, division ] }; key <AD12> { [ uacute, Uacute, multiply ] }; ++++++ xkeyboard-config.inet.microsoftpro.patch ++++++ --- /var/tmp/diff_new_pack.yzTGfD/_old 2010-05-07 15:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.yzTGfD/_new 2010-05-07 15:51:12.000000000 +0200 @@ -4,8 +4,8 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) -+ inet:microsoftpro = +inet(microsoftpro) -+ inet:media_common = +inet(nav_common) ++ inet:microsoftpro = +inet(microsoftprousb) ++ inet:media_common = +inet(media_common) + inet:nav_common = +inet(nav_common) + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pm-utils for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Fri May 7 15:50:59 CEST 2010. -------- --- pm-utils/pm-utils.changes 2010-04-30 11:18:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2010-05-06 09:36:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 6 07:35:56 UTC 2010 - mvyskocil(a)suse.cz + +- refresh patches to fix a build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.TNRX7e/_old 2010-05-07 15:49:57.000000000 +0200 +++ /var/tmp/diff_new_pack.TNRX7e/_new 2010-05-07 15:49:57.000000000 +0200 @@ -23,7 +23,7 @@ Name: pm-utils Version: 1.3.0 -Release: 3 +Release: 4 Summary: Tools to suspend and hibernate computers License: GPLv2+ Group: System/Base ++++++ pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch ++++++ --- /var/tmp/diff_new_pack.TNRX7e/_old 2010-05-07 15:49:57.000000000 +0200 +++ /var/tmp/diff_new_pack.TNRX7e/_new 2010-05-07 15:49:57.000000000 +0200 @@ -1,7 +1,7 @@ Index: pm-utils-1.3.0/pm/module.d/uswsusp =================================================================== ---- pm-utils-1.3.0.orig/pm/module.d/uswsusp 2010-04-30 11:09:07.000000000 +0200 -+++ pm-utils-1.3.0/pm/module.d/uswsusp 2010-04-30 11:11:14.817673683 +0200 +--- pm-utils-1.3.0.orig/pm/module.d/uswsusp 2010-05-06 09:27:37.000000000 +0200 ++++ pm-utils-1.3.0/pm/module.d/uswsusp 2010-05-06 09:29:29.887671637 +0200 @@ -132,6 +132,8 @@ HIBERNATE_MODULE="uswsusp" do_hibernate() ++++++ pm-utils-1.3.0-suse-smart-uswsusp.patch ++++++ --- /var/tmp/diff_new_pack.TNRX7e/_old 2010-05-07 15:49:57.000000000 +0200 +++ /var/tmp/diff_new_pack.TNRX7e/_new 2010-05-07 15:49:57.000000000 +0200 @@ -1,12 +1,12 @@ --- pm/defaults | 20 +++++++++++++++- - pm/module.d/uswsusp | 63 +++++++++++++++++++++++++++++++++++++++++++++++----- - 2 files changed, 77 insertions(+), 6 deletions(-) + pm/module.d/uswsusp | 64 +++++++++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 78 insertions(+), 6 deletions(-) Index: pm-utils-1.3.0/pm/defaults =================================================================== ---- pm-utils-1.3.0.orig/pm/defaults 2010-04-01 12:07:40.378407398 +0200 -+++ pm-utils-1.3.0/pm/defaults 2010-04-01 12:12:38.903407733 +0200 +--- pm-utils-1.3.0.orig/pm/defaults 2009-06-14 03:56:08.000000000 +0200 ++++ pm-utils-1.3.0/pm/defaults 2010-05-06 09:27:09.228673127 +0200 @@ -27,8 +27,26 @@ # tuxonice If your system has support for tuxonice, use this. # @@ -37,8 +37,8 @@ # Multiple declarations of these environment variables will result in Index: pm-utils-1.3.0/pm/module.d/uswsusp =================================================================== ---- pm-utils-1.3.0.orig/pm/module.d/uswsusp 2010-04-01 12:07:40.378407398 +0200 -+++ pm-utils-1.3.0/pm/module.d/uswsusp 2010-04-01 12:31:10.235228812 +0200 +--- pm-utils-1.3.0.orig/pm/module.d/uswsusp 2009-12-11 05:36:38.000000000 +0100 ++++ pm-utils-1.3.0/pm/module.d/uswsusp 2010-05-06 09:27:37.540671614 +0200 @@ -5,6 +5,7 @@ uswsusp_hooks() { @@ -111,11 +111,12 @@ } if [ "$METHOD" = "suspend" ]; then add_before_hooks uswsusp_hooks -@@ -87,7 +132,11 @@ +@@ -87,7 +132,12 @@ HIBERNATE_MODULE="uswsusp" do_hibernate() { - s2disk ++ get_s2ram_opts + if [ -z "${S2DISK_CONF}" ]; then + s2disk + else @@ -124,7 +125,7 @@ } fi -@@ -98,8 +147,12 @@ +@@ -98,8 +148,12 @@ SUSPEND_HYBRID_MODULE="uswsusp" do_suspend_hybrid() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Fri May 7 15:49:45 CEST 2010. -------- --- yast2-bootloader/yast2-bootloader.changes 2010-04-13 17:05:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-05-06 13:19:13.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 6 13:15:18 CEST 2010 - juhliarik(a)suse.cz + +- added patch for (bug#448883) +- 2.19.13 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.19.12.tar.bz2 New: ---- yast2-bootloader-2.19.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.isqrM3/_old 2010-05-07 15:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.isqrM3/_new 2010-05-07 15:48:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.19.12) +# spec file for package yast2-bootloader (Version 2.19.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-bootloader -Version: 2.19.12 +Version: 2.19.13 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.19.12.tar.bz2 +Source0: yast2-bootloader-2.19.13.tar.bz2 Prefix: /usr @@ -67,7 +67,7 @@ This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.19.12 +%setup -n yast2-bootloader-2.19.13 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-bootloader-2.19.12.tar.bz2 -> yast2-bootloader-2.19.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.12/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.19.13/src/clients/bootloader_proposal.ycp --- old/yast2-bootloader-2.19.12/src/clients/bootloader_proposal.ycp 2009-07-22 13:39:48.000000000 +0200 +++ new/yast2-bootloader-2.19.13/src/clients/bootloader_proposal.ycp 2010-05-06 13:16:36.000000000 +0200 @@ -1,7 +1,7 @@ /** * Module: bootloader_proposal.ycp * - * $Id: bootloader_proposal.ycp 58126 2009-07-22 11:39:44Z juhliarik $ + * $Id: bootloader_proposal.ycp 61958 2010-05-06 11:15:42Z juhliarik $ * * Author: Klaus Kaempf <kkaempf(a)suse.de> * @@ -112,6 +112,19 @@ if (Bootloader::getLoaderType () == "grub") { + integer max_end = 128; + + if (BootSupportCheck::EndOfBootOrRootPartition() > max_end * 1073741824) + { + ret = add (ret, "warning_level", `warning); + // warning text in the summary richtext + ret = add (ret, "warning", + sformat(_("The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot."), max_end)); + } + } + + if (Bootloader::getLoaderType () == "grub") + { import "BootGRUB"; if (BootGRUB::CheckDeviceMap()) { @@ -147,7 +160,7 @@ { y2error ("No bootloader selected"); ret = add (ret, "warning_level", `error); - // warning text in the summary rixhtext + // warning text in the summary richtext ret = add (ret, "warning", _("No boot loader is selected for installation. Your system might not be bootable.")); } @@ -156,7 +169,7 @@ { y2error ("LILO bootloader selected"); ret = add (ret, "warning_level", `error); - // warning text in the summary rixhtext + // warning text in the summary richtext ret = add (ret, "warning", _("The LILO is not supported now.")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.12/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.19.13/src/modules/BootSupportCheck.ycp --- old/yast2-bootloader-2.19.12/src/modules/BootSupportCheck.ycp 2010-02-19 14:40:32.000000000 +0100 +++ new/yast2-bootloader-2.19.13/src/modules/BootSupportCheck.ycp 2010-05-06 13:13:43.000000000 +0200 @@ -23,6 +23,7 @@ import "Bootloader"; import "Arch"; import "Storage"; +import "Region"; import "BootCommon"; import "BootStorage"; import "FileUtils"; @@ -352,4 +353,30 @@ return supported; } + +global integer EndOfBootOrRootPartition() +{ + map part = Storage::GetEntryForMountpoint("/boot"); + if (isempty(part)) + part = Storage::GetEntryForMountpoint("/"); + + string device = part["device"]:""; + y2milestone("device:%1", device); + + integer end_cyl = Region::End(part["region"]:[]); + + integer cyl_size = 82252800; + map<string, map> target_map = Storage::GetTargetMap(); + foreach (string dev, map disk, target_map, { + if (find (map p, disk["partitions"]:[], { return p["device"]:"" == device; }) != nil) + cyl_size = disk["cyl_size"]:82252800; + }); + + integer ret = end_cyl * cyl_size; + + y2milestone("end_cyl:%1 cyl_size:%2 end:%3", end_cyl, cyl_size, ret); + return ret; +} + + } // EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.12/VERSION new/yast2-bootloader-2.19.13/VERSION --- old/yast2-bootloader-2.19.12/VERSION 2010-04-13 14:16:27.000000000 +0200 +++ new/yast2-bootloader-2.19.13/VERSION 2010-05-06 13:16:15.000000000 +0200 @@ -1 +1 @@ -2.19.12 +2.19.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sane-backends for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at Fri May 7 15:47:31 CEST 2010. -------- --- sane-backends/sane-backends.changes 2010-04-28 14:30:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/sane-backends/sane-backends.changes 2010-05-07 13:31:53.000000000 +0200 @@ -1,0 +2,37 @@ +Fri May 7 11:43:41 CEST 2010 - jsmeix(a)suse.de + +- Upgraded to sane-backends version 1.0.21: + New backends: + kodak (Kodak i18xx), kvs1025 (Panasonic KV-S10xx), + p5 (Primax PagePartner) + Many backends updated. + 224 more scanner models supported. + More consistent option naming. + Scanimage no longer writes image to tty. + Modern translation infrastructure. + Improved saned network daemon. + Internal SCSI, USB, threading, TCP & UDP code updates. + Updated HAL and udev support. + New sanei_magic image processing library. + Documentation updates. + Bugfixes. + Note: + This is one more release of the SANE 1.0 series, compare + the below entry dated "Thu Feb 28 13:56:15 CET 2008". +- fix-hp3900_config.c.patch, sane-desc_closedir.patch, + fix-lexmark_low-memory-leak.patch, and + fix-hp3900_sane-string-option-sizes.diff are obsolete since + sane-backends-1.0.21 because it is fixed in the source. +- sane-backends-1.0.20-xerox_mfp.diff backported post 1.0.20 + xerox_mfp changes and is therefore removed since + sane-backends-1.0.21 which contains those changes, compare + the below entry dated "Thu Oct 8 09:35:17 UTC 2009". +- Slightly adapted disable-resmgr-support.patch and + no-descriptions-external-hpoj.patch to apply to the + sane-backends-1.0.21 sources. +- fix-genesys-create_range-type.patch lets in genesys.c + the create_range function be of type 'SANE_Range *' + to fix 'assignment makes pointer from integer' bugs + wherever the create_range function is called. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-hp3900_config.c.patch fix-hp3900_sane-string-option-sizes.diff fix-lexmark_low-memory-leak.patch sane-backends-1.0.20.tar.bz2 sane-backends-1.0.20-xerox_mfp.diff sane-desc_closedir.patch New: ---- fix-genesys-create_range-type.patch sane-backends-1.0.21-i18n.patch sane-backends-1.0.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.2sZ2I7/_old 2010-05-07 15:43:17.000000000 +0200 +++ /var/tmp/diff_new_pack.2sZ2I7/_new 2010-05-07 15:43:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sane-backends (Version 1.0.20) +# spec file for package sane-backends (Version 1.0.21) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,12 +24,12 @@ Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers -Version: 1.0.20 -Release: 11 +Version: 1.0.21 +Release: 1 Url: http://www.sane-project.org/ -# URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz +# URL for Source0: https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz +# MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): be586a23633949cf2ecf0c9c6d769130 Source0: sane-backends-%{version}.tar.bz2 -Source1: baselibs.conf # Source100... is SUSE specific stuff: # Source100 is the evil-hack init-script "sane-dev" to grant scanner access permissions. # Source100 is no longer provided because sane-backends-1.0.19 has udev and HAL support. @@ -53,6 +53,9 @@ # We create our hpaio.desc file directly from the models.dat file of HPLIP: Source109: create_hpaio.desc_from_models.dat Source110: models.dat +# Was initially just dumped in as Source1 to "package baselibs.conf" +# (see the matching explanatory entry in the RPM changelog): +Source190: baselibs.conf # Source200... is scanner autoconfiguration stuff: # Source200 and Source201 generate the 56-sane-backends-autoconfig.rules file # for automated scanner driver activation via udev ("scanner autoconfiguration"). @@ -82,24 +85,41 @@ # Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously # removed in sane-backends-1.0.20 so that sane-frontends and xsane can no longer build, # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675 +# SANE_CAP_ALWAYS_SETTABLE is still missing in sane-backends-1.0.21 Patch8: re-add-SANE_CAP_ALWAYS_SETTABLE.patch -# Patch9 fixes a possible for loop overflow in hp3900_config.c +# Patch9 fix-hp3900_config.c.patch fixes a possible for loop overflow in hp3900_config.c # see https://bugzilla.novell.com/show_bug.cgi?id=517281 -Patch9: fix-hp3900_config.c.patch +# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311856&group_id… +# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c # see https://bugzilla.novell.com/show_bug.cgi?id=498435 +# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311857&group_id… +# where the upstream maintainer did not understand what is wrong and closed it as "Wont Fix" +# so that we have to keep this patch: Patch10: fix-mustek_pp_ccd300.c.patch -# Patch11 adds missing call to closedir to sane-desc.c +# Patch11 sane-desc_closedir.patch adds missing call to closedir to sane-desc.c # see https://bugzilla.novell.com/show_bug.cgi?id=530313 -Patch11: sane-desc_closedir.patch -# Patch12 adds a missing call to free in backend/lexmark_low.c +# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311880&group_id… +# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. +# Patch12 fix-lexmark_low-memory-leak.patch adds a missing call to free in backend/lexmark_low.c # in the sanei_lexmark_low_find_start_line function # see https://bugzilla.novell.com/show_bug.cgi?id=542341 -Patch12: fix-lexmark_low-memory-leak.patch -# Patch13 fixes option sizes in backend/hp3900_sane.c +# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311990&group_id… +# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. +# Patch13 fix-hp3900_sane-string-option-sizes.diff fixes option sizes in backend/hp3900_sane.c # because otherwise the frontend (e.g. xsane) may crash # see https://bugzilla.novell.com/show_bug.cgi?id=535752 -Patch13: fix-hp3900_sane-string-option-sizes.diff +# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311991&group_id… +# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. +# Patch14 is an upstream patch which adds two files required to build translations +# which are missing in the upstream sane-backends-1.0.21 source tar ball. +# URL for Patch14: https://alioth.debian.org/frs/download.php/3261/sane-backends-1.0.21-i18n.p… +Patch14: sane-backends-1.0.21-i18n.patch +# Patch15 fix-genesys-create_range-type.patch lets in genesys.c the create_range function +# be of type 'SANE_Range *' to fix 'assignment makes pointer from integer' bugs +# wherever the create_range function is called +# see https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id… +Patch15: fix-genesys-create_range-type.patch # Patch100... is SUSE specific stuff: # Patch100 lets the "canon" backend do scanner auto-recognition: Patch100: canon-backend-autoprobing.patch @@ -123,8 +143,8 @@ # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: Patch104: no-descriptions-external-hpoj.patch -# backport post 1.0.20 xerox_mfp changes. remove with next sane version -Patch105: sane-backends-1.0.20-xerox_mfp.diff +# Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp changes +# and is therefore removed since sane-backends-1.0.21 which contains those changes. # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build # The postinstall script requires this: @@ -303,20 +323,19 @@ %prep %setup -q +# Apply upstream patches first of all: +# Patch14 is an upstream patch for sane-backends-1.0.21 +# which adds two files required to build translations: +%patch14 -p1 +# Then apply non-upstream patches: # Patch2 fixes too small arrays in backend/niash.c: %patch2 # Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: %patch8 -# Patch9 fixes a possible for loop overflow in hp3900_config.c: -%patch9 # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: %patch10 -# Patch11 adds missing call to closedir to sane-desc.c: -%patch11 -# Patch12 adds a missing call to free in backend/lexmark_low.c: -%patch12 -# Patch13 fixes option sizes in backend/hp3900_sane.c -%patch13 -p1 +# Patch15 lets in genesys.c the create_range function be of type 'SANE_Range *': +%patch15 # Patch100... is SUSE specific stuff: # Patch100 lets the "canon" backend do scanner auto-recognition: %patch100 @@ -327,7 +346,6 @@ # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: %patch104 -%patch105 -p1 # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. ++++++ disable-resmgr-support.patch ++++++ --- /var/tmp/diff_new_pack.2sZ2I7/_old 2010-05-07 15:43:17.000000000 +0200 +++ /var/tmp/diff_new_pack.2sZ2I7/_new 2010-05-07 15:43:17.000000000 +0200 @@ -1,8 +1,6 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -155,15 +155,21 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include +--- configure.in.orig 2010-04-26 02:55:27.000000000 +0200 ++++ configure.in 2010-05-07 12:14:59.000000000 +0200 +@@ -155,16 +155,22 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include SANE_CHECK_MISSING_HEADERS @@ -11,25 +9,27 @@ - resmgr, - rsm_open_device,[ - AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library]) -- LIBS="$LIBS -lresmgr" +- RESMGR_LIBS="-lresmgr" - ] - ) -]) +-AC_SUBST(RESMGR_LIBS) +# Since Suse Linux 10.0 resmgr installs ACLs on device nodes. +# Therefore there is no need to patch applications with special resmgr +# support anymore. +# As the "rsm_open_device" calls in sanei_scsi.c and sanei_usb.c +# are optionally via "ifdef HAVE_RESMGR" with fallback "open" calls, +# the special resmgr support is not removed but only disabled here: -+#AC_CHECK_HEADER(resmgr.h,[ -+# AC_CHECK_LIB( -+# resmgr, -+# rsm_open_device,[ -+# AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library]) -+# LIBS="$LIBS -lresmgr" -+# ] -+# ) -+#]) - ++# AC_CHECK_HEADER(resmgr.h,[ ++# AC_CHECK_LIB( ++# resmgr, ++# rsm_open_device,[ ++# AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library]) ++# RESMGR_LIBS="-lresmgr" ++# ] ++# ) ++# ]) ++# AC_SUBST(RESMGR_LIBS) dnl *********************************************************************** + dnl Checks for types and structures ++++++ fix-genesys-create_range-type.patch ++++++ --- backend/genesys.c.orig 2010-04-05 15:18:04.000000000 +0200 +++ backend/genesys.c 2010-05-07 13:06:07.000000000 +0200 @@ -5436,7 +5436,7 @@ init_gamma_vector_option (Genesys_Scanne * @param size maximum size of the range * @return a poiter to a valid range or NULL */ -static create_range(SANE_Fixed size) +static SANE_Range *create_range(SANE_Fixed size) { SANE_Range *range=NULL; ++++++ no-descriptions-external-hpoj.patch ++++++ --- /var/tmp/diff_new_pack.2sZ2I7/_old 2010-05-07 15:43:17.000000000 +0200 +++ /var/tmp/diff_new_pack.2sZ2I7/_new 2010-05-07 15:43:17.000000000 +0200 @@ -1,10 +1,10 @@ ---- doc/Makefile.am.orig 2009-03-24 14:36:37.000000000 +0100 -+++ doc/Makefile.am 2009-06-10 14:47:53.000000000 +0200 -@@ -201,7 +201,6 @@ DESC_EXT_FILES = descriptions-external/b +--- doc/Makefile.am.orig 2010-04-05 15:18:05.000000000 +0200 ++++ doc/Makefile.am 2010-05-07 12:38:51.000000000 +0200 +@@ -202,7 +202,6 @@ DESC_EXT_FILES = descriptions-external/b descriptions-external/hp3770.desc \ descriptions-external/hp8200.desc \ descriptions-external/hpaio.desc \ - descriptions-external/hpoj.desc \ + descriptions-external/kodak-twain.desc \ descriptions-external/lhii.desc \ descriptions-external/mustek_a3p1.desc \ - descriptions-external/primascan.desc \ ++++++ sane-backends-1.0.21-i18n.patch ++++++ diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS --- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500 +++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400 @@ -0,0 +1,21 @@ +# List of languages +# try to keep this list ordered +bg +cs +da +de +en_GB +eo +es +fi +fr +gl +it +ja +nb +nl +pl +pt +ru +sv +uk diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES --- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500 +++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400 @@ -0,0 +1,100 @@ +# List of source files containing translatable strings +# paths relative to po +../include/sane/saneopts.h +../backend/sane_strstatus.c + +../backend/artec_eplus48u.c + +../backend/avision.h + +../backend/canon630u.c +../backend/canon.c +../backend/canon-sane.c + +../backend/canon_dr.c +../backend/canon_dr.h + +../backend/cardscan.c +../backend/cardscan.h + +../backend/epjitsu.c +../backend/epjitsu.h + +../backend/epson.c +../backend/epson.h +../backend/epson2.c +../backend/epson2.h + +../backend/fujitsu.c +../backend/fujitsu.h + +../backend/genesys.c + +../backend/kodak.c +../backend/kodak.h + +../backend/gt68xx.c +../backend/gt68xx_low.h + +../backend/hp3500.c +../backend/hp3900_sane.c +../backend/hp5400_sane.c +../backend/hp5590.c +../backend/hp-option.c +../backend/hp-option.h + +../backend/leo.c +../backend/leo.h + +../backend/lexmark.c + +../backend/ma1509.c + +../backend/matsushita.c +../backend/matsushita.h + +../backend/microtek2.c +../backend/microtek2.h + +../backend/mustek.c +../backend/mustek_usb.c +../backend/mustek_usb2.c + +../backend/niash.c + +../backend/pixma.c +../backend/pixma_sane_options.c + +../backend/plustek.c +../backend/plustek_pp.c + +../backend/pnm.c + +../backend/rts8891.c + +../backend/sceptre.c +../backend/sceptre.h + +../backend/sm3840.c + +../backend/snapscan.c +../backend/snapscan-options.c + +../backend/stv680.c +../backend/stv680.h + +../backend/teco1.c +../backend/teco1.h +../backend/teco2.c +../backend/teco2.h +../backend/teco3.c +../backend/teco3.h + +../backend/test.c + +../backend/u12.c + +../backend/umax1220u.c +../backend/umax.c +../backend/umax_pp.c + ++++++ sane-backends-1.0.20.tar.bz2 -> sane-backends-1.0.21.tar.bz2 ++++++ ++++ 256870 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 fuse for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package fuse for openSUSE:Factory checked in at Fri May 7 15:43:01 CEST 2010. -------- --- fuse/fuse.changes 2010-04-26 15:41:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2010-05-07 11:59:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 28 09:26:51 CEST 2010 - mszeredi(a)suse.cz + +- keep examples and internal docs in devel package (from jnweiger) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.ZRc2JG/_old 2010-05-07 15:42:07.000000000 +0200 +++ /var/tmp/diff_new_pack.ZRc2JG/_new 2010-05-07 15:42:07.000000000 +0200 @@ -21,7 +21,7 @@ Name: fuse Summary: User space File System Version: 2.8.4 -Release: 1 +Release: 2 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems # http://prdownloads.sourceforge.net/fuse/fuse-2.X/%{version}/fuse-%{version}… @@ -258,6 +258,9 @@ %{__rm} -f %{buildroot}/%{_lib}/libulockmgr.so.* %{__rm} -f %{buildroot}/%{_includedir}/ulockmgr.h +(cd example && %{__make} clean) +%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in + %post %{insserv_force_if_yast boot.fuse} %run_permissions @@ -297,6 +300,7 @@ %files devel %defattr(-,root,root) +%doc example doc %{_libdir}/libfuse.so %{_includedir}/fuse.h %{_includedir}/fuse ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dmraid for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package dmraid for openSUSE:Factory checked in at Fri May 7 15:41:52 CEST 2010. -------- --- dmraid/dmraid.changes 2010-02-02 04:52:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/dmraid/dmraid.changes 2010-04-20 01:14:38.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 19 23:11:39 UTC 2010 - nfbrown(a)novell.com + +- handle_space: cope with arrays with spaces in the name stored + in the metadata (bnc#470696) +- remove_trylock: pthreads_mutex_trylock is still very new in + glibc so safest not to use it yet (bnc#594388) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- handle_spaces remove_trylock ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.GHxetk/_old 2010-05-07 15:40:03.000000000 +0200 +++ /var/tmp/diff_new_pack.GHxetk/_new 2010-05-07 15:40:03.000000000 +0200 @@ -28,7 +28,7 @@ AutoReqProv: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc16 -Release: 1 +Release: 2 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid @@ -38,6 +38,8 @@ Patch1: dmraid-1.0.0.rc16-cvs-2010-02-02.patch Patch2: dmraid-1.0.0.rc13-geometry.patch Patch3: lib-install.patch +Patch4: handle_spaces +Patch5: remove_trylock BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -72,6 +74,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p2 cp %{SOURCE3} . %build ++++++ handle_spaces ++++++ --- include/dmraid/misc.h | 1 + lib/format/ataraid/isw.c | 7 ++++++- lib/format/ddf/ddf1.c | 1 + lib/misc/misc.c | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) --- 1.0.0.rc16.orig/include/dmraid/misc.h +++ 1.0.0.rc16/include/dmraid/misc.h @@ -18,6 +18,7 @@ extern void libdmraid_exit(struct lib_co extern void sysfs_workaround(struct lib_context *lc); extern void mk_alpha(struct lib_context *lc, char *str, size_t len); +extern void mk_alphanum(struct lib_context *lc, char *str, size_t len); extern char *get_basename(struct lib_context *lc, char *str); extern char *get_dirname(struct lib_context *lc, char *str); extern char *remove_white_space(struct lib_context *lc, char *str, size_t len); --- 1.0.0.rc16.orig/lib/format/ataraid/isw.c +++ 1.0.0.rc16/lib/format/ataraid/isw.c @@ -169,6 +169,7 @@ static size_t _name(struct lib_context *lc, struct isw *isw, char *str, size_t len, enum name_type nt, int num, struct isw_dev *dev, struct raid_dev *rd) { + int n; struct { const char *fmt, *what; } formats[] = { @@ -189,7 +190,11 @@ _name(struct lib_context *lc, struct isw f += (is_raid10(dev) ? 1 : 0); } - return snprintf(str, len, f->fmt, isw->family_num, f->what, num); + n = snprintf(str, len, f->fmt, isw->family_num, f->what, num); + /* As '->volume' could contain anything, we need to sanitise the name */ + if (str) + mk_alphanum(lc, str, n); + return n; } static char * --- 1.0.0.rc16.orig/lib/format/ddf/ddf1.c +++ 1.0.0.rc16/lib/format/ddf/ddf1.c @@ -689,6 +689,7 @@ name(struct lib_context *lc, struct ddf1 i = prefix + 16; while (!isgraph(buf[--i])); buf[i + 1] = 0; + mk_alphanum(lc, buf, i); } else { char *b; --- 1.0.0.rc16.orig/lib/misc/misc.c +++ 1.0.0.rc16/lib/misc/misc.c @@ -66,6 +66,20 @@ mk_alpha(struct lib_context *lc, char *s } } +/* Convert a string to only have alphanum or '-' or '_'. + * All others become '_' + */ +void +mk_alphanum(struct lib_context *lc, char *str, size_t len) +{ + for (; len && *str; len--, str++) { + if (!isalnum(*str) && + *str != '-' && + *str != '_') + *str = '_'; + } +} + /* Remove any whitespace from a string. */ char * remove_white_space(struct lib_context *lc, char *str, size_t size) ++++++ remove_trylock ++++++ Remove call to pthreads_mutex_trylock Reference bnc 594388 This appears only to be in very recent releases of glibc. Its presence causes /sbin/dmraid -ay -p The dynamic shared library "libdmraid-events-isw.so" could not be loaded: /lib/libdmraid-events-isw.so: undefined symbol: pthread_mutex_trylock on openSUSE 11.3, it is is not used for anything except a simple logging message. Signed-off-by: NeilBrown <neilb(a)suse.de> --- 1.0.0.rc16/lib/events/libdmraid-events-isw.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- dmraid.orig/1.0.0.rc16/lib/events/libdmraid-events-isw.c +++ dmraid/1.0.0.rc16/lib/events/libdmraid-events-isw.c @@ -1433,11 +1433,7 @@ void process_event(struct dm_task *dmt, /* * Make sure, events are processed sequentially per RAID set. */ - if (pthread_mutex_trylock(&rs->event_mutex)) { - syslog(LOG_NOTICE, - " Another thread is handling an event. Waiting..."); - pthread_mutex_lock(&rs->event_mutex); - } + pthread_mutex_lock(&rs->event_mutex); do { next = dm_get_next_target(dmt, next, &start, &length, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 firebird for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package firebird for openSUSE:Factory checked in at Fri May 7 15:40:52 CEST 2010. -------- --- firebird/firebird.changes 2009-08-19 19:46:52.000000000 +0200 +++ firebird/firebird.changes 2010-05-06 08:24:44.000000000 +0200 @@ -1,0 +2,11 @@ +Thu May 6 06:22:39 UTC 2010 - makowski.opensuse(a)gmail.com + +- add dir /etc/tmpdirs.d to the package + +------------------------------------------------------------------- +Wed May 5 13:56:31 UTC 2010 - makowski.opensuse(a)gmail.com + +- stable upstream +- make changes need for mounting /var/run as tmpfs + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Firebird-2.1.3.18185-0.RC2.tar.bz2 New: ---- 01_firebird Firebird-2.1.3.18185-0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firebird.spec ++++++ --- /var/tmp/diff_new_pack.7iAt6m/_old 2010-05-07 15:39:20.000000000 +0200 +++ /var/tmp/diff_new_pack.7iAt6m/_new 2010-05-07 15:39:20.000000000 +0200 @@ -25,15 +25,15 @@ Name: firebird Version: 2.1.3.18185.0 -Release: 2 -Group: Applications/Databases +Release: 3 +Group: Productivity/Databases/Servers License: Interbase Url: http://www.firebirdsql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -#Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 -Source0: http://firebirdsql.org/downloads/prerelease/source/%{pkgname}.RC2.tar.bz2 +Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2 Source3: firebird-logrotate Source4: README.OpenSuse +Source5: 01_firebird Patch0: firebird-mcpu-to-mtune.patch Patch1: Firebird-edit_fix.diff Patch2: firebird-gcc-warnings-fixes.patch @@ -199,6 +199,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +mkdir -p %{buildroot}%{_sysconfdir}/tmpdirs.d +cp %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpdirs.d/01_firebird mkdir -p %{buildroot}%{_var}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data @@ -414,8 +416,10 @@ %{_bindir}/gfix %{_bindir}/nbackup %{_bindir}/gstat-fb -%dir %attr(0775,%{name},%{name}) %{_var}/run/%{name} +%ghost %dir %attr(0775,%{name},%{name}) %{_var}/run/%{name} %defattr(0755,root,root,0755) +%dir %{_sysconfdir}/tmpdirs.d +%{_sysconfdir}/tmpdirs.d/01_firebird %{fbroot}/run %files filesystem ++++++ 01_firebird ++++++ test -d /var/run || mkdir -m 755 /var/run test -d /var/run/firebird || mkdir -m 1777 /var/run/firebird ++++++ Firebird-2.1.3.18185-0.RC2.tar.bz2 -> Firebird-2.1.3.18185-0.tar.bz2 ++++++ firebird/Firebird-2.1.3.18185-0.RC2.tar.bz2 firebird/Firebird-2.1.3.18185-0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sensors for openSUSE:Factory
by root＠hilbert.suse.de 07 May '10

07 May '10

Hello community, here is the log from the commit of package sensors for openSUSE:Factory checked in at Fri May 7 15:39:48 CEST 2010. -------- --- sensors/sensors.changes 2010-04-13 13:20:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2010-05-07 11:49:50.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 7 11:48:40 CEST 2010 - jdelvare(a)suse.de + +- lm_sensors-r5835-fix-sensord-regression.patch: Fix regression + in sensord (support for multiple chips was broken by release + 3.1.2). Fixes upstream ticket #2377. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lm_sensors-r5835-fix-sensord-regression.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.5MI2TJ/_old 2010-05-07 15:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.5MI2TJ/_new 2010-05-07 15:39:08.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ Version: 3.1.2 -Release: 3 +Release: 4 Summary: Hardware health monitoring for Linux License: GPLv2+ Group: System/Monitoring @@ -37,6 +37,7 @@ Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch Patch5: lm_sensors-3.1.1-no-ipmisensors-driver.patch Patch6: lm_sensors-r5832-adt7468-driver.patch +Patch7: lm_sensors-r5835-fix-sensord-regression.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -140,6 +141,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ lm_sensors-r5835-fix-sensord-regression.patch ++++++ Fix support of multiple chips. Index: lm-sensors/prog/sensord/rrd.c =================================================================== --- lm-sensors/prog/sensord/rrd.c (revision 5793) +++ lm-sensors/prog/sensord/rrd.c (revision 5835) @@ -138,7 +138,9 @@ } +/* Returns the number of features processed, or -1 on error */ static int _applyToFeatures(FeatureFN fn, void *data, const sensors_chip_name *chip, - const ChipDescriptor *desc) + const ChipDescriptor *desc, + int labelOffset) { int i; @@ -148,5 +150,5 @@ char *label; - for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) { + for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) { feature = features + i; rawLabel = feature->feature->name; @@ -159,9 +161,9 @@ } - rrdCheckLabel(rawLabel, i); - fn(data, rrdLabels[i], label, feature); + rrdCheckLabel(rawLabel, labelOffset + i); + fn(data, rrdLabels[labelOffset + i], label, feature); free(label); } - return 0; + return i; } @@ -185,5 +187,5 @@ static int applyToFeatures(FeatureFN fn, void *data) { - int i, i_detected, ret; + int i, i_detected, ret, labelOffset = 0; const sensors_chip_name *chip, *chip_arg; ChipDescriptor *desc; @@ -198,7 +200,8 @@ continue; - ret = _applyToFeatures(fn, data, chip, desc); - if (ret) + ret = _applyToFeatures(fn, data, chip, desc, labelOffset); + if (ret < 0) return ret; + labelOffset += ret; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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