February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit ncpfs for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package ncpfs for openSUSE:Factory checked in at Thu Feb 4 11:27:30 CET 2010. -------- --- ncpfs/ncpfs.changes 2009-12-02 21:32:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/ncpfs/ncpfs.changes 2010-02-01 13:05:40.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 12:05:36 UTC 2010 - jengelh(a)medozas.de + +- Package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncpfs.spec ++++++ --- /var/tmp/diff_new_pack.yBsWjD/_old 2010-02-04 11:27:18.000000000 +0100 +++ /var/tmp/diff_new_pack.yBsWjD/_new 2010-02-04 11:27:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ncpfs (Version 2.2.6) # -# 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 @@ -24,12 +24,13 @@ Group: Productivity/Networking/Novell AutoReqProv: on Version: 2.2.6 -Release: 158 +Release: 159 PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tools for Accessing Novell File Systems Source: ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-%{version}.tar.bz2 Source1: ncpfs.hu.po.bz2 +Source2: baselibs.conf Source10: ncpfs-ipxmount Source11: ncpfs-ipxmount.sysconfig Source12: ncpfs-example.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 uim for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package uim for openSUSE:Factory checked in at Thu Feb 4 11:27:00 CET 2010. -------- --- uim/uim.changes 2009-09-16 00:56:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/uim/uim.changes 2010-02-01 13:36:08.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 12:36:04 UTC 2010 - jengelh(a)medozas.de + +- package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uim.spec ++++++ --- /var/tmp/diff_new_pack.i0xhiW/_old 2010-02-04 11:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.i0xhiW/_new 2010-02-04 11:26:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package uim (Version 1.5.6) # -# 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 @@ -30,13 +30,13 @@ BuildRequires: fdupes %endif # xorg-x11-libXdmcp-devel libgnomeprintui-devel -License: GPL v2 or later +License: GPLv2+ Group: System/I18n/Japanese AutoReqProv: on PreReq: %{_bindir}/touch Provides: locale(xorg-x11:ja) Version: 1.5.6 -Release: 2 +Release: 3 Url: http://uim.freedesktop.org/wiki/ # svn co http://freedesktop.org:8080/svn/uim/trunk # Source0: http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2 @@ -47,6 +47,7 @@ Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim +Source4: baselibs.conf Patch1: qt-build.patch Patch10: uim-sigscheme-build-fixes.diff Patch11: uim-gnome-build-fixes.diff @@ -69,7 +70,7 @@ NOKUBI Takatsugu <knok(a)daionet.gr.jp> %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: System/I18n/Japanese Requires: %{name} = %{version} glibc-devel @@ -88,7 +89,7 @@ NOKUBI Takatsugu <knok(a)daionet.gr.jp> %package gtk2 -License: GPL v2 or later +License: GPLv2+ Summary: Control applet using gnome2 Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -110,7 +111,7 @@ NOKUBI Takatsugu <knok(a)daionet.gr.jp> %package qt -License: GPL v2 or later +License: GPLv2+ Summary: Qt3 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -127,7 +128,7 @@ Yamaken <yamaken(a)bp.iij4u.or.jp> %package qt4 -License: GPL v2 or later +License: GPLv2+ Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ulimit for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package ulimit for openSUSE:Factory checked in at Thu Feb 4 11:26:06 CET 2010. -------- --- ulimit/ulimit.changes 2009-06-08 13:26:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/ulimit/ulimit.changes 2010-02-02 15:46:29.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 2 15:45:23 CET 2010 - kukuk(a)suse.de + +- Don't set limits before running /etc/init.d/boot [bnc#573838] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dont_run_before_boot.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulimit.spec ++++++ --- /var/tmp/diff_new_pack.HUKBdb/_old 2010-02-04 11:24:55.000000000 +0100 +++ /var/tmp/diff_new_pack.HUKBdb/_new 2010-02-04 11:24:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ulimit (Version 1.2) # -# 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,17 @@ Name: ulimit -License: Artistic License +License: Artistic Group: System/Base AutoReqProv: on Summary: Set system-wide per-process limits (rlimits) Version: 1.2 -Release: 2 +Release: 3 Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Patch: bug-495258_ulimit_cmo_fix.patch +Patch1: dont_run_before_boot.diff PreReq: %fillup_prereq %description @@ -62,6 +63,7 @@ %prep %setup -n ulimit %patch -p1 +%patch1 -p0 %build # nothing to be done ++++++ dont_run_before_boot.diff ++++++ --- initscript 2009-10-24 04:58:52.000000000 +0200 +++ initscript 2010-02-02 15:07:32.000000000 +0100 @@ -73,7 +69,7 @@ esac } -if test -r /etc/sysconfig/ulimit; then +if [ "$1" != "si" -a -r /etc/sysconfig/ulimit ]; then . /etc/sysconfig/ulimit # Max CPU time (not recommended) calc_limit "Ht" "$HARDCPULIMIT" && HARGS="$RC" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-isns for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package yast2-isns for openSUSE:Factory checked in at Thu Feb 4 09:14:28 CET 2010. -------- --- yast2-isns/yast2-isns.changes 2007-09-18 21:24:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-isns/yast2-isns.changes 2010-02-02 09:49:09.000000000 +0100 @@ -2 +2 @@ -Tue Sep 18 13:23:48 MDT 2007 - wrwhitehead(a)novell.com +Tue Feb 2 09:44:13 CET 2010 - mzugec(a)suse.cz @@ -3,0 +4,40 @@ +- marked string for translation (bnc#446571) +- 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) + +------------------------------------------------------------------- +Thu Nov 5 11:37:05 CET 2009 - mzugec(a)suse.cz + +- fixed agent registration path (bnc#552573) +- 2.18.3 + +------------------------------------------------------------------- +Tue Jul 7 13:45:43 CEST 2009 - mzugec(a)suse.cz + +- missing html tag (bnc#434301) + +------------------------------------------------------------------- +Fri Jul 3 15:14:10 CEST 2009 - mzugec(a)suse.de + +- button ordering (bnc#440543) +- 2.18.2 + +------------------------------------------------------------------- +Fri Jul 3 13:38:15 CEST 2009 - mzugec(a)suse.de + +- fixed typo in help text (bnc#439179) +- 2.18.1 + +------------------------------------------------------------------- +Thu Jul 2 15:42:01 CEST 2009 - mzugec(a)suse.cz + +- submitted into yast svn, fixed some build issues + +------------------------------------------------------------------- +Tue Sep 18 12:00:00 CEST 2007 - wrwhitehead(a)novell.com @@ -8,2 +48 @@ -Tue Sep 4 14:18:46 MDT 2007 - wrwhitehead(a)novell.com - +Tue Sep 04 12:00:00 CEST 2007 - wrwhitehead(a)novell.com @@ -13,2 +52 @@ -Wed Aug 29 12:17:33 MDT 2007 - wrwhitehead(a)novell.com - +Wed Aug 29 12:00:00 CEST 2007 - wrwhitehead(a)novell.com @@ -18,2 +56 @@ -Fri Apr 13 10:05:05 MDT 2007 - wrwhitehead(a)novell.com - +Fri Apr 13 12:00:00 CEST 2007 - wrwhitehead(a)novell.com @@ -23,2 +60 @@ -Thu Feb 15 15:45:19 CET 2007 - WRWhitehead(a)novell.com - +Thu Feb 15 12:00:00 CEST 2007 - WRWhitehead(a)novell.com @@ -25,0 +62,3 @@ + + + calling whatdependson for head-i586 Old: ---- yast2-isns-1.0.4.tar.bz2 New: ---- yast2-isns-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-isns.spec ++++++ --- /var/tmp/diff_new_pack.EOfhdg/_old 2010-02-04 09:12:34.000000000 +0100 +++ /var/tmp/diff_new_pack.EOfhdg/_new 2010-02-04 09:12:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-isns (Version 1.0.4) +# spec file for package yast2-isns (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,37 +19,23 @@ Name: yast2-isns -Version: 1.0.4 -Release: 167 -License: GPL v2 or later +Version: 2.19.0 +Release: 1 +License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-isns-1.0.4.tar.bz2 +Source0: yast2-isns-2.19.0.tar.bz2 Prefix: /usr -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildArch: noarch -Summary: YaST2 - Configuration of Internet Storage Naming Service (isns) +Summary: Configuration of isns %description -This package provides the YaST2 configuration for Internet Storage -Naming Service (iSNS). - -The iSNS provides registration functions that allow all entities in a -storage network to register and query the iSNS database. Both iSCSI -initiators and targets register with this service. Discovery Domains -are used in the iSNS service to place register nodes into manageable -groupings. This package provide the ability to administer these -Discovery Domains. - - - -Authors: --------- - Robert Whitehead +- %prep -%setup -n yast2-isns-1.0.4 +%setup -n yast2-isns-2.19.0 %build %{prefix}/bin/y2tool y2autoconf @@ -59,7 +45,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" @@ -78,10 +66,9 @@ /usr/share/YaST2/include/isns/* /usr/share/YaST2/clients/isns.ycp /usr/share/YaST2/clients/isns_*.ycp -/usr/share/YaST2/clients/inst_isns.ycp -/usr/share/YaST2/modules/IsnsServer.* +/usr/share/YaST2/modules/*.ycp +/usr/share/YaST2/modules/*.ybc %{prefix}/share/applications/YaST2/isns.desktop -/usr/share/YaST2/scrconf/isnsd.scr +/usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-isns - %changelog ++++++ yast2-isns-1.0.4.tar.bz2 -> yast2-isns-2.19.0.tar.bz2 ++++++ ++++ 7560 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-isns-1.0.4/agents/isnsd.scr new/yast2-isns-2.19.0/agents/isnsd.scr --- old/yast2-isns-1.0.4/agents/isnsd.scr 2007-02-07 20:57:43.000000000 +0100 +++ new/yast2-isns-2.19.0/agents/isnsd.scr 2009-11-05 11:36:39.000000000 +0100 @@ -2,14 +2,14 @@ * Read(.ietd.Compression) * (["yes"]) * - * Write(.ietd.Compression, "no") + * Write(.isns.Compression, "no") * (true) * * Fore more information about possible keys and values * consult with the slp_config man pages `man slp_config`. */ -.etc.iscsid +.etc.isns `ag_ini( `IniAgent( "/etc/isns/isns.conf", 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-isns-1.0.4/autodocs-ycp.ami new/yast2-isns-2.19.0/autodocs-ycp.ami --- old/yast2-isns-1.0.4/autodocs-ycp.ami 2007-02-06 10:49:23.000000000 +0100 +++ new/yast2-isns-2.19.0/autodocs-ycp.ami 2009-07-07 13:44:53.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # 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 +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +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. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + 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; \ + 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-isns-1.0.4/configure.in new/yast2-isns-2.19.0/configure.in --- old/yast2-isns-1.0.4/configure.in 2007-02-07 21:03:39.000000000 +0100 +++ new/yast2-isns-2.19.0/configure.in 2009-07-07 13:44:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-isns dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-isns, 1.0.0, http://bugs.opensuse.org/, yast2-isns) +AC_INIT(yast2-isns, 2.18.2, http://bugs.opensuse.org/, yast2-isns) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,12 +14,13 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="1.0.0" +VERSION="2.18.2" RPMNAME="yast2-isns" -MAINTAINER="Robert Whitehead <wrwhitehead(a)novell.com>" +MAINTAINER="Michal Zugec <mzugec(a)novell.com>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig @@ -107,7 +108,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` 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-isns-1.0.4/COPYRIGHT.english new/yast2-isns-2.19.0/COPYRIGHT.english --- old/yast2-isns-1.0.4/COPYRIGHT.english 2007-02-06 10:52:57.000000000 +0100 +++ new/yast2-isns-2.19.0/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. 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-isns-1.0.4/MAINTAINER new/yast2-isns-2.19.0/MAINTAINER --- old/yast2-isns-1.0.4/MAINTAINER 2007-02-07 21:04:36.000000000 +0100 +++ new/yast2-isns-2.19.0/MAINTAINER 2009-06-26 15:57:05.000000000 +0200 @@ -1 +1 @@ -Robert Whitehead <wrwhitehead(a)novell.com> +Michal Zugec <mzugec(a)novell.com> 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-isns-1.0.4/Makefile.am new/yast2-isns-2.19.0/Makefile.am --- old/yast2-isns-1.0.4/Makefile.am 2007-02-06 10:49:24.000000000 +0100 +++ new/yast2-isns-2.19.0/Makefile.am 2009-07-07 13:44:53.000000000 +0200 @@ -23,18 +23,19 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 -# where devtools instal m4 snippets +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +# 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 $< $@ @@ -210,8 +211,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am SUBDIRS = agents doc src testsuite 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-isns-1.0.4/missing new/yast2-isns-2.19.0/missing --- old/yast2-isns-1.0.4/missing 2007-02-06 10:49:28.000000000 +0100 +++ new/yast2-isns-2.19.0/missing 2009-07-07 13:45:06.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # 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). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 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-isns-1.0.4/README new/yast2-isns-2.19.0/README --- old/yast2-isns-1.0.4/README 2007-02-06 10:52:57.000000000 +0100 +++ new/yast2-isns-2.19.0/README 2010-02-02 09:48:47.000000000 +0100 @@ -1,2 +1,3 @@ -This program/library is part of YaST2 -See the file COPYRIGHT.english for license terms +http://lists.opensuse.org/yast-devel/2009-07/msg00019.html says: + +Its an iSCSI discovery module thingie. 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-isns-1.0.4/src/dialogs.ycp new/yast2-isns-2.19.0/src/dialogs.ycp --- old/yast2-isns-1.0.4/src/dialogs.ycp 2007-09-04 22:09:04.000000000 +0200 +++ new/yast2-isns-2.19.0/src/dialogs.ycp 2009-07-07 09:52:23.000000000 +0200 @@ -138,7 +138,7 @@ "custom_widget" : `VBox( `HBox( - `TextEntry(`id(`isnsaddress),_("Address of iSNS Server")) + `InputField(`id(`isnsaddress), `opt(`hstretch), _("Address of iSNS Server")) ) ), "init" : initAddress, @@ -292,8 +292,12 @@ string help = CWM::MergeHelps(w); contents = CWM::PrepareDialog(contents, w); - Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ()); + Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::OKButton ()); + Wizard::SetNextButton(`next, Label::OKButton()); + Wizard::SetAbortButton(`abort, Label::CancelButton()); Wizard::HideBackButton(); +// Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ()); +// Wizard::HideBackButton(); symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]); return ret; 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-isns-1.0.4/src/helps.ycp new/yast2-isns-2.19.0/src/helps.ycp --- old/yast2-isns-1.0.4/src/helps.ycp 2007-09-05 01:23:26.000000000 +0200 +++ new/yast2-isns-2.19.0/src/helps.ycp 2009-07-07 13:44:34.000000000 +0200 @@ -54,11 +54,11 @@ "A list of all discovery domains are displayed. For discovery domains, it is possible to Create a discovery domain and Delete them. Deleting a domain removes the members from the domain but does not delete the iSCSI node members "), "dd_display_members" :_( -"A list of all iSCSI nodes are displayed by discovery domain. Selecting another discovery domain refreshes the list with members from that discovery domain. It is possible to Add an iSCSI node to a discovery domain or Delete thenode. Deleting a node removes it from the domain but does not delete the iSCSI node Creating a iSCSI node allows a not yet registered node to be added as a member of the discovery domain. When the initiator or target registers this node then it becomes part of this domain When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains. "), +"A list of all iSCSI nodes are displayed by discovery domain. Selecting another discovery domain refreshes the list with members from that discovery domain. It is possible to Add an iSCSI node to a discovery domain or Delete thenode. Deleting a node removes it from the domain but does not delete the iSCSI node Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain. When the initiator or target registers this node then it becomes part of this domain When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains. "), // dds table dialog "dds_display" :_( -"At the top a list of all Discovery Domain Sets are displayed. Discovery Domains belong to Discovery Domain Sets. A Discovery Domain must be a member of a Discovery Domain Set in order to be active. In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members." ), +"At the top a list of all Discovery Domain Sets are displayed. Discovery Domains belong to Discovery Domain Sets. A Discovery Domain must be a member of a Discovery Domain Set in order to be active. In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members." ), "dds_display_members" :_( "The Discovery Domain Set Members list is refreshed whenever a different Discovery Domain Set is selected." ), 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-isns-1.0.4/src/inst_isns.ycp new/yast2-isns-2.19.0/src/inst_isns.ycp --- old/yast2-isns-1.0.4/src/inst_isns.ycp 2007-02-07 21:16:38.000000000 +0100 +++ new/yast2-isns-2.19.0/src/inst_isns.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -/** - * File: clients/isns.ycp - * Package: Configuration of isns - * Summary: Main file - * Authors: Michal Zugec <mzugec(a)suse.cz> - * - * $Id: inst_iscsi-client.ycp 35883 2007-02-06 09:51:05Z mzugec $ - * - * Main file for iscsi-client configuration. Uses all other files. - */ - -{ - -/*** - * <h3>Configuration of isns</h3> - */ - -textdomain "isns"; - -/* The main () */ -y2milestone ("----------------------------------------"); -y2milestone ("IsnsServer module started"); - -import "Progress"; -import "Report"; -import "Summary"; -import "ModuleLoading"; -import "Packages"; -import "Installation"; -include "isns/wizards.ycp"; - -/* main ui function */ -any ret = nil; - -y2milestone("start isns"); -// check initiator name, create if not exists -WFM::Execute (.local.bash,"test -d /etc/isns/ && /bin/cp -a /etc/isns/* " + Installation::destdir + "/etc/isns/"); -//IsnsServer::checkInitiatorName(); - -/ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); -// start daemon before -SCR::Execute(.background.run_output_err, "isnsd"); -// run dialog -ret = MainSequence(); -y2debug("MainSequence ret=%1", ret); -// add package isns to installed system -Packages::addAdditionalPackage("isns"); - -/* Finish */ -y2milestone("IsnsServer module finished"); -y2milestone("----------------------------------------"); - -return ret; - -/* EOF */ -} 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-isns-1.0.4/src/isns_auto.ycp new/yast2-isns-2.19.0/src/isns_auto.ycp --- old/yast2-isns-1.0.4/src/isns_auto.ycp 2007-02-07 21:27:22.000000000 +0100 +++ new/yast2-isns-2.19.0/src/isns_auto.ycp 2009-07-02 14:29:02.000000000 +0200 @@ -43,26 +43,36 @@ y2debug("param=%1", param); /* Create a summary*/ +/* if(func == "Summary") { ret = select(IsnsServer::Summary(), 0, ""); } +*/ /* Reset configuration */ -else if (func == "Reset") { - IsnsServerscsiClient::Import($[]); +//else +/* +if (func == "Reset") { + IsnsServer::Import($[]); ret = $[]; } +*/ /* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = IscsiClientAutoSequence(); +//else +if (func == "Change") { + ret = IsnsServerAutoSequence(); } /* Import configuration */ +/* else if (func == "Import") { ret = IsnsServer::Import(param); } +*/ /* Return actual state */ +/* else if (func == "Export") { ret = IsnsServer::Export(); } +*/ /* Return needed packages */ else if (func == "Packages") { ret = IsnsServer::AutoPackages(); 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-isns-1.0.4/src/isns.desktop new/yast2-isns-2.19.0/src/isns.desktop --- old/yast2-isns-1.0.4/src/isns.desktop 2007-08-29 20:56:15.000000000 +0200 +++ new/yast2-isns-2.19.0/src/isns.desktop 2010-02-02 09:25:24.000000000 +0100 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-DocTeamID=ycc_isns Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; @@ -18,8 +17,7 @@ X-SuSE-YaST-AutoInstResource=isns Icon=yast-iscsi-server -Exec=/sbin/yast2 isns +Exec=xdg-su -c "/sbin/yast2 isns" Name=iSNS Server GenericName=Configure an iSNS server -X-KDE-SubstituteUID=true 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-isns-1.0.4/src/isns_proposal.ycp new/yast2-isns-2.19.0/src/isns_proposal.ycp --- old/yast2-isns-1.0.4/src/isns_proposal.ycp 2007-02-07 21:22:32.000000000 +0100 +++ new/yast2-isns-2.19.0/src/isns_proposal.ycp 2009-07-02 14:30:17.000000000 +0200 @@ -38,6 +38,7 @@ IsnsServer::Read(); Progress::set (progress_orig); } +/* list sum = IsnsServer::Summary(); proposal = sum[0]:""; @@ -46,8 +47,10 @@ "warning_level" : warning_level, "warning" : warning, ]; +*/ } /* run the module */ +/* else if(func == "AskUser") { map stored = IsnsServer::Export(); symbol seq = (symbol) WFM::CallFunction("isns", [.propose]); @@ -58,6 +61,7 @@ "workflow_sequence" : seq ]; } +*/ /* create titles */ else if(func == "Description") { ret = $[ 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-isns-1.0.4/src/Makefile.am new/yast2-isns-2.19.0/src/Makefile.am --- old/yast2-isns-1.0.4/src/Makefile.am 2007-02-07 21:24:42.000000000 +0100 +++ new/yast2-isns-2.19.0/src/Makefile.am 2009-07-07 09:52:23.000000000 +0200 @@ -6,21 +6,25 @@ isns.ycp \ isns_auto.ycp \ isns_proposal.ycp \ - isns_finish.ycp \ - inst_isns.ycp + isns_finish.ycp ynclude_DATA = \ helps.ycp \ wizards.ycp \ + widgets.ycp \ dialogs.ycp \ - complex.ycp \ - widgets.ycp + complex.ycp desktop_DATA = \ isns.desktop module_DATA = \ - IsnsServer.ycp + IsnsServer.ycp + +# create a symlink for local build, #145327 +isns: + ln -sf . $@ +ycpchook = isns EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) 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-isns-1.0.4/src/widgets.ycp new/yast2-isns-2.19.0/src/widgets.ycp --- old/yast2-isns-1.0.4/src/widgets.ycp 2007-09-18 21:05:09.000000000 +0200 +++ new/yast2-isns-2.19.0/src/widgets.ycp 2010-02-02 09:39:34.000000000 +0100 @@ -4,6 +4,7 @@ import "Label"; import "IsnsServer"; import "String"; +import "Report"; string address = ""; //global @@ -21,9 +22,9 @@ map <string, any> ret_map = $[]; term dd_dialog = `VBox( - `Heading("Create New Discovery Domain"), + `Heading(_("Create New Discovery Domain")), `HSpacing(50), - `HWeight(3,`TextEntry( `id( `ddentry ), _("Discovery Domain Name" ))) , + `HWeight(3,`InputField( `id( `ddentry ), `opt(`hstretch), _("Discovery Domain Name" ))) , `VSpacing(1), `HBox( `HSpacing(3), @@ -106,7 +107,7 @@ `HSpacing(5), `VBox( `VSpacing(1), - `Left( `HWeight(3,`TextEntry( `id( `ddsentry ), _("Discovery Domain Set Name") )) ), + `Left( `HWeight(3,`InputField( `id( `ddsentry ), `opt(`hstretch), _("Discovery Domain Set Name") )) ), `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))), `VSpacing(1) ), @@ -136,7 +137,7 @@ `HSpacing(5), `VBox( `VSpacing(1), - `Left( `HWeight(3,`TextEntry( `id( `nodeentry ), `opt(`hstretch), _("iSCSI Node Name"))) ), + `Left( `HWeight(3,`InputField( `id( `nodeentry ), `opt(`hstretch), _("iSCSI Node Name"))) ), `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))), `VSpacing(1) ), 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-isns-1.0.4/testsuite/tests/GetSetServiceStatus.out new/yast2-isns-2.19.0/testsuite/tests/GetSetServiceStatus.out --- old/yast2-isns-1.0.4/testsuite/tests/GetSetServiceStatus.out 2007-02-07 22:36:17.000000000 +0100 +++ new/yast2-isns-2.19.0/testsuite/tests/GetSetServiceStatus.out 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Read .target.tmpdir "/tmp" 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-isns-1.0.4/testsuite/tests/GetSetServiceStatus.ycp new/yast2-isns-2.19.0/testsuite/tests/GetSetServiceStatus.ycp --- old/yast2-isns-1.0.4/testsuite/tests/GetSetServiceStatus.ycp 2007-02-07 22:31:06.000000000 +0100 +++ new/yast2-isns-2.19.0/testsuite/tests/GetSetServiceStatus.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -{ - include "testsuite.ycp"; - - map READ = $[ - "target" : $[ - "tmpdir" : "/tmp" - ], - "init" :$[ - "scripts" :$[ - "exists" : true, - "runlevel" : $[ "isns":$["start":["3","5"], "stop":["3", "5"]] ], - "comment" : $["isns":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["isns"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the isns server", "shouldstart":[], "shouldstop":[]]] - ] - ] - ]; - TESTSUITE_INIT ([READ, $[], $[]], nil); - - import "IsnsServer"; - - -// TEST( ``{ return IsnsServer::GetStartService();}, [ READ, $[], $[] ], nil ); -// TEST( ``{ return IsnsServer::SetStartService(true);}, [ READ, $[], $[] ], nil ); -} - 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-isns-1.0.4/testsuite/tests/Isns.out new/yast2-isns-2.19.0/testsuite/tests/Isns.out --- old/yast2-isns-1.0.4/testsuite/tests/Isns.out 2007-02-07 21:08:01.000000000 +0100 +++ new/yast2-isns-2.19.0/testsuite/tests/Isns.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Dump IsnsServer::Modified -Return false 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-isns-1.0.4/testsuite/tests/Isns.ycp new/yast2-isns-2.19.0/testsuite/tests/Isns.ycp --- old/yast2-isns-1.0.4/testsuite/tests/Isns.ycp 2007-02-07 22:42:18.000000000 +0100 +++ new/yast2-isns-2.19.0/testsuite/tests/Isns.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -{ - -// testedfiles: Isns.ycp - -include "testsuite.ycp"; -TESTSUITE_INIT([], nil); - -import "IsnsServer"; - -DUMP("IsnsServer::Modified"); -TEST(``(IsnsServer::Modified()), [], nil); - -} 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-isns-1.0.4/VERSION new/yast2-isns-2.19.0/VERSION --- old/yast2-isns-1.0.4/VERSION 2007-02-07 21:05:41.000000000 +0100 +++ new/yast2-isns-2.19.0/VERSION 2010-02-02 09:43:52.000000000 +0100 @@ -1 +1 @@ -1.0.0 +2.19.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 mkinitrd for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu Feb 4 09:11:29 CET 2010. -------- --- mkinitrd/mkinitrd.changes 2010-01-25 16:20:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-01-27 15:20:50.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 27 14:59:02 CET 2010 - mmarek(a)suse.cz + +- scripts/setup-modules.sh: fix for module options in /proc/cmdline + (bnc#567868, bnc#574261). + +------------------------------------------------------------------- +Tue Jan 26 16:58:03 CET 2010 - eich(a)freedesktop.org + +- Bail out of kms setup if no pci devices can be found (bnc#573454). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.tQ8sa9/_old 2010-02-04 09:11:08.000000000 +0100 +++ /var/tmp/diff_new_pack.tQ8sa9/_new 2010-02-04 09:11:08.000000000 +0100 @@ -26,7 +26,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.5.10 -Release: 8 +Release: 9 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/build_rpm new/mkinitrd-2.5.10/build_rpm --- old/mkinitrd-2.5.10/build_rpm 2010-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/build_rpm 2010-01-27 15:19:31.000000000 +0100 @@ -3,7 +3,7 @@ # Build a mkinitrd source rpm # -DESTDIR="/tmp/mkinitrd" +DESTDIR="mkinitrd" uncommitted_changes=0 while [ $# -gt 0 ] ; do @@ -12,7 +12,7 @@ DESTDIR=$2; shift 2; ;; - --destdir) + --destdir=*) DESTDIR=${$1#*=}; shift; ;; @@ -49,30 +49,19 @@ fi if [ -z "$BRANCH" ] ; then - BRANCH="master" - echo "Branch is not set, checking out from $BRANCH" -fi - -if [ -d "$DESTDIR" ] ; then - if [ -z "$force" ] ; then - echo "directory $DESTDIR exists, cannot continue" - exit 1 - else - if ! rm -rf "$DESTDIR" ; then - echo "Cannot remove directory $DESTDIR" - exit 1 - fi + BRANCH=$(sed -n 's|^ref: refs/heads/||p' .git/HEAD) + if test -z "$BRANCH"; then + BRANCH=HEAD fi + echo "Branch is not set, checking out from $BRANCH" fi - -if ! git branch | grep -q "$BRANCH" ; then +if ! git rev-parse "$BRANCH" >/dev/null; then echo "Branch \"$BRANCH\" does not exist" exit 1 -else - echo "Checking out from $BRANCH" fi -if ! mkdir $DESTDIR ; then +rm -f "$DESTDIR"/* +if ! mkdir -p $DESTDIR ; then echo "Cannot create directory $DESTDIR" exit 1 fi 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-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-01-27 15:19:31.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jan 27 14:59:02 CET 2010 - mmarek(a)suse.cz + +- scripts/setup-modules.sh: fix for module options in /proc/cmdline + (bnc#567868, bnc#574261). + +------------------------------------------------------------------- +Tue Jan 26 16:58:03 CET 2010 - eich(a)freedesktop.org + +- Bail out of kms setup if no pci devices can be found (bnc#573454). + +------------------------------------------------------------------- Mon Jan 25 16:03:04 CET 2010 - eich(a)freedesktop.org - Add support for KMS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-kms.sh new/mkinitrd-2.5.10/scripts/setup-kms.sh --- old/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-01-27 15:19:31.000000000 +0100 @@ -71,14 +71,18 @@ local line local n tmp local ct=0 + local ret=1 declare -a entries OFS=$IFS IFS=" " - for line in $(lspci -mn) + [ -d /sys/bus/pci ] && [ -x /sbin/lspci ] || return 1 + + for line in $(/sbin/lspci -mn 2>/dev/null) do unset entries + ret=0 m_if[$ct]=00 n=0 IFS=$OFS @@ -104,6 +108,7 @@ ct=$(( $ct + 1 )) done IFS=$OFS + return $ret } # @@ -186,7 +191,8 @@ for i in /lib/modules/$kver/kernel/drivers/char/agp/*.ko do i=${i##*/} - agps="$agps ${i%.ko}" + i=${i%.ko} + [ "$i" != "*" ] && agps="$agps $i" done echo "$agps" } @@ -238,9 +244,8 @@ ################## end of functions ###################### -if [ "$NO_KMS_IN_INITRD" != "yes" ] +if [ "$NO_KMS_IN_INITRD" != "yes" ] && pciids_on_system then - pciids_on_system gfx_modules=$(class_drivers $kernel_version $supported_classes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-modules.sh new/mkinitrd-2.5.10/scripts/setup-modules.sh --- old/mkinitrd-2.5.10/scripts/setup-modules.sh 2010-01-25 16:06:10.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-modules.sh 2010-01-27 15:19:31.000000000 +0100 @@ -256,7 +256,7 @@ echo \ "WARNING: no dependencies for kernel module '$module' found." >&2 fi - module_list=$(echo "$module_list" | sed -rn 's/^insmod +//p') + module_list=$(echo "$module_list" | sed -rn 's/^insmod +([^ ]+).*/\1/p') for mod in $module_list ; do if ! $(echo $resolved_modules | grep -q $mod) ; then resolved_modules="$resolved_modules $mod" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 patch for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package patch for openSUSE:Factory checked in at Thu Feb 4 09:10:57 CET 2010. -------- --- patch/patch.changes 2009-12-30 17:19:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/patch/patch.changes 2010-01-31 16:23:45.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 31 16:22:05 CET 2010 - agruen(a)suse.de + +- Version 2.6.1.9: + + Skip another ed-dependent test when ed isn't installed. + + More portability fixes. +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- patch-2.6.1.tar.bz2 New: ---- patch-2.6.1-9-gf376c5d.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patch.spec ++++++ --- /var/tmp/diff_new_pack.Kgv0cY/_old 2010-02-04 09:10:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Kgv0cY/_new 2010-02-04 09:10:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package patch (Version 2.6.1) +# spec file for package patch (Version 2.6.1.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,13 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define ver %version +%define ver 2.6.1-9-gf376c5d Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6.1 +Version: 2.6.1.9 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 @@ -43,7 +43,7 @@ Paul Eggert %prep -%setup -n patch-%ver +%setup -q -n patch-%ver %patch -p1 %build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apparmor-parser for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package apparmor-parser for openSUSE:Factory checked in at Thu Feb 4 09:10:12 CET 2010. -------- --- apparmor-parser/apparmor-parser.changes 2009-12-24 22:42:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/apparmor-parser/apparmor-parser.changes 2010-01-21 23:34:49.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 21 23:26:41 CET 2010 - jeffm(a)suse.de + +- Display correct line numbers while reporting errors (bnc#520013) +- Fix handling of removing profiles with whitespace (bnc#510740) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- apparmor-parser-line-numbers apparmor-parser-removal-whitespace-fix ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-docs.spec ++++++ --- /var/tmp/diff_new_pack.Ew3oa6/_old 2010-02-04 09:09:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew3oa6/_new 2010-02-04 09:09:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apparmor-docs (Version 2.3.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ %endif Summary: AppArmor Documentation package Version: 2.3.1 -Release: 13 +Release: 14 Group: Documentation/Other Source0: apparmor-parser-%{version}-1349.tar.gz License: GPLv2 ++++++ apparmor-parser.spec ++++++ --- /var/tmp/diff_new_pack.Ew3oa6/_old 2010-02-04 09:09:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew3oa6/_new 2010-02-04 09:09:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apparmor-parser (Version 2.3.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,13 +32,15 @@ %endif Summary: AppArmor userlevel parser utility Version: 2.3.1 -Release: 13 +Release: 14 Group: Productivity/Networking/Security Source0: %{name}-%{version}-1349.tar.gz Patch: apparmor-init.patch Patch1: apparmor-parser_phonet.patch Patch2: apparmor-parser-rc-exit-code-fix Patch3: apparmor-startproc.patch +Patch4: apparmor-parser-line-numbers +Patch5: apparmor-parser-removal-whitespace-fix License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -74,6 +76,8 @@ %patch1 %patch2 -p1 %patch3 +%patch4 -p1 +%patch5 -p1 %build make clean ++++++ apparmor-parser-line-numbers ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: apparmor-parser: Display correct line numbers while reporting errors References: bnc#520013 The line number reported as the location of the error only corresponds to the preprocessed output. It doesn't indicate the file or the real location, which would be helpful for users. This patch adds the tracking necessary to handle it. Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- parser_include.c | 2 ++ parser_lex.l | 14 +++++++++++++- parser_main.c | 12 +++++++++--- parser_yacc.y | 4 ++-- 4 files changed, 26 insertions(+), 6 deletions(-) --- a/parser_include.c +++ b/parser_include.c @@ -465,6 +465,7 @@ static int preprocess(FILE * f, char *na fprintf(out, "\n#source %s\n", name); } else { fprintf(out, "\n#included %s\n", name); + fprintf(out, "#line %d %s\n", 0, name); } while ((c = fgetc(f)) != EOF) { @@ -476,6 +477,7 @@ static int preprocess(FILE * f, char *na err = process_include(inc, name, line, out, nest); if (err) retval = err; + fprintf(out, "#line %d %s\n", line, name); chdir(cwd); free(cwd); free(inc); --- a/parser_lex.l +++ b/parser_lex.l @@ -42,6 +42,7 @@ #define NPDEBUG(fmt, args...) /* Do nothing */ int current_lineno = 1; +char current_filename[PATH_MAX]; %} @@ -238,7 +239,18 @@ LT_EQUAL <= } #.*\n { /* Comment - ignore */ - current_lineno++; + char file[PATH_MAX]; + int line; + int ret; + + ret = sscanf(yytext, "#line %d %s\n", + &line, file); + if (ret == 2) { + strcpy(current_filename, file); + current_lineno = line; + } else { + current_lineno++; + } PDEBUG("Line no++: %d\n", current_lineno); } --- a/parser_main.c +++ b/parser_main.c @@ -85,6 +85,7 @@ struct option long_options[] = { {"help", 0, 0, 'h'}, {"replace", 0, 0, 'r'}, {"reload", 0, 0, 'r'}, /* undocumented reload option == replace */ + {"dry-run", 0, 0, 'z'}, {"version", 0, 0, 'v'}, {"preprocess", 0, 0, 'p'}, {"complain", 0, 0, 'C'}, @@ -101,6 +102,7 @@ struct option long_options[] = { }; static int debug = 0; +static int dry_run = 0; static void display_version(void) { @@ -161,7 +163,7 @@ static int process_args(int argc, char * int count = 0; option = OPTION_ADD; - while ((c = getopt_long(argc, argv, "adf:hrRvpI:b:BCNSm:qn:", long_options, &o)) != -1) + while ((c = getopt_long(argc, argv, "adf:hrRvpI:b:BCNSm:qn:z", long_options, &o)) != -1) { switch (c) { case 0: @@ -176,6 +178,9 @@ static int process_args(int argc, char * case 'd': debug++; break; + case 'z': + dry_run++; + break; case 'h': display_usage(progname); exit(0); @@ -337,7 +342,7 @@ int have_enough_privilege(void) uid = getuid(); euid = geteuid(); - if (uid != 0 && euid != 0) { + if (uid != 0 && euid != 0 && !dry_run) { PERROR(_("%s: Sorry. You need root privileges to run this program.\n\n"), progname); display_usage(progname); @@ -533,7 +538,8 @@ int process_profile(int option, char *pr die_if_any_regex(); } - retval = load_policy(option); + if (!dry_run) + retval = load_policy(option); out: return retval; --- a/parser_yacc.y +++ b/parser_yacc.y @@ -58,7 +58,7 @@ static struct flagval force_complain_flags = {0, 1, 0}; /* from lex_config, for nice error messages */ -/* extern char *current_file; */ +extern char current_filename[]; extern int current_lineno; struct value_list { @@ -1073,7 +1073,7 @@ void yyerror(char *msg, ...) if (profilename) { PERROR(_("AppArmor parser error in %s at line %d: %s\n"), - profilename, current_lineno, buf); + current_filename, current_lineno, buf); } else { PERROR(_("AppArmor parser error, line %d: %s\n"), current_lineno, buf); ++++++ apparmor-parser-removal-whitespace-fix ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: apparmor-parser: Fix handling of removing profiles with whitespace References: bnc#510740 The loop that iterates over the profile list doesn't properly handle whitespace in the profile name. This patch properly handles it line-by-line instead of using whitespace as a separator. Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- rc.apparmor.functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/rc.apparmor.functions +++ b/rc.apparmor.functions @@ -378,7 +378,7 @@ remove_profiles() { #them so stor to tmp first MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX) sed -e "s/ ($enforce\|complain$)$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST" - cat "$MODULE_PLIST" | while read profile ; do + cat "$MODULE_PLIST" | while IFS= read profile ; do echo -n "$profile" > "$SFS_MOUNTPOINT/.remove" rc=$? if [ ${rc} -ne 0 ] ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at Thu Feb 4 09:09:18 CET 2010. -------- --- PackageKit/PackageKit.changes 2009-12-06 10:38:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/PackageKit/PackageKit.changes 2010-01-29 10:42:58.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 29 09:41:06 UTC 2010 - lslezak(a)suse.cz + +- enhanced libzypp-backend to save more attributes + (keeppackages, url and name), this is needed by WebYaST + Repository Manager module +- version 0.5.1-4 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- PackageKit-webyast.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.xkzZc7/_old 2010-02-04 09:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.xkzZc7/_new 2010-02-04 09:08:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package PackageKit (Version 0.5.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Name: PackageKit Version: 0.5.1 -Release: 3 +Release: 4 License: GPLv2+ BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel @@ -57,6 +57,7 @@ Patch3: PackageKit-force-pm-utils.patch # PATCH-FIX-UPSTREAM PackageKit-BNC543595.patch sreeves(a)novell.com -- install local files Patch4: PackageKit-BNC543595.patch +Patch5: PackageKit-webyast.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} PreReq: python-base = %{py_ver} @@ -170,6 +171,7 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p0 %build # uncomment out the following line if autotools should be run again (i.e., ++++++ PackageKit-webyast.patch ++++++ --- backends/zypp/pk-backend-zypp.cpp.orig 2010-01-28 13:09:55.000000000 +0100 +++ backends/zypp/pk-backend-zypp.cpp 2010-01-28 13:11:46.000000000 +0100 @@ -1699,6 +1699,27 @@ } manager.modifyRepository (repo_id, repo); + }else if (g_ascii_strcasecmp (parameter, "keep") == 0) { + repo = manager.getRepositoryInfo (repo_id); + + if (g_ascii_strcasecmp (value, "true") == 0) { + repo.setKeepPackages (TRUE); + }else if (g_ascii_strcasecmp (value, "false") == 0) { + repo.setKeepPackages (FALSE); + }else { + pk_backend_message (backend, PK_MESSAGE_ENUM_PARAMETER_INVALID, "Keep downloaded packages: Enter true or false"); + bReturn = FALSE; + } + + manager.modifyRepository (repo_id, repo); + }else if (g_ascii_strcasecmp (parameter, "url") == 0) { + repo = manager.getRepositoryInfo (repo_id); + repo.setBaseUrl (zypp::Url(value)); + manager.modifyRepository (repo_id, repo); + }else if (g_ascii_strcasecmp (parameter, "name") == 0) { + repo = manager.getRepositoryInfo (repo_id); + repo.setName(value); + manager.modifyRepository (repo_id, repo); }else if (g_ascii_strcasecmp (parameter, "prio") == 0) { repo = manager.getRepositoryInfo (repo_id); gint prio = 0; @@ -1732,7 +1753,7 @@ } } else { - pk_backend_error_code (backend, PK_ERROR_ENUM_NOT_SUPPORTED, "Valid parameters for set_repo_data are remove/add/refresh/prio"); + pk_backend_error_code (backend, PK_ERROR_ENUM_NOT_SUPPORTED, "Valid parameters for set_repo_data are remove/add/refresh/prio/keep/url/name"); bReturn = FALSE; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zypper for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Thu Feb 4 09:08:31 CET 2010. -------- --- zypper/zypper.changes 2010-01-18 15:39:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2010-01-31 00:34:32.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Jan 30 14:04:11 CET 2010 - jkupec(a)suse.cz + +- Fixed ignored .arch when specifying packages as name.arch + (bnc #561294) + +------------------------------------------------------------------- +Wed Jan 27 16:04:11 CET 2010 - jkupec(a)suse.cz + +- Setting --root correctly when working with lock (reported by Uwe) + +------------------------------------------------------------------- +Wed Jan 27 13:34:06 CET 2010 - jkupec(a)suse.cz + +- Correctly abbreviate strings with non-ascii characters in tables + (bnc #393723) + +------------------------------------------------------------------- @@ -38,0 +56 @@ +- 1.2.13 @@ -45 +62,0 @@ -- 1.2.13 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.kt3TRf/_old 2010-02-04 09:07:43.000000000 +0100 +++ /var/tmp/diff_new_pack.kt3TRf/_new 2010-02-04 09:07:43.000000000 +0100 @@ -32,7 +32,7 @@ PreReq: permissions Summary: Command line software manager using libzypp Version: 1.2.15 -Release: 2 +Release: 3 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Prefix: /usr ++++++ zypper-1.2.15.tar.bz2 ++++++ ++++ 1613 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit speechd for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '10

04 Feb '10

Hello community, here is the log from the commit of package speechd for openSUSE:Factory checked in at Thu Feb 4 09:07:30 CET 2010. -------- --- speechd/speechd.changes 2009-09-01 09:30:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/speechd/speechd.changes 2010-01-31 10:25:09.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Jan 31 10:24:11 CET 2010 - lnussel(a)suse.de + +- don't enable daemon by default + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ speechd.spec ++++++ --- /var/tmp/diff_new_pack.0Dw3Hr/_old 2010-02-04 09:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.0Dw3Hr/_new 2010-02-04 09:07:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package speechd (Version 0.6.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ Name: speechd BuildRequires: alsa-devel dotconf-devel espeak-devel gcc-c++ glib2-devel pulseaudio-devel python-devel Version: 0.6.7 -Release: 9 -License: GPL v2 only ; GPL v2 or later +Release: 10 +License: GPLv2 ; GPLv2+ AutoReqProv: on Group: Productivity/Multimedia/Sound/Utilities Source: %{name}-%{version}.tbz2 @@ -43,7 +43,7 @@ control TTS-systems. %package python -License: GPL v2 only ; GPL v2 or later +License: GPLv2 ; GPLv2+ Summary: speech-dispatcher - speech server Group: Productivity/Multimedia/Sound/Utilities Requires: speechd = %version @@ -55,7 +55,7 @@ control TTS-systems %package devel -License: GPL v2 only ; GPL v2 or later +License: GPLv2 ; GPLv2+ Summary: speech-dispatcher - speech server Group: Productivity/Multimedia/Sound/Utilities Requires: %name = %version @@ -93,7 +93,6 @@ %post /sbin/ldconfig -%{insserv_force_if_yast etc/init.d/speechd } %install_info --info-dir=%{_infodir} %{_infodir}/speechd.info.gz %postun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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