summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Calorì <axelgenus@gmail.com>2016-02-14 19:35:51 +0100
committerAlessandro Calorì <axelgenus@gmail.com>2016-02-15 15:27:52 +0100
commitc91e5a92d0c814abe968fbddbdab397494101bb1 (patch)
tree900f9b4c147eff7757bdde5e3cccf686dc7eda53 /app-backup/rdiff-backup/files
parentnet-analyzer/fail2ban: arm stable, bug #573558 (diff)
downloadgentoo-c91e5a92d0c814abe968fbddbdab397494101bb1.tar.gz
gentoo-c91e5a92d0c814abe968fbddbdab397494101bb1.tar.bz2
gentoo-c91e5a92d0c814abe968fbddbdab397494101bb1.zip
app-backup/rdiff-backup: clean up, fix #568800
Diffstat (limited to 'app-backup/rdiff-backup/files')
-rw-r--r--app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch16
-rw-r--r--app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch16
2 files changed, 16 insertions, 16 deletions
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
deleted file mode 100644
index f9cad9ae6f6..00000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-@@ -135,10 +135,10 @@
- if not remote_cmd: return Globals.local_connection
-
- Log("Executing " + remote_cmd, 4)
-- if os.name == "nt":
-+ if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
- import subprocess
- try:
-- process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
-+ process = subprocess.Popen(remote_cmd, shell=True, bufsize=0,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE)
- (stdin, stdout) = (process.stdin, process.stdout)
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
new file mode 100644
index 00000000000..16b97ab1c01
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
@@ -0,0 +1,16 @@
+--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+ if (sm == NULL) return NULL;
+ sm->x_attr = NULL;
+
++#ifdef RS_DEFAULT_STRONG_LEN
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
+ (size_t)RS_DEFAULT_STRONG_LEN);
++#else
++ sm->sig_job = rs_sig_begin((size_t)blocklen,
++ (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+ return (PyObject*)sm;
+ }
+