Solene Rapenne <[email protected]> wrote:
> hello
>
> following this thread about faubackup
> https://marc.info/?l=openbsd-ports&m=154046081401380&w=2
>
> I have been able to contact the authors, after some digging they were able to
> find a backup of the CVS repository (not including all history). I rehosted
> that history and last versions and did some changes to faubackup, publishing a
> new release.
>
> New release includes some changes like "removing sourceforge links/mails", and
> I upstreamed some of our patches, like replacing rsh by ssh.
>
Hi, slightly different diff from input with jca@, the license is a GPLv2+
Since last time, tarball checksum is still the same. I don't know much about
framagit gitlab tarball generation. If it ends up that the checksum is not
reliable I will host it somewhere else.
Index: Makefile
===================================================================
RCS file: /data/cvs/ports/sysutils/faubackup/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 15 Nov 2018 20:15:09 -0000 1.9
+++ Makefile 14 Jan 2019 05:45:45 -0000
@@ -1,19 +1,20 @@
# $OpenBSD: Makefile,v 1.9 2018/11/15 20:15:09 solene Exp $
COMMENT = full and incremental backups on filesystem
-DISTNAME = faubackup-0.5.9
-REVISION = 1
+V = v0.6.1
+DISTNAME = faubackup-${V}
+PKGNAME = ${DISTNAME:S/-v/-/}
CATEGORIES = sysutils
-HOMEPAGE = http://freshmeat.sourceforge.net/projects/faubackup
+HOMEPAGE = https://framagit.org/soleneBSD/faubackup/
-# GPLv2
+# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c popt>=0.3
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=faubackup/}
+MASTER_SITES = https://framagit.org/soleneBSD/faubackup/-/archive/${V}/
LIB_DEPENDS = devel/popt
TEST_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS}
Index: distinfo
===================================================================
RCS file: /data/cvs/ports/sysutils/faubackup/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:15:09 -0000 1.2
+++ distinfo 19 Dec 2018 08:20:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (faubackup-0.5.9.tar.gz) = D2uLJI7FXvqBs68p6bvYa2yrM2IovPJx7gHqMw00fLk=
-SIZE (faubackup-0.5.9.tar.gz) = 134982
+SHA256 (faubackup-v0.6.0.tar.gz) = 04c8Rx2hj0PRcKS3et/+E4jXKr+pJRKYlHNSFF257dQ=
+SIZE (faubackup-v0.6.0.tar.gz) = 135778
Index: patches/patch-faubackup_conf
===================================================================
RCS file: patches/patch-faubackup_conf
diff -N patches/patch-faubackup_conf
--- patches/patch-faubackup_conf 29 Dec 2008 19:51:09 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-faubackup_conf,v 1.1.1.1 2008/12/29 19:51:09 sturm Exp $
---- faubackup.conf.orig Sat Nov 29 13:13:59 2008
-+++ faubackup.conf Sat Nov 29 13:14:22 2008
-@@ -23,7 +23,7 @@ $keepdays = 7;
- #@ignore = qw( **.o **/cache **/Cache **/nobackup );
-
- # use this command for remote commands
--$rsh = "rsh";
-+$rsh = "ssh";
-
-
- # make perl happy
Index: patches/patch-src_faubackup-gather_c
===================================================================
RCS file: patches/patch-src_faubackup-gather_c
diff -N patches/patch-src_faubackup-gather_c
--- patches/patch-src_faubackup-gather_c 29 Dec 2008 19:51:09 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_faubackup-gather_c,v 1.1.1.1 2008/12/29 19:51:09 sturm Exp
$
---- src/faubackup-gather.c.orig Sun Dec 28 13:00:40 2008
-+++ src/faubackup-gather.c Sun Dec 28 13:02:58 2008
-@@ -56,8 +56,8 @@ send_buf(void *_buf, size_t len)
- while( len > 0 ) {
- ret = fwrite( buf, 1, len, stdout );
- if( ferror(stdout) ) {
-- fprintf( stderr, "%s: stdout fwrite %d bytes: %s\n",
-- progname, len, strerror(errno));
-+ fprintf( stderr, "%s: stdout fwrite %lu bytes: %s\n",
-+ progname, (unsigned long) len,
strerror(errno));
- exit(1);
- }
- buf += ret;
Index: patches/patch-src_faubackup-scatter_c
===================================================================
RCS file: patches/patch-src_faubackup-scatter_c
diff -N patches/patch-src_faubackup-scatter_c
--- patches/patch-src_faubackup-scatter_c 29 Dec 2008 19:51:09 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_faubackup-scatter_c,v 1.1.1.1 2008/12/29 19:51:09 sturm
Exp $
---- src/faubackup-scatter.c.orig Sun Dec 28 13:00:52 2008
-+++ src/faubackup-scatter.c Sun Dec 28 13:02:24 2008
-@@ -69,8 +69,8 @@ recv_buf(void *buf, size_t len, int mayfail)
- }
-
- if( len!=0 && ! mayfail ) {
-- fprintf(stderr, "%s: protocol error (%d bytes missing)\n",
-- progname, len);
-+ fprintf(stderr, "%s: protocol error (%lu bytes missing)\n",
-+ progname, (unsigned long) len);
- exit(1);
- }
-