svn commit: r545504 - in branches/2020Q3/net/rsync: . files
Rodrigo Osorio
rodrigo at FreeBSD.org
Thu Aug 20 07:17:52 UTC 2020
Author: rodrigo
Date: Thu Aug 20 07:17:51 2020
New Revision: 545504
URL: https://svnweb.freebsd.org/changeset/ports/545504
Log:
MFH: r543580 r543582 r543637 r544331 r545124
net/rsync upgrade to 3.2.2
Major changes and bugfixes:
3.1.3 -> 3.2.0
* Avoid potential out-of-bounds read in daemon mode
* Fix defaul list list of skip-compress files for non-daemon transfers
* Fix xattr filter rules losing an 'x' attribute in a non-local transfer
* zlib fixes for CVE-2016-9843, CVE-2016-9842, CVE-2016-9841, and CVE-2016-9840
* Fixed a crash in the --iconv code
* Checksum enhancements, including the addition of xxhash
* The checksum preference order of the negotiation can be customized or forced
* Compression enhancements, including the addition of zstd and lz4 compression algorithms
* Added openssl & preliminary gnutls support to the rsync-ssl script
* Added the proxy protocol daemon parameter that allows your rsyncd to know the real remote
IP when it is setup behind a proxy
3.2.0 -> 3.2.1
* Fix potential issue with MD5 assembly-language code
* option --backup-dir=STR now implies --backup
3.2.1 -> 3.2.2
* Avoid a crash when a daemon module enables transfer logging without setting a log format value
Full release message: https://download.samba.org/pub/rsync/NEWS#3.2.2
Security: CVE-2016-9843 CVE-2016-9842 CVE-2016-9841 CVE-2016-9840
MFH after: 2 weeks
rsync: Unbreak fetch
rsync: Unbreak and fix depends
rsync now depends on stuff in LOCALBASE. Previously, clang only needed to know
about LOCALBASE if POPT or ICONV was enabled. When those options are off, xxhash
and zstd were not found by configure.
Also, a depend on libssl was missing, and there were some noop reinplaces.
With hat: portmgr
- Fix fetch
- Fix license and add LICENSE_FILE
- Add missing dependency on liblz4
- Whitespace fixes
- Switch to options helpers
Approved by: portmgr blanket
net/rsync upgrade to 3.2.3
major changes:
- Fix multiple bugs in xattr code.
- Restored the ability to use --bwlimit=0 to specify no bandwidth limit.
- Fix a bug when combining --delete-missing-args with --no-implied-dirs & -R where rsync might create the destination path of a missing arg.
- Fixed an issue where hard-linked devices could cause the rdev_major value to get out of sync between the sender and the receiver.
- Rsync now complains about a missing --temp-dir before starting any file transfers.
- A completely empty source arg is now a fatal error.
See full changelog: https://download.samba.org/pub/rsync/NEWS#3.2.3
Also, fix build issue with ACL option (patch is not required anymore)
PR: 248318 247795
Approved by: ports-secteam (joenum)
Deleted:
branches/2020Q3/net/rsync/files/extrapatch-acl
branches/2020Q3/net/rsync/files/patch-siginfo
Modified:
branches/2020Q3/net/rsync/Makefile
branches/2020Q3/net/rsync/distinfo
branches/2020Q3/net/rsync/pkg-plist
Directory Properties:
branches/2020Q3/ (props changed)
Modified: branches/2020Q3/net/rsync/Makefile
==============================================================================
--- branches/2020Q3/net/rsync/Makefile Thu Aug 20 06:17:49 2020 (r545503)
+++ branches/2020Q3/net/rsync/Makefile Thu Aug 20 07:17:51 2020 (r545504)
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= rsync
-DISTVERSION= 3.1.3
-PORTREVISION= 1
+DISTVERSION= 3.2.3
CATEGORIES= net
MASTER_SITES= https://rsync.samba.org/ftp/rsync/ \
+ https://rsync.samba.org/ftp/rsync/src/ \
https://www.mirrorservice.org/sites/rsync.samba.org/ \
http://rsync.samba.org/ftp/rsync/ \
ftp://ftp.fu-berlin.de/pub/unix/network/rsync/ \
@@ -15,9 +15,14 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= rodrigo at FreeBSD.org
COMMENT= Network file distribution/synchronization utility
-LICENSE= GPLv3
+LICENSE= GPLv3+
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe shebangfix
+LIB_DEPENDS= libxxhash.so:devel/xxhash \
+ libzstd.so:archivers/zstd \
+ liblz4.so:archivers/liblz4
+
+USES= cpe shebangfix ssl
SHEBANG_FILES= support/rrsync
CPE_VENDOR= samba
@@ -33,8 +38,10 @@ TEST_TARGET= check
CONFIGURE_ARGS= --disable-debug --enable-ipv6 \
--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-PORTDOCS= NEWS README csprotocol.txt tech_report.tex
+PORTDOCS= NEWS.md README.md csprotocol.txt tech_report.tex
# define options
OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV
@@ -55,7 +62,7 @@ ATIMES_DESC= Preserve access times, adds --atimes (BRO
ACL_DESC= Add backward-compatibility for the --acls option
# define default options
-OPTIONS_DEFAULT=FLAGS ICONV SSH
+OPTIONS_DEFAULT=FLAGS ICONV SSH ZLIB_BASE
ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no
TIMELIMIT_EXTRA_PATCHES= ${WRKSRC}/patches/time-limit.diff
@@ -63,32 +70,27 @@ ATIMES_EXTRA_PATCHES= ${WRKSRC}/patches/atimes.diff
FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \
${FILESDIR}/extrapatch-main.c
RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff
-ACL_EXTRA_PATCHES= ${WRKSRC}/patches/acls.diff \
- ${FILESDIR}/extrapatch-acl
+ACL_EXTRA_PATCHES= ${WRKSRC}/patches/acls.diff
ICONV_USES= iconv:translit
-ICONV_CPPFLAGS= -I${LOCALBASE}/include
-ICONV_LDFLAGS= -L${LOCALBASE}/lib
ICONV_CONFIGURE_ENABLE= iconv iconv-open
POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt
-POPT_PORT_CPPFLAGS= -I${LOCALBASE}/include
-POPT_PORT_LDFLAGS= -L${LOCALBASE}/lib
POPT_PORT_CONFIGURE_OFF= --with-included-popt
SSH_CONFIGURE_ON= --with-rsh=ssh
SSH_CONFIGURE_OFF= --with-rsh=rsh
-ACL_DISTFILES= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
-ATIMES_DISTFILES= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
-FLAGS_DISTFILES= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
-ICONV_DISTFILES= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
-RENAMED_DISTFILES= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
-TIMELIMIT_DISTFILES= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
+ACL_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+ATIMES_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+TIMELIMIT_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
.if make(makesum)
-DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
.endif
.include <bsd.port.pre.mk>
@@ -98,16 +100,17 @@ CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|perl.*|${DO_NADA}|' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g' \
- ${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
+ @${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g' \
+ ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
@${REINPLACE_CMD} -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' ${WRKSRC}/support/rrsync
post-install:
@${MKDIR} ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
+ ${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin
.include <bsd.port.post.mk>
Modified: branches/2020Q3/net/rsync/distinfo
==============================================================================
--- branches/2020Q3/net/rsync/distinfo Thu Aug 20 06:17:49 2020 (r545503)
+++ branches/2020Q3/net/rsync/distinfo Thu Aug 20 07:17:51 2020 (r545504)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1518368927
-SHA256 (rsync-3.1.3.tar.gz) = 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
-SIZE (rsync-3.1.3.tar.gz) = 905908
-SHA256 (rsync-patches-3.1.3.tar.gz) = 0dc2848f20ca75c07a30c3237ccf8d61b61082ae7de94758a27dac350c99fb98
-SIZE (rsync-patches-3.1.3.tar.gz) = 174524
+TIMESTAMP = 1597589726
+SHA256 (rsync-3.2.3.tar.gz) = becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e
+SIZE (rsync-3.2.3.tar.gz) = 1069784
+SHA256 (rsync-patches-3.2.3.tar.gz) = de6645b46967bd701b7d6f3e29cccb19d2b46a6fa2d26a9db165847dca0e42f2
+SIZE (rsync-patches-3.2.3.tar.gz) = 157092
Modified: branches/2020Q3/net/rsync/pkg-plist
==============================================================================
--- branches/2020Q3/net/rsync/pkg-plist Thu Aug 20 06:17:49 2020 (r545503)
+++ branches/2020Q3/net/rsync/pkg-plist Thu Aug 20 07:17:51 2020 (r545504)
@@ -1,5 +1,7 @@
bin/rsync
+bin/rsync-ssl
sbin/rrsync
man/man1/rsync.1.gz
+man/man1/rsync-ssl.1.gz
man/man5/rsyncd.conf.5.gz
@sample %%ETCDIR%%/rsyncd.conf.sample
More information about the svn-ports-all
mailing list