April 2010 - openSUSE Commits - openSUSE Mailing Lists

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

25 Apr '10

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at Sun Apr 25 18:46:56 CEST 2010. -------- --- kernel-firmware/kernel-firmware.changes 2010-03-04 15:28:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-firmware/kernel-firmware.changes 2010-04-23 16:11:34.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 23 16:10:30 CEST 2010 - mmarek(a)suse.cz + +- Update firmware-supplements.txt using module aliases from + kernel-desktop-2.6.34-5.2.i586 (bnc#598624). + +------------------------------------------------------------------- +Fri Apr 23 16:09:12 CEST 2010 - mmarek(a)suse.cz + +- Silence the firmware-supplements.sh script. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.taE4MY/_old 2010-04-25 18:46:40.000000000 +0200 +++ /var/tmp/diff_new_pack.taE4MY/_new 2010-04-25 18:46:40.000000000 +0200 @@ -20,7 +20,7 @@ Name: kernel-firmware BuildRequires: fdupes Version: 20100227 -Release: 1 +Release: 2 Summary: Linux kernel firmware files License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar) Group: System/Kernel ++++++ firmware-supplements.sh ++++++ --- /var/tmp/diff_new_pack.taE4MY/_old 2010-04-25 18:46:40.000000000 +0200 +++ /var/tmp/diff_new_pack.taE4MY/_new 2010-04-25 18:46:40.000000000 +0200 @@ -54,7 +54,7 @@ case "$kernel" in *.rpm) mkdir "$tmp/kernel" - rpm2cpio "$kernel" | (cd "$tmp/kernel"; cpio -id) + rpm2cpio "$kernel" | (cd "$tmp/kernel"; cpio -id --quiet) kernel="$tmp/kernel" return esac @@ -71,5 +71,5 @@ break fi done -done | sort | /usr/lib/rpm/find-supplements.ksyms | \ -sed 's/^modalias(kernel-[^:]*:/modalias(/' # strip the kernel-$flavor: prefix +done | sort | RPMBUILD_SPECFILE=/dev/null /usr/lib/rpm/find-supplements.ksyms \ +| sed 's/^modalias(kernel-[^:]*:/modalias(/' # strip the kernel-$flavor: prefix ++++++ firmware-supplements.txt ++++++ ++++ 664 lines (skipped) ++++ between kernel-firmware/firmware-supplements.txt ++++ and /mounts/work_src_done/STABLE/kernel-firmware/firmware-supplements.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-dhcp-server for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at Sun Apr 25 18:45:32 CEST 2010. -------- --- yast2-dhcp-server/yast2-dhcp-server.changes 2010-02-12 11:08:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-dhcp-server/yast2-dhcp-server.changes 2010-04-23 20:11:55.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 23 18:11:37 UTC 2010 - coolo(a)novell.com + +- reupdate the tar ball to fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.WMq4Dg/_old 2010-04-25 18:45:24.000000000 +0200 +++ /var/tmp/diff_new_pack.WMq4Dg/_new 2010-04-25 18:45:24.000000000 +0200 @@ -20,20 +20,26 @@ Name: yast2-dhcp-server Version: 2.19.0 -Release: 1 +Release: 2 + BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-dhcp-server-2.19.0.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite + Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent # Address::CheckMAC && Address::ValidMAC (2.13.73) # Punycode Requires: yast2 >= 2.16.23 # DnsServerAPI::IsServiceConfigurableExternally Requires: yast2-dns-server >= 2.13.16 + BuildArch: noarch + Summary: YaST2 - DHCP Server Configuration %description @@ -47,8 +53,10 @@ %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-dhcp-server-2.19.0.tar.bz2 ++++++ ++++ 3421 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/Makefile.am new/yast2-dhcp-server-2.19.0/Makefile.am --- old/yast2-dhcp-server-2.19.0/Makefile.am 2009-03-11 13:15:33.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/Makefile.am 2010-04-23 20:07:30.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/autodocs-ycp.ami new/yast2-dhcp-server-2.19.0/autodocs-ycp.ami --- old/yast2-dhcp-server-2.19.0/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/autodocs-ycp.ami 2010-04-23 20:07:30.000000000 +0200 @@ -0,0 +1,32 @@ +# -*- makefile -*- Automake include file +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ + +# Builds source documentation for YCP sources +# Uses ycpdoc +# PARAMETERS: +# AUTODOCS_YCP: Files that the ycp autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src + +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs + +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) +CLEANFILES = $(html_DATA) pod2htm*.tmp + +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + for i in $(AUTODOCS_PM); do \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ + done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/configure.in new/yast2-dhcp-server-2.19.0/configure.in --- old/yast2-dhcp-server-2.19.0/configure.in 2009-03-11 13:15:33.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/configure.in 2010-04-23 20:07:30.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-dhcp-server dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dhcp-server, 2.17.2, http://bugs.opensuse.org/, yast2-dhcp-server) +AC_INIT(yast2-dhcp-server, 2.19.0, http://bugs.opensuse.org/, yast2-dhcp-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.2" +VERSION="2.19.0" RPMNAME="yast2-dhcp-server" MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/missing new/yast2-dhcp-server-2.19.0/missing --- old/yast2-dhcp-server-2.19.0/missing 2009-03-11 13:15:39.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/missing 2010-04-23 20:07:35.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/src/widgets.ycp new/yast2-dhcp-server-2.19.0/src/widgets.ycp --- old/yast2-dhcp-server-2.19.0/src/widgets.ycp 2010-02-12 11:00:01.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/src/widgets.ycp 2010-02-12 11:08:08.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Widgets * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: widgets.ycp 40814 2007-09-07 17:51:39Z kmachalkova $ + * $Id: widgets.ycp 60806 2010-02-12 10:08:08Z juhliarik $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/Read.err new/yast2-dhcp-server-2.19.0/testsuite/tests/Read.err --- old/yast2-dhcp-server-2.19.0/testsuite/tests/Read.err 2009-11-27 13:47:44.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/testsuite/tests/Read.err 2003-08-26 14:57:19.000000000 +0200 @@ -1,25 +0,0 @@ -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Loading module 'URLRecode' failed -2009-11-27 13:47:44 <3> kokso(32066) [libycp] Import.cc(import):97 No matching component found -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Import 'URLRecode' failed... -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Could not create its namespace -2009-11-27 13:47:44 <3> kokso(32066) [libycp] Bytecode.cc(readFile):1161 Caught invalid bytecode in '/usr/share/YaST2/modules/URL.ybc' -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Loading module 'URL' failed -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Import 'URL' failed... -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Could not create its namespace -2009-11-27 13:47:44 <3> kokso(32066) [libycp] Bytecode.cc(readFile):1161 Caught invalid bytecode in '/usr/share/YaST2/modules/TypeRepository.ybc' -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Loading module 'TypeRepository' failed -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Import 'TypeRepository' failed... -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Could not create its namespace -2009-11-27 13:47:44 <3> kokso(32066) [libycp] Bytecode.cc(readFile):1161 Caught invalid bytecode in '/usr/share/YaST2/modules/CommandLine.ybc' -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Loading module 'CommandLine' failed -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Import 'CommandLine' failed... -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Could not create its namespace -2009-11-27 13:47:44 <3> kokso(32066) [libycp] Bytecode.cc(readFile):1161 Caught invalid bytecode in '/usr/share/YaST2/modules/Progress.ybc' -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:24 Loading module 'Progress' failed -2009-11-27 13:47:44 <3> kokso(32066) [Parser] tests/Read.ycp:24 Can't load module 'Progress'. -2009-11-27 13:47:44 <3> kokso(32066) [Interpreter] tests/Read.ycp:25 Loading module 'DhcpServer' failed -2009-11-27 13:47:44 <3> kokso(32066) [libycp] Import.cc(import):97 No matching component found -2009-11-27 13:47:44 <3> kokso(32066) [Parser] tests/Read.ycp:25 Can't load module 'DhcpServer'. -2009-11-27 13:47:44 <3> kokso(32066) [Parser] tests/Read.ycp:30 Unknown namespace 'Progress'. Missing 'import'? -2009-11-27 13:47:44 <3> kokso(32066) [Parser] tests/Read.ycp:30 syntax error, unexpected SCANNER_ERROR -2009-11-27 13:47:44 <3> kokso(32066) [liby2] genericfrontend.cc(print_error):920 Error while creating client module ../tests/Read.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/Read.out new/yast2-dhcp-server-2.19.0/testsuite/tests/Read.out --- old/yast2-dhcp-server-2.19.0/testsuite/tests/Read.out 2009-11-27 13:47:43.000000000 +0100 +++ new/yast2-dhcp-server-2.19.0/testsuite/tests/Read.out 2006-11-13 14:40:30.000000000 +0100 @@ -0,0 +1,11 @@ +Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" +Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" +Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" +Read .etc.dhcpd_conf [$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"]] +Read .target.size "/etc/dhcpd.conf" 5 +Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1 +Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[] +Return true +Return $["allowed_interfaces":["eth0", "eth2"], "chroot":"0", "other_options":"-p 111", "settings":[$["children":[], "comment_after":nil, "comment_before":nil, "directives":[], "id":"", "options":[$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"]], "parent_id":"", "parent_type":"", "type":""]], "start_service":"0", "use_ldap":"0"] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ftp-server for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at Sun Apr 25 18:45:28 CEST 2010. -------- --- yast2-ftp-server/yast2-ftp-server.changes 2009-11-30 09:48:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ftp-server/yast2-ftp-server.changes 2010-04-23 16:35:27.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Apr 23 16:30:14 CEST 2010 - juhliarik(a)suse.cz + +- added fix for parsing options from xinetd (bnc#597842) +- 2.19.0 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ftp-server-2.18.1.tar.bz2 New: ---- yast2-ftp-server-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.Nwx1Hl/_old 2010-04-25 18:44:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Nwx1Hl/_new 2010-04-25 18:44:35.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-ftp-server (Version 2.18.1) +# spec file for package yast2-ftp-server (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,21 @@ Name: yast2-ftp-server -Version: 2.18.1 +Version: 2.19.0 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ftp-server-2.18.1.tar.bz2 +Source0: yast2-ftp-server-2.19.0.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ Requires: yast2 yast2-inetd BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite + BuildArch: noarch + Summary: YaST2 - FTP configuration %description @@ -36,14 +41,16 @@ to configure two daemons: pure-ftpd and vsftpd. %prep -%setup -n yast2-ftp-server-2.18.1 +%setup -n yast2-ftp-server-2.19.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-ftp-server-2.18.1.tar.bz2 -> yast2-ftp-server-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-2.18.1/VERSION new/yast2-ftp-server-2.19.0/VERSION --- old/yast2-ftp-server-2.18.1/VERSION 2009-11-30 09:38:57.000000000 +0100 +++ new/yast2-ftp-server-2.19.0/VERSION 2010-04-23 16:31:17.000000000 +0200 @@ -1 +1 @@ -2.18.1 +2.19.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-2.18.1/src/ftp-server.desktop new/yast2-ftp-server-2.19.0/src/ftp-server.desktop --- old/yast2-ftp-server-2.18.1/src/ftp-server.desktop 2009-02-17 13:42:47.000000000 +0100 +++ new/yast2-ftp-server-2.19.0/src/ftp-server.desktop 2010-03-03 16:07:00.000000000 +0100 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=ftp-server.rnc Icon=yast-ftp-server -Exec=/sbin/yast2 ftp-server +Exec=xdg-su -c "/sbin/yast2 ftp-server" Name=FTP Server GenericName=Module for configuration FTP daemon (vsftpd or pure-ftpd) -X-KDE-SubstituteUID=true StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-2.18.1/src/write_load.ycp new/yast2-ftp-server-2.19.0/src/write_load.ycp --- old/yast2-ftp-server-2.18.1/src/write_load.ycp 2009-11-30 09:32:45.000000000 +0100 +++ new/yast2-ftp-server-2.19.0/src/write_load.ycp 2010-04-23 16:27:44.000000000 +0200 @@ -53,7 +53,14 @@ string option = ""; y2milestone("---------------boolean SettingsXinetdPure (list <string> server_args)-----------------"); y2milestone("----------------------------------------------------"); - + + //bnc#597842 Yast2-ftp-server module losses the chroot everyone (chroot-local-user) setting + if ((FtpServer::vsftpd_edit) || (size(pure_ftpd_xinet_conf) == 0)) + { + y2milestone("skip SettingsXinetdPure() -> vsftpd is used or pure_ftpd_xinet_conf is empty"); + return true; + } + //ChrootEnable option = find(string opt, pure_ftpd_xinet_conf, ``(opt == "-A")); if (option != nil) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 opencv for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at Sun Apr 25 18:45:13 CEST 2010. -------- --- opencv/opencv.changes 2010-04-15 11:02:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/opencv/opencv.changes 2010-04-22 10:48:43.000000000 +0200 @@ -1,0 +2,30 @@ +Thu Apr 22 11:43:38 EEST 2010 - koprok(a)nand.bg + +- devel package renamed to opencv-devel, so that switching between + OBS and packman opencv packages is easier + +------------------------------------------------------------------- +Mon Apr 19 10:48:10 EEST 2010 - koprok(a)nand.bg + +- fix gstreamer support +- fix xine support +- fix some rpmlint warnings +- fix shared libraries permissions + +------------------------------------------------------------------- +Sat Apr 17 18:23:31 EEST 2010 - koprok(a)nand.bg + +- Do not waste resources building the tests as we do not run them + +------------------------------------------------------------------- +Fri Apr 16 10:58:26 EEST 2010 - koprok(a)nand.bg + +- Do not disable SSE,SSE2,etc. According to OpenCV changelog, + it should be safe to leave these enabled. + +------------------------------------------------------------------- +Thu Apr 15 14:26:49 EEST 2010 - koprok(a)nand.bg + +- fix build on openSUSE 11.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.VHlEUc/_old 2010-04-25 18:44:22.000000000 +0200 +++ /var/tmp/diff_new_pack.VHlEUc/_new 2010-04-25 18:44:22.000000000 +0200 @@ -22,7 +22,7 @@ %define libname lib%{name} %define soname 2 Version: 2.1.0 -Release: 1 +Release: 2 Summary: Collection of algorithms for computer vision Group: Development/Libraries License: BSD3c @@ -32,7 +32,12 @@ Patch1: %{name}-2.1-samples.patch Patch2: libpng14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gstreamer-0_10-devel libdc1394-devel libv4l-devel libxine-devel +BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel +%if 0%{?suse_version} >= 1110 +BuildRequires: libdc1394-devel libv4l-devel libxine-devel +%else +BuildRequires: xine-devel +%endif BuildRequires: gtk2-devel libjasper-devel libjpeg-devel libtiff-devel BuildRequires: cmake gcc-c++ libpng-devel python-devel swig zlib-devel %if %{with ffmpeg} @@ -55,15 +60,15 @@ for various computer vision problems. The library is compatible with IPL and utilizes Intel Integrated Performance Primitives for better performance. -%package -n %{libname}-devel - +%package devel +License: BSD3c Summary: Development files for using the OpenCV library Group: Development/Libraries Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} -%description -n %{libname}-devel +%description devel This package contains the OpenCV C/C++ library and header files, as well as documentation. It should be installed if you want to develop programs that will use the OpenCV library. @@ -94,7 +99,7 @@ Summary: Documentation and examples for OpenCV Group: Documentation # Since this package also contains examples that need -devel to be compiled -Recommends: %{libname}-devel +Recommends: %{name}-devel %description -n %{name}-doc This package contains the documentation and examples for the OpenCV library. @@ -107,7 +112,10 @@ # Windows specific and with wrong end of line %{__rm} -f doc/packaging.txt %{__chmod} +x samples/c/build_all.sh -sed -i 's/\r$//' samples/c/adaptiveskindetector.cpp samples/python/camshift.py +sed -i 's/\r$//' samples/c/adaptiveskindetector.cpp \ + samples/c/calibration_artificial.cpp \ + samples/c/grabcut.cpp \ + samples/python/camshift.py %build export CFLAGS=$RPM_OPT_FLAGS @@ -119,10 +127,8 @@ -DLIB_SUFFIX=$(echo %_lib | cut -b4-) \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_OMIT_FRAME_POINTER=OFF \ - -DUSE_MMX=OFF \ - -DUSE_SSE=OFF \ - -DUSE_SSE2=OFF \ - -DUSE_SSE3=OFF \ + -DWITH_XINE=ON \ + -DBUILD_TESTS=OFF \ -DBUILD_SWIG_PYTHON_SUPPORT=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ @@ -144,7 +150,7 @@ %postun -n %{libname}%{soname} -p /sbin/ldconfig %files -n %{libname}%{soname} -%defattr(0644, root, root, 0755) +%defattr(-, root, root, 0755) %{_libdir}/lib*.so.* %files -n %{name} @@ -153,7 +159,7 @@ %{_datadir}/%{name} %exclude %{_datadir}/%{name}/OpenCVConfig.cmake -%files -n %{libname}-devel +%files devel %defattr(0644, root, root, 0755) %{_includedir}/%{name} %{_libdir}/lib*.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-input for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Sun Apr 25 18:44:20 CEST 2010. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-04-21 16:45:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-04-23 16:09:41.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Apr 23 16:08:45 CEST 2010 - ro(a)suse.de + +- drop 00-evdev.conf (now in xorg-x11-server) + +------------------------------------------------------------------- +Fri Apr 23 12:09:08 CEST 2010 - ro(a)suse.de + +- update last patch with fix from takashi: check priv->has_double + (set on appletouch but not on clickpad devices) + +------------------------------------------------------------------- +Fri Apr 23 00:27:02 CEST 2010 - ro(a)suse.de + +- blacklist appletouch for synaptics clickpad support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 00-evdev.conf New: ---- xf86-input-synaptics-clickpad_blacklist_appletouch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.TgdcaY/_old 2010-04-25 18:44:03.000000000 +0200 +++ /var/tmp/diff_new_pack.TgdcaY/_new 2010-04-25 18:44:03.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 5 +Release: 6 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -50,7 +50,6 @@ Source29: xf86-input-synaptics-1.2.2.tar.bz2 Source30: xf86-input-evdev-2.4.0.tar.bz2 Source33: xf86-input-wacom-0.10.5.tar.bz2 -Source40: 00-evdev.conf Source42: 11-mouse.conf Source43: 20-synaptics.conf Source44: 20-wacom.conf @@ -64,6 +63,7 @@ Patch43: xf86-input-synaptics-retry-serial-open.diff Patch44: xf86-input-synaptics-add-clickpad-support Patch45: xf86-input-synaptics-add-led-support +Patch46: xf86-input-synaptics-clickpad_blacklist_appletouch %description This package contains X.Org input drivers. @@ -82,6 +82,7 @@ %patch43 -p1 %patch44 -p1 %patch45 -p1 +%patch46 -p1 popd pushd xf86-input-elographics-* %patch38 -p1 @@ -119,7 +120,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi rm -f $RPM_BUILD_ROOT/usr/%{_lib}/hal/hal-probe-vmmouse mkdir -p $RPM_BUILD_ROOT/etc/X11/xorg.conf.d -install -m 644 %{S:40} %{S:42} %{S:43} %{S:44} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d +install -m 644 %{S:42} %{S:43} %{S:44} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d %clean rm -rf "$RPM_BUILD_ROOT" ++++++ xf86-input-synaptics-clickpad_blacklist_appletouch ++++++ --- xf86-input-synaptics-1.2.2/src/eventcomm.c +++ xf86-input-synaptics-1.2.2/src/eventcomm.c @@ -279,7 +279,7 @@ xf86Msg(X_INFO, "%s: buttons:%s\n", local->name, buf); /* clickpad device reports only the single left button mask */ - if (priv->has_left && !priv->has_right && !priv->has_middle) { + if (priv->has_left && !priv->has_right && !priv->has_middle && !priv->has_double) { priv->is_clickpad = TRUE; xf86Msg(X_INFO, "%s: is Clickpad device\n", local->name); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ntp for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at Sun Apr 25 18:44:07 CEST 2010. -------- --- ntp/ntp.changes 2010-04-09 17:31:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2010-04-23 13:00:30.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 23 10:59:52 UTC 2010 - varkoly(a)novell.com + +- Set time by starting ntp via ntptimeset + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.nrW1vO/_old 2010-04-25 18:43:36.000000000 +0200 +++ /var/tmp/diff_new_pack.nrW1vO/_new 2010-04-25 18:43:36.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD3c(or similar) Group: Productivity/Networking/Other Version: 4.2.4p8 -Release: 4 +Release: 5 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz ++++++ conf.ntp.init ++++++ --- /var/tmp/diff_new_pack.nrW1vO/_old 2010-04-25 18:43:36.000000000 +0200 +++ /var/tmp/diff_new_pack.nrW1vO/_new 2010-04-25 18:43:36.000000000 +0200 @@ -146,7 +146,7 @@ case "$1" in start) - # ntpd_is_running || $0 ntptimeset + ntpd_is_running || $0 ntptimeset # get the initial date from the timeservers configured in ntp.conf echo -n "Starting network time protocol daemon (NTPD)" # do we need a refclock symlink? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-printer for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at Sun Apr 25 18:43:51 CEST 2010. -------- --- yast2-printer/yast2-printer.changes 2010-03-30 15:17:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2010-04-23 12:42:16.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Apr 23 11:39:13 CEST 2010 - jsmeix(a)suse.de + +- In overview.ycp added an initial responsive test if CUPS server + is accessible by using the TestClientOnlyServer function + which was moved from printingvianetwork.ycp to Printer.ycp + and adapted so that it can be used both for overview.ycp and + printingvianetwork.ycp (see Novell/Suse Bugzilla bnc#595612). +- Fixed English spelling in basicadd.ycp, basicmodify.ycp, + and Printerlib.ycp (see Novell/Suse Bugzilla bnc#596526). +- In overview.ycp for testpage printing added "tail -n 20" + when the CUPS error_log info is grepped to avoid a too + tall popup which may show too many lines (in particular + in case of the oververbose Gutenprint driver). +- In overview.ycp show a generic text when the user selected + that testpage printing had failed for a local queue but + there are no messages in /var/log/cups/error_log regarding + the testpage print job. +- 2.19.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.19.7.tar.bz2 New: ---- yast2-printer-2.19.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.3kYq12/_old 2010-04-25 18:43:42.000000000 +0200 +++ /var/tmp/diff_new_pack.3kYq12/_new 2010-04-25 18:43:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.19.7) +# spec file for package yast2-printer (Version 2.19.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-printer -Version: 2.19.7 +Version: 2.19.8 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.19.7.tar.bz2 +Source0: yast2-printer-2.19.8.tar.bz2 Prefix: /usr @@ -54,7 +54,7 @@ Developer documentation for yast2-printer. %prep -%setup -n yast2-printer-2.19.7 +%setup -n yast2-printer-2.19.8 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-printer-2.19.7.tar.bz2 -> yast2-printer-2.19.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/VERSION new/yast2-printer-2.19.8/VERSION --- old/yast2-printer-2.19.7/VERSION 2010-03-30 14:57:54.000000000 +0200 +++ new/yast2-printer-2.19.8/VERSION 2010-04-08 15:10:33.000000000 +0200 @@ -1 +1 @@ -2.19.7 +2.19.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/configure new/yast2-printer-2.19.8/configure --- old/yast2-printer-2.19.7/configure 2010-03-30 14:58:07.000000000 +0200 +++ new/yast2-printer-2.19.8/configure 2010-04-23 11:47:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.7. +# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.8. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.19.7' -PACKAGE_STRING='yast2-printer 2.19.7' +PACKAGE_VERSION='2.19.8' +PACKAGE_STRING='yast2-printer 2.19.8' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1336,7 +1336,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-printer 2.19.7 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.19.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1407,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.19.7:";; + short | recursive ) echo "Configuration of yast2-printer 2.19.8:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.19.7 +yast2-printer configure 2.19.8 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1516,7 +1516,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-printer $as_me 2.19.7, which was +It was created by yast2-printer $as_me 2.19.8, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2363,7 +2363,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.19.7' + VERSION='2.19.8' cat >>confdefs.h <<_ACEOF @@ -2587,7 +2587,7 @@ -VERSION="2.19.7" +VERSION="2.19.8" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -5413,7 +5413,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-printer $as_me 2.19.7, which was +This file was extended by yast2-printer $as_me 2.19.8, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5467,7 +5467,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-printer config.status 2.19.7 +yast2-printer config.status 2.19.8 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/configure.in new/yast2-printer-2.19.8/configure.in --- old/yast2-printer-2.19.7/configure.in 2010-03-30 14:58:01.000000000 +0200 +++ new/yast2-printer-2.19.8/configure.in 2010-04-23 11:47:38.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.19.7, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.19.8, http://bugs.opensuse.org/, yast2-printer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.7" +VERSION="2.19.8" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/src/Printer.ycp new/yast2-printer-2.19.8/src/Printer.ycp --- old/yast2-printer-2.19.7/src/Printer.ycp 2010-03-24 11:35:20.000000000 +0100 +++ new/yast2-printer-2.19.8/src/Printer.ycp 2010-04-22 10:56:39.000000000 +0200 @@ -2208,6 +2208,227 @@ } /** + * Test whether or not a "client-only" server is accessible. + * @param server_name string of the "client-only" server name + * @param fail_if_executable_is_missing boolean which lets this function fail + * if netcat, ping, or host are not executable (e.g. because of not installed packages) + * @return false if the "client-only" server is not accessible. + */ +global boolean TestClientOnlyServer( string server_name, boolean fail_if_executable_is_missing ) +{ // Test for "localhost" or "127.0.0.1" and make a local cupsd accessible + // because a local cupsd is needed if the server name is "localhost" or "127.0.0.1": + if( "localhost" == tolower( server_name ) + || "127.0" == substring( server_name, 0, 5 ) + ) + { // The server name is "localhost" or "127.0.0.1" + // which makes it effectively a config with a local running cupsd. + // If a local cupsd is already accessible, exit successfully, otherwise start it: + if( Printerlib::GetAndSetCupsdStatus( "" ) ) + { return true; + } + return Printerlib::GetAndSetCupsdStatus( "start" ); + } + // The tests here are the same (except verbosity) as in the cups_client_only tool. + // First do the most meaningful test and only if this works return true. + // The subsequent tests are only there to provide more info for the user + // what might be the reason why the server is not accessible via port 631. + string netcat_test_good_message = sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server '%1' is accessible via port 631 (IPP/CUPS)."), + server_name + ); + string netcat_test_fail_message = sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server '%1' is not accessible via port 631 (IPP/CUPS)."), + server_name + ); + string ping_test_good_message = sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server '%1' responds to a 'ping' in the network."), + server_name + ); + string ping_test_fail_message = sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server '%1' does not respond to a 'ping' in the network."), + server_name + ); + string host_test_good_message = sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server name '%1' is known in the network."), + server_name + ); + string host_test_fail_message = sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server name '%1' is not known in the network."), + server_name + ); + string separator = "\n===========================================================\n"; + string error_messages = ""; + string result_details = ""; + boolean netcat_test_failed = false; + boolean ping_test_failed = false; + boolean host_test_failed = false; + // Only the netcat test provides a really meaningful result + // so that only this test returns immediately true if it was successful. + if( ! Printerlib::ExecuteBashCommand( "type -P netcat" ) ) + { // netcat is required for a meaningful test. + // Show negative feedback: + Popup::ErrorDetails( // Popup::ErrorDetails message: + _("Cannot execute the program 'netcat'"), + // Popup::ErrorDetails details: + _("The RPM package 'netcat' is required for a meaningful test.") + "\n" + + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + if( fail_if_executable_is_missing ) + { return false; + } + } + else + { // netcat is executable: + // Make netcat verbose, otherwise there would be no output at all + // but some output is needed for the Popup::ErrorDetails below: + if( Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z " + server_name + " 631" ) ) + { // Show positive feedback. + // Show it as TimedMessage so that is disappears automatically + // when TestClientOnlyServer() is called from ApplyNetworkPrintingSettings(): + Popup::TimedMessage( netcat_test_good_message, 3 ); + return true; + } + // The netcat-test failed: + netcat_test_failed = true; + error_messages = netcat_test_fail_message; + result_details = Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""; + } + // When the netcat-test failed or when netcat is not executable, do a less meaningful test: + if( ! Printerlib::ExecuteBashCommand( "type -P ping" ) ) + { // ping is required for the less meaningful test + // but it the less meaningful test is not really important + // so that the less meaningful test is silently skipped + // and no negative feedback is shown when ping is not executable: + if( fail_if_executable_is_missing ) + { // Show negative feedback: + Popup::ErrorDetails( // Popup::ErrorDetails message + _("Cannot execute the program 'ping'"), + // Popup::ErrorDetails details: + _("The RPM package 'iputils' is required for a meaningful test.") + "\n" + + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + + separator + + error_messages + "\n" + + result_details + ); + return false; + } + } + else + { // ping is executable: + if( Printerlib::ExecuteBashCommand( "ping -w 1 -c 1 " + server_name ) ) + { // The ping-test was successful. + if( netcat_test_failed ) + { // The netcat-test had failed. + // Show negative feedback: + Popup::ErrorDetails( sformat( // Popup::ErrorDetails message + // where %1 will be replaced by the server name. + _("The server '%1' is not accessible"), + server_name + ), + // Popup::ErrorDetails details: + error_messages + "\n" + + ping_test_good_message + + separator + + result_details + "\n" + + Printerlib::result["stderr"]:"" + "\n" + + Printerlib::result["stdout"]:"" + ); + return false; + } + // netcat was not executable but at least the ping-test was successful. + // There was already a Popup::ErrorDetails that netcat is required for a meaningful test + // so that the less meaningful ping-test is all what could be done in this case. + return true; + } + // The ping-test failed: + ping_test_failed = true; + error_messages = error_messages + "\n" + ping_test_fail_message; + result_details = result_details + "\n" + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""; + } + // When the netcat-test failed or when netcat is not executable + // and when the ping-test failed or when ping is not executable + // do a last test: + if( ! Printerlib::ExecuteBashCommand( "type -P host" ) ) + { // host is required for the last test + // but it the last test is not really important + // so that the last test is silently skipped + // and no negative feedback is shown when host is not executable: + if( fail_if_executable_is_missing ) + { // Show negative feedback: + Popup::ErrorDetails( // Popup::ErrorDetails message + _("Cannot execute the program 'host'"), + // Popup::ErrorDetails details: + _("The RPM package 'bind-utils' is required for a meaningful test.") + "\n" + + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + + separator + + error_messages + "\n" + + result_details + ); + return false; + } + } + else + { // host is executable: + if( Printerlib::ExecuteBashCommand( "host -W 1 " + server_name ) ) + { // The host-test was successful. + if( netcat_test_failed || ping_test_failed ) + { // The netcat-test or the ping-test failed. + // Show negative feedback: + Popup::ErrorDetails( sformat( // Popup::ErrorDetails message + // where %1 will be replaced by the server name. + _("The server '%1' does not respond in the network"), + server_name + ), + // Popup::ErrorDetails details: + error_messages + "\n" + + host_test_good_message + + separator + + result_details + "\n" + + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + return false; + } + // ping was not executable but at least the host-test was successful. + // There was already a Popup::ErrorDetails that netcat is required for a meaningful test + // so that the last host-test is all what could be done in this case. + return true; + } + // The host-test failed: + host_test_failed = true; + error_messages = error_messages + "\n" + host_test_fail_message; + result_details = result_details + "\n" + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""; + } + // When the netcat-test failed or when netcat is not executable + // and when the ping-test failed or when ping is not executable + // and when the host-test failed or when host is not executable: + if( netcat_test_failed || ping_test_failed || host_test_failed ) + { // The netcat-test or the ping-test or the host-test failed. + // Show negative feedback: + Popup::ErrorDetails( sformat( // Popup::ErrorDetails message + // where %1 will be replaced by the server name. + _("The server '%1' is unknown"), + server_name + ), + // Popup::ErrorDetails details: + error_messages + + separator + + result_details + ); + return false; + } + // Neither netcat nor ping nor host were executable. + // There was already a Popup::ErrorDetails that netcat is required for a meaningful test + // so that nothing else could be done in this case except a "hope-for-the-best" successful return: + return true; +} + +/** * Run hp-setup: * @return false if hp-setup cannot be run and return true in any other case * because there is no usable exit code of hp-setup (always zero even in case of error). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/src/Printerlib.ycp new/yast2-printer-2.19.8/src/Printerlib.ycp --- old/yast2-printer-2.19.7/src/Printerlib.ycp 2010-03-17 08:53:58.000000000 +0100 +++ new/yast2-printer-2.19.8/src/Printerlib.ycp 2010-04-14 16:51:09.000000000 +0200 @@ -593,7 +593,7 @@ // by calling time() which returns the number of seconds since 1.1.1970: integer time_before = time(); Popup::TimedMessage( // Message of a Popup::TimedMessage: - popupheader + "\n\n" + _("Waiting until the config files are updated..."), + popupheader + "\n\n" + _("Updating configuration files..."), dirty_clean_interval + 1 ); integer waiting_time = time() - time_before; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/src/basicadd.ycp new/yast2-printer-2.19.8/src/basicadd.ycp --- old/yast2-printer-2.19.7/src/basicadd.ycp 2010-01-21 11:41:03.000000000 +0100 +++ new/yast2-printer-2.19.8/src/basicadd.ycp 2010-04-14 16:45:33.000000000 +0200 @@ -386,7 +386,7 @@ // in particular when no local queues were shown before: Printer::queue_filter_show_local = true; // Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files: - if( ! Printerlib::WaitForUpdatedConfigFiles( _("Created New Printer Setup") ) ) + if( ! Printerlib::WaitForUpdatedConfigFiles( _("Creating New Printer Setup") ) ) { // It returns false if the user had interrupted the waiting for updated config files: Popup::ErrorDetails( // Message of a Popup::ErrorDetails: _("New Printer Configuration not yet Stored in the System"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/src/basicmodify.ycp new/yast2-printer-2.19.8/src/basicmodify.ycp --- old/yast2-printer-2.19.7/src/basicmodify.ycp 2010-01-21 11:40:37.000000000 +0100 +++ new/yast2-printer-2.19.8/src/basicmodify.ycp 2010-04-14 16:46:07.000000000 +0200 @@ -669,7 +669,7 @@ } } // Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files: - if( ! Printerlib::WaitForUpdatedConfigFiles( _("Modified Printer Setup") ) ) + if( ! Printerlib::WaitForUpdatedConfigFiles( _("Modifying Printer Setup") ) ) { // It returns false if the user had interrupted the waiting for updated config files: Popup::WarningDetails( // Message of a Popup::WarningDetails. _("Modified Printer Configuration not yet Stored in the System"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/src/overview.ycp new/yast2-printer-2.19.8/src/overview.ycp --- old/yast2-printer-2.19.7/src/overview.ycp 2010-03-12 14:55:07.000000000 +0100 +++ new/yast2-printer-2.19.8/src/overview.ycp 2010-04-23 11:36:03.000000000 +0200 @@ -145,6 +145,7 @@ _("The CUPS daemon seems not to listen on the official IANA IPP port (631). Check with 'netstat -nap | grep cupsd' where the cupsd actually listens. This happens when there is a 'Listen ...:1234' or 'Port 1234' setting +(where 1234 means any port number which is not the official port 631) in /etc/cups/cupsd.conf (check also if there is 'BrowsePort 1234'). The YaST printer module does not support a non-official port. A non-official port leads to an endless sequence of further failures. @@ -160,28 +161,117 @@ boolean local_content_selected = Printer::queue_filter_show_local; boolean remote_content_selected = Printer::queue_filter_show_remote; boolean local_cupsd_required = true; + boolean feedback_popup_exists = false; // Determine whether or not it is currently a real client-only config // (i.e. a ServerName != "localhost/127.0.0.1" in /etc/cups/client.conf) // and ignore when it fails (i.e. use the fallback value silently): + integer time_before = time(); Printerlib::DetermineClientOnly(); if( Printerlib::client_only ) - { local_cupsd_required = false; - local_content_selected = false; - remote_content_selected = true; - UI::ChangeWidget( `client_only_server_name, - `Value, - sformat( // Show the CUPS server name if it is a client-only config - // where %1 will be replaced by the CUPS server name. - _("CUPS Server %1"), - Printerlib::client_conf_server_name - ) - ); - // In case of a client-only config it does not work to show local queues: - UI::ChangeWidget( `local_content_checkbox, `Enabled, false ); + { if( time() - time_before > 10 ) + { y2milestone( "DetermineClientOnly took longer than 10 seconds. CUPS server is '%1'", + Printerlib::client_conf_server_name + ); + // When Printerlib::DetermineClientOnly took longer than 10 seconds + // something is fishy regarding CUPS server access. + // In this case show feedback what goes on because for example + // when a CUPS server is unknown by the DNS there can be longer DNS timeouts + // which would also delay Printer::TestClientOnlyServer for up to a few minutes + // so that the user must be informed what goes on while he is wainting: + Popup::ShowFeedback( // No title for a simple busy message: + "", + // Busy message: + // Body of a Popup::ShowFeedback + _("Running several tests regarding CUPS server accessibility...\n(this might take some time)") + ); + feedback_popup_exists = true; + // Sleep one second to let the feedback popup stay for at least one second + // to avoid a flickering popup which appears and disappears at the same time: + sleep( 1000 ); + } + // A non-accessible client-only server leads to an endless sequence of weird further behaviour + // of the module so that a non-accessible server is only accepted after insistent warning popups: + if( ! Printer::TestClientOnlyServer( Printerlib::client_conf_server_name, false ) ) + { if( feedback_popup_exists ) + { Popup::ClearFeedback(); + feedback_popup_exists = false; + } + if( Popup::YesNoHeadline( // Popup::YesNoHeadline headline question + // where %1 will be replaced by the server name: + sformat( _("Do no longer use the inaccessible CUPS server '%1'?"), + Printerlib::client_conf_server_name + ), + // Popup::YesNoHeadline body recommendation how to answer the headline question + // where %1 will be replaced by the server name: + sformat( _("To proceed, you should agree that '%1' will be no longer used."), + Printerlib::client_conf_server_name + ) + ) + ) + { // Remove the 'ServerName' entry in /etc/cups/client.conf: + if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "cups_client_only none" ) ) + { Popup::ErrorDetails( // Popup::ErrorDetails message: + _("Failed to remove the 'ServerName' entry in /etc/cups/client.conf"), + Printerlib::result["stderr"]:"" + ); + Popup::Warning( // Popup::Warning message: + _("A non-accessible server leads to an endless sequence of delays and failures.") + ); + } + // The 'ServerName' entry in /etc/cups/client.conf was removed + // so that it is now no longer a real client-only config and + // therefore the Printerlib::client_* values must be determined anew: + Printerlib::DetermineClientOnly(); + } + else + { // The user decided not to remove the non-accessible 'ServerName' in /etc/cups/client.conf: + Popup::Warning( // Popup::Warning message: + _("A non-accessible server leads to an endless sequence of delays and failures.") + ); + } + } + // The 'ServerName' entry in /etc/cups/client.conf may have been removed above + // when the client-only server was non-accessible so that it might be now + // no longer a real client-only config and therefore it is tested again + // whether or not it is still a real client-only config: + if( Printerlib::client_only ) + { local_cupsd_required = false; + local_content_selected = false; + remote_content_selected = true; + UI::ChangeWidget( `client_only_server_name, + `Value, + sformat( // Show the CUPS server name if it is a client-only config + // where %1 will be replaced by the CUPS server name. + _("CUPS Server %1"), + Printerlib::client_conf_server_name + ) + ); + // In case of a client-only config it does not work to show local queues: + UI::ChangeWidget( `local_content_checkbox, `Enabled, false ); + } } // Determine whether or not a local cupsd is accessible: + time_before = time(); if( local_cupsd_required && ! Printerlib::GetAndSetCupsdStatus( "" ) ) - { // Printerlib::GetAndSetCupsdStatus results also false when + { if( time() - time_before > 10 ) + { y2milestone( "GetAndSetCupsdStatus('') took longer than 10 seconds." ); + // When Printerlib::GetAndSetCupsdStatus took longer than 10 seconds + // something is fishy regarding CUPS server access. + // In this case show feedback what goes on because subsequent + // Printerlib::GetAndSetCupsdStatus calls would be also delayed + // so that the user must be informed what goes on while he is wainting: + Popup::ShowFeedback( // No title for a simple busy message: + "", + // Busy message: + // Body of a Popup::ShowFeedback: + _("Testing if CUPS server is accessible...") + ); + feedback_popup_exists = true; + // Sleep one second to let the feedback popup stay for at least one second + // to avoid a flickering popup which appears and disappears at the same time: + sleep( 1000 ); + } + // Printerlib::GetAndSetCupsdStatus results also false when // a local running cupsd does not listen on the official IPP port. // Therefore, to be on the safe side, do a restart here. // Printerlib::GetAndSetCupsdStatus already shows a confirmation popup: @@ -191,7 +281,11 @@ // the user may have aborted the Popup::TimedMessage from the above call // which would wait until a started cupsd becomes actually accessible. if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) - { Popup::ErrorDetails( required_cupsd_not_accessible, + { if( feedback_popup_exists ) + { Popup::ClearFeedback(); + feedback_popup_exists = false; + } + Popup::ErrorDetails( required_cupsd_not_accessible, Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" ); // A special case is when the cupsd does not listen on the official IANA IPP port (631). @@ -222,6 +316,10 @@ } } } + if( feedback_popup_exists ) + { Popup::ClearFeedback(); + feedback_popup_exists = false; + } if( Printer::printer_auto_dialogs ) { // When the Overview dialog is called by AutoYaST // (by calling in printer_auto.ycp the "Change" function) @@ -487,10 +585,7 @@ // Body of a Popup::AnyMessage when no queue was selected from the list: _("Select an entry.") ); - // When testpage printing failed there might be whatever reason - // so that a refresh of the overview content is needed to be on the safe side. - // Re-run the OverviewDialog (with re-created queue status) via the sequencer: - return `refresh; + return nil; } if( "yes" == Printer::queues[selected_queue_index,"rejecting"]:"no" ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when the queue rejects print jobs: @@ -498,8 +593,8 @@ // Body of a Popup::AnyMessage when the queue rejects print jobs: _("The testpage cannot be printed because print jobs are rejected.") ); - // When testpage printing failed there might be whatever reason - // so that a refresh of the overview content is needed to be on the safe side. + // Do a refresh of the overview content to be on the safe side. + // Perhaps the actual current queue state is no longer "rejecting". // Re-run the OverviewDialog (with re-created queue status) via the sequencer: return `refresh; } @@ -509,8 +604,8 @@ // Body of a Popup::AnyMessage when printing is disabled for the queue: _("The testpage cannot be printed because printout is disabled.") ); - // When testpage printing failed there might be whatever reason - // so that a refresh of the overview content is needed to be on the safe side. + // Do that a refresh of the overview content to be on the safe side. + // Perhaps the actual current queue state is no longer "disabled". // Re-run the OverviewDialog (with re-created queue status) via the sequencer: return `refresh; } @@ -726,7 +821,6 @@ { // When the user had selected in the Popup::AnyQuestion that "Testpage printing failed" // and when it is a local queue, extract logging information about the test print job // from /var/log/cups/error_log and show them to the user: - string test_print_cups_error_log = ""; test_print_command_stdout = deletechars( test_print_command_stdout, "'" ); Printerlib::ExecuteBashCommand( // sed is greedy and cuts all up to the last '-' for example // echo ' funprinter-1000-123 ' | sed -e 's/.*-//' @@ -741,13 +835,14 @@ + "-[0-9]* ' | sed -e 's/.*-//' | tr -d -c '[:digit:]'" ); string test_print_job_number = Printerlib::result["stdout"]:""; + string test_print_cups_error_log = ""; if( "" != test_print_job_number ) { // Note the YCP quoting: \\ becomes \ in the commandline: Printerlib::ExecuteBashCommand( "grep '\\[Job " + test_print_job_number - + "\\]' /var/log/cups/error_log | grep -v '^[dD]'" + + "\\]' /var/log/cups/error_log | grep -v '^[dD]' | tail -n 20" ); - test_print_cups_error_log = Printerlib::result["stdout"]:""; + test_print_cups_error_log = "...\n" + Printerlib::result["stdout"]:""; } // Ignore an effectively empty test_print_cups_error_log: if( "" != filterchars( test_print_cups_error_log, Printer::alnum_chars ) ) @@ -762,6 +857,13 @@ + where_full_log ); } + else + { Popup::Notify( // When the user had selected that "Testpage printing failed" for a local queue + // but the test_print_cups_error_log was effectively empty, + // show a very generic info to the user to show at least something: + _( "For CUPS log information, see the /var/log/cups/error_log file." ) + ); + } } } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.7/src/printingvianetwork.ycp new/yast2-printer-2.19.8/src/printingvianetwork.ycp --- old/yast2-printer-2.19.7/src/printingvianetwork.ycp 2010-03-12 13:33:48.000000000 +0100 +++ new/yast2-printer-2.19.8/src/printingvianetwork.ycp 2010-04-22 11:15:12.000000000 +0200 @@ -181,167 +181,6 @@ `VStretch() ); -boolean TestClientOnlyServer( string server_name ) -{ string netcat_test_good_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server '%1' is accessible via port 631 (IPP/CUPS)."), - server_name - ); - string netcat_test_fail_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server '%1' is not accessible via port 631 (IPP/CUPS)."), - server_name - ); - string ping_test_good_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server '%1' responds to a 'ping' in the network."), - server_name - ); - string ping_test_fail_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server '%1' does not respond to a 'ping' in the network."), - server_name - ); - string host_test_good_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server name '%1' is known in the network."), - server_name - ); - string host_test_fail_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server name '%1' is not known in the network."), - server_name - ); - string separator = "\n===========================================================\n"; - string error_messages = ""; - string result_details = ""; - // The tests here are the same (except verbosity) as in the cups_client_only tool. - // First do the most meaningful test and only if this works return true. - // The subsequent tests are only there to provide more info for the user - // what might be the reason why the server is not accessible via port 631. - // Make netcat verbose, otherwise there would be no output at all - // but some output is needed for the Popup::MessageDetails below: - if( ! Printerlib::ExecuteBashCommand( "type -P netcat" ) ) - { // netcat is required for a meaningful test. - // Show negative feedback: - Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Cannot execute the program 'netcat'"), - // Popup::ErrorDetails details: - _("The RPM package 'netcat' is required for a meaningful test.") + "\n" - + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" - ); - return false; - } - // Test for "localhost" or "127.0.0.1" and make a local cupsd accessible - // because a local cupsd is needed if the server name is "localhost" or "127.0.0.1": - if( "localhost" == tolower( server_name ) - || "127.0" == substring( server_name, 0, 5 ) - ) - { // The user has entered "localhost" or "127.0.0.1" as server name - // which makes it effectively a config with a local running cupsd. - // If a local cupsd is already accessible, do nothing, otherwise start it: - if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) - { if( ! Printerlib::GetAndSetCupsdStatus( "start" ) ) - { return false; - } - } - } - if( Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z " + server_name + " 631" ) ) - { // Show positive feedback. - // Show it as TimedMessage so that is disappears automatically - // when TestClientOnlyServer() is called from ApplyNetworkPrintingSettings(): - Popup::TimedMessage( netcat_test_good_message, 3 ); - return true; - } - // The netcat-test failed: - error_messages = netcat_test_fail_message; - result_details = Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""; - // When the netcat-test failed, do a less meaningful test: - if( ! Printerlib::ExecuteBashCommand( "type -P ping" ) ) - { // ping is required for the less meaningful test. - // Show negative feedback: - Popup::ErrorDetails( // Popup::ErrorDetails message - _("Cannot execute the program 'ping'"), - // Popup::ErrorDetails details: - _("The RPM package 'iputils' is required for a meaningful test.") + "\n" - + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" - + separator - + error_messages + "\n" - + result_details - ); - return false; - } - if( Printerlib::ExecuteBashCommand( "ping -w 1 -c 1 " + server_name ) ) - { // The netcat-test failed but the ping-test was successful. - // Show negative feedback: - Popup::ErrorDetails( sformat( // Popup::ErrorDetails message - // where %1 will be replaced by the server name. - _("The server '%1' is not accessible"), - server_name - ), - // Popup::ErrorDetails details: - error_messages + "\n" - + ping_test_good_message - + separator - + result_details + "\n" - + Printerlib::result["stderr"]:"" + "\n" - + Printerlib::result["stdout"]:"" - ); - return false; - } - // The ping-test failed: - error_messages = error_messages + "\n" + ping_test_fail_message; - result_details = result_details + "\n" + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""; - // When the netcat-test and the ping-test failed - // do a last test: - if( ! Printerlib::ExecuteBashCommand( "type -P host" ) ) - { // host is required for the last test. - // Show negative feedback: - Popup::ErrorDetails( // Popup::ErrorDetails message - _("Cannot execute the program 'host'"), - // Popup::ErrorDetails details: - _("The RPM package 'bind-utils' is required for a meaningful test.") + "\n" - + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" - + separator - + error_messages + "\n" - + result_details - ); - return false; - } - if( Printerlib::ExecuteBashCommand( "host -W 1 " + server_name ) ) - { // The netcat-test and the ping-test failed but the host-test was successful. - // Show negative feedback: - Popup::ErrorDetails( sformat( // Popup::ErrorDetails message - // where %1 will be replaced by the server name. - _("The server '%1' does not respond in the network"), - server_name - ), - // Popup::ErrorDetails details: - error_messages + "\n" - + host_test_good_message - + separator - + result_details + "\n" - + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" - ); - return false; - } - // The netcat-test and the ping-test and the host-test failed: - // Show negative feedback: - Popup::ErrorDetails( sformat( // Popup::ErrorDetails message - // where %1 will be replaced by the server name. - _("The server '%1' is unknown"), - server_name - ), - // Popup::ErrorDetails details: - error_messages + "\n" - + host_test_fail_message - + separator - + result_details + "\n" - + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" - ); - return false; -} - boolean ShowBrowsingFirewallPopup() { if( Printerlib::FirewallSeemsToBeActive() ) { Popup::MessageDetails( // Popup::MessageDetails message: @@ -453,9 +292,9 @@ // for a client-only config but the workstation is currently not connected to the network // where the client-only server is (e.g. in the department for which the workstation is set up). // Therefore the admin can force YaST to proceed here. - // Do not show additional error messages here because TestClientOnlyServer() + // Do not show additional error messages here because Printer::TestClientOnlyServer() // shows sufficient popups to the user: - if( ! TestClientOnlyServer( current_client_conf_value ) ) + if( ! Printer::TestClientOnlyServer( current_client_conf_value, true ) ) { if( ! Popup::ContinueCancelHeadline( sformat( // Header of a Popup::ContinueCancelHeadline // when a client-only server is not accessible // where %1 will be replaced by the server name: @@ -1086,7 +925,7 @@ if( `test_client_conf_server == event["ID"]:nil ) { string current_client_conf_input_value = (string)UI::QueryWidget( `id(`client_conf_input), `Value ); // Ignore what TestClientOnlyServer() returns, it shows sufficient popups to the user: - TestClientOnlyServer( deletechars( tolower( current_client_conf_input_value ), " " ) ); + Printer::TestClientOnlyServer( deletechars( tolower( current_client_conf_input_value ), " " ), true ); } } return nil; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 NetworkManager-gnome for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package NetworkManager-gnome for openSUSE:Factory checked in at Sun Apr 25 18:43:27 CEST 2010. -------- --- GNOME/NetworkManager-gnome/NetworkManager-gnome.changes 2010-02-23 15:53:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager-gnome/NetworkManager-gnome.changes 2010-04-18 03:40:32.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 18 01:40:10 UTC 2010 - crrodriguez(a)opensuse.org + +- Requires timezone package + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-gnome.spec ++++++ --- /var/tmp/diff_new_pack.VHQhAG/_old 2010-04-25 18:43:14.000000000 +0200 +++ /var/tmp/diff_new_pack.VHQhAG/_new 2010-04-25 18:43:14.000000000 +0200 @@ -20,7 +20,7 @@ Name: NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.8 -Release: 1 +Release: 2 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel @@ -46,7 +46,7 @@ # PATCH-FIX-OPENSUSE NetworkManager-gnome-OnlyShowIn.patch -- Add OnlyShowIn key to autostart file Patch1: NetworkManager-gnome-OnlyShowIn.patch Provides: NetworkManager-client -Requires: NetworkManager >= 0.7.998 +Requires: NetworkManager >= 0.7.998 timezone %gconf_schemas_prereq %description ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mkinitrd for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Sun Apr 25 18:43:23 CEST 2010. -------- --- mkinitrd/mkinitrd.changes 2010-03-26 15:43:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-04-23 16:38:23.000000000 +0200 @@ -1,0 +2,49 @@ +Wed Apr 21 10:38:18 CEST 2010 - thomas(a)novell.com + +- boot-boot.sh: Load selinux only if selinux=1 and enforcing=[0|1] + is given on the command line (bnc#598075) + +------------------------------------------------------------------- +Fri Apr 16 13:20:21 UTC 2010 - mmarek(a)novell.com + +- boot-start: Support double-quoted strings in /proc/cmdline + (bnc#551967). + +------------------------------------------------------------------- +Fri Apr 16 12:07:20 UTC 2010 - mmarek(a)novell.com + +- Clean up load_modules(). + +------------------------------------------------------------------- +Fri Apr 16 11:30:39 UTC 2010 - mmarek(a)novell.com + +- Load KMS modules after udev has started (bnc#596268). + +------------------------------------------------------------------- +Tue Apr 13 14:19:45 CEST 2010 - mmarek(a)suse.cz + +- setup-prepare: Fix feature check (bnc#596086). + +------------------------------------------------------------------- +Tue Apr 13 13:16:28 CEST 2010 - mmarek(a)suse.cz + +- setup-ibft: Include the NIC driver (bnc#596076). + +------------------------------------------------------------------- +Tue Apr 13 08:56:06 CEST 2010 - hare(a)suse.de + +- Only set nettype to 'dhcp' if a valid DHCP address was found + (bnc#576601) + +------------------------------------------------------------------- +Fri Apr 9 15:50:40 CEST 2010 - mmarek(a)suse.cz + +- Do not call update-bootloader if not available (bnc#595071). + +------------------------------------------------------------------- +Wed Apr 7 14:18:30 CEST 2010 - thomas(a)novell.com + +- added call to load_policy to load the SELinux policy during + the boot process (bnc#594041). + +------------------------------------------------------------------- @@ -22,0 +72,5 @@ + +------------------------------------------------------------------- +Mon Mar 15 13:59:11 CET 2010 - mmarek(a)suse.cz + +- scripts/boot-start.sh: avoid using eval statements (bnc#525668). calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.mU8zae/_old 2010-04-25 18:43:07.000000000 +0200 +++ /var/tmp/diff_new_pack.mU8zae/_new 2010-04-25 18:43:07.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.5.10 -Release: 15 +Release: 16 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc new/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc --- old/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc 2010-04-23 16:36:14.000000000 +0200 @@ -10,30 +10,6 @@ } ################################################## -# mod_opt $kernelmodule -# get module parameter from kernel command line -################################################## -mod_opt() -{ - local module=$1 - local name=${module%%.ko} - local param - - test -e /proc/cmdline || return 1 - - name=$(eval echo $name | sed "s/[-_]/\*/g") - for i in `cat /proc/cmdline` - do - case $i in - ${name}.*=*) - param="${param}${param:+ }${i##${name}.}" - ;; - esac - done - echo $param -} - -################################################## # load_modules # loads all kernelmodules that belong to the # current init module @@ -42,19 +18,10 @@ # e.g. load_modules ################################################## load_modules() { - local option - local i - for file in $(eval echo $modules) + local module + for module in $(eval echo $modules) do - options=$(mod_opt $file) - if [ "n" != "n$options" ] - then - for i in $options - do - add_module_param ${file%%.ko} $i - done - fi - modprobe $file + modprobe $module done modules="" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.changes new/mkinitrd-2.5.10/mkinitrd.changes --- old/mkinitrd-2.5.10/mkinitrd.changes 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-04-23 16:36:14.000000000 +0200 @@ -1,4 +1,53 @@ ------------------------------------------------------------------- +Wed Apr 21 10:38:18 CEST 2010 - thomas(a)novell.com + +- boot-boot.sh: Load selinux only if selinux=1 and enforcing=[0|1] + is given on the command line (bnc#598075) + +------------------------------------------------------------------- +Fri Apr 16 13:20:21 UTC 2010 - mmarek(a)novell.com + +- boot-start: Support double-quoted strings in /proc/cmdline + (bnc#551967). + +------------------------------------------------------------------- +Fri Apr 16 12:07:20 UTC 2010 - mmarek(a)novell.com + +- Clean up load_modules(). + +------------------------------------------------------------------- +Fri Apr 16 11:30:39 UTC 2010 - mmarek(a)novell.com + +- Load KMS modules after udev has started (bnc#596268). + +------------------------------------------------------------------- +Tue Apr 13 14:19:45 CEST 2010 - mmarek(a)suse.cz + +- setup-prepare: Fix feature check (bnc#596086). + +------------------------------------------------------------------- +Tue Apr 13 13:16:28 CEST 2010 - mmarek(a)suse.cz + +- setup-ibft: Include the NIC driver (bnc#596076). + +------------------------------------------------------------------- +Tue Apr 13 08:56:06 CEST 2010 - hare(a)suse.de + +- Only set nettype to 'dhcp' if a valid DHCP address was found + (bnc#576601) + +------------------------------------------------------------------- +Fri Apr 9 15:50:40 CEST 2010 - mmarek(a)suse.cz + +- Do not call update-bootloader if not available (bnc#595071). + +------------------------------------------------------------------- +Wed Apr 7 14:18:30 CEST 2010 - thomas(a)novell.com + +- added call to load_policy to load the SELinux policy during + the boot process (bnc#594041). + +------------------------------------------------------------------- Fri Mar 26 15:25:22 CET 2010 - mmarek(a)suse.cz - setup-storage: Do not assume that anything that contains a colon @@ -22,6 +71,11 @@ - setup-sharedlibs.sh: Do not run ldd on scripts (bnc#588609). ------------------------------------------------------------------- +Mon Mar 15 13:59:11 CET 2010 - mmarek(a)suse.cz + +- scripts/boot-start.sh: avoid using eval statements (bnc#525668). + +------------------------------------------------------------------- Fri Mar 12 12:07:11 CET 2010 - coolo(a)suse.de - support upstart in providing a file with the initrd exports. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.spec new/mkinitrd-2.5.10/mkinitrd.spec --- old/mkinitrd-2.5.10/mkinitrd.spec 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.spec 2010-04-23 16:36:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd (Version 2.5.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: mkinitrd -License: GPL v2 or later +License: GPLv2+ Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc libxslt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/sbin/mkinitrd new/mkinitrd-2.5.10/sbin/mkinitrd --- old/mkinitrd-2.5.10/sbin/mkinitrd 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/sbin/mkinitrd 2010-04-23 16:36:14.000000000 +0200 @@ -3,7 +3,7 @@ # mkinitrd - create the initramfs images # usage: see below usage() or call with -h # -# Copyright (C) 1999-2006 SuSE Linux Products GmbH, Nuernberg, Germany +# Copyright (C) 1999-2010 SuSE Linux Products GmbH, Nuernberg, Germany # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -539,7 +539,7 @@ cleanup_finish if [ ! -x /sbin/update-bootloader ] ; then - no_bootloader_update= + no_bootloader_update=1 fi if [ "$exit_code" -eq 0 ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-boot.sh new/mkinitrd-2.5.10/scripts/boot-boot.sh --- old/mkinitrd-2.5.10/scripts/boot-boot.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/boot-boot.sh 2010-04-23 16:36:14.000000000 +0200 @@ -14,9 +14,76 @@ ## ----------------------- ## + +# based on rd_load_policy() from fedora 12 dracut package +selinux_load_policy() +{ + local NEWROOT=$1 + local CR="${NEWROOT}/usr/bin/chroot" + + local SELINUX="enforcing" + [ -e "$NEWROOT/etc/selinux/config" ] && . "$NEWROOT/etc/selinux/config" + + # If SELinux is disabled exit now + if [ -z $cmd_selinux ]; then + return 0 + fi + if [ -z $cmd_enforcing ]; then + return 0 + fi + if [ $cmd_selinux == 0 ]; then + return 0 + fi + + # Check whether SELinux is in permissive mode + local permissive=0 + if [ $cmd_enforcing == 0 ]; then + permissive=1 + fi + + # Attempt to load SELinux Policy + if [ -x "$NEWROOT/usr/sbin/load_policy" -o -x "$NEWROOT/sbin/load_policy" ]; then + local ret=0 + echo "Loading SELinux policy" + # load_policy does mount /proc and /selinux in + # libselinux,selinux_init_load_policy() + if [ -x "$NEWROOT/sbin/load_policy" ]; then + $CR "$NEWROOT" /sbin/load_policy -i + ret=$? + else + $CR "$NEWROOT" /usr/sbin/load_policy -i + ret=$? + fi + + if [ $ret -eq 0 -o $ret -eq 2 ]; then + return 0 + fi + + echo "Initial SELinux policy load failed." + if [ $ret -eq 3 -o $permissive -eq 0 ]; then + echo "Machine in enforcing mode." + echo "Not continuing" + sleep 100d # XXX well... + exit 1 + fi + return 0 + elif [ $permissive -eq 0 ]; then + echo "Machine in enforcing mode and cannot execute load_policy." + echo "To disable selinux, add selinux=0 to the kernel command line." + echo "Not continuing" + sleep 100d + exit 1 + fi +} + + # Move device nodes /bin/mount --move /dev /root/dev /bin/mount -t proc proc /root/proc + +# SELinux load policy +selinux_load_policy "/root" + # ready to leave cd /root umount -l /proc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-ibft.sh new/mkinitrd-2.5.10/scripts/boot-ibft.sh --- old/mkinitrd-2.5.10/scripts/boot-ibft.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/boot-ibft.sh 2010-04-23 16:36:14.000000000 +0200 @@ -39,6 +39,8 @@ if [ -d $ibft_nic ]; then if [ -s $ibft_nic/dhcp ]; then nettype='dhcp' + read ibft_dhcp < $ibft_nic/dhcp + [ "$ibft_dhcp" = "0.0.0.0" ] && nettype='static' else nettype='static' fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-kms.sh new/mkinitrd-2.5.10/scripts/boot-kms.sh --- old/mkinitrd-2.5.10/scripts/boot-kms.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/boot-kms.sh 2010-04-23 16:36:14.000000000 +0200 @@ -2,7 +2,7 @@ # #%stage: boot # -#%depends: start +#%depends: start udev # #%modules: $kms_modules # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-start.sh new/mkinitrd-2.5.10/scripts/boot-start.sh --- old/mkinitrd-2.5.10/scripts/boot-start.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/boot-start.sh 2010-04-23 16:36:14.000000000 +0200 @@ -63,20 +63,65 @@ [ "$debug" ] && set -a # kernel commandline parsing -for o in $(cat /proc/cmdline); do - key="${o%%=*}" +cmdline=$(cat /proc/cmdline) +pos=0 + +# stores next character from /proc/cmdline in $c +next_char() { + c=${cmdline:pos++:1} + test -n "$c" +} + +# stores next var[=value] string from /proc/cmdline in $var +# supports double quotes to some extent +next_var() { + local c quoted=false + + var= + # eat leading whitespace + next_char || return + while test "$c" = ' ' -o "$c" = $'\t'; do + next_char || return + done + while true; do + case "$c" in + ' ' | $'\t') + if $quoted; then + var="$var$c" + else + break + fi + ;; + '"') + if $quoted; then + quoted=false + else + quoted=true + fi + ;; + *) + var="$var$c" + ;; + esac + next_char || break + done +} + +while next_var; do + key="${var%%=*}" key="${key//-/_}" if [ "${key%.*}" != "${key}" ]; then : # module parameter, ignored else # environment variable # set local variables too, in case somehow the kernel does not do this correctly - value="${o#*=}" + value="${var#*=}" value=${value:=1} - eval cmd_$key="${value}" - eval $key="${value}" 2> /dev/null + read cmd_$key < <(echo "$value") + read $key < <(echo "$value") fi done +unset next_char next_var c pos cmdline var if ! $have_devtmpfs; then tty_driver= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-ibft.sh new/mkinitrd-2.5.10/scripts/setup-ibft.sh --- old/mkinitrd-2.5.10/scripts/setup-ibft.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-ibft.sh 2010-04-23 16:36:14.000000000 +0200 @@ -7,8 +7,11 @@ local if=$(cd $ibft_nic/device/net; ls -d eth* 2>/dev/null) [ "$if" ] && { interface=$if + drvlink=$(get_network_module $interface) if [ ! "$nettype" -a -e $ibft_nic/dhcp ]; then nettype=dhcp + read ibft_dhcp < $ibft_nic/dhcp + [ "$ibft_dhcp" = "0.0.0.0" ] && nettype=static else nettype=static fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-prepare.sh new/mkinitrd-2.5.10/scripts/setup-prepare.sh --- old/mkinitrd-2.5.10/scripts/setup-prepare.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-prepare.sh 2010-04-23 16:36:14.000000000 +0200 @@ -44,12 +44,10 @@ # check if we should use script or feature $1 use_script() { - local condition feature script file check - - check="$2" + local condition feature script file # always use when creating monster initrd - [ -z "$check" -a "$create_monster_initrd" ] && return 0 + [ "$create_monster_initrd" ] && return 0 # Normalize to feature name feature="${1##*/}" @@ -58,7 +56,7 @@ # when using additional features defined in the sysconfig # script / command line, always use them - if [ -z "$check" -a "$ADDITIONAL_FEATURES" ]; then + if [ "$ADDITIONAL_FEATURES" ]; then for addfeature in $ADDITIONAL_FEATURES; do if [ "$addfeature" = "$feature" ]; then return 0 @@ -88,6 +86,16 @@ return 0 } +# returns true if feature exists +feature_exists() { + local feature=$1 script + + for script in $INITRD_PATH/boot/*-$feature.sh; do + return 0 + done + return 1 +} + create_monster_initrd=$param_A local kernel_version @@ -133,7 +141,7 @@ # check features for feature in $ADDITIONAL_FEATURES ; do - use_script "$feature" "check" || echo "[WARNING] Feature \"$feature\" not found. A typo?" + feature_exists "$feature" || echo "[WARNING] Feature \"$feature\" not found. A typo?" done # create an empty initrd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-udev.sh new/mkinitrd-2.5.10/scripts/setup-udev.sh --- old/mkinitrd-2.5.10/scripts/setup-udev.sh 2010-03-26 15:30:24.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-udev.sh 2010-04-23 16:36:14.000000000 +0200 @@ -20,6 +20,7 @@ 62-dm_linear.rules \ 64-device-mapper.rules \ 64-md-raid.rules \ + 79-kms.rules \ 80-drivers.rules; do if [ -f /lib/udev/rules.d/$rule ]; then cp /lib/udev/rules.d/$rule $tmp_mnt/lib/udev/rules.d ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 PackageKit for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at Sun Apr 25 18:42:51 CEST 2010. -------- --- PackageKit/PackageKit.changes 2010-04-10 02:11:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/PackageKit/PackageKit.changes 2010-04-21 11:31:36.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 21 11:31:15 CEST 2010 - meissner(a)suse.de + +- added obsoletes/provides for the renamed package to allow + zypp to migrate it correctly on update. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.cnl3Ht/_old 2010-04-25 18:42:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cnl3Ht/_new 2010-04-25 18:42:38.000000000 +0200 @@ -31,7 +31,7 @@ Name: PackageKit Version: 0.6.3 -Release: 2 +Release: 3 License: GPLv2+ BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel @@ -154,6 +154,8 @@ License: GPLv2+ Summary: Simple software installation management software Group: System/Daemons +Provides: libpackagekit-glib12 = %{version} +Obsoletes: libpackagekit-glib12 < %{version} Requires: %{name} = %{version} %description -n libpackagekit-glib2-14 @@ -169,6 +171,8 @@ Group: System/Daemons Requires: %{name} = %{version} Requires: libpackagekit-glib2-14 = %{version} +Provides: libpackagekit-glib12-devel = %{version} +Obsoletes: libpackagekit-glib12-devel < %{version} Requires: glib2-devel NetworkManager-devel sqlite3-devel %description -n libpackagekit-glib2-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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