From 5c6ce5bee8c7a7d3fc6f742784e17e0e87dd9355 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sep 14 2007 22:05:34 +0000 Subject: - Upgrade to 0.4.3 (#265701) - Updated the license tag according to the guidelines --- diff --git a/.cvsignore b/.cvsignore index e6bc79e..17ce404 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -duplicity-0.4.2.tar.gz +duplicity-0.4.3.tar.gz diff --git a/duplicity-0.4.1-timeout.patch b/duplicity-0.4.1-timeout.patch deleted file mode 100644 index a2df007..0000000 --- a/duplicity-0.4.1-timeout.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fixes ftp timeout exception when backing up huge files with small changes - thanks -to Stefan Schimanski . - ---- duplicity-0.4.1/src/backends.py 2003-08-10 04:17:21.000000000 +0200 -+++ duplicity-0.4.1/src/backends.py.timeout 2005-10-17 10:47:10.000000000 +0200 -@@ -20,6 +20,7 @@ - - import os, types, ftplib, tempfile - import log, path, dup_temp, file_naming -+import time - - class BackendException(Exception): pass - class ParsingException(Exception): pass -@@ -316,6 +317,7 @@ - - class ftpBackend(Backend): - """Connect to remote store using File Transfer Protocol""" -+ SLEEP = 10 # time in seconds before we try to reconnect on temporary errors - def __init__(self, parsed_url): - """Create a new ftp backend object, log in to host""" - self.ftp = ftplib.FTP() -@@ -330,6 +332,12 @@ - def error_wrap(self, command, *args): - """Run self.ftp.command(*args), but raise BackendException on error""" - try: return ftplib.FTP.__dict__[command](self.ftp, *args) -+ except ftplib.error_temp, e: -+ log.Log("Temporary error '%s'. Trying to reconnect in %d seconds." % -+ (str(e), self.SLEEP), 3) -+ time.sleep(self.SLEEP) -+ self.__init__(self.parsed_url) -+ self.error_wrap(command, *args) - except ftplib.all_errors, e: raise BackendException(e) - - def get_password(self): diff --git a/duplicity-0.4.2-sftp.patch b/duplicity-0.4.2-sftp.patch deleted file mode 100644 index afe4858..0000000 --- a/duplicity-0.4.2-sftp.patch +++ /dev/null @@ -1,37 +0,0 @@ -Adds support for --sftp-command option - thanks to intrigeri . - ---- duplicity-0.4.2/src/commandline.py 2006-02-03 04:44:31.000000000 +0100 -+++ duplicity-0.4.2/src/commandline.py.sftp 2006-12-20 14:15:38.000000000 +0100 -@@ -50,7 +50,7 @@ - "list-current-files", "no-encryption", - "no-print-statistics", "null-separator", - "remove-older-than=", "restore-dir=", "restore-time=", -- "scp-command=", "short-filenames", "sign-key=", -+ "scp-command=", "sftp-command=", "short-filenames", "sign-key=", - "ssh-command=", "verbosity=", "verify", "version"]) - except getopt.error, e: - command_line_error("%s" % (str(e),)) -@@ -95,6 +95,7 @@ - elif opt == "-t" or opt == "--restore-time": - globals.restore_time = dup_time.genstrtotime(arg) - elif opt == "--scp-command": backends.scp_command = arg -+ elif opt == "--sftp-command": backends.sftp_command = arg - elif opt == "--short-filenames": globals.short_filenames = 1 - elif opt == "--sign-key": set_sign_key(arg) - elif opt == "--ssh-command": backends.ssh_command = arg ---- duplicity-0.4.2/duplicity.1 2006-02-03 04:44:31.000000000 +0100 -+++ duplicity-0.4.2/duplicity.1.sftp 2006-12-20 14:24:58.000000000 +0100 -@@ -271,6 +271,13 @@ - give extra arguments to scp, for instance "--scp-command \'scp -i - foo\'". The default is "scp". - .TP -+.BI "--sftp-command " command -+This option only matters when using the ssh/scp backend. There -+.I command -+will be used instead of sftp for listing and deleting files. The -+default is "sftp". For more information see -+.BR --scp-command . -+.TP - .BI "--sign-key " key - This option can be used when backing up or restoring. When backing - up, all backup files will be signed with keyid diff --git a/duplicity.spec b/duplicity.spec index 7c410ee..2be1dd0 100644 --- a/duplicity.spec +++ b/duplicity.spec @@ -2,37 +2,32 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.2 -Release: 7%{?dist} -License: GPL +Version: 0.4.3 +Release: 1%{?dist} +License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch0: duplicity-0.4.1-timeout.patch -Patch1: duplicity-0.4.2-sftp.patch -Requires: gnupg >= 1.0.6 -%if "%{?rhel}" <= "4" -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -%endif -BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 +Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6 +Requires: pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Duplicity incrementally backs up files and directory by encrypting tar-format volumes with GnuPG and uploading them to a remote (or -local) file server. In theory many remote backends are possible; -right now local, ssh/scp, ftp, and rsync backends are written. +local) file server. In theory many protocols for connecting to a +file server could be supported; so far ssh/scp, local file access, +rsync, ftp, HSI, WebDAV and Amazon S3 have been written. Because duplicity uses librsync, the incremental archives are space efficient and only record the parts of files that have changed since the last backup. Currently duplicity supports deleted files, full -unix permissions, directories, symbolic links, fifos, etc., but not -hard links. +unix permissions, directories, symbolic links, fifos, device files, +but not hard links. %prep %setup -q -%patch0 -p1 -b .timeout -%patch1 -p1 -b .sftp %build %{__python} setup.py build @@ -56,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/%{name}/*.so %changelog +* Sat Sep 15 2007 Robert Scheck 0.4.3-1 +- Upgrade to 0.4.3 (#265701) +- Updated the license tag according to the guidelines + * Mon May 07 2007 Robert Scheck 0.4.2-7 - Rebuild diff --git a/sources b/sources index d056cd8..c4f3f78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz +fc615a1bf173fb55c36c502d252583f8 duplicity-0.4.3.tar.gz