[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.4.0-1-4-g31f6612
Laurent Léonard
laurent at open-minds.org
Sat Aug 6 10:45:00 UTC 2011
The following commit has been merged in the master branch:
commit 16b141a62f1b2968fa2401d67bac5202faee9553
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sat Aug 6 12:35:44 2011 +0200
Drop patch
0001-Don-t-hardcode-sshport.patch - applied upstream http://git.fedorahosted.org/git/?p=virt-viewer.git;a=commitdiff;h=39439b0b3e531f1eeac44fec229b8cd77bed78a6
diff --git a/debian/patches/0001-Don-t-hardcode-sshport.patch b/debian/patches/0001-Don-t-hardcode-sshport.patch
deleted file mode 100644
index 0ef1008..0000000
--- a/debian/patches/0001-Don-t-hardcode-sshport.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 23 Jul 2011 18:01:29 +0200
-Subject: Don't hardcode sshport
-
-this unbreaks using different ports via .ssh/config
----
- src/virt-viewer.c | 12 +++++-------
- 1 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/src/virt-viewer.c b/src/virt-viewer.c
-index 5321580..9622446 100644
---- a/src/virt-viewer.c
-+++ b/src/virt-viewer.c
-@@ -896,14 +896,12 @@ virt_viewer_open_tunnel_ssh(const char *sshhost,
- char portstr[50];
- int n = 0;
-
-- if (!sshport)
-- sshport = 22;
--
-- sprintf(portstr, "%d", sshport);
--
- cmd[n++] = "ssh";
-- cmd[n++] = "-p";
-- cmd[n++] = portstr;
-+ if (!sshport) {
-+ cmd[n++] = "-p";
-+ sprintf(portstr, "%d", sshport);
-+ cmd[n++] = portstr;
-+ }
- if (sshuser) {
- cmd[n++] = "-l";
- cmd[n++] = sshuser;
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cffd5ef..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Don-t-hardcode-sshport.patch
--
VirtViewer Debian packaging
More information about the Pkg-libvirt-commits
mailing list