Attachment #199825 for bug #233758




# $FreeBSD: head/sysutils/burp/Makefile 476181 2018-08-01 13:39:36Z tobik $

PORTNAME=	burp
PORTVERSION?=	2.1.32
PORTREVISION=	2
CATEGORIES=	sysutils

MAINTAINER=	phascolarctos@protonmail.ch
COMMENT=	Network backup and restore program

LICENSE=	AGPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
		${LOCALBASE}/include/yajl/yajl_common.h:devel/yajl
LIB_DEPENDS=	librsync.so:net/librsync2

USES=		autoreconf gmake libtool ncurses pkgconfig ssl

USE_GITHUB=	yes
USE_RC_SUBR=	burp

GH_ACCOUNT=	grke

USE_RC_SUBR=	burp
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}

PORTSCOUT=	limit:^1\.4\.

INSTALL_TARGET=	install-all
		--sysconfdir=${ETCDIR} \

OPTIONS_DEFINE=		IPV6
IPV6_CONFIGURE_ENABLE=	ipv6

CONFIG_FILES=	configs/server/burp.conf \
		configs/client/burp.conf \
		configs/certs/CA/CA.cnf

post-patch:
.for f in ${CONFIG_FILES}
	@${REINPLACE_CMD} -e 's,/etc/burp,${PREFIX}/etc/burp,g' ${WRKSRC}/${f}
	@${REINPLACE_CMD} -e 's,/usr/sbin,${PREFIX}/sbin,g' ${WRKSRC}/${f}
.endfor

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/bedup
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vss_strip
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/burp

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/usr/local/poudriere/ports/experimental/sysutils/burp/distinfo (-2 / +3 lines)
1	SHA256 (grke-burp-1.4.40_GH0.tar.gz) = 2e6a9a28453a11f3e36d0beefa185e72e7781a8718b55d3101144c9900752d6f	1	TIMESTAMP = 1543919893
2	SIZE (grke-burp-1.4.40_GH0.tar.gz) = 858049	2	SHA256 (grke-burp-2.1.32_GH0.tar.gz) = 1b2299670032eb5f0fc0783b7989b1cc6227d3d0758452a42b50d167b63d8d30
		3	SIZE (grke-burp-2.1.32_GH0.tar.gz) = 591737




server.c:546:25: error: ordered comparison between pointer and zero ('struct strlist **' and 'int')
                if(!ret && cconf->keep>0)
                           ~~~~~~~~~~~^~

--- src/server.c.orig	2018-08-01 13:34:56 UTC
+++ src/server.c
@@ -543,7 +543,7 @@ static int do_backup_server(const char *basedir, const
 			working, current, currentdata,
 			finishing, cconf, client,
 			p1cntr, cntr);
-		if(!ret && cconf->keep>0)
+		if(!ret && cconf->keep != NULL)
 			ret=remove_old_backups(basedir, cconf, client);
 	}
 

Lines 1-24 Link Here

(-)/usr/local/poudriere/ports/experimental/sysutils/burp/pkg-plist (-10 / +11 lines)
		1	bin/vss_strip
1	%%ETCDIR%%/CA.cnf	2	%%ETCDIR%%/CA.cnf
2	%%ETCDIR%%/autoupgrade/server/win32/script
3	%%ETCDIR%%/autoupgrade/server/win64/script
4	%%ETCDIR%%/burp-server.conf	3	%%ETCDIR%%/burp-server.conf
5	%%ETCDIR%%/burp.conf	4	%%ETCDIR%%/burp.conf
6	%%ETCDIR%%/clientconfdir/incexc/example	5	%%ETCDIR%%/clientconfdir/incexc/example
7	%%ETCDIR%%/clientconfdir/testclient	6	%%ETCDIR%%/clientconfdir/testclient
8	%%ETCDIR%%/notify_script
9	%%ETCDIR%%/ssl_extra_checks_script
10	%%ETCDIR%%/summary_script
11	%%ETCDIR%%/timer_script
12	man/man8/bedup.8.gz	7	man/man8/bedup.8.gz
		8	man/man8/bsigs.8.gz
		9	man/man8/bsparse.8.gz
13	man/man8/burp.8.gz	10	man/man8/burp.8.gz
14	man/man8/burp_ca.8.gz	11	man/man8/burp_ca.8.gz
15	man/man8/vss_strip.8.gz	12	man/man8/vss_strip.8.gz
16	sbin/bedup	13	sbin/bedup
		14	sbin/bsigs
		15	sbin/bsparse
