Re: sysutils/rdiff-backup: update or remove ?

On Mon, Dec 05, 2022 at 11:25:15AM +0000, Stuart Henderson wrote:
> On 2022/12/05 12:01, Giovanni Bechis wrote:
> > On Sat, Dec 03, 2022 at 07:30:55PM +0000, Klemens Nanni wrote:
> > > Last port update is from 2010, i consider this port unmaintained despite
> > > the variable being set.
> > >
> > > python 2, but upstream is super active (last beta is a few hours old)
> > > with python 3 support and a stable version of 2.0.5.
> > >
> > > Does anyone use this port and cares to update it?
> > > It shouldn't rot away on py2 life support^W^W...
> > I am using it, update to 2.0.5 follows.
>
> Joshua Megerman sent a diff back in May for this, which I tweaked and
> sent back, no response from maintainer (and I forgot it was in-flight
> and didn't get round to committing it).
>
> It would be really helpful if people would drop maintainer on ports
> which they aren't realistically going to maintain.
>
> > +lib/python${MODPY_VERSION}/site-packages/rdiff_backup-0.0.0.dist-info/
>
> This should use the pypi "sdist" tarball, the version number doesn't end up
> set correctly when it's built from the GH autogenerated tar.
>
> Here's an updated version of the earlier diffs. OK?
>
sure, ok giovanni@, thanks.
Giovanni


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/rdiff-backup/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 11 Mar 2022 19:57:55 -0000 1.24
> +++ Makefile 5 Dec 2022 11:20:28 -0000
> @@ -1,26 +1,27 @@
> -COMMENT = incremental backup
> +COMMENT = incremental backup
>
> -MODPY_EGG_VERSION = 1.2.8
> +MODPY_EGG_VERSION = 2.0.5
> DISTNAME = rdiff-backup-${MODPY_EGG_VERSION}
> -REVISION = 8
> +
> CATEGORIES = sysutils
>
> -HOMEPAGE = http://www.nongnu.org/rdiff-backup/
> +HOMEPAGE = https://rdiff-backup.net/
>
> -MAINTAINER = Pierre-Emmanuel Andre <pea@openbsd.org>
> +MAINTAINER = Pierre-Emmanuel Andre <pea@openbsd.org>
>
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> WANTLIB += rsync pthread ${MODPY_WANTLIB}
>
> -LIB_DEPENDS += net/librsync
> -
> -MASTER_SITES = ${MASTER_SITE_SAVANNAH:=rdiff-backup/}
> +LIB_DEPENDS += net/librsync
>
> -MODULES = lang/python
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
> +MODULES = lang/python
> +MODPY_PI = Yes
> +MODPY_PYBUILD = setuptools_scm
> +CFLAGS += -I${LOCALBASE}/include
>
> -NO_TEST = Yes
> +# tests are present but are intended to run via Tox in a Docker container
> +NO_TEST = Yes
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/rdiff-backup/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 18 Jan 2015 03:15:14 -0000 1.3
> +++ distinfo 5 Dec 2022 11:20:28 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (rdiff-backup-1.2.8.tar.gz) = DZGoW0CUkRb6iq8V2hZcNKLRVEmzy+AcgCY5ExCslds=
> -SIZE (rdiff-backup-1.2.8.tar.gz) = 196526
> +SHA256 (rdiff-backup-2.0.5.tar.gz) = VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s=
> +SIZE (rdiff-backup-2.0.5.tar.gz) = 456089
> Index: patches/patch-_librsyncmodule_c
> ===================================================================
> RCS file: patches/patch-_librsyncmodule_c
> diff -N patches/patch-_librsyncmodule_c
> --- patches/patch-_librsyncmodule_c 11 Mar 2022 19:57:55 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -Fix with librsync v1.0.0; similar to
> -https://bugs.launchpad.net/duplicity/+bug/1416344
> -
> -This uses the backwards-compatible format that uses the insecure
> -truncated MD4 hash.
> -
> ---- _librsyncmodule.c.orig Wed Aug 19 20:33:42 2015
> -+++ _librsyncmodule.c Wed Aug 19 20:34:42 2015
> -@@ -59,8 +59,13 @@ _librsync_new_sigmaker(PyObject* self, PyObject* args)
> - 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);
> -+