November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit post-build-checks for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at Fri Nov 5 16:20:45 CET 2010. -------- --- post-build-checks/post-build-checks.changes 2010-05-31 17:37:43.000000000 +0200 +++ post-build-checks/post-build-checks.changes 2010-11-04 16:30:21.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 4 15:29:40 UTC 2010 - lnussel(a)suse.de + +- revive 04-check-filelist part that checks for unpackaged + directory. Not possible to implement with rpmlint atm. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.HFpwA2/_old 2010-11-05 16:20:19.000000000 +0100 +++ /var/tmp/diff_new_pack.HFpwA2/_new 2010-11-05 16:20:19.000000000 +0100 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 73 +Release: 80 PreReq: aaa_base permissions sed Source0: %{name}-%{version}.tar.bz2 Source1: suse-buildsystem.sh ++++++ post-build-checks-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-1.0/checks/04-check-filelist new/post-build-checks-1.0/checks/04-check-filelist --- old/post-build-checks-1.0/checks/04-check-filelist 1970-01-01 01:00:00.000000000 +0100 +++ new/post-build-checks-1.0/checks/04-check-filelist 2010-11-04 16:27:01.000000000 +0100 @@ -0,0 +1,15 @@ +#!/bin/bash +# check if all directories are owned by a package + +echo "... checking filelist" +ret=0 + +for pkg in `find $BUILD_ROOT/.build.packages/RPMS -name "*.rpm"`; do + case "$pkg" in + *-debuginfo-*|*-debugsource-*) continue ;; + esac + rpm -qlp $pkg | chroot $BUILD_ROOT /usr/lib/build/checks-data/checkdirs "${pkg##*/}" + [ $? = 0 ] || ret=1 +done + +exit $ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-1.0/checks-data/checkdirs new/post-build-checks-1.0/checks-data/checkdirs --- old/post-build-checks-1.0/checks-data/checkdirs 2008-08-11 14:35:40.000000000 +0200 +++ new/post-build-checks-1.0/checks-data/checkdirs 2010-11-04 16:26:39.000000000 +0100 @@ -1,15 +1,7 @@ #!/usr/bin/perl @exclude = qw{ - /CD1 - /etc/hotplug /etc/hotplug/usb /emul /emul/ia32-linux - /usr/include/NOVLam /usr/libexec /var/nam - /opt/novell/man /opt/novell/man/man1 /opt/novell/man/man5 /opt/novell/man/man7 /opt/novell/man/man8 - /var/opt/novell /var/opt/novell/tomcat4 /var/opt/novell/tomcat4/webapps /var/opt/novell/tomcat4/webapps/nps - /var/opt/novell/tomcat4/webapps/welcome /var/opt/novell/tomcat4/webapps/welcome/WEB-INF - /var/opt/novell/tomcat4/webapps/welcome/WEB-INF/XMLData /var/opt/novell/tomcat4/webapps/welcome/images - /var/opt/novell/iManager }; %dirs = (); @@ -22,8 +14,6 @@ $rname = "$rname: " if $rname ne ''; } -exit 0 if ( $pname eq "busybox-links"); - my %myfiles; while (<STDIN>) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rfc for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Fri Nov 5 16:19:47 CET 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-11-01 20:43:37.000000000 +0100 +++ rfc/rfc.changes 2010-11-05 12:42:18.000000000 +0100 @@ -2 +2 @@ -Mon Nov 1 20:43:37 CET 2010 - autobuild(a)suse.de +Fri Nov 5 12:42:18 CET 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-11-01 +- automated update on 2010-11-05 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.v60GTr/_old 2010-11-05 16:19:28.000000000 +0100 +++ /var/tmp/diff_new_pack.v60GTr/_new 2010-11-05 16:19:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.11.1) +# spec file for package rfc (Version 2010.11.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.11.1 +Version: 2010.11.5 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfkill for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package rfkill for openSUSE:Factory checked in at Fri Nov 5 16:19:20 CET 2010. -------- --- rfkill/rfkill.changes 2010-03-16 11:11:08.000000000 +0100 +++ rfkill/rfkill.changes 2010-11-05 11:43:40.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 5 11:42:17 CET 2010 - vbotka(a)suse.de + +- license change to "ISC License" after consultation with + cfarrell(a)novell.com + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfkill.spec ++++++ --- /var/tmp/diff_new_pack.Rgo8az/_old 2010-11-05 16:17:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Rgo8az/_new 2010-11-05 16:17:16.000000000 +0100 @@ -21,8 +21,8 @@ Name: rfkill Url: http://wireless.kernel.org/download/rfkill/ Version: 0.4 -Release: 1 -License: MIT +Release: 6 +License: ISC License Group: Productivity/Networking/Other Summary: Query the state of the rfkill switches Source: rfkill-%{version}.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at Fri Nov 5 16:16:05 CET 2010. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2010-10-01 00:06:17.000000000 +0200 +++ kdenetwork4/kdenetwork4.changes 2010-10-28 22:13:08.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 28 22:13:00 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.3 + * see http://kde.org/announcements/changelogs/changelog4_5_2to4_5_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdenetwork-4.5.2.tar.bz2 New: ---- kdenetwork-4.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.qTekIF/_old 2010-11-05 16:15:39.000000000 +0100 +++ /var/tmp/diff_new_pack.qTekIF/_new 2010-11-05 16:15:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdenetwork4 (Version 4.5.2) +# spec file for package kdenetwork4 (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,7 +34,7 @@ Group: Productivity/Networking/Other Summary: KDE Network Base Package Url: http://www.kde.org -Version: 4.5.2 +Version: 4.5.3 Release: 1 Source0: kdenetwork-%version.tar.bz2 Patch: 4_5_BRANCH.diff ++++++ kdenetwork-4.5.2.tar.bz2 -> kdenetwork-4.5.3.tar.bz2 ++++++ KDE/kdenetwork4/kdenetwork-4.5.2.tar.bz2 kdenetwork4/kdenetwork-4.5.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevelop4 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package kdevelop4 for openSUSE:Factory checked in at Fri Nov 5 16:15:18 CET 2010. -------- --- KDE/kdevelop4/kdevelop4.changes 2010-07-18 09:52:04.000000000 +0200 +++ kdevelop4/kdevelop4.changes 2010-10-19 11:12:19.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Oct 19 08:31:31 UTC 2010 - wstephenson(a)novell.com + +- update to 4.1.0, require kdevplatform 1.1.0 + * fix custommake manager crashes when deleting, renaming folders + * optimize: no need to call moveBehindComment if we found a last #include, just put include after that + * finally fix the missing include item placement... + * place includes/forward declarations after defines or comments if no empty line is found + * properly add include/forward definition at start of document when we don't find a position after that + * Check cached variables from conditionals too. + * Make it possible to reload CMakeFolders that don't have a cmakelists.txt (because it has been removed). + Improve responsibity on file removal. Reload project branch when a CMakeLists.txt file was removed. + * use system colors instead of hardcoded colors in GDB command line toolview + * set focus on filter lineedit by default in 'attach to process' dialog + * properly read debugger state when adding output widget after debug process was started + * Test the option command works properly with the cache. + * Fix project reloading when the cache is dirty. + * Don't set the variable in case it's already specified on the cache. + * Reload the project whenever the CMakeCache is modified. + * let view take ownership of widgets, prevents leakage and crashes + * CMake support: avoid infinite loop on foreach(RANGE) that never runs. + * Make it possible to parse properly projects with empty CMakeLists.txt files. + Don't add the cmake project root directory two times to the watcher. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevelop-4.0.1.tar.bz2 New: ---- kdevelop-4.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4.spec ++++++ --- /var/tmp/diff_new_pack.mjJ6Cj/_old 2010-11-05 16:14:03.000000000 +0100 +++ /var/tmp/diff_new_pack.mjJ6Cj/_new 2010-11-05 16:14:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdevelop4 (Version 4.0.1) +# spec file for package kdevelop4 (Version 4.1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,13 @@ Name: kdevelop4 -BuildRequires: db-devel enscript graphviz kdesdk4 libkde4-devel libkdevplatform-devel -BuildRequires: kdebase4-workspace-devel python-devel subversion-devel +BuildRequires: fdupes libkde4-devel libkdevplatform-devel okteta +BuildRequires: kdebase4-workspace-devel License: GPLv2 ; GPLv2+ Group: Development/Tools/IDE Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME Url: http://www.kdevelop.org -Version: 4.0.1 +Version: 4.1.0 Release: 1 Source0: kdevelop-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +63,7 @@ %install cd build %makeinstall + %fdupes -s $RPM_BUILD_ROOT %kde_post_install cd .. # %find_lang desktop_extragear-sdk_kdevelop %{name}.lang @@ -74,6 +75,7 @@ %find_lang kdevformatters %{name}.lang %find_lang kdevgdb %{name}.lang %find_lang kdevmakebuilder %{name}.lang + %find_lang kdevokteta %{name}.lang %find_lang kdevqthelp %{name}.lang %post -p /sbin/ldconfig @@ -127,6 +129,7 @@ %_kde4_modules/kdevcpplanguagesupport.so %_kde4_modules/kdevcustommakemanager.so %_kde4_modules/kdevmakebuilder.so +%_kde4_modules/kdevkdeprovider.so %_libdir/libkdev4cmakecommon.so %_libdir/libkdev4cppduchain.so %_libdir/libkdev4cppparser.so ++++++ kdevelop-4.0.1.tar.bz2 -> kdevelop-4.1.0.tar.bz2 ++++++ ++++ 81935 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 ktorrent for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package ktorrent for openSUSE:Factory checked in at Fri Nov 5 16:13:47 CET 2010. -------- --- KDE/ktorrent/ktorrent.changes 2010-09-28 21:08:14.000000000 +0200 +++ ktorrent/ktorrent.changes 2010-10-18 21:36:31.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 18 19:35:48 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 4.0.4 + * fixes several minor things, and improves the performance when + there are many torrents + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ktorrent-4.0.3.tar.bz2 New: ---- ktorrent-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.k7MpUf/_old 2010-11-05 16:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.k7MpUf/_new 2010-11-05 16:11:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ktorrent (Version 4.0.3) +# spec file for package ktorrent (Version 4.0.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ License: GPLv2+ Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client -Version: 4.0.3 +Version: 4.0.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion %version ++++++ ktorrent-4.0.3.tar.bz2 -> ktorrent-4.0.4.tar.bz2 ++++++ ++++ 244693 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 NetworkManager-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package NetworkManager-kde4 for openSUSE:Factory checked in at Fri Nov 5 16:09:18 CET 2010. -------- --- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2010-10-06 10:25:09.000000000 +0200 +++ NetworkManager-kde4/NetworkManager-kde4.changes 2010-11-03 12:22:32.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 3 11:21:24 UTC 2010 - tittiatcoke(a)gmail.com + +- update to r1192577 + * Hide popup when losing focus + * Patch from Jirka Klimes against monolithic KNM to reflect a + change in Solid Network Manager backend. (bko#238325) + +------------------------------------------------------------------- +Sun Oct 10 11:22:32 UTC 2010 - tittiatcoke(a)gmail.com + +- update to r1184295 + * Fix crash and enable CDMA support in Mobile Connection Wizard + * Workaround for the crash when Network Manager restarts + +------------------------------------------------------------------- @@ -4 +19 @@ -- update to 1182930 +- update to r1182930 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-kde4.spec ++++++ --- /var/tmp/diff_new_pack.wziKhj/_old 2010-11-05 16:08:17.000000000 +0100 +++ /var/tmp/diff_new_pack.wziKhj/_new 2010-11-05 16:08:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package NetworkManager-kde4 (Version 0.9.svn1182930) +# spec file for package NetworkManager-kde4 (Version 0.9.svn1192577) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: NetworkManager-kde4 BuildRequires: NetworkManager-devel kdebase4-workspace-devel -Version: 0.9.svn1182930 +Version: 0.9.svn1192577 Release: 1 License: LGPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ networkmanagement.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/applet/networkmanager.cpp new/networkmanagement/applet/networkmanager.cpp --- old/networkmanagement/applet/networkmanager.cpp 2010-10-03 04:02:56.000000000 +0200 +++ new/networkmanagement/applet/networkmanager.cpp 2010-11-03 12:12:36.000000000 +0100 @@ -78,7 +78,7 @@ { setHasConfigurationInterface(true); setPopupIcon(QIcon()); - setPassivePopup(true); // FIXME: disable, only true for testing ... + //setPassivePopup(true); // FIXME: disable, only true for testing ... m_overlayTimeline.setEasingCurve(QEasingCurve::OutExpo); m_currentState = Solid::Control::NetworkInterface::UnknownState; connect(&m_overlayTimeline, SIGNAL(valueChanged(qreal)), this, SLOT(repaint())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/applet/plasma-applet-networkmanagement.desktop new/networkmanagement/applet/plasma-applet-networkmanagement.desktop --- old/networkmanagement/applet/plasma-applet-networkmanagement.desktop 2010-09-24 10:59:57.000000000 +0200 +++ new/networkmanagement/applet/plasma-applet-networkmanagement.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -13,6 +13,7 @@ Name[nb]=Nettverksstyring Name[nds]=Nettwarkpleeg Name[nl]=Netwerkbeheer +Name[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ Name[pt]=Gestão de Rede Name[pt_BR]=Gerenciamento de redes Name[sk]=Správa siete @@ -24,6 +25,7 @@ Name[x-test]=xxNetwork Managementxx Name[zh_TW]=網路管理 Comment=Network status and control utility +Comment[cs]=Nástroj stavu a ovládání sítě Comment[da]=Værktøj til netværksstatus og -kontrol Comment[de]=Dienstprogramm für Netzwerkstatus und -kontrolle Comment[en_GB]=Network status and control utility @@ -35,6 +37,7 @@ Comment[nb]=Verktøy for nettverksstatus og styring Comment[nds]=Warktüüch för den Nettwarkstatus un sien Kuntrull Comment[nl]=Netwerkstatus en besturingsprogramma +Comment[pa]=ਨੈੱਟਵਰਕ ਹਾਲਤ ਤੇ ਕੰਟਰੋਲ ਸਹੂਲਤ Comment[pt]=Utilitário de estado e controlo da rede Comment[pt_BR]=Utilitário de controle e status da rede Comment[sk]=Nástroj na riadenie a stav siete diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/kded/networkmanagement.desktop new/networkmanagement/kded/networkmanagement.desktop --- old/networkmanagement/kded/networkmanagement.desktop 2010-09-28 12:21:11.000000000 +0200 +++ new/networkmanagement/kded/networkmanagement.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=NetworkManager User Settings Service +Name[cs]=Služba uživatelského nastavení NetworkManageru Name[da]=Tjeneste til brugerindstillinger for NetworkManager Name[de]=Benutzereinstellungsdienst fÃ¼r NetworkManager Name[en_GB]=NetworkManager User Settings Service @@ -10,6 +11,7 @@ Name[nb]=Tjeneste for brukerinnstillinger i NetworkManager Name[nds]=Brukerinstellen-Deenst för Nettwarkpleeg Name[nl]=Gebruikersinstellingenservice van netwerkbeheer +Name[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਯੂਜ਼ਰ ਸੈਟਿੰਗ ਸਰਵਿਸ Name[pt]=Serviço de Configuração do Utilizador do NetworkManager Name[pt_BR]=Serviço de configuração do usuário do NetworkManager Name[sl]=Uporabniška storitev za nastavitev NetworkManagerja @@ -30,6 +32,7 @@ Comment[nb]=Forsyner NetworkManager-nissen med nettverksoppsett Comment[nds]=Stellt Nettwarkinstellen över den Nettwarkpleger-Dämoon praat Comment[nl]=Levert de netwerkconfiguratie voor de NetworkManager-daemon +Comment[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਡੈਮਨ ਲਈ ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਦਿੰਦੀ ਹੈ Comment[pt]=Oferece a configuração da rede ao servidor do NetworkManager Comment[pt_BR]=Fornece a configuração da rede ao daemon do NetworkManager Comment[sk]=Poskytuje nastavenie siete pre démona NetworkManager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/service/activatablelist.cpp new/networkmanagement/libs/service/activatablelist.cpp --- old/networkmanagement/libs/service/activatablelist.cpp 2010-10-03 04:02:56.000000000 +0200 +++ new/networkmanagement/libs/service/activatablelist.cpp 2010-10-20 17:34:48.000000000 +0200 @@ -29,11 +29,22 @@ ActivatableList::ActivatableList(QObject * parent) : QObject(parent), d_ptr(new ActivatableListPrivate) { + // Disabling for now, it needs more work. + //init(); } ActivatableList::ActivatableList(ActivatableListPrivate & dd, QObject * parent) : QObject(parent), d_ptr(&dd) { + // Disabling for now, it needs more work. + //init(); +} + +void ActivatableList::init() +{ + QObject::connect(Solid::Control::NetworkManager::notifier(), + SIGNAL(statusChanged(Solid::Networking::Status)), + this, SLOT(nm_restart_workaround(Solid::Networking::Status))); } ActivatableList::~ActivatableList() @@ -41,6 +52,15 @@ delete d_ptr; } +void ActivatableList::nm_restart_workaround(Solid::Networking::Status status) +{ + if (status == Solid::Networking::Unknown || status == Solid::Networking::Unconnected) { + Q_D(ActivatableList); + kDebug() << "----- Emptying activatables list, activatables cleared: " << d->activatables.count(); + d->activatables.clear(); + } +} + void ActivatableList::registerObserver(ActivatableObserver * observer, ActivatableObserver * insertAfter) { Q_D(ActivatableList); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/service/activatablelist.h new/networkmanagement/libs/service/activatablelist.h --- old/networkmanagement/libs/service/activatablelist.h 2009-11-18 09:35:04.000000000 +0100 +++ new/networkmanagement/libs/service/activatablelist.h 2010-10-09 04:51:36.000000000 +0200 @@ -22,6 +22,7 @@ #define ACTIVATABLELIST_H #include <QObject> +#include <solid/control/networkmanager.h> #include "knm_export.h" namespace Knm @@ -59,7 +60,9 @@ virtual void unregisterObserver(ActivatableObserver *); protected Q_SLOTS: void activatableChanged(); + void nm_restart_workaround(Solid::Networking::Status status); protected: + void init(); void addActivatableInternal(Knm::Activatable * activatable); void notifyOnAddActivatable(Knm::Activatable * activatable); ActivatableListPrivate * d_ptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/ui/cdmaconnectioneditor.cpp new/networkmanagement/libs/ui/cdmaconnectioneditor.cpp --- old/networkmanagement/libs/ui/cdmaconnectioneditor.cpp 2009-11-16 09:26:28.000000000 +0100 +++ new/networkmanagement/libs/ui/cdmaconnectioneditor.cpp 2010-10-09 21:47:27.000000000 +0200 @@ -38,11 +38,20 @@ QString connectionId = args[0].toString(); m_connection = new Knm::Connection(QUuid(connectionId), Knm::Connection::Cdma); m_contents->setConnection(m_connection); - m_contents->setDefaultName(i18n("New Cellular Connection")); CdmaWidget * cdmaWidget = new CdmaWidget(m_connection, this); PppWidget * pppWidget = new PppWidget(m_connection, this); + if (args.count() > 1) { + m_contents->setDefaultName(args[1].toString()); + + if (args.count() > 2) { + cdmaWidget->setCdmaInfo(args[2].toMap()); + } + } else { + m_contents->setDefaultName(i18n("New Cellular Connection")); + } + addToTabWidget(cdmaWidget); addToTabWidget(pppWidget); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/ui/gsmconnectioneditor.cpp new/networkmanagement/libs/ui/gsmconnectioneditor.cpp --- old/networkmanagement/libs/ui/gsmconnectioneditor.cpp 2010-10-06 04:01:25.000000000 +0200 +++ new/networkmanagement/libs/ui/gsmconnectioneditor.cpp 2010-10-09 21:47:27.000000000 +0200 @@ -44,22 +44,28 @@ PppWidget * pppWidget = new PppWidget(m_connection, this); IpV4Widget * ipV4Widget = new IpV4Widget(m_connection, this); - if (!args[1].isNull() && !args[2].isNull() && !args[3].isNull()) { - QList<QVariant> networkIds = args[2].toList(); - if (!networkIds.isEmpty()) { - gsmWidget->setNetworkIds(networkIds); + if (args.count() > 1) { + if (args.count() > 2) { + QList<QVariant> networkIds = args[2].toList(); + if (!networkIds.isEmpty()) { + gsmWidget->setNetworkIds(networkIds); + } } - QMap<QString, QVariant> apnInfo = args[3].toMap(); - if (apnInfo["name"].isNull()) { - m_contents->setDefaultName(args[1].toString()); + if (args.count() > 3) { + QMap<QString, QVariant> apnInfo = args[3].toMap(); + if (apnInfo["name"].isNull()) { + m_contents->setDefaultName(args[1].toString()); + } else { + m_contents->setDefaultName(args[1].toString() + " - " + apnInfo["name"].toString()); + } + gsmWidget->setApnInfo(apnInfo); + + if (!apnInfo["dnsList"].isNull()) { + ipV4Widget->setDns(apnInfo["dnsList"].toList()); + } } else { - m_contents->setDefaultName(args[1].toString() + " - " + apnInfo["name"].toString()); - } - gsmWidget->setApnInfo(apnInfo); - - if (!apnInfo["dnsList"].isNull()) { - ipV4Widget->setDns(apnInfo["dnsList"].toList()); + m_contents->setDefaultName(args[1].toString()); } } else { m_contents->setDefaultName(i18n("New Cellular Connection")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop new/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop --- old/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop 2010-09-28 12:21:11.000000000 +0200 +++ new/networkmanagement/libs/ui/networkmanagement_vpnuiplugin.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -6,12 +6,14 @@ Name[da]=UI-plugin til VPN-netværkshåndtering Name[de]=Netzwerkverwaltung VPN-Modul Name[en_GB]=Network Management VPN UI Plugin +Name[es]=Complemento de IU para VPN de gestión de red Name[et]=Võrguhalduri VPN-i UI plugin Name[fr]=Module externe d'interface utilisateur VPN de gestion de réseau Name[hu]=Hálózatkezelő VPN UI bővítmény Name[nb]=Programtillegg til nettverksstyring med VPN brukerflate Name[nds]=Nettwarkpleger-VPN-Böversietmoduul Name[nl]=Netwerkbeheer VPN UI-plugin +Name[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ VPN UI ਪਲੱਗਇਨ Name[pt]='Plugin' de Interface VPN da Gestão de Rede Name[pt_BR]=Plug-in de interface VPN do gerenciamento de redes Name[sk]=Modul pre správu siete VPN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/CMakeLists.txt new/networkmanagement/monolithic/CMakeLists.txt --- old/networkmanagement/monolithic/CMakeLists.txt 2010-05-19 01:03:37.000000000 +0200 +++ new/networkmanagement/monolithic/CMakeLists.txt 2010-10-21 17:44:39.000000000 +0200 @@ -76,7 +76,7 @@ install(TARGETS knetworkmanager ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES knetworkmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(PROGRAMS knetworkmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) if (INSTALL_KNM_AUTOSTART) install(FILES kde4-knetworkmanager-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop new/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop --- old/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop 2010-09-24 10:59:57.000000000 +0200 +++ new/networkmanagement/monolithic/kde4-knetworkmanager-autostart.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -11,6 +11,7 @@ Name[nb]=KNetworkManager Name[nds]=KDE-Nettwarkpleger Name[nl]=KNetworkManager +Name[pa]=ਕੇਨੈੱਟਵਰਕਮੈਨੇਜਰ Name[pt]=KNetworkManager Name[pt_BR]=KNetworkManager Name[sk]=KNetworkManager @@ -33,6 +34,7 @@ GenericName[nb]=Nettverksstyring GenericName[nds]=Nettwarkpleger GenericName[nl]=Netwerkbeheer +GenericName[pa]=ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ GenericName[pt]=KNetworkManager GenericName[pt_BR]=Gerenciador de redes GenericName[sk]=Správca siete @@ -58,6 +60,7 @@ Comment[nb]=Et KDE-grensesnitt til NetworkManager Comment[nds]=En KDE-Böversiet för »NetworkManager« Comment[nl]=Een KDE-schil voor NetworkManager +Comment[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਲਈ KDE ਫਰੰਟਐਂਡ Comment[pt]=Uma interface para KDE do NetworkManager Comment[pt_BR]=Uma interface do NetworkManager para o KDE Comment[sk]=KDE rozhranie pre NetworkManager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/knetworkmanager.desktop new/networkmanagement/monolithic/knetworkmanager.desktop --- old/networkmanagement/monolithic/knetworkmanager.desktop 2010-09-24 10:59:57.000000000 +0200 +++ new/networkmanagement/monolithic/knetworkmanager.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -11,6 +11,7 @@ Name[nb]=KNetworkManager Name[nds]=KDE-Nettwarkpleger Name[nl]=KNetworkManager +Name[pa]=ਕੇਨੈੱਟਵਰਕਮੈਨੇਜਰ Name[pt]=KNetworkManager Name[pt_BR]=KNetworkManager Name[sk]=KNetworkManager @@ -33,6 +34,7 @@ GenericName[nb]=Nettverksstyring GenericName[nds]=Nettwarkpleger GenericName[nl]=Netwerkbeheer +GenericName[pa]=ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ GenericName[pt]=KNetworkManager GenericName[pt_BR]=Gerenciador de redes GenericName[sk]=Správca siete @@ -58,6 +60,7 @@ Comment[nb]=Et KDE-grensesnitt til NetworkManager Comment[nds]=En KDE-Böversiet för »NetworkManager« Comment[nl]=Een KDE-schil voor NetworkManager +Comment[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਲਈ KDE ਫਰੰਟਐਂਡ Comment[pt]=Uma interface para KDE do NetworkManager Comment[pt_BR]=Uma interface do NetworkManager para o KDE Comment[sk]=KDE rozhranie pre NetworkManager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/knetworkmanagertrayicon.cpp new/networkmanagement/monolithic/knetworkmanagertrayicon.cpp --- old/networkmanagement/monolithic/knetworkmanagertrayicon.cpp 2010-07-01 05:11:43.000000000 +0200 +++ new/networkmanagement/monolithic/knetworkmanagertrayicon.cpp 2010-10-11 15:19:26.000000000 +0200 @@ -64,6 +64,7 @@ KNetworkManagerTrayIconPrivate() : list(0), iconName(QLatin1String("networkmanager")), + networkingEnableAction(0), flightModeAction(0), prefsAction(0), copyIpAddrAction(0), @@ -75,6 +76,7 @@ QHash<Knm::Activatable *, QWidgetAction *> actions; QStringList deviceUnis; QString iconName; + KAction * networkingEnableAction; KAction * flightModeAction; KAction * prefsAction; KAction * copyIpAddrAction; @@ -110,6 +112,13 @@ setAssociatedWidget(contextMenu()); setStatus( (!d->active || Solid::Control::NetworkManager::status() == Solid::Networking::Unknown )? PARENT_ICON_CLASS::Passive : PARENT_ICON_CLASS::Active); + d->networkingEnableAction = new KAction(i18nc("@action:inmenu turns off networking", "Enable networking"), this); + d->networkingEnableAction->setCheckable(true); + d->networkingEnableAction->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled()); + connect(d->networkingEnableAction, SIGNAL(toggled(bool)), this, SLOT(enableNetworking(bool))); + connect(Solid::Control::NetworkManager::notifier(), SIGNAL(networkingEnabledChanged(bool)), + this, SLOT(networkingEnabledChanged())); + if (types.testFlag(Solid::Control::NetworkInterface::Ieee80211)) { d->flightModeAction = new KAction(i18nc("@action:inmenu turns off wireless networking", "Enable wireless"), this); d->flightModeAction->setCheckable(true); @@ -200,7 +209,7 @@ } } - // if not active, add a warning notice and stop + // if not active, add a warning notice, show Networking and Wireless check buttons and stop if (Solid::Control::NetworkManager::status() == Solid::Networking::Unknown) { QString passiveText = i18nc("@action:inmenu Disable action text used when the NetworkManager daemon is not running", "Network Management disabled"); QString passiveTooltip = i18nc("@info:tooltip NetworkManager is not running, this client cannot do anything", "The system Network Management service is not running"); @@ -209,6 +218,12 @@ passiveAction->setToolTip(passiveTooltip); passiveAction->setEnabled(false); contextMenu()->addAction(passiveAction); + + // show "Enable" check buttons + contextMenu()->addAction(d->networkingEnableAction); + if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) { + contextMenu()->addAction(d->flightModeAction); + } return; } @@ -309,9 +324,11 @@ // add the housekeeping actions contextMenu()->addSeparator(); + contextMenu()->addAction(d->networkingEnableAction); if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) { contextMenu()->addAction(d->flightModeAction); } + contextMenu()->addSeparator(); contextMenu()->addAction(d->prefsAction); } @@ -531,6 +548,12 @@ } } +void KNetworkManagerTrayIcon::enableNetworking(bool enabled) +{ + kDebug() << enabled; + Solid::Control::NetworkManager::setNetworkingEnabled(enabled); +} + void KNetworkManagerTrayIcon::enableWireless(bool enabled) { kDebug() << enabled; @@ -548,6 +571,12 @@ } } +void KNetworkManagerTrayIcon::networkingEnabledChanged() +{ + Q_D(KNetworkManagerTrayIcon); + d->networkingEnableAction->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled()); +} + void KNetworkManagerTrayIcon::setActive(bool active) { Q_D(KNetworkManagerTrayIcon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/monolithic/knetworkmanagertrayicon.h new/networkmanagement/monolithic/knetworkmanagertrayicon.h --- old/networkmanagement/monolithic/knetworkmanagertrayicon.h 2009-12-01 09:06:04.000000000 +0100 +++ new/networkmanagement/monolithic/knetworkmanagertrayicon.h 2010-10-11 15:19:26.000000000 +0200 @@ -91,6 +91,11 @@ void networkingStatusChanged(Solid::Networking::Status); /** + * Enable networking in response to user action + */ + void enableNetworking(bool); + + /** * Enable wireless in response to user action */ void enableWireless(bool); @@ -101,6 +106,11 @@ void wirelessEnabledChanged(); /** + * Update UI in response to system network management networking state changes + */ + void networkingEnabledChanged(); + + /** * Starts monitoring new network interfaces' state changes */ void networkInterfaceAdded(const QString&); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/networkmanagement.notifyrc new/networkmanagement/networkmanagement.notifyrc --- old/networkmanagement/networkmanagement.notifyrc 2010-09-28 12:21:11.000000000 +0200 +++ new/networkmanagement/networkmanagement.notifyrc 2010-10-20 10:30:53.000000000 +0200 @@ -13,6 +13,7 @@ Name[nb]=Nettverksstyring Name[nds]=Nettwarkpleeg Name[nl]=Netwerkbeheer +Name[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ Name[pt]=Gestão de Rede Name[pt_BR]=Gerenciamento de redes Name[sk]=Správa siete @@ -37,6 +38,7 @@ Comment[nb]=Nettverksstyring Comment[nds]=Nettwarkpleeg Comment[nl]=Netwerkbeheer +Comment[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ Comment[pt]=Gestão de Rede Comment[pt_BR]=Gerenciamento de redes Comment[sk]=Správa siete @@ -62,6 +64,7 @@ Name[nb]=Tilkoblingstype til nettverk Name[nds]=Nettwarkverbinnentyp Name[nl]=Type netwerkverbinding +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ Name[pt]=Tipo da Ligação de Rede Name[pt_BR]=Tipo de conexão de rede Name[sk]=Typ sieťového pripojenia @@ -75,6 +78,7 @@ [Event/hwadded] Name=Network Interface Attached +Name[cs]=Síťové rozhraní připojeno Name[da]=Netkort tilsluttet Name[de]=Netzwerkschnittstelle angeschlossen Name[en_GB]=Network Interface Attached @@ -85,6 +89,7 @@ Name[nb]=Nettverksgrensesnitt lagt til Name[nds]=Nettwarkkoppelsteed toföögt Name[nl]=Netwerkinterface aangesloten +Name[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਟੇਸ ਜੋੜਿਆ ਗਿਆ Name[pt]=Interface de Rede Ligada Name[pt_BR]=Interface de rede conectada Name[sk]=Sieťové rozhranie bolo pripojené @@ -96,6 +101,7 @@ Name[x-test]=xxNetwork Interface Attachedxx Name[zh_TW]=網路介面已接上 Comment=A network interface was attached +Comment[cs]=Síťové rozhraní bylo připojeno Comment[da]=Et netkort blev tilsluttet Comment[de]=Eine Netzwerkschnittstelle ist angeschlossen worden Comment[en_GB]=A network interface was attached @@ -106,6 +112,7 @@ Comment[nb]=Et nettverksgrensesnitt ble lagt til Comment[nds]=En Nettwarkkoppelsteed wöör toföögt. Comment[nl]=Er is een netwerkinterface aangesloten +Comment[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਜੋੜਿਆ ਗਿਆ ਹੈ Comment[pt]=Foi ligada uma interface de rede Comment[pt_BR]=Uma interface de rede foi conectada Comment[sk]=Sieťové rozhranie bolo pripojené @@ -130,6 +137,7 @@ Name[nb]=Nettverksgrensesnitt fjernet Name[nds]=Nettwark-Koppelsteed wegdaan Name[nl]=Netwerkinterface verwijderd +Name[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਹਟਾਇਆ ਗਿਆ Name[pt]=Interface de Rede Removida Name[pt_BR]=Interface de rede removida Name[sk]=Sieťové rozhranie bolo odstránené @@ -152,6 +160,7 @@ Comment[nb]=Et nettverksgrensesnitt ble tatt bort Comment[nds]=En Nettwark-Koppelsteed wöör wegdaan. Comment[nl]=Er is een netwerkinterface verwijderd +Comment[pa]=ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਨੂੰ ਹਟਾਇਆ ਗਿਆ Comment[pt]=Foi removida uma interface de rede Comment[pt_BR]=Uma interface de rede foi removida Comment[sk]=Sieťové rozhranie bolo odstránené @@ -165,6 +174,7 @@ [Event/networkappeared] Name=Found Wireless Network +Name[cs]=Nalezena bezdrátová síť Name[da]=Fandt trådløst netværk Name[de]=Drahtloses Netzwerk gefunden Name[en_GB]=Found Wireless Network @@ -175,6 +185,7 @@ Name[nb]=Fant trådløst nettverk Name[nds]=Funknettwark opdeckt Name[nl]=Draadloos netwerk gevonden +Name[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਲੱਭਿਆ Name[pt]=Rede Sem-Fios Descoberta Name[pt_BR]=Rede sem fio encontrada Name[sk]=Nájdená bezdrôtová sieť @@ -186,6 +197,7 @@ Name[x-test]=xxFound Wireless Networkxx Name[zh_TW]=找到無線網路 Comment=A wireless network appeared +Comment[cs]=Objevila se bezdrátová síť Comment[da]=Et trådløst netværk er dukket op Comment[de]=Ein drahtloses Netzwerk ist entdeckt worden Comment[en_GB]=A wireless network appeared @@ -196,6 +208,7 @@ Comment[nb]=Et trådløst nettverk dukket opp Comment[nds]=En Funknettwark is opdukt. Comment[nl]=Er verscheen een draadloos netwerk +Comment[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਇਆ Comment[pt]=Apareceu uma rede sem-fios Comment[pt_BR]=Um rede sem fio apareceu Comment[sk]=Objavila sa bezdrôtová sieť @@ -209,6 +222,7 @@ [Event/networkdisappeared] Name=Lost Wireless Network +Name[cs]=Bezdrátová síť ztracena Name[da]=Mistede trådløst netværk Name[de]=Drahtloses Netzwerk verloren Name[en_GB]=Lost Wireless Network @@ -219,6 +233,7 @@ Name[nb]=Mistet trådløst nettverk Name[nds]=Funknettwark wegkamen Name[nl]=Verloren draadloos netwerk +Name[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਗੁਆਚਾ Name[pt]=Rede Sem-Fios Perdida Name[pt_BR]=Rede sem fio perdida Name[sk]=Stratená bezdrôtová sieť @@ -230,6 +245,7 @@ Name[x-test]=xxLost Wireless Networkxx Name[zh_TW]=遺失無線網路 Comment=A wireless network disappeared +Comment[cs]=Bezdrátová síť zmizela Comment[da]=Et trådløst netværk forsvandt Comment[de]=Ein drahtloses Netzwerk ist nicht mehr vorhanden Comment[en_GB]=A wireless network disappeared @@ -240,6 +256,7 @@ Comment[nb]=Et trådløst nettverk forsvant Comment[nds]=En Funknettwark is wegkamen. Comment[nl]=Een draadloos netwerk is verdwenen +Comment[pa]=ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਖਤਮ ਹੋ ਗਿਆ ਹੈ Comment[pt]=Desapareceu uma rede sem-fios Comment[pt_BR]=Uma rede sem fio desapareceu Comment[sk]=Bezdrôtová sieť zmizla @@ -253,6 +270,7 @@ [Event/userconnectionattempt] Name=Establishing Network Connection +Name[cs]=Navazuje se síťové spojení Name[da]=Opretter netværksforbindelse Name[de]=Netzwerkverbindung wird hergestellt Name[en_GB]=Establishing Network Connection @@ -263,6 +281,7 @@ Name[nb]=Oppretter nettverkstilkobling Name[nds]=Tokoppeln na Nettwark Name[nl]=Netwerkverbinding opzetten +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ Name[pt]=A Estabelecer a Ligação à Rede Name[pt_BR]=Estabelecendo conexão de rede Name[sk]=Vytvára sa sieťové pripojenie @@ -274,6 +293,7 @@ Name[x-test]=xxEstablishing Network Connectionxx Name[zh_TW]=建立網路連線中 Comment=The user started making a connection +Comment[cs]=Uživatel zahájil spojení Comment[da]=Brugeren begyndte at oprette en forbindelse Comment[de]=Der Benutzer hat einen Verbindungsaufbau gestartet Comment[en_GB]=The user started making a connection @@ -297,6 +317,7 @@ [Event/autoconnectionattempt] Name=Establishing Network Connection +Name[cs]=Navazuje se síťové spojení Name[da]=Opretter netværksforbindelse Name[de]=Netzwerkverbindung wird hergestellt Name[en_GB]=Establishing Network Connection @@ -307,6 +328,7 @@ Name[nb]=Oppretter nettverkstilkobling Name[nds]=Tokoppeln na Nettwark Name[nl]=Netwerkverbinding opzetten +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ Name[pt]=A Estabelecer a Ligação à Rede Name[pt_BR]=Estabelecendo conexão de rede Name[sk]=Vytvára sa sieťové pripojenie @@ -318,6 +340,7 @@ Name[x-test]=xxEstablishing Network Connectionxx Name[zh_TW]=建立網路連線中 Comment=A connection is being started automatically +Comment[cs]=Spojení je automaticky navazováno Comment[da]=En forbindelse er blevet startet automatisk Comment[de]=Es wird automatisch eine Verbindung aufgebaut Comment[en_GB]=A connection is being started automatically @@ -328,6 +351,7 @@ Comment[nb]=En tilkobling blir nå startet automatisk Comment[nds]=En Verbinnen warrt automaatsch opstellt. Comment[nl]=Er is automatisch begonnen met het maken van een verbinding +Comment[pa]=ਕੁਨੈਕਸ਼ਨ ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ Comment[pt]=Uma ligação está a ser iniciada automaticamente Comment[pt_BR]=Uma conexão foi iniciada automaticamente Comment[sk]=Pripojenie sa spúšťa automaticky @@ -342,6 +366,7 @@ [Event/connecting] Name=Establishing Network Connection +Name[cs]=Navazuje se síťové spojení Name[da]=Opretter netværksforbindelse Name[de]=Netzwerkverbindung wird hergestellt Name[en_GB]=Establishing Network Connection @@ -352,6 +377,7 @@ Name[nb]=Oppretter nettverkstilkobling Name[nds]=Tokoppeln na Nettwark Name[nl]=Netwerkverbinding opzetten +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ Name[pt]=A Estabelecer a Ligação à Rede Name[pt_BR]=Estabelecendo conexão de rede Name[sk]=Vytvára sa sieťové pripojenie @@ -363,6 +389,7 @@ Name[x-test]=xxEstablishing Network Connectionxx Name[zh_TW]=建立網路連線中 Comment=A network connection attempt was begun +Comment[cs]=Zahájen pokus o síťové spojení Comment[da]=Et netværksforbindelsesforsøg er påbegyndt Comment[de]=Ein Verbindungsversuch ist begonnen worden Comment[en_GB]=A network connection attempt was begun @@ -373,6 +400,7 @@ Comment[nb]=Det ble begynt et forsøk på nettverkstilkobling Comment[nds]=Mit Tokoppeln na en Nettwark anfungen Comment[nl]=Een poging tot het maken van een netwerkverbinding is begonnen +Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਆਟੋਮੈਟਿਕ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਗਈ Comment[pt]=Iniciou-se uma tentativa de ligação à rede Comment[pt_BR]=Foi iniciada uma tentativa de conexão de rede Comment[sk]=Pokus o sieťové pripojenie začal @@ -387,6 +415,7 @@ [Event/disconnected] Name=Network Connection Disconnected +Name[cs]=Síťové spojení odpojeno Name[da]=Netværksforbindelse afbrudt Name[de]=Netzwerkverbindung getrennt Name[en_GB]=Network Connection Disconnected @@ -397,6 +426,7 @@ Name[nb]=Nettverkstilkobling ble frakoblet Name[nds]=Vun Nettwark afkoppelt Name[nl]=Netwerkverbinding verbroken +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ Name[pt]=Ligação de Rede Desligada Name[pt_BR]=Conexão de rede desconectada Name[sk]=Sieťové pripojenie bolo odpojené @@ -408,6 +438,7 @@ Name[x-test]=xxNetwork Connection Disconnectedxx Name[zh_TW]=網路連線已中斷 Comment=A network connection was disconnected +Comment[cs]=Síťové spojení bylo odpojeno Comment[da]=En netværksforbindelse blev afbrudt Comment[de]=Eine Netzwerkverbindung ist getrennt worden Comment[en_GB]=A network connection was disconnected @@ -418,6 +449,7 @@ Comment[nb]=En nettverkstilkobling ble frakoblet Comment[nds]=En Nettwark-Verbinnen wöör afkoppelt. Comment[nl]=Een netwerkverbinding was verbroken +Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਗਿਆ Comment[pt]=A ligação de rede terminou Comment[pt_BR]=Uma conexão de rede foi desconectada Comment[sk]=Sieťové pripojenie bolo odpojené @@ -442,6 +474,7 @@ Name[nb]=Nettverkstilkobling fullført Name[nds]=Mit Spood na Nettwark tokoppelt Name[nl]=Netwerkverbinding geslaagd +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸਫ਼ਲ ਰਿਹਾ Name[pt]=Ligação à Rede com Sucesso Name[pt_BR]=Conexão de rede estabelecida com sucesso Name[sk]=Sieťové pripojenie bolo úspešné @@ -464,6 +497,7 @@ Comment[nb]=En nettverkstilkobling ble opprettet Comment[nds]=En Nettwark-Verbinnen wöör opstellt. Comment[nl]=Een netwerkverbinding is opgezet +Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ Comment[pt]=Foi estabelecida uma ligação à rede Comment[pt_BR]=Uma conexão de rede foi estabelecida Comment[sk]=Sieťové pripojenie bolo vytvorené @@ -489,6 +523,7 @@ Name[nb]=Nettverkstilkobling lyktes ikke Name[nds]=Tokoppeln na Nettwark fehlslaan Name[nl]=Netwerkverbinding is mislukt +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ Name[pt]=Ligação à Rede sem Sucesso Name[pt_BR]=Falha na conexão de rede Name[sk]=Sieťové pripojenie zlyhalo @@ -511,6 +546,7 @@ Comment[nb]=Et forsøk på nettverkstilkobling lyktes ikke Comment[nds]=Dat Tokoppeln na en Nettwark is fehlslaan. Comment[nl]=Een poging tot het maken van een netwerkverbinding is mislukt +Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਫੇਲ੍ਹ ਹੋਈ Comment[pt]=A tentativa de ligação à rede foi mal-sucedida Comment[pt_BR]=Uma tentativa de conexão de rede falhou Comment[sk]=Pokus o sieťové pripojenie zlyhal @@ -534,6 +570,7 @@ Name[nb]=Radio-maskinvare slått av Name[nds]=Funkreedschap utmaakt Name[nl]=Radio-hardware uitgeschakeld +Name[pa]=ਰੇਡੀਓ ਹਾਰਡਵੇਅਰ ਬੰਦ ਹੈ Name[pt]='Hardware' de Rádio Desligado Name[pt_BR]=Hardware de rádio desligado Name[sk]=Bezdrôtový hardvér bol vypnutý @@ -554,6 +591,7 @@ Comment[nb]=Trådløse sendere/mottakere slått av med maskinbryter Comment[nds]=Funkreedschap mit Hardwareschalter utmaakt Comment[nl]=Draadloze transceivers uitgeschakeld door hardware schakelaar +Comment[pa]=ਬੇਤਾਰ ਟਰਾਂਸਸੀਵਰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਨਾਲ ਬੰਦ ਕੀਤੇ ਹਨ Comment[pt]=Os receptores/transmissores sem-fios foram desligados pelo interruptor Comment[pt_BR]=Os transmissores/receptores sem fio foram desabilitados pelo interruptor do hardware Comment[sk]=Bezdrôtový vysielač bol vypnutý hardvérovým vypínačom @@ -577,6 +615,7 @@ Name[nb]=Radio-maskinvare slått på Name[nds]=Funkreedschap anmaakt Name[nl]=Radio-hardware aan geschakeld +Name[pa]=ਰੇਡੀਓ ਹਾਰਡਵੇਅਰ ਚਾਲੂ ਹੈ Name[pt]='Hardware' de Rádio Ligado Name[pt_BR]=Hardware de rádio ligado Name[sk]=Bezdrôtový hardvér bol zapnutý @@ -597,6 +636,7 @@ Comment[nb]=Trådløse sendere/mottakere slått på Comment[nds]=Funkreedschap wöör anmaakt Comment[nl]=Draadloze transceivers ingeschakeld +Comment[pa]=ਬੇਤਾਰ ਟਰਾਂਸਸੀਵਰ ਚਾਲੂ ਹੈ Comment[pt]=Os receptores/transmissores sem-fios foram ligados Comment[pt_BR]=Os transmissores/receptores sem fio foram habilitados Comment[sk]=Bezdrôtový vysielač bol zapnutý @@ -611,6 +651,7 @@ [Event/lowsignal] Name=Low Wireless Signal Strength +Name[cs]=Slabý bezdrátový signál Name[da]=Lav signalstyrke på trådløst Name[de]=Niedrige Signalstärke Name[en_GB]=Low Wireless Signal Strength @@ -622,6 +663,7 @@ Name[nb]=Lav trådløs signalstyrkee Name[nds]=Minn Funksignaalstärk Name[nl]=Lage draadloze signaalsterkte +Name[pa]=ਘੱਟ ਬੇਤਾਰ ਸਿਗਨਲ ਤਾਕਤ Name[pt]=Potência do Sinal Sem-Fios Fraca Name[pt_BR]=Potência baixa do sinal sem fio Name[sk]=Nízka sila bezdrôtového signálu @@ -633,6 +675,7 @@ Name[x-test]=xxLow Wireless Signal Strengthxx Name[zh_TW]=無線網路信號強度偏低 Comment=The wireless signal strength is low +Comment[cs]=Síla bezdrátového signálu je slabá Comment[da]=Den trådløse signalstyrke er lav Comment[de]=Die Signalstärke der drahtlosen Verbindung ist niedrig Comment[en_GB]=The wireless signal strength is low @@ -643,6 +686,7 @@ Comment[nb]=Den trådløse signalstyrken er lav Comment[nds]=De Stärk vun't Funksignaal is minn. Comment[nl]=De sterkte van het draadloze signaal is laag +Comment[pa]=ਬੇਤਾਰ ਸਿਗਨਲ ਤਾਕਤ ਘੱਟ ਹੈ Comment[pt]=A potência do sinal sem-fios é fraca Comment[pt_BR]=A potência do sinal sem fio está baixa Comment[sk]=Sila bezdrôtového signálu je nízka @@ -657,6 +701,7 @@ [Event/ifacestatechange] Name=Interface changed state +Name[cs]=Rozhraní změnilo stav Name[da]=Netkort ændrede tilstand Name[de]=Schnittstellenstatus geändert Name[en_GB]=Interface changed state @@ -667,6 +712,7 @@ Name[nb]=Grensesnitt endret status Name[nds]=Koppelsteed hett Status wesselt Name[nl]=Status interface gewijzigd +Name[pa]=ਇੰਟਰਫੇਸ ਬਦਲਿਆ ਗਿਆ Name[pt]=A interface mudou de estado Name[pt_BR]=A interface alterou o estado Name[sk]=Rozhranie zmenilo stav @@ -678,6 +724,7 @@ Name[x-test]=xxInterface changed statexx Name[zh_TW]=介面已變更狀態 Comment=An interface changed state +Comment[cs]=Stav rozhraní se změnil Comment[da]=Et netkort ændrede tilstand Comment[de]=Der Status einer Schnittstelle hat sich geändert Comment[en_GB]=An interface changed state @@ -688,6 +735,7 @@ Comment[nb]=Et grensesnitt endret status Comment[nds]=En Koppelsteed hett den Status wesselt. Comment[nl]=De status van een interface is gewijzigd +Comment[pa]=ਇੰਟਰਫੇਸ ਹਾਲਤ ਬਦਲਈ ਗਈ Comment[pt]=Uma interface de rede mudou de estado Comment[pt_BR]=Uma interface alterou o estado Comment[sk]=Rozhranie zmenilo stav @@ -701,6 +749,7 @@ [Event/networkingdisabled] Name=Network management disabled +Name[cs]=Správa sítě zakázána Name[da]=Netværkshåndtering deaktiveret Name[de]=Netzwerkverwaltung deaktiviert Name[en_GB]=Network management disabled @@ -711,6 +760,7 @@ Name[nb]=Nettverksstyring slått av Name[nds]=Nettwarkpleeg utmaakt Name[nl]=Netwerkbeheer uitgeschakeld +Name[pa]=ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਬੰਦ ਹੈ Name[pt]=Gestão de rede desactivada Name[pt_BR]=Gerenciamento de redes desabilitado Name[sk]=Správa siete bola zakázaná diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/kcm_networkmanagement.desktop new/networkmanagement/settings/config/kcm_networkmanagement.desktop --- old/networkmanagement/settings/config/kcm_networkmanagement.desktop 2010-10-03 12:06:57.000000000 +0200 +++ new/networkmanagement/settings/config/kcm_networkmanagement.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -12,6 +12,7 @@ Name[nb]=Nettverksforbindelser Name[nds]=Nettwarkverbinnen Name[nl]=Netwerkverbindingen +Name[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ Name[pt]=Ligações de Rede Name[pt_BR]=Conexões de rede Name[sk]=Sieťové pripojenia @@ -35,6 +36,7 @@ Comment[nb]=Legg til, endre og fjern nettverksforbindelser Comment[nds]=Nettwark-Verbinnen tofögen, bewerken un wegmaken Comment[nl]=Netwerkverbindingen toevoegen, bewerken en verwijderen +Comment[pa]=ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ, ਸੋਧੋ ਤੇ ਹਟਾਉ Comment[pt]=Adicionar, Editar e Remover as Ligações de Rede Comment[pt_BR]=Adiciona, edita e remove conexões de rede Comment[sk]=Pridanie, úprava a odstránenie sieťových pripojení diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop new/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop --- old/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop 2010-09-28 12:21:11.000000000 +0200 +++ new/networkmanagement/settings/config/kcm_networkmanagement_tray.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -13,6 +13,7 @@ Name[nb]=Andre Name[nds]=Anner Name[nl]=Overig +Name[pa]=ਹੋਰ Name[pt]=Outra Name[pt_BR]=Outra Name[sk]=Ostatné @@ -35,6 +36,7 @@ Comment[nb]=Sett opp verktøyet for nettverksstyring Comment[nds]=Dat Nettwark-Pleegwarktüüch instellen Comment[nl]=Hulpmiddel voor netwerkbeheer instellen +Comment[pa]=ਨੈੱਟਵਰਕ ਪਰਬੰਧ ਟੂਲ ਸੰਰਚਨਾ Comment[pt]=Configurar a ferramenta de Gestão da Rede Comment[pt_BR]=Configura a ferramenta de gerenciamento de redes Comment[sk]=Nastavenie nástroja pre správu siete diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/manageconnectionwidget.cpp new/networkmanagement/settings/config/manageconnectionwidget.cpp --- old/networkmanagement/settings/config/manageconnectionwidget.cpp 2010-10-06 04:01:25.000000000 +0200 +++ new/networkmanagement/settings/config/manageconnectionwidget.cpp 2010-10-09 21:47:27.000000000 +0200 @@ -260,7 +260,7 @@ mMobileConnectionWizard = new MobileConnectionWizard(); if (mMobileConnectionWizard->exec() == QDialog::Accepted) { - mEditor->addConnection(false, connectionTypeForCurrentIndex(), mMobileConnectionWizard->args(), true); + mEditor->addConnection(false, mMobileConnectionWizard->type(), mMobileConnectionWizard->args(), true); } } else { // show connection settings widget for the active tab mEditor->addConnection(false, connectionTypeForCurrentIndex()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/mobileconnectionwizard.cpp new/networkmanagement/settings/config/mobileconnectionwizard.cpp --- old/networkmanagement/settings/config/mobileconnectionwizard.cpp 2010-10-06 04:01:25.000000000 +0200 +++ new/networkmanagement/settings/config/mobileconnectionwizard.cpp 2010-10-09 21:47:27.000000000 +0200 @@ -32,7 +32,7 @@ #include "mobileconnectionwizard.h" -MobileConnectionWizard::MobileConnectionWizard(QWidget * parent): QWizard(parent), mType(0), mPlanComboBox(0), mCountryList(0), mProvidersList(0), userApn(0), mProviders(0) +MobileConnectionWizard::MobileConnectionWizard(QWidget * parent): QWizard(parent) { mProviders = new MobileProviders(); setWindowTitle(i18nc("Mobile Connection Wizard", "New Mobile Broadband Connection")); @@ -189,6 +189,15 @@ return temp; } +Knm::Connection::Type MobileConnectionWizard::type() +{ + if (mIface && mIface ->type() == Solid::Control::NetworkInterface::Cdma) { + return Knm::Connection::Cdma; + } + + return Knm::Connection::Gsm; +} + /**********************************************************/ /* Intro page */ /**********************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/settings/config/mobileconnectionwizard.h new/networkmanagement/settings/config/mobileconnectionwizard.h --- old/networkmanagement/settings/config/mobileconnectionwizard.h 2010-10-06 04:01:25.000000000 +0200 +++ new/networkmanagement/settings/config/mobileconnectionwizard.h 2010-10-09 21:47:27.000000000 +0200 @@ -30,6 +30,7 @@ #include <solid/control/networkmanager.h> #include "mobileproviders.h" +#include "../../libs/internals/connection.h" class MobileConnectionWizard : public QWizard { @@ -49,6 +50,8 @@ */ QVariantList args(); + Knm::Connection::Type type(); + private Q_SLOTS: void introDeviceAdded(const QString uni); void introDeviceRemoved(const QString uni); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop new/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop --- old/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop 2010-09-24 10:59:57.000000000 +0200 +++ new/networkmanagement/vpnplugins/openvpn/networkmanagement_openvpnui.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -27,6 +27,7 @@ Name[nb]=OpenVPN Name[nds]=OpenVPN Name[nl]=OpenVPN +Name[pa]=OpenVPN Name[pt]=OpenVPN Name[pt_BR]=OpenVPN Name[sk]=OpenVPN @@ -50,6 +51,7 @@ Comment[nb]=OpenVPN programtillegg Comment[nds]=OpenVPN-Moduul Comment[nl]=OpenVPN-plugin +Comment[pa]=OpenVPN ਪਲੱਗਇਨ Comment[pt]='Plugin' do OpenVPN Comment[pt_BR]=Plug-in do OpenVPN Comment[sk]=OpenVPN modul diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop new/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop --- old/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop 2010-09-24 10:59:57.000000000 +0200 +++ new/networkmanagement/vpnplugins/pptp/networkmanagement_pptpui.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -26,6 +26,7 @@ Name[nb]=PPTP Name[nds]=PPTP Name[nl]=PPTP +Name[pa]=PPTP Name[pt]=PPTP Name[pt_BR]=PPTP Name[sk]=PPTP @@ -49,6 +50,7 @@ Comment[nb]=PPTP programtillegg Comment[nds]=PPTP-Moduul Comment[nl]=PPTP-plugin +Comment[pa]=PPTP ਪਲੱਗਇਨ Comment[pt]='Plugin' de PPTP Comment[pt_BR]=Plug-in de PPTP Comment[sk]=PPTP modul diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop new/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop --- old/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop 2010-09-24 10:59:57.000000000 +0200 +++ new/networkmanagement/vpnplugins/vpnc/networkmanagement_vpncui.desktop 2010-10-20 10:30:53.000000000 +0200 @@ -26,6 +26,7 @@ Name[nb]=VPNC Name[nds]=VPNC Name[nl]=VPNC +Name[pa]=VPNC Name[pt]=VPNC Name[pt_BR]=VPNC Name[sk]=VPNC @@ -49,6 +50,7 @@ Comment[nb]=VPNC programtillegg Comment[nds]=VPNC-Moduul Comment[nl]=VPNC-plugin +Comment[pa]=VPNC ਪਲੱਗਇਨ Comment[pt]='Plugin' do VPNC Comment[pt_BR]=Plug-in do VPNC Comment[sk]=VPNC modul ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Fri Nov 5 16:07:57 CET 2010. -------- --- rpmlint/rpmlint.changes 2010-10-29 10:01:34.000000000 +0200 +++ rpmlint/rpmlint.changes 2010-11-04 15:20:53.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Nov 4 14:20:41 UTC 2010 - lnussel(a)suse.de + +- enable suse-hide-unstripped-outside-build.diff again + +------------------------------------------------------------------- +Thu Nov 4 13:35:33 UTC 2010 - lnussel(a)suse.de + +- check for file system capabilities +- check for %verifyscript and %run_permissions + +------------------------------------------------------------------- +Wed Nov 3 10:48:30 CET 2010 - dmueller(a)suse.de + +- update to 1.0: + * add support for PEP 3147 when handling python bytecode + * various doc improvements + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rpmlint-0.99.tar.bz2 New: ---- rpmlint-1.0.tar.bz2 rpmlint-fscaps.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.DQML6R/_old 2010-11-05 16:04:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DQML6R/_new 2010-11-05 16:04:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rpmlint (Version 0.99) +# spec file for package rpmlint (Version 1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Name: rpmlint BuildRequires: rpm-python Summary: Rpm correctness checker -Version: 0.99 -Release: 5 +Version: 1.0 +Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -117,6 +117,7 @@ Patch76: confusing-invalid-spec-name.patch Patch77: rpmlint-pkg-quoting.diff Patch78: suse-g-ir-chech.diff +Patch79: rpmlint-fscaps.diff %py_requires %description @@ -148,7 +149,7 @@ %patch13 %patch14 %patch17 -#%patch18 +%patch18 %patch19 %patch20 %patch22 @@ -190,6 +191,7 @@ %patch76 -p1 %patch77 %patch78 +%patch79 -p1 cp -p %{SOURCE1} . cp -p %{SOURCE2} . cp -p %{SOURCE3} . ++++++ CheckSUIDPermissions.py ++++++ --- /var/tmp/diff_new_pack.DQML6R/_old 2010-11-05 16:04:25.000000000 +0100 +++ /var/tmp/diff_new_pack.DQML6R/_new 2010-11-05 16:04:25.000000000 +0100 @@ -11,6 +11,7 @@ import re import os import string +import rpm _permissions_d_whitelist = ( "lprng", @@ -37,15 +38,34 @@ self._parsefile(file) def _parsefile(self,file): + lnr = 0 + lastfn = None for line in open(file): + lnr+=1 line = line.split('#')[0].split('\n')[0] - if len(line): - line = re.split(r'\s+', line) + line = line.lstrip() + if not len(line): + continue + + if line.startswith("+capabilities "): + line = line[len("+capabilities "):] + if lastfn: + self.perms[lastfn]['fscaps'] = line + continue + + line = re.split(r'\s+', line) + if len(line) == 3: fn = line[0] owner = line[1].replace('.', ':') mode = line[2] self.perms[fn] = { "owner" : owner, "mode" : int(mode,8)&07777} + # for permissions that don't change and therefore + # don't need special handling + if file == '/etc/permissions': + self.perms[fn]['static'] = True + else: + print >>sys.stderr, "invalid line %d " % lnr def check(self, pkg): global _permissions_d_whitelist @@ -78,10 +98,16 @@ else: self._parsefile(f) + need_run_permissions = False # second pass, find permissions violations for f, pkgfile in files.items(): if f in pkg.ghostFiles(): continue + + if pkgfile.filecaps: + printError(pkg, 'permissions-fscaps', '%(file)s has fscaps "%(caps)s"' % \ + { 'file':f, 'caps':pkgfile.filecaps}) + mode = pkgfile.mode owner = pkgfile.user+':'+pkgfile.group @@ -94,11 +120,14 @@ # S_IFIFO 001 FIFO type = (mode>>12)&017; mode &= 07777 + need_verifyscript = False if f in self.perms or (type == 04 and f+"/" in self.perms): if type == 012: printWarning(pkg, "permissions-symlink", f) continue + need_verifyscript = True + m = 0 o = "invalid" if type == 04: @@ -124,6 +153,7 @@ printWarning(pkg, 'permissions-file-as-dir', f+' is a file but listed as directory') if mode&06000: + need_verifyscript = True msg = '%(file)s is packaged with setuid/setgid bits (0%(mode)o)' % { 'file':f, 'mode':mode } if type != 04: printError(pkg, 'permissions-file-setuid-bit', msg) @@ -131,10 +161,29 @@ printWarning(pkg, 'permissions-directory-setuid-bit', msg) if mode&02: + need_verifyscript = True printError(pkg, 'permissions-world-writable', \ '%(file)s is packaged with world writable permissions (0%(mode)o)' % \ { 'file':f, 'mode':mode }) + if need_verifyscript and \ + (not f in self.perms or not 'static' in self.perms[f]): + need_run_permissions = True + script = pkg[rpm.RPMTAG_VERIFYSCRIPT] or pkg[rpm.RPMTAG_VERIFYSCRIPTPROG] + if not script or not "chkstat -n -e %s"%f in script: + printError(pkg, 'permissions-missing-verifyscript', \ + "missing %%verify_permissions -e %s" % f) + + if need_run_permissions: + postin = pkg[rpm.RPMTAG_POSTIN] or pkg[rpm.RPMTAG_POSTINPROG] + if not postin or not "SuSEconfig --module permissions" in postin: + printError(pkg, 'permissions-missing-postin', \ + "missing %run_permissions in %post") + + if not 'permissions' in map(lambda x: x[0], pkg.prereq()): + printError(pkg, 'permissions-missing-requires', \ + "missing 'permissions' in PreReq") + check=SUIDCheck() @@ -171,4 +220,15 @@ """If the package is intended for inclusion in any SUSE product please open a bug report to request review of the package by the security team""", +'permissions-fscaps', +"""Packaging file capabilities is currently not supported. Please +use normal permissions instead. You may contact the security team to +request an entry that sets capabilities in /etc/permissions +instead.""", +'permissions-missing-postin', +"""Please add %run_permissions to %post""", +'permissions-missing-requires', +"""Please add \"PreReq: permissions\"""", +'permissions-missing-verifyscript', +"""Please add a %verifyscript section""", ) ++++++ rpmlint-0.99.tar.bz2 -> rpmlint-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-0.99/ChangeLog new/rpmlint-1.0/ChangeLog --- old/rpmlint-0.99/ChangeLog 2010-08-19 17:49:12.000000000 +0200 +++ new/rpmlint-1.0/ChangeLog 2010-11-01 22:15:40.000000000 +0100 @@ -1,3 +1,31 @@ +2010-11-01 Ville Skyttä <ville.skytta at iki.fi> + + * Makefile: Release 1.0. + +2010-10-25 Ville Skyttä <ville.skytta at iki.fi> + + * FilesCheck.py: Add note about file capabilities to setuid-binary + info message. + + https://bugzilla.redhat.com/646455 + +2010-10-06 Ville Skyttä <ville.skytta at iki.fi> + + * FilesCheck.py: Turn some comments into docstrings. + * FilesCheck.py: Add support for PEP 3147 dirs when finding Python + sources (David Malcolm). + + https://bugzilla.redhat.com/637956 + +2010-10-04 Ville Skyttä <ville.skytta at iki.fi> + + * rpmlint.bash-completion: Offer only long rpmdiff completion + options. + * rpmlint.bash-completion: Add basic -c/--check completion. + * rpmlint.1: Document format of values for --check. + + https://bugzilla.redhat.com/639823 + 2010-08-19 Ville Skyttä <ville.skytta at iki.fi> * Makefile: Release 0.99. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-0.99/FilesCheck.py new/rpmlint-1.0/FilesCheck.py --- old/rpmlint-0.99/FilesCheck.py 2010-08-19 16:32:06.000000000 +0200 +++ new/rpmlint-1.0/FilesCheck.py 2010-10-25 19:38:28.000000000 +0200 @@ -4,7 +4,7 @@ # Package : rpmlint # Author : Frederic Lepied # Created on : Mon Oct 4 19:32:49 1999 -# Version : $Id: FilesCheck.py 1802 2010-08-19 14:32:06Z scop $ +# Version : $Id: FilesCheck.py 1810 2010-10-25 17:38:26Z scop $ # Purpose : test various aspects on files: locations, owner, groups, # permission, setuid, setgid... ############################################################################# @@ -202,6 +202,7 @@ normal_zero_length_regex = re.compile('^/etc/security/console\.apps/|/\.nosearch$|/__init__\.py$') perl_regex = re.compile('^/usr/lib/perl5/(?:vendor_perl/)?([0-9]+\.[0-9]+)\.([0-9]+)/') python_regex = re.compile('^/usr/lib(?:64)?/python([.0-9]+)/') +python_bytecode_regex_pep3147 = re.compile('^(.*)/__pycache__/(.*)\.(.*)(\.py[oc])$') python_bytecode_regex = re.compile('^(.*)(\.py[oc])$') python_default_version = Config.getOption('PythonDefaultVersion', None) perl_version_trick = Config.getOption('PerlVersionTrick', True) @@ -294,16 +295,16 @@ } def get_expected_pyc_magic(path): - # .pyc/.pyo files embed a 4-byte magic value identifying which version of - # the python bytecode ABI they are for. Given a path to a .pyc/.pyo file, - # return a (magic ABI value, python version) tuple. For example, - # '/usr/lib/python3.1/foo.pyc' should return (3151, '3.1'). - # The first value will be None if the python version was not resolved - # from the given pathname and the PythonDefaultVersion configuration - # variable is not set, or if we don't know the magic ABI value for the - # python version (no matter from which source the version came from). - # The second value will be None if a python version could not be resolved - # from the given pathname. + """.pyc/.pyo files embed a 4-byte magic value identifying which version of + the python bytecode ABI they are for. Given a path to a .pyc/.pyo file, + return a (magic ABI value, python version) tuple. For example, + '/usr/lib/python3.1/foo.pyc' should return (3151, '3.1'). + The first value will be None if the python version was not resolved + from the given pathname and the PythonDefaultVersion configuration + variable is not set, or if we don't know the magic ABI value for the + python version (no matter from which source the version came from). + The second value will be None if a python version could not be resolved + from the given pathname.""" ver_from_path = None m = python_regex.search(path) @@ -325,13 +326,27 @@ return (expected_magic_value, ver_from_path) def py_demarshal_long(b): - # Counterpart to Python's PyMarshal_ReadLongFromFile, operating on the - # bytes in a string: + """Counterpart to Python's PyMarshal_ReadLongFromFile, operating on the + bytes in a string.""" return (ord(b[0]) + (ord(b[1]) << 8) + (ord(b[2]) << 16) + (ord(b[3]) << 24)) +def python_bytecode_to_script(path): + """Given a python bytecode path, give the path of the .py file + (or None if not python bytecode).""" + + res = python_bytecode_regex_pep3147.search(path) + if res: + return res.group(1) + '/' + res.group(2) + '.py' + + res = python_bytecode_regex.search(path) + if res: + return res.group(1) + '.py' + + return None + class FilesCheck(AbstractCheck.AbstractCheck): def __init__(self): @@ -631,9 +646,8 @@ res.group(1)) python_dep_error = True - res = python_bytecode_regex.search(f) - if res: - source_file = res.group(1) + '.py' + source_file = python_bytecode_to_script(f) + if source_file: if source_file in files: # Extract header of .pyc file: pyc_fobj = open(pkgfile.path, 'rb') @@ -1030,8 +1044,9 @@ extension.''', 'setuid-binary', -'''The file is setuid, this may be dangerous, especially if this -file is setuid root.''', +'''The file is setuid; this may be dangerous, especially if this +file is setuid root. Sometimes file capabilities can be used instead of +setuid bits.''', 'setgid-binary', '''The file is setgid. Usually this is a packaging bug. If this is a game, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-0.99/Makefile new/rpmlint-1.0/Makefile --- old/rpmlint-0.99/Makefile 2010-08-19 17:48:11.000000000 +0200 +++ new/rpmlint-1.0/Makefile 2010-11-01 22:15:22.000000000 +0100 @@ -3,7 +3,7 @@ # Package : rpmlint # Author : Frederic Lepied # Created on : Mon Sep 30 13:20:18 1999 -# Version : $Id: Makefile 1803 2010-08-19 15:48:11Z scop $ +# Version : $Id: Makefile 1811 2010-11-01 21:15:22Z scop $ # Purpose : rules to manage the files. ############################################################################# @@ -21,7 +21,7 @@ PYTHON = python # update this variable to create a new release -VERSION := 0.99 +VERSION := 1.0 TAG := $(shell echo "V$(VERSION)" | tr -- '-.' '__') SVNBASE = $(shell svn info . | grep URL | sed -e 's/[^:]*:\s*//' -e 's,/$trunk\|tags/.\+$$$,,') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-0.99/__version__.py new/rpmlint-1.0/__version__.py --- old/rpmlint-0.99/__version__.py 2010-08-19 17:49:01.000000000 +0200 +++ new/rpmlint-1.0/__version__.py 2010-11-01 22:15:29.000000000 +0100 @@ -1,2 +1,2 @@ # Automatically generated, do not edit -__version__ = '0.99' +__version__ = '1.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-0.99/rpmlint.1 new/rpmlint-1.0/rpmlint.1 --- old/rpmlint-0.99/rpmlint.1 2010-07-12 18:11:30.000000000 +0200 +++ new/rpmlint-1.0/rpmlint.1 2010-10-04 20:43:07.000000000 +0200 @@ -27,7 +27,9 @@ .TP \fB\-c\fR, \fB\-\-check\fR=\fIcheck\fR Run only the specified check. This option may be given multiple times -to specify multiple checks to run. +to specify multiple checks to run. \fIcheck\fR is the name of the Python +module (as it would be given to Python's import statement) containing the +check. .TP \fB\-a\fR, \fB\-\-all\fR Check all installed packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-0.99/rpmlint.bash-completion new/rpmlint-1.0/rpmlint.bash-completion --- old/rpmlint-0.99/rpmlint.bash-completion 2009-10-02 20:05:13.000000000 +0200 +++ new/rpmlint-1.0/rpmlint.bash-completion 2010-10-04 21:41:08.000000000 +0200 @@ -15,7 +15,15 @@ _filedir return 0 ;; - -I|-c|--check|-o|--option) + -c|--check) + # should take --checkdir, python path, inheritance into account... + COMPREPLY=( $( compgen -W \ + "$( command ls /usr/share/rpmlint/*Check.py* 2>/dev/null | + sed -e '/^AbstractCheck/d' \ + -e 's|.*/$[^/.]*$\.py.*|\1|' )" -- "$cur" ) ) + return 0 + ;; + -I|-o|--option) # argument required but no completions available return 0 ;; @@ -52,7 +60,7 @@ esac if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-h --help -i --ignore' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '--help --ignore' -- "$cur" ) ) else # Installed packages completion is slow, do it only if arg does not # look like a path. ++++++ rpmlint-fscaps.diff ++++++ >From 1300bf63e4f5e345329b040e3ccd982c02ee35bd Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Wed, 3 Nov 2010 16:57:00 +0100 Subject: [PATCH] make file capabilities available in PkgFile --- Pkg.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Pkg.py b/Pkg.py index 73bd0ba..a2c864d 100644 --- a/Pkg.py +++ b/Pkg.py @@ -603,6 +603,10 @@ class Pkg: provides = self.header[rpm.RPMTAG_FILEPROVIDE] files = self.header[rpm.RPMTAG_FILENAMES] magics = self.header[rpm.RPMTAG_FILECLASS] + try: + filecaps = self.header[rpm.RPMTAG_FILECAPS] + except: + filecaps = None # rpm-python < 4.6 does not return a list for this (or FILEDEVICES, # FWIW) for packages containing exactly one file @@ -629,6 +633,8 @@ class Pkg: pkgfile.requires = parse_deps(requires[idx]) pkgfile.provides = parse_deps(provides[idx]) pkgfile.lang = langs[idx] + if filecaps: + pkgfile.filecaps = filecaps[idx] pkgfile.magic = magics[idx] if not pkgfile.magic and _magic: pkgfile.magic = _magic.file(pkgfile.path) @@ -806,6 +812,7 @@ class PkgFile(object): self.provides = [] self.lang = '' self.magic = '' + self.filecaps = None # TODO: decompression support -- 1.7.1 ++++++ suse-hide-unstripped-outside-build.diff ++++++ --- /var/tmp/diff_new_pack.DQML6R/_old 2010-11-05 16:04:26.000000000 +0100 +++ /var/tmp/diff_new_pack.DQML6R/_new 2010-11-05 16:04:26.000000000 +0100 @@ -1,4 +1,6 @@ ---- BinariesCheck.py +Index: BinariesCheck.py +=================================================================== +--- BinariesCheck.py.orig +++ BinariesCheck.py @@ -10,6 +10,7 @@ @@ -8,18 +10,18 @@ import rpm -@@ -283,7 +284,9 @@ +@@ -284,7 +285,9 @@ class BinariesCheck(AbstractCheck.Abstra continue # stripped ? - if 'not stripped' in pkgfile.magic: + if 'not stripped' in pkgfile.magic and \ -+ (os.environ.get('BUILD_DIR', None) == None or -+ os.environ.get('BUILD_DEBUG', None) != None): ++ (os.environ.get('BUILD_DIR', '') == '' or ++ os.environ.get('BUILD_DEBUG', '') != ''): printWarning(pkg, 'unstripped-binary-or-object', fname) # inspect binary file -@@ -580,6 +583,12 @@ +@@ -581,6 +584,12 @@ form, make sure that rpmbuild does not s that use prelink, make sure that prelink does not strip it either, usually by placing a blacklist file in /etc/prelink.conf.d. For more information, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900#49''', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virt-utils for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package virt-utils for openSUSE:Factory checked in at Fri Nov 5 16:04:13 CET 2010. -------- --- virt-utils/virt-utils.changes 2010-08-24 06:25:52.000000000 +0200 +++ virt-utils/virt-utils.changes 2010-11-04 18:49:29.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 4 17:28:55 UTC 2010 - brogers(a)novell.com + +- Update to qemu-0.13.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qemu-0.12.3.tar.bz2 qemu-img-read-only-image-issue.patch qemu-img-rebase_1.patch qemu-img-rebase_2.patch qemu-img-rebase_3.patch qemu-img-segfault-during-rebase.patch qemu-overflow.patch New: ---- qemu-0.13.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-utils.spec ++++++ --- /var/tmp/diff_new_pack.NmCKqu/_old 2010-11-05 16:03:02.000000000 +0100 +++ /var/tmp/diff_new_pack.NmCKqu/_new 2010-11-05 16:03:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package virt-utils (Version 1.1.3) +# spec file for package virt-utils (Version 1.1.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,20 +23,14 @@ Name: virt-utils BuildRequires: zlib-devel -Version: 1.1.3 +Version: 1.1.4 Release: 1 License: GPLv2 Group: System/Kernel Summary: Virtualization Utilities -Source0: qemu-0.12.3.tar.bz2 +Source0: qemu-0.13.0.tar.bz2 Source1: vm-snapshot-disk Patch1: qemu-img-vmdk-scsi.patch -Patch2: qemu-img-rebase_1.patch -Patch3: qemu-img-rebase_2.patch -Patch4: qemu-img-rebase_3.patch -Patch5: qemu-img-segfault-during-rebase.patch -Patch6: qemu-img-read-only-image-issue.patch -Patch7: qemu-overflow.patch Url: http://www.qemu.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,14 +53,8 @@ %prep %if %{?qemu_utils}0 -%setup -q -n qemu-0.12.3 +%setup -q -n qemu-0.13.0 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %endif %build ++++++ qemu-0.12.3.tar.bz2 -> qemu-0.13.0.tar.bz2 ++++++ ++++ 198139 lines of diff (skipped) ++++++ qemu-img-vmdk-scsi.patch ++++++ --- /var/tmp/diff_new_pack.NmCKqu/_old 2010-11-05 16:03:04.000000000 +0100 +++ /var/tmp/diff_new_pack.NmCKqu/_new 2010-11-05 16:03:04.000000000 +0100 @@ -13,11 +13,11 @@ qemu-img.c | 15 +++++++++++++-- 4 files changed, 21 insertions(+), 8 deletions(-) -Index: qemu-kvm-0.12.3/block/vmdk.c +Index: qemu-0.13.0/block/vmdk.c =================================================================== ---- qemu-kvm-0.12.3.orig/block/vmdk.c -+++ qemu-kvm-0.12.3/block/vmdk.c -@@ -710,7 +710,7 @@ static int vmdk_create(const char *filen +--- qemu-0.13.0.orig/block/vmdk.c ++++ qemu-0.13.0/block/vmdk.c +@@ -686,7 +686,7 @@ static int vmdk_create(const char *filen "ddb.geometry.cylinders = \"%" PRId64 "\"\n" "ddb.geometry.heads = \"16\"\n" "ddb.geometry.sectors = \"63\"\n" @@ -26,7 +26,7 @@ char desc[1024]; const char *real_filename, *temp_str; int64_t total_size = 0; -@@ -725,6 +725,8 @@ static int vmdk_create(const char *filen +@@ -702,6 +702,8 @@ static int vmdk_create(const char *filen backing_file = options->value.s; } else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) { flags |= options->value.n ? BLOCK_FLAG_COMPAT6: 0; @@ -35,7 +35,7 @@ } options++; } -@@ -800,7 +802,8 @@ static int vmdk_create(const char *filen +@@ -799,7 +801,8 @@ static int vmdk_create(const char *filen snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL), total_size, real_filename, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), @@ -45,7 +45,7 @@ /* write the descriptor */ lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); -@@ -844,6 +847,11 @@ static QEMUOptionParameter vmdk_create_o +@@ -845,6 +848,11 @@ static QEMUOptionParameter vmdk_create_o .type = OPT_FLAG, .help = "VMDK version 6 image" }, @@ -57,11 +57,11 @@ { NULL } }; -Index: qemu-kvm-0.12.3/block_int.h +Index: qemu-0.13.0/block_int.h =================================================================== ---- qemu-kvm-0.12.3.orig/block_int.h -+++ qemu-kvm-0.12.3/block_int.h -@@ -30,10 +30,12 @@ +--- qemu-0.13.0.orig/block_int.h ++++ qemu-0.13.0/block_int.h +@@ -31,10 +31,12 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPRESS 2 #define BLOCK_FLAG_COMPAT6 4 @@ -74,10 +74,10 @@ #define BLOCK_OPT_BACKING_FILE "backing_file" #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" -Index: qemu-kvm-0.12.3/qemu-img-cmds.hx +Index: qemu-0.13.0/qemu-img-cmds.hx =================================================================== ---- qemu-kvm-0.12.3.orig/qemu-img-cmds.hx -+++ qemu-kvm-0.12.3/qemu-img-cmds.hx +--- qemu-0.13.0.orig/qemu-img-cmds.hx ++++ qemu-0.13.0/qemu-img-cmds.hx @@ -16,9 +16,9 @@ STEXI ETEXI @@ -102,12 +102,12 @@ ETEXI DEF("info", img_info, -Index: qemu-kvm-0.12.3/qemu-img.c +Index: qemu-0.13.0/qemu-img.c =================================================================== ---- qemu-kvm-0.12.3.orig/qemu-img.c -+++ qemu-kvm-0.12.3/qemu-img.c -@@ -227,6 +227,11 @@ static void add_old_style_options(const - error("VMDK version 6 not supported for file format '%s'", fmt); +--- qemu-0.13.0.orig/qemu-img.c ++++ qemu-0.13.0/qemu-img.c +@@ -247,6 +247,11 @@ static int add_old_style_options(const c + return -1; } } + if (flags & BLOCK_FLAG_SCSI) { @@ -118,7 +118,7 @@ if (base_filename) { if (set_option_parameter(list, BLOCK_OPT_BACKING_FILE, base_filename)) { -@@ -253,7 +258,7 @@ static int img_create(int argc, char **a +@@ -276,7 +281,7 @@ static int img_create(int argc, char **a flags = 0; for(;;) { @@ -127,7 +127,7 @@ if (c == -1) break; switch(c) { -@@ -272,6 +277,9 @@ static int img_create(int argc, char **a +@@ -295,6 +300,9 @@ static int img_create(int argc, char **a case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; @@ -137,7 +137,7 @@ case '6': flags |= BLOCK_FLAG_COMPAT6; break; -@@ -354,6 +362,8 @@ static int img_create(int argc, char **a +@@ -403,6 +411,8 @@ static int img_create(int argc, char **a printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); @@ -146,7 +146,7 @@ puts(""); ret = bdrv_create(drv, filename, param); -@@ -548,7 +558,7 @@ static int img_convert(int argc, char ** +@@ -652,7 +662,7 @@ static int img_convert(int argc, char ** out_baseimg = NULL; flags = 0; for(;;) { @@ -155,7 +155,7 @@ if (c == -1) break; switch(c) { -@@ -570,6 +580,9 @@ static int img_convert(int argc, char ** +@@ -674,6 +684,9 @@ static int img_convert(int argc, char ** case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; @@ -165,7 +165,7 @@ case '6': flags |= BLOCK_FLAG_COMPAT6; break; -@@ -637,6 +650,9 @@ static int img_convert(int argc, char ** +@@ -770,6 +783,9 @@ static int img_convert(int argc, char ** } } @@ -174,4 +174,4 @@ + /* Create the new image */ ret = bdrv_create(drv, out_filename, param); - free_option_parameters(param); + if (ret < 0) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at Fri Nov 5 16:00:47 CET 2010. -------- --- clamav/clamav.changes 2010-09-15 16:35:22.000000000 +0200 +++ clamav/clamav.changes 2010-10-28 16:42:06.000000000 +0200 @@ -1,0 +2,51 @@ +Thu Oct 28 16:34:29 CEST 2010 - max(a)suse.de + +- New version: 0.96.4 (bnc#649631): + * sigtool/sigtool.c: don't use of sizeof() for malloc'ed buffer + (bb#2283) + * shared/cdiff.c, sigtool/sigtool.c: fix error path double frees + (bb#2280, bb#2281) + * See /usr/share/doc/packages/clamav/ChangeLog for the full list + of changes. + +------------------------------------------------------------------- +Wed Sep 22 15:32:10 UTC 2010 - max(a)novell.com + +- New version: 0.96.3 (bnc#640812): + * libclamav/nsis/bzlib.cld sys: port upstream fixes for + CVE-2010-0405, check for buggy bzip2 (bb#2230, bb#2231). + * libclamav/pdf.c: Add missing boundscheck to pdf code + (bb #2226). + * libclamav/c++/bytecode2llvm.cpp: workaround crash due to gcc + stack alignment requirements (bb #2270). + * libclamav/pdf.c, pe.c, bytecode*: Fix bytecode virusname + reporting (bb #2255). + * clamav-milter/netcode.c: fix error path fd leak when + connection succeeds but ping fails (bb#2259). + * libclamav/bytecode.c: properly skip bytecodes with long lines. + * unit_tests: add VI unit tests + * libclamav: versioninfo hashset was not properly cached + (bb#2065). + * libclamav/pe.c: add BC_PE_ALL hook (bb #2237). + * libclamav/c++/{bytecode2llvm,ClamBCRTChecks}.cpp: avoid false + 'Verification error' messages (bb #2239). + * freshclam/freshclam.c: fix handling of relative paths with + --datadir (bb#2240). + * clamd/clamd.c: limit RLIMIT_DATA to 2GB on 32-bit processes + (bb #1941). + * libclamav/regex/regexec.c: fix regex when + sizeof(void*) != sizeof(long) (bb #2232). + * libclamav/pdf.c: improve handling of pdf objects (bb #2216). + * libclamav/pe_icons.c: support special case where icon is + encoded as 32bpp but it really carries alpha as a mask... well + go figure. (bb#2221) + * libclamav/mpool.c: permanently disable debug mode (bb#2222). + * libclamav: allow logical sigs to be used as file type sigs + (bb#2228). + * libclamav/c++/detect.cpp: don't warn on x86_64 vs i386 + mismatches (bb #2214). + * sigtool/sigtool.c: fix EOL matching in --find-sigs (bb#2164). + * libclamav/bytecode_detect.c: prevent fclose(NULL) on SELinux + (bb #2200). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- clamav-0.96.2.tar.bz2 New: ---- clamav-0.96.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.snjL80/_old 2010-11-05 15:59:35.000000000 +0100 +++ /var/tmp/diff_new_pack.snjL80/_new 2010-11-05 15:59:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package clamav (Version 0.96.2) +# spec file for package clamav (Version 0.96.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: clamav -BuildRequires: libbz2-devel ncurses-devel sed sendmail sendmail-devel +BuildRequires: ncurses-devel sed sendmail sendmail-devel %define llvm --disable-llvm %if 0%{?suse_version} >= 1010 BuildRequires: bc pkgconfig zlib-devel @@ -29,13 +29,14 @@ %endif %endif %if 0%{?suse_version} >= 1030 -BuildRequires: check-devel pwdutils python-devel +BuildRequires: check-devel libbz2-devel pwdutils python-devel %define clamav_check --enable-check %else +BuildRequires: bzip2 %define clamav_check --disable-check %endif Summary: Antivirus Toolkit -Version: 0.96.2 +Version: 0.96.4 Release: 1 License: GPLv2 Group: Productivity/Security ++++++ clamav-0.96.2.tar.bz2 -> clamav-0.96.4.tar.bz2 ++++++ clamav/clamav-0.96.2.tar.bz2 clamav/clamav-0.96.4.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0