summaryrefslogtreecommitdiff
path: root/sysutils/rdiff-backup
diff options
context:
space:
mode:
authorwiz <wiz>2009-08-23 15:23:26 +0000
committerwiz <wiz>2009-08-23 15:23:26 +0000
commit1dcb9deec2382cf3aa5be59309184010b16757a9 (patch)
tree9467cfdcf3348105d3f9f482201521a82224bd91 /sysutils/rdiff-backup
parent96a75e21bb8f283b64bad244a8365411516bc14e (diff)
downloadpkgsrc-1dcb9deec2382cf3aa5be59309184010b16757a9.tar.gz
Avoid using os.popen2 with Python>=2.6.
Patch from https://savannah.nongnu.org/bugs/?26064 Bump PKGREVISION.
Diffstat (limited to 'sysutils/rdiff-backup')
-rw-r--r--sysutils/rdiff-backup/Makefile3
-rw-r--r--sysutils/rdiff-backup/distinfo3
-rw-r--r--sysutils/rdiff-backup/patches/patch-aa15
3 files changed, 19 insertions, 2 deletions
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 24fa89e370d..cfd6ef99069 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2009/08/08 16:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2009/08/23 15:23:26 wiz Exp $
DISTNAME= rdiff-backup-1.2.8
+PKGREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= http://savannah.nongnu.org/download/rdiff-backup/
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
index f27336a4a84..73186d464d9 100644
--- a/sysutils/rdiff-backup/distinfo
+++ b/sysutils/rdiff-backup/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2009/03/22 15:24:37 snj Exp $
+$NetBSD: distinfo,v 1.16 2009/08/23 15:23:26 wiz Exp $
SHA1 (rdiff-backup-1.2.8.tar.gz) = 14ffe4f5b46a8a96ded536c1d03ae5e85faae318
RMD160 (rdiff-backup-1.2.8.tar.gz) = f7fb7a894afe17b495611a3738c85263ae72b2b5
Size (rdiff-backup-1.2.8.tar.gz) = 196526 bytes
+SHA1 (patch-aa) = 658bd7a9dce3cd88dbc3b3d8839693bd5560d8cd
diff --git a/sysutils/rdiff-backup/patches/patch-aa b/sysutils/rdiff-backup/patches/patch-aa
new file mode 100644
index 00000000000..ae713928645
--- /dev/null
+++ b/sysutils/rdiff-backup/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2009/08/23 15:23:26 wiz Exp $
+
+https://savannah.nongnu.org/bugs/?26064
+
+--- rdiff_backup/SetConnections.py.orig 2009-03-16 14:36:21.000000000 +0000
++++ rdiff_backup/SetConnections.py
+@@ -135,7 +135,7 @@ def init_connection(remote_cmd):
+ if not remote_cmd: return Globals.local_connection
+
+ Log("Executing " + remote_cmd, 4)
+- if os.name == "nt":
++ if os.name == "nt" or map(int, sys.version.split()[0].split('.')) >= [2, 6]:
+ import subprocess
+ try:
+ process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,