17	sbin/burp	16	sbin/burp
18	sbin/burp_ca	17	sbin/burp_ca
19	sbin/vss_strip	18	%%DATADIR%%/scripts/notify_script
		19	%%DATADIR%%/scripts/ssl_extra_checks_script
		20	%%DATADIR%%/scripts/summary_script
		21	%%DATADIR%%/scripts/timer_script
20	@dir %%ETCDIR%%/CA-client	22	@dir %%ETCDIR%%/CA-client
21	@dir %%ETCDIR%%/autoupgrade/client	23	@dir %%ETCDIR%%/autoupgrade/server/win32
22	@dir %%ETCDIR%%/autoupgrade/server/win32/1.4.40	24	@dir %%ETCDIR%%/autoupgrade/server/win64/2.1.32
23	@dir %%ETCDIR%%/autoupgrade/server/win64/1.4.40
24	@dir /var/spool/burp	25	@dir /var/spool/burp

Return to bug 233758

Lines 2-49 Link Here

(-)/usr/local/poudriere/ports/experimental/sysutils/burp/Makefile (-27 / +10 lines)
2	# $FreeBSD: head/sysutils/burp/Makefile 476181 2018-08-01 13:39:36Z tobik $	2	# $FreeBSD: head/sysutils/burp/Makefile 476181 2018-08-01 13:39:36Z tobik $
3		3
4	PORTNAME= burp	4	PORTNAME= burp
5	PORTVERSION= 1.4.40	5	PORTVERSION?= 2.1.32
6	PORTREVISION= 2
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= phascolarctos@protonmail.ch
10	COMMENT= Network backup and restore program	9	COMMENT= Network backup and restore program
11		10
12	LICENSE= AGPLv3	11	LICENSE= AGPLv3
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
15	BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash	14	BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash \
		15	${LOCALBASE}/include/yajl/yajl_common.h:devel/yajl
16	LIB_DEPENDS= librsync.so:net/librsync2	16	LIB_DEPENDS= librsync.so:net/librsync2
17		17
18	OPTIONS_DEFINE= IPV6	18	USES= autoreconf gmake libtool ncurses pkgconfig ssl
19
20	USE_GITHUB= yes	19	USE_GITHUB= yes
		20	USE_RC_SUBR= burp
		21
21	GH_ACCOUNT= grke	22	GH_ACCOUNT= grke
22		23
23	USE_RC_SUBR= burp
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	USES= compiler:c++11-lib gmake localbase ncurses ssl	25	CONFIGURE_ARGS= --sysconfdir=${ETCDIR}
26
27	PORTSCOUT= limit:^1\.4\.
28		26
29	CONFIGURE_ARGS= --sbindir="${PREFIX}/sbin" \	27	INSTALL_TARGET= install-all
30	--sysconfdir=${ETCDIR} \
31		28
		29	OPTIONS_DEFINE= IPV6
32	IPV6_CONFIGURE_ENABLE= ipv6	30	IPV6_CONFIGURE_ENABLE= ipv6
33		31
34	CONFIG_FILES= configs/server/burp.conf \
35	configs/client/burp.conf \
36	configs/certs/CA/CA.cnf
37
38	post-patch:
39	.for f in ${CONFIG_FILES}
40	@${REINPLACE_CMD} -e 's,/etc/burp,${PREFIX}/etc/burp,g' ${WRKSRC}/${f}
41	@${REINPLACE_CMD} -e 's,/usr/sbin,${PREFIX}/sbin,g' ${WRKSRC}/${f}
42	.endfor
43
44	post-install:
45	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/bedup
46	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vss_strip
47	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/burp
48
49	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)/usr/local/poudriere/ports/experimental/sysutils/burp/files/patch-src_server.c (-15 lines)
1	server.c:546:25: error: ordered comparison between pointer and zero ('struct strlist **' and 'int')
2	if(!ret && cconf->keep>0)
3	~~~~~~~~~~~^~
4
5	--- src/server.c.orig 2018-08-01 13:34:56 UTC
6	+++ src/server.c
7	@@ -543,7 +543,7 @@ static int do_backup_server(const char *basedir, const
8	working, current, currentdata,
9	finishing, cconf, client,
10	p1cntr, cntr);
11	- if(!ret && cconf->keep>0)
12	+ if(!ret && cconf->keep != NULL)
13	ret=remove_old_backups(basedir, cconf, client);
14	}
15