From 4070b24b51bb8190936af1f518e64e33f55f9db2 Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Mon, 13 Jun 2016 19:05:31 +0000 Subject: [PATCH] sysutils/rdiff-backup-devel: Fix build, change dependency to librsync1 - rdiff-backup-devel fails with: _librsyncmodule.c:63:17: error: use of undeclared identifier 'RS_DEFAULT_STRONG_LEN' - found working patch here: http://pkgs.fedoraproject.org/cgit/rpms/rdiff-backup.git/tree/rdiff-backup-1.2.8-librsync-1.0.0.patch - change dependency to librsync1 PR: 210239 Submitted by: Walter Schwarzenfeld --- sysutils/rdiff-backup-devel/Makefile | 4 ++-- .../files/patch-librsyncmodule.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile index d4dadf0fa313..0a75bf4788fc 100644 --- a/sysutils/rdiff-backup-devel/Makefile +++ b/sysutils/rdiff-backup-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= rdiff-backup PORTVERSION= 1.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SAVANNAH \ LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX} @@ -15,7 +15,7 @@ COMMENT= Local/remote mirroring+incremental backup LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= librsync.so:net/librsync +LIB_DEPENDS= librsync.so:net/librsync1 CONFLICTS= rdiff-backup-[0-9]* diff --git a/sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c b/sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c new file mode 100644 index 000000000000..0cfdea09b65f --- /dev/null +++ b/sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c @@ -0,0 +1,15 @@ +--- _librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100 ++++ _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; + }