CVS commit: pkgsrc/sysutils/duplicity

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri May 24 15:08:39 UTC 2024

Modified Files:
        pkgsrc/sysutils/duplicity: Makefile distinfo
        pkgsrc/sysutils/duplicity/patches: patch-duplicity_gpginterface.py
Added Files:
        pkgsrc/sysutils/duplicity/patches:
            patch-duplicity_backends_lftpbackend.py

Log Message:
duplicity: Fix lftp path


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/sysutils/duplicity/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/duplicity/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/duplicity/patches/patch-duplicity_backends_lftpbackend.py
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/duplicity/Makefile
diff -u pkgsrc/sysutils/duplicity/Makefile:1.66 pkgsrc/sysutils/duplicity/Makefile:1.67
--- pkgsrc/sysutils/duplicity/Makefile:1.66     Wed May 22 04:33:35 2024
+++ pkgsrc/sysutils/duplicity/Makefile  Fri May 24 15:08:38 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2024/05/22 04:33:35 triaxx Exp $
+# $NetBSD: Makefile,v 1.67 2024/05/24 15:08:38 triaxx Exp $
 
 DISTNAME=      duplicity-2.2.4
+PKGREVISION=   1
 CATEGORIES=    sysutils net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/duplicity/}
 
@@ -16,7 +17,6 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 
-GPGPATH=       ${PREFIX}/bin/gpg2
 DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 DEPENDS+=      lftp-[0-9]*:../../net/lftp
 DEPENDS+=      ${PYPKGPREFIX}-boto3-[0-9]*:../../net/py-boto3
