Date: Fri, 21 Nov 2003 00:37:40 +0900 (JST) From: Hideyuki KURASHINA <rushani@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59511: [Maintainer update] shells/scponly: Unbreak chrootscript for recent FreeBSD -CURRENT and comming 5.2R Message-ID: <20031121.003740.116352767.rushani@FreeBSD.org> Resent-Message-ID: <200311201540.hAKFeCfW072697@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
+.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031121.003740.116352767.rushani>