cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/rdiff-backup-devel: Fix build, change dependency to librsync1

Browse Source 
- 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 <w.schwarzenfeld@utanet.at>
This commit is contained in:
Kurt Jaeger 2016-06-13 19:05:31 +00:00
parent 18a37112d1
commit 4070b24b51
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=416858
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/rdiff-backup-devel/Makefile
View File

@ -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]*

15
sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c Normal file
View File

@ -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;
}