diff --git a/net/rsync/Makefile b/net/rsync/Makefile index bff07ac4e14..f2b978f5c1e 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,13 +1,6 @@ COMMENT = mirroring/synchronization over low bandwidth links -DISTNAME = rsync-3.2.5 - -# distfile was rerolled under the same name; remove PKGNAME/DISTFILES -# when updating -PKGNAME = rsync-3.2.5pl0 -DISTFILES = rsync-3.2.5pl0{rsync-3.2.5}${EXTRACT_SUFX} -REVISION = 0 - +DISTNAME = rsync-3.2.7 CATEGORIES = net HOMEPAGE = https://rsync.samba.org/ diff --git a/net/rsync/distinfo b/net/rsync/distinfo index a4e728f758d..a2a224ceda7 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,2 +1,2 @@ -SHA256 (rsync-3.2.5pl0.tar.gz) = KsTSFjXN95GGe8N3w1ym3af1DZGaWL5FBX/VFgDGmro= -SIZE (rsync-3.2.5pl0.tar.gz) = 1129957 +SHA256 (rsync-3.2.7.tar.gz) = Tn2dP27RCHjFjF+3JKZ9rPS2qsc0CxPkiPstxBNG8rs= +SIZE (rsync-3.2.7.tar.gz) = 1149787 diff --git a/net/rsync/patches/patch-authenticate_c b/net/rsync/patches/patch-authenticate_c index 56908127adc..8a9d908c669 100644 --- a/net/rsync/patches/patch-authenticate_c +++ b/net/rsync/patches/patch-authenticate_c @@ -1,12 +1,12 @@ Index: authenticate.c --- authenticate.c.orig +++ authenticate.c -@@ -349,7 +349,7 @@ void auth_client(int fd, const char *user, const char +@@ -351,7 +351,7 @@ void auth_client(int fd, const char *user, const char char pass2[MAX_DIGEST_LEN*2]; if (!user || !*user) - user = "nobody"; + user = "_rsync"; + negotiate_daemon_auth(-1, 1); if (!(pass = getpassf(password_file)) - && !(pass = getenv("RSYNC_PASSWORD"))) { diff --git a/net/rsync/patches/patch-rsync_1_md b/net/rsync/patches/patch-rsync_1_md index 7635dfe889e..4ccac0d8881 100644 --- a/net/rsync/patches/patch-rsync_1_md +++ b/net/rsync/patches/patch-rsync_1_md @@ -1,7 +1,7 @@ Index: rsync.1.md --- rsync.1.md.orig +++ rsync.1.md -@@ -4628,7 +4628,7 @@ file is included or excluded. +@@ -4723,7 +4723,7 @@ file is included or excluded. The USER or LOGNAME environment variables are used to determine the default username sent to an rsync daemon. If neither is set, the username defaults diff --git a/net/rsync/patches/patch-rsyncd_conf_5_md b/net/rsync/patches/patch-rsyncd_conf_5_md index c98335a744d..aa587d6d3f7 100644 --- a/net/rsync/patches/patch-rsyncd_conf_5_md +++ b/net/rsync/patches/patch-rsyncd_conf_5_md @@ -1,7 +1,7 @@ Index: rsyncd.conf.5.md --- rsyncd.conf.5.md.orig +++ rsyncd.conf.5.md -@@ -474,7 +474,7 @@ the values of parameters. See the GLOBAL PARAMETERS s +@@ -502,7 +502,7 @@ the values of parameters. See the GLOBAL PARAMETERS s and from that module should take place as when the daemon was run as root. In combination with the "[gid](#)" parameter this determines what file permissions are available. The default when run by a super-user is to @@ -10,7 +10,7 @@ Index: rsyncd.conf.5.md to not try to change the user. See also the "[gid](#)" parameter. The RSYNC_USER_NAME environment variable may be used to request that rsync -@@ -492,7 +492,7 @@ the values of parameters. See the GLOBAL PARAMETERS s +@@ -520,7 +520,7 @@ the values of parameters. See the GLOBAL PARAMETERS s extra ones be set as supplemental groups. You may also specify a "`*`" as the first gid in the list, which will be replaced by all the normal groups for the transfer's user (see "[uid](#)"). The default when run by a super-user @@ -19,7 +19,7 @@ Index: rsyncd.conf.5.md 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). -@@ -1170,8 +1170,8 @@ A simple rsyncd.conf file that allow anonymous rsync t +@@ -1198,8 +1198,8 @@ A simple rsyncd.conf file that allow anonymous rsync t A more sophisticated example would be: > ```