diff --git a/build.sh b/build.sh index cda8f0933fb7e193149e9b4af91aa0e5c1c3c885..b462549dcd9c1d5d059b969fb84238219da84c34 100644 --- a/build.sh +++ b/build.sh @@ -7,7 +7,7 @@ set -x # Input variable LIBRSYNC_VERSION=${LIBRSYNC_VERSION:-0.9.7} -RDIFFBACKUP_VERSION=${RDIFFBACKUP_VERSION:-1.2.8} +RDIFFBACKUP_VERSION=${RDIFFBACKUP_VERSION:-1.3.3} # Intermediate variable LIBRSYNC_DIR=librsync-$LIBRSYNC_VERSION diff --git a/patches/rdiff-backup/01_fix_restricted_test-server_option.diff b/patches/rdiff-backup/01_fix_restricted_test-server_option.diff index d7880f81a942083438bc04f8fdd843cd2269164c..415a30b61d6429523492262895b3f3bdd4453d2c 100644 --- a/patches/rdiff-backup/01_fix_restricted_test-server_option.diff +++ b/patches/rdiff-backup/01_fix_restricted_test-server_option.diff @@ -1,9 +1,9 @@ # Description: 01_fix_restricted_test-server_option.diff # Author: Carl Chenet -diff -urNad rdiff-backup-1.2.8~/rdiff_backup/Main.py rdiff-backup-1.2.8/rdiff_backup/Main.py ---- rdiff-backup-1.2.8~/rdiff_backup/Main.py 2009-03-16 15:36:21.000000000 +0100 -+++ rdiff-backup-1.2.8/rdiff_backup/Main.py 2010-02-20 11:26:27.000000000 +0100 +diff -urNad rdiff-backup-1.3.3~/rdiff_backup/Main.py rdiff-backup-1.3.3/rdiff_backup/Main.py +--- rdiff-backup-1.3.3~/rdiff_backup/Main.py 2009-03-16 15:36:21.000000000 +0100 ++++ rdiff-backup-1.3.3/rdiff_backup/Main.py 2010-02-20 11:26:27.000000000 +0100 @@ -288,7 +288,7 @@ elif action == "remove-older-than": RemoveOlderThan(rps[0]) elif action == "restore": Restore(*rps) @@ -13,9 +13,9 @@ diff -urNad rdiff-backup-1.2.8~/rdiff_backup/Main.py rdiff-backup-1.2.8/rdiff_ba elif action == "verify": Verify(rps[0]) else: raise AssertionError("Unknown action " + action) -diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py ---- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100 -+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2010-02-20 11:29:43.000000000 +0100 +diff -urNad rdiff-backup-1.3.3~/rdiff_backup/SetConnections.py rdiff-backup-1.3.3/rdiff_backup/SetConnections.py +--- rdiff-backup-1.3.3~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100 ++++ rdiff-backup-1.3.3/rdiff_backup/SetConnections.py 2010-02-20 11:29:43.000000000 +0100 @@ -241,20 +241,25 @@ Globals.backup_reader = Globals.isbackup_reader = \ Globals.backup_writer = Globals.isbackup_writer = None diff --git a/patches/rdiff-backup/02_python_2.6_deprecationwarning.diff b/patches/rdiff-backup/02_python_2.6_deprecationwarning.diff index 547ecd18247c32d676ee454ce10cbbd5cd8b8d28..88e4259324a934d93eb55d9fbeca485d3f821a45 100644 --- a/patches/rdiff-backup/02_python_2.6_deprecationwarning.diff +++ b/patches/rdiff-backup/02_python_2.6_deprecationwarning.diff @@ -7,9 +7,9 @@ # Also, the *nix version of rdiff-backup requires shell=True instead of # shell=False in the subprocess.Popen call -diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py ---- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100 -+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2009-10-03 19:27:54.935647306 +0200 +diff -urNad rdiff-backup-1.3.3~/rdiff_backup/SetConnections.py rdiff-backup-1.3.3/rdiff_backup/SetConnections.py +--- rdiff-backup-1.3.3~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100 ++++ rdiff-backup-1.3.3/rdiff_backup/SetConnections.py 2009-10-03 19:27:54.935647306 +0200 @@ -135,10 +135,10 @@ if not remote_cmd: return Globals.local_connection diff --git a/patches/rdiff-backup/03_fix_hardlinks.diff b/patches/rdiff-backup/03_fix_hardlinks.diff index ee0c285645783f258335960190d61f7f960df6e6..a2d670103411b04e87eb1040d008d7918dcf6239 100644 --- a/patches/rdiff-backup/03_fix_hardlinks.diff +++ b/patches/rdiff-backup/03_fix_hardlinks.diff @@ -4,9 +4,9 @@ # Apply hard-links bug fix patch # https://savannah.nongnu.org/bugs/index.php?26848 -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' rdiff-backup-1.2.8~/rdiff_backup/Hardlink.py rdiff-backup-1.2.8/rdiff_backup/Hardlink.py ---- rdiff-backup-1.2.8~/rdiff_backup/Hardlink.py 2009-03-16 14:36:21.000000000 +0000 -+++ rdiff-backup-1.2.8/rdiff_backup/Hardlink.py 2012-01-03 11:44:21.708987145 +0000 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' rdiff-backup-1.3.3~/rdiff_backup/Hardlink.py rdiff-backup-1.3.3/rdiff_backup/Hardlink.py +--- rdiff-backup-1.3.3~/rdiff_backup/Hardlink.py 2009-03-16 14:36:21.000000000 +0000 ++++ rdiff-backup-1.3.3/rdiff_backup/Hardlink.py 2012-01-03 11:44:21.708987145 +0000 @@ -95,7 +95,13 @@ src_rorp.getnumlinks() == dest_rorp.getnumlinks() == 1): return 1 # Hard links don't apply @@ -22,9 +22,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' src_key = get_inode_key(src_rorp) index, remaining, dest_key, digest = _inode_index[src_key] if dest_key == "NA": -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' rdiff-backup-1.2.8~/rdiff_backup/compare.py rdiff-backup-1.2.8/rdiff_backup/compare.py ---- rdiff-backup-1.2.8~/rdiff_backup/compare.py 2009-03-16 14:36:21.000000000 +0000 -+++ rdiff-backup-1.2.8/rdiff_backup/compare.py 2012-01-03 11:43:33.792989189 +0000 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' rdiff-backup-1.3.3~/rdiff_backup/compare.py rdiff-backup-1.3.3/rdiff_backup/compare.py +--- rdiff-backup-1.3.3~/rdiff_backup/compare.py 2009-03-16 14:36:21.000000000 +0000 ++++ rdiff-backup-1.3.3/rdiff_backup/compare.py 2012-01-03 11:43:33.792989189 +0000 @@ -25,7 +25,7 @@ """