X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/283e472105d10e0c782e79f336ae07b0e0378a59..61ae9994ad9d74eebddeccc7412cbf253fba014b:/Porting/bisect-runner.pl diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index 1fc7014..d8172f4 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -8,24 +8,16 @@ use Config; my @targets = qw(config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep); -my $cpus; -if (open my $fh, '<', '/proc/cpuinfo') { - while (<$fh>) { - ++$cpus if /^processor\s+:\s+\d+$/; - } -} elsif (-x '/sbin/sysctl') { - $cpus = 1 + $1 if `/sbin/sysctl hw.ncpu` =~ /^hw\.ncpu: (\d+)$/; -} elsif (-x '/usr/bin/getconf') { - $cpus = 1 + $1 if `/usr/bin/getconf _NPROCESSORS_ONLN` =~ /^(\d+)$/; -} - my %options = ( - jobs => defined $cpus ? $cpus + 1 : 2, 'expect-pass' => 1, clean => 1, # mostly for debugging this ); +# We accept #!./miniperl and #!./perl +# We don't accept #!miniperl and #!perl as their intent is ambiguous +my $run_with_our_perl = qr{\A#!(\./(?:mini)?perl)\b}; + my $linux64 = `uname -sm` eq "Linux x86_64\n" ? '64' : ''; my @paths; @@ -44,24 +36,34 @@ if ($^O eq 'linux') { push @paths, $_; } } + push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib) + if $linux64; } -push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib); - my %defines = ( usedevel => '', optimize => '-g', - cc => 'ccache gcc', - ld => 'gcc', - ($linux64 ? (libpth => \@paths) : ()), + ld => 'cc', + (@paths ? (libpth => \@paths) : ()), ); +# Needed for the 'ignore_versioned_solibs' emulation below. +push @paths, qw(/usr/local/lib /lib /usr/lib) + unless $linux64; + unless(GetOptions(\%options, - 'target=s', 'jobs|j=i', 'expect-pass=i', + 'target=s', 'make=s', 'jobs|j=i', 'expect-pass=i', 'expect-fail' => sub { $options{'expect-pass'} = 0; }, - 'clean!', 'one-liner|e=s', 'match=s', 'force-manifest', - 'test-build', 'check-args', 'A=s@', 'usage|help|?', + 'clean!', 'one-liner|e=s', 'c', 'l', 'w', 'match=s', + 'no-match=s' => sub { + $options{match} = $_[1]; + $options{'expect-pass'} = 0; + }, + 'force-manifest', 'force-regen', 'test-build', 'validate', + 'all-fixups', 'early-fixup=s@', 'late-fixup=s@', 'valgrind', + 'check-args', 'check-shebang!', 'usage|help|?', 'gold=s', + 'A=s@', 'D=s@' => sub { my (undef, $val) = @_; if ($val =~ /\A([^=]+)=(.*)/s) { @@ -77,11 +79,19 @@ unless(GetOptions(\%options, pod2usage(exitval => 255, verbose => 1); } -my ($target, $j, $match) = @options{qw(target jobs match)}; +my ($target, $match) = @options{qw(target match)}; -pod2usage(exitval => 255, verbose => 1) if $options{usage}; +@ARGV = ('sh', '-c', 'cd t && ./perl TEST base/*.t') + if $options{validate} && !@ARGV; + +pod2usage(exitval => 0, verbose => 2) if $options{usage}; pod2usage(exitval => 255, verbose => 1) unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'}; +pod2usage(exitval => 255, verbose => 1) + if !$options{'one-liner'} && ($options{l} || $options{w}); + +check_shebang($ARGV[0]) + if $options{'check-shebang'} && @ARGV && !$options{match}; exit 0 if $options{'check-args'}; @@ -95,17 +105,21 @@ bisect.pl - use git bisect to pinpoint changes .../Porting/bisect.pl -e 'my $a := 2;' # When did this stop being an error? .../Porting/bisect.pl --expect-fail -e '1 // 2' - # When did this stop matching? + # When were all lines matching this pattern removed from all files? .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b' - # When did this start matching? + # When was some line matching this pattern added to some file? .../Porting/bisect.pl --expect-fail --match '\buseithreads\b' - # When did this test program stop working? + # When did this test program stop exiting 0? .../Porting/bisect.pl -- ./perl -Ilib ../test_prog.pl + # When did this test start failing? + .../Porting/bisect.pl -- ./perl -Ilib t/TEST op/sort.t # When did this first become valid syntax? .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \ --expect-fail -e 'my $a := 2;' # What was the last revision to build with these options? .../Porting/bisect.pl --test-build -Dd_dosuid + # When did this test program start generating errors from valgrind? + .../Porting/bisect.pl --valgrind ../test_prog.pl =head1 DESCRIPTION @@ -125,11 +139,11 @@ Which commit caused this example code to start working? =item * -Which commit added the first to match this regex? +Which commit added the first file to match this regex? =item * -Which commit removed the last to match this regex? +Which commit removed the last file to match this regex? =back @@ -139,14 +153,19 @@ end revisions. By default F will process all options, then use the rest of the command line as arguments to list C to run a test case. By default, the test case should pass (exit with 0) on earlier perls, and fail (exit -non-zero) on I. F will use F to find the -earliest stable perl version on which the test case passes, check that it -fails on blead, and then use F with C to -find the commit which caused the failure. +non-zero) on I (note that running most of perl's test files directly +won't do this, you'll need to run them through a harness to get the proper +error code). F will use F to find the earliest +stable perl version on which the test case passes, check that it fails on +blead, and then use F with C to find the +commit which caused the failure. Because the test case is the complete argument to C, it is easy to run something other than the F built, if necessary. If you need to run -the perl built, you'll probably need to invoke it as C<./perl -Ilib ...> +the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>. +As a special case, if the first argument of the test case is a readable file +(whether executable or not), matching C then it +will have C<./perl> <-Ilib> (or C<./miniperl>) prepended to it. You need a clean checkout to run a bisect, and you can't use the checkout which contains F (because C) will check out @@ -175,8 +194,13 @@ If your F is old enough you can override this with C<-Unoextensions>. Earliest revision to test, as a I (a tag, commit or anything else C understands as a revision). If not specified, F will -search stable perl releases from 5.002 to 5.14.0 until it finds one where -the test case passes. +search stable .0 perl releases until it finds one where the test case passes +(5.16.0 at the time of writing). The default is to search from 5.002 to the +most recent tagged stable release. If F detects that the +checkout is on a case insensitive file system, it will search from 5.005 to +the most recent tagged stable release. Only .0 stable releases are used +because these are the only stable releases that are parents of blead, and +hence suitable for a bisect run. =item * @@ -268,6 +292,33 @@ which interferes with detecting errors in the example code itself. =item * +-c + +Add C<-c> to the command line, to cause perl to exit after syntax checking. + +=item * + +-l + +Add C<-l> to the command line with C<-e> + +This will automatically append a newline to every output line of your testcase. +Note that you can't specify an argument to F's C<-l> with this, as it's +not feasible to emulate F's somewhat quirky switch parsing with +L. If you need the full flexibility of C<-l>, you need to write +a full test case, instead of using C's C<-e> shortcut. + +=item * + +-w + +Add C<-w> to the command line with C<-e> + +It's not valid to pass C<-c>, C<-l> or C<-w> to C unless you are +also using C<-e> + +=item * + --expect-fail The test case should fail for the I revision, and pass for the I @@ -275,17 +326,23 @@ revision. The bisect run will find the first commit where it passes. =item * --Dnoextensions=Encode +-D I =item * --Uusedevel +-U I =item * --Accflags=-DNO_MATHOMS +-A I + +Arguments (C<-A>, C<-D>, C<-U>) to pass to F. For example, -Arguments to pass to F. Repeated C<-A> arguments are passed + -Dnoextensions=Encode + -Uusedevel + -Accflags=-DNO_MATHOMS + +Repeated C<-A> arguments are passed through as is. C<-D> and C<-U> are processed in order, and override previous settings for the same parameter. F emulates C<-Dnoextensions> when F itself does not provide it, as it's @@ -293,29 +350,86 @@ often very useful to be able to disable some XS extensions. =item * +--make I + +The C command to use. If this not set, F is used. If this is +set, it also adds a C<-Dmake=...> else some recursive make invocations +in extensions may fail. Typically one would use this as C<--make gmake> +to use F in place of the system F. + +=item * + --jobs I =item * -j I -Number of C jobs to run in parallel. If F exists and -can be parsed, or F exists and reports C, or -F exists and reports C<_NPROCESSORS_ONLN> defaults to 1 + -I. Otherwise defaults to 2. +Number of C jobs to run in parallel. A value of 0 suppresses +parallelism. If F exists and can be parsed, or F +exists and reports C, or F exists and reports +C<_NPROCESSORS_ONLN> defaults to 1 + I. On HP-UX with the +system make defaults to 0, otherwise defaults to 2. =item * --match pattern -Instead of running a test program to determine I or I, pass -if the given regex matches, and hence search for the commit that removes -the last matching file. +=item * + +--no-match pattern + +Instead of running a test program to determine I or I, +C<--match> will pass if the given regex matches, and hence search for the +commit that removes the last matching file. C<--no-match> inverts the test, +to search for the first commit that adds files that match. + +The remaining command line arguments are treated as glob patterns for files +to match against. If none are specified, then they default as follows: + +=over 4 + +=item * If no I is specified, the match is against all files in the -repository (which is fast). If a I is specified, that target is -built, and the match is against only the built files. C<--expect-fail> can -be used with C<--match> to search for a commit that adds files that match. +repository (which is fast). + +=item * + +If a I is specified, that target is built, and the match is against +only the built files. + +=back + +Treating the command line arguments as glob patterns should not cause +problems, as the perl distribution has never shipped or built files with +names that contain characters which are globbing metacharacters. + +Anything which is not a readable file is ignored, instead of generating an +error. (If you want an error, run C or C as a test case). This +permits one to easily search in a file that changed its name. For example: + + .../Porting/bisect.pl --match 'Pod.*Functions' 'pod/buildtoc*' + +C<--no-match ...> is implemented as C<--expect-fail --match ...> + +=item * + +--valgrind + +Run the test program under C. If you need to test for memory +errors when parsing invalid programs, the default parser fail exit code of +255 will always override C, so try putting the test case invalid +code inside a I C, so that the perl interpreter will exit with 0. +(Be sure to check the output of $@, to avoid missing mistakes such as +unintended C failures due to incorrect C<@INC>) + +Specifically, this option prepends C C<--error-exitcode=124> to +the command line that runs the testcase, to cause valgrind to exit non-zero +if it detects errors, with the assumption that the test program itself +always exits with zero. If you require more flexibility than this, either +specify your C invocation explicitly as part of the test case, or +use a wrapper script to control the command line or massage the exit codes. =item * @@ -358,12 +472,92 @@ F are missing. =item * +--force-regen + +Run C before building F. This may fix a build +that otherwise would skip because the generated headers at that revision +are stale. It's not the default because it conceals this error in the true +state of such revisions. + +=item * + --expect-pass [0|1] C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default. =item * +--all-fixups + +F will minimally patch various files on a platform and +version dependent basis to get the build to complete. Normally it defers +doing this as long as possible - C<.SH> files aren't patched until after +F is run, and C and C code isn't patched until after +F is built. If C<--all-fixups> is specified, all the fixups are +done before running C. In rare cases adding this may cause a +bisect to abort, because an inapplicable patch or other fixup is attempted +for a revision which would usually have already Ied. If this happens, +please report it as a bug, giving the OS and problem revision. + +=item * + +--early-fixup file + +=item * + +--late-fixup file + +Specify a file containing a patch or other fixup for the source code. The +action to take depends on the first line of the fixup file + +=over 4 + +=item * + +C<#!perl> + +If the first line starts C<#!perl> then the file is run using C<$^X> + +=item * + +C<#!/absolute/path> + +If a shebang line is present the file is executed using C + +=item * + +C =~ /I/> + +=item * + +C !~ /I/> + +If I does not exist then the fixup file's contents are ignored. +Otherwise, for C<=~>, if it contains a line matching I, then the +file is fed to C on standard input. For C<=~>, the patch is +applied if no lines match the pattern. + +As the empty pattern in Perl is a special case (it matches the most recent +sucessful match) which is not useful here, an the treatment of empty pattern +is special-cased. C =~ //> applies the patch if filename is +present. C !~ //> applies the patch if filename missing. This +makes it easy to unconditionally apply patches to files, and to use a patch +as a way of creating a new file. + +=item * + +Otherwise, the file is assumed to be a patch, and always applied. + +=back + +Is are applied before F<./Configure> is run. Is are +applied just after F<./Configure> is run. + +These options can be specified more than once. I is actually expanded +as a glob pattern. Globs that do not match are errors, as are missing files. + +=item * + --no-clean Tell F not to clean up after the build. This allows one @@ -374,12 +568,50 @@ Passing this to F will likely cause the bisect to fail badly. =item * +--validate + +Test that all stable (.0) revisions can be built. By default, attempts to +build I, then tagged stable releases in reverse order down to +I (or I on a case insensitive file system). Stops at +the first failure, without cleaning the checkout. Use I<--start> to specify +the earliest revision to test, I<--end> to specify the most recent. Useful +for validating a new OS/CPU/compiler combination. For example + + ../perl/Porting/bisect.pl --validate -le 'print "Hello from $]"' + +If no testcase is specified, the default is to use F to run +F + +=item * + --check-args Validate the options and arguments, and exit silently if they are valid. =item * +--check-shebang + +Validate that the test case isn't an executable file with a +C<#!/usr/bin/perl> line (or similar). As F does B +automatically prepend C<./perl> to the test case, a I<#!> line specifying an +external F binary will cause the test case to always run with I +F, not the F built by the bisect runner. Likely this is not what +you wanted. If your test case is actually a wrapper script to run other +commands, you should run it with an explicit interpreter, to be clear. For +example, instead of C<../perl/Porting/bisect.pl ~/test/testcase.pl> you'd +run C<../perl/Porting/bisect.pl /usr/bin/perl ~/test/testcase.pl> + +=item * + +--gold + +Revision to use when checking out known-good recent versions of files, +such as F. F defaults this to I, +but F will default it to the most recent stable release. + +=item * + --usage =item * @@ -396,18 +628,112 @@ Display the usage information and exit. =cut -die "$0: Can't build $target" if defined $target && !grep {@targets} $target; +# Ensure we always exit with 255, to cause git bisect to abort. +sub croak_255 { + my $message = join '', @_; + if ($message =~ /\n\z/) { + print STDERR $message; + } else { + my (undef, $file, $line) = caller 1; + print STDERR "@_ at $file line $line\n"; + } + exit 255; +} + +sub die_255 { + croak_255(@_); +} + +die_255("$0: Can't build $target") + if defined $target && !grep {@targets} $target; + +foreach my $phase (qw(early late)) { + next unless $options{"$phase-fixup"}; + my $bail_out; + require File::Glob; + my @expanded; + foreach my $glob (@{$options{"$phase-fixup"}}) { + my @got = File::Glob::bsd_glob($glob); + push @expanded, @got ? @got : $glob; + } + @expanded = sort @expanded; + $options{"$phase-fixup"} = \@expanded; + foreach (@expanded) { + unless (-f $_) { + print STDERR "$phase-fixup '$_' is not a readable file\n"; + ++$bail_out; + } + } + exit 255 if $bail_out; +} + +unless (exists $defines{cc}) { + # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence + # confusing. + # FIXME - really it should be replaced with a proper test of + # "can we build something?" and a helpful diagnostic if we can't. + # For now, simply move it here. + $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc'; +} + +my $j = $options{jobs} ? "-j$options{jobs}" : ''; -$j = "-j$j" if $j =~ /\A\d+\z/; +if (exists $options{make}) { + if (!exists $defines{make}) { + $defines{make} = $options{make}; + } +} else { + $options{make} = 'make'; +} # Sadly, however hard we try, I don't think that it will be possible to build # modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29, # which updated to MakeMaker 3.7, which changed from using a hard coded ld # in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc. +sub open_or_die { + my $file = shift; + my $mode = @_ ? shift : '<'; + open my $fh, $mode, $file or croak_255("Can't open $file: $!"); + ${*$fh{SCALAR}} = $file; + return $fh; +} + +sub close_or_die { + my $fh = shift; + return if close $fh; + croak_255("Can't close: $!") unless ref $fh eq 'GLOB'; + croak_255("Can't close ${*$fh{SCALAR}}: $!"); +} + +sub system_or_die { + my $command = '{name}; + $name = "@_" unless defined $name; + + my $pid = fork; + die_255("Can't fork: $!") unless defined $pid; + if (!$pid) { + if (exists $options->{stdin}) { + open STDIN, '<', $options->{stdin} + or die "Can't open STDIN from $options->{stdin}: $!"; + } + { exec @_ }; + die_255("Failed to start $name: $!"); + } + waitpid $pid, 0 + or die_255("wait for $name, pid $pid failed: $!"); + return $?; +} + sub extract_from_file { my ($file, $rx, $default) = @_; - open my $fh, '<', $file or die "Can't open $file: $!"; + my $fh = open_or_die($file); while (<$fh>) { my @got = $_ =~ $rx; return wantarray ? @got : $got[0] @@ -420,25 +746,227 @@ sub extract_from_file { sub edit_file { my ($file, $munger) = @_; local $/; - open my $fh, '<', $file or die "Can't open $file: $!"; + my $fh = open_or_die($file); my $orig = <$fh>; - die "Can't read $file: $!" unless defined $orig && close $fh; + die_255("Can't read $file: $!") unless defined $orig && close $fh; my $new = $munger->($orig); return if $new eq $orig; - open $fh, '>', $file or die "Can't open $file: $!"; - print $fh $new or die "Can't print to $file: $!"; - close $fh or die "Can't close $file: $!"; + $fh = open_or_die($file, '>'); + print $fh $new or die_255("Can't print to $file: $!"); + close_or_die($fh); } -sub apply_patch { - my $patch = shift; +# AIX supplies a pre-historic patch program, which certainly predates Linux +# and is probably older than NT. It can't cope with unified diffs. Meanwhile, +# it's hard enough to get git diff to output context diffs, let alone git show, +# and nearly all the patches embedded here are unified. So it seems that the +# path of least resistance is to convert unified diffs to context diffs: + +sub process_hunk { + my ($from_out, $to_out, $has_from, $has_to, $delete, $add) = @_; + ++$$has_from if $delete; + ++$$has_to if $add; + + if ($delete && $add) { + $$from_out .= "! $_\n" foreach @$delete; + $$to_out .= "! $_\n" foreach @$add; + } elsif ($delete) { + $$from_out .= "- $_\n" foreach @$delete; + } elsif ($add) { + $$to_out .= "+ $_\n" foreach @$add; + } +} + +# This isn't quite general purpose, as it can't cope with +# '\ No newline at end of file' +sub ud2cd { + my $diff_in = shift; + my $diff_out = ''; + + # Stuff before the diff + while ($diff_in =~ s/\A(?!\*\*\* )(?!--- )([^\n]*\n?)//ms && length $1) { + $diff_out .= $1; + } + + if (!length $diff_in) { + die_255("That didn't seem to be a diff"); + } + + if ($diff_in =~ /\A\*\*\* /ms) { + warn "Seems to be a context diff already\n"; + return $diff_out . $diff_in; + } + + # Loop for files + FILE: while (1) { + if ($diff_in =~ s/\A((?:diff |index )[^\n]+\n)//ms) { + $diff_out .= $1; + next; + } + if ($diff_in !~ /\A--- /ms) { + # Stuff after the diff; + return $diff_out . $diff_in; + } + $diff_in =~ s/\A([^\n]+\n?)//ms; + my $line = $1; + die_255("Can't parse '$line'") unless $line =~ s/\A--- /*** /ms; + $diff_out .= $line; + $diff_in =~ s/\A([^\n]+\n?)//ms; + $line = $1; + die_255("Can't parse '$line'") unless $line =~ s/\A\+\+\+ /--- /ms; + $diff_out .= $line; + + # Loop for hunks + while (1) { + next FILE + unless $diff_in =~ s/\A\@\@ (-([0-9]+),([0-9]+) \+([0-9]+),([0-9]+)) \@\@[^\n]*\n?//; + my ($hunk, $from_start, $from_count, $to_start, $to_count) + = ($1, $2, $3, $4, $5); + my $from_end = $from_start + $from_count - 1; + my $to_end = $to_start + $to_count - 1; + my ($from_out, $to_out, $has_from, $has_to, $add, $delete); + while (length $diff_in && ($from_count || $to_count)) { + die_255("Confused in $hunk") + unless $diff_in =~ s/\A([^\n]*)\n//ms; + my $line = $1; + $line = ' ' unless length $line; + if ($line =~ /^ .*/) { + process_hunk(\$from_out, \$to_out, \$has_from, \$has_to, + $delete, $add); + undef $delete; + undef $add; + $from_out .= " $line\n"; + $to_out .= " $line\n"; + --$from_count; + --$to_count; + } elsif ($line =~ /^-(.*)/) { + push @$delete, $1; + --$from_count; + } elsif ($line =~ /^\+(.*)/) { + push @$add, $1; + --$to_count; + } else { + die_255("Can't parse '$line' as part of hunk $hunk"); + } + } + process_hunk(\$from_out, \$to_out, \$has_from, \$has_to, + $delete, $add); + die_255("No lines in hunk $hunk") + unless length $from_out || length $to_out; + die_255("No changes in hunk $hunk") + unless $has_from || $has_to; + $diff_out .= "***************\n"; + $diff_out .= "*** $from_start,$from_end ****\n"; + $diff_out .= $from_out if $has_from; + $diff_out .= "--- $to_start,$to_end ----\n"; + $diff_out .= $to_out if $has_to; + } + } +} + +{ + my $use_context; + + sub placate_patch_prog { + my $patch = shift; + + if (!defined $use_context) { + my $version = `patch -v 2>&1`; + die_255("Can't run `patch -v`, \$?=$?, bailing out") + unless defined $version; + if ($version =~ /Free Software Foundation/) { + $use_context = 0; + } elsif ($version =~ /Header: patch\.c,v.*\blwall\b/) { + # The system patch is older than Linux, and probably older than + # Windows NT. + $use_context = 1; + } elsif ($version =~ /Header: patch\.c,v.*\babhinav\b/) { + # Thank you HP. No, we have no idea *which* version this is: + # $Header: patch.c,v 76.1.1.2.1.3 2001/12/03 12:24:52 abhinav Exp $ + $use_context = 1; + } else { + # Don't know. + $use_context = 0; + } + } + + return $use_context ? ud2cd($patch) : $patch; + } +} - my ($file) = $patch =~ qr!^diff.*a/(\S+) b/\1!; - open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!"; - print $fh $patch; +sub apply_patch { + my ($patch, $what, $files) = @_; + $what = 'patch' unless defined $what; + unless (defined $files) { + $patch =~ m!^--- a/(\S+)\n\+\+\+ b/\1!sm; + $files = " $1"; + } + my $patch_to_use = placate_patch_prog($patch); + open my $fh, '|-', 'patch', '-p1' or die_255("Can't run patch: $!"); + print $fh $patch_to_use; return if close $fh; print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n"; - die "Can't patch $file: $?, $!"; + print STDERR "\nConverted to a context diff <<'EOCONTEXT'\n${patch_to_use}EOCONTEXT\n" + if $patch_to_use ne $patch; + die_255("Can't $what$files: $?, $!"); +} + +sub apply_commit { + my ($commit, @files) = @_; + my $patch = `git show $commit @files`; + if (!defined $patch) { + die_255("Can't get commit $commit for @files: $?") if @files; + die_255("Can't get commit $commit: $?"); + } + apply_patch($patch, "patch $commit", @files ? " for @files" : ''); +} + +sub revert_commit { + my ($commit, @files) = @_; + my $patch = `git show -R $commit @files`; + if (!defined $patch) { + die_255("Can't get revert commit $commit for @files: $?") if @files; + die_255("Can't get revert commit $commit: $?"); + } + apply_patch($patch, "revert $commit", @files ? " for @files" : ''); +} + +sub checkout_file { + my ($file, $commit) = @_; + $commit ||= $options{gold} || 'blead'; + system "git show $commit:$file > $file ; + return if $line =~ $run_with_our_perl; + if (!-x $file) { + die_255("$file is not executable. +system($file, ...) is always going to fail. + +Bailing out"); + } + return unless $line =~ m{\A#!(/\S+/perl\S*)\s}; + die_255("$file will always be run by $1 +It won't be tested by the ./perl we build. +If you intended to run it with that perl binary, please change your +test case to + + $1 @ARGV + +If you intended to test it with the ./perl we build, please change your +test case to + + ./perl -Ilib @ARGV + +[You may also need to add -- before ./perl to prevent that -Ilib as being +parsed as an argument to bisect.pl] + +Bailing out"); } sub clean { @@ -460,34 +988,48 @@ sub skip { } sub report_and_exit { - my ($ret, $pass, $fail, $desc) = @_; + my ($good, $pass, $fail, $desc) = @_; clean(); - my $got = ($options{'expect-pass'} ? !$ret : $ret) ? 'good' : 'bad'; - if ($ret) { - print "$got - $fail $desc\n"; - } else { + my $got = ($options{'expect-pass'} ? $good : !$good) ? 'good' : 'bad'; + if ($good) { print "$got - $pass $desc\n"; + } else { + print "$got - $fail $desc\n"; } exit($got eq 'bad'); } +sub run_report_and_exit { + my $ret = run_with_options(undef, @_); + report_and_exit(!$ret, 'zero exit from', 'non-zero exit from', "@_"); +} + sub match_and_exit { - my $target = shift; + my ($target, @globs) = @_; my $matches = 0; my $re = qr/$match/; my @files; - { + if (@globs) { + require File::Glob; + foreach (sort map { File::Glob::bsd_glob($_)} @globs) { + if (!-f $_ || !-r _) { + warn "Skipping matching '$_' as it is not a readable file\n"; + } else { + push @files, $_; + } + } + } else { local $/ = "\0"; @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`; chomp @files; } foreach my $file (@files) { - open my $fh, '<', $file or die "Can't open $file: $!"; + my $fh = open_or_die($file); while (<$fh>) { if ($_ =~ $re) { ++$matches; @@ -499,251 +1041,2093 @@ sub match_and_exit { } } } - close $fh or die "Can't close $file: $!"; + close_or_die($fh); } - report_and_exit(!$matches, + report_and_exit($matches, $matches == 1 ? '1 match for' : "$matches matches for", 'no matches for', $match); } # Not going to assume that system perl is yet new enough to have autodie -system 'git clean -dxf > \$optdef;;$/)) { - # This is " Spaces now allowed in -D command line options.", - # part of commit ecfc54246c2a6f42 - apply_patch(<<'EOPATCH'); -diff --git a/Configure b/Configure -index 3d3b38d..78ffe16 100755 ---- a/Configure -+++ b/Configure -@@ -652,7 +777,8 @@ while test $# -gt 0; do - echo "$me: use '-U symbol=', not '-D symbol='." >&2 - echo "$me: ignoring -D $1" >&2 - ;; -- *=*) echo "$1" >> $optdef;; -+ *=*) echo "$1" | \ -+ sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;; - *) echo "$1='define'" >> $optdef;; - esac - shift -EOPATCH - } - if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) { - # Configure's original simple "grep" for d_namlen falls foul of the - # approach taken by the glibc headers: - # #ifdef _DIRENT_HAVE_D_NAMLEN - # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen) - # - # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux. - # This is also part of commit ecfc54246c2a6f42 - apply_patch(<<'EOPATCH'); -diff --git a/Configure b/Configure -index 3d3b38d..78ffe16 100755 ---- a/Configure -+++ b/Configure -@@ -3935,7 +4045,8 @@ $rm -f try.c - - : see if the directory entry stores field length - echo " " --if $contains 'd_namlen' $xinc >/dev/null 2>&1; then -+$cppstdin $cppflags $cppminus < "$xinc" > try.c -+if $contains 'd_namlen' try.c >/dev/null 2>&1; then - echo "Good, your directory entry keeps length information in d_namlen." >&4 - val="$define" - else -EOPATCH +my $unfixable_db_file; + +if ($major < 10 + && !extract_from_file('ext/DB_File/DB_File.xs', + qr!^#else /\* Berkeley DB Version > 2 \*/$!)) { + # This DB_File.xs is really too old to patch up. + # Skip DB_File, unless we're invoked with an explicit -Unoextensions + if (!exists $defines{noextensions}) { + $defines{noextensions} = 'DB_File'; + } elsif (defined $defines{noextensions}) { + $defines{noextensions} .= ' DB_File'; } + ++$unfixable_db_file; } -if ($major < 8 && !extract_from_file('Configure', - qr/^\t\tif test ! -t 0; then$/)) { - # Before dfe9444ca7881e71, Configure would refuse to run if stdin was not a - # tty. With that commit, the tty requirement was dropped for -de and -dE - # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S - # For those older versions, it's probably easiest if we simply remove the - # sanity test. - edit_file('Configure', sub { - my $code = shift; - $code =~ s/test ! -t 0/test Perl = rules/; - return $code; - }); +patch_Configure(); +patch_hints(); +if ($options{'all-fixups'}) { + patch_SH(); + patch_C(); + patch_ext(); } +apply_fixups($options{'early-fixup'}); -if ($major < 10 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) { - # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as - # prior to bd9b35c97ad661cc Configure had the malloc.h test before the - # definition of $compile. - apply_patch(<<'EOPATCH'); -diff --git a/Configure b/Configure -index 3d2e8b9..6ce7766 100755 ---- a/Configure -+++ b/Configure -@@ -6743,5 +6743,22 @@ set d_dosuid - - : see if this is a malloc.h system --set malloc.h i_malloc --eval $inhdr -+: we want a real compile instead of Inhdr because some systems have a -+: malloc.h that just gives a compile error saying to use stdlib.h instead -+echo " " -+$cat >try.c < -+#include -+int main () { return 0; } -+EOCP -+set try -+if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then -+ echo " found." >&4 -+ val="$define" -+else -+ echo " NOT found." >&4 -+ val="$undef" -+fi -+$rm -f try.c try -+set i_malloc -+eval $setvar - -EOPATCH -} +# if Encode is not needed for the test, you can speed up the bisect by +# excluding it from the runs with -Dnoextensions=Encode +# ccache is an easy win. Remove it if it causes problems. +# Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it +# to true in hints/linux.sh +# On dromedary, from that point on, Configure (by default) fails to find any +# libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain +# versioned libraries. Without -lm, the build fails. +# Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards, +# until commit faae14e6e968e1c0 adds it to the hints. +# However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work, +# because it will spot versioned libraries, pass them to the compiler, and then +# bail out pretty early on. Configure won't let us override libswanted, but it +# will let us override the entire libs list. + +foreach (@{$options{A}}) { + push @paths, $1 if /^libpth=(.*)/s; +} + +unless (extract_from_file('Configure', 'ignore_versioned_solibs')) { + # Before 1cfa4ec74d4933da, so force the libs list. + + my @libs; + # This is the current libswanted list from Configure, less the libs removed + # by current hints/linux.sh + foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld + ld sun m crypt sec util c cposix posix ucb BSD)) { + foreach my $dir (@paths) { + # Note the wonderful consistency of dot-or-not in the config vars: + next unless -f "$dir/lib$lib.$Config{dlext}" + || -f "$dir/lib$lib$Config{lib_ext}"; + push @libs, "-l$lib"; + last; + } + } + $defines{libs} = \@libs unless exists $defines{libs}; +} + +$defines{usenm} = undef + if $major < 2 && !exists $defines{usenm}; + +my ($missing, $created_dirs); +($missing, $created_dirs) = force_manifest() + if $options{'force-manifest'}; + +my @ARGS = '-dEs'; +foreach my $key (sort keys %defines) { + my $val = $defines{$key}; + if (ref $val) { + push @ARGS, "-D$key=@$val"; + } elsif (!defined $val) { + push @ARGS, "-U$key"; + } elsif (!length $val) { + push @ARGS, "-D$key"; + } else { + $val = "" if $val eq "\0"; + push @ARGS, "-D$key=$val"; + } +} +push @ARGS, map {"-A$_"} @{$options{A}}; + +# If a file in MANIFEST is missing, Configure asks if you want to +# continue (the default being 'n'). With stdin closed or /dev/null, +# it exits immediately and the check for config.sh below will skip. +# Without redirecting stdin, the commands called will attempt to read from +# stdin (and thus effectively hang) +run_with_options({stdin => '/dev/null', name => 'Configure'}, + './Configure', @ARGS); + +patch_SH() unless $options{'all-fixups'}; +apply_fixups($options{'late-fixup'}); + +if (-f 'config.sh') { + # Emulate noextensions if Configure doesn't support it. + fake_noextensions() + if $major < 10 && $defines{noextensions}; + system_or_die('./Configure -S'); +} + +if ($target =~ /config\.s?h/) { + match_and_exit($target, @ARGV) if $match && -f $target; + report_and_exit(-f $target, 'could build', 'could not build', $target) + if $options{'test-build'}; + + skip("could not build $target") unless -f $target; + + run_report_and_exit(@ARGV); +} elsif (!-f 'config.sh') { + # Skip if something went wrong with Configure + + skip('could not build config.sh'); +} + +force_manifest_cleanup($missing, $created_dirs) + if $missing; + +if($options{'force-regen'} + && extract_from_file('Makefile', qr/\bregen_headers\b/)) { + # regen_headers was added in e50aee73b3d4c555, patch.1m for perl5.001 + # It's not worth faking it for earlier revisions. + system_or_die('make regen_headers'); +} + +unless ($options{'all-fixups'}) { + patch_C(); + patch_ext(); +} + +# Parallel build for miniperl is safe +system "$options{make} $j miniperl ' fails, and + # Makefile tries to run minitest. + + # Of course, helpfully sometimes it's called ../perl, other times .././perl + # and who knows if that list is exhaustive... + my ($dev0, $ino0) = stat 't/perl'; + my ($dev1, $ino1) = stat 'perl'; + unless (defined $dev0 && defined $dev1 && $dev0 == $dev1 && $ino0 == $ino1) { + undef $expected_file_found; + my $link = readlink $expected_file; + warn "'t/perl' => '$link', not 'perl'"; + die_255("Could not realink t/perl: $!") unless defined $link; + } +} + +if ($options{'test-build'}) { + report_and_exit($expected_file_found, 'could build', 'could not build', + $real_target); +} elsif (!$expected_file_found) { + skip("could not build $real_target"); +} + +match_and_exit($real_target, @ARGV) if $match; + +if (defined $options{'one-liner'}) { + my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl'; + unshift @ARGV, '-e', $options{'one-liner'}; + foreach (qw(c l w)) { + unshift @ARGV, "-$_" if $options{$_}; + } + unshift @ARGV, "./$exe", '-Ilib'; +} + +if (-f $ARGV[0]) { + my $fh = open_or_die($ARGV[0]); + my $line = <$fh>; + unshift @ARGV, $1, '-Ilib' + if $line =~ $run_with_our_perl; +} + +if ($options{valgrind}) { + # Turns out to be too confusing to use an optional argument with the path + # of the valgrind binary, as if --valgrind takes an optional argument, + # then specifying it as the last option eats the first part of the testcase. + # ie this: .../bisect.pl --valgrind testcase + # is treated as --valgrind=testcase and as there is no test case given, + # it's an invalid commandline, bailing out with the usage message. + + # Currently, the test script can't signal a skip with 125, so anything + # non-zero would do. But to keep that option open in future, use 124 + unshift @ARGV, 'valgrind', '--error-exitcode=124'; +} + +# This is what we came here to run: + +if (exists $Config{ldlibpthname}) { + require Cwd; + my $varname = $Config{ldlibpthname}; + my $cwd = Cwd::getcwd(); + if (defined $ENV{$varname}) { + $ENV{$varname} = $cwd . $Config{path_sep} . $ENV{$varname}; + } else { + $ENV{$varname} = $cwd; + } +} + +run_report_and_exit(@ARGV); + +############################################################################ +# +# Patching, editing and faking routines only below here. +# +############################################################################ + +sub fake_noextensions { + edit_file('config.sh', sub { + my @lines = split /\n/, shift; + my @ext = split /\s+/, $defines{noextensions}; + foreach (@lines) { + next unless /^extensions=/ || /^dynamic_ext/; + foreach my $ext (@ext) { + s/\b$ext( )?\b/$1/; + } + } + return join "\n", @lines; + }); +} + +sub force_manifest { + my (@missing, @created_dirs); + my $fh = open_or_die('MANIFEST'); + while (<$fh>) { + next unless /^(\S+)/; + # -d is special case needed (at least) between 27332437a2ed1941 and + # bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread + push @missing, $1 + unless -f $1 || -d $1; + } + close_or_die($fh); + + foreach my $pathname (@missing) { + my @parts = split '/', $pathname; + my $leaf = pop @parts; + my $path = '.'; + while (@parts) { + $path .= '/' . shift @parts; + next if -d $path; + mkdir $path, 0700 or die_255("Can't create $path: $!"); + unshift @created_dirs, $path; + } + $fh = open_or_die($pathname, '>'); + close_or_die($fh); + chmod 0, $pathname or die_255("Can't chmod 0 $pathname: $!"); + } + return \@missing, \@created_dirs; +} + +sub force_manifest_cleanup { + my ($missing, $created_dirs) = @_; + # This is probably way too paranoid: + my @errors; + require Fcntl; + foreach my $file (@$missing) { + my (undef, undef, $mode, undef, undef, undef, undef, $size) + = stat $file; + if (!defined $mode) { + push @errors, "Added file $file has been deleted by Configure"; + next; + } + if (Fcntl::S_IMODE($mode) != 0) { + push @errors, + sprintf 'Added file %s had mode changed by Configure to %03o', + $file, $mode; + } + if ($size != 0) { + push @errors, + "Added file $file had sized changed by Configure to $size"; + } + unlink $file or die_255("Can't unlink $file: $!"); + } + foreach my $dir (@$created_dirs) { + rmdir $dir or die_255("Can't rmdir $dir: $!"); + } + skip("@errors") + if @errors; +} + +sub patch_Configure { + if ($major < 1) { + if (extract_from_file('Configure', + qr/^\t\t\*=\*\) echo "\$1" >> \$optdef;;$/)) { + # This is " Spaces now allowed in -D command line options.", + # part of commit ecfc54246c2a6f42 + apply_patch(<<'EOPATCH'); +diff --git a/Configure b/Configure +index 3d3b38d..78ffe16 100755 +--- a/Configure ++++ b/Configure +@@ -652,7 +777,8 @@ while test $# -gt 0; do + echo "$me: use '-U symbol=', not '-D symbol='." >&2 + echo "$me: ignoring -D $1" >&2 + ;; +- *=*) echo "$1" >> $optdef;; ++ *=*) echo "$1" | \ ++ sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;; + *) echo "$1='define'" >> $optdef;; + esac + shift +EOPATCH + } + + if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) { + # Configure's original simple "grep" for d_namlen falls foul of the + # approach taken by the glibc headers: + # #ifdef _DIRENT_HAVE_D_NAMLEN + # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen) + # + # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux. + # This is also part of commit ecfc54246c2a6f42 + apply_patch(<<'EOPATCH'); +diff --git a/Configure b/Configure +index 3d3b38d..78ffe16 100755 +--- a/Configure ++++ b/Configure +@@ -3935,7 +4045,8 @@ $rm -f try.c + + : see if the directory entry stores field length + echo " " +-if $contains 'd_namlen' $xinc >/dev/null 2>&1; then ++$cppstdin $cppflags $cppminus < "$xinc" > try.c ++if $contains 'd_namlen' try.c >/dev/null 2>&1; then + echo "Good, your directory entry keeps length information in d_namlen." >&4 + val="$define" + else +EOPATCH + } + } + + if ($major < 2 + && !extract_from_file('Configure', + qr/Try to guess additional flags to pick up local libraries/)) { + my $mips = extract_from_file('Configure', + qr!(''\) if (?:\./)?mips; then)!); + # This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to + # the ld flags if libraries are found there. It shifts the code to set + # up libpth earlier, and then adds the code to add libpth entries to + # ldflags + # mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g + apply_patch(sprintf <<'EOPATCH', $mips); +diff --git a/Configure b/Configure +index 53649d5..0635a6e 100755 +--- a/Configure ++++ b/Configure +@@ -2749,6 +2749,52 @@ EOM + ;; + esac + ++: Set private lib path ++case "$plibpth" in ++'') if ./mips; then ++ plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" ++ fi;; ++esac ++case "$libpth" in ++' ') dlist='';; ++'') dlist="$plibpth $glibpth";; ++*) dlist="$libpth";; ++esac ++ ++: Now check and see which directories actually exist, avoiding duplicates ++libpth='' ++for xxx in $dlist ++do ++ if $test -d $xxx; then ++ case " $libpth " in ++ *" $xxx "*) ;; ++ *) libpth="$libpth $xxx";; ++ esac ++ fi ++done ++$cat <<'EOM' ++ ++Some systems have incompatible or broken versions of libraries. Among ++the directories listed in the question below, please remove any you ++know not to be holding relevant libraries, and add any that are needed. ++Say "none" for none. ++ ++EOM ++case "$libpth" in ++'') dflt='none';; ++*) ++ set X $libpth ++ shift ++ dflt=${1+"$@"} ++ ;; ++esac ++rp="Directories to use for library searches?" ++. ./myread ++case "$ans" in ++none) libpth=' ';; ++*) libpth="$ans";; ++esac ++ + : flags used in final linking phase + case "$ldflags" in + '') if ./venix; then +@@ -2765,6 +2811,23 @@ case "$ldflags" in + ;; + *) dflt="$ldflags";; + esac ++ ++: Possible local library directories to search. ++loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" ++loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++ ++: Try to guess additional flags to pick up local libraries. ++for thislibdir in $libpth; do ++ case " $loclibpth " in ++ *" $thislibdir "*) ++ case "$dflt " in ++ "-L$thislibdir ") ;; ++ *) dflt="$dflt -L$thislibdir" ;; ++ esac ++ ;; ++ esac ++done ++ + echo " " + rp="Any additional ld flags (NOT including libraries)?" + . ./myread +@@ -2828,52 +2891,6 @@ n) echo "OK, that should do.";; + esac + $rm -f try try.* core + +-: Set private lib path +-case "$plibpth" in +-%s +- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" +- fi;; +-esac +-case "$libpth" in +-' ') dlist='';; +-'') dlist="$plibpth $glibpth";; +-*) dlist="$libpth";; +-esac +- +-: Now check and see which directories actually exist, avoiding duplicates +-libpth='' +-for xxx in $dlist +-do +- if $test -d $xxx; then +- case " $libpth " in +- *" $xxx "*) ;; +- *) libpth="$libpth $xxx";; +- esac +- fi +-done +-$cat <<'EOM' +- +-Some systems have incompatible or broken versions of libraries. Among +-the directories listed in the question below, please remove any you +-know not to be holding relevant libraries, and add any that are needed. +-Say "none" for none. +- +-EOM +-case "$libpth" in +-'') dflt='none';; +-*) +- set X $libpth +- shift +- dflt=${1+"$@"} +- ;; +-esac +-rp="Directories to use for library searches?" +-. ./myread +-case "$ans" in +-none) libpth=' ';; +-*) libpth="$ans";; +-esac +- + : compute shared library extension + case "$so" in + '') +EOPATCH + } + + if ($major < 5 && extract_from_file('Configure', + qr!if \$cc \$ccflags try\.c -o try >/dev/null 2>&1; then!)) { + # Analogous to the more general fix of dfe9444ca7881e71 + # Without this flags such as -m64 may not be passed to this compile, + # which results in a byteorder of '1234' instead of '12345678', which + # can then cause crashes. + + if (extract_from_file('Configure', qr/xxx_prompt=y/)) { + # 8e07c86ebc651fe9 or later + # ("This is my patch patch.1n for perl5.001.") + apply_patch(<<'EOPATCH'); +diff --git a/Configure b/Configure +index 62249dd..c5c384e 100755 +--- a/Configure ++++ b/Configure +@@ -8247,7 +8247,7 @@ main() + } + EOCP + xxx_prompt=y +- if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then ++ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then + dflt=`./try` + case "$dflt" in + [1-4][1-4][1-4][1-4]|12345678|87654321) +EOPATCH + } else { + apply_patch(<<'EOPATCH'); +diff --git a/Configure b/Configure +index 53649d5..f1cd64a 100755 +--- a/Configure ++++ b/Configure +@@ -6362,7 +6362,7 @@ main() + printf("\n"); + } + EOCP +- if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then ++ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 ; then + dflt=`./try` + case "$dflt" in + ????|????????) echo "(The test program ran ok.)";; +EOPATCH + } + } + + if ($major < 6 && !extract_from_file('Configure', + qr!^\t-A\)$!)) { + # This adds the -A option to Configure, which is incredibly useful + # Effectively this is commits 02e93a22d20fc9a5, 5f83a3e9d818c3ad, + # bde6b06b2c493fef, f7c3111703e46e0c and 2 lines of trailing whitespace + # removed by 613d6c3e99b9decc, but applied at slightly different + # locations to ensure a clean patch back to 5.000 + # Note, if considering patching to the intermediate revisions to fix + # bugs in -A handling, f7c3111703e46e0c is from 2002, and hence + # $major == 8 + + # To add to the fun, early patches add -K and -O options, and it's not + # trivial to get patch to put the C<. ./posthint.sh> in the right place + edit_file('Configure', sub { + my $code = shift; + $code =~ s/(optstr = ")([^"]+";\s*# getopt-style specification)/$1A:$2/ + or die_255("Substitution failed"); + $code =~ s!^(: who configured the system)! +touch posthint.sh +. ./posthint.sh + +$1!ms + or die_255("Substitution failed"); + return $code; + }); + apply_patch(<<'EOPATCH'); +diff --git a/Configure b/Configure +index 4b55fa6..60c3c64 100755 +--- a/Configure ++++ b/Configure +@@ -1150,6 +1150,7 @@ set X `for arg in "$@"; do echo "X$arg"; done | + eval "set $*" + shift + rm -f options.awk ++rm -f posthint.sh + + : set up default values + fastread='' +@@ -1172,6 +1173,56 @@ while test $# -gt 0; do + case "$1" in + -d) shift; fastread=yes;; + -e) shift; alldone=cont;; ++ -A) ++ shift ++ xxx='' ++ yyy="$1" ++ zzz='' ++ uuu=undef ++ case "$yyy" in ++ *=*) zzz=`echo "$yyy"|sed 's!=.*!!'` ++ case "$zzz" in ++ *:*) zzz='' ;; ++ *) xxx=append ++ zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'` ++ yyy=`echo "$yyy"|sed 's!=.*!!'` ;; ++ esac ++ ;; ++ esac ++ case "$xxx" in ++ '') case "$yyy" in ++ *:*) xxx=`echo "$yyy"|sed 's!:.*!!'` ++ yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ++ zzz=`echo "$yyy"|sed 's!^[^=]*=!!'` ++ yyy=`echo "$yyy"|sed 's!=.*!!'` ;; ++ *) xxx=`echo "$yyy"|sed 's!:.*!!'` ++ yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;; ++ esac ++ ;; ++ esac ++ case "$xxx" in ++ append) ++ echo "$yyy=\"\${$yyy}$zzz\"" >> posthint.sh ;; ++ clear) ++ echo "$yyy=''" >> posthint.sh ;; ++ define) ++ case "$zzz" in ++ '') zzz=define ;; ++ esac ++ echo "$yyy='$zzz'" >> posthint.sh ;; ++ eval) ++ echo "eval \"$yyy=$zzz\"" >> posthint.sh ;; ++ prepend) ++ echo "$yyy=\"$zzz\${$yyy}\"" >> posthint.sh ;; ++ undef) ++ case "$zzz" in ++ '') zzz="$uuu" ;; ++ esac ++ echo "$yyy=$zzz" >> posthint.sh ;; ++ *) echo "$me: unknown -A command '$xxx', ignoring -A $1" >&2 ;; ++ esac ++ shift ++ ;; + -f) + shift + cd .. +EOPATCH + } + + if ($major < 8 && $^O eq 'aix') { + edit_file('Configure', sub { + my $code = shift; + # Replicate commit a8c676c69574838b + # Whitespace allowed at the ends of /lib/syscalls.exp lines + # and half of commit c6912327ae30e6de + # AIX syscalls.exp scan: the syscall might be marked 32, 3264, or 64 + $code =~ s{(\bsed\b.*\bsyscall)(?:\[0-9\]\*)?(\$.*/lib/syscalls\.exp)} + {$1 . "[0-9]*[ \t]*" . $2}e; + return $code; + }); + } + + if ($major < 8 && !extract_from_file('Configure', + qr/^\t\tif test ! -t 0; then$/)) { + # Before dfe9444ca7881e71, Configure would refuse to run if stdin was + # not a tty. With that commit, the tty requirement was dropped for -de + # and -dE + # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S + # For those older versions, it's probably easiest if we simply remove + # the sanity test. + edit_file('Configure', sub { + my $code = shift; + $code =~ s/test ! -t 0/test Perl = rules/; + return $code; + }); + } + + if ($major == 8 || $major == 9) { + # Fix symbol detection to that of commit 373dfab3839ca168 if it's any + # intermediate version 5129fff43c4fe08c or later, as the intermediate + # versions don't work correctly on (at least) Sparc Linux. + # 5129fff43c4fe08c adds the first mention of mistrustnm. + # 373dfab3839ca168 removes the last mention of lc="" + edit_file('Configure', sub { + my $code = shift; + return $code + if $code !~ /\btc="";/; # 373dfab3839ca168 or later + return $code + if $code !~ /\bmistrustnm\b/; # before 5129fff43c4fe08c + my $fixed = <<'EOC'; + +: is a C symbol defined? +csym='tlook=$1; +case "$3" in +-v) tf=libc.tmp; tdc="";; +-a) tf=libc.tmp; tdc="[]";; +*) tlook="^$1\$"; tf=libc.list; tdc="()";; +esac; +tx=yes; +case "$reuseval-$4" in +true-) ;; +true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;; +esac; +case "$tx" in +yes) + tval=false; + if $test "$runnm" = true; then + if $contains $tlook $tf >/dev/null 2>&1; then + tval=true; + elif $test "$mistrustnm" = compile -o "$mistrustnm" = run; then + echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c; + $cc -o try $optimize $ccflags $ldflags try.c >/dev/null 2>&1 $libs && tval=true; + $test "$mistrustnm" = run -a -x try && { $run ./try$_exe >/dev/null 2>&1 || tval=false; }; + $rm -f try$_exe try.c core core.* try.core; + fi; + else + echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c; + $cc -o try $optimize $ccflags $ldflags try.c $libs >/dev/null 2>&1 && tval=true; + $rm -f try$_exe try.c; + fi; + ;; +*) + case "$tval" in + $define) tval=true;; + *) tval=false;; + esac; + ;; +esac; +eval "$2=$tval"' + +EOC + $code =~ s/\n: is a C symbol defined\?\n.*?\neval "\$2=\$tval"'\n\n/$fixed/sm + or die_255("substitution failed"); + return $code; + }); + } + + if ($major < 10 + && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) { + # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as + # prior to bd9b35c97ad661cc Configure had the malloc.h test before the + # definition of $compile. + apply_patch(<<'EOPATCH'); +diff --git a/Configure b/Configure +index 3d2e8b9..6ce7766 100755 +--- a/Configure ++++ b/Configure +@@ -6743,5 +6743,22 @@ set d_dosuid + + : see if this is a malloc.h system +-set malloc.h i_malloc +-eval $inhdr ++: we want a real compile instead of Inhdr because some systems have a ++: malloc.h that just gives a compile error saying to use stdlib.h instead ++echo " " ++$cat >try.c < ++#include ++int main () { return 0; } ++EOCP ++set try ++if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then ++ echo " found." >&4 ++ val="$define" ++else ++ echo " NOT found." >&4 ++ val="$undef" ++fi ++$rm -f try.c try ++set i_malloc ++eval $setvar + +EOPATCH + } +} + +sub patch_hints { + if ($^O eq 'freebsd') { + # There are rather too many version-specific FreeBSD hints fixes to + # patch individually. Also, more than once the FreeBSD hints file has + # been written in what turned out to be a rather non-future-proof style, + # with case statements treating the most recent version as the + # exception, instead of treating previous versions' behaviour explicitly + # and changing the default to cater for the current behaviour. (As + # strangely, future versions inherit the current behaviour.) + checkout_file('hints/freebsd.sh'); + } elsif ($^O eq 'darwin') { + if ($major < 8) { + # We can't build on darwin without some of the data in the hints + # file. Probably less surprising to use the earliest version of + # hints/darwin.sh and then edit in place just below, than use + # blead's version, as that would create a discontinuity at + # f556e5b971932902 - before it, hints bugs would be "fixed", after + # it they'd resurface. This way, we should give the illusion of + # monotonic bug fixing. + my $faking_it; + if (!-f 'hints/darwin.sh') { + checkout_file('hints/darwin.sh', 'f556e5b971932902'); + ++$faking_it; + } + + edit_file('hints/darwin.sh', sub { + my $code = shift; + # Part of commit 8f4f83badb7d1ba9, which mostly undoes + # commit 0511a818910f476c. + $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m; + # commit 14c11978e9b52e08/803bb6cc74d36a3f + # Without this, code in libperl.bundle links against op.o + # in preference to opmini.o on the linker command line, + # and hence miniperl tries to use File::Glob instead of + # csh + $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m; + # f556e5b971932902 also patches Makefile.SH with some + # special case code to deal with useshrplib for darwin. + # Given that post 5.8.0 the darwin hints default was + # changed to false, and it would be very complex to splice + # in that code in various versions of Makefile.SH back + # to 5.002, lets just turn it off. + $code =~ s/^useshrplib='true'/useshrplib='false'/m + if $faking_it; + + # Part of commit d235852b65d51c44 + # Don't do this on a case sensitive HFS+ partition, as it + # breaks the build for 5.003 and earlier. + if ($case_insensitive + && $code !~ /^firstmakefile=GNUmakefile/) { + $code .= "\nfirstmakefile=GNUmakefile;\n"; + } + + return $code; + }); + } + } elsif ($^O eq 'netbsd') { + if ($major < 6) { + # These are part of commit 099685bc64c7dbce + edit_file('hints/netbsd.sh', sub { + my $code = shift; + my $fixed = <<'EOC'; +case "$osvers" in +0.9|0.8*) + usedl="$undef" + ;; +*) + if [ -f /usr/libexec/ld.elf_so ]; then + d_dlopen=$define + d_dlerror=$define + ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags" + cccdlflags="-DPIC -fPIC $cccdlflags" + lddlflags="--whole-archive -shared $lddlflags" + elif [ "`uname -m`" = "pmax" ]; then +# NetBSD 1.3 and 1.3.1 on pmax shipped an 'old' ld.so, which will not work. + d_dlopen=$undef + elif [ -f /usr/libexec/ld.so ]; then + d_dlopen=$define + d_dlerror=$define + ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags" +# we use -fPIC here because -fpic is *NOT* enough for some of the +# extensions like Tk on some netbsd platforms (the sparc is one) + cccdlflags="-DPIC -fPIC $cccdlflags" + lddlflags="-Bforcearchive -Bshareable $lddlflags" + else + d_dlopen=$undef + fi + ;; +esac +EOC + $code =~ s/^case "\$osvers" in\n0\.9\|0\.8.*?^esac\n/$fixed/ms; + return $code; + }); + } + } elsif ($^O eq 'openbsd') { + if ($major < 8) { + checkout_file('hints/openbsd.sh', '43051805d53a3e4c') + unless -f 'hints/openbsd.sh'; + my $which = extract_from_file('hints/openbsd.sh', + qr/# from (2\.8|3\.1) onwards/, + ''); + if ($which eq '') { + my $was = extract_from_file('hints/openbsd.sh', + qr/(lddlflags="(?:-Bforcearchive )?-Bshareable)/); + # This is commit 154d43cbcf57271c and parts of 5c75dbfa77b0949c + # and 29b5585702e5e025 + apply_patch(sprintf <<'EOPATCH', $was); +diff --git a/hints/openbsd.sh b/hints/openbsd.sh +index a7d8bf2..5b79709 100644 +--- a/hints/openbsd.sh ++++ b/hints/openbsd.sh +@@ -37,7 +37,25 @@ OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax) + # we use -fPIC here because -fpic is *NOT* enough for some of the + # extensions like Tk on some OpenBSD platforms (ie: sparc) + cccdlflags="-DPIC -fPIC $cccdlflags" +- %s $lddlflags" ++ case "$osvers" in ++ [01].*|2.[0-7]|2.[0-7].*) ++ lddlflags="-Bshareable $lddlflags" ++ ;; ++ 2.[8-9]|3.0) ++ ld=${cc:-cc} ++ lddlflags="-shared -fPIC $lddlflags" ++ ;; ++ *) # from 3.1 onwards ++ ld=${cc:-cc} ++ lddlflags="-shared -fPIC $lddlflags" ++ libswanted=`echo $libswanted | sed 's/ dl / /'` ++ ;; ++ esac ++ ++ # We need to force ld to export symbols on ELF platforms. ++ # Without this, dlopen() is crippled. ++ ELF=`${cc:-cc} -dM -E - >'); + print $fh <<'EOT' or die_255($!); + +case "`uname -m`" in +sparc*) + case "$cccdlflags" in + *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;; + *) cccdlflags="$cccdlflags -fPIC" ;; + esac + ;; +esac +EOT + close_or_die($fh); + } + } + } + } elsif ($^O eq 'solaris') { + if (($major == 13 || $major == 14) + && extract_from_file('hints/solaris_2.sh', qr/getconfldllflags/)) { + apply_commit('c80bde4388070c45'); + } + } +} + +sub patch_SH { + # Cwd.xs added in commit 0d2079faa739aaa9. Cwd.pm moved to ext/ 8 years + # later in commit 403f501d5b37ebf0 + if ($major > 0 && <*/Cwd/Cwd.xs>) { + if ($major < 10 + && !extract_from_file('Makefile.SH', qr/^extra_dep=''$/)) { + # The Makefile.PL for Unicode::Normalize needs + # lib/unicore/CombiningClass.pl. Even without a parallel build, we + # need a dependency to ensure that it builds. This is a variant of + # commit 9f3ef600c170f61e. Putting this for earlier versions gives + # us a spot on which to hang the edits below + apply_patch(<<'EOPATCH'); +diff --git a/Makefile.SH b/Makefile.SH +index f61d0db..6097954 100644 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -155,10 +155,20 @@ esac + + : Prepare dependency lists for Makefile. + dynamic_list=' ' ++extra_dep='' + for f in $dynamic_ext; do + : the dependency named here will never exist + base=`echo "$f" | sed 's/.*\///'` +- dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext" ++ this_target="lib/auto/$f/$base.$dlext" ++ dynamic_list="$dynamic_list $this_target" ++ ++ : Parallel makes reveal that we have some interdependencies ++ case $f in ++ Math/BigInt/FastCalc) extra_dep="$extra_dep ++$this_target: lib/auto/List/Util/Util.$dlext" ;; ++ Unicode/Normalize) extra_dep="$extra_dep ++$this_target: lib/unicore/CombiningClass.pl" ;; ++ esac + done + + static_list=' ' +@@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) ++!NO!SUBS! ++ ++$spitshell >>Makefile <>Makefile <<'!NO!SUBS!' + +EOPATCH + } + + if ($major == 15 && $^O !~ /^(linux|darwin|.*bsd)$/ + && extract_from_file('Makefile.SH', qr/^V.* \?= /)) { + # Remove the GNU-make-ism (which the BSD makes also support, but + # most other makes choke on) + apply_patch(<<'EOPATCH'); +diff --git a/Makefile.SH b/Makefile.SH +index 94952bd..13e9001 100755 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -338,8 +338,8 @@ linux*|darwin) + $spitshell >>$Makefile </dev/null ++VALGRIND = valgrind ++VG_TEST = ./perl -e 1 2>/dev/null + + !GROK!THIS! + ;; +EOPATCH + } + + if ($major == 11) { + if (extract_from_file('patchlevel.h', + qr/^#include "unpushed\.h"/)) { + # I had thought it easier to detect when building one of the 52 + # commits with the original method of incorporating the git + # revision and drop parallel make flags. Commits shown by + # git log 46807d8e809cc127^..dcff826f70bf3f64^ ^d4fb0a1f15d1a1c4 + # However, it's not actually possible to make miniperl for that + # configuration as-is, because the file .patchnum is only made + # as a side effect of target 'all' + # I also don't think that it's "safe" to simply run + # make_patchnum.sh before the build. We need the proper + # dependency rules in the Makefile to *stop* it being run again + # at the wrong time. + # This range is important because contains the commit that + # merges Schwern's y2038 work. + apply_patch(<<'EOPATCH'); +diff --git a/Makefile.SH b/Makefile.SH +index 9ad8b6f..106e721 100644 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -540,9 +544,14 @@ sperl.i: perl.c $(h) + + .PHONY: all translators utilities make_patchnum + +-make_patchnum: ++make_patchnum: lib/Config_git.pl ++ ++lib/Config_git.pl: make_patchnum.sh + sh $(shellflags) make_patchnum.sh + ++# .patchnum, unpushed.h and lib/Config_git.pl are built by make_patchnum.sh ++unpushed.h .patchnum: lib/Config_git.pl ++ + # make sure that we recompile perl.c if .patchnum changes + perl$(OBJ_EXT): .patchnum unpushed.h + +EOPATCH + } elsif (-f '.gitignore' + && extract_from_file('.gitignore', qr/^\.patchnum$/)) { + # 8565263ab8a47cda to 46807d8e809cc127^ inclusive. + edit_file('Makefile.SH', sub { + my $code = shift; + $code =~ s/^make_patchnum:\n/make_patchnum: .patchnum + +.sha1: .patchnum + +.patchnum: make_patchnum.sh +/m; + return $code; + }); + } elsif (-f 'lib/.gitignore' + && extract_from_file('lib/.gitignore', + qr!^/Config_git.pl!) + && !extract_from_file('Makefile.SH', + qr/^uudmap\.h.*:bitcount.h$/)) { + # Between commits and dcff826f70bf3f64 and 0f13ebd5d71f8177^ + edit_file('Makefile.SH', sub { + my $code = shift; + # Bug introduced by 344af494c35a9f0f + # fixed in 0f13ebd5d71f8177 + $code =~ s{^(pod/perlapi\.pod) (pod/perlintern\.pod): } + {$1: $2\n\n$2: }m; + # Bug introduced by efa50c51e3301a2c + # fixed in 0f13ebd5d71f8177 + $code =~ s{^(uudmap\.h) (bitcount\.h): } + {$1: $2\n\n$2: }m; + + # The rats nest of getting git_version.h correct + + if ($code =~ s{git_version\.h: stock_git_version\.h +\tcp stock_git_version\.h git_version\.h} + {}m) { + # before 486cd780047ff224 + + # We probably can't build between + # 953f6acfa20ec275^ and 8565263ab8a47cda + # inclusive, but all commits in that range + # relate to getting make_patchnum.sh working, + # so it is extremely unlikely to be an + # interesting bisect target. They will skip. + + # No, don't spawn a submake if + # make_patchnum.sh or make_patchnum.pl fails + $code =~ s{\|\| \$\(MAKE\) miniperl.*} + {}m; + $code =~ s{^\t(sh.*make_patchnum\.sh.*)} + {\t-$1}m; + + # Use an external perl to run make_patchnum.pl + # because miniperl still depends on + # git_version.h + $code =~ s{^\t.*make_patchnum\.pl} + {\t-$^X make_patchnum.pl}m; + + + # "Truth in advertising" - running + # make_patchnum generates 2 files. + $code =~ s{^make_patchnum:.*}{ +make_patchnum: lib/Config_git.pl + +git_version.h: lib/Config_git.pl + +perlmini\$(OBJ_EXT): git_version.h + +lib/Config_git.pl:}m; + } + # Right, now we've corrected Makefile.SH to + # correctly describe how lib/Config_git.pl and + # git_version.h are made, we need to fix the rest + + # This emulates commit 2b63e250843b907e + # This might duplicate the rule stating that + # git_version.h depends on lib/Config_git.pl + # This is harmless. + $code =~ s{^(?:lib/Config_git\.pl )?git_version\.h: (.* make_patchnum\.pl.*)} + {git_version.h: lib/Config_git.pl + +lib/Config_git.pl: $1}m; + + # This emulates commits 0f13ebd5d71f8177 and + # and a04d4598adc57886. It ensures that + # lib/Config_git.pl is built before configpm, + # and that configpm is run exactly once. + $code =~ s{^(\$\(.*?\) )?(\$\(CONFIGPOD\))(: .*? configpm Porting/Glossary)( lib/Config_git\.pl)?}{ + # If present, other files depend on $(CONFIGPOD) + ($1 ? "$1: $2\n\n" : '') + # Then the rule we found + . $2 . $3 + # Add dependency if not there + . ($4 ? $4 : ' lib/Config_git.pl') + }me; + + return $code; + }); + } + } + + if ($major < 14) { + # Commits dc0655f797469c47 and d11a62fe01f2ecb2 + edit_file('Makefile.SH', sub { + my $code = shift; + foreach my $ext (qw(Encode SDBM_File)) { + next if $code =~ /\b$ext\) extra_dep=/s; + $code =~ s!(\) extra_dep="\$extra_dep +\$this_target: .*?" ;;) +( esac +)!$1 + $ext) extra_dep="\$extra_dep +\$this_target: lib/auto/Cwd/Cwd.\$dlext" ;; +$2!; + } + return $code; + }); + } + } + + if ($major == 7) { + # Remove commits 9fec149bb652b6e9 and 5bab1179608f81d8, which add/amend + # rules to automatically run regen scripts that rebuild C headers. These + # cause problems because a git checkout doesn't preserve relative file + # modification times, hence the regen scripts may fire. This will + # obscure whether the repository had the correct generated headers + # checked in. + # Also, the dependency rules for running the scripts were not correct, + # which could cause spurious re-builds on re-running make, and can cause + # complete build failures for a parallel make. + if (extract_from_file('Makefile.SH', + qr/Writing it this way gives make a big hint to always run opcode\.pl before/)) { + apply_commit('70c6e6715e8fec53'); + } elsif (extract_from_file('Makefile.SH', + qr/^opcode\.h opnames\.h pp_proto\.h pp\.sym: opcode\.pl$/)) { + revert_commit('9fec149bb652b6e9'); + } + } + + if ($^O eq 'aix' && $major >= 11 && $major <= 15 + && extract_from_file('makedef.pl', qr/^use Config/)) { + edit_file('Makefile.SH', sub { + # The AIX part of commit e6807d8ab22b761c + # It's safe to substitute lib/Config.pm for config.sh + # as lib/Config.pm depends on config.sh + # If the tree is post e6807d8ab22b761c, the substitution + # won't match, which is harmless. + my $code = shift; + $code =~ s{^(perl\.exp:.* )config\.sh(\b.*)} + {$1 . '$(CONFIGPM)' . $2}me; + return $code; + }); + } + + # There was a bug in makedepend.SH which was fixed in version 96a8704c. + # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string' + # Remove this if you're actually bisecting a problem related to + # makedepend.SH + # If you do this, you may need to add in code to correct the output of older + # makedepends, which don't correctly filter newer gcc output such as + # + checkout_file('makedepend.SH'); + + if ($major < 4 && -f 'config.sh' + && !extract_from_file('config.sh', qr/^trnl=/)) { + # This seems to be necessary to avoid makedepend becoming confused, + # and hanging on stdin. Seems that the code after + # make shlist || ...here... is never run. + edit_file('makedepend.SH', sub { + my $code = shift; + $code =~ s/^trnl='\$trnl'$/trnl='\\n'/m; + return $code; + }); + } +} + +sub patch_C { + # This is ordered by $major, as it's likely that different platforms may + # well want to share code. + + if ($major == 2 && extract_from_file('perl.c', qr/^\tfclose\(e_fp\);$/)) { + # need to patch perl.c to avoid calling fclose() twice on e_fp when + # using -e + # This diff is part of commit ab821d7fdc14a438. The second close was + # introduced with perl-5.002, commit a5f75d667838e8e7 + # Might want a6c477ed8d4864e6 too, for the corresponding change to + # pp_ctl.c (likely without this, eval will have "fun") + apply_patch(<<'EOPATCH'); +diff --git a/perl.c b/perl.c +index 03c4d48..3c814a2 100644 +--- a/perl.c ++++ b/perl.c +@@ -252,6 +252,7 @@ setuid perl scripts securely.\n"); + #ifndef VMS /* VMS doesn't have environ array */ + origenviron = environ; + #endif ++ e_tmpname = Nullch; + + if (do_undump) { + +@@ -405,6 +406,7 @@ setuid perl scripts securely.\n"); + if (e_fp) { + if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp)) + croak("Can't write to temp file for -e: %s", Strerror(errno)); ++ e_fp = Nullfp; + argc++,argv--; + scriptname = e_tmpname; + } +@@ -470,10 +472,10 @@ setuid perl scripts securely.\n"); + curcop->cop_line = 0; + curstash = defstash; + preprocess = FALSE; +- if (e_fp) { +- fclose(e_fp); +- e_fp = Nullfp; ++ if (e_tmpname) { + (void)UNLINK(e_tmpname); ++ Safefree(e_tmpname); ++ e_tmpname = Nullch; + } + + /* now that script is parsed, we can modify record separator */ +@@ -1369,7 +1371,7 @@ SV *sv; + scriptname = xfound; + } + +- origfilename = savepv(e_fp ? "-e" : scriptname); ++ origfilename = savepv(e_tmpname ? "-e" : scriptname); + curcop->cop_filegv = gv_fetchfile(origfilename); + if (strEQ(origfilename,"-")) + scriptname = ""; + +EOPATCH + } -if ($major < 10 && -d 'ext/Unicode/Normalize/' - && !extract_from_file('Configure', qr/^extra_dep=''$/)) { - # The Makefile.PL for Unicode::Normalize needs - # lib/unicore/CombiningClass.pl. Even without a parallel build, we need - # a dependency to ensure that it builds. This is a variant of commit - # 9f3ef600c170f61e - apply_patch(<<'EOPATCH'); -diff --git a/Makefile.SH b/Makefile.SH -index f61d0db..6097954 100644 ---- a/Makefile.SH -+++ b/Makefile.SH -@@ -155,10 +155,20 @@ esac + if ($major < 3 && $^O eq 'openbsd' + && !extract_from_file('pp_sys.c', qr/BSD_GETPGRP/)) { + # Part of commit c3293030fd1b7489 + apply_patch(<<'EOPATCH'); +diff --git a/pp_sys.c b/pp_sys.c +index 4608a2a..f0c9d1d 100644 +--- a/pp_sys.c ++++ b/pp_sys.c +@@ -2903,8 +2903,8 @@ PP(pp_getpgrp) + pid = 0; + else + pid = SvIVx(POPs); +-#ifdef USE_BSDPGRP +- value = (I32)getpgrp(pid); ++#ifdef BSD_GETPGRP ++ value = (I32)BSD_GETPGRP(pid); + #else + if (pid != 0) + DIE("POSIX getpgrp can't take an argument"); +@@ -2933,8 +2933,8 @@ PP(pp_setpgrp) + } - : Prepare dependency lists for Makefile. - dynamic_list=' ' -+extra_dep='' - for f in $dynamic_ext; do - : the dependency named here will never exist - base=`echo "$f" | sed 's/.*\///'` -- dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext" -+ this_target="lib/auto/$f/$base.$dlext" -+ dynamic_list="$dynamic_list $this_target" -+ -+ : Parallel makes reveal that we have some interdependencies -+ case $f in -+ Math/BigInt/FastCalc) extra_dep="$extra_dep -+$this_target: lib/auto/List/Util/Util.$dlext" ;; -+ Unicode/Normalize) extra_dep="$extra_dep -+$this_target: lib/unicore/CombiningClass.pl" ;; -+ esac - done + TAINT_PROPER("setpgrp"); +-#ifdef USE_BSDPGRP +- SETi( setpgrp(pid, pgrp) >= 0 ); ++#ifdef BSD_SETPGRP ++ SETi( BSD_SETPGRP(pid, pgrp) >= 0 ); + #else + if ((pgrp != 0) || (pid != 0)) { + DIE("POSIX setpgrp can't take an argument"); +EOPATCH + } + + if ($major < 4 && $^O eq 'openbsd') { + my $bad; + # Need changes from commit a6e633defa583ad5. + # Commits c07a80fdfe3926b5 and f82b3d4130164d5f changed the same part + # of perl.h + + if (extract_from_file('perl.h', + qr/^#ifdef HAS_GETPGRP2$/)) { + $bad = <<'EOBAD'; +*************** +*** 57,71 **** + #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s) + #define TAINT_ENV() if (tainting) taint_env() + +! #ifdef HAS_GETPGRP2 +! # ifndef HAS_GETPGRP +! # define HAS_GETPGRP +! # endif +! #endif +! +! #ifdef HAS_SETPGRP2 +! # ifndef HAS_SETPGRP +! # define HAS_SETPGRP +! # endif + #endif + +EOBAD + } elsif (extract_from_file('perl.h', + qr/Gack, you have one but not both of getpgrp2/)) { + $bad = <<'EOBAD'; +*************** +*** 56,76 **** + #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s) + #define TAINT_ENV() if (tainting) taint_env() + +! #if defined(HAS_GETPGRP2) && defined(HAS_SETPGRP2) +! # define getpgrp getpgrp2 +! # define setpgrp setpgrp2 +! # ifndef HAS_GETPGRP +! # define HAS_GETPGRP +! # endif +! # ifndef HAS_SETPGRP +! # define HAS_SETPGRP +! # endif +! # ifndef USE_BSDPGRP +! # define USE_BSDPGRP +! # endif +! #else +! # if defined(HAS_GETPGRP2) || defined(HAS_SETPGRP2) +! #include "Gack, you have one but not both of getpgrp2() and setpgrp2()." +! # endif + #endif + +EOBAD + } elsif (extract_from_file('perl.h', + qr/^#ifdef USE_BSDPGRP$/)) { + $bad = <<'EOBAD' +*************** +*** 91,116 **** + #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s) + #define TAINT_ENV() if (tainting) taint_env() + +! #ifdef USE_BSDPGRP +! # ifdef HAS_GETPGRP +! # define BSD_GETPGRP(pid) getpgrp((pid)) +! # endif +! # ifdef HAS_SETPGRP +! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp)) +! # endif +! #else +! # ifdef HAS_GETPGRP2 +! # define BSD_GETPGRP(pid) getpgrp2((pid)) +! # ifndef HAS_GETPGRP +! # define HAS_GETPGRP +! # endif +! # endif +! # ifdef HAS_SETPGRP2 +! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp)) +! # ifndef HAS_SETPGRP +! # define HAS_SETPGRP +! # endif +! # endif + #endif + + #ifndef _TYPES_ /* If types.h defines this it's easy. */ +EOBAD + } + if ($bad) { + apply_patch(<<"EOPATCH"); +*** a/perl.h 2011-10-21 09:46:12.000000000 +0200 +--- b/perl.h 2011-10-21 09:46:12.000000000 +0200 +$bad--- 91,144 ---- + #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s) + #define TAINT_ENV() if (tainting) taint_env() + +! /* XXX All process group stuff is handled in pp_sys.c. Should these +! defines move there? If so, I could simplify this a lot. --AD 9/96. +! */ +! /* Process group stuff changed from traditional BSD to POSIX. +! perlfunc.pod documents the traditional BSD-style syntax, so we'll +! try to preserve that, if possible. +! */ +! #ifdef HAS_SETPGID +! # define BSD_SETPGRP(pid, pgrp) setpgid((pid), (pgrp)) +! #else +! # if defined(HAS_SETPGRP) && defined(USE_BSD_SETPGRP) +! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp)) +! # else +! # ifdef HAS_SETPGRP2 /* DG/UX */ +! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp)) +! # endif +! # endif +! #endif +! #if defined(BSD_SETPGRP) && !defined(HAS_SETPGRP) +! # define HAS_SETPGRP /* Well, effectively it does . . . */ +! #endif +! +! /* getpgid isn't POSIX, but at least Solaris and Linux have it, and it makes +! our life easier :-) so we'll try it. +! */ +! #ifdef HAS_GETPGID +! # define BSD_GETPGRP(pid) getpgid((pid)) +! #else +! # if defined(HAS_GETPGRP) && defined(USE_BSD_GETPGRP) +! # define BSD_GETPGRP(pid) getpgrp((pid)) +! # else +! # ifdef HAS_GETPGRP2 /* DG/UX */ +! # define BSD_GETPGRP(pid) getpgrp2((pid)) +! # endif +! # endif +! #endif +! #if defined(BSD_GETPGRP) && !defined(HAS_GETPGRP) +! # define HAS_GETPGRP /* Well, effectively it does . . . */ +! #endif +! +! /* These are not exact synonyms, since setpgrp() and getpgrp() may +! have different behaviors, but perl.h used to define USE_BSDPGRP +! (prior to 5.003_05) so some extension might depend on it. +! */ +! #if defined(USE_BSD_SETPGRP) || defined(USE_BSD_GETPGRP) +! # ifndef USE_BSDPGRP +! # define USE_BSDPGRP +! # endif + #endif + + #ifndef _TYPES_ /* If types.h defines this it's easy. */ +EOPATCH + } + } + + if ($major < 4 && $^O eq 'hpux' + && extract_from_file('sv.c', qr/i = _filbuf\(/)) { + apply_patch(<<'EOPATCH'); +diff --git a/sv.c b/sv.c +index a1f1d60..0a806f1 100644 +--- a/sv.c ++++ b/sv.c +@@ -2641,7 +2641,7 @@ I32 append; - static_list=' ' -@@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -+!NO!SUBS! -+ -+$spitshell >>Makefile <>Makefile <<'!NO!SUBS!' + FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */ + FILE_ptr(fp) = ptr; +- i = _filbuf(fp); /* get more characters */ ++ i = __filbuf(fp); /* get more characters */ + cnt = FILE_cnt(fp); + ptr = FILE_ptr(fp); /* reregisterize cnt and ptr */ + EOPATCH -} + } + + if ($major == 4 && extract_from_file('scope.c', qr/\(SV\*\)SSPOPINT/)) { + # [PATCH] 5.004_04 +MAINT_TRIAL_1 broken when sizeof(int) != sizeof(void) + # Fixes a bug introduced in 161b7d1635bc830b + apply_commit('9002cb76ec83ef7f'); + } + + if ($major == 4 && extract_from_file('av.c', qr/AvARRAY\(av\) = 0;/)) { + # Fixes a bug introduced in 1393e20655efb4bc + apply_commit('e1c148c28bf3335b', 'av.c'); + } + + if ($major == 4) { + my $rest = extract_from_file('perl.c', qr/delimcpy(.*)/); + if (defined $rest and $rest !~ /,$/) { + # delimcpy added in fc36a67e8855d031, perl.c refactored to use it. + # bug introduced in 2a92aaa05aa1acbf, fixed in 8490252049bf42d3 + # code then moved to util.c in commit 491527d0220de34e + apply_patch(<<'EOPATCH'); +diff --git a/perl.c b/perl.c +index 4eb69e3..54bbb00 100644 +--- a/perl.c ++++ b/perl.c +@@ -1735,7 +1735,7 @@ SV *sv; + if (len < sizeof tokenbuf) + tokenbuf[len] = '\0'; + #else /* ! (atarist || DOSISH) */ +- s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend ++ s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend, + ':', + &len); + #endif /* ! (atarist || DOSISH) */ +EOPATCH + } + } + + if ($major == 4 && $^O eq 'linux') { + # Whilst this is fixed properly in f0784f6a4c3e45e1 which provides the + # Configure probe, it's easier to back out the problematic changes made + # in these previous commits. + + # In maint-5.004, the simplest addition is to "correct" the file to + # use the same pre-processor macros as blead had used. Whilst commit + # 9b599b2a63d2324d (reverted below) is described as + # [win32] merge change#887 from maintbranch + # it uses __sun__ and __svr4__ instead of the __sun and __SVR4 of the + # maint branch commit 6cdf74fe31f049dc + + edit_file('doio.c', sub { + my $code = shift; + $code =~ s{defined\(__sun\) && defined\(__SVR4\)} + {defined(__sun__) && defined(__svr4__)}g; + return $code; + }); + + if (extract_from_file('doio.c', + qr!^/\* XXX REALLY need metaconfig test \*/$!)) { + revert_commit('4682965a1447ea44', 'doio.c'); + } + if (my $token = extract_from_file('doio.c', + qr!^#if (defined\(__sun(?:__)?\)) && defined\(__svr4__\) /\* XXX Need metaconfig test \*/$!)) { + my $patch = `git show -R 9b599b2a63d2324d doio.c`; + $patch =~ s/defined\(__sun__\)/$token/g; + apply_patch($patch); + } + if (extract_from_file('doio.c', + qr!^/\* linux \(and Solaris2\?\) uses :$!)) { + revert_commit('8490252049bf42d3', 'doio.c'); + } + if (extract_from_file('doio.c', + qr/^ unsemds.buf = &semds;$/)) { + revert_commit('8e591e46b4c6543e'); + } + if (extract_from_file('doio.c', + qr!^#ifdef __linux__ /\* XXX Need metaconfig test \*/$!)) { + # Reverts part of commit 3e3baf6d63945cb6 + apply_patch(<<'EOPATCH'); +diff --git b/doio.c a/doio.c +index 62b7de9..0d57425 100644 +--- b/doio.c ++++ a/doio.c +@@ -1333,9 +1331,6 @@ SV **sp; + char *a; + I32 id, n, cmd, infosize, getinfo; + I32 ret = -1; +-#ifdef __linux__ /* XXX Need metaconfig test */ +- union semun unsemds; +-#endif + + id = SvIVx(*++mark); + n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0; +@@ -1364,29 +1359,11 @@ SV **sp; + infosize = sizeof(struct semid_ds); + else if (cmd == GETALL || cmd == SETALL) + { +-#ifdef __linux__ /* XXX Need metaconfig test */ +-/* linux uses : +- int semctl (int semid, int semnun, int cmd, union semun arg) +- +- union semun { +- int val; +- struct semid_ds *buf; +- ushort *array; +- }; +-*/ +- union semun semds; +- if (semctl(id, 0, IPC_STAT, semds) == -1) +-#else + struct semid_ds semds; + if (semctl(id, 0, IPC_STAT, &semds) == -1) +-#endif + return -1; + getinfo = (cmd == GETALL); +-#ifdef __linux__ /* XXX Need metaconfig test */ +- infosize = semds.buf->sem_nsems * sizeof(short); +-#else + infosize = semds.sem_nsems * sizeof(short); +-#endif + /* "short" is technically wrong but much more portable + than guessing about u_?short(_t)? */ + } +@@ -1429,12 +1406,7 @@ SV **sp; + #endif + #ifdef HAS_SEM + case OP_SEMCTL: +-#ifdef __linux__ /* XXX Need metaconfig test */ +- unsemds.buf = (struct semid_ds *)a; +- ret = semctl(id, n, cmd, unsemds); +-#else + ret = semctl(id, n, cmd, (struct semid_ds *)a); +-#endif + break; + #endif + #ifdef HAS_SHM +EOPATCH + } + # Incorrect prototype added as part of 8ac853655d9b7447, fixed as part + # of commit dc45a647708b6c54, with at least one intermediate + # modification. Correct prototype for gethostbyaddr has socklen_t + # second. Linux has uint32_t first for getnetbyaddr. + # Easiest just to remove, instead of attempting more complex patching. + # Something similar may be needed on other platforms. + edit_file('pp_sys.c', sub { + my $code = shift; + $code =~ s/^ struct hostent \*(?:PerlSock_)?gethostbyaddr\([^)]+\);$//m; + $code =~ s/^ struct netent \*getnetbyaddr\([^)]+\);$//m; + return $code; + }); + } + + if ($major < 5 && $^O eq 'aix' + && !extract_from_file('pp_sys.c', + qr/defined\(HOST_NOT_FOUND\) && !defined\(h_errno\)/)) { + # part of commit dc45a647708b6c54 + # Andy Dougherty's configuration patches (Config_63-01 up to 04). + apply_patch(<<'EOPATCH') +diff --git a/pp_sys.c b/pp_sys.c +index c2fcb6f..efa39fb 100644 +--- a/pp_sys.c ++++ b/pp_sys.c +@@ -54,7 +54,7 @@ extern "C" int syscall(unsigned long,...); + #endif + #endif + +-#ifdef HOST_NOT_FOUND ++#if defined(HOST_NOT_FOUND) && !defined(h_errno) + extern int h_errno; + #endif + +EOPATCH + } + + if ($major == 5 + && `git rev-parse HEAD` eq "22c35a8c2392967a5ba6b5370695be464bd7012c\n") { + # Commit 22c35a8c2392967a is significant, + # "phase 1 of somewhat major rearrangement of PERL_OBJECT stuff" + # but doesn't build due to 2 simple errors. blead in this broken state + # was merged to the cfgperl branch, and then these were immediately + # corrected there. cfgperl (with the fixes) was merged back to blead. + # The resultant rather twisty maze of commits looks like this: + +=begin comment + +* | | commit 137225782c183172f360c827424b9b9f8adbef0e +|\ \ \ Merge: 22c35a8 2a8ee23 +| |/ / Author: Gurusamy Sarathy +| | | Date: Fri Oct 30 17:38:36 1998 +0000 +| | | +| | | integrate cfgperl tweaks into mainline +| | | +| | | p4raw-id: //depot/perl@2144 +| | | +| * | commit 2a8ee23279873759693fa83eca279355db2b665c +| | | Author: Jarkko Hietaniemi +| | | Date: Fri Oct 30 13:27:39 1998 +0000 +| | | +| | | There can be multiple yacc/bison errors. +| | | +| | | p4raw-id: //depot/cfgperl@2143 +| | | +| * | commit 93fb2ac393172fc3e2c14edb20b718309198abbc +| | | Author: Jarkko Hietaniemi +| | | Date: Fri Oct 30 13:18:43 1998 +0000 +| | | +| | | README.posix-bc update. +| | | +| | | p4raw-id: //depot/cfgperl@2142 +| | | +| * | commit 4ec43091e8e6657cb260b5e563df30aaa154effe +| | | Author: Jarkko Hietaniemi +| | | Date: Fri Oct 30 09:12:59 1998 +0000 +| | | +| | | #2133 fallout. +| | | +| | | p4raw-id: //depot/cfgperl@2141 +| | | +| * | commit 134ca994cfefe0f613d43505a885e4fc2100b05c +| |\ \ Merge: 7093112 22c35a8 +| |/ / Author: Jarkko Hietaniemi +|/| | Date: Fri Oct 30 08:43:18 1998 +0000 +| | | +| | | Integrate from mainperl. +| | | +| | | p4raw-id: //depot/cfgperl@2140 +| | | +* | | commit 22c35a8c2392967a5ba6b5370695be464bd7012c +| | | Author: Gurusamy Sarathy +| | | Date: Fri Oct 30 02:51:39 1998 +0000 +| | | +| | | phase 1 of somewhat major rearrangement of PERL_OBJECT stuff +| | | (objpp.h is gone, embed.pl now does some of that); objXSUB.h +| | | should soon be automated also; the global variables that +| | | escaped the PL_foo conversion are now reined in; renamed +| | | MAGIC in regcomp.h to REG_MAGIC to avoid collision with the +| | | type of same name; duplicated lists of pp_things in various +| | | places is now gone; result has only been tested on win32 +| | | +| | | p4raw-id: //depot/perl@2133 + +=end comment + +=cut + + # and completely confuses git bisect (and at least me), causing it to + # the bisect run to confidently return the wrong answer, an unrelated + # commit on the cfgperl branch. + + apply_commit('4ec43091e8e6657c'); + } -# There was a bug in makedepend.SH which was fixed in version 96a8704c. -# Symptom was './makedepend: 1: Syntax error: Unterminated quoted string' -# Remove this if you're actually bisecting a problem related to makedepend.SH -system 'git show blead:makedepend.SH > makedepend.SH hints/freebsd.sh + # endif +-# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF)) +-# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF)) +-# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF)) ++ /* XXX Configure test needed for eaccess */ ++# ifdef ACC_SELF ++ /* HP SecureWare */ ++# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF)) ++# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF)) ++# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF)) ++# else ++ /* SCO */ ++# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK)) ++# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK)) ++# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK)) ++# endif + #endif + + #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF) +EOPATCH + } + + if ($major == 5 + && extract_from_file('mg.c', qr/If we're still on top of the stack, pop us off/) + && !extract_from_file('mg.c', qr/PL_savestack_ix -= popval/)) { + # Fix up commit 455ece5e082708b1: + # SSNEW() API for allocating memory on the savestack + # Message-Id: + # Subject: [PATCH 5.005_51] (was: why SAVEDESTRUCTOR()...) + apply_commit('3c8a44569607336e', 'mg.c'); + } + + if ($major == 5) { + if (extract_from_file('doop.c', qr/croak\(no_modify\);/) + && extract_from_file('doop.c', qr/croak\(PL_no_modify\);/)) { + # Whilst the log suggests that this would only fix 5 commits, in + # practice this area of history is a complete tarpit, and git bisect + # gets very confused by the skips in the middle of the back and + # forth merging between //depot/perl and //depot/cfgperl + apply_commit('6393042b638dafd3'); + } + + # One error "fixed" with another: + if (extract_from_file('pp_ctl.c', + qr/\Qstatic void *docatch_body _((void *o));\E/)) { + apply_commit('5b51e982882955fe'); + } + # Which is then fixed by this: + if (extract_from_file('pp_ctl.c', + qr/\Qstatic void *docatch_body _((valist\E/)) { + apply_commit('47aa779ee4c1a50e'); + } + + if (extract_from_file('thrdvar.h', qr/PERLVARI\(Tprotect/) + && !extract_from_file('embedvar.h', qr/PL_protect/)) { + # Commit 312caa8e97f1c7ee didn't update embedvar.h + apply_commit('e0284a306d2de082', 'embedvar.h'); + } + } + + if ($major == 5 + && extract_from_file('sv.c', + qr/PerlDir_close\(IoDIRP\((?:\(IO\*\))?sv\)\);/) + && !(extract_from_file('toke.c', + qr/\QIoDIRP(FILTER_DATA(AvFILLp(PL_rsfp_filters))) = NULL\E/) + || extract_from_file('toke.c', + qr/\QIoDIRP(datasv) = (DIR*)NULL;\E/))) { + # Commit 93578b34124e8a3b, //depot/perl@3298 + # close directory handles properly when localized, + # tweaked slightly by commit 1236053a2c722e2b, + # add test case for change#3298 # - # : Try to guess additional flags to pick up local libraries. + # The fix is the last part of: + # + # various fixes for clean build and test on win32; configpm broken, + # needed to open myconfig.SH rather than myconfig; sundry adjustments + # to bytecode stuff; tweaks to DYNAMIC_ENV_FETCH code to make it + # work under win32; getenv_sv() changed to getenv_len() since SVs + # aren't visible in the lower echelons; remove bogus exports from + # config.sym; PERL_OBJECT-ness for C++ exception support; null out + # IoDIRP in filter_del() or sv_free() will attempt to close it + # + # The changed code is modified subsequently by commit e0c198038146b7a4 + apply_commit('a6c403648ecd5cc7', 'toke.c'); + } + + if ($major < 6 && $^O eq 'netbsd' + && !extract_from_file('unixish.h', + qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) { + apply_patch(<<'EOPATCH') +diff --git a/unixish.h b/unixish.h +index 2a6cbcd..eab2de1 100644 +--- a/unixish.h ++++ b/unixish.h +@@ -89,7 +89,7 @@ + */ + /* #define ALTERNATE_SHEBANG "#!" / **/ + +-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) ++#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__) + # include + #endif + +EOPATCH + } + + if ($major == 7 && $^O eq 'aix' && + extract_from_file('ext/List/Util/Util.xs', qr/PUSHBLOCK/) + && !extract_from_file('makedef.pl', qr/^Perl_cxinc/)) { + # Need this to get List::Utils 1.03 and later to compile. + # 1.03 also expects to call Perl_pp_rand. Commit d3632a54487acc5f + # fixes this (for the unthreaded case), but it's not until 1.05, + # two days later, that this is fixed properly. + apply_commit('cbb96eed3f175499'); + } + + if (($major >= 7 || $major <= 9) && $^O eq 'openbsd' + && `uname -m` eq "sparc64\n" + # added in 2000 by commit cb434fcc98ac25f5: + && extract_from_file('regexec.c', + qr!/\* No need to save/restore up to this paren \*/!) + # re-indented in 2006 by commit 95b2444054382532: + && extract_from_file('regexec.c', qr/^\t\tCURCUR cc;$/)) { + # Need to work around a bug in (at least) OpenBSD's 4.6's sparc64 # + # compiler ["gcc (GCC) 3.3.5 (propolice)"]. Between commits + # 3ec562b0bffb8b8b (2002) and 1a4fad37125bac3e^ (2005) the darling thing + # fails to compile any code for the statement cc.oldcc = PL_regcc; # - # which will automatically add --L/usr/local/lib because libpth - # contains /usr/local/lib + # If you refactor the code to "fix" that, or force the issue using set + # in the debugger, the stack smashing detection code fires on return + # from S_regmatch(). Turns out that the compiler doesn't allocate any + # (or at least enough) space for cc. # - # Without it, if Configure finds libraries in /usr/local/lib (eg - # libgdbm.so) and adds them to the compiler commandline (as -lgdbm), - # then the link will fail. We can't fix this up in config.sh because - # the link will *also* fail in the test compiles that Configure does - # (eg $inlibc) which makes Configure get all sorts of things - # wrong. :-( So bodge it here. + # Restore the "uninitialised" value for cc before function exit, and the + # stack smashing code is placated. "Fix" 3ec562b0bffb8b8b (which + # changes the size of auto variables used elsewhere in S_regmatch), and + # the crash is visible back to bc517b45fdfb539b (which also changes + # buffer sizes). "Unfix" 1a4fad37125bac3e and the crash is visible until + # 5b47454deb66294b. Problem goes away if you compile with -O, or hack + # the code as below. # - # Possibly other platforms will need something similar. (if they - # have "wanted" libraries in /usr/local/lib, but the compiler - # doesn't default to putting that directory in its link path) + # Hence this turns out to be a bug in (old) gcc. Not a security bug we + # still need to fix. + apply_patch(<<'EOPATCH'); +diff --git a/regexec.c b/regexec.c +index 900b491..6251a0b 100644 +--- a/regexec.c ++++ b/regexec.c +@@ -2958,7 +2958,11 @@ S_regmatch(pTHX_ regnode *prog) + I,I + *******************************************************************/ + case CURLYX: { +- CURCUR cc; ++ union { ++ CURCUR hack_cc; ++ char hack_buff[sizeof(CURCUR) + 1]; ++ } hack; ++#define cc hack.hack_cc + CHECKPOINT cp = PL_savestack_ix; + /* No need to save/restore up to this paren */ + I32 parenfloor = scan->flags; +@@ -2983,6 +2987,7 @@ S_regmatch(pTHX_ regnode *prog) + n = regmatch(PREVOPER(next)); /* start on the WHILEM */ + regcpblow(cp); + PL_regcc = cc.oldcc; ++#undef cc + saySAME(n); + } + /* NOT REACHED */ +EOPATCH +} + + if ($major < 8 && $^O eq 'openbsd' + && !extract_from_file('perl.h', qr/include /)) { + # This is part of commit 3f270f98f9305540, applied at a slightly + # different location in perl.h, where the context is stable back to + # 5.000 apply_patch(<<'EOPATCH'); ---- perl2/hints/freebsd.sh.orig 2011-10-05 16:44:55.000000000 +0200 -+++ perl2/hints/freebsd.sh 2011-10-05 16:45:52.000000000 +0200 -@@ -125,7 +125,7 @@ - else - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" -- ldflags="-Wl,-E " -+ ldflags="-Wl,-E -L/usr/local/lib " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' -@@ -133,7 +133,7 @@ - *) - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" -- ldflags="-Wl,-E " -+ ldflags="-Wl,-E -L/usr/local/lib " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' - ;; +diff --git a/perl.h b/perl.h +index 9418b52..b8b1a7c 100644 +--- a/perl.h ++++ b/perl.h +@@ -496,6 +496,10 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); + # include + #endif + ++/* If this causes problems, set i_unistd=undef in the hint file. */ ++#ifdef I_UNISTD ++# include ++#endif + + /* Use all the "standard" definitions? */ + #if defined(STANDARD_C) && defined(I_STDLIB) EOPATCH } -} elsif ($^O eq 'darwin') { - if ($major < 8) { - my $faking_it; - # We can't build on darwin without some of the data in the hints file. - foreach ('ext/DynaLoader/dl_dyld.xs', 'hints/darwin.sh') { - next if -f $_; - ++$faking_it; - # Probably less surprising to use the earliest version of - # hints/darwin.sh and then edit in place just below, than use - # blead's version, as that would create a discontinuity at - # f556e5b971932902 - before it, hints bugs would be "fixed", after - # it they'd resurface. This way, we should give the illusion of - # monotonic bug fixing. - system "git show f556e5b971932902:$_ >$_" - and die "while attempting to extract $_"; - } - if ($faking_it) { - apply_patch(<<'EOPATCH'); +} + +sub patch_ext { + if (-f 'ext/POSIX/Makefile.PL' + && extract_from_file('ext/POSIX/Makefile.PL', + qr/Explicitly avoid including/)) { + # commit 6695a346c41138df, which effectively reverts 170888cff5e2ffb7 + + # PERL5LIB is populated by make_ext.pl with paths to the modules we need + # to run, don't override this with "../../lib" since that may not have + # been populated yet in a parallel build. + apply_commit('6695a346c41138df'); + } + + if (-f 'ext/Hash/Util/Makefile.PL' + && extract_from_file('ext/Hash/Util/Makefile.PL', + qr/\bDIR\b.*'FieldHash'/)) { + # ext/Hash/Util/Makefile.PL should not recurse to FieldHash's Makefile.PL + # *nix, VMS and Win32 all know how to (and have to) call the latter directly. + # As is, targets in ext/Hash/Util/FieldHash get called twice, which may result + # in race conditions, and certainly messes up make clean; make distclean; + apply_commit('550428fe486b1888'); + } + + if ($major < 8 && $^O eq 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') { + checkout_file('ext/DynaLoader/dl_dyld.xs', 'f556e5b971932902'); + apply_patch(<<'EOPATCH'); diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs --- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:41:27.000000000 +0100 +++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 21:42:20.000000000 +0100 @@ -780,143 +3164,56 @@ diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs +# define get_av perl_get_av +#endif + - #define DL_LOADONCEONLY - - #include "dlutils.c" /* SaveError() etc */ -@@ -185,7 +191,7 @@ - CODE: - DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags)); - if (flags & 0x01) -- Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename); -+ Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename); - RETVAL = dlopen(filename, mode) ; - DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL)); - ST(0) = sv_newmortal() ; -EOPATCH - if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) { - apply_patch(<<'EOPATCH'); -diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs ---- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100 -+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100 -@@ -60,6 +60,18 @@ - # define get_av perl_get_av - #endif - -+static char * -+form(char *pat, ...) -+{ -+ char *retval; -+ va_list args; -+ va_start(args, pat); -+ vasprintf(&retval, pat, &args); -+ va_end(args); -+ SAVEFREEPV(retval); -+ return retval; -+} -+ - #define DL_LOADONCEONLY - - #include "dlutils.c" /* SaveError() etc */ -EOPATCH - } - } - - edit_file('hints/darwin.sh', sub { - my $code = shift; - # Part of commit 8f4f83badb7d1ba9, which mostly undoes - # commit 0511a818910f476c. - $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m; - # commit 14c11978e9b52e08/803bb6cc74d36a3f - # Without this, code in libperl.bundle links against op.o - # in preference to opmini.o on the linker command line, - # and hence miniperl tries to use File::Glob instead of - # csh - $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m; - # f556e5b971932902 also patches Makefile.SH with some - # special case code to deal with useshrplib for darwin. - # Given that post 5.8.0 the darwin hints default was - # changed to false, and it would be very complex to splice - # in that code in various versions of Makefile.SH back - # to 5.002, lets just turn it off. - $code =~ s/^useshrplib='true'/useshrplib='false'/m - if $faking_it; - return $code; - }); - } -} elsif ($^O eq 'netbsd') { - if ($major < 6) { - # These are part of commit 099685bc64c7dbce - edit_file('hints/netbsd.sh', sub { - my $code = shift; - my $fixed = <<'EOC'; -case "$osvers" in -0.9|0.8*) - usedl="$undef" - ;; -*) - if [ -f /usr/libexec/ld.elf_so ]; then - d_dlopen=$define - d_dlerror=$define - ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags" - cccdlflags="-DPIC -fPIC $cccdlflags" - lddlflags="--whole-archive -shared $lddlflags" - elif [ "`uname -m`" = "pmax" ]; then -# NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work. - d_dlopen=$undef - elif [ -f /usr/libexec/ld.so ]; then - d_dlopen=$define - d_dlerror=$define - ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags" -# we use -fPIC here because -fpic is *NOT* enough for some of the -# extensions like Tk on some netbsd platforms (the sparc is one) - cccdlflags="-DPIC -fPIC $cccdlflags" - lddlflags="-Bforcearchive -Bshareable $lddlflags" - else - d_dlopen=$undef - fi - ;; -esac -EOC - $code =~ s/^case "\$osvers" in\n0\.9\|0\.8.*?^esac\n/$fixed/ms; - return $code; - }); - if (!extract_from_file('unixish.h', - qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) { - apply_patch(<<'EOPATCH') -diff --git a/unixish.h b/unixish.h -index 2a6cbcd..eab2de1 100644 ---- a/unixish.h -+++ b/unixish.h -@@ -89,7 +89,7 @@ - */ - /* #define ALTERNATE_SHEBANG "#!" / **/ + #define DL_LOADONCEONLY --#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) -+#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__) - # include + #include "dlutils.c" /* SaveError() etc */ +@@ -185,7 +191,7 @@ + CODE: + DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags)); + if (flags & 0x01) +- Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename); ++ Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename); + RETVAL = dlopen(filename, mode) ; + DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL)); + ST(0) = sv_newmortal() ; +EOPATCH + if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) { + apply_patch(<<'EOPATCH'); +diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs +--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100 ++++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100 +@@ -60,6 +60,18 @@ + # define get_av perl_get_av #endif ++static char * ++form(char *pat, ...) ++{ ++ char *retval; ++ va_list args; ++ va_start(args, pat); ++ vasprintf(&retval, pat, &args); ++ va_end(args); ++ SAVEFREEPV(retval); ++ return retval; ++} ++ + #define DL_LOADONCEONLY + + #include "dlutils.c" /* SaveError() etc */ EOPATCH } } -} -if ($major < 10) { - if (!extract_from_file('ext/DB_File/DB_File.xs', - qr!^#else /\* Berkeley DB Version > 2 \*/$!)) { - # This DB_File.xs is really too old to patch up. - # Skip DB_File, unless we're invoked with an explicit -Unoextensions - if (!exists $defines{noextensions}) { - $defines{noextensions} = 'DB_File'; - } elsif (defined $defines{noextensions}) { - $defines{noextensions} .= ' DB_File'; - } - } elsif (!extract_from_file('ext/DB_File/DB_File.xs', - qr/^#ifdef AT_LEAST_DB_4_1$/)) { - # This line is changed by commit 3245f0580c13b3ab - my $line = extract_from_file('ext/DB_File/DB_File.xs', - qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/); - apply_patch(<<"EOPATCH"); + if ($major < 10) { + if ($unfixable_db_file) { + # Nothing we can do. + } elsif (!extract_from_file('ext/DB_File/DB_File.xs', + qr/^#ifdef AT_LEAST_DB_4_1$/)) { + # This line is changed by commit 3245f0580c13b3ab + my $line = extract_from_file('ext/DB_File/DB_File.xs', + qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/); + apply_patch(<<"EOPATCH"); diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs index 489ba96..fba8ded 100644 --- a/ext/DB_File/DB_File.xs @@ -943,238 +3240,13 @@ index 489ba96..fba8ded 100644 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */ EOPATCH - } -} - -# if Encode is not needed for the test, you can speed up the bisect by -# excluding it from the runs with -Dnoextensions=Encode -# ccache is an easy win. Remove it if it causes problems. -# Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it -# to true in hints/linux.sh -# On dromedary, from that point on, Configure (by default) fails to find any -# libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain -# versioned libraries. Without -lm, the build fails. -# Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards, -# until commit faae14e6e968e1c0 adds it to the hints. -# However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work, -# because it will spot versioned libraries, pass them to the compiler, and then -# bail out pretty early on. Configure won't let us override libswanted, but it -# will let us override the entire libs list. - -unless (extract_from_file('Configure', 'ignore_versioned_solibs')) { - # Before 1cfa4ec74d4933da, so force the libs list. - - my @libs; - # This is the current libswanted list from Configure, less the libs removed - # by current hints/linux.sh - foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld - ld sun m crypt sec util c cposix posix ucb BSD)) { - foreach my $dir (@paths) { - next unless -f "$dir/lib$lib.so"; - push @libs, "-l$lib"; - last; - } - } - $defines{libs} = \@libs unless exists $defines{libs}; -} - -$defines{usenm} = undef - if $major < 2 && !exists $defines{usenm}; - -my (@missing, @created_dirs); - -if ($options{'force-manifest'}) { - open my $fh, '<', 'MANIFEST' - or die "Could not open MANIFEST: $!"; - while (<$fh>) { - next unless /^(\S+)/; - push @missing, $1 - unless -f $1; - } - close $fh or die "Can't close MANIFEST: $!"; - - foreach my $pathname (@missing) { - my @parts = split '/', $pathname; - my $leaf = pop @parts; - my $path = '.'; - while (@parts) { - $path .= '/' . shift @parts; - next if -d $path; - mkdir $path, 0700 or die "Can't create $path: $!"; - unshift @created_dirs, $path; - } - open $fh, '>', $pathname or die "Can't open $pathname: $!"; - close $fh or die "Can't close $pathname: $!"; - chmod 0, $pathname or die "Can't chmod 0 $pathname: $!"; - } -} - -my @ARGS = '-dEs'; -foreach my $key (sort keys %defines) { - my $val = $defines{$key}; - if (ref $val) { - push @ARGS, "-D$key=@$val"; - } elsif (!defined $val) { - push @ARGS, "-U$key"; - } elsif (!length $val) { - push @ARGS, "-D$key"; - } else { - $val = "" if $val eq "\0"; - push @ARGS, "-D$key=$val"; - } -} -push @ARGS, map {"-A$_"} @{$options{A}}; - -# ) { - print unless /<(?:built-in|command|stdin)/; - } -} - -if ($major == 2 && extract_from_file('perl.c', qr/^ fclose\(e_fp\);$/)) { - # need to patch perl.c to avoid calling fclose() twice on e_fp when using -e - # This diff is part of commit ab821d7fdc14a438. The second close was - # introduced with perl-5.002, commit a5f75d667838e8e7 - # Might want a6c477ed8d4864e6 too, for the corresponding change to pp_ctl.c - # (likely without this, eval will have "fun") - apply_patch(<<'EOPATCH'); -diff --git a/perl.c b/perl.c -index 03c4d48..3c814a2 100644 ---- a/perl.c -+++ b/perl.c -@@ -252,6 +252,7 @@ setuid perl scripts securely.\n"); - #ifndef VMS /* VMS doesn't have environ array */ - origenviron = environ; - #endif -+ e_tmpname = Nullch; - - if (do_undump) { - -@@ -405,6 +406,7 @@ setuid perl scripts securely.\n"); - if (e_fp) { - if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp)) - croak("Can't write to temp file for -e: %s", Strerror(errno)); -+ e_fp = Nullfp; - argc++,argv--; - scriptname = e_tmpname; - } -@@ -470,10 +472,10 @@ setuid perl scripts securely.\n"); - curcop->cop_line = 0; - curstash = defstash; - preprocess = FALSE; -- if (e_fp) { -- fclose(e_fp); -- e_fp = Nullfp; -+ if (e_tmpname) { - (void)UNLINK(e_tmpname); -+ Safefree(e_tmpname); -+ e_tmpname = Nullch; - } - - /* now that script is parsed, we can modify record separator */ -@@ -1369,7 +1371,7 @@ SV *sv; - scriptname = xfound; - } - -- origfilename = savepv(e_fp ? "-e" : scriptname); -+ origfilename = savepv(e_tmpname ? "-e" : scriptname); - curcop->cop_filegv = gv_fetchfile(origfilename); - if (strEQ(origfilename,"-")) - scriptname = ""; - -EOPATCH -} -if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') { - edit_file('ext/IPC/SysV/SysV.xs', sub { - my $xs = shift; - my $fixed = <<'EOFIX'; + if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') { + edit_file('ext/IPC/SysV/SysV.xs', sub { + my $xs = shift; + my $fixed = <<'EOFIX'; #include #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) @@ -1202,73 +3274,54 @@ if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') { # endif #endif EOFIX - $xs =~ s! + $xs =~ s! #include .* (#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms; - return $xs; - }); -} - -# Parallel build for miniperl is safe -system "make $j miniperl ; + close_or_die($fh); + if ($line =~ /^#!perl\b/) { + system $^X, $file + and die_255("$^X $file failed: \$!=$!, \$?=$?"); + } elsif ($line =~ /^#!(\/\S+)/) { + system $file + and die_255("$file failed: \$!=$!, \$?=$?"); + } else { + if (my ($target, $action, $pattern) + = $line =~ m#^(\S+) ([=!])~ /(.*)/#) { + if (length $pattern) { + next unless -f $target; + if ($action eq '=') { + next unless extract_from_file($target, $pattern); + } else { + next if extract_from_file($target, $pattern); + } + } else { + # Avoid the special case meaning of the empty pattern, + # and instead use this to simply test for the file being + # present or absent + if ($action eq '=') { + next unless -f $target; + } else { + next if -f $target; + } + } + } + system_or_die("patch -p1 <$file"); + } } } -my $ret = system @ARGV; - -report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV"); - # Local variables: # cperl-indent-level: 4 # indent-tabs-mode: nil