Attachment #167792 for bug #207765

View | Details | Raw Unified | Return to bug 207765
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	csync2
PORTVERSION=	2.0
PORTREVISION=	20
CATEGORIES=	net
MASTER_SITES=	http://oss.linbit.com/csync2/
		http://people.freebsd.org/~aaron/distfiles/

MAINTAINER=	alexey@renatasystems.org
COMMENT=	Cluster synchronization tool

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	librsync.so.2:${PORTSDIR}/net/librsync1 \
		libgnutls.so:${PORTSDIR}/security/gnutls \
		libsqlite3.so:${PORTSDIR}/databases/sqlite3
		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
		libgpg-error.so:${PORTSDIR}/security/libgpg-error

OPTIONS_DEFINE=	CSYNC2_COMPARE DOCS
OPTIONS_SUB=	yes
CSYNC2_COMPARE_DESC=		Install csync2-compare script
CSYNC2_COMPARE_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash

USES=		pkgconfig shebangfix
SHEBANG_FILES=	csync2-compare

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	ac_cv_prog_PDFLATEX=
CONFIGURE_ENV=	LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib

USE_RC_SUBR=	csync2

PLIST_FILES=	etc/csync2.cfg-dist \
		sbin/csync2 \
		man/man1/csync2.1.gz

SUB_FILES=	pkg-install

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MCSYNC2_COMPARE}
RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
PLIST_FILES+=	sbin/csync2-compare
CSYNC2_COMPARE=	csync2-compare
.else
CSYNC2_COMPARE=
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|(localstatedir)/lib|(localstatedir)/db|' \
		-e 's/-ldl//' ${WRKSRC}/Makefile.in

post-install:
	${MV} ${STAGEDIR}${PREFIX}/etc/csync2.cfg \
		${STAGEDIR}${PREFIX}/etc/csync2.cfg.sample
	${MKDIR} ${STAGEDIR}/var/backups/csync2

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net/csync2/distinfo (-2 / +2 lines)
1	SHA256 (csync2-1.34.tar.gz) = 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833	1	SHA256 (csync2-2.0.tar.gz) = 11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2
2	SIZE (csync2-1.34.tar.gz) = 222765	2	SIZE (csync2-2.0.tar.gz) = 411013




--- ./Makefile.am.orig	2007-07-24 14:04:18.000000000 -0700
+++ ./Makefile.am	2008-01-17 02:39:33.790652051 -0800
@@ -48,14 +48,14 @@
   LIBS += -lprivatesqlite
 endif
 
-AM_CPPFLAGS  = -D'DBDIR="$(localstatedir)/lib/csync2"'
+AM_CPPFLAGS  = -D'DBDIR="$(localstatedir)/db/csync2"'
 AM_CPPFLAGS += -D'ETCDIR="$(sysconfdir)"'
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/csync2
+	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/csync2
 	test -e $(DESTDIR)$(sysconfdir)/csync2.cfg || \
