From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 0BCE11F45F; Sun, 5 May 2019 21:33:42 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Cc: Eric Wong Subject: [PATCH] t/search.t: fix permissions check on FreeBSD Date: Sun, 5 May 2019 21:33:40 +0000 Message-Id: <20190505213340.814-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: FreeBSD does not allow non-root users to set S_ISGID; so git skips this bit on FreeBSD and Debian/kFreeBSD platforms. --- t/search.t | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/t/search.t b/t/search.t index 6415a64..35d7147 100644 --- a/t/search.t +++ b/t/search.t @@ -430,13 +430,23 @@ $ibx->with_umask(sub { is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art); }); +my $all_mask = 07777; +my $dir_mask = 02770; + +# FreeBSD does not allow non-root users to set S_ISGID, so +# git doesn't set it, either (see DIR_HAS_BSD_GROUP_SEMANTICS in git.git) +if ($^O =~ /freebsd/i) { + $all_mask = 0777; + $dir_mask = 0770; +} + foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3", "$git_dir/public-inbox", glob("$git_dir/public-inbox/xapian*/"), glob("$git_dir/public-inbox/xapian*/*")) { my @st = stat($f); my ($bn) = (split(m!/!, $f))[-1]; - is($st[2] & 07777, -f _ ? 0660 : 02770, + is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask, "sharedRepository respected for $bn"); } -- EW