rpms/duplicity/F-9 duplicity-0.4.12-scp_username.patch, NONE, 1.1 duplicity.spec, 1.19, 1.20
Robert Scheck (robert)
fedora-extras-commits at redhat.com
Fri Aug 8 20:14:37 UTC 2008
Author: robert
Update of /cvs/extras/rpms/duplicity/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24142/F-9
Modified Files:
duplicity.spec
Added Files:
duplicity-0.4.12-scp_username.patch
Log Message:
Added patch to get scp without username working (#457680)
duplicity-0.4.12-scp_username.patch:
--- NEW FILE duplicity-0.4.12-scp_username.patch ---
Patch by Kenneth Loafman <kenneth at loafman.com> for duplicity <= 0.4.12 to solve scp syntax
regression introduced with duplicity 0.4.12. Problem is, that user at hostname:port works, but
hostname:port doesn't any longer. This patch solves the behaviour and will be included into
the next upstream release as well. For further information, see:
- https://savannah.nongnu.org/bugs/index.php?23988
- https://bugzilla.redhat.com/show_bug.cgi?id=457680
--- duplicity-0.4.12/src/backends.py 2008-07-22 17:20:04.000000000 +0200
+++ duplicity-0.4.12/src/backends.py.scp_username 2008-08-03 19:58:35.000000000 +0200
@@ -330,8 +330,11 @@
"You can get pexpect from http://pexpect.sourceforge.net or "
"python-pexpect from your distro's repository.")
- # host string of form user at hostname:port
- self.host_string = parsed_url.username + "@" + parsed_url.hostname
+ # host string of form [user@]hostname
+ if parsed_url.username:
+ self.host_string = parsed_url.username + "@" + parsed_url.hostname
+ else:
+ self.host_string = parsed_url.hostname
# make sure remote_dir is always valid
if parsed_url.path:
# remove leading '/'
Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-9/duplicity.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- duplicity.spec 27 Jul 2008 20:10:05 -0000 1.19
+++ duplicity.spec 8 Aug 2008 20:14:06 -0000 1.20
@@ -3,11 +3,12 @@
Summary: Encrypted bandwidth-efficient backup using rsync algorithm
Name: duplicity
Version: 0.4.12
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+
Group: Applications/Archiving
URL: http://www.nongnu.org/duplicity/
Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+Patch: duplicity-0.4.12-scp_username.patch
Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync
Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d
BuildRequires: python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1
@@ -28,6 +29,7 @@
%prep
%setup -q
+%patch -p1 -b .scp_username
%build
%{__python} setup.py build
@@ -49,6 +51,9 @@
%{python_sitearch}/%{name}*
%changelog
+* Fri Aug 08 2008 Robert Scheck <robert at fedoraproject.org> 0.4.12-2
+- Added patch to get scp without username working (#457680)
+
* Sun Jul 27 2008 Robert Scheck <robert at fedoraproject.org> 0.4.12-1
- Upgrade to 0.4.12
More information about the fedora-extras-commits
mailing list