-		$(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg
+		$(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg-dist
 
 cert:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)




--- Makefile.in.orig	2007-07-24 21:04:25.000000000 +0000
+++ Makefile.in	2010-05-20 10:51:32.000000000 +0000
@@ -150,7 +150,7 @@
 target_alias = @target_alias@
 
 sbin_PROGRAMS = csync2
-sbin_SCRIPTS = csync2-compare
+sbin_SCRIPTS = %%CSYNC2_COMPARE%%
 man_MANS = csync2.1
 
 csync2_SOURCES = action.c cfgfile_parser.y cfgfile_scanner.l check.c	\
@@ -168,7 +168,7 @@
 AM_CFLAGS = $(am__append_2) $(am__append_6)
 AM_LDFLAGS = $(am__append_3) $(am__append_7)
 
-AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/lib/csync2"' -D'ETCDIR="$(sysconfdir)"'
+AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/db/csync2"' -D'ETCDIR="$(sysconfdir)"'
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -699,9 +699,9 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/csync2
+	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/csync2
 	test -e $(DESTDIR)$(sysconfdir)/csync2.cfg || \
-		$(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg
+		$(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg-dist
 
 cert:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-11 Link Here

(-)net/csync2/files/patch-configure (-11 lines)
1	--- configure.org 2009-09-03 14:22:32.000000000 +0900
2	+++ configure 2009-09-03 14:23:02.000000000 +0900
3	@@ -3836,7 +3836,7 @@
4	else
5	LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
6	LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
7	- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
8	+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
9
10
11	ac_save_CFLAGS="$CFLAGS"

Lines 1-8 Link Here

(-)net/csync2/files/patch-csync2-compare (-8 lines)
1	--- csync2-compare.orig 2010-05-20 10:55:31.000000000 +0000
2	+++ csync2-compare 2010-05-20 10:55:50.000000000 +0000
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	verbose=0
8

Line 0 Link Here

(-)net/csync2/files/patch-csync2.h (+11 lines)
	1	--- csync2.h.orig 2013-05-02 12:58:14 UTC
	2	+++ csync2.h
	3	@@ -80,7 +80,7 @@ extern int csync_perm(const char *filena
	4
	5	extern void csync_printtime();
	6	extern void csync_printtotaltime();
	7	-extern void csync_fatal(const char *fmt, ...);
	8	+extern void csync_fatal(const char *fmt, ...) __dead2;
	9	extern void csync_debug(int lv, const char *fmt, ...);
	10
	11	#define csync_debug_ping(N) \




--- rsync.c.orig	2015-03-09 14:08:51 UTC
+++ rsync.c
@@ -41,6 +41,7 @@
 
 /* This has been taken from rsync:lib/compat.c */
 
+#if 0
 /**
  * Like strncpy but does not 0 fill the buffer and always null
  * terminates.
@@ -61,6 +62,7 @@ static size_t strlcpy(char *d, const cha
         }
         return ret;
 }
+#endif
 
 /* splits filepath at the last '/', if any, like so:
  *	dirname		basename	filepath
@@ -117,7 +119,10 @@ int mkpath(const char *path, mode_t mode
 		return -1;
 	}
 
-	strlcpy(temp,path,strlen(path));
+	if(strlcpy(temp,path,sizeof(temp))>=sizeof(temp)) {
+		csync_debug(1,"path too long: %s",path);
+		return -1;
+	}
 	csync_debug(1,"mkpath full path: %s",temp);
 	for( remaining=strchr(temp+1, '/'); remaining!=NULL; remaining=strchr(remaining+1, '/') ){
 		*remaining='\0';




#!/bin/sh

: ${PREFIX:="%%PREFIX%%"}
: ${CSYNC2_DBDIR:="/var/db/csync2"}
: ${CSYNC2_BACKUPDIR:="/var/backups/csync2"}

create_cert() {

	_errlog=`mktemp /tmp/.${0##*/}.XXXXX`


	exec 3>&2 2>${_errlog}

	openssl genrsa -out ${PKG_PREFIX}/etc/csync2_ssl_key.pem 1024 || code=1
	yes '' | openssl req -new -key ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
		-out /tmp/csync2_ssl_cert.csr || code=1
	openssl x509 -req -days 600 -in /tmp/csync2_ssl_cert.csr \
		-signkey ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
		-out ${PKG_PREFIX}/etc/csync2_ssl_cert.pem || code=1

	rm -f /tmp/csync2_ssl_cert.csr



	rm -f ${_errlog}

	chmod 600 ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
		${PKG_PREFIX}/etc/csync2_ssl_cert.pem

	echo "csync2: RSA certificate-key pair installed."



	[ -n "${PACKAGE_BUILDING}" ] && return 0

	if [ ! -f ${PKG_PREFIX}/etc/csync2_ssl_cert.pem ]; then
		[ ! -d ${_dir} ] && mkdir -p -m 700 ${_dir}
	done

	if [ ! -f ${PREFIX}/etc/csync2_ssl_cert.pem ]; then
		create_cert || return $?
	fi


Line 0 Link Here

(-)net/csync2/pkg-plist (+9 lines)
	1	@sample etc/csync2.cfg.sample
	2	man/man1/csync2.1.gz
	3	sbin/csync2
	4	%%CSYNC2_COMPARE%%sbin/csync2-compare
	5	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
	6	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
	7	%%PORTDOCS%%%%DOCSDIR%%/README
	8	@dir(,,700) /var/db/csync2
	9	@dir(,,700) /var/backups/csync2

Return to bug 207765

Lines 2-53 Link Here

(-)net/csync2/Makefile (-30 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= csync2	4	PORTNAME= csync2
5	PORTVERSION= 1.34	5	PORTVERSION= 2.0
6	PORTREVISION= 20
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://oss.linbit.com/csync2/ \	7	MASTER_SITES= http://oss.linbit.com/csync2/
9	http://people.freebsd.org/~aaron/distfiles/
10		8
11	MAINTAINER= alexey@renatasystems.org	9	MAINTAINER= alexey@renatasystems.org
12	COMMENT= Cluster synchronization tool	10	COMMENT= Cluster synchronization tool
13		11
14	LIB_DEPENDS= librsync.so:${PORTSDIR}/net/librsync \	12	LICENSE= GPLv2
15	libtasn1.so:${PORTSDIR}/security/libtasn1 \	13	LICENSE_FILE= ${WRKSRC}/COPYING
		14
		15	LIB_DEPENDS= librsync.so.2:${PORTSDIR}/net/librsync1 \
16	libgnutls.so:${PORTSDIR}/security/gnutls \	16	libgnutls.so:${PORTSDIR}/security/gnutls \
17	libsqlite.so:${PORTSDIR}/databases/sqlite2 \	17	libsqlite3.so:${PORTSDIR}/databases/sqlite3
18	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
19	libgpg-error.so:${PORTSDIR}/security/libgpg-error
20		18
21	OPTIONS_DEFINE= CSYNC2_COMPARE	19	OPTIONS_DEFINE= CSYNC2_COMPARE DOCS
22	CSYNC2_COMPARE_DESC= Install csync2-compare script	20	OPTIONS_SUB= yes
		21	CSYNC2_COMPARE_DESC= Install csync2-compare script
		22	CSYNC2_COMPARE_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
23		23
24	USES= pkgconfig	24	USES= pkgconfig shebangfix
		25	SHEBANG_FILES= csync2-compare
25		26
26	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc	28	CONFIGURE_ARGS= ac_cv_prog_PDFLATEX=
28	CONFIGURE_ENV= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
29	CPPFLAGS+= -I${LOCALBASE}/include	29	CPPFLAGS+= -I${LOCALBASE}/include
30	LDFLAGS+= -L${LOCALBASE}/lib	30	LIBS+= -L${LOCALBASE}/lib
31		31
32	USE_RC_SUBR= csync2	32	USE_RC_SUBR= csync2
33		33
34	PLIST_FILES= etc/csync2.cfg-dist \
35	sbin/csync2 \
36	man/man1/csync2.1.gz
37
38	SUB_FILES= pkg-install	34	SUB_FILES= pkg-install
39		35
40	.include <bsd.port.options.mk>
41
42	.if ${PORT_OPTIONS:MCSYNC2_COMPARE}
43	RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
44	PLIST_FILES+= sbin/csync2-compare
45	CSYNC2_COMPARE= csync2-compare
46	.else
47	CSYNC2_COMPARE=
48	.endif
49
50	post-patch:	36	post-patch:
51	${REINPLACE_CMD} -E "s#%%CSYNC2_COMPARE%%#${CSYNC2_COMPARE}#" ${WRKSRC}/Makefile.in	37	@${REINPLACE_CMD} -e 's\|(localstatedir)/lib\|(localstatedir)/db\|' \
		38	-e 's/-ldl//' ${WRKSRC}/Makefile.in
		39
		40	post-install:
		41	${MV} ${STAGEDIR}${PREFIX}/etc/csync2.cfg \
		42	${STAGEDIR}${PREFIX}/etc/csync2.cfg.sample
		43	${MKDIR} ${STAGEDIR}/var/backups/csync2
52		44
53	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)net/csync2/files/patch-Makefile.am (-20 lines)
1	--- ./Makefile.am.orig 2007-07-24 14:04:18.000000000 -0700
2	+++ ./Makefile.am 2008-01-17 02:39:33.790652051 -0800
3	@@ -48,14 +48,14 @@
4	LIBS += -lprivatesqlite
5	endif
6
7	-AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/lib/csync2"'
8	+AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/db/csync2"'
9	AM_CPPFLAGS += -D'ETCDIR="$(sysconfdir)"'
10
11	install-data-local:
12	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
13	- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/csync2
14	+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/csync2
15	test -e $(DESTDIR)$(sysconfdir)/csync2.cfg \|\| \
16	- $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg
17	+ $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg-dist
18
19	cert:
20	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-32 Link Here

(-)net/csync2/files/patch-Makefile.in (-32 lines)
1	--- Makefile.in.orig 2007-07-24 21:04:25.000000000 +0000
2	+++ Makefile.in 2010-05-20 10:51:32.000000000 +0000
3	@@ -150,7 +150,7 @@
4	target_alias = @target_alias@
5
6	sbin_PROGRAMS = csync2
7	-sbin_SCRIPTS = csync2-compare
8	+sbin_SCRIPTS = %%CSYNC2_COMPARE%%
9	man_MANS = csync2.1
10
11	csync2_SOURCES = action.c cfgfile_parser.y cfgfile_scanner.l check.c \
12	@@ -168,7 +168,7 @@
13	AM_CFLAGS = $(am__append_2) $(am__append_6)
14	AM_LDFLAGS = $(am__append_3) $(am__append_7)
15
16	-AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/lib/csync2"' -D'ETCDIR="$(sysconfdir)"'
17	+AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/db/csync2"' -D'ETCDIR="$(sysconfdir)"'
18	subdir = .
19	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
20	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
21	@@ -699,9 +699,9 @@
22
23	install-data-local:
24	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
25	- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/csync2
26	+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/csync2
27	test -e $(DESTDIR)$(sysconfdir)/csync2.cfg \|\| \
28	- $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg
29	+ $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg-dist
30
31	cert:
32	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Line 0 Link Here

(-)net/csync2/files/patch-rsync.c (+30 lines)
	1	--- rsync.c.orig 2015-03-09 14:08:51 UTC
	2	+++ rsync.c
	3	@@ -41,6 +41,7 @@
	4
	5	/* This has been taken from rsync:lib/compat.c */
	6
	7	+#if 0
	8	/**
	9	* Like strncpy but does not 0 fill the buffer and always null
	10	* terminates.
	11	@@ -61,6 +62,7 @@ static size_t strlcpy(char *d, const cha
	12	}
	13	return ret;
	14	}
	15	+#endif
	16
	17	/* splits filepath at the last '/', if any, like so:
	18	* dirname basename filepath
	19	@@ -117,7 +119,10 @@ int mkpath(const char *path, mode_t mode
	20	return -1;
	21	}
	22
	23	- strlcpy(temp,path,strlen(path));
	24	+ if(strlcpy(temp,path,sizeof(temp))>=sizeof(temp)) {
	25	+ csync_debug(1,"path too long: %s",path);
	26	+ return -1;
	27	+ }
	28	csync_debug(1,"mkpath full path: %s",temp);
	29	for( remaining=strchr(temp+1, '/'); remaining!=NULL; remaining=strchr(remaining+1, '/') ){
	30	*remaining='\0';

Lines 1-9 Link Here

(-)net/csync2/files/pkg-install.in (-15 / +7 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	: ${PREFIX:="%%PREFIX%%"}
4	: ${CSYNC2_DBDIR:="/var/db/csync2"}
5	: ${CSYNC2_BACKUPDIR:="/var/backups/csync2"}
6
7	create_cert() {	3	create_cert() {
8		4
9	_errlog=`mktemp /tmp/.${0##*/}.XXXXX`	5	_errlog=`mktemp /tmp/.${0##*/}.XXXXX`
Lines 11-22 create_cert() { Link Here
11		7
12	exec 3>&2 2>${_errlog}	8	exec 3>&2 2>${_errlog}
13		9
14	openssl genrsa -out ${PREFIX}/etc/csync2_ssl_key.pem 1024 \|\| code=1	10	openssl genrsa -out ${PKG_PREFIX}/etc/csync2_ssl_key.pem 1024 \|\| code=1
15	yes '' \| openssl req -new -key ${PREFIX}/etc/csync2_ssl_key.pem \	11	yes '' \| openssl req -new -key ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
16	-out /tmp/csync2_ssl_cert.csr \|\| code=1	12	-out /tmp/csync2_ssl_cert.csr \|\| code=1
17	openssl x509 -req -days 600 -in /tmp/csync2_ssl_cert.csr \	13	openssl x509 -req -days 600 -in /tmp/csync2_ssl_cert.csr \
18	-signkey ${PREFIX}/etc/csync2_ssl_key.pem \	14	-signkey ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
19	-out ${PREFIX}/etc/csync2_ssl_cert.pem \|\| code=1	15	-out ${PKG_PREFIX}/etc/csync2_ssl_cert.pem \|\| code=1
20		16
21	rm -f /tmp/csync2_ssl_cert.csr	17	rm -f /tmp/csync2_ssl_cert.csr
22		18
Lines 33-40 create_cert() { Link Here
33		29
34	rm -f ${_errlog}	30	rm -f ${_errlog}
35		31
36	chmod 600 ${PREFIX}/etc/csync2_ssl_key.pem \	32	chmod 600 ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
37	${PREFIX}/etc/csync2_ssl_cert.pem	33	${PKG_PREFIX}/etc/csync2_ssl_cert.pem
38		34
39	echo "csync2: RSA certificate-key pair installed."	35	echo "csync2: RSA certificate-key pair installed."
40		36
Lines 49-59 post_install() { Link Here
49		45
50	[ -n "${PACKAGE_BUILDING}" ] && return 0	46	[ -n "${PACKAGE_BUILDING}" ] && return 0
51		47
52	for _dir in ${CSYNC2_DBDIR} ${CSYNC2_BACKUPDIR}; do	48	if [ ! -f ${PKG_PREFIX}/etc/csync2_ssl_cert.pem ]; then
53	[ ! -d ${_dir} ] && mkdir -p -m 700 ${_dir}
54	done
55
56	if [ ! -f ${PREFIX}/etc/csync2_ssl_cert.pem ]; then
57	create_cert \|\| return $?	49	create_cert \|\| return $?
58	fi	50	fi
59		51