From nobody Sun Jan 19 21:06:24 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YbmH45SnRz5ljPQ; Sun, 19 Jan 2025 21:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbmH44nm1z49qY; Sun, 19 Jan 2025 21:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737320784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fvxLJyvHufVgGR76A/BBKtAkrk9Rt+pMLDsQXdgex/Q=; b=aU8zzinNnaW3Prj2kdXMylki0kO7Bp2q5Wjl+2m09P3JPTqdycx6YiMC7/p7DOcS3lgfeI P7X0k9bTr3GZhPRcJYW614KFA8lcXa5iiUdvywFGRSb0W4/WnxLG4BxbB4LMtuSPeG5XHo txzmW5QOz4GLcGAnvNsfpKUKI2VUo6GV+khNnx2Q2pJXI31IiZI9iERGXt1tVMDlMCd8Iu wl3jKRMK7dL8kmKLNv/zvX1H7xqWtSDHdBAdiXAhfN5WEQPBfOt5tI3avOe8gtM3iZsh9h 6mrld08aUMUMCGqI6n18FyvC9yRWKNZ7NrNRyr3TKH7jadQEgggmLzv3inhiEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737320784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fvxLJyvHufVgGR76A/BBKtAkrk9Rt+pMLDsQXdgex/Q=; b=biusUvoDbJPJdnPwEo9sO8A6kY+BU7Eu+Zq4EMlh9U4n6oLJiiOvvi8PNpJg20iw30HKHM 4r+Xlol28+ofW/4kXe1KIcq0QOxCVepZM4hcgLQ3ZpOY9zZKB7SDZ+ErTvaswc1qLEZ7eo dRK3ZrYjgRu3xhMykkM0XPNg9zUcE94Sdtjm5VfLDhhttRhwyfpWjf6aYoCcs4Jftjfx5h Nuz+WqwmiJGGZ0VYTvje4uopn370H3R70/i/PV8T7upS55anRPqZrPwA6FTjicp5CNP0jc U+PIz4ElCLiO3vSsvP84I723PH/1HSgh1zR/J4kDMh8FVH8HLzzWFoKI9ZFkrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737320784; a=rsa-sha256; cv=none; b=VYmqvi7HFkZZ0APDt3uW0pJAPbAj9NW5x/At/xLXUbiPsfmWelbFOHdhiPd9rl3WKDooLR 511l9GrOa5AGJKkmeHOUDsH18duo97Sl/9/eilRVH5f61wzqtq0o+ZuvsSghomxmxxq5h3 hm2GIzRIK1NvHDxxDlkYyms43hufxxN0MR+Ci243RXAR6SWPzwcoenV9Zrs0zP4CTuq4Ih ucJBB16DptZ0TzjYxwR3y5omtAoTRHvYvrMoLN1vJfj8x7t8av8S/RCWLT2B4sq49tggUQ 40djftyye00H7WUXe4TUuOxQFGmleDs0+feyKvaqVsbArSkxiUwOJvsBLzqf4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YbmH44B6Fz15br; Sun, 19 Jan 2025 21:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50JL6Oiv045965; Sun, 19 Jan 2025 21:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50JL6OB1045962; Sun, 19 Jan 2025 21:06:24 GMT (envelope-from git) Date: Sun, 19 Jan 2025 21:06:24 GMT Message-Id: <202501192106.50JL6OB1045962@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 5e8e9ffbff18 - main - net/rsync: fix build with portmaster List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e8e9ffbff18ffa1cc46d7833227e4143030d314 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e8e9ffbff18ffa1cc46d7833227e4143030d314 commit 5e8e9ffbff18ffa1cc46d7833227e4143030d314 Author: Rodrigo Osorio AuthorDate: 2025-01-19 14:25:16 +0000 Commit: Rodrigo Osorio CommitDate: 2025-01-19 21:02:53 +0000 net/rsync: fix build with portmaster Change the fix for tests to unbreak the build with postmaster PR: 284154 Reported by: --- net/rsync/Makefile | 3 +++ net/rsync/files/patch-t_stub.c | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 7189ea8bae7c..cbd568649489 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -88,6 +88,9 @@ DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no .endif +pre-patch: + @${REINPLACE_CMD} 's:+int module_dirlen = 0;:+:' ${WRKSRC}/patches/fileflags.diff + post-patch: @${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \ -e 's:/etc/letsencrypt:${PREFIX}/etc/letsencrypt:g' \ diff --git a/net/rsync/files/patch-t_stub.c b/net/rsync/files/patch-t_stub.c deleted file mode 100644 index 6da977be0db5..000000000000 --- a/net/rsync/files/patch-t_stub.c +++ /dev/null @@ -1,10 +0,0 @@ ---- t_stub.c.orig 2025-01-18 20:59:30 UTC -+++ t_stub.c -@@ -28,7 +28,6 @@ - int protect_args = 0; - int module_id = -1; - int relative_paths = 0; --int module_dirlen = 0; - int force_change = 0; - int preserve_acls = 0; - unsigned int module_dirlen = 0;