From e50403590bb487426c0f7afc3a712004316a7b9a Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 7 Jan 2014 13:31:35 +0000 Subject: [PATCH] tedu some very old checks: we no longer have INSTALL/UNINSTALL scripts, so we don't care whether /var/db/pkg is mounted noexec. --- usr.sbin/pkg_add/OpenBSD/Add.pm | 11 +---------- usr.sbin/pkg_add/OpenBSD/Delete.pm | 5 +---- usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 5 +---- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 922469b7f9e..292b2659c1d 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.137 2014/01/07 13:26:17 espie Exp $ +# $OpenBSD: Add.pm,v 1.138 2014/01/07 13:31:35 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie # @@ -680,20 +680,11 @@ sub prepare_for_addition if (!defined $size) { $size = (stat $cname)[7]; } - if ($self->exec_on_add) { - my $s2 = $state->vstat->stat($cname); - if (defined $s2 && $s2->noexec) { - $s2->report_noexec($state, $cname); - } - } my $s = $state->vstat->add($fname, $self->{size}, $pkgname); return unless defined $s; if ($s->ro) { $s->report_ro($state, $fname); } - if ($s->noexec && $self->exec_on_delete) { - $s->report_noexec($state, $fname); - } if ($s->avail < 0) { $s->report_overflow($state, $fname); } diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 3d559fe5f32..41a40afefd9 100644 --- a/usr.sbin/pkg_add/OpenBSD/Delete.pm +++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Delete.pm,v 1.124 2014/01/05 10:24:30 espie Exp $ +# $OpenBSD: Delete.pm,v 1.125 2014/01/07 13:31:36 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie # @@ -484,9 +484,6 @@ sub prepare_for_deletion if ($s->ro) { $s->report_ro($state, $fname); } - if ($s->noexec && $self->exec_on_delete) { - $s->report_noexec($state, $fname); - } } sub copy_old_stuff diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 7edf37cfd67..0c3abc85d00 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.221 2014/01/07 13:26:18 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.222 2014/01/07 13:31:36 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie # @@ -1596,9 +1596,6 @@ sub destate package OpenBSD::PackingElement::SpecialFile; our @ISA=qw(OpenBSD::PackingElement::Unique); -sub exec_on_add { 0 } -sub exec_on_delete { 0 } - sub add_digest { &OpenBSD::PackingElement::FileBase::add_digest; -- 2.20.1