Hello community, here is the log from the commit of package gns3 for openSUSE:Factory checked in at 2013-01-08 13:36:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gns3 (Old) and /work/SRC/openSUSE:Factory/.gns3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gns3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gns3/gns3.changes 2012-08-07 08:06:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gns3.new/gns3.changes 2013-01-08 13:36:28.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Jan 7 14:49:56 UTC 2013 - and...@opensuse.org + +- new upstream version 0.8.3.1 + * minor fixes and support for access to GNS3 VirtualBox VM hostnames + from inside VMs (e.g. VBoxControl guestproperty get NameInGNS3) + * includes updated vboxwrapper that work with the new VirtualBox 4.2 +- removed gns3-0.8.3-defaults.diff now in upstream code + +------------------------------------------------------------------- Old: ---- GNS3-0.8.3-src.tar.bz2 gns3-0.8.3-defaults.diff New: ---- GNS3-0.8.3.1-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gns3.spec ++++++ --- /var/tmp/diff_new_pack.nEqCv9/_old 2013-01-08 13:36:29.000000000 +0100 +++ /var/tmp/diff_new_pack.nEqCv9/_new 2013-01-08 13:36:29.000000000 +0100 @@ -20,7 +20,7 @@ Summary: GNS3 is a graphical network simulator License: GPL-2.0 Group: Productivity/Networking/Other -Version: 0.8.3 +Version: 0.8.3.1 Release: 0 Url: http://www.gns3.net/ Source0: GNS3-%{version}-src.tar.bz2 @@ -29,7 +29,6 @@ Source3: %{name}.xml Source4: %{name}.desktop Source5: application-x-%{name}.png -Patch0: %{name}-0.8.3-defaults.diff BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: hicolor-icon-theme @@ -65,7 +64,6 @@ %prep %setup -q -n GNS3-%{version}-src -%patch0 -p1 %build %__cp %SOURCE2 . ++++++ GNS3-0.8.3-src.tar.bz2 -> GNS3-0.8.3.1-src.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/.hg_archival.txt new/GNS3-0.8.3.1-src/.hg_archival.txt --- old/GNS3-0.8.3-src/.hg_archival.txt 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/.hg_archival.txt 2012-10-22 19:17:09.000000000 +0200 @@ -1,5 +1,5 @@ repo: b2f14b6bbf1898f815c70f435a8c72a165f78f83 -node: 1a4f92828f839e5735229d84d3c87c505b465d28 +node: 35ac243c2692887596367b3da1c34823ee008e6d branch: GNS3-stable-0.8.3 -latesttag: GNS3-0.8.3 -latesttagdistance: 1 +latesttag: GNS3-0.8.3.1 +latesttagdistance: 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/.hgtags new/GNS3-0.8.3.1-src/.hgtags --- old/GNS3-0.8.3-src/.hgtags 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/.hgtags 2012-10-22 19:17:09.000000000 +0200 @@ -41,3 +41,4 @@ 71ba86a96487b25d92b34732d6f946f5120f5f94 GNS3-0.8.3 71ba86a96487b25d92b34732d6f946f5120f5f94 GNS3-0.8.3 7071d85f9e31c50c5fa44b8d95e06ca9cf6f9f39 GNS3-0.8.3 +dde1c52f157bef4090d7981bf1430515ba50a568 GNS3-0.8.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/CHANGELOG new/GNS3-0.8.3.1-src/CHANGELOG --- old/GNS3-0.8.3-src/CHANGELOG 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/CHANGELOG 2012-10-22 19:17:09.000000000 +0200 @@ -1,5 +1,11 @@ CHANGELOG +GNS3 0.8.3.1 + + * Vboxwrapper recompilation to run with VirtualBox 4.2 + * Support for access to the GNS3 VirtualBox VM name from inside a VM: VBoxControl guestproperty get NameInGNS3 + * Minor fixes + GNS3 0.8.3 New features: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/gns3.pyw new/GNS3-0.8.3.1-src/gns3.pyw --- old/GNS3-0.8.3-src/gns3.pyw 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/gns3.pyw 2012-10-22 19:17:09.000000000 +0200 @@ -29,7 +29,7 @@ sys.stderr.write("Can't set default encoding to utf-8\n") # current version of GNS3 -VERSION = "0.8.3" +VERSION = "0.8.3.1" try: from PyQt4 import QtCore, QtGui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/qemuwrapper/qemuwrapper.py new/GNS3-0.8.3.1-src/qemuwrapper/qemuwrapper.py --- old/GNS3-0.8.3-src/qemuwrapper/qemuwrapper.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/qemuwrapper/qemuwrapper.py 2012-10-22 19:17:09.000000000 +0200 @@ -81,7 +81,7 @@ debugmsg(2, msg) __author__ = 'Thomas Pani and Jeremy Grossmann' -__version__ = '0.8.3' +__version__ = '0.8.3.1' if platform.system() == 'Windows': QEMU_PATH = "qemu" # we still use Qemu 0.11.0 on Windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/setup.py new/GNS3-0.8.3.1-src/setup.py --- old/GNS3-0.8.3-src/setup.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/setup.py 2012-10-22 19:17:09.000000000 +0200 @@ -9,7 +9,7 @@ from glob import glob # current version of GNS3 -VERSION = "0.8.3" +VERSION = "0.8.3.1" try: # delete previous build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/src/GNS3/Application.py new/GNS3-0.8.3.1-src/src/GNS3/Application.py --- old/GNS3-0.8.3-src/src/GNS3/Application.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/src/GNS3/Application.py 2012-10-22 19:17:09.000000000 +0200 @@ -565,6 +565,7 @@ int(version) except: force_clear_configuration = False + pass # for future releases #if LooseVersion(VERSION) > version: # pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/src/GNS3/Config/Defaults.py new/GNS3-0.8.3.1-src/src/GNS3/Config/Defaults.py --- old/GNS3-0.8.3-src/src/GNS3/Config/Defaults.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/src/GNS3/Config/Defaults.py 2012-10-22 19:17:09.000000000 +0200 @@ -83,7 +83,7 @@ if os.path.exists(qemuwrapper_path): VBOXWRAPPER_DEFAULT_PATH = vboxwrapper_path elif platform.system() == 'Linux': - QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/lib/gns3/vboxwrapper.py") + VBOXWRAPPER_DEFAULT_PATH = unicode("/usr/lib/gns3/vboxwrapper.py") else: VBOXWRAPPER_DEFAULT_PATH = unicode("/usr/local/libexec/gns3/vboxwrapper.py") # libexec is standard on BSD platforms @@ -175,6 +175,7 @@ elif platform.system() == 'Windows' and os.path.exists("C:\Program Files (x86)\\"): TERMINAL_PRESET_CMDS = { 'Putty (Windows, included with GNS3)': 'putty.exe -telnet %h %p -wt %d -gns3 5', + 'SuperPutty (Windows)': 'SuperPutty.exe -telnet "%h -P %p -wt \"%d\" -gns3 5 -skin 4"', 'SecureCRT (Windows 64-bit)': '"C:\Program Files (x86)\\VanDyke Software\\SecureCRT\\SecureCRT.EXE" /SCRIPT securecrt.vbs /ARG %d /T /TELNET %h %p', 'SecureCRT (Windows 32-bit)': '"C:\Program Files\\VanDyke Software\\SecureCRT\\SecureCRT.EXE" /SCRIPT securecrt.vbs /ARG %d /T /TELNET %h %p', 'TeraTerm (Windows 64-bit)': '"C:\Program Files (x86)\\teraterm\\ttermpro.exe" /W=%d /T=1 %h %p', @@ -184,6 +185,7 @@ elif platform.system() == 'Windows': TERMINAL_PRESET_CMDS = { 'Putty (Windows, included with GNS3)': 'putty.exe -telnet %h %p -wt %d -gns3 5', + 'SuperPutty (Windows)': 'SuperPutty.exe -telnet "%h -P %p -wt \"%d\" -gns3 5 -skin 4"', 'SecureCRT (Windows)': '"C:\Program Files\\VanDyke Software\\SecureCRT\\SecureCRT.EXE" /SCRIPT securecrt.vbs /ARG %d /T /TELNET %h %p', 'TeraTerm (Windows)': '"C:\Program Files\\teraterm\\ttermpro.exe" /W=%d /T=1 %h %p', 'Telnet (Windows)': 'telnet %h %p' @@ -197,6 +199,7 @@ else: # For unknown platforms, or if detection failed, we list all options. TERMINAL_PRESET_CMDS = { 'Putty (Windows, included with GNS3)': 'putty.exe -telnet %h %p -wt %d -gns3 5', + 'SuperPutty (Windows)': 'SuperPutty.exe -telnet "%h -P %p -wt \"%d\" -gns3 5 -skin 4"', 'SecureCRT (Windows 64-bit)': '"C:\Program Files (x86)\\VanDyke Software\\SecureCRT\\SecureCRT.EXE" /SCRIPT securecrt.vbs /ARG %d /T /TELNET %h %p', 'SecureCRT (Windows 32-bit)': '"C:\Program Files\\VanDyke Software\\SecureCRT\\SecureCRT.EXE" /SCRIPT securecrt.vbs /ARG %d /T /TELNET %h %p', 'TeraTerm (Windows 32-bit)': '"C:\Program Files\\teraterm\\ttermpro.exe" /W=%d /T=1 %h %p', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/src/GNS3/HypervisorManager.py new/GNS3-0.8.3.1-src/src/GNS3/HypervisorManager.py --- old/GNS3-0.8.3-src/src/GNS3/HypervisorManager.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/src/GNS3/HypervisorManager.py 2012-10-22 19:17:09.000000000 +0200 @@ -135,7 +135,11 @@ """ if binding == None: - binding = self.dynamips.HypervisorManager_binding + if self.dynamips.HypervisorManager_binding: + binding = self.dynamips.HypervisorManager_binding + else: + debug("Hypervisor manager: warning: no default binding, defaulting to 127.0.0.1") + binding = '127.0.0.1' last_exception = None # give 15 seconds to the hypervisor to accept connections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/src/GNS3/Node/AnyVBoxEmuDevice.py new/GNS3-0.8.3.1-src/src/GNS3/Node/AnyVBoxEmuDevice.py --- old/GNS3-0.8.3-src/src/GNS3/Node/AnyVBoxEmuDevice.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/src/GNS3/Node/AnyVBoxEmuDevice.py 2012-10-22 19:17:09.000000000 +0200 @@ -257,7 +257,11 @@ try: self.create_emudev() if old_console: - self.emu_vboxdev.console = old_console + #FIXME: temporary workaround + try: + self.emu_vboxdev.console = old_console + except: + pass except lib.DynamipsError, msg: QtGui.QMessageBox.critical(globals.GApp.mainWindow, translate("AnyVBoxEmuDevice", "Dynamips error"), unicode(msg)) self.delete_emudev() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/src/GNS3/Workspace.py new/GNS3-0.8.3.1-src/src/GNS3/Workspace.py --- old/GNS3-0.8.3-src/src/GNS3/Workspace.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/src/GNS3/Workspace.py 2012-10-22 19:17:09.000000000 +0200 @@ -1079,7 +1079,7 @@ try: shutil.copy(node.router.cnfg, self.projectConfigs) except (OSError, IOError), e: - debug("Warning: cannot copy " + file + " to " + self.projectConfigs) + debug("Warning: cannot copy " + node.router.cnfg + " to " + self.projectConfigs) continue except: continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/vboxwrapper/vboxcontroller_4_1.py new/GNS3-0.8.3.1-src/vboxwrapper/vboxcontroller_4_1.py --- old/GNS3-0.8.3-src/vboxwrapper/vboxcontroller_4_1.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/vboxwrapper/vboxcontroller_4_1.py 2012-10-22 19:17:09.000000000 +0200 @@ -205,6 +205,21 @@ return False return True + def setName(self, name): + debugmsg(2, "VBoxController_4_1::setName()") + try: + self.mach.setGuestPropertyValue("NameInGNS3",name) + except E_ACCESSDENIED: + debugmsg(2, "setName FAILED : E_ACCESSDENIED") + return False + except VBOX_E_INVALID_VM_STATE: + debugmsg(2, "setName FAILED : VBOX_E_INVALID_VM_STATE") + return False + except VBOX_E_INVALID_OBJECT_STATE: + debugmsg(2, "setName FAILED : VBOX_E_INVALID_OBJECT_STATE") + return False + return True + def displayWindowFocus(self): debugmsg(2, "VBoxController_4_1::displayWindowFocus()") # For example, look at "VBoxGlobal.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GNS3-0.8.3-src/vboxwrapper/vboxwrapper.py new/GNS3-0.8.3.1-src/vboxwrapper/vboxwrapper.py --- old/GNS3-0.8.3-src/vboxwrapper/vboxwrapper.py 2012-07-13 05:23:30.000000000 +0200 +++ new/GNS3-0.8.3.1-src/vboxwrapper/vboxwrapper.py 2012-10-22 19:17:09.000000000 +0200 @@ -83,7 +83,7 @@ debugmsg(1, "debuglevel = %s" % debuglevel + os.linesep) __author__ = 'Thomas Pani, Jeremy Grossmann and Alexey Eromenko "Technologov"' -__version__ = '0.8.3' +__version__ = '0.8.3.1' PORT = 11525 IP = "" @@ -206,6 +206,9 @@ started = self.vbc.start(self.vmname, self.nics, self.udp, self.capture, self.netcard, self.first_nic_managed, self.headless_mode, pipe_name) + if started: + self.vbc.setName(self.name) + if started and self.console_support == 'True' and int(self.console) and self.console_telnet_server == 'True': global IP -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
