cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert the revert and apply upstream fix

Browse Source
This commit is contained in:
jasper 2015-05-06 21:36:33 +00:00
parent 65337c6c57
commit fd80f36c06
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/virt-manager/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2015/05/06 09:59:14 jasper Exp $
# $OpenBSD: Makefile,v 1.12 2015/05/06 21:36:33 jasper Exp $
COMMENT= GUI for managing virtual machines through libvirt
DISTNAME= virt-manager-1.2.0
REVISION= 0
CATEGORIES= sysutils x11
HOMEPAGE= http://virt-manager.org/

27
sysutils/virt-manager/patches/patch-virtManager_sshtunnels_py
View File

@ -1,25 +1,28 @@
$OpenBSD: patch-virtManager_sshtunnels_py,v 1.1 2015/05/06 09:59:14 jasper Exp $
$OpenBSD: patch-virtManager_sshtunnels_py,v 1.2 2015/05/06 21:36:33 jasper Exp $
Revert:
From a2d453f3e20d103a4767394300c5183fde9a6bb4 Mon Sep 17 00:00:00 2001
From ebcb7c064ca5a3afd2ec3a0c8f59328a7f71b009 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri, 24 Apr 2015 11:01:43 +0200
Subject: sshtunnels: use ipaddr to check if address is loopback or unspecified
Date: Wed, 6 May 2015 12:52:40 +0200
Subject: sshtunnels: fix exception when the address is not an IP
details: https://bugzilla.redhat.com/show_bug.cgi?id=1218958
--- virtManager/sshtunnels.py.orig Wed May 6 11:56:14 2015
+++ virtManager/sshtunnels.py Wed May 6 11:56:49 2015
@@ -48,10 +48,10 @@ class ConnectionInfo(object):
--- virtManager/sshtunnels.py.orig Mon May 4 18:26:13 2015
+++ virtManager/sshtunnels.py Wed May 6 23:35:02 2015
@@ -48,10 +48,16 @@ class ConnectionInfo(object):
self._connhost = "127.0.0.1"
def _is_listen_localhost(self, host=None):
- return ipaddr.IPNetwork(host or self.gaddr).is_loopback
+ return (host or self.gaddr) in ["127.0.0.1", "::1"]
+ try:
+ return ipaddr.IPNetwork(host or self.gaddr).is_loopback
+ except:
+ return False
def _is_listen_any(self):
- return ipaddr.IPNetwork(self.gaddr).is_unspecified
+ return self.gaddr in ["0.0.0.0", "::"]
+ try:
+ return ipaddr.IPNetwork(self.gaddr).is_unspecified
+ except:
+ return False
def need_tunnel(self):
if not self._is_listen_localhost():