commit 1d565e04926c73e6b1aa2c376fc79f15a79c9a83 from: Omar Polo date: Sat May 06 15:31:53 2023 UTC pledge and unveil (via perl' OpenBSD::Pledge/Unveil) only on OpenBSD commit - aa06b2a9eb704e87a5abb12e9bbb4a1a1e75bcbe commit + 1d565e04926c73e6b1aa2c376fc79f15a79c9a83 blob - 8787235bd639f0acfc3837c60d4ec2d714db0caa blob + 28f05814baa5f9af8a883277bc958b459ee67ba3 --- mexp +++ mexp @@ -12,20 +12,22 @@ use v5.32; use List::Util qw(max min); -use OpenBSD::Pledge; -use OpenBSD::Unveil; - use GotMArc qw(parse san urlencode initpage endpage thread_header threntry thrslice thrnav); my $outdir = $ENV{'OUTDIR'}; die 'Set $OUTDIR' unless defined $outdir; -unveil("/usr/local/bin/mshow", "rx") or die "unveil mshow: $!"; -unveil($outdir, "rwc") or die "unveil $outdir: $!"; +if (`uname` =~ "OpenBSD") { + use OpenBSD::Pledge; + use OpenBSD::Unveil; -pledge("stdio rpath wpath cpath proc exec") or die "pledge: $!"; + unveil("/usr/local/bin/mshow", "rx") or die "unveil mshow: $!"; + unveil($outdir, "rwc") or die "unveil $outdir: $!"; + pledge("stdio rpath wpath cpath proc exec") or die "pledge: $!"; +} + sub export_part { my ($fh, $n, $fname) = @_; blob - cd49e6961ad39806d0da632a1940893adce8c3ce blob + 858e62ed2fb4d4c836c282d5edf5cb4b08fb9eb8 --- mkindex +++ mkindex @@ -11,9 +11,6 @@ use warnings; use v5.32; use File::Temp qw(tempfile); -use OpenBSD::Pledge; -use OpenBSD::Unveil; - use GotMArc qw(parse san urlencode initpage endpage index_header search thread_header threntry); @@ -159,14 +156,19 @@ sub index_entry { threntry $fh, "thread", 0, 0, $mail; } -unveil($outdir, "rwc") or die "unveil $outdir: $!"; +if (`uname` =~ "OpenBSD") { + use OpenBSD::Pledge; + use OpenBSD::Unveil; -# can't use tmppath because File::Temp checks wether /tmp exists. -unveil("/tmp", "rwc") or die "unveil /tmp: $!"; + unveil($outdir, "rwc") or die "unveil $outdir: $!"; -# fattr for File::Temp -pledge("stdio rpath wpath cpath fattr") or die "pledge: $!"; + # can't use tmppath because File::Temp checks wether /tmp exists. + unveil("/tmp", "rwc") or die "unveil /tmp: $!"; + # fattr for File::Temp + pledge("stdio rpath wpath cpath fattr") or die "pledge: $!"; +} + nextfile; while (<>) { blob - 821b194162c519a174e6d8e3312f4b2513ea0026 blob + 9f73857870aa589f38cc4e728d90e5a1069ab776 --- pe +++ pe @@ -13,9 +13,6 @@ use Digest::SHA; use Encode qw(encode); use IO::Poll qw(POLLOUT); -use OpenBSD::Pledge; -use OpenBSD::Unveil; - use GotMArc qw(parse); my $jobs = $ENV{'MAKE_JOBS'} // 1; @@ -75,9 +72,14 @@ sub process { savesum($tid, $thrsum); } -unveil($csumdir, "rwc") or die "unveil $csumdir: $!"; -pledge("stdio rpath wpath cpath") or die "pledge: $!"; +if (`uname` =~ "OpenBSD") { + use OpenBSD::Pledge; + use OpenBSD::Unveil; + unveil($csumdir, "rwc") or die "unveil $csumdir: $!"; + pledge("stdio rpath wpath cpath") or die "pledge: $!"; +} + my @thread; while (<>) { print; # continue the pipeline