cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move a large part of check-lib-depends into separate modules

Browse Source
This commit is contained in:
espie 2010-08-20 15:29:41 +00:00
parent 9b38b584e9
commit 04cb4e82a5
4 changed files with 362 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
infrastructure/bin/check-lib-depends
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
# $OpenBSD: check-lib-depends,v 1.2 2010/08/20 15:22:21 espie Exp $ # $OpenBSD: check-lib-depends,v 1.3 2010/08/20 15:29:41 espie Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
# #
# Permission to use, copy, modify, and distribute this software for any # Permission to use, copy, modify, and distribute this software for any
@ -30,290 +30,9 @@ use OpenBSD::LibSpec;
use OpenBSD::Temp; use OpenBSD::Temp;
use OpenBSD::AddCreateDelete; use OpenBSD::AddCreateDelete;
use OpenBSD::Getopt; use OpenBSD::Getopt;
use OpenBSD::FileSource;
# FileSource: where we get the files to analyze use OpenBSD::Recorder;
package FileSource; use OpenBSD::Issue;
# file system
package FsFileSource;
our @ISA = qw(FileSource);
sub new
{
my ($class, $location) = @_;
bless {location => $location }, $class
}
sub retrieve
{
my ($self, $state, $item) = @_;
return $self->{location}.$item->fullname;
}
sub skip
{
}
sub clean
{
}
# package archive
package PkgFileSource;
our @ISA = qw(FileSource);
sub new
{
my ($class, $handle, $location) = @_;
bless {handle => $handle, location => $location }, $class;
}
sub prepare_to_extract
{
my ($self, $item) = @_;
require OpenBSD::ArcCheck;
my $o = $self->{handle}->next;
$o->{cwd} = $item->cwd;
if (!$o->check_name($item)) {
die "Error checking name for $o->{name} vs. $item->{name}\n";
}
$o->{name} = $item->fullname;
$o->{destdir} = $self->{location};
return $o;
}
sub extracted_name
{
my ($self, $item) = @_;
return $self->{location}.$item->fullname;
}
sub retrieve
{
my ($self, $state, $item) = @_;
my $o = $self->prepare_to_extract($item);
$o->create;
return $self->extracted_name($item);
}
sub skip
{
my ($self, $item) = @_;
my $o = $self->prepare_to_extract($item);
$self->{handle}->skip;
}
sub clean
{
my ($self, $item) = @_;
unlink($self->extracted_name($item));
}
# Recorder: how we keep track of which binary uses which library
package Recorder;
sub new
{
my $class = shift;
return bless {}, $class;
}
sub reduce_libname
{
my ($self, $lib) = @_;
$lib =~ s/^(.*\/)?lib(.*)\.so\.(\d+)\.\d+$/$2.$3/;
return $lib;
}
sub libs
{
my $self = shift;
return keys %$self;
}
sub record_rpath
{
}
# SimpleRecorder: remember one single binary for each library
package SimpleRecorder;
our @ISA = qw(Recorder);
sub record
{
my ($self, $lib, $filename) = @_;
$self->{$self->reduce_libname($lib)} = $filename;
}
sub binary
{
my ($self, $lib) = @_;
return $self->{$lib};
}
# AllRecorder: remember all binaries for each library
package AllRecorder;
our @ISA = qw(Recorder);
sub record
{
my ($self, $lib, $filename) = @_;
push(@{$self->{$self->reduce_libname($lib)}}, $filename);
}
sub binaries
{
my ($self, $lib) = @_;
return @{$self->{$lib}};
}
sub binary
{
my ($self, $lib) = @_;
return $self->{$lib}->[0];
}
sub dump
{
my ($self, $fh) = @_;
for my $lib (sort $self->libs) {
print $fh "$lib:\t\n";
for my $binary (sort $self->binaries($lib)) {
print $fh "\t$binary\n";
}
}
}
package DumpRecorder;
our @ISA = qw(Recorder);
sub record
{
my ($self, $lib, $filename) = @_;
push(@{$self->{$filename}->{libs}}, $lib);
}
sub record_rpath
{
my ($self, $path, $filename) = @_;
push(@{$self->{$filename}->{rpath}}, $path);
}
sub dump
{
my ($self, $fh) = @_;
while (my ($binary, $v) = each %$self) {
print $fh $binary;
if (defined $v->{rpath}) {
print $fh "(", join(':', @{$v->{rpath}}), ")";
}
print $fh ": ", join(',', @{$v->{libs}}), "\n";
}
}
sub retrieve
{
my ($self, $state, $filename) = @_;
open(my $fh, '<', $filename) or
$state->fatal("Can't read #1: #2", $filename, $!);
my $_;
while (<$fh>) {
chomp;
if (m/^(.*?)\:\s(.*)$/) {
my ($binary, $libs) = ($1, $2);
if ($binary =~ m/^(.*)\(.*\)$/) {
$binary = $1;
}
my @libs = split(/,/, $libs);
$self->{$binary}= \@libs;
} else {
$state->errsay("Can't parse #1", $_);
}
}
close $fh;
}
# Issue: intermediate objects that record problems with libraries
package Issue;
sub new
{
my ($class, $lib, $binary, @packages) = @_;
bless { lib => $lib, binary => $binary, packages => \@packages },
$class;
}
sub stringize
{
my $self = shift;
my $string = $self->{lib};
if (@{$self->{packages}} > 0) {
$string.=" from ".join(',', @{$self->{packages}});
}
return $string." ($self->{binary})";
}
sub do_record_wantlib
{
my ($self, $h) = @_;
my $want = $self->{lib};
$want =~ s/\.\d+$//;
$h->{$want} = 1;
}
sub record_wantlib
{
}
sub not_reachable
{
return 0;
}
sub print
{
my $self = shift;
print $self->message, "\n";
}
package Issue::SystemLib;
our @ISA = qw(Issue);
sub message
{
my $self = shift;
return "WANTLIB: ". $self->stringize. " (system lib)";
}
sub record_wantlib
{
&Issue::do_record_wantlib;
}
package Issue::DirectDependency;
our @ISA = qw(Issue);
sub message
{
my $self = shift;
return "LIB_DEPENDS: ". $self->stringize;
}
package Issue::IndirectDependency;
our @ISA = qw(Issue);
sub message
{
my $self = shift;
return "WANTLIB: ". $self->stringize;
}
sub record_wantlib
{
&Issue::do_record_wantlib;
}
package Issue::NotReachable;
our @ISA = qw(Issue);
sub message
{
my $self = shift;
return "Missing lib: ". $self->stringize. " (NOT REACHABLE)";
}
sub not_reachable
{
my $self = shift;
return "Bogus WANTLIB: ". $self->stringize. " (NOT REACHABLE)";
}
package MyFile; package MyFile;
our @ISA = qw(OpenBSD::PackingElement::FileBase); our @ISA = qw(OpenBSD::PackingElement::FileBase);
@ -601,7 +320,7 @@ sub report_lib_issue
for my $dir (qw(/usr /usr/X11R6)) { for my $dir (qw(/usr /usr/X11R6)) {
my @r = lookup_library($dir, $libspec); my @r = lookup_library($dir, $libspec);
if (grep { $_ eq 'system' } @r) { if (grep { $_ eq 'system' } @r) {
return Issue::SystemLib->new($lib, $binary); return OpenBSD::Issue::SystemLib->new($lib, $binary);
} }
} }
@ -614,7 +333,7 @@ sub report_lib_issue
if (@r > 0) { if (@r > 0) {
for my $p (@r) { for my $p (@r) {
if (defined $dependencies->{$plist->pkgname}->{$p}) { if (defined $dependencies->{$plist->pkgname}->{$p}) {
return Issue::DirectDependency->new($lib, $binary, $p); return OpenBSD::Issue::DirectDependency->new($lib, $binary, $p);
} }
} }
} }
@ -635,10 +354,10 @@ sub report_lib_issue
@r = lookup_library(OpenBSD::Paths->localbase, $libspec); @r = lookup_library(OpenBSD::Paths->localbase, $libspec);
for my $p (@r) { for my $p (@r) {
if (defined $done->{$p}) { if (defined $done->{$p}) {
return Issue::IndirectDependency->new($lib, $binary, $p); return OpenBSD::Issue::IndirectDependency->new($lib, $binary, $p);
} }
} }
return Issue::NotReachable->new($lib,, $binary, @r); return OpenBSD::Issue::NotReachable->new($lib,, $binary, @r);
} }
sub print_list sub print_list
@ -668,10 +387,11 @@ sub analyze
} else { } else {
$state->context($pkgname); $state->context($pkgname);
} }
my $needed_libs = $state->{full} ? AllRecorder->new : SimpleRecorder->new; my $needed_libs = $state->{full} ? OpenBSD::AllRecorder->new :
OpenBSD::SimpleRecorder->new;
my $has_libs = {}; my $has_libs = {};
if ($state->{source}) { if ($state->{source}) {
my $special = DumpRecorder->new; my $special = OpenBSD::DumpRecorder->new;
$special->retrieve($state, $state->{source}); $special->retrieve($state, $state->{source});
$plist->find_libs($needed_libs, $special); $plist->find_libs($needed_libs, $special);
} else { } else {
@ -727,11 +447,11 @@ sub do_pkg
$self->analyze($state, $plist); $self->analyze($state, $plist);
} elsif ($state->{destdir} ne '/') { } elsif ($state->{destdir} ne '/') {
$self->analyze($state, $plist, $self->analyze($state, $plist,
FsFileSource->new($state->{destdir})); OpenBSD::FsFileSource->new($state->{destdir}));
} else { } else {
my $temp = OpenBSD::Temp->dir; my $temp = OpenBSD::Temp->dir;
$self->analyze($state, $plist, $self->analyze($state, $plist,
PkgFileSource->new($true_package, $temp)); OpenBSD::PkgFileSource->new($true_package, $temp));
rmtree($temp); rmtree($temp);
} }
$true_package->close; $true_package->close;
@ -750,7 +470,7 @@ sub do_plist
return; return;
} else { } else {
$self->analyze($state, $plist, $self->analyze($state, $plist,
FsFileSource->new($state->{destdir})); OpenBSD::FsFileSource->new($state->{destdir}));
} }
} }
@ -761,9 +481,9 @@ sub main
$state->handle_options; $state->handle_options;
my $fs = $state->{destdir}; my $fs = $state->{destdir};
if ($state->{dest}) { if ($state->{dest}) {
my $recorder = DumpRecorder->new; my $recorder = OpenBSD::DumpRecorder->new;
my $cwd = $fs; my $cwd = $fs;
my $source = FsFileSource->new($fs); my $source = OpenBSD::FsFileSource->new($fs);
find({ find({
wanted => sub { wanted => sub {
return if -l $_; return if -l $_;

97
infrastructure/lib/OpenBSD/FileSource.pm Normal file
View File

@ -0,0 +1,97 @@
# $OpenBSD: FileSource.pm,v 1.1 2010/08/20 15:29:41 espie Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
use strict;
use warnings;
# part of check-lib-depends
# FileSource: where we get the files to analyze
package OpenBSD::FileSource;
# file system
package OpenBSD::FsFileSource;
our @ISA = qw(OpenBSD::FileSource);
sub new
{
my ($class, $location) = @_;
bless {location => $location }, $class
}
sub retrieve
{
my ($self, $state, $item) = @_;
return $self->{location}.$item->fullname;
}
sub skip
{
}
sub clean
{
}
# package archive
package OpenBSD::PkgFileSource;
our @ISA = qw(OpenBSD::FileSource);
sub new
{
my ($class, $handle, $location) = @_;
bless {handle => $handle, location => $location }, $class;
}
sub prepare_to_extract
{
my ($self, $item) = @_;
require OpenBSD::ArcCheck;
my $o = $self->{handle}->next;
$o->{cwd} = $item->cwd;
if (!$o->check_name($item)) {
die "Error checking name for $o->{name} vs. $item->{name}\n";
}
$o->{name} = $item->fullname;
$o->{destdir} = $self->{location};
return $o;
}
sub extracted_name
{
my ($self, $item) = @_;
return $self->{location}.$item->fullname;
}
sub retrieve
{
my ($self, $state, $item) = @_;
my $o = $self->prepare_to_extract($item);
$o->create;
return $self->extracted_name($item);
}
sub skip
{
my ($self, $item) = @_;
my $o = $self->prepare_to_extract($item);
$self->{handle}->skip;
}
sub clean
{
my ($self, $item) = @_;
unlink($self->extracted_name($item));
}
1;

109
infrastructure/lib/OpenBSD/Issue.pm Normal file
View File

@ -0,0 +1,109 @@
# $OpenBSD: Issue.pm,v 1.1 2010/08/20 15:29:41 espie Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
use strict;
use warnings;
# part of check-lib-depends
# Issue: intermediate objects that record problems with libraries
package OpenBSD::Issue;
sub new
{
my ($class, $lib, $binary, @packages) = @_;
bless { lib => $lib, binary => $binary, packages => \@packages },
$class;
}
sub stringize
{
my $self = shift;
my $string = $self->{lib};
if (@{$self->{packages}} > 0) {
$string.=" from ".join(',', @{$self->{packages}});
}
return $string." ($self->{binary})";
}
sub do_record_wantlib
{
my ($self, $h) = @_;
my $want = $self->{lib};
$want =~ s/\.\d+$//;
$h->{$want} = 1;
}
sub record_wantlib
{
}
sub not_reachable
{
return 0;
}
sub print
{
my $self = shift;
print $self->message, "\n";
}
package OpenBSD::Issue::SystemLib;
our @ISA = qw(OpenBSD::Issue);
sub message
{
my $self = shift;
return "WANTLIB: ". $self->stringize. " (system lib)";
}
sub record_wantlib
{
&OpenBSD::Issue::do_record_wantlib;
}
package OpenBSD::Issue::DirectDependency;
our @ISA = qw(OpenBSD::Issue);
sub message
{
my $self = shift;
return "LIB_DEPENDS: ". $self->stringize;
}
package OpenBSD::Issue::IndirectDependency;
our @ISA = qw(OpenBSD::Issue);
sub message
{
my $self = shift;
return "WANTLIB: ". $self->stringize;
}
sub record_wantlib
{
&OpenBSD::Issue::do_record_wantlib;
}
package OpenBSD::Issue::NotReachable;
our @ISA = qw(OpenBSD::Issue);
sub message
{
my $self = shift;
return "Missing lib: ". $self->stringize. " (NOT REACHABLE)";
}
sub not_reachable
{
my $self = shift;
return "Bogus WANTLIB: ". $self->stringize. " (NOT REACHABLE)";
}
1;

140
infrastructure/lib/OpenBSD/Recorder.pm Normal file
View File

@ -0,0 +1,140 @@
# $OpenBSD: Recorder.pm,v 1.1 2010/08/20 15:29:41 espie Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
use strict;
use warnings;
# part of check-lib-depends
# Recorder: how we keep track of which binary uses which library
package OpenBSD::Recorder;
sub new
{
my $class = shift;
return bless {}, $class;
}
sub reduce_libname
{
my ($self, $lib) = @_;
$lib =~ s/^(.*\/)?lib(.*)\.so\.(\d+)\.\d+$/$2.$3/;
return $lib;
}
sub libs
{
my $self = shift;
return keys %$self;
}
sub record_rpath
{
}
# SimpleRecorder: remember one single binary for each library
package OpenBSD::SimpleRecorder;
our @ISA = qw(OpenBSD::Recorder);
sub record
{
my ($self, $lib, $filename) = @_;
$self->{$self->reduce_libname($lib)} = $filename;
}
sub binary
{
my ($self, $lib) = @_;
return $self->{$lib};
}
# AllRecorder: remember all binaries for each library
package OpenBSD::AllRecorder;
our @ISA = qw(OpenBSD::Recorder);
sub record
{
my ($self, $lib, $filename) = @_;
push(@{$self->{$self->reduce_libname($lib)}}, $filename);
}
sub binaries
{
my ($self, $lib) = @_;
return @{$self->{$lib}};
}
sub binary
{
my ($self, $lib) = @_;
return $self->{$lib}->[0];
}
sub dump
{
my ($self, $fh) = @_;
for my $lib (sort $self->libs) {
print $fh "$lib:\t\n";
for my $binary (sort $self->binaries($lib)) {
print $fh "\t$binary\n";
}
}
}
package OpenBSD::DumpRecorder;
our @ISA = qw(OpenBSD::Recorder);
sub record
{
my ($self, $lib, $filename) = @_;
push(@{$self->{$filename}->{libs}}, $lib);
}
sub record_rpath
{
my ($self, $path, $filename) = @_;
push(@{$self->{$filename}->{rpath}}, $path);
}
sub dump
{
my ($self, $fh) = @_;
while (my ($binary, $v) = each %$self) {
print $fh $binary;
if (defined $v->{rpath}) {
print $fh "(", join(':', @{$v->{rpath}}), ")";
}
print $fh ": ", join(',', @{$v->{libs}}), "\n";
}
}
sub retrieve
{
my ($self, $state, $filename) = @_;
open(my $fh, '<', $filename) or
$state->fatal("Can't read #1: #2", $filename, $!);
my $_;
while (<$fh>) {
chomp;
if (m/^(.*?)\:\s(.*)$/) {
my ($binary, $libs) = ($1, $2);
if ($binary =~ m/^(.*)\(.*\)$/) {
$binary = $1;
}
my @libs = split(/,/, $libs);
$self->{$binary}= \@libs;
} else {
$state->errsay("Can't parse #1", $_);
}
}
close $fh;
}
1;