svn commit: r410829 - in head/net/csync2: . files
Tijl Coosemans
tijl at FreeBSD.org
Fri Mar 11 13:33:37 UTC 2016
Author: tijl
Date: Fri Mar 11 13:33:35 2016
New Revision: 410829
URL: https://svnweb.freebsd.org/changeset/ports/410829
Log:
- Update net/csync2 to version 2.0.
- Prevent use of pdflatex when it's installed.
- Replace patch-csync2-compare with USES=shebangfix.
- Add a patch to fix use of strlcpy (pass size of destination instead of
source).
- Add a patch to let the compiler know csync_fatal does not return. This
fixes a warning about an uninitialised variable.
- Use predefined PKG_PREFIX in pkg-install and create directories from
pkg-plist.
PR: 207765
Approved by: alexey at renatasystems.org (maintainer)
Added:
head/net/csync2/files/patch-csync2.h (contents, props changed)
head/net/csync2/files/patch-rsync.c (contents, props changed)
head/net/csync2/pkg-plist (contents, props changed)
Deleted:
head/net/csync2/files/patch-Makefile.am
head/net/csync2/files/patch-Makefile.in
head/net/csync2/files/patch-configure
head/net/csync2/files/patch-csync2-compare
Modified:
head/net/csync2/Makefile
head/net/csync2/distinfo
head/net/csync2/files/pkg-install.in
Modified: head/net/csync2/Makefile
==============================================================================
--- head/net/csync2/Makefile Fri Mar 11 13:31:37 2016 (r410828)
+++ head/net/csync2/Makefile Fri Mar 11 13:33:35 2016 (r410829)
@@ -2,52 +2,44 @@
# $FreeBSD$
PORTNAME= csync2
-PORTVERSION= 1.34
-PORTREVISION= 20
+PORTVERSION= 2.0
CATEGORIES= net
-MASTER_SITES= http://oss.linbit.com/csync2/ \
- http://people.freebsd.org/~aaron/distfiles/
+MASTER_SITES= http://oss.linbit.com/csync2/
MAINTAINER= alexey at renatasystems.org
COMMENT= Cluster synchronization tool
-LIB_DEPENDS= librsync.so:${PORTSDIR}/net/librsync \
- libtasn1.so:${PORTSDIR}/security/libtasn1 \
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= librsync.so.2:${PORTSDIR}/net/librsync1 \
libgnutls.so:${PORTSDIR}/security/gnutls \
- libsqlite.so:${PORTSDIR}/databases/sqlite2 \
- libgcrypt.so:${PORTSDIR}/security/libgcrypt \
- libgpg-error.so:${PORTSDIR}/security/libgpg-error
+ libsqlite3.so:${PORTSDIR}/databases/sqlite3
-OPTIONS_DEFINE= CSYNC2_COMPARE
-CSYNC2_COMPARE_DESC= Install csync2-compare script
+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
+USES= pkgconfig shebangfix
+SHEBANG_FILES= csync2-compare
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
+CONFIGURE_ARGS= ac_cv_prog_PDFLATEX=
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+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#%%CSYNC2_COMPARE%%#${CSYNC2_COMPARE}#" ${WRKSRC}/Makefile.in
+ @${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>
Modified: head/net/csync2/distinfo
==============================================================================
--- head/net/csync2/distinfo Fri Mar 11 13:31:37 2016 (r410828)
+++ head/net/csync2/distinfo Fri Mar 11 13:33:35 2016 (r410829)
@@ -1,2 +1,2 @@
-SHA256 (csync2-1.34.tar.gz) = 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833
-SIZE (csync2-1.34.tar.gz) = 222765
+SHA256 (csync2-2.0.tar.gz) = 11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2
+SIZE (csync2-2.0.tar.gz) = 411013
Added: head/net/csync2/files/patch-csync2.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/csync2/files/patch-csync2.h Fri Mar 11 13:33:35 2016 (r410829)
@@ -0,0 +1,11 @@
+--- csync2.h.orig 2013-05-02 12:58:14 UTC
++++ csync2.h
+@@ -80,7 +80,7 @@ extern int csync_perm(const char *filena
+
+ extern void csync_printtime();
+ extern void csync_printtotaltime();
+-extern void csync_fatal(const char *fmt, ...);
++extern void csync_fatal(const char *fmt, ...) __dead2;
+ extern void csync_debug(int lv, const char *fmt, ...);
+
+ #define csync_debug_ping(N) \
Added: head/net/csync2/files/patch-rsync.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/csync2/files/patch-rsync.c Fri Mar 11 13:33:35 2016 (r410829)
@@ -0,0 +1,30 @@
+--- 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';
Modified: head/net/csync2/files/pkg-install.in
==============================================================================
--- head/net/csync2/files/pkg-install.in Fri Mar 11 13:31:37 2016 (r410828)
+++ head/net/csync2/files/pkg-install.in Fri Mar 11 13:33:35 2016 (r410829)
@@ -1,9 +1,5 @@
#!/bin/sh
-: ${PREFIX:="%%PREFIX%%"}
-: ${CSYNC2_DBDIR:="/var/db/csync2"}
-: ${CSYNC2_BACKUPDIR:="/var/backups/csync2"}
-
create_cert() {
_errlog=`mktemp /tmp/.${0##*/}.XXXXX`
@@ -11,12 +7,12 @@ create_cert() {
exec 3>&2 2>${_errlog}
- openssl genrsa -out ${PREFIX}/etc/csync2_ssl_key.pem 1024 || code=1
- yes '' | openssl req -new -key ${PREFIX}/etc/csync2_ssl_key.pem \
+ 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 ${PREFIX}/etc/csync2_ssl_key.pem \
- -out ${PREFIX}/etc/csync2_ssl_cert.pem || code=1
+ -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
@@ -33,8 +29,8 @@ create_cert() {
rm -f ${_errlog}
- chmod 600 ${PREFIX}/etc/csync2_ssl_key.pem \
- ${PREFIX}/etc/csync2_ssl_cert.pem
+ chmod 600 ${PKG_PREFIX}/etc/csync2_ssl_key.pem \
+ ${PKG_PREFIX}/etc/csync2_ssl_cert.pem
echo "csync2: RSA certificate-key pair installed."
@@ -49,11 +45,7 @@ post_install() {
[ -n "${PACKAGE_BUILDING}" ] && return 0
- for _dir in ${CSYNC2_DBDIR} ${CSYNC2_BACKUPDIR}; do
- [ ! -d ${_dir} ] && mkdir -p -m 700 ${_dir}
- done
-
- if [ ! -f ${PREFIX}/etc/csync2_ssl_cert.pem ]; then
+ if [ ! -f ${PKG_PREFIX}/etc/csync2_ssl_cert.pem ]; then
create_cert || return $?
fi
Added: head/net/csync2/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/csync2/pkg-plist Fri Mar 11 13:33:35 2016 (r410829)
@@ -0,0 +1,9 @@
+ at sample etc/csync2.cfg.sample
+man/man1/csync2.1.gz
+sbin/csync2
+%%CSYNC2_COMPARE%%sbin/csync2-compare
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+ at dir(,,700) /var/db/csync2
+ at dir(,,700) /var/backups/csync2
More information about the svn-ports-head
mailing list