pool/virt-manager
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Upstream bug fixes (bsc#1027942)

Browse Source 
e902fa55-force-binary-mode-with-FTP-servers.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=358
This commit is contained in:
Charles Arnold 2017-08-22 14:08:14 +00:00 committed by Git OBS Bridge
parent 56082a3f99
commit 67142b1ff7
9 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
e902fa55-force-binary-mode-with-FTP-servers.patch Normal file
View File

@ -0,0 +1,19 @@
Subject: urlfetcher: force binary mode with FTP servers (bz #1462838)
From: Cole Robinson crobinso@redhat.com Thu Aug 17 16:10:46 2017 -0400
Date: Thu Aug 17 16:10:46 2017 -0400:
Git: e902fa5550cc09538429b0fa828fb31aa2706d01
diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
index d04c78f..c60c77d 100644
--- a/virtinst/urlfetcher.py
+++ b/virtinst/urlfetcher.py
@@ -224,6 +224,8 @@ class _FTPURLFetcher(_URLFetcher):
self._ftp = ftplib.FTP()
self._ftp.connect(parsed.hostname, parsed.port)
self._ftp.login()
+ # Force binary mode
+ self._ftp.voidcmd("TYPE I")
except Exception as e:
raise ValueError(_("Opening URL %s failed: %s.") %
(self.location, str(e)))

6
virt-manager.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 22 08:05:07 MDT 2017 - carnold@suse.com
- Upstream bug fixes (bsc#1027942)
e902fa55-force-binary-mode-with-FTP-servers.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 9 08:27:42 MDT 2017 - carnold@suse.com Wed Aug 9 08:27:42 MDT 2017 - carnold@suse.com

2
virt-manager.spec
View File

@ -38,6 +38,7 @@ Source1: virt-install.rb
Source2: virt-install.desktop Source2: virt-install.desktop
Source3: virt-manager-supportconfig Source3: virt-manager-supportconfig
# Upstream Patches # Upstream Patches
Patch1: e902fa55-force-binary-mode-with-FTP-servers.patch
# SUSE Only # SUSE Only
Patch70: virtman-desktop.patch Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch Patch71: virtman-kvm.patch
@ -160,6 +161,7 @@ machine).
%prep %prep
%setup -q %setup -q
# Upstream Patches # Upstream Patches
%patch1 -p1
# SUSE Only # SUSE Only
%patch70 -p1 %patch70 -p1
%patch71 -p1 %patch71 -p1

8
virtinst-add-caasp-support.patch
View File

@ -4,7 +4,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py --- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.2/virtinst/urlfetcher.py +++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -464,6 +464,10 @@ def _distroFromSUSEContent(fetcher, arch @@ -466,6 +466,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLESDistro dclass = SLESDistro
if distro_version is None: if distro_version is None:
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
@ -15,7 +15,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
elif re.match(".*openSUSE.*", distribution[1]): elif re.match(".*openSUSE.*", distribution[1]):
dclass = OpensuseDistro dclass = OpensuseDistro
if distro_version is None: if distro_version is None:
@@ -1026,7 +1030,8 @@ class SuseDistro(Distro): @@ -1028,7 +1032,8 @@ class SuseDistro(Distro):
distro_version = self.version_from_content[1].strip() distro_version = self.version_from_content[1].strip()
version = distro_version.split('.', 1)[0].strip() version = distro_version.split('.', 1)[0].strip()
self.os_variant = self.urldistro self.os_variant = self.urldistro
@ -25,7 +25,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
if self.os_variant.startswith(("sles", "sled")): if self.os_variant.startswith(("sles", "sled")):
sp_version = None sp_version = None
if len(distro_version.split('.', 1)) == 2: if len(distro_version.split('.', 1)) == 2:
@@ -1040,6 +1045,8 @@ class SuseDistro(Distro): @@ -1042,6 +1047,8 @@ class SuseDistro(Distro):
self.os_variant += "tumbleweed" self.os_variant += "tumbleweed"
else: else:
self.os_variant += distro_version self.os_variant += distro_version
@ -34,7 +34,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
else: else:
self.os_variant += "9" self.os_variant += "9"
@@ -1086,6 +1093,9 @@ class SLESDistro(SuseDistro): @@ -1088,6 +1095,9 @@ class SLESDistro(SuseDistro):
class SLEDDistro(SuseDistro): class SLEDDistro(SuseDistro):
urldistro = "sled" urldistro = "sled"

4
virtinst-add-ppc64-arch-support.patch
View File

@ -4,7 +4,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py --- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.2/virtinst/urlfetcher.py +++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -438,6 +438,10 @@ def _distroFromSUSEContent(fetcher, arch @@ -440,6 +440,10 @@ def _distroFromSUSEContent(fetcher, arch
arch = "i586" arch = "i586"
elif cbuf.find("s390x") != -1: elif cbuf.find("s390x") != -1:
arch = "s390x" arch = "s390x"
@ -15,7 +15,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
def _parse_sle_distribution(d): def _parse_sle_distribution(d):
sle_version = d[1].strip().rsplit(' ')[4] sle_version = d[1].strip().rsplit(' ')[4]
@@ -996,10 +1000,12 @@ class SuseDistro(Distro): @@ -998,10 +1002,12 @@ class SuseDistro(Distro):
oldkern += "64" oldkern += "64"
oldinit += "64" oldinit += "64"

8
virtinst-detect-oes-distros.patch
View File

@ -1,10 +1,10 @@
Enhancement to correctly detect Open Enterprise Server media is Enhancement to correctly detect Open Enterprise Server media is
selected as the installation source. selected as the installation source.
Index: virt-manager-1.4.0/virtinst/urlfetcher.py Index: virt-manager-1.4.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py --- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.0/virtinst/urlfetcher.py +++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -456,6 +456,10 @@ def _distroFromSUSEContent(fetcher, arch @@ -458,6 +458,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLEDDistro dclass = SLEDDistro
if distro_version is None: if distro_version is None:
distro_version = _parse_sle_distribution(distribution) distro_version = _parse_sle_distribution(distribution)

4
virtinst-fix-sle-distro-parsing.patch
View File

@ -4,7 +4,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py --- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.2/virtinst/urlfetcher.py +++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -444,9 +444,20 @@ def _distroFromSUSEContent(fetcher, arch @@ -446,9 +446,20 @@ def _distroFromSUSEContent(fetcher, arch
arch = "ppc64le" arch = "ppc64le"
def _parse_sle_distribution(d): def _parse_sle_distribution(d):
@ -28,7 +28,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
return ['VERSION', sle_version] return ['VERSION', sle_version]
dclass = GenericDistro dclass = GenericDistro
@@ -1034,7 +1045,10 @@ class SuseDistro(Distro): @@ -1036,7 +1047,10 @@ class SuseDistro(Distro):
distro_version = self.version_from_content[1].strip() distro_version = self.version_from_content[1].strip()
version = distro_version.split('.', 1)[0].strip() version = distro_version.split('.', 1)[0].strip()
self.os_variant = self.urldistro self.os_variant = self.urldistro

2
virtinst-nfs-install-sanitize.patch
View File

@ -57,7 +57,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
######################################################################### #########################################################################
@@ -301,7 +302,8 @@ class _MountedURLFetcher(_LocalURLFetche @@ -303,7 +304,8 @@ class _MountedURLFetcher(_LocalURLFetche
logging.debug("Preparing mount at " + self._srcdir) logging.debug("Preparing mount at " + self._srcdir)
if self.location.startswith("nfs:"): if self.location.startswith("nfs:"):

2
virtinst-use-xenpae-kernel-for-32bit.patch
View File

@ -8,7 +8,7 @@ Index: virt-manager-1.4.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py --- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.2/virtinst/urlfetcher.py +++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -1023,8 +1023,12 @@ class SuseDistro(Distro): @@ -1025,8 +1025,12 @@ class SuseDistro(Distro):
"boot/%s/initrd" % self.arch)) "boot/%s/initrd" % self.arch))
# Matches Opensuse > 10.2 and sles 10 # Matches Opensuse > 10.2 and sles 10