From 0401463f47a16b7acb9e6c384c18237fc13440ba Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 12:27:33 +0200 Subject: [PATCH] xbmc: add patch to let add ssh/sftp connections Signed-off-by: Stephan Raue --- ...xbmc-538d8e1-322-add_sshd_dialog-0.1.patch | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-538d8e1-322-add_sshd_dialog-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-538d8e1-322-add_sshd_dialog-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-538d8e1-322-add_sshd_dialog-0.1.patch new file mode 100644 index 0000000000..beb0193017 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-538d8e1-322-add_sshd_dialog-0.1.patch @@ -0,0 +1,97 @@ +diff --git a/language/English/strings.xml b/language/English/strings.xml +index 1583695..bdea670 100644 +--- a/language/English/strings.xml ++++ b/language/English/strings.xml +@@ -1728,6 +1728,7 @@ + VDR Streamdev client + MythTV client + Network Filesystem (NFS) ++ Secure Shell (SSH/SFTP) + + Web server directory (HTTP) + Web server directory (HTTPS) +diff --git a/xbmc/network/GUIDialogNetworkSetup.cpp b/xbmc/network/GUIDialogNetworkSetup.cpp +index b39efd4..fc274f9 100644 +--- a/xbmc/network/GUIDialogNetworkSetup.cpp ++++ b/xbmc/network/GUIDialogNetworkSetup.cpp +@@ -144,6 +144,9 @@ void CGUIDialogNetworkSetup::OnInitWindow() + #ifdef HAS_FILESYSTEM_NFS + pSpin->AddLabel(g_localizeStrings.Get(20259), NET_PROTOCOL_NFS); + #endif ++#ifdef HAS_FILESYSTEM_SFTP ++ pSpin->AddLabel(g_localizeStrings.Get(20260), NET_PROTOCOL_SFTP); ++#endif + + pSpin->SetValue(m_protocol); + OnProtocolChange(); +@@ -210,6 +213,8 @@ void CGUIDialogNetworkSetup::OnProtocolChange() + m_port = "6543"; + else if (m_protocol == NET_PROTOCOL_NFS) + m_port = "2049"; ++ else if (m_protocol == NET_PROTOCOL_SFTP) ++ m_port = "22"; + + UpdateButtons(); + } +@@ -244,6 +249,7 @@ void CGUIDialogNetworkSetup::UpdateButtons() + m_protocol == NET_PROTOCOL_RSS || + m_protocol == NET_PROTOCOL_DAV || + m_protocol == NET_PROTOCOL_DAVS|| ++ m_protocol == NET_PROTOCOL_SFTP|| + m_protocol == NET_PROTOCOL_NFS) + { + SET_CONTROL_LABEL(CONTROL_REMOTE_PATH, 1011); // Remote Path +@@ -276,6 +282,7 @@ void CGUIDialogNetworkSetup::UpdateButtons() + m_protocol == NET_PROTOCOL_MYTH || + m_protocol == NET_PROTOCOL_RSS || + m_protocol == NET_PROTOCOL_DAAP || ++ m_protocol == NET_PROTOCOL_SFTP || + m_protocol == NET_PROTOCOL_NFS); + + SendMessage(GUI_MSG_SET_TYPE, CONTROL_PORT_NUMBER, CGUIEditControl::INPUT_TYPE_NUMBER, 1018); +@@ -302,6 +309,7 @@ void CGUIDialogNetworkSetup::UpdateButtons() + m_protocol == NET_PROTOCOL_VTP || + m_protocol == NET_PROTOCOL_MYTH || + m_protocol == NET_PROTOCOL_TUXBOX|| ++ m_protocol == NET_PROTOCOL_SFTP || + m_protocol == NET_PROTOCOL_NFS)); + } + +@@ -336,6 +344,8 @@ CStdString CGUIDialogNetworkSetup::ConstructPath() const + url.SetProtocol("myth"); + else if (m_protocol == NET_PROTOCOL_NFS) + url.SetProtocol("nfs"); ++ else if (m_protocol == NET_PROTOCOL_SFTP) ++ url.SetProtocol("sftp"); + + if (!m_username.IsEmpty()) + { +@@ -356,6 +366,7 @@ CStdString CGUIDialogNetworkSetup::ConstructPath() const + (m_protocol == NET_PROTOCOL_VTP) || + (m_protocol == NET_PROTOCOL_MYTH) || + (m_protocol == NET_PROTOCOL_TUXBOX) || ++ (m_protocol == NET_PROTOCOL_SFTP) || + (m_protocol == NET_PROTOCOL_NFS)) + && !m_port.IsEmpty() && atoi(m_port.c_str()) > 0) + { +@@ -398,6 +409,8 @@ void CGUIDialogNetworkSetup::SetPath(const CStdString &path) + m_protocol = NET_PROTOCOL_RSS; + else if (protocol == "nfs") + m_protocol = NET_PROTOCOL_NFS; ++ else if (protocol == "sftp" || protocol == "ssh") ++ m_protocol = NET_PROTOCOL_SFTP; + else + m_protocol = NET_PROTOCOL_SMB; // default to smb + m_username = url.GetUserName(); +diff --git a/xbmc/network/GUIDialogNetworkSetup.h b/xbmc/network/GUIDialogNetworkSetup.h +index 42dfa03..ec4c799 100644 +--- a/xbmc/network/GUIDialogNetworkSetup.h ++++ b/xbmc/network/GUIDialogNetworkSetup.h +@@ -41,6 +41,7 @@ public: + NET_PROTOCOL_VTP, + NET_PROTOCOL_MYTH, + NET_PROTOCOL_TUXBOX, ++ NET_PROTOCOL_SFTP, + NET_PROTOCOL_NFS}; + CGUIDialogNetworkSetup(void); + virtual ~CGUIDialogNetworkSetup(void);