summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/Makefile3
-rw-r--r--usr.sbin/pkg_add/OpenBSD/OldLibs.pm234
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Replace.pm224
-rw-r--r--usr.sbin/pkg_add/pkg_add17
4 files changed, 249 insertions, 229 deletions
diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile
index f3791fe4c5a..17e59b271c1 100644
--- a/usr.sbin/pkg_add/Makefile
+++ b/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2010/01/10 11:31:08 espie Exp $
+# $OpenBSD: Makefile,v 1.58 2010/01/11 12:25:38 espie Exp $
.include <bsd.own.mk>
@@ -24,6 +24,7 @@ PACKAGES= \
OpenBSD/IdCache.pm \
OpenBSD/Interactive.pm \
OpenBSD/Mtree.pm \
+ OpenBSD/OldLibs.pm \
OpenBSD/PackageInfo.pm \
OpenBSD/PackageLocation.pm \
OpenBSD/PackageLocator.pm \
diff --git a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
new file mode 100644
index 00000000000..819b124469c
--- /dev/null
+++ b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
@@ -0,0 +1,234 @@
+# ex:ts=8 sw=4:
+# $OpenBSD: OldLibs.pm,v 1.1 2010/01/11 12:25:38 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
+
+use strict;
+use warnings;
+
+package OpenBSD::PackingElement;
+
+sub mark_lib
+{
+}
+
+sub unmark_lib
+{
+}
+
+sub separate_element
+{
+ my ($self, $libs, $c1, $c2) = @_;
+ $c2->{$self} = 1;
+}
+
+package OpenBSD::PackingElement::Meta;
+
+sub separate_element
+{
+ my ($self, $libs, $c1, $c2) = @_;
+ $c1->{$self} = 1;
+ $c2->{$self} = 1;
+}
+
+package OpenBSD::PackingElement::DigitalSignature;
+sub separate_element
+{
+ my ($self, $libs, $c1, $c2) = @_;
+ $c2->{$self} = 1;
+}
+
+package OpenBSD::PackingElement::State;
+
+sub separate_element
+{
+ &OpenBSD::PackingElement::Meta::separate_element;
+}
+
+package OpenBSD::PackingElement::Depend;
+sub separate_element
+{
+ &OpenBSD::PackingElement::separate_element;
+}
+
+package OpenBSD::PackingElement::SpecialFile;
+sub separate_element
+{
+ &OpenBSD::PackingElement::separate_element;
+}
+
+package OpenBSD::PackingElement::Lib;
+sub mark_lib
+{
+ my ($self, $libs, $libpatterns) = @_;
+ my $libname = $self->fullname;
+ my ($stem, $major, $minor, $dir) = $self->parse($libname);
+ if (defined $stem) {
+ $libpatterns->{$stem}->{$dir} = [$major, $minor, $libname];
+ }
+ $libs->{$libname} = 1;
+}
+
+sub separate_element
+{
+ my ($self, $libs, $c1, $c2) = @_;
+ if ($libs->{$self->fullname}) {
+ $c1->{$self} = 1;
+ } else {
+ $c2->{$self} = 1;
+ }
+}
+
+sub unmark_lib
+{
+ my ($self, $libs, $libpatterns) = @_;
+ my $libname = $self->fullname;
+ my ($stem, $major, $minor, $dir) = $self->parse($libname);
+ if (defined $stem) {
+ my $p = $libpatterns->{$stem}->{$dir};
+ if (defined $p && $p->[0] == $major && $p->[1] <= $minor) {
+ my $n = $p->[2];
+ delete $libs->{$n};
+ }
+ }
+ delete $libs->{$libname};
+}
+
+package OpenBSD::OldLibs;
+use OpenBSD::RequiredBy;
+use OpenBSD::PackageInfo;
+
+sub split_some_libs
+{
+ my ($plist, $libs) = @_;
+ my $c1 = {};
+ my $c2 = {};
+ $plist->separate_element($libs, $c1, $c2);
+ my $p1 = $plist->make_deep_copy($c1);
+ my $p2 = $plist->make_shallow_copy($c2);
+ return ($p1, $p2);
+}
+
+# create a packing-list with only the libraries we want to keep around.
+sub split_libs
+{
+ my ($plist, $to_split) = @_;
+
+ (my $splitted, $plist) = split_some_libs($plist, $to_split);
+
+ require OpenBSD::PackageInfo;
+
+ $splitted->set_pkgname(OpenBSD::PackageInfo::libs_package($plist->pkgname));
+
+ if (defined $plist->{'no-default-conflict'}) {
+ # we conflict with the package we just removed...
+ OpenBSD::PackingElement::Conflict->add($splitted, $plist->pkgname);
+ } else {
+ my $stem = OpenBSD::PackageName::splitstem($plist->pkgname);
+ OpenBSD::PackingElement::Conflict->add($splitted, $stem."-*");
+ }
+ return ($plist, $splitted);
+}
+
+sub adjust_depends_closure
+{
+ my ($oldname, $plist, $state) = @_;
+
+ $state->say("Packages that depend on those shared libraries:")
+ if $state->verbose >= 3;
+
+ my $write = OpenBSD::RequiredBy->new($plist->pkgname);
+ for my $pkg (OpenBSD::RequiredBy->compute_closure($oldname)) {
+ $state->say("\t", $pkg) if $state->verbose >= 3;
+ $write->add($pkg);
+ my $r = OpenBSD::Requiring->new($pkg)->add($plist->pkgname);
+ if ($oldname =~ m/^\.libs\d*\-/o) {
+ $r->delete($oldname);
+ }
+ }
+}
+
+sub do_save_libs
+{
+ my ($o, $libs, $state) = @_;
+
+ my $oldname = $o->pkgname;
+
+ ($o->{plist}, my $stub_list) = split_libs($o->plist, $libs);
+ my $stub_name = $stub_list->pkgname;
+ my $dest = installed_info($stub_name);
+ $state->say("Keeping them in $stub_name")
+ if $state->verbose >= 2;
+
+
+ if ($state->{not}) {
+ require OpenBSD::SharedLibs;
+
+ OpenBSD::SharedLibs::add_libs_from_plist($stub_list);
+ $stub_list->to_cache;
+ $o->plist->to_cache;
+ } else {
+ mkdir($dest);
+ open my $descr, '>', $dest.DESC;
+ print $descr "Stub libraries for $oldname\n";
+ close $descr;
+ my $f = OpenBSD::PackingElement::FDESC->add($stub_list, DESC);
+ $f->{ignore} = 1;
+ $f->add_digest($f->compute_digest($dest.DESC));
+ $stub_list->to_installation;
+ $o->plist->to_installation;
+ }
+ add_installed($stub_name);
+
+ OpenBSD::PkgCfl::register($stub_list, $state);
+
+ adjust_depends_closure($oldname, $stub_list, $state);
+}
+
+sub save_libs_from_handle
+{
+ my ($o, $set, $state) = @_;
+
+ my $libs = {};
+ my $p = {};
+
+ $state->say("Looking for changes in shared libraries")
+ if $state->verbose >= 2;
+ $o->plist->mark_lib($libs, $p);
+ for my $n ($set->newer) {
+ $n->plist->unmark_lib($libs, $p);
+ }
+ for my $n ($set->kept) {
+ $n->plist->unmark_lib($libs, $p);
+ }
+
+ if (%$libs) {
+ $state->say("Libraries to keep: ",
+ join(",", sort(keys %$libs))) if $state->verbose >= 2;
+ do_save_libs($o, $libs, $state);
+ } else {
+ $state->say("No libraries to keep") if $state->verbose >= 2;
+ }
+}
+
+sub save
+{
+ my ($self, $set, $state) = @_;
+
+ for my $o ($set->older) {
+ save_libs_from_handle($o, $set, $state);
+ }
+}
+
+1;
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm
index 322b9e2fe0c..070c3c8005d 100644
--- a/usr.sbin/pkg_add/OpenBSD/Replace.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm
@@ -1,7 +1,7 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Replace.pm,v 1.67 2009/12/29 20:34:10 espie Exp $
+# $OpenBSD: Replace.pm,v 1.68 2010/01/11 12:25:38 espie Exp $
#
-# Copyright (c) 2004-2006 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
# purpose with or without fee is hereby granted, provided that the above
@@ -39,20 +39,6 @@ sub extract
$state->{partial}->{$self} = 1;
}
-sub mark_lib
-{
-}
-
-sub unmark_lib
-{
-}
-
-sub separate_element
-{
- my ($self, $libs, $c1, $c2) = @_;
- $c2->{$self} = 1;
-}
-
sub extract_and_progress
{
my ($self, $state, $donesize, $totsize) = @_;
@@ -63,29 +49,6 @@ sub extract_and_progress
$self->mark_progress($state->progress, $donesize, $totsize);
}
-package OpenBSD::PackingElement::Meta;
-
-sub separate_element
-{
- my ($self, $libs, $c1, $c2) = @_;
- $c1->{$self} = 1;
- $c2->{$self} = 1;
-}
-
-package OpenBSD::PackingElement::DigitalSignature;
-sub separate_element
-{
- my ($self, $libs, $c1, $c2) = @_;
- $c2->{$self} = 1;
-}
-
-package OpenBSD::PackingElement::State;
-
-sub separate_element
-{
- &OpenBSD::PackingElement::Meta::separate_element;
-}
-
package OpenBSD::PackingElement::FileBase;
use OpenBSD::Temp;
@@ -203,63 +166,7 @@ sub update_issue
package OpenBSD::PackingElement::UnexecDelete;
sub update_issue { undef }
-package OpenBSD::PackingElement::Depend;
-sub separate_element
-{
- &OpenBSD::PackingElement::separate_element;
-}
-
-package OpenBSD::PackingElement::SpecialFile;
-sub separate_element
-{
- &OpenBSD::PackingElement::separate_element;
-}
-
-package OpenBSD::PackingElement::Dependency;
-use OpenBSD::Error;
-
-package OpenBSD::PackingElement::Lib;
-sub mark_lib
-{
- my ($self, $libs, $libpatterns) = @_;
- my $libname = $self->fullname;
- my ($stem, $major, $minor, $dir) = $self->parse($libname);
- if (defined $stem) {
- $libpatterns->{$stem}->{$dir} = [$major, $minor, $libname];
- }
- $libs->{$libname} = 1;
-}
-
-sub separate_element
-{
- my ($self, $libs, $c1, $c2) = @_;
- if ($libs->{$self->fullname}) {
- $c1->{$self} = 1;
- } else {
- $c2->{$self} = 1;
- }
-}
-
-sub unmark_lib
-{
- my ($self, $libs, $libpatterns) = @_;
- my $libname = $self->fullname;
- my ($stem, $major, $minor, $dir) = $self->parse($libname);
- if (defined $stem) {
- my $p = $libpatterns->{$stem}->{$dir};
- if (defined $p && $p->[0] == $major && $p->[1] <= $minor) {
- my $n = $p->[2];
- delete $libs->{$n};
- }
- }
- delete $libs->{$libname};
-}
-
package OpenBSD::Replace;
-use OpenBSD::RequiredBy;
-use OpenBSD::PackingList;
-use OpenBSD::PackageInfo;
-use OpenBSD::Error;
sub perform_extraction
{
@@ -328,135 +235,10 @@ sub is_set_safe
}
} else {
$state->errsay("Cannot install ", $set->print,
- " (use -F update)");
+ " (use -D update)");
return 0;
}
}
-sub split_some_libs
-{
- my ($plist, $libs) = @_;
- my $c1 = {};
- my $c2 = {};
- $plist->separate_element($libs, $c1, $c2);
- my $p1 = $plist->make_deep_copy($c1);
- my $p2 = $plist->make_shallow_copy($c2);
- return ($p1, $p2);
-}
-
-# create a packing-list with only the libraries we want to keep around.
-sub split_libs
-{
- my ($plist, $to_split) = @_;
-
- (my $splitted, $plist) = split_some_libs($plist, $to_split);
-
- require OpenBSD::PackageInfo;
-
- $splitted->set_pkgname(OpenBSD::PackageInfo::libs_package($plist->pkgname));
-
- if (defined $plist->{'no-default-conflict'}) {
- # we conflict with the package we just removed...
- OpenBSD::PackingElement::Conflict->add($splitted, $plist->pkgname);
- } else {
- require OpenBSD::PackageName;
-
- my $stem = OpenBSD::PackageName::splitstem($plist->pkgname);
- OpenBSD::PackingElement::Conflict->add($splitted, $stem."-*");
- }
- return ($plist, $splitted);
-}
-
-sub adjust_depends_closure
-{
- my ($oldname, $plist, $state) = @_;
-
- $state->say("Packages that depend on those shared libraries:")
- if $state->verbose >= 3;
-
- my $write = OpenBSD::RequiredBy->new($plist->pkgname);
- for my $pkg (OpenBSD::RequiredBy->compute_closure($oldname)) {
- $state->say("\t", $pkg) if $state->verbose >= 3;
- $write->add($pkg);
- my $r = OpenBSD::Requiring->new($pkg)->add($plist->pkgname);
- if ($oldname =~ m/^\.libs\d*\-/o) {
- $r->delete($oldname);
- }
- }
-}
-
-sub do_save_libs
-{
- my ($o, $libs, $state) = @_;
-
- my $oldname = $o->pkgname;
-
- ($o->{plist}, my $stub_list) = split_libs($o->plist, $libs);
- my $stub_name = $stub_list->pkgname;
- my $dest = installed_info($stub_name);
- $state->say("Keeping them in $stub_name")
- if $state->verbose >= 2;
-
-
- if ($state->{not}) {
- require OpenBSD::SharedLibs;
-
- OpenBSD::SharedLibs::add_libs_from_plist($stub_list);
- $stub_list->to_cache;
- $o->plist->to_cache;
- } else {
- mkdir($dest);
- open my $descr, '>', $dest.DESC;
- print $descr "Stub libraries for $oldname\n";
- close $descr;
- my $f = OpenBSD::PackingElement::FDESC->add($stub_list, DESC);
- $f->{ignore} = 1;
- $f->add_digest($f->compute_digest($dest.DESC));
- $stub_list->to_installation;
- $o->plist->to_installation;
- }
- add_installed($stub_name);
-
- require OpenBSD::PkgCfl;
- OpenBSD::PkgCfl::register($stub_list, $state);
-
- adjust_depends_closure($oldname, $stub_list, $state);
-}
-
-sub save_libs_from_handle
-{
- my ($o, $set, $state) = @_;
-
- my $libs = {};
- my $p = {};
-
- $state->say("Looking for changes in shared libraries")
- if $state->verbose >= 2;
- $o->plist->mark_lib($libs, $p);
- for my $n ($set->newer) {
- $n->plist->unmark_lib($libs, $p);
- }
- for my $n ($set->kept) {
- $n->plist->unmark_lib($libs, $p);
- }
-
- if (%$libs) {
- $state->say("Libraries to keep: ",
- join(",", sort(keys %$libs))) if $state->verbose >= 2;
- do_save_libs($o, $libs, $state);
- } else {
- $state->say("No libraries to keep") if $state->verbose >= 2;
- }
-}
-
-sub save_old_libraries
-{
- my ($set, $state) = @_;
-
- for my $o ($set->older) {
- save_libs_from_handle($o, $set, $state);
- }
-}
-
1;
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index dc8b34652fa..0fe125a0706 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.465 2010/01/10 21:27:59 espie Exp $
+# $OpenBSD: pkg_add,v 1.466 2010/01/11 12:25:38 espie Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -291,13 +291,16 @@ sub install_issues
my @conflicts = $set->find_conflicts($state);
return 0 if @conflicts == 0;
+
if (!$state->{allow_replacing}) {
- $state->errsay("Can't install ", $set->print,
- " because of conflicts (",join(',', @conflicts), ")");
- return "conflicts";
+ if (grep { !/^.libs\d*\-/ && !/^partial\-/ } @conflicts) {
+ $state->errsay("Can't install ", $set->print,
+ " because of conflicts (",
+ join(',', @conflicts), ")");
+ return "conflicts";
+ }
}
-
my $later = 0;
for my $toreplace (@conflicts) {
if ($state->tracker->is_installed($toreplace)) {
@@ -559,8 +562,8 @@ sub really_add
local $SIG{'TERM'} = $handler;
if ($replacing) {
- require OpenBSD::Replace;
- OpenBSD::Replace::save_old_libraries($set, $state);
+ require OpenBSD::OldLibs;
+ OpenBSD::OldLibs->save($set, $state);
}
$set->compute_size;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 04:34:25 +0000