From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 20 07:40:20 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7615516A4CE for ; Thu, 20 Nov 2003 07:40:20 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D54E543FE1 for ; Thu, 20 Nov 2003 07:40:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAKFeCFY072698 for ; Thu, 20 Nov 2003 07:40:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAKFeCfW072697; Thu, 20 Nov 2003 07:40:12 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 20 Nov 2003 07:40:12 -0800 (PST) Resent-Message-Id: <200311201540.hAKFeCfW072697@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hideyuki KURASHINA Received: from localhost (hub.freebsd.org [216.136.204.18]) by hub.freebsd.org (Postfix) with ESMTP id 3DD0316A4CE for ; Thu, 20 Nov 2003 07:37:47 -0800 (PST) Message-Id: <20031121.003740.116352767.rushani@FreeBSD.org> Date: Fri, 21 Nov 2003 00:37:40 +0900 (JST) From: Hideyuki KURASHINA To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/59511: [Maintainer update] shells/scponly: Unbreak chrootscript for recent FreeBSD -CURRENT and comming 5.2R X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Hideyuki KURASHINA List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2003 15:40:20 -0000 >Number: 59511 >Category: ports >Synopsis: [Maintainer update] shells/scponly: Unbreak chroot script for recent FreeBSD -CURRENT and comming 5.2R >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 20 07:40:12 PST 2003 >Closed-Date: >Last-Modified: >Originator: Hideyuki KURASHINA >Release: FreeBSD 5.1-RELEASE-p10 >Organization: >Environment: System: FreeBSD ***.*******.jp 5.1-RELEASE-p10 >Description: scponly dist includes a script which setup chroot cage, which depends a location of run-time link-editor. Since FreeBSD has dynamic root capability from __FreeBSD_version == 501105, we should add new location to unbreak the script. >How-To-Repeat: Run chroot script (setup_chroot.sh) on FreeBSD with dynamic root, and then test that works or not. >Fix: Apply following patch; Index: Makefile =================================================================== RCS file: /home/ncvs/ports/shells/scponly/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- Makefile 2 Sep 2003 08:47:16 -0000 1.9 +++ Makefile 20 Nov 2003 15:17:42 -0000 @@ -65,6 +65,10 @@ .include +.if ${OSVERSION} >= 501105 && exists(/libexec/ld-elf.so.1) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aa +.endif + .if defined(WITHOUT_SCPONLY_WILDCARDS) CONFIGURE_ARGS+=--disable-wildcards .endif Index: files/extra-patch-aa =================================================================== RCS file: files/extra-patch-aa diff -N files/extra-patch-aa --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/extra-patch-aa 20 Nov 2003 15:17:42 -0000 @@ -0,0 +1,21 @@ +--- ./setup_chroot.sh.in.orig Fri Nov 21 00:14:36 2003 ++++ ./setup_chroot.sh.in Fri Nov 21 00:15:13 2003 +@@ -106,6 +106,7 @@ + @INSTALL@ -d $targetdir/usr/local/lib + @INSTALL@ -d $targetdir/usr/local/bin + @INSTALL@ -d $targetdir/lib ++@INSTALL@ -d $targetdir/libexec + @INSTALL@ -d $targetdir/usr/lib + @INSTALL@ -d $targetdir/usr/libexec + @INSTALL@ -d $targetdir/usr/libexec/openssh +@@ -125,6 +126,10 @@ + fi + if [ -f /lib/ld-linux.so.2 ]; then + LIB_LIST="$LIB_LIST /lib/ld-linux.so.2" ++ LDSOFOUND=1 ++fi ++if [ -f /libexec/ld-elf.so.1 ]; then ++ LIB_LIST="$LIB_LIST /libexec/ld-elf.so.1" + LDSOFOUND=1 + fi + if [ -f /usr/libexec/ld-elf.so.1 ]; then >Release-Note: >Audit-Trail: >Unformatted: