March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kde4-amarok for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package kde4-amarok for openSUSE:Factory checked in at Sat Mar 7 11:50:30 CET 2009. -------- --- KDE/kde4-amarok/kde4-amarok.changes 2009-03-02 21:45:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde4-amarok/kde4-amarok.changes 2009-03-06 10:23:40.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Mar 6 09:46:03 CET 2009 - wstephenson(a)suse.de + +- update to 2.0.2 + * Show a statusbar message when loving a lastfm track. + * Show error message when Wikipedia information cannot be retrieved. + * Fix showing of book information from the LibriVox service. + * Don't crash if a script has uncaught exceptions. + * Open ogg files in Amarok when using Dolphin and other file + managers. Patch thanks to Lubos Lunak. (kde#180155) + * Fix podcast episodes not ordered right because of incorrect + parsing of pubdate. (kde#181338) + * Fix crash in tagdialog when editing tracks without an artist. + (kde#183180) + * Statistics were not calculated properly in all instances. + (kde#182025) + * Compilation fixes on Open Solaris. + * Trim URL before adding a new podcast. + * Add Ok button to the podcast configuration dialog to improve usability. + (kde#181339) + * Add tooltips to now playing widget icons. + * Fix not possible to download episodes from newly added podcast channel. + (kde#180851) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- amarok-2.0.1.1.tar.bz2 ogg-mimetypes.diff New: ---- amarok-2.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-amarok.spec ++++++ --- /var/tmp/diff_new_pack.Mx2774/_old 2009-03-07 11:50:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Mx2774/_new 2009-03-07 11:50:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-amarok (Version 2.0.1.1) +# spec file for package kde4-amarok (Version 2.0.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,14 +35,13 @@ License: GPL v2 or later Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE -Version: 2.0.1.1 -Release: 3 +Version: 2.0.2 +Release: 1 Source0: amarok-%version.tar.bz2 Source1: errmsg.sys Patch3: link-mysql-embedded.diff Patch4: errmsg-mysql-embedded.diff -Patch5: ogg-mimetypes.diff -Patch6: amarok-gcc44.patch +Patch5: amarok-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: kde4-amarok-lang = %{version} @@ -68,7 +67,6 @@ %patch3 %patch4 %patch5 -%patch6 %build %ifarch ppc ppc64 @@ -136,6 +134,27 @@ %_kde_share_dir/services/amaroklastfm.protocol %changelog +* Fri Mar 06 2009 wstephenson(a)suse.de +- update to 2.0.2 + * Show a statusbar message when loving a lastfm track. + * Show error message when Wikipedia information cannot be retrieved. + * Fix showing of book information from the LibriVox service. + * Don't crash if a script has uncaught exceptions. + * Open ogg files in Amarok when using Dolphin and other file + managers. Patch thanks to Lubos Lunak. (kde#180155) + * Fix podcast episodes not ordered right because of incorrect + parsing of pubdate. (kde#181338) + * Fix crash in tagdialog when editing tracks without an artist. + (kde#183180) + * Statistics were not calculated properly in all instances. + (kde#182025) + * Compilation fixes on Open Solaris. + * Trim URL before adding a new podcast. + * Add Ok button to the podcast configuration dialog to improve usability. + (kde#181339) + * Add tooltips to now playing widget icons. + * Fix not possible to download episodes from newly added podcast channel. + (kde#180851) * Mon Mar 02 2009 coolo(a)suse.de - compile with gcc 4.4 * Sat Jan 10 2009 stbinner(a)suse.de ++++++ amarok-2.0.1.1.tar.bz2 -> amarok-2.0.2.tar.bz2 ++++++ ++++ 70547 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 yast2-iscsi-client for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at Sat Mar 7 11:49:49 CET 2009. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2009-02-24 12:36:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-iscsi-client/yast2-iscsi-client.changes 2009-03-06 09:36:21.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 6 09:25:13 CET 2009 - mzugec(a)suse.cz + +- start iscsid during autoyast installation (bnc#482429) +- 2.18.4 + +------------------------------------------------------------------- +Tue Mar 3 10:28:27 CET 2009 - mzugec(a)suse.cz + +- added X-SuSE-YaST-AutoInstSchema into desktop file (bnc#480466) +- 2.18.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-iscsi-client-2.18.2.tar.bz2 New: ---- yast2-iscsi-client-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.Ym1150/_old 2009-03-07 11:49:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Ym1150/_new 2009-03-07 11:49:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.18.2) +# spec file for package yast2-iscsi-client (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-iscsi-client -Version: 2.18.2 +Version: 2.18.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.18.2.tar.bz2 +Source0: yast2-iscsi-client-2.18.4.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libicu-devel libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-packager yast2-perl-bindings yast2-testsuite Requires: yast2-packager @@ -41,7 +41,7 @@ %prep -%setup -n yast2-iscsi-client-2.18.2 +%setup -n yast2-iscsi-client-2.18.4 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,12 @@ %doc %{prefix}/share/doc/packages/yast2-iscsi-client /usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc %changelog +* Fri Mar 06 2009 mzugec(a)suse.cz +- start iscsid during autoyast installation (bnc#482429) +- 2.18.4 +* Tue Mar 03 2009 mzugec(a)suse.cz +- added X-SuSE-YaST-AutoInstSchema into desktop file (bnc#480466) +- 2.18.3 * Tue Feb 24 2009 mzugec(a)suse.cz - toggle between "manual", "automatic", "onboot" (bnc#457252) - 2.18.2 ++++++ yast2-iscsi-client-2.18.2.tar.bz2 -> yast2-iscsi-client-2.18.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.2/configure new/yast2-iscsi-client-2.18.4/configure --- old/yast2-iscsi-client-2.18.2/configure 2009-02-24 12:23:50.000000000 +0100 +++ new/yast2-iscsi-client-2.18.4/configure 2009-03-06 09:18:21.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-iscsi-client 2.18.1. +# Generated by GNU Autoconf 2.63 for yast2-iscsi-client 2.18.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-iscsi-client' PACKAGE_TARNAME='yast2-iscsi-client' -PACKAGE_VERSION='2.18.1' -PACKAGE_STRING='yast2-iscsi-client 2.18.1' +PACKAGE_VERSION='2.18.3' +PACKAGE_STRING='yast2-iscsi-client 2.18.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-iscsi-client 2.18.1 to adapt to many kinds of systems. +\`configure' configures yast2-iscsi-client 2.18.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-iscsi-client 2.18.1:";; + short | recursive ) echo "Configuration of yast2-iscsi-client 2.18.3:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-iscsi-client configure 2.18.1 +yast2-iscsi-client configure 2.18.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,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-iscsi-client $as_me 2.18.1, which was +It was created by yast2-iscsi-client $as_me 2.18.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-iscsi-client' - VERSION='2.18.1' + VERSION='2.18.3' cat >>confdefs.h <<_ACEOF @@ -2511,7 +2511,7 @@ -VERSION="2.18.1" +VERSION="2.18.3" RPMNAME="yast2-iscsi-client" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-iscsi-client $as_me 2.18.1, which was +This file was extended by yast2-iscsi-client $as_me 2.18.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-iscsi-client config.status 2.18.1 +yast2-iscsi-client config.status 2.18.3 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-iscsi-client-2.18.2/configure.in new/yast2-iscsi-client-2.18.4/configure.in --- old/yast2-iscsi-client-2.18.2/configure.in 2009-02-24 12:23:39.000000000 +0100 +++ new/yast2-iscsi-client-2.18.4/configure.in 2009-03-06 09:18:16.000000000 +0100 @@ -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-iscsi-client, 2.18.1, http://bugs.opensuse.org/, yast2-iscsi-client) +AC_INIT(yast2-iscsi-client, 2.18.3, http://bugs.opensuse.org/, yast2-iscsi-client) 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.18.1" +VERSION="2.18.3" RPMNAME="yast2-iscsi-client" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.2/src/iscsi-client_auto.ycp new/yast2-iscsi-client-2.18.4/src/iscsi-client_auto.ycp --- old/yast2-iscsi-client-2.18.2/src/iscsi-client_auto.ycp 2008-01-24 14:40:51.000000000 +0100 +++ new/yast2-iscsi-client-2.18.4/src/iscsi-client_auto.ycp 2009-03-06 09:30:16.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Client for autoinstallation * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: iscsi-client_auto.ycp 42224 2007-11-20 15:09:31Z mzugec $ + * $Id: iscsi-client_auto.ycp 55955 2009-03-06 08:30:16Z mzugec $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -82,12 +82,13 @@ ret = IscsiClient::Read(); Progress::set (progress_orig); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; boolean progress_orig = Progress::set (false); IscsiClient::write_only = true; ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); + SCR::Execute(.background.run_output_err, "iscsid"); ret = IscsiClient::Write(); Progress::set (progress_orig); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.2/src/iscsi-client.desktop new/yast2-iscsi-client-2.18.4/src/iscsi-client.desktop --- old/yast2-iscsi-client-2.18.2/src/iscsi-client.desktop 2008-05-21 11:20:56.000000000 +0200 +++ new/yast2-iscsi-client-2.18.4/src/iscsi-client.desktop 2009-03-03 10:27:24.000000000 +0100 @@ -16,6 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=iscsi-client X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=iscsi-client.rnc Icon=yast-iscsi-client Exec=/sbin/yast2 iscsi-client diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.2/VERSION new/yast2-iscsi-client-2.18.4/VERSION --- old/yast2-iscsi-client-2.18.2/VERSION 2009-02-24 12:24:52.000000000 +0100 +++ new/yast2-iscsi-client-2.18.4/VERSION 2009-03-06 09:25:11.000000000 +0100 @@ -1 +1 @@ -2.18.2 +2.18.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-http-server for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at Sat Mar 7 11:49:24 CET 2009. -------- --- yast2-http-server/yast2-http-server.changes 2009-02-23 12:21:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-http-server/yast2-http-server.changes 2009-03-06 16:56:56.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Mar 6 16:49:11 CET 2009 - mzugec(a)suse.cz + +- modules ordering problem (bnc#350590) +- validation of modules dependency +- 2.18.2 + +------------------------------------------------------------------- +Tue Mar 3 10:25:03 CET 2009 - mzugec(a)suse.cz + +- added X-SuSE-YaST-AutoInstSchema into desktop file (bnc#480466) +- 2.18.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-http-server-2.18.0.tar.bz2 New: ---- yast2-http-server-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.o32178/_old 2009-03-07 11:48:33.000000000 +0100 +++ /var/tmp/diff_new_pack.o32178/_new 2009-03-07 11:48:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-http-server (Version 2.18.0) +# spec file for package yast2-http-server (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-http-server -Version: 2.18.0 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-http-server-2.18.0.tar.bz2 +Source0: yast2-http-server-2.18.2.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2-network yast2-perl-bindings libzio @@ -44,7 +44,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-http-server-2.18.0 +%setup -n yast2-http-server-2.18.2 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,13 @@ /usr/lib/YaST2/servers_non_y2/* %doc %{prefix}/share/doc/packages/yast2-http-server %changelog +* Fri Mar 06 2009 mzugec(a)suse.cz +- modules ordering problem (bnc#350590) +- validation of modules dependency +- 2.18.2 +* Tue Mar 03 2009 mzugec(a)suse.cz +- added X-SuSE-YaST-AutoInstSchema into desktop file (bnc#480466) +- 2.18.1 * Mon Feb 23 2009 mzugec(a)suse.cz - fixed text (bnc#476002) - 2.18.0 ++++++ yast2-http-server-2.18.0.tar.bz2 -> yast2-http-server-2.18.2.tar.bz2 ++++++ ++++ 2030 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-http-server-2.18.0/configure.in new/yast2-http-server-2.18.2/configure.in --- old/yast2-http-server-2.18.0/configure.in 2009-02-23 12:14:11.000000000 +0100 +++ new/yast2-http-server-2.18.2/configure.in 2009-03-03 10:23:08.000000000 +0100 @@ -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-http-server, 2.17.5, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.18.0, http://bugs.opensuse.org/, yast2-http-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.5" +VERSION="2.18.0" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(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-http-server-2.18.0/doc/autodocs/Makefile.am new/yast2-http-server-2.18.2/doc/autodocs/Makefile.am --- old/yast2-http-server-2.18.0/doc/autodocs/Makefile.am 2008-01-24 14:40:00.000000000 +0100 +++ new/yast2-http-server-2.18.2/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs -# - -htmldir = $(docdir)/autodocs - -index.html: $(srcdir)/../../src/*.ycp - $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp - -html_DATA = index.html $(wildcard *.html) - -CLEANFILES = $(html_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-http-server-2.18.0/doc/Makefile.am new/yast2-http-server-2.18.2/doc/Makefile.am --- old/yast2-http-server-2.18.0/doc/Makefile.am 2008-01-24 14:40:00.000000000 +0100 +++ new/yast2-http-server-2.18.2/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# Makefile.am for devtools/devtools/skeletons/config/doc -# - -SUBDIRS = autodocs - -htmldir = $(docdir) - -doc_DATA = -html_DATA = - -EXTRA_DIST = $(doc_DATA) $(html_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-http-server-2.18.0/src/http-server.desktop new/yast2-http-server-2.18.2/src/http-server.desktop --- old/yast2-http-server-2.18.0/src/http-server.desktop 2008-05-20 12:05:55.000000000 +0200 +++ new/yast2-http-server-2.18.2/src/http-server.desktop 2009-03-03 10:27:50.000000000 +0100 @@ -16,6 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=http-server X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=http-server.rnc Icon=yast-http-server Exec=/sbin/yast2 http-server 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-http-server-2.18.0/src/HttpServerWidgets.ycp new/yast2-http-server-2.18.2/src/HttpServerWidgets.ycp --- old/yast2-http-server-2.18.0/src/HttpServerWidgets.ycp 2009-02-23 12:15:55.000000000 +0100 +++ new/yast2-http-server-2.18.2/src/HttpServerWidgets.ycp 2009-03-06 16:50:30.000000000 +0100 @@ -6,7 +6,7 @@ * Stanislav Visnovsky <visnov(a)suse.cz> * Internal * - * $Id: HttpServerWidgets.ycp 55672 2009-02-23 11:15:54Z mzugec $ + * $Id: HttpServerWidgets.ycp 55984 2009-03-06 15:50:29Z mzugec $ */ { @@ -629,6 +629,7 @@ global void initModules (string key); global symbol handleModules (string key, map event); +global boolean validateModules (string key, map event); global void initListenSettings (string key); global symbol handleListenSettings (string key, map event); global void initServiceStatus (string key); @@ -1469,6 +1470,8 @@ ), "init" : initModules, "handle" : handleModules, + "validate_type" : `function, + "validate_function" : validateModules, "help" : HELPS["modules"]:"", ], @@ -2467,7 +2470,7 @@ integer index = -1; // create temporary list of maps from modules list< map<string, any > > listmodules = maplist(string name , modules,{ - return( mapmap(string k,any v, $["default":"1", "name":name, "summary":_("unknown"), "required":"0", "suggested":"0"], + return( mapmap(string k,any v, $["default":"1", "name":name, "summary":_("unknown"), "requires":""], {return ($[k:v]); })); }); // add to known modules list modules from temporary list @@ -2494,6 +2497,30 @@ UI::SetFocus (`id (`modules)); } + global boolean validateModules(string id, map key){ + boolean valid=true; + list<string> selected = []; + foreach(term i, (list<term>)UI::QueryWidget(`modules, `Items), { + if (i[2]:""==_("Enabled")) selected=add(selected, i[1]:""); + }); + map<string, any> all_modules =$[]; + foreach(map row, YaST::HTTPDData::GetKnownModules(), { + all_modules[row["name"]:""] = remove(row, "name"); + }); + foreach(string mod, selected, { + string require = all_modules[mod, "requires"]:""; + if (size(require)>0){ + if (!contains(selected, require)){ + string message = sformat("%1:\n %2 %3 %4\n%5", _("Modules dependency problem"), mod, _("requires"), require, _("Enable required module or disable first one.")); + Popup::Error(message); + y2warning("Error message: %1", message); + valid=false; + } + } + }); + return valid; + } + /** * Handle function of a widget * @param key any widget key of widget that is processed 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-http-server-2.18.0/src/YaPI/HTTPDModules.pm new/yast2-http-server-2.18.2/src/YaPI/HTTPDModules.pm --- old/yast2-http-server-2.18.0/src/YaPI/HTTPDModules.pm 2008-02-21 17:35:10.000000000 +0100 +++ new/yast2-http-server-2.18.2/src/YaPI/HTTPDModules.pm 2009-03-06 14:58:44.000000000 +0100 @@ -1,14 +1,18 @@ package YaPI::HTTPDModules; use YaPI; textdomain "http-server"; - %modules = ( +# (without_leading mod_) module name = { +# summary => __("Translatable text with module description - will be shown in YaST table"), +# packages => [ list of rpm packages needed for particular module ], +# default => 0 or 1 if this module should be enabled by default +# postition => order in /etc/sysconfig/apache2 (lowest numbew, ... , higher number) +# requires => required modulename (this is used in YaST dialog validation) +# } 'authz_host' => { summary => __("Provides access control based on client host name, IP address, etc."), packages => [], default => 1, - required => 0, - suggested => 0, position => 10, directives=> [ { option => "Allow", "context" => [ "Directory" ] }, { option => "Deny", "context" => [ "Directory" ] }, @@ -19,8 +23,6 @@ summary => __("Executing CGI scripts based on media type or request method"), packages => [], default => 1, - required => 0, - suggested => 0, position => 20, directives=> [ { option => "Action", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "Script", "context" => [ "Directory", "Server", "Virtual" ] } @@ -30,8 +32,6 @@ summary => __("Mapping different parts of the host file system in the document tree and for URL redirection"), packages => [], default => 1, - required => 0, - suggested => 0, position => 30, directives=> [ { option => "Alias", "context" => [ "Server", "Virtual" ] }, { option => "AliasMatch", "context" => [ "Server", "Virtual" ] }, @@ -47,8 +47,6 @@ summary => __("Basic authentication"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthBasicAuthoritative", "context" => [ "Directory" ] , "values" => [ "On", "Off" ] }, { option => "AuthBasicProvider", "context" => [ "Directory" ] } @@ -58,8 +56,6 @@ summary => __("User authentication using text files"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthUserFile", "context" => [ "Directory" ] } ] @@ -68,8 +64,6 @@ summary => __("User Authorization"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthzUserAuthoritative", "context" => [ "Directory" ], "values" => [ "On", "Off" ] } ] @@ -78,8 +72,6 @@ summary => __("Group authorization using plaintext files"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthGroupFile", "context" => [ "Directory" ] }, { option => "AuthzGroupFileAuthoritative", "context" => [ "Directory" ], "values" => [ "On", "Off" ] } @@ -89,18 +81,12 @@ summary => __("User authentication using DBM files"), packages => [], default => 0, - required => 0, - suggested => 0, position => 50, module => { -# AuthDBMAuthoritative => 'mod_auth_dbm', -# AuthDBMGroupFile => 'mod_auth_dbm', AuthDBMType => 'mod_auth_dbm', AuthDBMUserFile => 'mod_auth_dbm' }, directives=> [ -#{ option => "AuthDBMAuthoritative", "context" => [ "Directory" ] , "values" => [ "On", "Off" ] }, -# { option => "AuthDBMGroupFile", "context" => [ "Directory" ] }, { option => "AuthDBMType", "context" => [ "Directory" ] , "values" => [ "default", "SDBM", "GDBM", "NDBM", "DB" ] }, { option => "AuthDBMUserFile", "context" => [ "Directory" ] } @@ -110,8 +96,6 @@ summary => __("Generates directory indices, automatically, similar to the Unix ls command"), packages => [], default => 1, - required => 0, - suggested => 0, position => 60, directives=> [ { option => "AddAlt", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "AddAltByEncoding", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -133,8 +117,6 @@ summary => __("Execution of CGI scripts"), packages => [], default => 1, - required => 0, - suggested => 0, position => 70, directives=> [ { option => "ScriptLog", "context" => [ "Server", "Virtual" ] }, { option => "ScriptLogBuffer", "context" => [ "Server", "Virtual" ] }, @@ -145,8 +127,6 @@ summary => __("Provides for trailing slash redirects and serving directory index files"), packages => [], default => 1, - required => 0, - suggested => 0, position => 80, directives=> [ { option => "DirectoryIndex", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "DirectorySlash", "context" => [ "Directory", "Server", "Virtual" ] , "values" => [ "On", "Off" ] } @@ -156,8 +136,6 @@ summary => __("Modifies the environment passed to CGI scripts and SSI pages"), packages => [], default => 0, - required => 0, - suggested => 0, position => 90, directives=> [ { option => "PassEnv", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "SetEnv", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -168,8 +146,6 @@ summary => __("Generation of Expires HTTP headers according to user-specified criteria"), packages => [], default => 0, - required => 0, - suggested => 0, position => 100, module => { ExpiresActive => 'mod_expires', @@ -185,8 +161,6 @@ summary => __("Server-parsed HTML documents (Server Side Includes)"), packages => [], default => 1, - required => 0, - suggested => 0, position => 110, directives=> [ { option => "SSIEndTag", "context" => [ "Server", "Virtual" ] }, { option => "SSIErrorMsg", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -201,8 +175,6 @@ summary => __("Logging of the requests made to the server"), packages => [], default => 1, - required => 0, - suggested => 0, position => 120, directives=> [ { option => "BufferedLogs", "context" => [ "Server" ] , "values" => [ "On", "Off" ] }, { option => "CookieLog", "context" => [ "Server", "Virtual" ] }, @@ -215,8 +187,6 @@ summary => __("Associates the requested file name\'s extensions with the file\'s behavior and content"), packages => [], default => 1, - required => 0, - suggested => 0, position => 130, directives=> [ { option => "AddCharset", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "AddEncoding", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -242,8 +212,6 @@ summary => __("Provides for content negotiation"), packages => [], default => 1, - required => 0, - suggested => 0, position => 140, directives=> [ { option => "CacheNegotiatedDocs", "context" => [ "Server", "Virtual" ], "values" => [ "On", "Off" ] }, { option => "ForceLanguagePriority", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -254,8 +222,6 @@ summary => __("Allows the setting of environment variables based on characteristics of the request"), packages => [], default => 1, - required => 0, - suggested => 0, position => 150, directives=> [ { option => "BrowserMatch", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "BrowserMatchNoCase", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -267,8 +233,6 @@ summary => __("Provides information about server activity and performance"), packages => [], default => 1, - required => 0, - suggested => 0, position => 160, directives=> [ { option => "ExtendedStatus", "context" => [ "Server" ], "values" => [ "On", "Off" ] } ] @@ -277,8 +241,6 @@ summary => __("Allows CGI scripts to run as a specified user and group"), packages => [], default => 0, - required => 0, - suggested => 0, position => 0, module => { SuexecUserGroup => 'mod_suexec', @@ -290,8 +252,6 @@ summary => __("User-specific directories"), packages => [], default => 1, - required => 0, - suggested => 0, position => 180, directives=> [ { option =>"UserDir", "context" => [ "Server", "Virtual" ] } ] @@ -300,16 +260,12 @@ summary => __("Sends files that contain their own HTTP headers"), packages => [], default => 1, - required => 0, - suggested => 0, position => 190 }, 'authn_anon' => { summary => __("Allows \"anonymous\" user access to authenticated areas"), packages => [], default => 0, - required => 0, - suggested => 0, position => 200, module => { Anonymous => 'mod_auth_anon', @@ -331,8 +287,6 @@ summary => __("User authentication using MD5 Digest Authentication"), packages => [], default => 0, - required => 0, - suggested => 0, position => 210, directives=> [ { option =>"AuthDigestAlgorithm", "context" => [ "Directory" ], "values" => [ "MD5", "MD5-sess" ] }, { option =>"AuthDigestDomain", "context" => [ "Directory" ] }, @@ -348,8 +302,6 @@ summary => __("Allows an LDAP directory to be used to store the database for HTTP Basic authentication"), packages => [], default => 0, - required => 0, - suggested => 0, position => 355, directives=> [ { option =>"AuthLDAPBindDN", "context" => [ "Directory" ] }, { option =>"AuthLDAPBindPassword", "context" => [ "Directory" ] }, @@ -368,8 +320,6 @@ summary => __("Content cache keyed to URIs"), packages => [], default => 0, - required => 0, - suggested => 0, position => 230, directives=> [ { option =>"CacheDefaultExpire", "context" => [ "Server", "Virtual" ] }, { option =>"CacheDisable", "context" => [ "Server", "Virtual" ] }, @@ -387,8 +337,6 @@ summary => __("Specify character set translation or recoding"), packages => [], default => 0, - required => 0, - suggested => 0, position => 240, directives=> [ { option =>"CharsetDefault", "context" => [ "Directory", "Server", "Virtual" ] }, { option =>"CharsetOptions", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -399,8 +347,6 @@ summary => __("Distributed Authoring and Versioning (WebDAV) functionality"), packages => [], default => 0, - required => 0, - suggested => 0, position => 250, module => { Dav => 'mod_dav', @@ -416,8 +362,6 @@ summary => __("File system provider for mod_dav"), packages => [], default => 0, - required => 0, - suggested => 0, position => 260, module => { DavLockDB => 'mod_dav_fs' @@ -429,8 +373,6 @@ summary => __("Compress content before it is delivered to the client"), packages => [], default => 0, - required => 0, - suggested => 0, position => 270, module => { DeflateBufferSize => 'mod_deflate', @@ -445,14 +387,11 @@ { option =>"DeflateMemLevel", "context" => [ "Server", "Virtual" ] }, { option =>"DeflateWindowSize", "context" => [ "Server", "Virtual" ] } ] - }, 'disk_cache' => { summary => __("Content cache storage manager keyed to URIs"), packages => [], default => 0, - required => 0, - suggested => 0, position => 280, directives=> [ { option =>"CacheDirLength", "context" => [ "Server", "Virtual" ] }, { option =>"CacheDirLevels", "context" => [ "Server", "Virtual" ] }, @@ -465,8 +404,6 @@ summary => __("A simple echo server to illustrate protocol modules"), packages => [], default => 0, - required => 0, - suggested => 0, position => 290, directives=> [ { option =>"ProtocolEcho", "context" => [ "Server", "Virtual" ], "values" => [ "On", "Off" ] } ] @@ -475,8 +412,6 @@ summary => __("Pass the response body through an external program before delivery to the client"), packages => [], default => 0, - required => 0, - suggested => 0, position => 300, module => { ExtFilterDefine => 'mod_ext_filter', @@ -485,26 +420,20 @@ directives=> [ { option =>"ExtFilterDefine", "context" => [ "Server" ] }, { option =>"ExtFilterOptions", "context" => [ "Directory" ] } ] - }, 'file_cache' => { summary => __("Caches a static list of files in memory"), packages => [], default => 0, - required => 0, - suggested => 0, position => 310, directives=> [ { option =>"CacheFile", "context" => [ "Server" ] }, { option =>"MMapFile", "context" => [ "Server" ] } ] - }, 'headers' => { summary => __("Customization of HTTP request and response headers"), packages => [], default => 0, - required => 0, - suggested => 0, position => 320, module => { Header => 'mod_headers', @@ -513,28 +442,22 @@ directives=> [ { option =>"Header", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"RequestHeader", "context" => [ "Server", "Virtual", "Directory" ] } ] - }, 'imagemap' => { summary => __("Server-side image map processing"), packages => [], default => 1, - required => 0, - suggested => 0, position => 330, directives=> [ { option =>"ImapBase", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"ImapDefault", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"ImapMenu", "context" => [ "Server", "Virtual", "Directory" ], "values" => [ "none", "formatted", "semiformatted", "unformatted" ] } ] - }, 'info' => { summary => __("Provides a comprehensive overview of the server configuration"), packages => [], default => 0, - required => 0, - suggested => 0, position => 340, module => { AddModuleInfo => 'mod_info' }, directives=> [ { option =>"AddModuleInfo", "context" => [ "Server", "Virtual" ] }, @@ -544,8 +467,6 @@ summary => __("LDAP connection pooling and result caching services for use by other LDAP modules"), packages => [], default => 0, - required => 0, - suggested => 0, position => 350, directives=> [ { option =>"LDAPCacheEntries", "context" => [ "Server" ] }, { option =>"LDAPCacheTTL", "context" => [ "Server" ] }, @@ -566,16 +487,12 @@ summary => __("Logging of input and output bytes per request"), packages => [], default => 0, - required => 0, - suggested => 0, position => 360 }, 'mem_cache' => { summary => __("Content cache keyed to URIs"), packages => [], default => 0, - required => 0, - suggested => 0, position => 370, directives=> [ { option =>"MCacheMaxObjectCount", "context" => [ "Server" ] }, { option =>"MCacheMaxObjectSize", "context" => [ "Server" ] }, @@ -589,20 +506,15 @@ summary => __("Determines the MIME type of a file by looking at a few bytes of its contents"), packages => [], default => 0, - required => 0, - suggested => 0, position => 380, module => { MimeMagicFile => 'mod_mime_magic' }, directives=> [ { option =>"MimeMagicFile", "context" => [ "Server", "Virtual" ] }, ] - }, 'proxy' => { summary => __("HTTP/1.1 proxy/gateway server"), packages => [], default => 0, - required => 0, - suggested => 0, position => 390, module => { NoProxy => 'mod_proxy', @@ -646,14 +558,11 @@ { option =>"ProxyVia", "context" => [ "Server", "Virtual" ], "values" => [ "On", "Off", "Full", "Block" ] } ] - }, 'proxy_connect' => { summary => __("mod_proxy extension for CONNECT request handling"), packages => [], default => 0, - required => 0, - suggested => 0, position => 400, module => { AllowCONNECT => 'mod_proxy_connect' } }, @@ -661,24 +570,18 @@ summary => __("FTP support module for mod_proxy"), packages => [], default => 0, - required => 0, - suggested => 0, position => 410 }, 'proxy_http' => { summary => __("HTTP support module for mod_proxy"), packages => [], default => 0, - required => 0, - suggested => 0, position => 420 }, 'rewrite' => { summary => __("Provides a rule-based rewriting engine to rewrite requested URLs on the fly"), packages => [], default => 0, - required => 0, - suggested => 0, position => 430, module => { RewriteBase => 'mod_rewrite', @@ -701,26 +604,20 @@ { option =>"RewriteOptions", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"RewriteRule", "context" => [ "Server", "Virtual", "Directory" ] } ] - }, 'speling' => { summary => __("Attempts to correct mistaken URLs that users might have entered"), packages => [], default => 0, - required => 0, - suggested => 0, position => 440, module => { CheckSpelling => 'mod_speling' }, directives=> [ { option =>"CheckSpelling", "context" => [ "Server", "Virtual", "Directory" ], "values" => [ "On", "Off" ] }, ] - }, 'ssl' => { summary => __("Strong cryptography using the Secure Sockets Layer (SSL) and Transport Layer Security (TLS) protocols"), packages => [], default => 0, - required => 0, - suggested => 0, position => 450, directives=> [ { option =>"SSLCACertificateFile", "context" => [ "SSL", "Server", "Virtual" ] }, { option =>"SSLCACertificatePath", "context" => [ "SSL", "Server", "Virtual" ] }, @@ -761,16 +658,12 @@ summary => __("Provides an environment variable with a unique identifier for each request"), packages => [], default => 0, - required => 0, - suggested => 0, position => 460 }, 'usertrack' => { summary => __("Clickstream logging of user activity on a site"), packages => [], default => 0, - required => 0, - suggested => 0, position => 470, module => { CookieDomain => 'mod_usertrack', @@ -791,8 +684,6 @@ summary => __("Provides support for dynamically configured mass virtual hosting"), packages => [], default => 0, - required => 0, - suggested => 0, position => 480, module => { VirtualDocumentRoot => 'mod_vhost_alias', @@ -806,54 +697,45 @@ { option =>"VirtualScriptAliasIP", "context" => [ "Server", "Virtual", "Directory" ] } ] }, - -# 'php4' => { -# summary => 'Provides support for PHP4 dynamically generated pages', -# packages => ["apache2-mod_php4"], -# default => 0, -# required => 0, -# suggested => 0, -# position => 490, -# exclude => [ "php5" ] -# }, - 'php5' => { summary => __("Provides support for PHP5 dynamically generated pages"), packages => ["apache2-mod_php5"], default => 0, - required => 0, - suggested => 0, - position => 490, - exclude => [ "php4" ] + position => 490 }, 'perl' => { summary => __("Provides support for Perl dynamically generated pages"), packages => ["apache2-mod_perl"], default => 0, - required => 0, - suggested => 0, position => 500 }, 'python' => { summary => __("Provides support for Python dynamically generated pages"), packages => ["apache2-mod_python"], default => 0, - required => 0, - suggested => 0, position => 510 }, 'apparmor' => { summary => __("Provides support for AppArmor subprocess confinement within apache"), packages => ["mod-apparmor"], default => 0, - required => 0, - suggested => 0, position => 530 + }, + 'dav_svn' => { + summary => __("Provides support for subversion"), + packages => ["subversion-server"], + requires => "dav", + default => 0, + position => 540 + }, + 'authz_svn' => { + summary => __("Provides support for subversion"), + packages => ["subversion-server"], + requires => "dav_svn", + default => 0, + position => 550 } - ); - - %selection = ( TestSel => { summary => 'A test selection', @@ -861,4 +743,3 @@ default => 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-http-server-2.18.0/src/YaPI/HTTPD.pm new/yast2-http-server-2.18.2/src/YaPI/HTTPD.pm --- old/yast2-http-server-2.18.0/src/YaPI/HTTPD.pm 2008-11-19 16:37:35.000000000 +0100 +++ new/yast2-http-server-2.18.2/src/YaPI/HTTPD.pm 2009-03-06 11:12:30.000000000 +0100 @@ -528,16 +528,6 @@ } else { $vhost_files->{$ip} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; } - - - -#$vhost_files->{$ip} = \@newdata; -# deleteVH() if (@{$self->GetHost($hostid)} ne 0); - -# if ($type eq "0"){ -# $vhost_files->{$ip} = @newdata; -# } - } @@ -579,17 +569,7 @@ my $data = shift; -# my @newdata = (); -# foreach my $row (@{$data}){ -# if ($row->{KEY} eq 'HostIP' ) { -# $ip = $row->{VALUE}; -# } elsif ($row->{KEY} eq 'VirtualByName' ) { -# $type = $row->{VALUE}; -# }else { -# push(@newdata, $row); -# } -# } -my $params = $self->getVhType($hostid); + my $params = $self->getVhType($hostid); $self->deleteVH($hostid); $self->createVH($hostid, $data, $params); @@ -781,17 +761,6 @@ if( $key->{KEY} eq 'VirtualByName' ) { $VirtualByName = $key->{VALUE}; } -#elsif( $key->{KEY} eq 'SSL' and $key->{VALUE} == 1 ) { -# $sslHash->{'VALUE'} = 'on'; -# } elsif( $key->{KEY} eq 'SSL' and $key->{VALUE} == 2 ) { -# $sslHash->{'VALUE'} = 'on'; -# push( @tmp, { KEY => 'SSLRequireSSL', VALUE => '' } ); -# } elsif( $key->{KEY} eq 'SSL' ) { -# # already set to "off" above. So ignore. -# } elsif( $key->{KEY} eq 'DocumentRoot' ) { -# $docRoot = $key->{VALUE}; -# push( @tmp, $key ); -# } els if( $key->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost return $self->SetError( summary => sprintf(__("Illegal key in vhost '%s'."), $key->{KEY}), @@ -955,7 +924,9 @@ BEGIN { $TYPEINFO{GetModuleList} = ["function", [ "list", "string" ] ]; } sub GetModuleList { my $self = shift; - my $data = SCR->Read('.sysconfig.apache2.APACHE_MODULES'); # FIXME: Error handling +# my $data = SCR->Read('.sysconfig.apache2.APACHE_MODULES'); # FIXME: Error handling + my $data = SCR->Execute('.target.bash_output', 'a2enmod -l')->{'stdout'}; # FIXME: Error handling + $data =~ s/mod_//g; return [ split(/\s+/, $data) ]; @@ -1070,8 +1041,12 @@ } @newList = (@known, @unknown); - SCR->Write('.sysconfig.apache2.APACHE_MODULES', join(' ',@newList)); - SCR->Write('.sysconfig.apache2', undef); + SCR->Execute('.target.bash', 'for module in $(a2enmod -l);do a2enmod -d $module; done'); + foreach my $module (@newList){ + SCR->Execute('.target.bash', "a2enmod $module"); + } +# SCR->Write('.sysconfig.apache2.APACHE_MODULES', join(' ',@newList)); +# SCR->Write('.sysconfig.apache2', undef); return 1; } @@ -1622,15 +1597,11 @@ $file .= '-cert.pem'; if( not $pemData ) { -# SCR->Execute( '.target.remove', $file ); -# $self->ModifyHostKey( $host, 'SSLCertificateFile' ); } elsif( $pemData !~ /BEGIN CERTIFICATE/ ) { return $self->SetError( summary => __("Corrupt PEM data."), code => 'CERT_ERROR' ); } else { SCR->Write( '.target.string', $file, $pemData ); SCR->Execute( '.target.bash', "chmod 0400 $file" ); -# $self->ModifyHostKey( $host, 'SSLCertificateFile', $file ); -# $self->ModifyHostKey( $host, 'SSLCertificateKeyFile', $file ) if( $key ); } return $self->ModifyHost( $hostid, $host ); } @@ -1673,16 +1644,12 @@ $file .= '-key.pem'; if( not $pemData ) { -# SCR->Execute( '.target.remove', $file ); -# $self->ModifyHostKey( $host, 'SSLCertificateKeyFile' ); } elsif( $pemData !~ /PRIVATE KEY/ ) { return $self->SetError( summary => __("Corrupt PEM data."), code => 'CERT_ERROR' ); } else { my $cert = ($pemData =~ /BEGIN CERTIFICATE/)?(1):(0); SCR->Write( '.target.string', $file, $pemData ); SCR->Execute( '.target.bash', "chmod 0400 $file" ); -# $self->ModifyHostKey( $host, 'SSLCertificateKeyFile', $file ); -# $self->ModifyHostKey( $host, 'SSLCertificateFile', $file ) if( $cert ); } return $self->ModifyHost( $hostid, $host ); } 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-http-server-2.18.0/src/YaST/HTTPDData.pm new/yast2-http-server-2.18.2/src/YaST/HTTPDData.pm --- old/yast2-http-server-2.18.0/src/YaST/HTTPDData.pm 2008-11-19 16:37:35.000000000 +0100 +++ new/yast2-http-server-2.18.2/src/YaST/HTTPDData.pm 2009-03-05 14:58:04.000000000 +0100 @@ -97,8 +97,6 @@ } ] }; -# push( @{$hosts{'default'}}, $dirEntry ); -# $dirty{MODIFIED}->{'default'} = 1; return $dirEntry; } @@ -208,53 +206,10 @@ my $hostdata = shift; return undef if( ! $self->checkHostmap( $hostdata ) ); - -# my $dr; -# my $vbn; -# foreach my $h ( @{$hosts{$hostid}} ) { -# if( $h->{KEY} eq 'DocumentRoot' ) { -# $dr = $h->{VALUE}; -# } elsif( $h->{KEY} eq 'VirtualByName' ) { -# $vbn = $h->{VALUE}; -# } -# } -# $hosts{$hostid} = $hostdata; if ($hostid ne 'main') { YaPI::HTTPD->modifyVH($hostid, $hostdata); - - -# foreach my $h ( @{$hosts{$hostid}} ) { -# if( $h->{KEY} eq 'DocumentRoot' ) { -# if( $dr ne $h->{VALUE} ) { -# $self->delDir( $dr ); -# $self->addDir( $h->{VALUE} ); -# } -# } els -# if( $h->{KEY} eq 'VirtualByName' ) { -# if( $vbn ne $h->{VALUE} ) { -# $hostid =~ /^([^\/]+)/; -# my $vhost = $1; -# if( $h->{VALUE} == 1 and $self->getNVH( $vhost ) == 0 ) { -# push( @{$hosts{'main'}}, { KEY => 'NameVirtualHost', VALUE => $1 } ); -# } elsif( $h->{VALUE} == 0 and $self->getNVH( $vhost ) == 1 ) { -# my @newData = (); -# while( my $e = shift(@{$hosts{'main'}}) ) { -# if( $e->{KEY} eq 'NameVirtualHost' and -# $e->{VALUE} eq $vhost ) { -# push( @newData, @{$hosts{'main'}} ); -# last; -# } -# push( @newData, $e ); -# } -# $hosts{'main'} = \@newData; -# } -# $dirty{MODIFIED}->{'main'} = 1; -# } -# } -# } - $dirty{MODIFIED}->{$hostid} = 1 unless( exists($dirty{NEW}->{$hostid}) ); } else { YaPI::HTTPD->modifyMain($hostdata); @@ -272,19 +227,6 @@ if( ! $self->checkHostmap( $hostdata ) ) { return undef; } -# foreach my $h ( @$hostdata ) { -# if( $h->{KEY} eq 'DocumentRoot' ) { -# $dir=$self->addDir($h->{VALUE}); -# } elsif( $h->{KEY} eq 'VirtualByName' and $h->{VALUE} ) { -# $hostid =~ /^([^\/]+)/; -# my $v = $1; -# if( $self->getNVH( $v ) == 0 ) { -# push( @{$hosts{'main'}}, { KEY => 'NameVirtualHost', VALUE => $v } ); -# $dirty{MODIFIED}->{'main'} = 1; -# } -# } -# } - # don't create Directory for DocumentRoot, if already exists if ($dir ne ""){ foreach my $row (@$hostdata) { @@ -566,11 +508,8 @@ sub GetCurrentListen { my $self = shift; my @new; -#y2internal("BEGIN - newListen ", Dumper(\%newListen), "oldListen", Dumper(@oldListen), "delListen ", Dumper(\%delListen)); -#y2internal("new ", Dumper(\@new)); foreach my $new ( keys(%newListen) ) { my ($ip, $fp, $tp, $port) = ('', '', '', ''); -# if ( $new =~ m/\[([\w\W]*)\]/; #) { $ip=$1; if ($new =~ m/\[$ip\]:([\d\:]*)/){ @@ -580,10 +519,7 @@ } $tp=$fp if ($tp eq ''); $port = ($fp eq $tp)?($fp):($fp.'-'.$tp); -# } push( @new, { ADDRESS => $ip, PORT => $port } ); -#y2internal("MIDDLE newListen ", Dumper(\%newListen), "oldListen", Dumper(@oldListen), "delListen ", Dumper(\%delListen)); -#y2internal("new ", Dumper(\@new)); } foreach my $old ( @oldListen ) { if( $old->{PORT} =~ /-/ ) { @@ -596,8 +532,6 @@ } push( @new, $old ); } -#y2internal("END - newListen ", Dumper(\%newListen), "oldListen", Dumper(@oldListen), "delListen ", Dumper(\%delListen)); -#y2internal("new ", Dumper(\@new)); return \@new; } 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-http-server-2.18.0/src/YaST/httpdUtils.pm new/yast2-http-server-2.18.2/src/YaST/httpdUtils.pm --- old/yast2-http-server-2.18.0/src/YaST/httpdUtils.pm 2008-04-10 08:47:09.000000000 +0200 +++ new/yast2-http-server-2.18.2/src/YaST/httpdUtils.pm 2009-03-05 15:00:12.000000000 +0100 @@ -48,14 +48,9 @@ my %checkMap = ( ServerAdmin => qr/^[^@]+@[^@]+$/, ServerName => qr/^[\w\d.-]+$/, -# SSL => qr/^[012]$/, # more to go ); -# my $ssl = 0; -# my $nb_vh = 0; -# my $dr = 0; -# my $sn = 0; foreach my $entry ( @$host ) { next unless( exists($checkMap{$entry->{KEY}}) ); my $re = $checkMap{$entry->{KEY}}; @@ -63,10 +58,6 @@ return $self->SetError( summary => sprintf( __("Illegal '%s' parameter"), $entry->{KEY} ), code => "PARAM_CHECK_FAILED" ); } -# $ssl = $entry->{VALUE} if( $entry->{KEY} eq 'SSL' ); -# $nb_vh = $entry->{VALUE} if( $entry->{KEY} eq 'VirtualByName' ); -# $dr = 1 if( $entry->{KEY} eq 'DocumentRoot' ); -# $sn = 1 if( $entry->{KEY} eq 'ServerName' ); } return $self->SetError( summary => __('ssl together with "virtual by name" is not possible'), code => 'PARAM_CHECK_FAILED' ) if( $ssl and $nb_vh ); @@ -79,24 +70,6 @@ my $self = shift; my @data = SCR->Read('.http_server.vhosts'); - # this is a hack. - # yast will put some directives in define sections - # automatically and here we remove them - -# if( ref($data[0]) eq 'HASH' ) { -# foreach my $file ( keys %{$data[0]} ) { -# foreach my $host ( @{$data[0]->{$file}} ) { -# foreach my $data ( @{$host->{DATA}} ) { -# if( exists($data->{OVERHEAD}) and -# $data->{OVERHEAD} =~ /# YaST auto define section/ ) { -# $data = $data->{VALUE}->[0]; # delete the "auto define" section -# } -# } -# } -# } -# } - - return @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-http-server-2.18.0/VERSION new/yast2-http-server-2.18.2/VERSION --- old/yast2-http-server-2.18.0/VERSION 2009-02-23 12:15:11.000000000 +0100 +++ new/yast2-http-server-2.18.2/VERSION 2009-03-06 16:49:02.000000000 +0100 @@ -1 +1 @@ -2.18.0 +2.18.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-core for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at Sat Mar 7 11:48:26 CET 2009. -------- --- yast2-core/yast2-core.changes 2009-01-29 17:29:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2009-03-06 14:27:43.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Mar 6 13:53:48 CET 2009 - mvidner(a)suse.cz + +- ag_background: re-disabled the testsuite, silly me. +- 2.18.4 + +------------------------------------------------------------------- +Fri Mar 6 13:08:10 CET 2009 - lslezak(a)suse.cz + +- put backtrace begin and end markers to y2log when e.g. + y2error(-1, ...) is called + +------------------------------------------------------------------- +Fri Mar 6 10:57:11 CET 2009 - mvidner(a)suse.cz + +- ag_background: re-enabled the testsuite (bnc#470645#c11), + with some expect magic (~bnc#475551) + +------------------------------------------------------------------- +Wed Feb 25 14:49:33 CET 2009 - mvidner(a)suse.cz + +- Fixed tty_wrapper losing output: stdio was interrupted by SIGCHLD (bnc#470645). + +------------------------------------------------------------------- +Sun Feb 01 03:14:16 CET 2009 - mvidner(a)suse.cz + +- dbus: fixed timeout handling to reduce latency (kkaempf) + http://lists.opensuse.org/yast-devel/2009-02/msg00004.html +- dbus: code cleanup (kkaempf) +- dbus: fixed resource leaks (aschnell, lslezak) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-core-2.18.3.tar.bz2 New: ---- yast2-core-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.W31091/_old 2009-03-07 11:47:59.000000000 +0100 +++ /var/tmp/diff_new_pack.W31091/_new 2009-03-07 11:47:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-core (Version 2.18.3) +# spec file for package yast2-core (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-core -Version: 2.18.3 +Version: 2.18.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.18.3.tar.bz2 +Source0: yast2-core-2.18.4.tar.bz2 Prefix: /usr # obviously BuildRequires: gcc-c++ @@ -95,7 +95,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-core-2.18.3 +%setup -n yast2-core-2.18.4 %build %{prefix}/bin/y2tool y2autoconf @@ -181,6 +181,22 @@ %doc %{_datadir}/doc/yastdoc /usr/share/YaST2/data/devtools/bin/generateYCPWrappers %changelog +* Fri Mar 06 2009 mvidner(a)suse.cz +- ag_background: re-disabled the testsuite, silly me. +- 2.18.4 +* Fri Mar 06 2009 lslezak(a)suse.cz +- put backtrace begin and end markers to y2log when e.g. + y2error(-1, ...) is called +* Fri Mar 06 2009 mvidner(a)suse.cz +- ag_background: re-enabled the testsuite (bnc#470645#c11), + with some expect magic (~bnc#475551) +* Wed Feb 25 2009 mvidner(a)suse.cz +- Fixed tty_wrapper losing output: stdio was interrupted by SIGCHLD (bnc#470645). +* Sun Feb 01 2009 mvidner(a)suse.cz +- dbus: fixed timeout handling to reduce latency (kkaempf) + http://lists.opensuse.org/yast-devel/2009-02/msg00004.html +- dbus: code cleanup (kkaempf) +- dbus: fixed resource leaks (aschnell, lslezak) * Thu Jan 29 2009 aschnell(a)suse.de - added dbus client agent (required for bnc #464453) - 2.18.3 ++++++ yast2-core-2.18.3.tar.bz2 -> yast2-core-2.18.4.tar.bz2 ++++++ ++++ 36926 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-core-2.18.3/agent-dbus/conf/dbus.scr new/yast2-core-2.18.4/agent-dbus/conf/dbus.scr --- old/yast2-core-2.18.3/agent-dbus/conf/dbus.scr 2009-01-27 11:14:24.000000000 +0100 +++ new/yast2-core-2.18.4/agent-dbus/conf/dbus.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -/** - * File: - * dbus.scr - * Authors: - * Arvin Schnell <aschnell(a)suse.de> - */ -.dbus - -`ag_dbus() 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-core-2.18.3/agent-dbus/conf/dbus.session.scr new/yast2-core-2.18.4/agent-dbus/conf/dbus.session.scr --- old/yast2-core-2.18.3/agent-dbus/conf/dbus.session.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.18.4/agent-dbus/conf/dbus.session.scr 2009-02-12 15:55:28.000000000 +0100 @@ -0,0 +1,11 @@ +/** + * File: + * dbus.session.scr + * Authors: + * Arvin Schnell <aschnell(a)suse.de> + */ +.dbus.session + +`ag_dbus( + `Bus("session") +) 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-core-2.18.3/agent-dbus/conf/dbus.system.scr new/yast2-core-2.18.4/agent-dbus/conf/dbus.system.scr --- old/yast2-core-2.18.3/agent-dbus/conf/dbus.system.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.18.4/agent-dbus/conf/dbus.system.scr 2009-02-12 15:55:28.000000000 +0100 @@ -0,0 +1,11 @@ +/** + * File: + * dbus.system.scr + * Authors: + * Arvin Schnell <aschnell(a)suse.de> + */ +.dbus.system + +`ag_dbus( + `Bus("system") +) 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-core-2.18.3/agent-dbus/conf/Makefile.am new/yast2-core-2.18.4/agent-dbus/conf/Makefile.am --- old/yast2-core-2.18.3/agent-dbus/conf/Makefile.am 2009-01-27 11:14:42.000000000 +0100 +++ new/yast2-core-2.18.4/agent-dbus/conf/Makefile.am 2009-02-12 15:55:28.000000000 +0100 @@ -2,6 +2,6 @@ # Makefile.am for core/agent-dbus/conf # -scrconf_DATA = dbus.scr +scrconf_DATA = dbus.system.scr dbus.session.scr EXTRA_DIST = $(scrconf_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-core-2.18.3/agent-dbus/src/DbusAgent.cc new/yast2-core-2.18.4/agent-dbus/src/DbusAgent.cc --- old/yast2-core-2.18.3/agent-dbus/src/DbusAgent.cc 2009-01-29 15:13:13.000000000 +0100 +++ new/yast2-core-2.18.4/agent-dbus/src/DbusAgent.cc 2009-02-12 15:55:28.000000000 +0100 @@ -13,27 +13,15 @@ DbusAgent::DbusAgent() + : connection(NULL) { - y2milestone("connecting dbus"); - dbus_error_init(&error); - - connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (dbus_error_is_set(&error)) - { - y2error("dbus_bus_get failed (%s)\n", error.message); - dbus_error_free(&error); - } - - if (connection == NULL) - { - y2error("connecting dbus failed"); - } } DbusAgent::~DbusAgent() { + disconnect(); } @@ -149,16 +137,23 @@ { const char* param = tmp3->asString()->value_cstr(); if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &param)) + { + dbus_message_unref(message); return YCPError("dbus_message_iter_append_basic() failed"); + } } else if (tmp3->isBoolean()) { bool param = tmp3->asBoolean()->value(); if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &param)) + { + dbus_message_unref(message); return YCPError("dbus_message_iter_append_basic() failed"); + } } else { + dbus_message_unref(message); return YCPError("Unsupported type"); } } @@ -185,3 +180,62 @@ return YCPError(string("Undefined subpath for Execute(") + path->toString() + ")"); } + + +YCPValue +DbusAgent::otherCommand(const YCPTerm& term) +{ + string sym = term->name(); + + if (sym == "Bus") + { + if (term->size() != 1 || !term->value(0)->isString()) + { + return YCPError("Bad number of arguments. Expecting Bus (\"type\")"); + } + + string bus = term->value(0)->asString()->value(); + if (bus == "system") + connect(DBUS_BUS_SYSTEM); + else if (bus == "session") + connect(DBUS_BUS_SESSION); + else + return YCPError("Unknown bus"); + + return YCPBoolean(true); + } + + return YCPNull(); +} + + +void +DbusAgent::connect(DBusBusType type) +{ + disconnect(); + + y2milestone("connecting dbus"); + + connection = dbus_bus_get(type, &error); + if (dbus_error_is_set(&error)) + { + y2error("dbus_bus_get() failed (%s)", error.message); + dbus_error_free(&error); + } + + if (connection == NULL) + { + y2error("connecting dbus failed"); + } +} + + +void +DbusAgent::disconnect() +{ + if (connection) + { + dbus_connection_unref(connection); + connection = NULL; + } +} 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-core-2.18.3/agent-dbus/src/DbusAgent.h new/yast2-core-2.18.4/agent-dbus/src/DbusAgent.h --- old/yast2-core-2.18.3/agent-dbus/src/DbusAgent.h 2009-01-29 12:54:01.000000000 +0100 +++ new/yast2-core-2.18.4/agent-dbus/src/DbusAgent.h 2009-02-12 15:55:28.000000000 +0100 @@ -52,8 +52,16 @@ */ virtual YCPList Dir(const YCPPath& path) { return YCPList(); } + /** + * Used for mounting the agent. + */ + virtual YCPValue otherCommand(const YCPTerm& term); + private: + void connect(DBusBusType type); + void disconnect(); + DBusConnection* connection; DBusError error; 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-core-2.18.3/agents-perl/doc/ycp-pm-pod.html new/yast2-core-2.18.4/agents-perl/doc/ycp-pm-pod.html --- old/yast2-core-2.18.3/agents-perl/doc/ycp-pm-pod.html 2009-01-23 20:00:39.000000000 +0100 +++ new/yast2-core-2.18.4/agents-perl/doc/ycp-pm-pod.html 2009-01-26 14:04:49.000000000 +0100 @@ -4,7 +4,7 @@ <head> <title>ycp - a Perl module for parsing and writing the YaST2 Communication Protocol</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> -<link rev="made" href="mailto:feedback@suse.de" /> +<link rev="made" href="mailto:root@localhost" /> </head> <body style="background-color: white"> @@ -104,36 +104,31 @@ A PerlYCPValue cannot represent a term but only a term is allowed to initialize an agent in a .scr file. Therefore <a href="#parseterm">ParseTerm</a> is provided. <dl> -<dt><a name="string_integer_boolean" class="item">string, integer, boolean</a> +<dt><a name="string_integer_boolean" class="item">string, integer, boolean</a></dt> <dd> Stored as a scalar. </dd> -</li> -<dt><a name="list" class="item">list</a> +<dt><a name="list" class="item">list</a></dt> <dd> Stored as a reference to a list of PerlYCPValues. </dd> -</li> -<dt><a name="map" class="item">map</a> +<dt><a name="map" class="item">map</a></dt> <dd> Stored as a reference to a map of PerlYCPValues. </dd> -</li> -<dt><a name="path" class="item">path</a> +<dt><a name="path" class="item">path</a></dt> <dd> Stored as a reference to a string (starting with a "." as expected). </dd> -</li> -<dt><a name="nil" class="item">nil (void)</a> +<dt><a name="nil" class="item">nil (void)</a></dt> <dd> Stored as an undef. </dd> -</li> </dl> 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-core-2.18.3/agents-perl/testsuite/t-echo.exp new/yast2-core-2.18.4/agents-perl/testsuite/t-echo.exp --- old/yast2-core-2.18.3/agents-perl/testsuite/t-echo.exp 2009-01-23 16:45:29.000000000 +0100 +++ new/yast2-core-2.18.4/agents-perl/testsuite/t-echo.exp 2009-03-06 10:47:26.000000000 +0100 @@ -3,8 +3,6 @@ source test-common.exp -expect -exact "" - # sleep: have it still running while this simple test runs send "`Execute(.run, \"sleep 2; echo Hello world\")\r" expect "(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-core-2.18.3/agents-perl/testsuite/test-common.exp new/yast2-core-2.18.4/agents-perl/testsuite/test-common.exp --- old/yast2-core-2.18.3/agents-perl/testsuite/test-common.exp 2009-01-23 16:45:29.000000000 +0100 +++ new/yast2-core-2.18.4/agents-perl/testsuite/test-common.exp 2009-03-06 13:41:26.000000000 +0100 @@ -1,7 +1,8 @@ # common setup for test cases of ag_backgound -#tests disabled until libyui is integrated -exit 0 +#tests disabled until I figure out bnc#475551 +exit 77 # automake TESTS: SKIP + # enlarge your input buffer now! satisfaction guaranteed! give us your $$$ match_max 100000 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-core-2.18.3/agents-perl/testsuite/t-norun.exp new/yast2-core-2.18.4/agents-perl/testsuite/t-norun.exp --- old/yast2-core-2.18.3/agents-perl/testsuite/t-norun.exp 2009-01-23 16:45:29.000000000 +0100 +++ new/yast2-core-2.18.4/agents-perl/testsuite/t-norun.exp 2009-03-06 10:47:26.000000000 +0100 @@ -3,8 +3,6 @@ source test-common.exp -expect -exact "" - send "`Read(.pid)\r" expect "(-1)" send_user "\n" 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-core-2.18.3/base/tools/tty_wrapper/tty_wrapper.cc new/yast2-core-2.18.4/base/tools/tty_wrapper/tty_wrapper.cc --- old/yast2-core-2.18.3/base/tools/tty_wrapper/tty_wrapper.cc 2009-01-23 16:45:39.000000000 +0100 +++ new/yast2-core-2.18.4/base/tools/tty_wrapper/tty_wrapper.cc 2009-02-25 15:36:11.000000000 +0100 @@ -74,6 +74,32 @@ return true; } +void output(const std::string & s, int fd) +{ + const char *cs = s.c_str(); + while (true) { + ssize_t n = s.size(); + ssize_t w = write(fd, cs, n); + if (w == n) + break; // success + else if (w == -1) { + if (errno == EINTR) { + // perror("gotcha"); // bnc#470645 + } + else { + perror("write"); // other cases + break; + } + } + else { + errno = 0; + perror("short"); + cs += w; + n -= w; + } + } +} + int main(int argc, char **argv) { if (argc > 1) @@ -119,6 +145,11 @@ if (finish) { + // read the remaining pieces + std::string std_out(subprocess.read()); + output(std_out, 1); + std::string err_out(subprocess.readErr()); + output(err_out, 2); // SIGCHLD received, return the exit status return subprocess.close(); } @@ -168,7 +199,7 @@ { // read stdout of the subprocess and print it on stdout std::string std_out(subprocess.read()); - std::cout << std_out; + output(std_out, 1); } // stderr available @@ -176,7 +207,7 @@ { // read stderr of the subprocess and print it on stderr std::string err_out(subprocess.readErr()); - std::cerr << err_out; + output(err_out, 2); } } } @@ -189,4 +220,3 @@ return 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-core-2.18.3/configure.in new/yast2-core-2.18.4/configure.in --- old/yast2-core-2.18.3/configure.in 2009-01-29 17:14:12.000000000 +0100 +++ new/yast2-core-2.18.4/configure.in 2009-03-06 14:28:29.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-core dnl -dnl -- This file is generated by y2autoconf 2.18.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.18.3, http://bugs.opensuse.org/, yast2-core) +AC_INIT(yast2-core, 2.18.4, http://bugs.opensuse.org/, yast2-core) 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.18.3" +VERSION="2.18.4" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -285,6 +285,28 @@ HAVE_POLKIT=0 fi +# +# configuration for dbus/SCR_service +# + +# set access mode according to the PolicyKit status +# if policykit is disabled only root can access the service +if test $HAVE_POLKIT -ne 0; then +ACCESS_MODE=allow +else +ACCESS_MODE=deny +fi + + +YAST_SCR_SERVICE=org.opensuse.yast.SCR +YAST_SCR_INTERFACE=org.opensuse.yast.SCR.Methods +# @ybindir@ expands to ${prefix}/lib/..., force full expansion here +YAST_SCR_SERVICE_DIR=$ybindir +AC_SUBST(YAST_SCR_SERVICE) +AC_SUBST(YAST_SCR_SERVICE_DIR) +AC_SUBST(YAST_SCR_INTERFACE) +AC_SUBST(ACCESS_MODE) + AC_SUBST(POLKIT_CFLAGS) AC_SUBST(POLKIT_LIBS) AC_SUBST(HAVE_POLKIT) @@ -293,6 +315,10 @@ AC_CONFIG_FILES([ scr/doc/SCR.html scr/doc/intro_to_scr.html + dbus/SCR_service/org.opensuse.yast.SCR.conf + dbus/SCR_service/org.opensuse.yast.SCR.service.in + dbus/SCR_service/scr_names.h + dbus/SCR_service/test_SCR_dbus_server.rb ]) AC_CONFIG_FILES(Makefile liby2util-r/src/include/y2util/Makefile liby2util-r/src/include/Makefile 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-core-2.18.3/configure.in.in new/yast2-core-2.18.4/configure.in.in --- old/yast2-core-2.18.3/configure.in.in 2009-01-23 16:45:42.000000000 +0100 +++ new/yast2-core-2.18.4/configure.in.in 2009-02-23 15:23:51.000000000 +0100 @@ -124,6 +124,28 @@ HAVE_POLKIT=0 fi +# +# configuration for dbus/SCR_service +# + +# set access mode according to the PolicyKit status +# if policykit is disabled only root can access the service +if test $HAVE_POLKIT -ne 0; then +ACCESS_MODE=allow +else +ACCESS_MODE=deny +fi + + +YAST_SCR_SERVICE=org.opensuse.yast.SCR +YAST_SCR_INTERFACE=org.opensuse.yast.SCR.Methods +# @ybindir@ expands to ${prefix}/lib/..., force full expansion here +YAST_SCR_SERVICE_DIR=$ybindir +AC_SUBST(YAST_SCR_SERVICE) +AC_SUBST(YAST_SCR_SERVICE_DIR) +AC_SUBST(YAST_SCR_INTERFACE) +AC_SUBST(ACCESS_MODE) + AC_SUBST(POLKIT_CFLAGS) AC_SUBST(POLKIT_LIBS) AC_SUBST(HAVE_POLKIT) @@ -133,5 +155,9 @@ AC_CONFIG_FILES([ scr/doc/SCR.html scr/doc/intro_to_scr.html + dbus/SCR_service/org.opensuse.yast.SCR.conf + dbus/SCR_service/org.opensuse.yast.SCR.service.in + dbus/SCR_service/scr_names.h + dbus/SCR_service/test_SCR_dbus_server.rb ]) @YAST2-OUTPUT@ 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-core-2.18.3/dbus/SCR_service/DBusServer.cc new/yast2-core-2.18.4/dbus/SCR_service/DBusServer.cc --- old/yast2-core-2.18.3/dbus/SCR_service/DBusServer.cc 2009-01-23 16:45:37.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/DBusServer.cc 2009-02-23 15:24:40.000000000 +0100 @@ -14,6 +14,10 @@ #include <ycp/y2log.h> +#include "scr_names.h" + +#define TIMEOUT 15 /* 30 secs idle timeout */ + extern "C" { // nanosleep() @@ -44,16 +48,16 @@ } +// connect to DBus, request a service name bool DBusServer::connect() { - // connect to DBus, request a service name - return connection.connect(DBUS_BUS_SYSTEM, "org.opensuse.yast.SCR"); + return connection.connect(DBUS_BUS_SYSTEM, YAST_SCR_SERVICE); } -// set 30 second timer +// reset idle timer void DBusServer::resetTimer() { - ::alarm(30); + ::alarm(TIMEOUT); } // NOTE: this is a signal handler, do only really necessary tasks here! @@ -67,6 +71,7 @@ } } +// register signal handler for idle timeout void DBusServer::registerSignalHandler() { struct sigaction new_action, old_action; @@ -82,10 +87,10 @@ } } +// check if clients are still running, +// remove finished clients bool DBusServer::canFinish() { - // check if clients are still running, - // remove finished clients for(Clients::iterator it = clients.begin(); it != clients.end();) { @@ -134,7 +139,7 @@ // the time is over if (finish) { - y2milestone("Timout signal received"); + y2milestone("Timeout signal received"); if (canFinish()) { @@ -150,14 +155,14 @@ } } - // set 5 seconds timeout - connection.setTimeout(5000); // try reading a message from DBus DBusMsg request(connection.receive()); // check if a message was received if (request.empty()) { + /* run the mainloop only on message or after(!) reaching the idle timeout */ + connection.setTimeout((TIMEOUT+1)*1000); /* returns on message or timeout */ continue; } @@ -172,7 +177,9 @@ request.interface().c_str(), request.method().c_str()); // check this is a method call for the right object, interface & method - if (request.type() == DBUS_MESSAGE_TYPE_METHOD_CALL && request.interface() == "org.opensuse.yast.SCR.Methods" && request.path() == "/SCR") + if (request.type() == DBUS_MESSAGE_TYPE_METHOD_CALL + && request.interface() == YAST_SCR_INTERFACE + && request.path() == SCR_OBJECT_PATH) { std::string method(request.method()); @@ -182,9 +189,14 @@ bool check_ok = false; // check missing arguments - if (method == "Read" || method == "Write" || method == "Execute" || - method == "Dir" || method == "Error" || method == "UnregisterAgent" || - method == "UnmountAgent" || method == "RegisterAgent") + if (method == METHOD_READ + || method == METHOD_WRITE + || method == METHOD_EXECUTE + || method == METHOD_DIR + || method == METHOD_ERROR + || method == METHOD_UNREGISTER + || method == METHOD_UNMOUNT + || method == METHOD_REGISTER) { if (request.arguments() == 0) { @@ -207,7 +219,7 @@ } } } - else if (method == "UnregisterAllAgents" || method != "RegisterNewAgents") + else if (method == METHOD_UNREGISTER_ALL || method != METHOD_REGISTER_NEW) { check_ok = true; } @@ -254,29 +266,29 @@ YCPValue ret; - if (method == "Read") + if (method == METHOD_READ) ret = sa->Read(pth, arg, opt); - else if (method == "Write") + else if (method == METHOD_WRITE) ret = sa->Write(pth, arg, opt); - else if (method == "Execute") + else if (method == METHOD_EXECUTE) ret = sa->Execute(pth, arg, opt); - else if (method == "Dir") + else if (method == METHOD_DIR) { ret = sa->Dir(pth); if (ret.isNull()) ret = YCPList(); } - else if (method == "Error") + else if (method == METHOD_ERROR) ret = sa->Error(pth); - else if (method == "UnregisterAgent") + else if (method == METHOD_UNREGISTER) ret = sa->UnregisterAgent(pth); - else if (method == "UnregisterAllAgents") + else if (method == METHOD_UNREGISTER_ALL) ret = sa->UnregisterAllAgents(); - else if (method == "UnmountAgent") + else if (method == METHOD_UNMOUNT) ret = sa->UnmountAgent(pth); - else if (method == "RegisterNewAgents") + else if (method == METHOD_REGISTER_NEW) ret = sa->RegisterNewAgents(); - else if (method == "RegisterAgent") + else if (method == METHOD_REGISTER) ret = sa->RegisterAgent(pth, arg); else y2internal("Unhandled method %s", method.c_str()); @@ -298,11 +310,11 @@ { y2milestone("Requesting path: %s", request.path().c_str()); // define all exported methods here - const char *introspect = (request.path() != "/SCR") ? + const char *introspect = (request.path() != SCR_OBJECT_PATH) ? // introcpection data for the root node DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<node>" -" <interface name='org.freedesktop.DBus.Introspectable'>" +" <interface name='"DBUS_INTERFACE_INTROSPECTABLE"'>" " <method name='Introspect'>" " <arg name='xml_data' type='s' direction='out'/>" " </method>" @@ -313,58 +325,58 @@ // introcpection data for SCR node DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<node>" -" <interface name='org.opensuse.yast.SCR.Methods'>" -" <method name='Read'>" +" <interface name='"YAST_SCR_INTERFACE"'>" +" <method name='"METHOD_READ"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='arg' type='(bsv)' direction='in'/>" " <arg name='opt' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='Write'>" +" <method name='"METHOD_WRITE"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='arg' type='(bsv)' direction='in'/>" " <arg name='opt' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='Execute'>" +" <method name='"METHOD_EXECUTE"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='arg' type='(bsv)' direction='in'/>" " <arg name='opt' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='Dir'>" +" <method name='"METHOD_DIR"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='Error'>" +" <method name='"METHOD_ERROR"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='UnregisterAgent'>" +" <method name='"METHOD_UNREGISTER"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='UnregisterAllAgents'>" +" <method name='"METHOD_UNREGISTER_ALL"'>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='RegisterNewAgents'>" +" <method name='"METHOD_REGISTER_NEW"'>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='RegisterAgent'>" +" <method name='"METHOD_REGISTER"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='arg' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <method name='UnmountAgent'>" +" <method name='"METHOD_UNMOUNT"'>" " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" -" <interface name='org.freedesktop.DBus.Introspectable'>" +" </interface>" +" <interface name='"DBUS_INTERFACE_INTROSPECTABLE"'>" " <method name='Introspect'>" " <arg name='xml_data' type='s' direction='out'/>" " </method>" " </interface>" -" </interface>" "</node>"; // create a reply to the request @@ -373,8 +385,8 @@ } else if (request.type() == DBUS_MESSAGE_TYPE_METHOD_CALL) { - y2warning("Ignoring unknown interface or method call: interface: %s, method: %s", - request.interface().c_str(), request.method().c_str()); + y2warning("Ignoring unknown object, interface or method call: object: %s, interface: %s, method: %s", + request.path().c_str(), request.interface().c_str(), request.method().c_str()); // report error reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); @@ -421,11 +433,12 @@ } #ifdef HAVE_POLKIT +// check if action is allowed by PolicyKit bool DBusServer::isActionAllowed(const std::string &caller, const std::string &path, const std::string &method, const std::string &arg, const std::string &opt) { // create actionId - static const char *polkit_prefix = "org.opensuse.yast.scr"; + static const char *polkit_prefix = POLKIT_PREFIX; // check the access right to all methods at first (see bnc#449794) std::string action_id(PolKit::createActionId(polkit_prefix, "", method, "", "")); @@ -478,8 +491,8 @@ DBusMsg query; // ask the DBus server for the PID of the caller - query.createCall("org.freedesktop.DBus", "/org/freedesktop/DBus/Bus", - "org.freedesktop.DBus", "GetConnectionUnixProcessID"); + query.createCall(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS"/Bus", + DBUS_SERVICE_DBUS, "GetConnectionUnixProcessID"); query.addString(bus_name); 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-core-2.18.3/dbus/SCR_service/Makefile.am new/yast2-core-2.18.4/dbus/SCR_service/Makefile.am --- old/yast2-core-2.18.3/dbus/SCR_service/Makefile.am 2009-01-23 16:45:37.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/Makefile.am 2009-02-12 15:55:28.000000000 +0100 @@ -1,8 +1,12 @@ # -# Makefile.am for dbus/service +# Makefile.am for dbus/SCR_service # -EXTRA_DIST=org.opensuse.yast.SCR.service.in org.opensuse.yast.SCR.conf.in org.opensuse.yast.scr.policy +EXTRA_DIST=org.opensuse.yast.SCR.service.in.in \ + org.opensuse.yast.SCR.conf.in \ + org.opensuse.yast.scr.policy \ + scr_names.h.in \ + test_SCR_dbus_server.rb.in AM_CXXFLAGS = -DY2LOG=\"SCR-service\" -DSUSEVERSION=\"${SUSEVERSION}\" @@ -24,35 +28,22 @@ check-local: polkit-policy-file-validate $(polkit_policies_DATA) - # service activation config # FIXME?? dbus pkgconfig provides only 'session_bus_services_dir' dbus_servicesdir = `pkg-config --print-errors --variable prefix dbus-1`/share/dbus-1/system-services -dbus_services_in_files = org.opensuse.yast.SCR.service.in +# Can't use autoconf only because @ybindir@ expands to '${prefix}/...'. +# So must use %YBINDIR% and expand it via sed during make +# Ouch, ouch, ouch +dbus_services_in_files = org.opensuse.yast.SCR.service.in dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) $(dbus_services_DATA): $(dbus_services_in_files) - sed -e "s|\@YBINDIR\@|$(ybindir)|" $< > $@ + sed -e "s|\%YBINDIR\%|$(ybindir)|" $< > $@ # service config dbus_confdir = `pkg-config --print-errors --variable sysconfdir dbus-1`/dbus-1/system.d - -dbus_conf_in_files = org.opensuse.yast.SCR.conf.in - -dbus_conf_DATA = $(dbus_conf_in_files:.conf.in=.conf) - -# set access mode according to the PolicyKit status -# if policykit is disabled only root can access the service -if HAVE_POLKIT -dbus_access_mode=allow -else -dbus_access_mode=deny -endif - -$(dbus_conf_DATA): $(dbus_conf_in_files) - sed -e "s|\@ACCESS_MODE\@|$(dbus_access_mode)|" $< > $@ - +dbus_conf_DATA = org.opensuse.yast.SCR.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-core-2.18.3/dbus/SCR_service/org.opensuse.yast.SCR.conf.in new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.SCR.conf.in --- old/yast2-core-2.18.3/dbus/SCR_service/org.opensuse.yast.SCR.conf.in 2009-01-26 14:21:45.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.SCR.conf.in 2009-02-12 15:55:28.000000000 +0100 @@ -5,16 +5,20 @@ http://lists.opensuse.org/opensuse-packaging/2009-01/msg00132.html https://bugzilla.novell.com/show_bug.cgi?id=468390 --> + + <policy user="root"> - <allow own="org.opensuse.yast.SCR"/> - <allow send_destination="org.opensuse.yast.SCR"/> + <allow own="@YAST_SCR_SERVICE@"/> + <allow send_destination="@YAST_SCR_SERVICE@"/> </policy> <policy context="default">  - <@ACCESS_MODE@ send_destination="org.opensuse.yast.SCR" - send_interface="org.opensuse.yast.SCR.Methods"/> + <@ACCESS_MODE@ send_destination="@YAST_SCR_SERVICE@" + send_interface="@YAST_SCR_INTERFACE@"/>  - <allow send_destination="org.opensuse.yast.SCR" + <allow send_destination="@YAST_SCR_SERVICE@" send_interface="org.freedesktop.DBus.Introspectable" /> </policy> </busconfig> 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-core-2.18.3/dbus/SCR_service/org.opensuse.yast.scr.policy new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.scr.policy --- old/yast2-core-2.18.3/dbus/SCR_service/org.opensuse.yast.scr.policy 2009-01-23 16:45:37.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.scr.policy 2009-02-12 15:55:28.000000000 +0100 @@ -29,7 +29,7 @@ </action> <action id="org.opensuse.yast.scr.execute"> - <description>Yast SCR Write Method</description> + <description>Yast SCR Execute Method</description> <message>System policy prevents the Yast SCR service from executing system calls.</message> <defaults> @@ -40,7 +40,7 @@ </action> <action id="org.opensuse.yast.scr.dir"> - <description>Yast SCR Write Method</description> + <description>Yast SCR Dir Method</description> <message>System policy prevents the Yast SCR service from listing agent properties.</message> <defaults> @@ -51,7 +51,7 @@ </action> <action id="org.opensuse.yast.scr.registeragent"> - <description>Yast SCR Write Method</description> + <description>Yast SCR RegisterAgent Method</description> <message>System policy prevents the Yast SCR service from registering a new agent.</message> <defaults> @@ -62,7 +62,7 @@ </action> <action id="org.opensuse.yast.scr.unregisteragent"> - <description>Yast SCR Write Method</description> + <description>Yast SCR UnregisterAgent Method</description> <message>System policy prevents the Yast SCR service from unregistering an agent.</message> <defaults> @@ -73,7 +73,7 @@ </action> <action id="org.opensuse.yast.scr.unmountagent"> - <description>Yast SCR Write Method</description> + <description>Yast SCR UnmountAgent Method</description> <message>System policy prevents the Yast SCR service from unmounting an agent.</message> <defaults> @@ -84,7 +84,7 @@ </action> <action id="org.opensuse.yast.scr.error"> - <description>Yast SCR Write Method</description> + <description>Yast SCR Error Method</description> <message>System policy prevents the Yast SCR service from reading error status.</message> <defaults> @@ -95,7 +95,7 @@ </action> <action id="org.opensuse.yast.scr.unregisterallagents"> - <description>Yast SCR Write Method</description> + <description>Yast SCR UnregisterAllAgents Method</description> <message>System policy prevents the Yast SCR service from unregistering all agents.</message> <defaults> @@ -106,7 +106,7 @@ </action> <action id="org.opensuse.yast.scr.registernewagents"> - <description>Yast SCR Write Method</description> + <description>Yast SCR RegisterNewAgents Method</description> <message>System policy prevents the Yast SCR service from registering new unloaded agents.</message> <defaults> 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-core-2.18.3/dbus/SCR_service/org.opensuse.yast.SCR.service.in new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.SCR.service.in --- old/yast2-core-2.18.3/dbus/SCR_service/org.opensuse.yast.SCR.service.in 2009-01-23 16:45:37.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.SCR.service.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# DBus service activation config -[D-BUS Service] -Name=org.opensuse.yast.SCR -Exec=@YBINDIR@/SCR_dbus_server -User=root 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-core-2.18.3/dbus/SCR_service/org.opensuse.yast.SCR.service.in.in new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.SCR.service.in.in --- old/yast2-core-2.18.3/dbus/SCR_service/org.opensuse.yast.SCR.service.in.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/org.opensuse.yast.SCR.service.in.in 2009-02-12 15:55:28.000000000 +0100 @@ -0,0 +1,5 @@ +# DBus service activation config +[D-BUS Service] +Name=@YAST_SCR_SERVICE@ +Exec=%YBINDIR%/SCR_dbus_server +User=root 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-core-2.18.3/dbus/SCR_service/scr_names.h.in new/yast2-core-2.18.4/dbus/SCR_service/scr_names.h.in --- old/yast2-core-2.18.3/dbus/SCR_service/scr_names.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/scr_names.h.in 2009-02-12 15:55:28.000000000 +0100 @@ -0,0 +1,22 @@ +/* + * scr_names.h - generated from scr_names.h.in + * + */ + +#define YAST_SCR_SERVICE "@YAST_SCR_SERVICE@" +#define YAST_SCR_INTERFACE "@YAST_SCR_INTERFACE@" + +#define METHOD_READ "Read" +#define METHOD_WRITE "Write" +#define METHOD_EXECUTE "Execute" +#define METHOD_DIR "Dir" +#define METHOD_ERROR "Error" +#define METHOD_REGISTER "RegisterAgent" +#define METHOD_UNREGISTER "UnregisterAgent" +#define METHOD_UNMOUNT "UnmountAgent" +#define METHOD_UNREGISTER_ALL "UnregisterAllAgents" +#define METHOD_REGISTER_NEW "RegisterNewAgents" + +#define SCR_OBJECT_PATH "/SCR" + +#define POLKIT_PREFIX "org.opensuse.yast.scr" 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-core-2.18.3/dbus/SCR_service/test_SCR_dbus_server.rb.in new/yast2-core-2.18.4/dbus/SCR_service/test_SCR_dbus_server.rb.in --- old/yast2-core-2.18.3/dbus/SCR_service/test_SCR_dbus_server.rb.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.18.4/dbus/SCR_service/test_SCR_dbus_server.rb.in 2009-03-06 10:30:21.000000000 +0100 @@ -0,0 +1,69 @@ +#!/usr/bin/env ruby + +# +# Test code for SCR_service +# +# test_SCR_dbus_server.rb is generated from test_SCR_dbus_server.rb.in +# +require 'test/unit' + +begin + require "dbus" +rescue Exception => e + $stderr.puts "Please install ruby-dbus" + exit +end + +class DBusTest < Test::Unit::TestCase + def test_loading + # Get the bus + system_bus = DBus::SystemBus.instance + assert system_bus + + # Get the yast service + yast = system_bus.service("@YAST_SCR_SERVICE@") + assert yast + + # Get the object from this service + # (using the root object of the service, for SCR there's just one) + objYast = yast.object("/#{yast.root}") + assert objYast + + # Create a local object for accessing the interface provided by the remote object + # The local application can 'talk' through this object which internally proxies + # all calls to the remote one via DBus. + poiSCR = DBus::ProxyObjectInterface.new(objYast, "@YAST_SCR_INTERFACE@") + assert poiSCR + end + def test_throughput + start = Time.now + count = 0 + while (Time.now - start < 1) + system_bus = DBus::SystemBus.instance + assert system_bus + + # Get the yast service + yast = system_bus.service("@YAST_SCR_SERVICE@") + assert yast + + # Get the object from this service + objYast = yast.object("/#{yast.root}") + assert objYast + + poiSCR = DBus::ProxyObjectInterface.new(objYast, "@YAST_SCR_INTERFACE@") + + res = poiSCR.define_method("Execute", "in path:(bsv), in arg:(bsv), in opt:(bsv), out ret:(bsv)") + + begin + r = poiSCR.Execute([false, "path", ["s",".target.bash_output"] ], + [false, "string", ["s","/bin/date +%r"] ], + [false, "", ["s",""] ]) + rescue Exception => e + end + count += 1 + end + elapsed = Time.now - start + persec = count / elapsed + puts "Throughput #{persec.to_i}/sec" + end +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-core-2.18.3/libycp/src/ExecutionEnvironment.cc new/yast2-core-2.18.4/libycp/src/ExecutionEnvironment.cc --- old/yast2-core-2.18.3/libycp/src/ExecutionEnvironment.cc 2009-01-23 16:45:30.000000000 +0100 +++ new/yast2-core-2.18.4/libycp/src/ExecutionEnvironment.cc 2009-03-06 13:41:36.000000000 +0100 @@ -93,7 +93,7 @@ { if (m_backtrace.size () == m_recursion_limit) { - y2error ("Recursion limit of %d call frames reached. Set the environment variable %s to change this", m_recursion_limit, Y2RECURSIONLIMIT); + y2error ("Recursion limit of %zd call frames reached. Set the environment variable %s to change this", m_recursion_limit, Y2RECURSIONLIMIT); return true; } return false; @@ -128,6 +128,8 @@ // FIXME: omit CallStack::const_reverse_iterator it = m_backtrace.rbegin(); + + y2logger(level, "------------- Backtrace begin -------------"); while (it != m_backtrace.rend()) { @@ -135,6 +137,8 @@ , "", "%s", (*it)->called_function.c_str ()); ++it; }; + + y2logger(level, "------------- Backtrace 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-core-2.18.3/libycp/testsuite/tests/builtin/Backtrace.err new/yast2-core-2.18.4/libycp/testsuite/tests/builtin/Backtrace.err --- old/yast2-core-2.18.3/libycp/testsuite/tests/builtin/Backtrace.err 2009-01-23 16:45:34.000000000 +0100 +++ new/yast2-core-2.18.4/libycp/testsuite/tests/builtin/Backtrace.err 2009-03-06 14:10:55.000000000 +0100 @@ -21,6 +21,8 @@ } ---------------------------------------------------------------------- [YCP] tests/builtin/Backtrace.ycp:6 My test +[libycp] ExecutionEnvironment.cc(backtrace):132 ------------- Backtrace begin ------------- [YCP] tests/builtin/Backtrace.ycp:10 aoo ((value + 1)) [YCP] tests/builtin/Backtrace.ycp:14 boo ((foo_val + 1)) [YCP] tests/builtin/Backtrace.ycp:17 foo (41) +[libycp] ExecutionEnvironment.cc(backtrace):141 ------------- Backtrace 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-core-2.18.3/VERSION new/yast2-core-2.18.4/VERSION --- old/yast2-core-2.18.3/VERSION 2009-01-29 15:15:50.000000000 +0100 +++ new/yast2-core-2.18.4/VERSION 2009-03-06 10:53:11.000000000 +0100 @@ -1 +1 @@ -2.18.3 +2.18.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-apparmor for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at Sat Mar 7 11:47:51 CET 2009. -------- --- yast2-apparmor/yast2-apparmor.changes 2009-02-11 16:33:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-apparmor/yast2-apparmor.changes 2009-03-06 18:01:07.844098000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 6 17:50:03 CET 2009 - kmachalkova(a)suse.cz + +- AA profiles editor adjusted to the new format of parsed profile + data (bnc#480099) +- 2.18.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-apparmor-2.18.1.tar.bz2 New: ---- yast2-apparmor-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.y28167/_old 2009-03-07 11:45:44.000000000 +0100 +++ /var/tmp/diff_new_pack.y28167/_new 2009-03-07 11:45:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-apparmor (Version 2.18.1) +# spec file for package yast2-apparmor (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://forge.novell.com/modules/xfmod/project/?apparmor Name: yast2-apparmor -Version: 2.18.1 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: Productivity/Security BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-apparmor-2.18.1.tar.bz2 +Source0: yast2-apparmor-2.18.2.tar.bz2 Prefix: /usr Summary: YaST2 - Plugins for AppArmor Profile Management Requires: yast2 perl-TimeDate @@ -51,7 +51,7 @@ jmichael(a)suse.de %prep -%setup -n yast2-apparmor-2.18.1 +%setup -n yast2-apparmor-2.18.2 %build %{prefix}/bin/y2tool y2autoconf @@ -101,6 +101,10 @@ [ -e $REPDIR2 ] || mkdir -p $REPDIR2 [ -e $REPDIR3 ] || mkdir -p $REPDIR3 %changelog +* Fri Mar 06 2009 kmachalkova(a)suse.cz +- AA profiles editor adjusted to the new format of parsed profile + data (bnc#480099) +- 2.18.2 * Wed Feb 11 2009 kmachalkova(a)suse.cz - Convert report names and modes to/from human readable strings (bnc#369119, bnc#371072) ++++++ yast2-apparmor-2.18.1.tar.bz2 -> yast2-apparmor-2.18.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.18.1/src/agents/ag_subdomain new/yast2-apparmor-2.18.2/src/agents/ag_subdomain --- old/yast2-apparmor-2.18.1/src/agents/ag_subdomain 2008-11-28 17:53:05.000000000 +0100 +++ new/yast2-apparmor-2.18.2/src/agents/ag_subdomain 2009-03-06 17:49:58.000000000 +0100 @@ -80,7 +80,8 @@ $result = Immunix::Notify::getNotifyStatus(); } elsif ( $command eq "Read" and $argument eq 'custom-includes') { my $cfg = Immunix::SubDomain::read_config("logprof.conf"); - ycp::ycpReturn(\@$cfg->{settings}{custom_includes}); + my @ret = split(' ', $cfg->{settings}{custom_includes}); + ycp::ycpReturn(\@ret); $donereturn = 1; } elsif ( $command eq "Execute" and $argument eq 'profile-syntax-check') { $result = profileSyntaxCheck(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.18.1/src/agents/ag_subdomain_profiles new/yast2-apparmor-2.18.2/src/agents/ag_subdomain_profiles --- old/yast2-apparmor-2.18.1/src/agents/ag_subdomain_profiles 2008-05-29 15:56:01.000000000 +0200 +++ new/yast2-apparmor-2.18.2/src/agents/ag_subdomain_profiles 2009-03-06 17:49:58.000000000 +0100 @@ -68,7 +68,7 @@ my ($command, $path, $argument) = ycp::ParseCommand ($_); $argument = "NONE" if ( ! $argument ); - ycp::y2milestone ("DOM command: $command, path: $path, argument: $argument"); + ycp::y2debug ("DOM command: $command, path: $path, argument: $argument"); my $result = undef; if ( $command && $path && $argument ) { @@ -127,7 +127,15 @@ } ycp::Return( "true" ); } - } + } elsif ( $command eq "Execute") { + if ( $path eq '.mode_to_string') { + my $ret = Immunix::SubDomain::mode_to_str( $argument ); + ycp::Return($ret); + } + elsif ($path eq '.string_to_mode') { + my $ret = Immunix::SubDomain::str_to_mode( $argument ); + ycp::Return($ret); + } } else { #ycpGetCommand and ycpGetArgType is obsolete, we have those #from ycp::ParseCommand @@ -141,5 +149,5 @@ } } exit 0; - +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.18.1/src/include/subdomain/profile_dialogs.ycp new/yast2-apparmor-2.18.2/src/include/subdomain/profile_dialogs.ycp --- old/yast2-apparmor-2.18.1/src/include/subdomain/profile_dialogs.ycp 2008-11-28 17:53:05.000000000 +0100 +++ new/yast2-apparmor-2.18.2/src/include/subdomain/profile_dialogs.ycp 2009-03-06 17:49:58.000000000 +0100 @@ -11,6 +11,7 @@ import "Wizard"; import "Popup"; import "Label"; +import "Map"; include "subdomain/capabilities.ycp"; textdomain "yast2-apparmor"; @@ -65,7 +66,7 @@ ); if ( linuxcapname != "" ) { - UI::ChangeWidget( `id(`caps), `CurrentValue, linuxcapname ); + UI::ChangeWidget( `id(`caps), `CurrentItem, linuxcapname ); } map event2 = $[]; @@ -85,13 +86,13 @@ } } until ( id2 == `save || id2 == `cancel ); - map<string, integer> newcapmap = $[]; + map<string, map> newcapmap = $[]; if ( id2 == `save ) { list<any> selectedcaps = (list<any>) UI::QueryWidget( `id(`caps), `SelectedItems ); string s = ""; foreach( any cpname, selectedcaps, { s = linnametolp[tostring(cpname)]:""; - newcapmap = add( newcapmap, s, 1); + newcapmap = add( newcapmap, s, $["audit":0, "set":1]); }); } UI::CloseDialog(); @@ -202,7 +203,7 @@ event2 = UI::WaitForEvent( timeout_millisec ); id2 = event2["ID"]:nil; // We'll need this often - cache it if ( id2 == `famItems ) { - if ( tostring(UI::QueryWidget( `famItems, `Value )) == "`allfam" ) { + if ( UI::QueryWidget( `famItems, `Value ) == `allfam ) { UI::ChangeWidget( `typeItems, `Value, `alltype ); UI::ChangeWidget( `typeItems, `Enabled, false ); } else { @@ -212,12 +213,12 @@ } until ( id2 == `save || id2 == `cancel ); if ( id2 == `save ) { rule = "network"; - string famselection = tostring(UI::QueryWidget( `famItems, `Value )); - string typeselection = tostring(UI::QueryWidget( `typeItems, `Value )); - if ( famselection != "`allfam" ) { - rule = rule + " " + regexpsub(famselection, "^`(.+)$", "\\1"); - if ( typeselection != "`alltype" ) { - rule = rule + " " + regexpsub(typeselection, "^`(.+)$", "\\1"); + symbol famselection = (symbol) UI::QueryWidget( `famItems, `Value ); + symbol typeselection = (symbol) UI::QueryWidget( `typeItems, `Value ); + if ( famselection != `allfam ) { + rule = rule + " " + substring( tostring(famselection), 1); + if ( typeselection != `alltype ) { + rule = rule + " " + substring( tostring(typeselection), 1); } } } else { @@ -519,53 +520,69 @@ define map deleteNetworkRule( map netRules, string rule ) { + map audit = netRules["audit"]:$[]; + map rules = netRules["rule"]:$[]; list netlist = splitstring( rule, " " ); integer netrulesize = size( netlist ); string family = ""; string sockettype = ""; if ( netrulesize == 1 ) { - return ( $[] ); + audit = $[]; + rules = $[]; } else if ( netrulesize == 2 ) { family = netlist[1]:""; - netRules = remove( netRules, family ); + audit = remove( audit, family ); + rules = remove( rules, family ); } else if ( netrulesize == 3 ) { family = netlist[1]:""; sockettype = netlist[2]:""; - any fam = netRules[family]:nil; + map a = audit[family]:$[]; + map r = rules[family]:$[]; + a = remove(a, sockettype); + r = remove(r, sockettype); + audit[family] = a; + rules[family] = r; + /*any fam = netRules[family]:nil; if ( is( fam, map ) ) { fam = remove( ((map) fam), sockettype ); netRules[family] = fam; } else { y2warning("deleteNetworkRule: deleting non-existing rule: " + rule); - } + }*/ } - return( netRules ); + return $["audit" : audit, "rule" : rules]; } define map addNetworkRule( map netRules, string rule ) { + map audit = netRules["audit"]:$[]; + map rules = netRules["rule"]:$[]; list netlist = splitstring( rule, " " ); integer netrulesize = size( netlist ); string family = ""; string sockettype = ""; if ( netrulesize == 1 ) { - return ( $["all":1] ); - } else if ( netrulesize == 2 ) { - //string all_net = netRules["all"]:nil; - if ( netRules["all"]:nil != nil ) { - netRules = remove( netRules, "all" ); - } - family = netlist[1]:""; - netRules[family] = "1"; - } else if ( netrulesize == 3 ) { - if ( netRules["all"]:nil != nil ) { - netRules = remove( netRules, "all" ); - } - family = netlist[1]:""; - sockettype = netlist[2]:""; - any any_fam = netRules[family]:nil; + return ( $["audit" : $["all":1], "rule" : $["all" :1] ] ); + } + else{ + if (haskey(audit, "all") && haskey(rules, "all")) { + audit = remove(audit, "all"); + rules = remove(rules, "all"); + } + + if ( netrulesize == 2 ) { + family = netlist[1]:""; + audit[family] = 0; + rules[family] = 1; + } else if ( netrulesize == 3 ) { + family = netlist[1]:""; + sockettype = netlist[2]:""; + audit[family] = add(audit[family]:$[], sockettype,0); + rules[family] = add(rules[family]:$[], sockettype,1); + } + /*any any_fam = netRules[family]:nil; map fam = nil; if ( is( any_fam, map ) ) { fam = (map) any_fam; @@ -574,9 +591,9 @@ fam = $[]; } fam[sockettype] = "1"; - netRules[family] = fam; + netRules[family] = fam;*/ } - return netRules; + return $[ "audit": audit, "rule": rules]; } define map editNetworkRule( map netRules, string old, string new ) { @@ -590,24 +607,30 @@ // define list<term> generateTableContents( map paths, map network, map caps, map includes, map hats ) { - list<term> newlist = []; + list<term> newlist = []; + integer indx = 0; foreach( string hatname, any hat, (map<string,map>) hats, { newlist = add( newlist, `item( `id(indx), "[+] ^"+ hatname, "")); indx = indx+1; }); + foreach( string incname, integer incval, (map<string,integer>) includes, { newlist = add( newlist, `item( `id(indx), "#include " +incname, "")); indx = indx+1; }); - foreach( string capname, integer capval, (map<string,integer>) caps, { + + foreach( string capname, map capval, (map<string,map>) caps, { map capdef = capdefs[capname]:nil; newlist = add( newlist, `item( `id(indx), capdef["name"]:"", "")); indx = indx+1; }); - foreach( string name, string val, (map<string,string>) paths, { - newlist = add( newlist, `item( `id(indx), name, val)); + + foreach( string name, map val, (map<string,map>) paths, { + string mode = (string) SCR::Execute(.subdomain_profiles.mode_to_string, val["mode"]:0); + newlist = add( newlist, `item( `id(indx), name, mode)); indx = indx+1; }); - foreach( string family, any any_fam, (map<string,any>) network, { + map rules = network["rule"]:$[]; + foreach( string family, any any_fam, (map<string,any>) rules, { if ( is( any_fam, map ) ) { foreach( string socktype, any any_type, (map<string,any>) any_fam, { newlist = add( newlist, @@ -725,10 +748,10 @@ if ( !hat ) { hats = collectHats( profile_map, pathname ); } - map paths = (map) profile["path"]:$[]; - map caps = (map) profile["capability"]:$[]; + map paths = (map) profile["allow","path"]:$[]; + map caps = (map) profile["allow","capability"]:$[]; map includes = (map) profile["include"]:$[]; - map netdomain = (map) profile["netdomain"]:$[]; + map netdomain = (map) profile["allow", "netdomain"]:$[]; list<term> profilelist = generateTableContents( paths, netdomain, caps, @@ -828,11 +851,11 @@ { event = UI::WaitForEvent( timeout_millisec ); id = event["ID"]:nil; // We'll need this often - cache it + integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); if ( (( id == `table ) && (event["EventReason"]:nil == "Activated" )) || ( id == `edit) ) { // Widget activated in the table - integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); string rule = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); integer findcap = find( rule, "CAP_"); integer findinc = find( rule, "#include"); @@ -841,7 +864,7 @@ string oldrule = rule; if ( findcap == 0 ) { caps = capabilityEntryPopup( caps, rule, pathname ); - profile["capability"] = caps; + profile["allow", "capability"] = caps; } else if ( findinc == 0 ) { Popup::Error(_("Include entries can not be edited. Please select add or delete to manage Include entries.")); continue; @@ -854,19 +877,19 @@ if ( newrule != "" && newrule != rule ) { netdomain = editNetworkRule( netdomain, rule, newrule ); } - profile["netdomain"] = netdomain; + profile["allow","netdomain"] = netdomain; } else { string perms = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 2, ""); map results = fileEntryPopup( rule, perms, pathname ); - string newperms = ""; - newperms = results["PERM"]:""; + integer newperms = 0; + newperms = (integer) SCR::Execute(.subdomain_profiles.string_to_mode, results["PERM"]:""); rule = results["FILE"]:""; if ( rule != "" ) { if ( rule != oldrule ) { paths = remove( paths, oldrule ); } - paths = add(paths, rule, newperms ); - profile["path"] = paths; + paths = add(paths, rule, $[ "audit": 0, "mode": newperms]); + profile["allow","path"] = paths; } } profile_map[pathname] = profile; @@ -877,9 +900,9 @@ includes, hats ); UI::ChangeWidget( `id(`table), `Items, profilelist ); + UI::ChangeWidget( `id(`table), `CurrentItem, itemselected ); } else if ( id == `delete ) { - integer selectedid = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string rule = (string) select((term) UI::QueryWidget(`id(`table), `Item(selectedid)), 1, ""); + string rule = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); integer findcap = find( rule, "CAP_"); integer findinc = find( rule, "#include"); integer findhat = find( rule, "[+] ^"); @@ -888,20 +911,21 @@ if ( findcap == 0 ) { string capNameToDelete = linnametolp[rule]:""; caps = remove( caps, capNameToDelete ); - profile["capability"] = caps; + profile["allow", "capability"] = caps; } else if ( findinc == 0 ) { string includeToRemove = substring( rule, 9); includes = remove( includes, includeToRemove ); profile["include"] = includes; } else if ( findhat == 0 ) { string hatToRemove = substring( rule, 5); + hats = remove( hats, hatToRemove); profile_map = remove( profile_map, hatToRemove ); } else if ( findnet == 0 ) { netdomain = deleteNetworkRule( netdomain, rule ); - profile["netdomain"] = netdomain; + profile["allow","netdomain"] = netdomain; } else { paths = remove( paths, rule ); - profile["path"] = paths; + profile["allow","path"] = paths; } profile_map[pathname] = profile; Settings["PROFILE_MAP"] = profile_map; @@ -911,9 +935,10 @@ includes, hats ); UI::ChangeWidget( `id(`table), `Items, profilelist ); + UI::ChangeWidget( `id(`table), `CurrentItem, (itemselected == 0) ? 0 : itemselected -1 ); } else if ( id == `file || id == `dir ) { string addfname = ""; - string addperms = ""; + integer addperms = 0; map newentry = nil; if ( id == `dir ) { newentry = dirEntryPopup( "", "", pathname ); @@ -924,10 +949,10 @@ continue; } addfname = newentry["FILE"]:""; - addperms = newentry["PERM"]:""; + addperms = (integer) SCR::Execute(.subdomain_profiles.string_to_mode, newentry["PERM"]:""); // Make sure that the entry doesn't already exist - paths = add( paths, addfname, addperms ); - profile["path"] = paths; + paths = add( paths, addfname, $["audit":0, "mode": addperms] ); + profile["allow","path"] = paths; profile_map[pathname] = profile; Settings["PROFILE_MAP"] = profile_map; list<term> profilelist = generateTableContents( paths, @@ -936,9 +961,10 @@ includes, hats ); UI::ChangeWidget( `id(`table), `Items, profilelist ); + UI::ChangeWidget( `id(`table), `CurrentItem, itemselected ); } else if ( id == `cap ) { caps = capabilityEntryPopup( caps, "", pathname ); - profile["capability"] = caps; + profile["allow","capability"] = caps; profile_map[pathname] = profile; Settings["PROFILE_MAP"] = profile_map; list<term> profilelist = generateTableContents( paths, @@ -956,16 +982,14 @@ return `showhat; } } else if ( id == `include ) { - any ci = SCR::Read(.subdomain, "custom-includes"); - list <any> customIncludes = tolist(ci); + list <string> customIncludes = (list <string>) SCR::Read(.subdomain, "custom-includes"); string newInclude = UI::AskForExistingFile( "/etc/apparmor.d/abstractions", "", _("Select File To Include")); if ( newInclude == nil || (string)newInclude == "" ) { continue; } list <string> validIncludes = [ "/etc/apparmor.d/abstractions", "/etc/apparmor.d/program-chunks", "/etc/apparmor.d/tunables" ]; - foreach( any incPath, (list<any>) customIncludes, { - string incPathStr = tostring(incPath); - validIncludes = add( validIncludes, "/etc/apparmor.d/" + incPathStr); + foreach( string incPath, customIncludes, { + validIncludes = add( validIncludes, "/etc/apparmor.d/" + incPath); }); integer result = 0; @@ -1000,7 +1024,7 @@ string newrule = networkEntryPopup( "" ); if ( newrule != "" ) { netdomain = addNetworkRule( netdomain, newrule ); - profile["netdomain"] = netdomain; + profile["allow","netdomain"] = netdomain; profile_map[pathname] = profile; Settings["PROFILE_MAP"] = profile_map; list<term> profilelist = generateTableContents( paths, @@ -1026,8 +1050,8 @@ } } else { if ( ! haskey(hats, Settings["CURRENT_HAT"]:"") ) { - profile["path"] = paths; - profile["capability"] = caps; + profile["allow","path"] = paths; + profile["allow","capability"] = caps; profile["include"] = includes; profile_map[pathname] = profile; Settings["PROFILE_MAP"] = profile_map; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.18.1/VERSION new/yast2-apparmor-2.18.2/VERSION --- old/yast2-apparmor-2.18.1/VERSION 2009-02-11 15:29:36.000000000 +0100 +++ new/yast2-apparmor-2.18.2/VERSION 2009-03-06 17:50:55.000000000 +0100 @@ -1 +1 @@ -2.18.1 +2.18.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-video for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Sat Mar 7 11:44:35 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-04 18:02:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-07 04:35:53.140937449 +0100 @@ -1,0 +2,8 @@ +Sat Mar 7 04:34:50 CET 2009 - sndirsch(a)suse.de + +- xf86-video-intel-commit-73aa23d.diff + * DRI1: Update sarea (and other information) when CRTC + configuration changes (bfo #14423, bfo #18100) + + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-intel-commit-73aa23d.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.n23523/_old 2009-03-07 11:44:00.000000000 +0100 +++ /var/tmp/diff_new_pack.n23523/_new 2009-03-07 11:44:00.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 44 +Release: 45 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -100,6 +100,7 @@ Patch69: xf86-video-ati-ia64_screen_blank.diff Patch70: xf86-video-newport.diff Patch71: xf86-video-fbdev.diff +Patch72: xf86-video-intel-commit-73aa23d.diff Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff @@ -133,6 +134,7 @@ %patch66 -p1 %endif %patch67 -p1 +%patch72 -p1 popd pushd xf86-video-nv-* %patch3 -p0 @@ -277,6 +279,10 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Sat Mar 07 2009 sndirsch(a)suse.de +- xf86-video-intel-commit-73aa23d.diff + * DRI1: Update sarea (and other information) when CRTC + configuration changes (bfo #14423, bfo #18100) * Wed Mar 04 2009 sndirsch(a)suse.de - no longer require xorg-x11-driver-video-unichrome; use Supplements in xorg-x11-driver-video-unichrome instead (bnc #481569) ++++++ xf86-video-intel-commit-73aa23d.diff ++++++ commit 73aa23d9150121a4e4b70a78cab910acd164abf5 Author: Eric Anholt <eric(a)anholt.net> Date: Fri Dec 5 13:06:05 2008 -0800 DRI1: Update sarea (and other information) when CRTC configuration changes. Bug #14423. Signed-off-by: Eric Anholt <eric(a)anholt.net> diff --git a/src/i830_display.c b/src/i830_display.c index 3139d40..ca55906 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1085,6 +1085,11 @@ i830_crtc_commit (xf86CrtcPtr crtc) /* Reenable FB compression if possible */ if (i830_use_fb_compression(crtc)) i830_enable_fb_compression(crtc); + +#ifdef XF86DRI + /* Tell DRI1 the news about new output config */ + i830_update_dri_buffers(crtc->scrn); +#endif } void diff --git a/src/i830_dri.c b/src/i830_dri.c index b7ebd92..f61c564 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1387,9 +1387,6 @@ i830_update_dri_mappings(ScrnInfoPtr pScrn, drmI830Sarea *sarea) { I830Ptr pI830 = I830PTR(pScrn); - if (pI830->directRenderingType == DRI_DRI2) - return TRUE; - if (!i830_do_addmap(pScrn, pI830->front_buffer, &sarea->front_handle, &sarea->front_size, &sarea->front_offset)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n"); @@ -1447,9 +1444,15 @@ Bool i830_update_dri_buffers(ScrnInfoPtr pScrn) { ScreenPtr pScreen = pScrn->pScreen; - drmI830Sarea *sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen); + I830Ptr pI830 = I830PTR(pScrn); + drmI830Sarea *sarea; Bool success; + if (pI830->directRenderingType == DRI_DRI2) + return TRUE; + + sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen); + success = i830_update_dri_mappings(pScrn, sarea); if (!success) return 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 xorg-x11-driver-input for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Sat Mar 7 11:43:50 CET 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-04 11:05:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-05 04:47:11.868381435 +0100 @@ -1,0 +2,8 @@ +Thu Mar 5 04:46:21 CET 2009 - sndirsch(a)suse.de + +- xf86-input-synaptics 1.0.99.4 + * 1.0.99.3 crashes on 64 bit machines. This is caused by + different struct sizes in the server and the driver, + due to a missing #define. Fixed now, please test. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-synaptics-1.0.99.3.tar.bz2 New: ---- xf86-input-synaptics-1.0.99.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.E22211/_old 2009-03-07 11:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.E22211/_new 2009-03-07 11:43:33.000000000 +0100 @@ -24,7 +24,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 21 +Release: 22 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -61,7 +61,7 @@ Source26: xf86-input-vmmouse-12.6.3.tar.bz2 Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 -Source29: xf86-input-synaptics-1.0.99.3.tar.bz2 +Source29: xf86-input-synaptics-1.0.99.4.tar.bz2 Source30: xf86-input-evdev-2.1.99.1.tar.bz2 Patch2: xf86-input-jamstudio.diff Patch3: p_mouse_misc.diff @@ -225,6 +225,11 @@ %endif %changelog +* Thu Mar 05 2009 sndirsch(a)suse.de +- xf86-input-synaptics 1.0.99.4 + * 1.0.99.3 crashes on 64 bit machines. This is caused by + different struct sizes in the server and the driver, + due to a missing #define. Fixed now, please test. * Wed Mar 04 2009 sndirsch(a)suse.de - xf86-input-synaptics 1.0.99.3 * Another snapshot before the release since a number of fixes ++++++ xf86-input-synaptics-1.0.99.3.tar.bz2 -> xf86-input-synaptics-1.0.99.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/configure new/xf86-input-synaptics-1.0.99.4/configure --- old/xf86-input-synaptics-1.0.99.3/configure 2009-03-04 06:20:27.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.4/configure 2009-03-05 02:57:09.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.0.99.3. +# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.0.99.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -750,8 +750,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-synaptics' PACKAGE_TARNAME='xf86-input-synaptics' -PACKAGE_VERSION='1.0.99.3' -PACKAGE_STRING='xf86-input-synaptics 1.0.99.3' +PACKAGE_VERSION='1.0.99.4' +PACKAGE_STRING='xf86-input-synaptics 1.0.99.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1520,7 +1520,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 xf86-input-synaptics 1.0.99.3 to adapt to many kinds of systems. +\`configure' configures xf86-input-synaptics 1.0.99.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1591,7 +1591,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-synaptics 1.0.99.3:";; + short | recursive ) echo "Configuration of xf86-input-synaptics 1.0.99.4:";; esac cat <<\_ACEOF @@ -1714,7 +1714,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-synaptics configure 1.0.99.3 +xf86-input-synaptics configure 1.0.99.4 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1728,7 +1728,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-synaptics $as_me 1.0.99.3, which was +It was created by xf86-input-synaptics $as_me 1.0.99.4, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2446,7 +2446,7 @@ # Define the identity of the package. PACKAGE='xf86-input-synaptics' - VERSION='1.0.99.3' + VERSION='1.0.99.4' cat >>confdefs.h <<_ACEOF @@ -22186,7 +22186,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-synaptics $as_me 1.0.99.3, which was +This file was extended by xf86-input-synaptics $as_me 1.0.99.4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22249,7 +22249,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xf86-input-synaptics config.status 1.0.99.3 +xf86-input-synaptics config.status 1.0.99.4 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/xf86-input-synaptics-1.0.99.3/configure.ac new/xf86-input-synaptics-1.0.99.4/configure.ac --- old/xf86-input-synaptics-1.0.99.3/configure.ac 2009-03-04 06:20:00.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.4/configure.ac 2009-03-05 02:54:56.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.0.99.3, + 1.0.99.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-synaptics) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/src/alpscomm.c new/xf86-input-synaptics-1.0.99.4/src/alpscomm.c --- old/xf86-input-synaptics-1.0.99.3/src/alpscomm.c 2008-10-03 10:20:48.000000000 +0200 +++ new/xf86-input-synaptics-1.0.99.4/src/alpscomm.c 2009-03-05 02:45:46.000000000 +0100 @@ -32,6 +32,7 @@ #include "config.h" #endif +#include <xorg-server.h> #include "alpscomm.h" #include "synproto.h" #include "synaptics.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/src/eventcomm.c new/xf86-input-synaptics-1.0.99.4/src/eventcomm.c --- old/xf86-input-synaptics-1.0.99.3/src/eventcomm.c 2008-11-13 02:09:52.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.4/src/eventcomm.c 2009-03-05 02:45:48.000000000 +0100 @@ -28,6 +28,7 @@ #include "config.h" #endif +#include <xorg-server.h> #include "eventcomm.h" #include <errno.h> #include <sys/types.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/src/properties.c new/xf86-input-synaptics-1.0.99.4/src/properties.c --- old/xf86-input-synaptics-1.0.99.3/src/properties.c 2009-02-26 05:20:07.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.4/src/properties.c 2009-03-05 02:45:50.000000000 +0100 @@ -27,6 +27,7 @@ #include "config.h" #endif +#include <xorg-server.h> #include "xf86Module.h" #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/src/ps2comm.c new/xf86-input-synaptics-1.0.99.4/src/ps2comm.c --- old/xf86-input-synaptics-1.0.99.3/src/ps2comm.c 2008-10-03 10:20:48.000000000 +0200 +++ new/xf86-input-synaptics-1.0.99.4/src/ps2comm.c 2009-03-05 02:45:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" #endif +#include <xorg-server.h> #include "ps2comm.h" #include "synproto.h" #include "synaptics.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/src/psmcomm.c new/xf86-input-synaptics-1.0.99.4/src/psmcomm.c --- old/xf86-input-synaptics-1.0.99.3/src/psmcomm.c 2008-10-03 10:20:48.000000000 +0200 +++ new/xf86-input-synaptics-1.0.99.4/src/psmcomm.c 2009-03-05 02:45:58.000000000 +0100 @@ -38,6 +38,7 @@ #include "config.h" #endif +#include <xorg-server.h> #include "psmcomm.h" #include <errno.h> #include <string.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.3/src/synaptics.c new/xf86-input-synaptics-1.0.99.4/src/synaptics.c --- old/xf86-input-synaptics-1.0.99.3/src/synaptics.c 2009-03-04 06:17:01.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.4/src/synaptics.c 2009-03-05 02:46:01.000000000 +0100 @@ -58,6 +58,7 @@ #include "config.h" #endif +#include <xorg-server.h> #include <unistd.h> #include <misc.h> #include <xf86.h> @@ -72,7 +73,6 @@ #include "mipointer.h" #endif -#include "xorg-server.h" #include "synaptics.h" #include "synapticsstr.h" #include "synaptics-properties.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Sat Mar 7 11:42:45 CET 2009. -------- --- zypper/zypper.changes 2009-02-17 14:15:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2009-02-24 16:42:38.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 24 16:38:16 CET 2009 - ma(a)suse.de + +- Let 'zypper clean' keep the raw metadata cache of CD/DVD based + repositories. We'd need the CD/DVD again to recreate the data. + If this is actually desired, explicitly remove an recreate the + CD/DVD based repository. (bnc #476429). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.P21145/_old 2009-03-07 11:42:36.000000000 +0100 +++ /var/tmp/diff_new_pack.P21145/_new 2009-03-07 11:42:36.000000000 +0100 @@ -30,7 +30,7 @@ PreReq: permissions Summary: Command line software manager using libzypp Version: 1.1.0 -Release: 1 +Release: 2 Source: zypper-1.1.0.tar.bz2 Prefix: /usr Url: http://en.opensuse.org/Zypper @@ -116,7 +116,13 @@ # declare ownership of the log file but prevent # it from being erased by rpm -e %ghost %config(noreplace) %{_var}/log/zypper.log + %changelog +* Tue Feb 24 2009 ma(a)suse.de +- Let 'zypper clean' keep the raw metadata cache of CD/DVD based + repositories. We'd need the CD/DVD again to recreate the data. + If this is actually desired, explicitly remove an recreate the + CD/DVD based repository. (bnc #476429). * Sun Feb 15 2009 jkupec(a)suse.cz - Writing additional rpm output after installing/removing packages (bnc #369450) ++++++ zypper-1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/package/zypper.changes new/zypper-1.1.0/package/zypper.changes --- old/zypper-1.1.0/package/zypper.changes 2009-02-17 14:13:18.000000000 +0100 +++ new/zypper-1.1.0/package/zypper.changes 2009-03-04 18:33:41.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Feb 24 16:38:16 CET 2009 - ma(a)suse.de + +- Let 'zypper clean' keep the raw metadata cache of CD/DVD based + repositories. We'd need the CD/DVD again to recreate the data. + If this is actually desired, explicitly remove an recreate the + CD/DVD based repository. (bnc #476429). + +------------------------------------------------------------------- Sun Feb 15 21:43:13 CET 2009 - jkupec(a)suse.cz - Writing additional rpm output after installing/removing packages diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/repos.cc new/zypper-1.1.0/src/repos.cc --- old/zypper-1.1.0/src/repos.cc 2009-02-17 14:13:18.000000000 +0100 +++ new/zypper-1.1.0/src/repos.cc 2009-03-04 18:33:41.000000000 +0100 @@ -1157,10 +1157,20 @@ } if( clean_raw_metadata ) { - zypper.out().info(boost::str(format( - _("Cleaning raw metadata cache for '%s'.")) % repo.alias ()), - Out::HIGH); - manager.cleanMetadata(repo); + std::string scheme( repo.url().getScheme() ); + if ( ! ( scheme == "cd" || scheme == "dvd" ) ) + { + zypper.out().info(boost::str(format( + _("Cleaning raw metadata cache for '%s'.")) % repo.alias ()), + Out::HIGH); + manager.cleanMetadata(repo); + } + else + { + zypper.out().info(boost::str(format( + _("Keeping raw metadata cache for %s '%s'.")) %scheme %repo.alias ()), + Out::HIGH); + } } if( clean_packages ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzypp for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Sat Mar 7 11:42:27 CET 2009. -------- --- libzypp/libzypp.changes 2009-02-26 14:48:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2009-03-05 16:11:25.000000000 +0100 @@ -1,0 +2,37 @@ +Thu Mar 5 14:52:44 CET 2009 - ma(a)suse.de + +- Remove a lock if the locking process is in zombie state. (bnc #481577) + +------------------------------------------------------------------- +Wed Mar 4 00:13:19 CET 2009 - jkupec(a)suse.cz + +- zypp.conf: fixed and enabled 'servicesdir' + +------------------------------------------------------------------- +Tue Mar 3 13:38:11 CET 2009 - dmacvicar(a)suse.de + +- aria2: implement speed indicators (bnc#475506) +- aria2: implement progress indicators correctly (bnc#473846) +- aria2: fix broken pipe when looking for aria2c which caused + a fallback to curl. (bnc#480930) +- aria2: implement saving and reading mirror stats data in + /var/cache/zypp/aria2.stats +- aria2: handle failover correctly (bnc#481115) +- aria2: various improvements in error and report handling +- aria2: curl: reset settings on attach to avoid duplicate + headers +- version 6.2.1 (2) + +------------------------------------------------------------------- +Tue Mar 3 12:44:24 CET 2009 - ma(a)suse.de + +- Adapt to changed satsolver API. + +------------------------------------------------------------------- +Fri Feb 27 16:23:36 CET 2009 - dmacvicar(a)suse.de + +- Make sure Fetcher pass optional files as non-interactive +- Fixes file does not exist error when key/sig does not exist +- version 6.2.0 (2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-6.1.0.tar.bz2 New: ---- libzypp-6.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.Y18714/_old 2009-03-07 11:42:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Y18714/_new 2009-03-07 11:42:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 6.1.0) +# spec file for package libzypp (Version 6.2.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,16 +24,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 6.1.0 -Release: 2 -Source: libzypp-6.1.0.tar.bz2 +Version: 6.2.2 +Release: 1 +Source: libzypp-6.2.2.tar.bz2 Source1: libzypp-rpmlintrc Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager Recommends: logrotate BuildRequires: cmake -BuildRequires: libsatsolver-devel >= 0.13.0 openssl-devel +BuildRequires: libsatsolver-devel >= 0.14.0 openssl-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel # required for testsuite, webrick BuildRequires: ruby @@ -80,7 +80,7 @@ %package devel License: GPL v2 or later -Requires: libzypp == 6.1.0 +Requires: libzypp == 6.2.2 Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake libsatsolver-devel >= 0.13.0 @@ -123,7 +123,7 @@ %if 0%{?run_testsuite} make -C tests %{?jobs:-j %jobs} pushd tests - ctest -A + LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest . popd %endif #make check @@ -245,6 +245,28 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog +* Thu Mar 05 2009 ma(a)suse.de +- Remove a lock if the locking process is in zombie state. (bnc #481577) +* Wed Mar 04 2009 jkupec(a)suse.cz +- zypp.conf: fixed and enabled 'servicesdir' +* Tue Mar 03 2009 dmacvicar(a)suse.de +- aria2: implement speed indicators (bnc#475506) +- aria2: implement progress indicators correctly (bnc#473846) +- aria2: fix broken pipe when looking for aria2c which caused + a fallback to curl. (bnc#480930) +- aria2: implement saving and reading mirror stats data in + /var/cache/zypp/aria2.stats +- aria2: handle failover correctly (bnc#481115) +- aria2: various improvements in error and report handling +- aria2: curl: reset settings on attach to avoid duplicate + headers +- version 6.2.1 (2) +* Tue Mar 03 2009 ma(a)suse.de +- Adapt to changed satsolver API. +* Fri Feb 27 2009 dmacvicar(a)suse.de +- Make sure Fetcher pass optional files as non-interactive +- Fixes file does not exist error when key/sig does not exist +- version 6.2.0 (2) * Thu Feb 26 2009 ma(a)suse.de - Use correct default for zconfig(solver.checkSystemFile) (bnc# 475144) * Thu Feb 26 2009 ma(a)suse.de ++++++ libzypp-6.1.0.tar.bz2 -> libzypp-6.2.2.tar.bz2 ++++++ ++++ 1713 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 libsatsolver for openSUSE:Factory
by root＠Hilbert.suse.de 07 Mar '09

07 Mar '09

Hello community, here is the log from the commit of package libsatsolver for openSUSE:Factory checked in at Sat Mar 7 11:41:55 CET 2009. -------- --- libsatsolver/libsatsolver.changes 2009-02-18 17:12:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsatsolver/libsatsolver.changes 2009-03-04 15:23:57.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Mar 4 14:39:00 CET 2009 - mls(a)suse.de + +- fix problem_to_solutions segfault +- bump version to 0.14 to make it different from code11 branch +- 0.14.0 + +------------------------------------------------------------------- +Mon Mar 2 18:20:22 CET 2009 - mls(a)suse.de + +- add solver_trivial_installable() to fix multiversion patches [bnc#480303] +- 0.13.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- satsolver-0.13.3.tar.bz2 New: ---- satsolver-0.14.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.d17465/_old 2009-03-07 11:41:42.000000000 +0100 +++ /var/tmp/diff_new_pack.d17465/_new 2009-03-07 11:41:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libsatsolver (Version 0.13.3) +# spec file for package libsatsolver (Version 0.14.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: libsatsolver -Version: 0.13.3 -Release: 2 +Version: 0.14.0 +Release: 1 License: BSD 3-Clause Url: http://svn.opensuse.org/svn/zypp/trunk/sat-solver Source: satsolver-%{version}.tar.bz2 @@ -167,6 +167,10 @@ -DCMAKE_SKIP_RPATH=1 make %{?jobs:-j %jobs} make doc_forced +%if 0%{?run_testsuite} + ln -s . build + ctest . +%endif %install make DESTDIR=$RPM_BUILD_ROOT install @@ -225,6 +229,13 @@ %{perl_vendorlib}/satsolver.pm %changelog +* Wed Mar 04 2009 mls(a)suse.de +- fix problem_to_solutions segfault +- bump version to 0.14 to make it different from code11 branch +- 0.14.0 +* Mon Mar 02 2009 mls(a)suse.de +- add solver_trivial_installable() to fix multiversion patches [bnc#480303] +- 0.13.5 * Wed Feb 18 2009 ma(a)suse.de - Use correct namespace (e.g. pattern:) even if solvable has no name [bnc#470011] * Fri Jan 30 2009 mls(a)suse.de ++++++ satsolver-0.13.3.tar.bz2 -> satsolver-0.14.0.tar.bz2 ++++++ libsatsolver/satsolver-0.13.3.tar.bz2 /mounts/work_src_done/STABLE/libsatsolver/satsolver-0.14.0.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0