Here is an update for net/rsync to 3.1.0. This has various minor improvements, internal changes, and now uses the system zlib. https://rsync.samba.org/ftp/rsync/src/rsync-3.1.0-NEWS
Needs testing! The port doesn't install the included helper/example scripts for running rsync over stunnel. This might be worth revisiting... by somebody who uses this stuff. I took the liberty to clean up some cruft: * Dropped the -T from --with-rsh. No tty allocation is the default for ssh, and if somebody for unfathomable reasons sets RequestTTY in .ssh/config, they should get what they want. * Removed pointless SECURITY file. * Replaced the bizarrely outdated DESCR text with the description from the man page. (rdist, seriously?) Index: Makefile =================================================================== RCS file: /cvs/ports/net/rsync/Makefile,v retrieving revision 1.71 diff -u -p -r1.71 Makefile --- Makefile 22 Apr 2013 16:00:11 -0000 1.71 +++ Makefile 3 Oct 2013 15:15:59 -0000 @@ -2,10 +2,9 @@ COMMENT = mirroring/synchronization over low bandwidth links -DISTNAME = rsync-3.0.9 +DISTNAME = rsync-3.1.0 CATEGORIES = net -HOMEPAGE = http://rsync.samba.org/ -REVISION = 3 +HOMEPAGE = https://rsync.samba.org/ MAINTAINER = Marc Espie <es...@openbsd.org> @@ -15,18 +14,16 @@ FLAVOR ?= # GPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c +WANTLIB = c z -MASTER_SITES = ftp://ftp.samba.org/pub/rsync/ \ - ftp://ftp.samba.org/pub/rsync/old-versions/ \ - http://ftp.samba.org/ftp/rsync/ \ - ftp://ftp.funet.fi/pub/mirrors/samba.org/pub/rsync/ +MASTER_SITES = https://rsync.samba.org/ftp/rsync/src/ \ + http://ftp.funet.fi/pub/mirrors/samba.org/pub/rsync/src/ -#SEPARATE_BUILD = Yes CONFIGURE_STYLE =gnu CONFIGURE_ARGS =--with-included-popt \ + --without-included-zlib \ --with-rsyncd-conf="${SYSCONFDIR}/rsyncd.conf" \ - --with-rsh="ssh -T" \ + --with-rsh=/usr/bin/ssh \ --with-nobody-group=_rsync .if ${FLAVOR:Miconv} @@ -41,12 +38,9 @@ pre-configure: ${SUBST_CMD} ${WRKSRC}/rsyncd.conf.5 \ ${WRKSRC}/support/rrsync -do-install: +post-install: ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_PROGRAM} ${WRKBUILD}/rsync ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/rsync.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/rsyncd.conf.5 ${PREFIX}/man/man5 ${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${DOCDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/support/rrsync ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${PREFIX}/bin .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/rsync/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- distinfo 18 Oct 2011 20:24:24 -0000 1.25 +++ distinfo 3 Oct 2013 15:15:59 -0000 @@ -1,5 +1,2 @@ -MD5 (rsync-3.0.9.tar.gz) = XuciZv4sGCIzPEB+F2G5Kw== -RMD160 (rsync-3.0.9.tar.gz) = 5e6NeG3vsNj5N8jQJ0ZvQYxjyX4= -SHA1 (rsync-3.0.9.tar.gz) = xkyDQZhK6mR1ButQRJaZn9lo3fw= -SHA256 (rsync-3.0.9.tar.gz) = MPEPjdVJDSgkDUJxu2UrHaemCyLtK5rigJBmjekkfAU= -SIZE (rsync-3.0.9.tar.gz) = 792725 +SHA256 (rsync-3.1.0.tar.gz) = gcoj93/JuVfrmEWmAk9Brw/wxhm384V2iHxj+jjiOU4= +SIZE (rsync-3.1.0.tar.gz) = 883901 Index: patches/patch-authenticate_c =================================================================== RCS file: /cvs/ports/net/rsync/patches/patch-authenticate_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-authenticate_c --- patches/patch-authenticate_c 18 Oct 2011 20:24:24 -0000 1.2 +++ patches/patch-authenticate_c 3 Oct 2013 15:15:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-authenticate_c,v 1.2 2011/10/18 20:24:24 naddy Exp $ ---- authenticate.c.orig Sat Sep 10 22:38:17 2011 -+++ authenticate.c Tue Oct 18 16:51:20 2011 -@@ -283,7 +283,7 @@ void auth_client(int fd, const char *user, const char +--- authenticate.c.orig Sun Jun 9 21:11:53 2013 ++++ authenticate.c Thu Oct 3 15:52:41 2013 +@@ -347,7 +347,7 @@ void auth_client(int fd, const char *user, const char char pass2[MAX_DIGEST_LEN*2]; if (!user || !*user) Index: patches/patch-configure_sh =================================================================== RCS file: /cvs/ports/net/rsync/patches/patch-configure_sh,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure_sh --- patches/patch-configure_sh 18 Oct 2011 20:24:24 -0000 1.2 +++ patches/patch-configure_sh 3 Oct 2013 15:15:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_sh,v 1.2 2011/10/18 20:24:24 naddy Exp $ ---- configure.sh.orig Fri Sep 23 18:41:30 2011 -+++ configure.sh Tue Oct 18 16:51:20 2011 -@@ -4218,7 +4218,7 @@ fi +--- configure.sh.orig Sun Sep 29 04:57:19 2013 ++++ configure.sh Thu Oct 3 15:52:41 2013 +@@ -4377,7 +4377,7 @@ fi cat >>confdefs.h <<_ACEOF Index: patches/patch-rsync_1 =================================================================== RCS file: /cvs/ports/net/rsync/patches/patch-rsync_1,v retrieving revision 1.2 diff -u -p -r1.2 patch-rsync_1 --- patches/patch-rsync_1 18 Oct 2011 20:24:24 -0000 1.2 +++ patches/patch-rsync_1 3 Oct 2013 15:15:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-rsync_1,v 1.2 2011/10/18 20:24:24 naddy Exp $ ---- rsync.1.orig Fri Sep 23 18:42:26 2011 -+++ rsync.1 Tue Oct 18 16:51:20 2011 -@@ -3495,7 +3495,7 @@ consult the remote shell\(cq\&s documentation. +--- rsync.1.orig Sun Sep 29 05:01:03 2013 ++++ rsync.1 Thu Oct 3 15:52:41 2013 +@@ -3868,7 +3868,7 @@ consult the remote shell\(cq\&s documentation. .IP "\fBUSER\fP or \fBLOGNAME\fP" The USER or LOGNAME environment variables are used to determine the default username sent to an rsync daemon. Index: patches/patch-rsyncd_conf_5 =================================================================== RCS file: /cvs/ports/net/rsync/patches/patch-rsyncd_conf_5,v retrieving revision 1.3 diff -u -p -r1.3 patch-rsyncd_conf_5 --- patches/patch-rsyncd_conf_5 18 Oct 2011 20:24:24 -0000 1.3 +++ patches/patch-rsyncd_conf_5 3 Oct 2013 15:15:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-rsyncd_conf_5,v 1.3 2011/10/18 20:24:24 naddy Exp $ ---- rsyncd.conf.5.orig Fri Sep 23 18:35:55 2011 -+++ rsyncd.conf.5 Tue Oct 18 16:51:20 2011 -@@ -67,12 +67,11 @@ When run via inetd you should add a line like this to +--- rsyncd.conf.5.orig Sun Sep 29 04:57:23 2013 ++++ rsyncd.conf.5 Thu Oct 3 16:20:15 2013 +@@ -68,12 +68,11 @@ When run via inetd you should add a line like this to and a single line something like this to /etc/inetd.conf: .PP .nf @@ -16,34 +16,34 @@ $OpenBSD: patch-rsyncd_conf_5,v 1.3 2011 reread its config file. .PP Note that you should \fBnot\fP send the rsync daemon a HUP signal to force -@@ -347,14 +346,13 @@ for modules to be listable. - This parameter specifies the user name or user ID that +@@ -395,7 +394,7 @@ This parameter specifies the user name or user ID that file transfers to and from that module should take place as when the daemon was run as root. In combination with the \(dq\&gid\(dq\& parameter this determines what --file permissions are available. The default is uid \-2, which is normally --the user \(dq\&nobody\(dq\&. -+file permissions are available. The default is \(dq\&_rsync\(dq\&. + file permissions are available. The default when run by a super\-user is to +-switch to the system\(cq\&s \(dq\&nobody\(dq\& user. The default for a non\-super\-user is to ++switch to the system\(cq\&s \(dq\&_rsync\(dq\& user. The default for a non\-super\-user is to + not try to change the user. See also the \(dq\&gid\(dq\& parameter. .IP - .IP "\fBgid\fP" - This parameter specifies the group name or group ID that - file transfers to and from that module should take place as when the daemon --was run as root. This complements the \(dq\&uid\(dq\& parameter. The default is gid \-2, --which is normally the group \(dq\&nobody\(dq\&. -+was run as root. This complements the \(dq\&uid\(dq\& parameter. The default is -+\(dq\&_rsync\(dq\&. - .IP - .IP "\fBfake super\fP" - Setting \(dq\&fake super = yes\(dq\& for a module causes the -@@ -466,7 +464,7 @@ limit the length of passwords that can be typed at the - you may find that passwords longer than 8 characters don\(cq\&t work. + The RSYNC_USER_NAME environment variable may be used to request that rsync run +@@ -414,7 +413,7 @@ used when accessing the module. The first one will be + any extra ones be set as supplemental groups. You may also specify a \(dq\&*\(dq\& as + the first gid in the list, which will be replaced by all the normal groups for + the transfer\(cq\&s user (see \(dq\&uid\(dq\&). The default when run by a super\-user is to +-switch to your OS\(cq\&s \(dq\&nobody\(dq\& (or perhaps \(dq\&nogroup\(dq\&) group with no other ++switch to the \(dq\&_rsync\(dq\& group with no other + supplementary groups. The default for a non\-super\-user is to not change any + group attributes (and indeed, your OS may not allow a non\-super\-user to try to + change their group settings). +@@ -574,7 +573,7 @@ require that you specify a group password if you do no + passwords. .IP There is no default for the \(dq\&secrets file\(dq\& parameter, you must choose a name -(such as \f(CW/etc/rsyncd.secrets\fP). The file must normally not be readable +(such as \f(CW${SYSCONFDIR}/rsyncd.secrets\fP). The file must normally not be readable - by \(dq\&other\(dq\&; see \(dq\&strict modes\(dq\&. + by \(dq\&other\(dq\&; see \(dq\&strict modes\(dq\&. If the file is not found or is rejected, no + logins for a \(dq\&user auth\(dq\& module will be possible. .IP - .IP "\fBstrict modes\fP" -@@ -764,8 +762,8 @@ A more sophisticated example would be: +@@ -975,8 +974,8 @@ A more sophisticated example would be: .PP .nf @@ -54,7 +54,7 @@ $OpenBSD: patch-rsyncd_conf_5,v 1.3 2011 use chroot = yes max connections = 4 syslog facility = local5 -@@ -791,12 +789,12 @@ pid file = /var/run/rsyncd.pid +@@ -1002,12 +1001,12 @@ pid file = /var/run/rsyncd.pid path = /data/cvs comment = CVS repository (requires authentication) auth users = tridge, susan @@ -69,7 +69,7 @@ $OpenBSD: patch-rsyncd_conf_5,v 1.3 2011 .PP .RS \f(CWtridge:mypass\fP -@@ -809,7 +807,7 @@ The /etc/rsyncd.secrets file would look something like +@@ -1020,7 +1019,7 @@ The /etc/rsyncd.secrets file would look something like .SH "FILES" .PP Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/net/rsync/pkg/DESCR,v retrieving revision 1.4 diff -u -p -r1.4 DESCR --- pkg/DESCR 3 Sep 2011 13:06:01 -0000 1.4 +++ pkg/DESCR 3 Oct 2013 15:15:59 -0000 @@ -1,14 +1,13 @@ -Rsync is a mirroring tool that uses a brilliant algorithm for figuring -out a small difference set between files and sending only the difference -over the link, typically using a very small bandwidth compared to e.g., -rdist. - -Rsync communicates over a lower-level protocol, such as rsh or ssh, -allowing for secure updating. - -On the down side, rsync is not quite as versatile as rdist when it comes to -mirroring only part of a hierarchy, though one can possibly use a perl -wrapper to obtain the same adaptability. +Rsync is a fast and extraordinarily versatile file copying tool. +It can copy locally, to/from another host over any remote shell, +or to/from a remote rsync daemon. It offers a large number of options +that control every aspect of its behavior and permit very flexible +specification of the set of files to be copied. It is famous for +its delta-transfer algorithm, which reduces the amount of data sent +over the network by sending only the differences between the source +files and the existing files in the destination. Rsync is widely +used for backups and mirroring and as an improved copy command for +everyday use. Flavor: iconv extra dependency, for people wanting to bring files from other OSes with Index: pkg/SECURITY =================================================================== RCS file: pkg/SECURITY diff -N pkg/SECURITY --- pkg/SECURITY 8 Apr 2004 06:26:57 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -$OpenBSD: SECURITY,v 1.6 2004/04/08 06:26:57 brad Exp $ - -The server makes extensive use of strlcpy/strlcat/snprintf. -- Christian "naddy" Weisgerber na...@mips.inka.de
