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

Report files and directories installed in WRKINST outside of PREFIX,

Browse Source 
usually a good indication the fake process is screwing up.
Okay naddy@
This commit is contained in:
espie 2003-12-26 00:26:01 +00:00
parent 60bf241ff9
commit 494fac294a
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
infrastructure/install/make-plist
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
# $OpenBSD: make-plist,v 1.31 2003/07/16 22:07:40 espie Exp $ # $OpenBSD: make-plist,v 1.32 2003/12/26 00:26:01 espie Exp $
# Copyright (c) 1999 Marc Espie # Copyright (c) 1999 Marc Espie
# #
@ -345,6 +345,29 @@ while (($name, $fh) = each %out) {
# compare all files against those dates # compare all files against those dates
my @date = (stat $ENV{INSTALL_PRE_COOKIE})[9, 10]; my @date = (stat $ENV{INSTALL_PRE_COOKIE})[9, 10];
my %okay_files=map { $_=>1 } split(/\s+/, $ENV{'OKAY_FILES'});
# check the installation directory, try to make certain there is
# no file or directory outside of $base
find(
sub {
if ($File::Find::name eq $base) {
$File::Find::prune = 1;
return;
}
if (-d $_) {
return if $File::Find::name eq $destdir;
if (defined $mtree->{$File::Find::name}) {
return;
} else {
print STDERR "Bogus directory: $File::Find::name\n";
}
} else {
return if defined $okay_files{$File::Find::name};
print STDERR "Bogus file: $File::Find::name\n";
}
}, $destdir);
# recursive traversal: mark specific `info' dirs, `ldconfig' dirs, # recursive traversal: mark specific `info' dirs, `ldconfig' dirs,
# and potentially modified dirs # and potentially modified dirs

3
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.593 2003/12/24 00:08:48 espie Exp $ # $OpenBSD: bsd.port.mk,v 1.594 2003/12/26 00:26:01 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -1871,6 +1871,7 @@ plist update-plist: fake ${_DEPrun_COOKIES}
PLIST=${PLIST} \ PLIST=${PLIST} \
PFRAG=${PKGDIR}/PFRAG \ PFRAG=${PKGDIR}/PFRAG \
FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \ FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \
OKAY_FILES='${_FAKE_COOKIE} ${_INSTALL_PRE_COOKIE}' \
perl ${PORTSDIR}/infrastructure/install/make-plist ${PKGDIR} ${_tmp} perl ${PORTSDIR}/infrastructure/install/make-plist ${PKGDIR} ${_tmp}
.endif .endif