[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Update to version 1.29

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cea16e9f7269
branches:  trunk
changeset: 514718:cea16e9f7269
user:      seb <seb%pkgsrc.org@localhost>
date:      Sat Jun 17 12:18:24 2006 +0000

description:
Update to version 1.29

Ensure that libkver.so is loaded if needed via LD_PRELOAD
for all kind of commands run via the chroot target.

This fix PR pkg/32921.

Approved by MAINTAINER.

diffstat:

 pkgtools/pkg_comp/Makefile          |   4 ++--
 pkgtools/pkg_comp/files/pkg_comp.sh |  19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 9b951f5594ff -r cea16e9f7269 pkgtools/pkg_comp/Makefile
--- a/pkgtools/pkg_comp/Makefile        Sat Jun 17 11:50:48 2006 +0000
+++ b/pkgtools/pkg_comp/Makefile        Sat Jun 17 12:18:24 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/03/12 19:36:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2006/06/17 12:18:24 seb Exp $
 
-DISTNAME=      pkg_comp-1.28
+DISTNAME=      pkg_comp-1.29
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 9b951f5594ff -r cea16e9f7269 pkgtools/pkg_comp/files/pkg_comp.sh
--- a/pkgtools/pkg_comp/files/pkg_comp.sh       Sat Jun 17 11:50:48 2006 +0000
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh       Sat Jun 17 12:18:24 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pkg_comp.sh,v 1.31 2006/03/12 19:36:01 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.32 2006/06/17 12:18:24 seb Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -838,18 +838,31 @@
 #
 pkg_chroot()
 {
+    local prefix script
+
     [ -d $DESTDIR ] || err "$DESTDIR does not exist"
 
     copy_vulnerabilities
 
     fsmount
     echo "PKG_COMP ==> Entering sandbox \`$DESTDIR'"
+    prefix=`mktemp $DESTDIR/pkg_comp/tmp/pkg_comp-XXXX`
+    rm $prefix
+    script="$prefix.sh"
+    init_script $script
     if [ $# -eq 0 ]; then
-        ENV=/etc/shrc chroot $DESTDIR $ROOTSHELL
+        cat >> $script <<EOF
+ENV=/etc/shrc $ROOTSHELL
+EOF
     else
-        ENV=/etc/shrc chroot $DESTDIR $*
+        cat >> $script <<EOF
+$*
+EOF
     fi
+    chmod +x $script
+    ENV=/etc/shrc chroot $DESTDIR /pkg_comp/tmp/`basename $script`
     echo
+    rm $script
     fsumount
 }