@@ -36,6 +36,9 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-pexpect-[0
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
+GPG=   ${PREFIX}/bin/gpg2
+LFTP=  ${PREFIX}/bin/lftp
+
 REPLACE_PYTHON+=       bin/duplicity
 REPLACE_PYTHON+=       bin/rdiffdir
 
@@ -48,11 +51,11 @@ SUBST_FILES.fix-paths=              setup.py
 SUBST_SED.fix-paths=           -e 's,share/man/man1,${PKGMANDIR}/man1,'
 SUBST_SED.fix-paths+=          -e 's,share/locale,${PKGLOCALEDIR}/locale,'
 
-SUBST_CLASSES+=                        gpgpath
-SUBST_STAGE.gpgpath=           pre-configure
-SUBST_MESSAGE.gpgpath=         Fixing path of GnuPG
-SUBST_FILES.gpgpath=           duplicity/gpginterface.py
-SUBST_VARS.gpgpath=            GPGPATH
+SUBST_CLASSES+=                        fix-bins
+SUBST_STAGE.fix-bins=          pre-configure
+SUBST_MESSAGE.fix-bins=                Fixing relative binary paths
+SUBST_FILES.fix-bins=          duplicity/backends/lftpbackend.py duplicity/gpginterface.py
+SUBST_VARS.fix-bins=           GPG LFTP
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/sysutils/duplicity/distinfo
diff -u pkgsrc/sysutils/duplicity/distinfo:1.34 pkgsrc/sysutils/duplicity/distinfo:1.35
--- pkgsrc/sysutils/duplicity/distinfo:1.34     Wed May 22 04:33:35 2024
+++ pkgsrc/sysutils/duplicity/distinfo  Fri May 24 15:08:38 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.34 2024/05/22 04:33:35 triaxx Exp $
+$NetBSD: distinfo,v 1.35 2024/05/24 15:08:38 triaxx Exp $
 
 BLAKE2s (duplicity-2.2.4.tar.gz) = d139d3b0c0f89bd66bfe2a8ae7bb83412a4d83977685e58139b87fa19db9d4ea
 SHA512 (duplicity-2.2.4.tar.gz) = afcf43e4f446e96b9c6a9d9d87ac30d9614ae9006b0d68a3498cb2dd7fc7c6f09e3a41bac88486432411f2a503572fcf2f947c56b31a44ef290b816a446b67a4
 Size (duplicity-2.2.4.tar.gz) = 1949969 bytes
-SHA1 (patch-duplicity_gpginterface.py) = 2fdf1cec8d069380be4802dd14ed7baaeb0c5929
+SHA1 (patch-duplicity_backends_lftpbackend.py) = e158f78e3ed47d3594598f40406a6d0815e449e8
+SHA1 (patch-duplicity_gpginterface.py) = bc15642fe7f6f5b9b28eefa2d953f83260fef40a

Index: pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py
diff -u pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.2 pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.3
--- pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.2       Mon Dec 18 09:28:38 2023
+++ pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py   Fri May 24 15:08:39 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-duplicity_gpginterface.py,v 1.2 2023/12/18 09:28:38 triaxx Exp $
+$NetBSD: patch-duplicity_gpginterface.py,v 1.3 2024/05/24 15:08:39 triaxx Exp $
 
-Provide path to gpg.
+Replace gpg executable name by absolute path.
 
 --- duplicity/gpginterface.py.orig     2023-10-10 16:25:32.000000000 +0000
 +++ duplicity/gpginterface.py
@@ -9,7 +9,7 @@ Provide path to gpg.
  
      def __init__(self):
 -        self.call = "gpg"
-+        self.call = "@GPGPATH@"
++        self.call = "@GPG@"
          self.passphrase = None
          self.options = Options()
  

Added files:

Index: pkgsrc/sysutils/duplicity/patches/patch-duplicity_backends_lftpbackend.py
diff -u /dev/null pkgsrc/sysutils/duplicity/patches/patch-duplicity_backends_lftpbackend.py:1.1
--- /dev/null   Fri May 24 15:08:39 2024
+++ pkgsrc/sysutils/duplicity/patches/patch-duplicity_backends_lftpbackend.py   Fri May 24 15:08:39 2024
@@ -0,0 +1,51 @@
+$NetBSD: patch-duplicity_backends_lftpbackend.py,v 1.1 2024/05/24 15:08:39 triaxx Exp $
+
+Replace lftp executable name by absolute path.
+
+--- duplicity/backends/lftpbackend.py.orig     2024-05-24 06:47:44.796435030 +0000
++++ duplicity/backends/lftpbackend.py
+@@ -51,7 +51,7 @@ class LFTPBackend(duplicity.backend.Back
+ 
+         # we expect an output
+         try:
+-            p = os.popen("lftp --version")
++            p = os.popen("@LFTP@ --version")
+             fout = p.read()
+             ret = p.close()
+         except Exception:
+@@ -145,7 +145,7 @@ class LFTPBackend(duplicity.backend.Back
+         if isinstance(remote_filename, bytes):
+             remote_filename = os.fsdecode(remote_filename)
+         commandline = (
+-            f'lftp -c "source {self.tempname}; mkdir -p -f {cmd_quote(self.remote_path)}; '
++            f'@LFTP@ -c "source {self.tempname}; mkdir -p -f {cmd_quote(self.remote_path)}; '
+             f"put {cmd_quote(source_path.uc_name)} "
+             f'-o {cmd_quote(self.remote_path) + os.fsdecode(remote_filename)}"'
+         )
+@@ -159,7 +159,7 @@ class LFTPBackend(duplicity.backend.Back
+         if isinstance(remote_filename, bytes):
+             remote_filename = os.fsdecode(remote_filename)
+         commandline = (
+-            f'lftp -c "source {cmd_quote(self.tempname)}; '
++            f'@LFTP@ -c "source {cmd_quote(self.tempname)}; '
+             f"get {cmd_quote(self.remote_path) + remote_filename} "
+             f'-o {cmd_quote(local_path.uc_name)}"'
+         )
+@@ -176,7 +176,7 @@ class LFTPBackend(duplicity.backend.Back
+         quoted_path = cmd_quote(self.remote_path)
+         # failing to cd into the folder might be because it was not created already
+         commandline = (
+-            f'lftp -c "source {cmd_quote(self.tempname)}; ( cd {quoted_path} && ls ) || '
++            f'@LFTP@ -c "source {cmd_quote(self.tempname)}; ( cd {quoted_path} && ls ) || '
+             f'( mkdir -p -f {quoted_path} && cd {quoted_path} && ls )"'
+         )
+         log.Debug(f"CMD: {commandline}")
+@@ -189,7 +189,7 @@ class LFTPBackend(duplicity.backend.Back
+ 
+     def _delete(self, filename):
+         commandline = (
+-            f'lftp -c "source {cmd_quote(self.tempname)}; cd {cmd_quote(self.remote_path)}; '
++            f'@LFTP@ -c "source {cmd_quote(self.tempname)}; cd {cmd_quote(self.remote_path)}; '
+             f'rm {cmd_quote(os.fsdecode(filename))}"'
+         )
+         log.Debug(f"CMD: {commandline}")