From: Christian Weisgerber Subject: net/rsync: do not rebuild man pages To: ports@openbsd.org Date: Wed, 14 Aug 2024 00:22:48 +0200 net/rsync: do not rebuild man pages Install the included man pages and do not regenerate them. This allows us to drop the python dependency. OK? diff 8c15eaec588f6f7cde3a81386e62eb921668bbb3 06aaf755253b4ffc2e0355956f004c447397c9d3 commit - 8c15eaec588f6f7cde3a81386e62eb921668bbb3 commit + 06aaf755253b4ffc2e0355956f004c447397c9d3 blob - c6780b1b5fb538a319cc8c099b610f05151bd53f blob + 5db147daaa97639a0a1fee92caf83f846624e81f --- net/rsync/Makefile +++ net/rsync/Makefile @@ -3,7 +3,7 @@ COMMENT = mirroring/synchronization over low bandwidth DISTNAME = rsync-3.3.0 CATEGORIES = net HOMEPAGE = https://rsync.samba.org/ -REVISION = 1 +REVISION = 2 FLAVORS = minimal FLAVOR ?= @@ -16,16 +16,11 @@ WANTLIB = c crypto SITES = https://rsync.samba.org/ftp/rsync/src/ \ https://ftp.funet.fi/pub/mirrors/samba.org/pub/rsync/src/ -MODULES = lang/python +BUILD_DEPENDS = sysutils/xxhash -MODPY_RUNDEP = No - -BUILD_DEPENDS = textproc/py-commonmark${MODPY_FLAVOR} \ - sysutils/xxhash - -SEPARATE_BUILD =Yes CONFIGURE_STYLE =gnu -CONFIGURE_ARGS =--disable-lz4 \ +CONFIGURE_ARGS =--disable-md2man \ + --disable-lz4 \ --disable-zstd \ --with-included-popt \ --with-included-zlib \ blob - 019c9562c74f1eec0bc19ebc26e7d9e38264834f (mode 644) blob + /dev/null --- net/rsync/patches/patch-rsync_1_md +++ /dev/null @@ -1,12 +0,0 @@ -Index: rsync.1.md ---- rsync.1.md.orig -+++ rsync.1.md -@@ -4726,7 +4726,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 -- to "nobody". If both are set, `USER` takes precedence. -+ to "_rsync". If both are set, `USER` takes precedence. - - 0. `RSYNC_PARTIAL_DIR` - blob - /dev/null blob + c29b24f9a7156c8db57254fba51aed5edc9db8a6 (mode 644) --- /dev/null +++ net/rsync/patches/patch-rsync_1 @@ -0,0 +1,12 @@ +Index: rsync.1 +--- rsync.1.orig ++++ rsync.1 +@@ -4949,7 +4949,7 @@ does \fBnot\fP supply a password to a remote shell tra + .IP "\fBUSER\fP or \fBLOGNAME\fP" + 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 +-to "nobody". If both are set, \fBUSER\fP takes precedence. ++to "_rsync". If both are set, \fBUSER\fP takes precedence. + .IP "\fBRSYNC_PARTIAL_DIR\fP" + This environment variable specifies the directory to use for a + \fB\-\-partial\fP transfer without implying that partial transfers be blob - 0ec50ebee3ef34ffb70b6ef2619bdbe1766c1312 (mode 644) blob + /dev/null --- net/rsync/patches/patch-rsyncd_conf_5_md +++ /dev/null @@ -1,32 +0,0 @@ -Index: rsyncd.conf.5.md ---- rsyncd.conf.5.md.orig -+++ rsyncd.conf.5.md -@@ -506,7 +506,7 @@ in the values of parameters. See that section for det - 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 -- switch to the system's "nobody" user. The default for a non-super-user is -+ switch to the system's "_rsync" user. The default for a non-super-user is - 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 -@@ -524,7 +524,7 @@ in the values of parameters. See that section for det - 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 -- is to switch to your OS's "nobody" (or perhaps "nogroup") group with no -+ is to switch to the "_rsync" 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). -@@ -1202,8 +1202,8 @@ A simple rsyncd.conf file that allow anonymous rsync t - A more sophisticated example would be: - - > ``` --> uid = nobody --> gid = nobody -+> uid = _rsync -+> gid = _rsync - > use chroot = yes - > max connections = 4 - > syslog facility = local5 blob - /dev/null blob + e391bac8b380ec27ef149f01ea3530a2c71c1d00 (mode 644) --- /dev/null +++ net/rsync/patches/patch-rsyncd_conf_5 @@ -0,0 +1,32 @@ +Index: rsyncd.conf.5 +--- rsyncd.conf.5.orig ++++ rsyncd.conf.5 +@@ -479,7 +479,7 @@ This parameter specifies the user name or user ID that + 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 +-switch to the system's "nobody" user. The default for a non-super-user is ++switch to the system's "_rsync" user. The default for a non-super-user is + to not try to change the user. See also the "gid" parameter. + .IP + The RSYNC_USER_NAME environment variable may be used to request that rsync +@@ -499,7 +499,7 @@ accessing the module. The first one will be the defau + extra ones be set as supplemental groups. You may also specify a "\fB*\fP" 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 +-is to switch to your OS's "nobody" (or perhaps "nogroup") group with no ++is to switch to the "_rsync" 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). +@@ -1239,8 +1239,8 @@ A more sophisticated example would be: + .RS 4 + .P + .nf +-uid = nobody +-gid = nobody ++uid = _rsync ++gid = _rsync + use chroot = yes + max connections = 4 + syslog facility = local5 -- Christian "naddy" Weisgerber naddy@mips.inka.de