May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit dconf for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package dconf for openSUSE:Factory checked in at Mon May 2 14:36:34 CEST 2011. -------- --- GNOME/dconf/dconf.changes 2011-02-13 18:08:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/dconf/dconf.changes 2011-04-04 15:25:41.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Apr 4 13:24:57 UTC 2011 - dimstar(a)opensuse.org + +- BuildRequire vala-devel instead of vala-unstable-devel (vala + reached 0.12 stable release). + +------------------------------------------------------------------- +Tue Mar 22 16:58:05 UTC 2011 - fcrozat(a)novell.com + +- Update to version 0.7.3: + + Bug fixes to dconf-editor + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dconf-0.7.2.tar.bz2 New: ---- dconf-0.7.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dconf.spec ++++++ --- /var/tmp/diff_new_pack.oFpBDs/_old 2011-05-02 14:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.oFpBDs/_new 2011-05-02 14:35:41.000000000 +0200 @@ -18,9 +18,8 @@ Name: dconf -Version: 0.7.2 +Version: 0.7.3 Release: 1 -# NOTE: once vala becomes 0.12, change BuildRequires back away from vala-unstable-devel # FIXME: remove SUSE_ASNEEDED=0 when this is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=626280 License: LGPLv2.1+ Summary: Simple key-based configuration system @@ -31,7 +30,7 @@ # For directory ownership BuildRequires: dbus-1 BuildRequires: update-desktop-files -BuildRequires: vala-unstable-devel +BuildRequires: vala-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) ++++++ dconf-0.7.2.tar.bz2 -> dconf-0.7.3.tar.bz2 ++++++ ++++ 7675 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 gir-repository for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package gir-repository for openSUSE:Factory checked in at Mon May 2 14:35:13 CEST 2011. -------- --- GNOME/gir-repository/gir-repository.changes 2010-09-29 11:46:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/gir-repository/gir-repository.changes 2011-04-21 17:33:22.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Mar 24 15:08:13 UTC 2011 - fcrozat(a)novell.com + +- Drop gtksourceview-devel BuildRequires: gtksourceview 2.91.9 has + instrospection data now. + +------------------------------------------------------------------- +Thu Mar 3 16:33:35 CET 2011 - vuntz(a)opensuse.org + +- Drop libpoppler-glib-devel BuildRequires: poppler 0.16 has + introspection data now. +- Remove references to libnotify: libnotify 0.7 has introspection + data now. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gir-repository.spec ++++++ --- /var/tmp/diff_new_pack.ZsIbhX/_old 2011-05-02 14:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ZsIbhX/_new 2011-05-02 14:34:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gir-repository (Version 0.6.5) +# spec file for package gir-repository # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: gir-repository Version: 0.6.5 -Release: 18 +Release: 22 # FIXME: find out what we can do for libnotify data (see bgo#625040) License: GPLv2+ Summary: GIR Repository @@ -38,11 +38,7 @@ BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: goocanvas-devel -BuildRequires: gtksourceview-devel BuildRequires: libgnome-keyring-devel -# Disabled because of bgo#625040 -#BuildRequires: libnotify-devel -BuildRequires: libpoppler-glib-devel # Virtual provides for compatibility with other distributions. Provides: gir-repository-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,8 +74,5 @@ %{_libdir}/girepository-1.0/Babl-0.1.typelib %{_libdir}/girepository-1.0/GnomeKeyring-2.0.typelib %{_libdir}/girepository-1.0/GooCanvas-0.10.typelib -%{_libdir}/girepository-1.0/GtkSource-2.2.typelib -#%{_libdir}/girepository-1.0/Notify-0.4.typelib -%{_libdir}/girepository-1.0/Poppler-0.8.typelib %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-menus-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package gnome-menus-branding-openSUSE for openSUSE:Factory checked in at Mon May 2 14:33:28 CEST 2011. -------- --- GNOME/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes 2010-10-15 17:11:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes 2011-04-27 16:03:54.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Apr 27 16:02:06 CEST 2011 - vuntz(a)opensuse.org + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + instead of excluding X-SuSE-ControlCenter-* categories, simply + exclude X-SuSE-YaST. We might still want to see .desktop files + with X-SuSE-ControlCenter-* in Other as the control center won't + display them anymore. + +------------------------------------------------------------------- +Wed Apr 27 14:26:20 CEST 2011 - fcrozat(a)novell.com + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + Ensure YaST launcher is visible in System category. + +------------------------------------------------------------------- gnome-menus-branding-openSUSE.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gnome-menus-branding-SLED (Version 11.4) +# spec file for package gnome-menus-branding-SLED # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,13 +23,13 @@ Name: gnome-menus-branding-SLED Version: 11.4 -Release: 1 +Release: 2 Group: System/GUI/GNOME License: BSD3c Summary: SLED branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-SLED, you cannot ++++++ gnome-menus-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gnome-menus-branding-openSUSE (Version 11.4) +# spec file for package gnome-menus-branding-openSUSE # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,13 +23,13 @@ Name: gnome-menus-branding-openSUSE Version: 11.4 -Release: 1 +Release: 5 Group: System/GUI/GNOME License: BSD3c Summary: openSUSE branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-openSUSE, you cannot ++++++ gnome-menus-branding-remove-X-SuSE-ControlCenter.patch ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,13 +1,18 @@ ---- gnome-applications.menu 2010-09-13 14:35:10.868032788 +0200 -+++ gnome-applications.menu.new 2010-09-13 14:34:56.248032229 +0200 -@@ -147,6 +147,10 @@ - <Not><Category>Core</Category></Not> +--- gnome-applications.menu.orig 2011-04-26 18:27:31.000000000 +0200 ++++ gnome-applications.menu 2011-04-27 14:24:20.805677461 +0200 +@@ -134,6 +134,7 @@ + <Category>System</Category> <Not><Category>Settings</Category></Not> + </And> ++ <Filename>YaST.desktop</Filename> + </Include> + </Menu>  + +@@ -147,6 +148,7 @@ + <Not><Category>Core</Category></Not> <Not><Category>Screensaver</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-Hardware</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-LookAndFeel</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-Personal</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-System</Category></Not> + <Not><Category>X-GNOME-Settings-Panel</Category></Not> ++ <Not><Category>X-SuSE-YaST</Category></Not> </And> </Include> </Menu>  ++++++ gnome-menus-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Apr 27 16:02:06 CEST 2011 - vuntz(a)opensuse.org + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + instead of excluding X-SuSE-ControlCenter-* categories, simply + exclude X-SuSE-YaST. We might still want to see .desktop files + with X-SuSE-ControlCenter-* in Other as the control center won't + display them anymore. + +------------------------------------------------------------------- +Wed Apr 27 14:26:20 CEST 2011 - fcrozat(a)novell.com + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + Ensure YaST launcher is visible in System category. + +------------------------------------------------------------------- Fri Oct 8 11:48:24 CEST 2010 - vuntz(a)opensuse.org - Bump version to 11.4. ++++++ gnome-menus-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -27,7 +27,7 @@ Summary: %{branding_name} branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-%{branding_name}, you cannot ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-tweak-tool for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package gnome-tweak-tool for openSUSE:Factory checked in at Mon May 2 14:31:34 CEST 2011. -------- --- GNOME/gnome-tweak-tool/gnome-tweak-tool.changes 2011-04-26 22:49:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-tweak-tool/gnome-tweak-tool.changes 2011-04-28 13:16:46.000000000 +0200 @@ -1,0 +2,30 @@ +Thu Apr 28 11:14:54 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.3: + + bgo#648087: autostart nautilus at login if it is configured to + show desktop icons. + + bgo#648735: improved robustness for missing theme/icon + directories. + + Fix shell theme installation for themes found in the wild. + + Improve shell theme selection. + +------------------------------------------------------------------- +Wed Apr 27 11:57:28 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.2: + + Really tweak window theme - both the fallback and the shell + metacity/mutter theme. + + Fix attribution of data/welcome.png +- Changes from version 3.0.1: + + Fix localization + + Tweak window theme + + Tweak week date in calendar + + Tweak cursor themes + + Support user installed themes in $HOME + + Remove org.gnome.desktop.background draw-backgroud tweak, it + should never be false +- Drop gnome-tweak-tool-3.0.0-fix-localization.patch: fixed + usptream. +- Remove now unneeded calls to autoreconf and intltoolize. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-tweak-tool-3.0.0-fix-localization.patch gnome-tweak-tool-3.0.0.tar.bz2 New: ---- gnome-tweak-tool-3.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-tweak-tool.spec ++++++ --- /var/tmp/diff_new_pack.XCcJRN/_old 2011-05-02 14:30:23.000000000 +0200 +++ /var/tmp/diff_new_pack.XCcJRN/_new 2011-05-02 14:30:23.000000000 +0200 @@ -19,15 +19,13 @@ Name: gnome-tweak-tool -Version: 3.0.0 +Version: 3.0.3 Release: 1 License: GPLv3+ Summary: A tool to customize advanced GNOME 3 options Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeTweakTool Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnome-tweak-tool-3.0.0-fix-localization.patch lmedinas(a)opensuse.org -- Enable application translations -Patch0: gnome-tweak-tool-3.0.0-fix-localization.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig(gconf-2.0) @@ -51,11 +49,8 @@ %lang_package %prep %setup -q -%patch0 -p1 %build -autoreconf -f -i -intltoolize --force %configure make %{?_smp_mflags} ++++++ gnome-tweak-tool-3.0.0.tar.bz2 -> gnome-tweak-tool-3.0.3.tar.bz2 ++++++ ++++ 8988 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/gnome-tweak-tool-3.0.0/AUTHORS new/gnome-tweak-tool-3.0.3/AUTHORS --- old/gnome-tweak-tool-3.0.0/AUTHORS 2011-03-22 09:35:08.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/AUTHORS 2011-04-26 23:49:46.000000000 +0200 @@ -1 +1,6 @@ John Stowers <john.stowers(a)gmail.com> + +---- + +data/welcome.png was created by Sofie van Schadewijk + (Creative Commons Attribution 3.0 Unported license) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-tweak-tool-3.0.0/NEWS new/gnome-tweak-tool-3.0.3/NEWS --- old/gnome-tweak-tool-3.0.0/NEWS 2011-03-29 23:19:23.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/NEWS 2011-04-27 14:03:55.000000000 +0200 @@ -1,3 +1,25 @@ +3.0.3 + * Autostart nautilus at login if it is configured to show + desktop icons (bug 648087) + * Improved robustness for missing theme/icon + directories (bug 648735) + * Fix shell theme installation for themes found in the wild + * Improve shell theme selection + +3.0.2 + * Really tweak window theme - both the fallback and the + shell metacity/mutter theme + * Fix attribution of data/welcome.png + +3.0.1 + * Fix localization + * Tweak window theme + * Tweak week date in calendar (Emmanuele Bassi) + * Tweak cursor themes (Andrea Fagiani) + * Support user installed themes in $HOME (Andrea Fagiani) + * Remove org.gnome.desktop.background draw-backgroud tweak, it + should never be false + 3.0.0 * First stable release * Enable icon theme selection 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/gnome-tweak-tool-3.0.0/configure.ac new/gnome-tweak-tool-3.0.3/configure.ac --- old/gnome-tweak-tool-3.0.0/configure.ac 2011-03-30 22:16:38.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/configure.ac 2011-04-26 23:57:24.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([gnome-tweak-tool], [3.0.0], [john.stowers(a)gmail.com]) +AC_INIT([gnome-tweak-tool], [3.0.3], [john.stowers(a)gmail.com]) AM_INIT_AUTOMAKE([foreign]) @@ -19,6 +19,9 @@ IT_PROG_INTLTOOL([0.40.0]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.17]) +GETTEXT_PACKAGE=gnome-tweak-tool +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) AS_AC_EXPAND(DATADIR, "${datadir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") 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/gnome-tweak-tool-3.0.0/gnome-tweak-tool new/gnome-tweak-tool-3.0.3/gnome-tweak-tool --- old/gnome-tweak-tool-3.0.0/gnome-tweak-tool 2011-03-30 00:46:54.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/gnome-tweak-tool 2011-04-27 10:34:40.000000000 +0200 @@ -15,6 +15,7 @@ import os.path import optparse +import logging import gi gi.require_version("Gtk", "3.0") @@ -78,5 +79,7 @@ gtweak.PKG_DATA_DIR = PKG_DATA_DIR gtweak.ENABLE_TEST = options.test + logging.basicConfig(format="%(levelname)-8s: %(message)s", level=logging.INFO) + MainWindow() 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/gnome-tweak-tool-3.0.0/gtweak/defs.py new/gnome-tweak-tool-3.0.3/gtweak/defs.py --- old/gnome-tweak-tool-3.0.0/gtweak/defs.py 2011-04-01 12:20:12.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/gtweak/defs.py 2011-04-27 21:52:53.000000000 +0200 @@ -1,5 +1,5 @@ DATA_DIR = "/usr/local/share" PKG_DATA_DIR = "/usr/local/share/gnome-tweak-tool" GSETTINGS_SCHEMA_DIR = "/usr/local/share/glib-2.0/schemas" -TWEAK_DIR = "/usr/local/lib/python2.6/dist-packages/gtweak/tweaks" -VERSION = "3.0.0" +TWEAK_DIR = "/usr/local/lib/python2.7/dist-packages/gtweak/tweaks" +VERSION = "3.0.3" 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/gnome-tweak-tool-3.0.0/gtweak/gconf.py new/gnome-tweak-tool-3.0.3/gtweak/gconf.py --- old/gnome-tweak-tool-3.0.0/gtweak/gconf.py 2011-03-24 21:57:50.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/gconf.py 2011-04-27 10:31:33.000000000 +0200 @@ -16,6 +16,7 @@ # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. import subprocess +import logging from gi.repository import GConf @@ -40,7 +41,7 @@ else: self._cmd_cache[command] = "ERROR: %s" % stderr.strip() - print "Caching gconf: %s (%s)" % (self, command) + logging.info("Caching gconf: %s (%s)" % (self, command)) return self._cmd_cache[command] def schema_get_summary(self): 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/gnome-tweak-tool-3.0.0/gtweak/gsettings.py new/gnome-tweak-tool-3.0.3/gtweak/gsettings.py --- old/gnome-tweak-tool-3.0.0/gtweak/gsettings.py 2011-03-24 21:56:59.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/gsettings.py 2011-04-27 10:34:07.000000000 +0200 @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. +import logging import os.path import xml.dom.minidom @@ -44,8 +45,7 @@ "summary" : key.getElementsByTagName("summary")[0].childNodes[0].data, "description" : key.getElementsByTagName("description")[0].childNodes[0].data} except: - import traceback - traceback.print_exc() + logging.critical("Error parsing schema", exc_info=True) def __repr__(self): return "<gtweak.gsettings._GSettingsSchema: %s>" % self._schema_name @@ -57,7 +57,7 @@ Gio.Settings.__init__(self, schema_name) if schema_name not in _SCHEMA_CACHE: _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, **options) - print "Caching gsettings: %s" % _SCHEMA_CACHE[schema_name] + logging.info("Caching gsettings: %s" % _SCHEMA_CACHE[schema_name]) self._schema = _SCHEMA_CACHE[schema_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/gnome-tweak-tool-3.0.0/gtweak/gshellwrapper.py new/gnome-tweak-tool-3.0.3/gtweak/gshellwrapper.py --- old/gnome-tweak-tool-3.0.0/gtweak/gshellwrapper.py 2011-03-24 21:57:04.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/gshellwrapper.py 2011-04-27 13:03:00.000000000 +0200 @@ -54,6 +54,9 @@ out = self._proxy.execute_js('const ExtensionSystem = imports.ui.extensionSystem; ExtensionSystem.extensionMeta') return json.loads(out) + def get_version(self): + return json.loads(self._proxy.execute_js('const Config = imports.misc.config; Config.PACKAGE_VERSION')) + if __name__ == "__main__": s = GnomeShell() print s.list_extensions() 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/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_interface.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_interface.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_interface.py 2011-04-01 12:10:44.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_interface.py 2011-04-27 10:10:42.000000000 +0200 @@ -20,34 +20,59 @@ from gi.repository import Gtk import gtweak +from gtweak.utils import walk_directories from gtweak.tweakmodel import TweakGroup from gtweak.widgets import GSettingsSwitchTweak, GSettingsComboTweak, build_horizontal_sizegroup -class ThemeSwitcher(GSettingsComboTweak): - """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ +class GtkThemeSwitcher(GSettingsComboTweak): def __init__(self, **options): - valid_themes = [] - themedir = os.path.join(gtweak.DATA_DIR, "themes") - for t in os.listdir(themedir): - if os.path.exists(os.path.join(themedir, t, "gtk-2.0")) and \ - os.path.exists(os.path.join(themedir, t, "gtk-3.0")): - valid_themes.append(t) - GSettingsComboTweak.__init__(self, "org.gnome.desktop.interface", "gtk-theme", - [(t, t) for t in valid_themes], + [(t, t) for t in self._get_valid_themes()], **options) + def _get_valid_themes(self): + """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ + dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), + os.path.join(os.path.expanduser("~"), ".themes")) + valid = walk_directories(dirs, lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + os.path.exists(os.path.join(d, "gtk-3.0"))) + return valid + class IconThemeSwitcher(GSettingsComboTweak): def __init__(self, **options): - iconthemedir = os.path.join(gtweak.DATA_DIR, "icons") GSettingsComboTweak.__init__(self, "org.gnome.desktop.interface", "icon-theme", - [(t, t) for t in os.listdir(iconthemedir)], + [(t, t) for t in self._get_valid_icon_themes()], **options) + def _get_valid_icon_themes(self): + dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), + os.path.join(os.path.expanduser("~"), ".icons")) + valid = walk_directories(dirs, lambda d: + os.path.isdir(d) and \ + not os.path.exists(os.path.join(d, "cursors"))) + return valid + +class CursorThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): + GSettingsComboTweak.__init__(self, + "org.gnome.desktop.interface", + "cursor-theme", + [(t, t) for t in self._get_valid_cursor_themes()], + **options) + + def _get_valid_cursor_themes(self): + dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), + os.path.join(os.path.expanduser("~"), ".icons")) + valid = walk_directories(dirs, lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) + return valid + sg = build_horizontal_sizegroup() TWEAK_GROUPS = ( @@ -55,6 +80,7 @@ "Interface", GSettingsSwitchTweak("org.gnome.desktop.interface", "menus-have-icons"), GSettingsSwitchTweak("org.gnome.desktop.interface", "buttons-have-icons"), - ThemeSwitcher(size_group=sg), - IconThemeSwitcher(size_group=sg)), + GtkThemeSwitcher(size_group=sg), + IconThemeSwitcher(size_group=sg), + CursorThemeSwitcher(size_group=sg)), ) 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/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_nautilus.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_nautilus.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_nautilus.py 2011-03-24 21:57:35.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_nautilus.py 2011-04-27 10:10:41.000000000 +0200 @@ -17,12 +17,29 @@ from gi.repository import Gtk +import gtweak +from gtweak.utils import AutostartManager from gtweak.tweakmodel import TweakGroup from gtweak.widgets import GSettingsSwitchTweak +class DesktopIconTweak(GSettingsSwitchTweak): + def __init__(self, **options): + GSettingsSwitchTweak.__init__(self, + "org.gnome.desktop.background", + "show-desktop-icons", + **options) + + #when the user enables nautilus to draw the desktop icons, set nautilus + #to autostart + self.nautilus = AutostartManager(gtweak.DATA_DIR, "nautilus.desktop", "nautilus -n") + self.settings.connect('changed::'+self.key_name, self._on_setting_changed) + + def _on_setting_changed(self, setting, key): + self.nautilus.update_start_at_login( + self.settings.get_boolean(key)) + TWEAK_GROUPS = ( TweakGroup( "File Manager", - GSettingsSwitchTweak("org.gnome.desktop.background", "show-desktop-icons"), - GSettingsSwitchTweak("org.gnome.desktop.background", "draw-background")), + DesktopIconTweak()), ) 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/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_shell.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_shell.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_shell.py 2011-03-24 21:57:38.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_shell.py 2011-04-27 14:03:20.000000000 +0200 @@ -19,14 +19,16 @@ import shutil import zipfile import tempfile +import logging from gi.repository import Gtk from gi.repository import GLib +from gtweak.utils import walk_directories from gtweak.gsettings import GSettingsSetting from gtweak.gshellwrapper import GnomeShell from gtweak.tweakmodel import Tweak, TweakGroup -from gtweak.widgets import GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup +from gtweak.widgets import GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup, build_combo_box_text class ShowWindowButtons(GConfComboTweak): def __init__(self, **options): @@ -50,7 +52,7 @@ #self.set_width_chars(15) self.set_local_only(True) -class ThemeInstaller(Tweak): +class ShellThemeTweak(Tweak): THEME_EXT_NAME = "user-theme(a)gnome-shell-extensions.gnome.org" THEME_GSETTINGS_SCHEMA = "org.gnome.shell.extensions.user-theme" @@ -68,12 +70,16 @@ error = "Shell not running" try: extensions = self._shell.list_extensions() - if ThemeInstaller.THEME_EXT_NAME in extensions and extensions[ThemeInstaller.THEME_EXT_NAME]["state"] == 1: + if ShellThemeTweak.THEME_EXT_NAME in extensions and extensions[ShellThemeTweak.THEME_EXT_NAME]["state"] == 1: #check the correct gsettings key is present try: - self._settings = GSettingsSetting(ThemeInstaller.THEME_GSETTINGS_SCHEMA) - name = self._settings.get_value(ThemeInstaller.THEME_GSETTINGS_NAME) - print "!!!!", name + self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA) + name = self._settings.get_value(ShellThemeTweak.THEME_GSETTINGS_NAME) + + #assume the usertheme version is that version of the shell which + #it most supports (this is a poor assumption) + self._usertheme_extension_version = max(extensions[ShellThemeTweak.THEME_EXT_NAME]["shell-version"]) + error = None except: error = "User Theme extension schema missing" @@ -91,9 +97,21 @@ self.widget_for_size_group = info else: hb = Gtk.HBox() - b = Gtk.Button.new_from_stock(Gtk.STOCK_REVERT_TO_SAVED) - b.connect("clicked", self._on_revert) - hb.pack_start(b, False, False, 5) + + #build a combo box with all the valid theme options + valid = walk_directories( (ShellThemeTweak.THEME_DIR,), lambda d: + os.path.exists(os.path.join(d, "gnome-shell")) and \ + os.path.exists(os.path.join(d, "gnome-shell", "gnome-shell.css"))) + #manually add Adwiata to represent the default + #valid.append( ("Adwiata", "") ) + + cb = build_combo_box_text( + self._settings.get_string(ShellThemeTweak.THEME_GSETTINGS_NAME), + ("", "Adwiata"), + *[(v,v) for v in valid]) + cb.connect('changed', self._on_combo_changed) + hb.pack_start(cb, False, False, 5) + self.combo = cb chooser = _ThemeZipChooser() chooser.connect("file-set", self._on_file_set) @@ -102,54 +120,74 @@ self.widget = build_label_beside_widget(self.name, hb) self.widget_for_size_group = chooser - def _extract_theme_zip(self, z, theme_name): + def _extract_theme_zip(self, z, theme_name, theme_members_path): tmp = tempfile.mkdtemp() - dest = os.path.join(ThemeInstaller.THEME_DIR, theme_name, "gnome-shell") + dest = os.path.join(ShellThemeTweak.THEME_DIR, theme_name, "gnome-shell") + + logging.info("Extracting theme %s to %s" % (theme_name, tmp)) + try: if os.path.exists(dest): shutil.rmtree(dest) z.extractall(tmp) - shutil.copytree(os.path.join(tmp, "theme"), dest) - self._settings.set_value(ThemeInstaller.THEME_GSETTINGS_NAME, theme_name) + shutil.copytree(os.path.join(tmp, theme_members_path), dest) + return theme_name except OSError: self.notify_error("Error installing theme") - - def _shell_reload_theme(self): - #reloading the theme works OK, however there are some problems with reloading images. - #https://bugzilla.gnome.org/show_bug.cgi?id=644125 - #however, smashing the whole shell just to change themes is pretty extreme. So we - #just let the user-theme extension pick up the change by itself - # - #self._shell.reload_theme() - #self.notify_action_required( - # "The shell must be restarted to apply the theme", - # "Restart", - # lambda: self._shell.restart()) - pass + return None def _on_file_set(self, chooser): f = chooser.get_filename() with zipfile.ZipFile(f, 'r') as z: try: - #check this looks like a valid theme - info = z.getinfo('theme/gnome-shell.css') - #the theme name is the filename, for the moment - self._extract_theme_zip( - z, - os.path.splitext(os.path.basename(f))[0]) - self._shell_reload_theme() - except KeyError: + fragment = () + for n in z.namelist(): + if n.endswith("gnome-shell.css"): + fragment = n.split("/")[0:-1] + break + + if not fragment: + raise Exception("Could not find gnome-shell.css") + + #old style themes name was taken from the zip name + if fragment[0] == "theme" and len(fragment) == 1: + theme_name = os.path.basename(f) + else: + theme_name = fragment[0] + theme_members_path = "/".join(fragment) + + installed_name = self._extract_theme_zip( + z, + theme_name, + theme_members_path) + if installed_name: + print self.combo.get_model().append( (installed_name, installed_name) ) + + except: #does not look like a valid theme self.notify_error("Invalid theme file") #set button back to default state chooser.unselect_all() - def _on_revert(self, btn): - self._settings.set_value(ThemeInstaller.THEME_GSETTINGS_NAME, "") - self._shell_reload_theme() - + def _on_combo_changed(self, combo): + val = combo.get_model().get_value(combo.get_active_iter(), 0) + self._settings.set_value(ShellThemeTweak.THEME_GSETTINGS_NAME, val) + #reloading the theme is not really necessary, the user-theme should pick + #pick up the change. + # + #however there are some problems with reloading images. + #https://bugzilla.gnome.org/show_bug.cgi?id=644125 + # + #resetting to the default theme is also fucked + #https://bugzilla.gnome.org/show_bug.cgi?id=647386 + if not val: + if self._usertheme_extension_version < "3.0.2": + self.notify_action_required( + "The shell must be restarted to apply the theme", + "Restart", + lambda: self._shell.restart()) sg = build_horizontal_sizegroup() @@ -157,8 +195,9 @@ TweakGroup( "Shell", GSettingsSwitchTweak("org.gnome.shell.clock", "show-date", schema_filename="org.gnome.shell.gschema.xml"), + GSettingsSwitchTweak("org.gnome.shell.calendar", "show-weekdate", schema_filename="org.gnome.shell.gschema.xml"), ShowWindowButtons(size_group=sg), - ThemeInstaller(size_group=sg), + ShellThemeTweak(size_group=sg), GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-battery-action", size_group=sg), GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg)), ) 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/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_windows.py new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_windows.py --- old/gnome-tweak-tool-3.0.0/gtweak/tweaks/tweak_windows.py 2011-03-24 21:57:45.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/tweaks/tweak_windows.py 2011-04-27 10:10:42.000000000 +0200 @@ -15,8 +15,13 @@ # You should have received a copy of the GNU General Public License # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. +import os.path + +import gtweak +from gtweak.utils import walk_directories from gtweak.tweakmodel import TweakGroup from gtweak.widgets import GConfComboTweak, build_horizontal_sizegroup +from gtweak.gconf import GConfSetting class ActionClickTitlebarTweak(GConfComboTweak): def __init__(self, key_name, **options): @@ -31,11 +36,39 @@ [(o, o.replace("_"," ").title()) for o in schema_options], **options) +class WindowThemeSwitcher(GConfComboTweak): + def __init__(self, **options): + GConfComboTweak.__init__(self, + "/desktop/gnome/shell/windows/theme", + str, + [(t, t) for t in self._get_valid_themes()], + **options) + + #also need to change the fallback (metacity) window theme + self.gconf_metacity = GConfSetting("/apps/metacity/general/theme", str) + + def _get_valid_themes(self): + dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), + os.path.join(os.path.expanduser("~"), ".themes")) + valid = walk_directories(dirs, lambda d: + os.path.exists(os.path.join(d, "metacity-1"))) + return valid + + def _on_combo_changed(self, combo): + #its probbably not too nice to dupe this function here, but i'm lazy + #and the real cause is the hidious gconf/shell/metacity override business + _iter = combo.get_active_iter() + if _iter: + value = combo.get_model().get_value(_iter, 0) + self.gconf.set_value(value) + self.gconf_metacity.set_value(value) + sg = build_horizontal_sizegroup() TWEAK_GROUPS = ( TweakGroup( "Windows", + WindowThemeSwitcher(size_group=sg), ActionClickTitlebarTweak("/apps/metacity/general/action_double_click_titlebar", size_group=sg), ActionClickTitlebarTweak("/apps/metacity/general/action_middle_click_titlebar", size_group=sg), ActionClickTitlebarTweak("/apps/metacity/general/action_right_click_titlebar", size_group=sg)), 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/gnome-tweak-tool-3.0.0/gtweak/utils.py new/gnome-tweak-tool-3.0.3/gtweak/utils.py --- old/gnome-tweak-tool-3.0.0/gtweak/utils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/utils.py 2011-04-27 10:24:25.000000000 +0200 @@ -0,0 +1,81 @@ +# This file is part of gnome-tweak-tool. +# +# Copyright (c) 2011 John Stowers +# +# gnome-tweak-tool is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# gnome-tweak-tool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. + +import os.path +import logging + +from gi.repository import GLib + +def walk_directories(dirs, filter_func): + valid = [] + try: + for thdir in dirs: + if os.path.isdir(thdir): + for t in os.listdir(thdir): + if filter_func(os.path.join(thdir, t)): + valid.append(t) + except: + logging.critical("Error parsing directories", exc_info=True) + return valid + +class AutostartManager: + def __init__(self, DATA_DIR, desktop_filename, exec_cmd="", extra_exec_args=""): + self._desktop_filename = desktop_filename + self._desktop_file = os.path.join(DATA_DIR, "applications", desktop_filename) + self._autostart_file = os.path.join( + GLib.get_user_config_dir(), "autostart", desktop_filename) + self._exec_cmd = exec_cmd + self._extra_exec_args = " %s\n" % extra_exec_args + + def is_start_at_login_enabled(self): + if os.path.exists(self._autostart_file): + #if it contains X-GNOME-Autostart-enabled=false then it has + #has been disabled by the user in the session applet, otherwise + #it is enabled + return open(self._autostart_file).read().find("X-GNOME-Autostart-enabled=false") == -1 + else: + return False + + def update_start_at_login(self, update): + logging.debug("Updating autostart %s -> %s" % (self._desktop_filename, update)) + + if os.path.exists(self._autostart_file): + logging.info("Removing autostart %s" % self._autostart_file) + os.remove(self._autostart_file) + + if update: + if not os.path.exists(self._desktop_file): + logging.critical("Could not find desktop file: %s" % self._desktop_file) + return + + logging.info("Adding autostart %s" % self._autostart_file) + #copy the original file to the new file, but add the extra exec args + old = open(self._desktop_file, "r") + new = open(self._autostart_file, "w") + + for l in old.readlines(): + if l.startswith("Exec="): + if self._exec_cmd: + new.write("Exec=%s\n" % self._exec_cmd) + else: + new.write(l[0:-1]) + new.write(self._extra_exec_args) + else: + new.write(l) + + old.close() + new.close() 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/gnome-tweak-tool-3.0.0/gtweak/widgets.py new/gnome-tweak-tool-3.0.3/gtweak/widgets.py --- old/gnome-tweak-tool-3.0.0/gtweak/widgets.py 2011-03-24 21:57:23.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/gtweak/widgets.py 2011-04-27 13:19:08.000000000 +0200 @@ -31,6 +31,10 @@ return hbox def build_combo_box_text(selected, *values): + """ + builds a GtkComboBox and model containing the supplied values. + @values: a list of 2-tuples (value, name) + """ store = Gtk.ListStore(str, str) selected_iter = None 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/gnome-tweak-tool-3.0.0/po/ChangeLog new/gnome-tweak-tool-3.0.3/po/ChangeLog --- old/gnome-tweak-tool-3.0.0/po/ChangeLog 2011-03-30 22:15:34.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -2011-03-31 gettextize <bug-gnu-gettext(a)gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.18.1. - * Rules-quot: Upgrade to gettext-0.18.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/gnome-tweak-tool-3.0.0/po/LINGUAS new/gnome-tweak-tool-3.0.3/po/LINGUAS --- old/gnome-tweak-tool-3.0.0/po/LINGUAS 2011-04-01 12:10:44.000000000 +0200 +++ new/gnome-tweak-tool-3.0.3/po/LINGUAS 2011-04-27 10:10:41.000000000 +0200 @@ -1,3 +1,14 @@ cs +da +de +es +ja +lv nb +pl pt +pt_BR +sl +sv +vi +zh_CN 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/gnome-tweak-tool-3.0.0/po/da.po new/gnome-tweak-tool-3.0.3/po/da.po --- old/gnome-tweak-tool-3.0.0/po/da.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/da.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Danish translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Kris Thomsen <lakristho(a)gmail.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-06 22:31+0200\n" +"PO-Revision-Date: 2011-04-02 14:28+0000\n" +"Last-Translator: Kris Thomsen <lakristho(a)gmail.com>\n" +"Language-Team: Danish <dansk(a)dansk-gruppen.dk>\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Tilpasningsværktøj" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "tilpasninger" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "velkommen" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Tilpas avancerede indstillinger" 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/gnome-tweak-tool-3.0.0/po/de.po new/gnome-tweak-tool-3.0.3/po/de.po --- old/gnome-tweak-tool-3.0.0/po/de.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/de.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,35 @@ +# German translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# +# Christian Kirbach <Christian.Kirbach(a)googlemail.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-05 12:30+0000\n" +"PO-Revision-Date: 2011-04-06 16:14+0100\n" +"Last-Translator: Christian Kirbach <Christian.Kirbach(a)googlemail.com>\n" +"Language-Team: German <gnome-de(a)gnome.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Optimierungs-Werkzeug" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "Optimierungen" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "Willkommen" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Erweiterte Einstellungen optimieren" 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/gnome-tweak-tool-3.0.0/po/es.po new/gnome-tweak-tool-3.0.3/po/es.po --- old/gnome-tweak-tool-3.0.0/po/es.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/es.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Spanish translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Jorge González <jorgegonz(a)svn.gnome.org>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-23 15:21+0000\n" +"PO-Revision-Date: 2011-04-24 11:11+0200\n" +"Last-Translator: Jorge González <jorgegonz(a)svn.gnome.org>\n" +"Language-Team: Español <gnome-es-list(a)gnome.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Herramienta de retoques" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "retoques" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "bienvenido" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Ajustes de retoques avanzados" 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/gnome-tweak-tool-3.0.0/po/ja.po new/gnome-tweak-tool-3.0.3/po/ja.po --- old/gnome-tweak-tool-3.0.0/po/ja.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/ja.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,33 @@ +# gnome-tweak-tool ja.po. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-tweak-tool package. +# Takeshi AIHANA <takeshi.aihana(a)gmail.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-02 20:20+0900\n" +"PO-Revision-Date: 2011-04-02 20:19+0900\n" +"Last-Translator: Takeshi AIHANA <takeshi.aihana(a)gmail.com>\n" +"Language-Team: Japanese <gnome-translation(a)gnome.gr.jp>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "カスタマイズ・ツール" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "tweaks" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "welcome" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "高度な設定のカスタマイズ" 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/gnome-tweak-tool-3.0.0/po/lv.po new/gnome-tweak-tool-3.0.3/po/lv.po --- old/gnome-tweak-tool-3.0.0/po/lv.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/lv.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,36 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Rūdofls Mazurs <rudolfs.mazurs(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=gnome-tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-12 19:55+0000\n" +"PO-Revision-Date: 2011-04-18 20:57+0300\n" +"Last-Translator: Rūdofls Mazurs <rudolfs.mazurs(a)gmail.com>\n" +"Language-Team: Latvian <lata-l10n(a)googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Piedares rīks" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "piedares" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "laipni lūdzam" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Piedares paplašinātie iestatījumi" + 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/gnome-tweak-tool-3.0.0/po/pl.po new/gnome-tweak-tool-3.0.3/po/pl.po --- old/gnome-tweak-tool-3.0.0/po/pl.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/pl.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,38 @@ +# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Aviary.pl +# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz +# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: +# gnomepl(a)aviary.pl +# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-04 08:21+0200\n" +"PO-Revision-Date: 2011-04-04 08:22+0200\n" +"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n" +"Language-Team: Polish <gnomepl(a)aviary.pl>\n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Polish\n" +"X-Poedit-Country: Poland\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Narzędzie dostrajania" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "dostrajanie" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "witamy" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Dostrajanie zaawansowanych ustawień" 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/gnome-tweak-tool-3.0.0/po/pt_BR.po new/gnome-tweak-tool-3.0.3/po/pt_BR.po --- old/gnome-tweak-tool-3.0.0/po/pt_BR.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/pt_BR.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Brazilian Portuguese translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Rodrigo Padula <contato(a)rodrigopadula.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-04 11:34+0000\n" +"PO-Revision-Date: 2011-04-05 02:37-0300\n" +"Last-Translator: Rodrigo Padula de Oliveira <contato(a)rodrigopadula.com>\n" +"Language-Team: Brazilian Portuguese <gnome-pt_br-list(a)gnome.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Ferramenta de Ajuste" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "ajustes" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "bem-vindo" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Ajuste avançado de configurações" 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/gnome-tweak-tool-3.0.0/po/sl.po new/gnome-tweak-tool-3.0.3/po/sl.po --- old/gnome-tweak-tool-3.0.0/po/sl.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/sl.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,39 @@ +# Slovenian translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# +# Matej Urbančič <mateju(a)svn.gnome.org>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-31 23:48+0000\n" +"PO-Revision-Date: 2011-03-31 23:48+0000\n" +"Last-Translator: Matej Urbančič <mateju(a)svn.gnome.org>\n" +"Language-Team: Slovenian GNOME Translation Team <gnome-si(a)googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Orodje za prilagajanje" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "prilagoditve" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "dobrodošli" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Napredne nastavitve prilagajanja" 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/gnome-tweak-tool-3.0.0/po/sv.po new/gnome-tweak-tool-3.0.3/po/sv.po --- old/gnome-tweak-tool-3.0.0/po/sv.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/sv.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Swedish translation for gnome-tweak-tool. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-tweak-tool package. +# Daniel Nylander <po(a)danielnylander.se>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-02 16:26+0200\n" +"PO-Revision-Date: 2011-04-02 16:28+0100\n" +"Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n" +"Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Justeringsverktyg" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "justeringar" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "välkommen" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Justera avancerade inställningar" + 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/gnome-tweak-tool-3.0.0/po/vi.po new/gnome-tweak-tool-3.0.3/po/vi.po --- old/gnome-tweak-tool-3.0.0/po/vi.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/vi.po 2011-04-26 23:06:12.000000000 +0200 @@ -0,0 +1,34 @@ +# Vietnamese translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Lê Trường An <xinemdungkhoc1(a)gmail.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-tweak-tool&keywords=I…" +"POT-Creation-Date: 2011-04-10 08:05+0000\n" +"PO-Revision-Date: 2011-04-12 08:53+0700\n" +"Last-Translator: Lê Trường An <xinemdungkhoc1(a)gmail.com>\n" +"Language-Team: Vietnamese <gnomevi-list(a)lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "Công cụ tinh chỉnh" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "tinh chỉnh" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "chào mừng" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "Tinh chỉnh các thiết lập nâng cao" + 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/gnome-tweak-tool-3.0.0/po/zh_CN.po new/gnome-tweak-tool-3.0.3/po/zh_CN.po --- old/gnome-tweak-tool-3.0.0/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-tweak-tool-3.0.3/po/zh_CN.po 2011-04-11 12:41:17.000000000 +0200 @@ -0,0 +1,33 @@ +# Chinese (China) translation for gnome-tweak-tool. +# Copyright (C) 2011 gnome-tweak-tool's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-tweak-tool package. +# Yinghua_Wang <wantinghard(a)gmail.com>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-tweak-tool master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"tweak-tool&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-04 06:22+0000\n" +"PO-Revision-Date: 2011-04-04 18:25+0800\n" +"Last-Translator: Yinghua Wang <wantinghard(a)gmail.com>\n" +"Language-Team: Chinese (China) <i18n-zh(a)googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/shell.ui.h:1 +msgid "Tweak Tool" +msgstr "优化工具" + +#: ../data/shell.ui.h:2 +msgid "tweaks" +msgstr "优化" + +#: ../data/shell.ui.h:3 +msgid "welcome" +msgstr "欢迎" + +#: ../data/gnome-tweak-tool.desktop.in.h:1 +msgid "Tweak Advanced Settings" +msgstr "优化高级设置" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gpicview for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package gpicview for openSUSE:Factory checked in at Mon May 2 14:30:17 CEST 2011. -------- --- gpicview/gpicview.changes 2011-02-18 09:45:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/gpicview/gpicview.changes 2011-03-14 15:26:22.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 14 14:17:19 UTC 2011 - gber(a)opensuse.org + +- call %desktop_database_post/un + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpicview.spec ++++++ --- /var/tmp/diff_new_pack.TZRoRx/_old 2011-05-02 14:29:42.000000000 +0200 +++ /var/tmp/diff_new_pack.TZRoRx/_new 2011-05-02 14:29:42.000000000 +0200 @@ -21,7 +21,7 @@ Name: gpicview Summary: LXDE Photo Viewer Version: 0.2.1 -Release: 12 +Release: 13 License: GPLv2 Group: Productivity/Graphics/Viewers Url: http://www.lxde.org/ @@ -60,6 +60,15 @@ %clean rm -fr %buildroot +%if 0%{?suse_version} >= 1140 + +%post +%desktop_database_post + +%postun +%desktop_database_postun +%endif + %files -f %name.lang %defattr(-,root,root) %_bindir/%name ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gutenprint for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package gutenprint for openSUSE:Factory checked in at Mon May 2 14:29:33 CEST 2011. -------- --- gutenprint/gutenprint.changes 2010-12-29 17:57:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/gutenprint/gutenprint.changes 2011-04-28 17:25:41.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 28 17:20:03 CEST 2011 - jsmeix(a)suse.de + +- Removed the needless RPM requirement for pstoraster. +- Removed the duplicate RPM requirement for ghostscript-library + because there is a RPM requirement for cups + and cups requires ghostscript. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gutenprint.spec ++++++ --- /var/tmp/diff_new_pack.xlwRap/_old 2011-05-02 14:28:45.000000000 +0200 +++ /var/tmp/diff_new_pack.xlwRap/_new 2011-05-02 14:28:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gutenprint (Version 5.2.6) +# spec file for package gutenprint # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: gutenprint Url: http://gutenprint.sourceforge.net Version: 5.2.6 -Release: 3 +Release: 8 %define gutenprintmajor 5.2 BuildRequires: cairo-devel cups-ddk cups-devel BuildRequires: gimp-devel glib2-devel gtk2-devel @@ -30,7 +30,7 @@ License: GPLv2+ Group: Hardware/Printing Summary: Printer drivers for CUPS from the Gutenprint project -Requires: ghostscript-library >= 7.05, cups >= 1.2.2, pstoraster +Requires: cups >= 1.2.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build # URL for Source0: # http://downloads.sourceforge.net/project/gimp-print/gutenprint-5.2/5.2.6/gu… ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 inst-source-utils for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at Mon May 2 14:28:36 CEST 2011. -------- --- inst-source-utils/inst-source-utils.changes 2010-03-17 11:55:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2011-04-28 18:25:52.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 28 18:25:28 CEST 2011 - ro(a)suse.de + +- add option -D to use sha256 checksums in create_package_descr + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.TLwZPV/_old 2011-05-02 14:28:03.000000000 +0200 +++ /var/tmp/diff_new_pack.TLwZPV/_new 2011-05-02 14:28:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package inst-source-utils (Version 2010.3.17) +# spec file for package inst-source-utils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: inst-source-utils Summary: Utilities for creating customized installation sources -Version: 2010.3.17 +Version: 2011.4.28 Release: 1 Url: http://en.opensuse.org/Inst-source-utils License: GPLv2+ ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr new/inst-source-utils/usr/bin/create_package_descr --- old/inst-source-utils/usr/bin/create_package_descr 2010-03-17 14:28:14.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_package_descr 2011-04-28 18:24:03.000000000 +0200 @@ -52,6 +52,7 @@ my $prefer_yastdescr = "0"; my $add_licenses = "0"; my $do_checksums = "0"; +my $do_sha256 = "0"; my $do_keywords = "0"; my $have_sha_cache = 0; my $do_file_list = 0; @@ -62,6 +63,7 @@ my $allow_shr = 1; my %used_fallbacks; my $num_pdb_records = 0; +my $checksum_binary = "sha1sum"; sub usage { my $exit_code=shift || 1; @@ -83,6 +85,7 @@ print " [-P ] (prefer_yastdescr)\n"; print " [-L ] (ignore_symlinks)\n"; print " [-C ] (do_checksums)\n"; + print " [-D ] (do_sha256_checksums)\n"; print " [-K ] (do_keywords)\n"; print " [-F ] (do_file_list)\n"; print " [-B ] (add requires for src packages)\n\n"; @@ -127,6 +130,7 @@ elsif ( $arg eq "-B" ) { $src_requires = 1; } elsif ( $arg eq "-V" ) { $add_vendor = 1; } elsif ( $arg eq "-C" ) { $do_checksums = "1"; } + elsif ( $arg eq "-D" ) { $do_checksums = "1"; $do_sha256 = "1"; $checksum_binary = "sha256sum"; } elsif ( $arg eq "-F" ) { $do_file_list = 1; } elsif ( $arg eq "-I" ) { $ignore_file = shift @ARGV ; } elsif ( $arg eq "-K" ) { $do_keywords = "1"; } @@ -332,10 +336,15 @@ #print "INFO: re_using checksum for $package ($checksum)\n"; } } + if ($do_sha256 eq "1") { + $checksum = "" unless length($checksum) == 64; + } else { + $checksum = "" unless length($checksum) == 40; + } } if ( ! $checksum ) { if ( $res{1044}[0] || $ignore_sources eq "0") { - ($checksum,$dummy) = split('\s+',`sha1sum $package`); + ($checksum,$dummy) = split('\s+',`$checksum_binary $package`); if ( $have_sha_cache eq "1" ) { open ( CSC, "> $SHA_CACHEDIR[0]/$rpm_name-$hash" ); print CSC $checksum; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 krb5-appl for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package krb5-appl for openSUSE:Factory checked in at Mon May 2 14:27:50 CEST 2011. -------- --- krb5-appl/krb5-appl.changes 2010-03-04 11:06:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/krb5-appl/krb5-appl.changes 2011-04-29 14:18:18.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 29 13:46:26 CEST 2011 - mc(a)suse.de + +- update to version 1.0.1 +- fix telnet issue (bnc#688281) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- krb5-appl-1.0.tar.bz2 New: ---- krb5-appl-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-appl.spec ++++++ --- /var/tmp/diff_new_pack.H4yDQb/_old 2011-05-02 14:26:26.000000000 +0200 +++ /var/tmp/diff_new_pack.H4yDQb/_new 2011-05-02 14:26:26.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package krb5-appl (Version 1.0) +# spec file for package krb5-appl # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ # norootforbuild -%define srcRoot krb5-appl-1.0/ +%define srcRoot krb5-appl-1.0.1/ %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ %define krb5docdir %{_defaultdocdir}/krb5 @@ -25,11 +25,11 @@ License: MIT License (or similar) Url: http://web.mit.edu/kerberos/www/ BuildRequires: bison krb5-devel libcom_err-devel ncurses-devel -Version: 1.0 +Version: 1.0.1 Release: 1 Summary: MIT Kerberos5 Implementation--Applications Group: Productivity/Networking/Security -Source0: krb5-appl-1.0.tar.bz2 +Source0: krb5-appl-1.0.1.tar.bz2 Source1: vendor-files.tar.bz2 Source2: README.Source Source3: spx.c ++++++ krb5-appl-1.0.tar.bz2 -> krb5-appl-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-appl-1.0/configure new/krb5-appl-1.0.1/configure --- old/krb5-appl-1.0/configure 2010-03-03 00:59:12.000000000 +0100 +++ new/krb5-appl-1.0.1/configure 2010-05-22 14:17:15.000000000 +0200 @@ -8840,9 +8840,7 @@ - - -for ac_func in line_push logwtmp openpty ptsname revoke rmufile rresvport_af +for ac_func in line_push ptsname revoke rmufile rresvport_af do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -9330,6 +9328,106 @@ done +# Check for functions found in libutil. +old_LIBS="$LIBS" +LIBS="$UTIL_LIB $LIBS" + + +for ac_func in logwtmp openpty +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +LIBS="$old_LIBS" + # Determine which functions to define in libmissing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-appl-1.0/configure.ac new/krb5-appl-1.0.1/configure.ac --- old/krb5-appl-1.0/configure.ac 2009-11-21 22:46:39.000000000 +0100 +++ new/krb5-appl-1.0.1/configure.ac 2010-05-22 14:08:50.000000000 +0200 @@ -105,12 +105,18 @@ AC_CHECK_FUNCS(_getpty cgetent getcwd getenv gettosbyname getusershell getutmp) AC_CHECK_FUNCS(getutmpx grantpt inet_aton initgroups isatty killpg killpg) -AC_CHECK_FUNCS(line_push logwtmp openpty ptsname revoke rmufile rresvport_af) +AC_CHECK_FUNCS(line_push ptsname revoke rmufile rresvport_af) AC_CHECK_FUNCS(seteuid setlogin setpgid setpriority setresuid setreuid) AC_CHECK_FUNCS(setutent setutsent setutxent strsave tcgetpgrp tcsetpgrp) AC_CHECK_FUNCS(ttyname unsetenv updwtmp updwtmpx utimes utmpname utmpxname) AC_CHECK_FUNCS(vhangup vsnprintf waitpid) +# Check for functions found in libutil. +old_LIBS="$LIBS" +LIBS="$UTIL_LIB $LIBS" +AC_CHECK_FUNCS(logwtmp openpty) +LIBS="$old_LIBS" + # Determine which functions to define in libmissing. AC_REPLACE_FUNCS(daemon getdtablesize getopt herror parsetos setenv setsid) AC_REPLACE_FUNCS(strcasecmp strdup strerror strftime strlcpy asprintf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-appl-1.0/telnet/libtelnet/kerberos5.c new/krb5-appl-1.0.1/telnet/libtelnet/kerberos5.c --- old/krb5-appl-1.0/telnet/libtelnet/kerberos5.c 2009-07-08 23:22:07.000000000 +0200 +++ new/krb5-appl-1.0.1/telnet/libtelnet/kerberos5.c 2010-05-22 14:11:26.000000000 +0200 @@ -498,23 +498,28 @@ if (authenticator->checksum) { char type_check[2]; krb5_checksum *cksum = authenticator->checksum; - krb5_keyblock *key; + krb5_key key; + krb5_boolean valid; + krb5_data d; type_check[0] = ap->type; type_check[1] = ap->way; - r = krb5_auth_con_getkey(telnet_context, auth_context, - &key); + r = krb5_auth_con_getkey_k(telnet_context, auth_context, + &key); if (r) { (void) snprintf(errbuf, sizeof(errbuf), "krb5_auth_con_getkey failed: %s", error_message(r)); goto errout; } - r = krb5_verify_checksum(telnet_context, - cksum->checksum_type, cksum, - &type_check, 2, key->contents, - key->length); + + d.magic = KV5M_DATA; + d.data = type_check; + d.length = 2; + r = krb5_k_verify_checksum(telnet_context, key, + cksum->checksum_type, + &d, cksum, &valid); /* * Note that krb5_verify_checksum() will fail if a pre- * MIT Kerberos Beta 5 client is attempting to connect @@ -524,13 +529,12 @@ * checksums (like in klogind). Such an option is not * present at this time. */ - if (r) { + if (r != 0 || !valid) { (void) snprintf(errbuf, sizeof(errbuf), - "checksum verification failed: %s", - error_message(r)); + "checksum verification failed"); goto errout; } - krb5_free_keyblock(telnet_context, key); + krb5_k_free_key(telnet_context, key); } krb5_free_authenticator(telnet_context, authenticator); if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 open-vm-tools for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at Mon May 2 14:24:41 CEST 2011. -------- --- open-vm-tools/open-vm-tools.changes 2011-04-27 10:59:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-vm-tools/open-vm-tools.changes 2011-04-29 17:24:17.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 29 16:08:33 UTC 2011 - dimstar(a)opensuse.org + +- Udpate to version 2011.04.25: + + Mostly cleanups and small bug fixes in this release. + + Logging is enabled by default in vmtoolsd, writing to syslog. + The default log level is not chatty, so few messages should + make it to syslog during normal operation. + + The GUI version of the toolbox was removed. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- open-vm-tools-2011.03.28-387002.tar.bz2 vmware-toolbox.desktop New: ---- _service _service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.1t7JxQ/_old 2011-05-02 14:21:03.000000000 +0200 +++ /var/tmp/diff_new_pack.1t7JxQ/_new 2011-05-02 14:21:03.000000000 +0200 @@ -32,15 +32,14 @@ Name: open-vm-tools Group: System/Emulators/PC Summary: Open Virtual Machine Tools -Version: 2011.03.28 +Version: 2011.04.25 Release: 1 -%define svn_rev 387002 +%define svn_rev 402641 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 Source: %{name}-%{version}-%{svn_rev}.tar.bz2 Source1: vmtoolsd Source2: vmware-user-autostart.desktop -Source3: vmware-toolbox.desktop Source4: open-vm-tools.permissions Source5: vmware-user-autostart-wrapper Source6: open-vm-tools-modprobe.conf @@ -321,7 +320,6 @@ %files gui %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop -%{_bindir}/vmware-toolbox %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper %{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so %{_libdir}/%{name}/plugins/vmusr/libdndcp.so ++++++ _service ++++++ <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">sourceforge.net</param> <param name="path">/projects/open-vm-tools/files/open-vm-tools/2011.04.25/open-vm-tools-2011.04.25-402641.tar.gz</param> </service> <service name="recompress"> <param name="file">_service:download_url:*.tar.gz</param> <param name="compression">bz2</param> </service> </services> ++++++ vmtoolsd ++++++ --- /var/tmp/diff_new_pack.1t7JxQ/_old 2011-05-02 14:21:03.000000000 +0200 +++ /var/tmp/diff_new_pack.1t7JxQ/_new 2011-05-02 14:21:03.000000000 +0200 @@ -43,10 +43,10 @@ # The kernel module for the balloon driver changes its name in different kernel versions KERNEL_MICRO=$(uname -r | awk -F- '{print $1}' | sed 's,2.6.,,') case $KERNEL_MICRO in - 36) + 27|28|29|30|31|32|33) VMBALLOON=vmmemctl ;; - 37) + 34|35) VMBALLOON=vmware_balloon ;; *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openvas-manager for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package openvas-manager for openSUSE:Factory checked in at Mon May 2 14:20:53 CEST 2011. -------- --- openvas-manager/openvas-manager.changes 2011-03-03 01:57:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/openvas-manager/openvas-manager.changes 2011-04-22 13:26:13.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 22 10:12:32 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 2.0.3 + * Enforces strict permissions on sensitive OpenVAS Manager files. + * Drop privileges before executing report format plugins if running with + elevated privileges. + * Ensures report formats are trusted before executing them. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openvas-manager-2.0.2.tar.gz New: ---- debian.series openvas-manager-2.0.3-install.patch openvas-manager-2.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-manager.spec ++++++ --- /var/tmp/diff_new_pack.kzOMe9/_old 2011-05-02 14:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.kzOMe9/_new 2011-05-02 14:18:36.000000000 +0200 @@ -19,9 +19,9 @@ Name: openvas-manager -Version: 2.0.2 +Version: 2.0.3 Release: 1 -License: GNU GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Security Url: http://www.openvas.org Source0: %{name}-%{version}.tar.gz @@ -30,6 +30,7 @@ Source3: openvasmd.init.suse Source4: openvasmd.init.fedora Source5: openvasmd.init.mandriva +Patch0: openvas-manager-2.0.3-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?scientificlinux_version} @@ -64,6 +65,7 @@ %prep %setup -q +%patch0 %build %if 0%{?mandriva_version} @@ -163,7 +165,6 @@ %doc CHANGES README %config(noreplace) %{_sysconfdir}/logrotate.d/openvas-manager %dir %{_sysconfdir}/openvas -#config(noreplace) %{_sysconfdir}/openvas/openvasmd %config(noreplace) %{_sysconfdir}/openvas/openvasmd_log.conf %{_initrddir}/openvas-manager %{_sbindir}/openvasmd @@ -171,6 +172,7 @@ %{_datadir}/openvas/openvasmd %dir %{_localstatedir}/lib/openvas %{_localstatedir}/lib/openvas/mgr +%{_localstatedir}/lib/openvas/openvasmd %dir %{_localstatedir}/log/openvas %ghost %{_localstatedir}/log/openvas/openvasmd.log ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.kzOMe9/_old 2011-05-02 14:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.kzOMe9/_new 2011-05-02 14:18:36.000000000 +0200 @@ -1,3 +1,13 @@ +openvas-manager (2.0.3-1) UNRELEASED; urgency=low + + * New upstream release. + - Enforces strict permissions on sensitive OpenVAS Manager files. + - Drop privileges before executing report format plugins if running with + elevated privileges. + - Ensures report formats are trusted before executing them. + + -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 22 Apr 2011 12:13:53 +0200 + openvas-manager (2.0.2-1) UNRELEASED; urgency=low * New upstream release. ++++++ debian.openvas-manager.dirs ++++++ --- /var/tmp/diff_new_pack.kzOMe9/_old 2011-05-02 14:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.kzOMe9/_new 2011-05-02 14:18:36.000000000 +0200 @@ -1 +1,3 @@ +var/lib/openvas/mgr +var/lib/openvas/openvasmd/report_formats var/log/openvas ++++++ debian.series ++++++ openvas-manager-2.0.3-install.patch -p0 ++++++ openvas-manager-2.0.3-install.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-04-15 15:30:03.000000000 +0200 +++ CMakeLists.txt 2011-04-22 12:29:06.124935838 +0200 @@ -257,7 +257,7 @@ enable_testing () ## Install -install (CODE "file (MAKE_DIRECTORY ${OPENVAS_STATE_DIR}/openvasmd/report_formats/)") +install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${OPENVAS_STATE_DIR}/openvasmd/report_formats)") install (FILES ${CMAKE_BINARY_DIR}/src/openvasmd_log.conf DESTINATION ${OPENVAS_SYSCONF_DIR}) ++++++ openvas-manager-2.0.2.tar.gz -> openvas-manager-2.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/CHANGES new/openvas-manager-2.0.3/CHANGES --- old/openvas-manager-2.0.2/CHANGES 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/CHANGES 2011-04-15 15:30:03.000000000 +0200 @@ -1,3 +1,34 @@ +openvas-manager 2.0.3 (2011-04-15) + +This is the third maintenance release of the openvas-manager 2.0 module for the +Open Vulnerability Assessment System release 4 (OpenVAS-4). The OpenVAS Manager +is the central management service between the actual security scanner and +various user clients. + +This release fixes a severe security issue discovered after the release of +openvas-manager 2.0.2. By crafting a special report format plugin, and knowing +about the operating system on which OpenVAS Manager is running, a rogue user +was able to upload the plugin and execute arbitrary code with the privileges of +the user running the OpenVAS Manager. + +This release enforces strict permissions on sensitive OpenVAS Manager files and +will drop privileges when executing report format plugins if it is running with +potentially dangerous privileges. Furthermore, it forces report formats to be +trusted before executing them. + +We strongly recommended upgrading existing installations of OpenVAS-4 to +openvas-manager 2.0.3. + +Many thanks to everyone who has contributed to this release: +Henri Doreau, Matthew Mundell, Michael Wiegand and Jan-Oliver Wagner. + +Main changes since 2.0.2: +* Enforces strict permissions on sensitive OpenVAS Manager files. +* Drop privileges before executing report format plugins if running with + elevated privileges. +* Ensures report formats are trusted before executing them. + + openvas-manager 2.0.2 (2011-03-02) This is the second maintenance release of the openvas-manager 2.0 module for the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/CMakeLists.txt new/openvas-manager-2.0.3/CMakeLists.txt --- old/openvas-manager-2.0.2/CMakeLists.txt 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/CMakeLists.txt 2011-04-15 15:30:03.000000000 +0200 @@ -78,7 +78,7 @@ set (CPACK_TOPLEVEL_TAG "") set (CPACK_PACKAGE_VERSION_MAJOR "2") set (CPACK_PACKAGE_VERSION_MINOR "0") -set (CPACK_PACKAGE_VERSION_PATCH "2${SVN_REVISION}") +set (CPACK_PACKAGE_VERSION_PATCH "3${SVN_REVISION}") set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") @@ -257,62 +257,64 @@ ## Install +install (CODE "file (MAKE_DIRECTORY ${OPENVAS_STATE_DIR}/openvasmd/report_formats/)") + install (FILES ${CMAKE_BINARY_DIR}/src/openvasmd_log.conf DESTINATION ${OPENVAS_SYSCONF_DIR}) install (FILES src/report_formats/CPE/generate src/report_formats/CPE/CPE.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/a0704abb-2120-489f-959f-251c9f4ffebd/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/HTML/generate src/report_formats/HTML/HTML.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/b993b6f5-f9fb-4e6e-9c94-dd46c00e058d/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/ITG/generate src/report_formats/ITG/ITG.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/929884c6-c2c4-41e7-befb-2f6aa163b458/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/LaTeX/generate src/report_formats/LaTeX/latex.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/9f1ab17b-aaaa-411a-8c57-12df446f5588/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/NBE/generate src/report_formats/NBE/NBE.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/f5c2a364-47d2-4700-b21d-0a7693daddab/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/PDF/generate src/report_formats/LaTeX/latex.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/1a60a67e-97d0-4cbf-bc77-f71b08e7043d/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/TXT/generate src/report_formats/TXT/TXT.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/19f6f1b3-7128-4433-888c-ccc764fe6ed5/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/report_formats/XML/generate DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_report_formats/d5da9f67-8551-4e51-807b-b6a873d70e34/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/schema_formats/HTML/generate src/schema_formats/RNC/rnc.xsl src/schema_formats/HTML/HTML.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/schema_formats/RNC/generate src/schema_formats/RNC/rnc.xsl src/schema_formats/RNC/RNC.xsl DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install (FILES src/schema_formats/XML/generate src/schema_formats/XML/OMP.xml DESTINATION ${OPENVAS_DATA_DIR}/openvasmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ) + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) ## End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/ChangeLog new/openvas-manager-2.0.3/ChangeLog --- old/openvas-manager-2.0.2/ChangeLog 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/ChangeLog 2011-04-15 15:30:03.000000000 +0200 @@ -1,3 +1,101 @@ +2011-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Preparing the openvas-manager 2.0.3 release. + + * CHANGES: Updated. + +2011-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * src/manage_sql.c (delete_report_format): Free allocated char on + failure. + +2011-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Make predefined report formats always available. Adapted from trunk + from code committed by Matthew Mundell in r10777. + + * src/omp.c (omp_xml_handle_end_element): In OMP GET_REPORT_FORMATS + allow predefined formats always. + + * src/manage_sql.c (manage_report, manage_send_report): Allow predefined + formats always. + +2011-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Refuse to delete predefined report formats. Adapted from trunk from + code committed by Matthew Mundell in r10776. + + * src/manage_sql.c (delete_report_format): Fail if format is predefined. + (report_format_predefined): New function. + + * src/manage.h: Add header accordingly. + + * src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_REPORTS remove + erroneous case and add predefined case. + +2011-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Require that format trust is "yes". Backport from trunk; initially + committed by Matthew Mundell in r10774. + + * src/manage_sql.c (manage_report, manage_send_report): Accept only + trusted report formats. + (report_format_trust): New function. + + * src/manage.h: Add header accordingly. + + * src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_REPORTS check + report format trust. + +2011-04-15 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Drop privileges in report creation when running as root. Backport from + trunk; initially committed by Matthew Mundell in r10772. + + * CMakeLists.txt: Create the user report_formats directory, so that it's + world readable, for nobody. Make the predefined report formats world + readable, for nobody. + + * src/manage_sql.c (manage_report, manage_send_report): Drop to nobody + within the spawned command when running as root. This prevents the report + formats from having root access. + (create_report_format): Ensure that nobody can access the installed report + formats. + +2011-04-14 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * src/manage_sql.c (init_manage_process): Reduce permissions if they are + too loose. Backport from trunk; initially committed by Matthew Mundell + in r10762 and r10763. + +2011-04-14 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * src/openvasmd.c (main): Set very restrictive umask. Backport from + trunk; initially committed by Matthew Mundell in r10758. + +2011-03-31 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * src/manage_sql.c (find_report_format): Add a user check to the + constraint XML because multiple users can import the same report format. + Backport from trunk; initially committed in r10632. + +2011-03-31 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * src/manage_sql.c (migrate_37_to_38): Use "mv" to do the move, because + "rename" requires the dirs to be on the same file system. Backport from + trunk; initially committed in r10663. + +2011-03-08 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * src/manage_sql.c (delete_lsc_credential) + (init_lsc_credential_iterator): Check both credentials in targets. + +2011-03-02 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Post release version bump. + + * CMakeLists.txt: Updated version number. + 2011-03-02 Michael Wiegand <michael.wiegand(a)greenbone.net> Preparing the openvas-manager 2.0.2 release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/src/manage.h new/openvas-manager-2.0.3/src/manage.h --- old/openvas-manager-2.0.2/src/manage.h 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/src/manage.h 2011-04-15 15:30:03.000000000 +0200 @@ -1553,6 +1553,9 @@ report_format_global (report_format_t); int +report_format_predefined (report_format_t); + +int report_format_active (report_format_t); void @@ -1641,6 +1644,9 @@ report_format_param_type_t report_format_param_type_from_name (const char *); +int +report_format_trust (report_format_t); + void init_report_format_param_iterator (iterator_t*, report_format_t, int, const char*); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/src/manage_sql.c new/openvas-manager-2.0.3/src/manage_sql.c --- old/openvas-manager-2.0.2/src/manage_sql.c 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/src/manage_sql.c 2011-04-15 15:30:00.000000000 +0200 @@ -40,6 +40,7 @@ #include <ctype.h> #include <dirent.h> #include <errno.h> +#include <pwd.h> #include <sqlite3.h> #include <stdlib.h> #include <string.h> @@ -4194,7 +4195,6 @@ new_dir = g_build_filename (OPENVAS_STATE_DIR, "openvasmd", - "report_formats", NULL); if (g_mkdir_with_parents (new_dir, 0755 /* "rwxr-xr-x" */)) @@ -4213,17 +4213,51 @@ /* Ensure the old dir exists. */ g_mkdir_with_parents (old_dir, 0755 /* "rwxr-xr-x" */); - if (rename (old_dir, new_dir)) - { - g_warning ("%s: renaming %s to %s failed: %s\n", - __FUNCTION__, - old_dir, - new_dir, - strerror (errno)); - g_free (old_dir); - g_free (new_dir); - sql ("ROLLBACK;"); - } + { + gchar **cmd; + gchar *standard_out = NULL; + gchar *standard_err = NULL; + gint exit_status; + + cmd = (gchar **) g_malloc (4 * sizeof (gchar *)); + cmd[0] = g_strdup ("mv"); + cmd[1] = old_dir; + cmd[2] = new_dir; + cmd[3] = NULL; + g_debug ("%s: Spawning in .: %s %s %s\n", + __FUNCTION__, cmd[0], cmd[1], cmd[2]); + if ((g_spawn_sync (".", + cmd, + NULL, /* Environment. */ + G_SPAWN_SEARCH_PATH, + NULL, /* Setup function. */ + NULL, + &standard_out, + &standard_err, + &exit_status, + NULL) + == FALSE) + || (WIFEXITED (exit_status) == 0) + || WEXITSTATUS (exit_status)) + { + g_warning ("%s: failed rename: %d (WIF %i, WEX %i)", + __FUNCTION__, + exit_status, + WIFEXITED (exit_status), + WEXITSTATUS (exit_status)); + g_debug ("%s: stdout: %s\n", __FUNCTION__, standard_out); + g_debug ("%s: stderr: %s\n", __FUNCTION__, standard_err); + g_free (old_dir); + g_free (new_dir); + g_free (cmd[0]); + g_free (cmd); + sql ("ROLLBACK;"); + return -1; + } + + g_free (cmd[0]); + g_free (cmd); + } g_free (old_dir); g_free (new_dir); @@ -6234,6 +6268,24 @@ abort (); } + { + struct stat state; + stat (database ? database : OPENVAS_STATE_DIR "/mgr/tasks.db", &state); + if (state.st_mode & (S_IXUSR | S_IRWXG | S_IRWXO)) + { + g_warning ("%s: database permissions are too loose, repairing\n", + __FUNCTION__); + if (chmod (database ? database : OPENVAS_STATE_DIR "/mgr/tasks.db", + S_IRUSR | S_IWUSR)) + { + g_warning ("%s: chmod failed: %s\n", + __FUNCTION__, + strerror (errno)); + abort (); + } + } + } + #ifndef S_SPLINT_S /* Open the database. */ if (sqlite3_open (database ? database @@ -11979,6 +12031,10 @@ /* Print the report as XML to a file. */ + if ((report_format_predefined (report_format) == 0) + && (report_format_trust (report_format) != TRUST_YES)) + return NULL; + if (report_task (report, &task)) return NULL; @@ -12101,11 +12157,41 @@ /* Call the script. */ - command = g_strdup_printf ("/bin/sh %s %s > %s" - " 2> /dev/null", - script, - xml_file, - output_file); + if (getuid () == 0) + { + struct passwd *nobody; + + nobody = getpwnam ("nobody"); + if ((nobody == NULL) + || chown (xml_dir, nobody->pw_uid, nobody->pw_gid) + || chown (xml_file, nobody->pw_uid, nobody->pw_gid)) + { + g_warning ("%s: Failed to set dir permissions: %s\n", + __FUNCTION__, + strerror (errno)); + g_free (previous_dir); + g_free (script); + g_free (xml_file); + if (extension) g_free (*extension); + if (content_type) g_free (*content_type); + return NULL; + } + + command = g_strdup_printf ("/bin/sh -c \"su nobody" + " -c \\\"/bin/sh %s %s > %s" + " 2> /dev/null\\\"" + " > /dev/null 2>&1\"" + " > /dev/null 2>&1", + script, + xml_file, + output_file); + } + else + command = g_strdup_printf ("/bin/sh %s %s > %s" + " 2> /dev/null", + script, + xml_file, + output_file); g_free (script); g_debug (" command: %s\n", command); @@ -12245,6 +12331,10 @@ /* Print the report as XML to a file. */ + if ((report_format_predefined (report_format) == 0) + && (report_format_trust (report_format) != TRUST_YES)) + return -1; + if (report_task (report, &task)) return -1; @@ -12353,11 +12443,39 @@ /* Call the script. */ - command = g_strdup_printf ("/bin/sh %s %s > %s" - " 2> /dev/null", - script, - xml_file, - output_file); + if (getuid () == 0) + { + struct passwd *nobody; + + nobody = getpwnam ("nobody"); + if ((nobody == NULL) + || chown (xml_dir, nobody->pw_uid, nobody->pw_gid) + || chown (xml_file, nobody->pw_uid, nobody->pw_gid)) + { + g_warning ("%s: Failed to set dir permissions: %s\n", + __FUNCTION__, + strerror (errno)); + g_free (previous_dir); + g_free (script); + g_free (xml_file); + return -1; + } + + command = g_strdup_printf ("/bin/sh -c \"su nobody" + " -c \\\"/bin/sh %s %s > %s" + " 2> /dev/null\\\"" + " > /dev/null 2>&1\"" + " > /dev/null 2>&1", + script, + xml_file, + output_file); + } + else + command = g_strdup_printf ("/bin/sh %s %s > %s" + " 2> /dev/null", + script, + xml_file, + output_file); g_free (script); g_free (xml_file); @@ -18493,7 +18611,9 @@ sql ("BEGIN IMMEDIATE;"); if (sql_int (0, 0, - "SELECT count(*) FROM targets WHERE lsc_credential = %llu;", + "SELECT count(*) FROM targets" + " WHERE lsc_credential = %llu OR smb_lsc_credential = %llu;", + lsc_credential, lsc_credential)) { sql ("ROLLBACK;"); @@ -18608,6 +18728,8 @@ " public_key, private_key, rpm, deb, exe," " (SELECT count(*) > 0 FROM targets" " WHERE lsc_credential = lsc_credentials.ROWID)" + " + (SELECT count(*) > 0 FROM targets" + " WHERE smb_lsc_credential = lsc_credentials.ROWID)" " FROM lsc_credentials" " WHERE ROWID = %llu" " AND ((owner IS NULL) OR (owner =" @@ -18623,6 +18745,8 @@ " public_key, private_key, rpm, deb, exe," " (SELECT count(*) > 0 FROM targets" " WHERE lsc_credential = lsc_credentials.ROWID)" + " + (SELECT count(*) > 0 FROM targets" + " WHERE smb_lsc_credential = lsc_credentials.ROWID)" " FROM lsc_credentials" " WHERE ((owner IS NULL) OR (owner =" " (SELECT ROWID FROM users WHERE users.uuid = '%s')))" @@ -21541,9 +21665,14 @@ *report_format = 0; return FALSE; } + assert (current_credentials.uuid); switch (sql_int64 (report_format, 0, 0, - "SELECT ROWID FROM report_formats WHERE uuid = '%s';", - quoted_uuid)) + "SELECT ROWID FROM report_formats WHERE uuid = '%s'" + " AND ((owner IS NULL) OR (owner =" + " (SELECT users.ROWID FROM users" + " WHERE users.uuid = '%s')));", + quoted_uuid, + current_credentials.uuid)) { case 0: break; @@ -21809,6 +21938,45 @@ return -1; } + if (global == 0) + { + gchar *report_dir; + + /* glib seems to apply the mode to the first dir only. */ + + report_dir = g_build_filename (OPENVAS_STATE_DIR, + "openvasmd", + "report_formats", + current_credentials.uuid, + NULL); + + if (chmod (report_dir, 0755 /* rwxr-xr-x */)) + { + g_warning ("%s: chmod failed: %s\n", + __FUNCTION__, + strerror (errno)); + g_free (dir); + g_free (report_dir); + g_free (quoted_name); + sql ("ROLLBACK;"); + return -1; + } + + g_free (report_dir); + } + + /* glib seems to apply the mode to the first dir only. */ + if (chmod (dir, 0755 /* rwxr-xr-x */)) + { + g_warning ("%s: chmod failed: %s\n", + __FUNCTION__, + strerror (errno)); + g_free (dir); + g_free (quoted_name); + sql ("ROLLBACK;"); + return -1; + } + index = 0; while ((file_name = (gchar*) g_ptr_array_index (files, index++))) { @@ -21839,17 +22007,32 @@ error = NULL; g_file_set_contents (full_file_name, contents, contents_size, &error); g_free (contents); - g_free (full_file_name); if (error) { g_warning ("%s: %s", __FUNCTION__, error->message); g_error_free (error); file_utils_rmdir_rf (dir); + g_free (full_file_name); g_free (dir); g_free (quoted_name); sql ("ROLLBACK;"); return -1; } + + if (chmod (full_file_name, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) + { + g_warning ("%s: chmod failed: %s\n", + __FUNCTION__, + strerror (errno)); + file_utils_rmdir_rf (dir); + g_free (full_file_name); + g_free (dir); + g_free (quoted_name); + sql ("ROLLBACK;"); + return -1; + } + + g_free (full_file_name); } /* Add format to database. */ @@ -22065,7 +22248,7 @@ * * @param[in] report_format Report format. * - * @return 0 success, -1 error. + * @return 0 success, 3 predefined report format, -1 error. */ int delete_report_format (report_format_t report_format) @@ -22082,6 +22265,13 @@ return -1; } + if (report_format_predefined (report_format)) + { + sql ("ROLLBACK;"); + free (uuid); + return 3; + } + if (report_format_global (report_format)) dir = g_build_filename (OPENVAS_DATA_DIR, "openvasmd", @@ -22391,6 +22581,30 @@ } /** + * @brief Return whether a report format is predefined. + * + * @param[in] report_format Report format. + * + * @return 1 if predefined, else 0. + */ +int +report_format_predefined (report_format_t report_format) +{ + return sql_int (0, 0, + "SELECT uuid = 'a0704abb-2120-489f-959f-251c9f4ffebd'" + " OR uuid = 'b993b6f5-f9fb-4e6e-9c94-dd46c00e058d'" + " OR uuid = '929884c6-c2c4-41e7-befb-2f6aa163b458'" + " OR uuid = '9f1ab17b-aaaa-411a-8c57-12df446f5588'" + " OR uuid = 'f5c2a364-47d2-4700-b21d-0a7693daddab'" + " OR uuid = '1a60a67e-97d0-4cbf-bc77-f71b08e7043d'" + " OR uuid = '19f6f1b3-7128-4433-888c-ccc764fe6ed5'" + " OR uuid = 'd5da9f67-8551-4e51-807b-b6a873d70e34'" + " FROM report_formats" + " WHERE ROWID = %llu;", + report_format); +} + +/** * @brief Return whether a report format is active. * * @param[in] report_format Report format. @@ -22659,6 +22873,21 @@ } /** + * @brief Return the trust of a report format. + * + * @param[in] report_format Report format. + * + * @return Trust: 1 yes, 2 no, 2 unknown. + */ +int +report_format_trust (report_format_t report_format) +{ + return sql_int (0, 0, + "SELECT trust FROM report_formats WHERE ROWID = %llu;", + report_format); +} + +/** * @brief Initialise a report format iterator. * * @param[in] iterator Iterator. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/src/omp.c new/openvas-manager-2.0.3/src/omp.c --- old/openvas-manager-2.0.2/src/omp.c 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/src/omp.c 2011-04-15 15:30:03.000000000 +0200 @@ -8461,10 +8461,10 @@ case 0: SEND_TO_CLIENT_OR_FAIL (XML_OK ("delete_report_format")); break; - case 1: + case 3: SEND_TO_CLIENT_OR_FAIL (XML_ERROR_SYNTAX ("delete_report_format", - "Attempt to delete a hidden report" + "Attempt to delete a predefined report" " format")); break; default: @@ -8631,6 +8631,18 @@ set_client_state (CLIENT_AUTHENTIC); break; } + + if ((report_format_predefined (report_format) == 0) + && (report_format_trust (report_format) > 1)) + { + get_reports_data_reset (get_reports_data); + SEND_TO_CLIENT_OR_FAIL + (XML_ERROR_SYNTAX ("get_reports", + "GET_REPORTS report format must be predefined" + " or trusted")); + set_client_state (CLIENT_AUTHENTIC); + break; + } SEND_TO_CLIENT_OR_FAIL ("<get_reports_response" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-manager-2.0.2/src/openvasmd.c new/openvas-manager-2.0.3/src/openvasmd.c --- old/openvas-manager-2.0.2/src/openvasmd.c 2011-03-02 15:21:27.000000000 +0100 +++ new/openvas-manager-2.0.3/src/openvasmd.c 2011-04-15 15:30:03.000000000 +0200 @@ -1092,6 +1092,10 @@ } tzset (); + /* Set umask to hoard created files, including the database. */ + + umask (S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH); + /* Set GnuPG home directory. */ gnupg_home = g_build_filename (OPENVAS_SYSCONF_DIR, "gnupg/", NULL); ++++++ openvas-manager.dsc ++++++ --- /var/tmp/diff_new_pack.kzOMe9/_old 2011-05-02 14:18:37.000000000 +0200 +++ /var/tmp/diff_new_pack.kzOMe9/_new 2011-05-02 14:18:37.000000000 +0200 @@ -2,12 +2,12 @@ Source: openvas-manager Binary: openvas-manager Architecture: any -Version: 2.0.2-1 +Version: 2.0.3-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), cmake, doxygen, dpatch, hardening-wrapper, libopenvas4-dev, libsqlite3-dev, pkg-config Files: - 776ce4e1000137c9aec7863372c8c876 373800 openvas-manager-2.0.2.orig.tar.gz - 131e6720b0526ade9405eade0d9150ac 56625 openvas-manager-2.0.2.diff.gz + 776ce4e1000137c9aec7863372c8c876 373800 openvas-manager-2.0.3.orig.tar.gz + 131e6720b0526ade9405eade0d9150ac 56625 openvas-manager-2.0.3.diff.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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