From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 16 12:33:51 2004 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from localhost (hub.freebsd.org [216.136.204.18]) by hub.freebsd.org (Postfix) with ESMTP id DFB1916A4CE; Tue, 16 Mar 2004 12:33:49 -0800 (PST) Date: Wed, 17 Mar 2004 05:33:01 +0900 (JST) Message-Id: <20040317.053301.59711655.rushani@FreeBSD.org> To: jims@bluenotch.com From: Hideyuki KURASHINA In-Reply-To: <200403110246.i2B2kRr0014016@freefall.freebsd.org> References: <200403110246.i2B2kRr0014016@freefall.freebsd.org> X-URL: http://www.rushani.jp/ X-PGP-Public-Key: http://www.rushani.jp/rushani.asc X-PGP-Fingerprint: A052 6F98 6146 6FE3 91E2 DA6B F2FA 2088 439A DC57 X-RC5-72-Stats: http://stats.distributed.net/participant/psummary.php?project_id=8&id=432320 X-Mailer: Mew version 4.0.64 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: freebsd-ports-bugs@FreeBSD.org cc: nork@FreeBSD.org Subject: Re: ports/64076: [update] shells/scponly 3.8 => 3.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 20:33:51 -0000 > Description > > -update to 3.9 (support for WinSCP3) Thanks, that's OK for me. While I'm here, o Remove unnecessary ${PATCHDIR}/extra-patch-aa because it was merged into scponly distribution. o Register ${PREFIX}/bin/scponly to /etc/shells. o If WITH_SCPONLY_CHROOT is defined, * also register ${PREFIX}/sbin/scponlyc to /etc/shells. * apply ${PATCHDIR}/extra-patch-ab and use autoconf 2.53 to fix bogus @PROG_RM@ error in generated chroot setup script. * copy setup_chroot.sh (and config.h) to ${EXAMPLESDIR} for maintainance use (Running `make configure' to obtain this script after every `make clean' is pain). Please apply following patch with -p0 flag for patch(1). Regards, -- rushani Index: Makefile =================================================================== RCS file: /home/ncvs/ports/shells/scponly/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 21 Nov 2003 00:59:00 -0000 1.10 +++ Makefile 16 Mar 2004 20:22:16 -0000 @@ -49,8 +49,7 @@ # to be installed. PORTNAME= scponly -PORTVERSION= 3.8 -PORTREVISION= 1 +PORTVERSION= 3.9 CATEGORIES= shells MASTER_SITES= http://www.sublimation.org/scponly/ EXTRACT_SUFX= .tgz @@ -65,10 +64,6 @@ .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 @@ -88,6 +83,8 @@ .if defined(WITH_SCPONLY_CHROOT) PLIST_SUB= SCPONLY_CHROOT="" CONFIGURE_ARGS+=--enable-chrooted-binary +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ab +USE_AUTOCONF_VER=253 .endif .if defined(WITH_SCPONLY_RSYNC) @@ -102,10 +99,22 @@ @${ECHO_MSG} "" post-install: + @${ECHO_MSG} "Updating /etc/shells" + @${CP} /etc/shells /etc/shells.bak + @(${GREP} -v ${PREFIX}/bin/scponly /etc/shells.bak; \ + ${ECHO_CMD} ${PREFIX}/bin/scponly) > /etc/shells + @${RM} /etc/shells.bak .if defined(WITH_SCPONLY_CHROOT) + @${CP} /etc/shells /etc/shells.bak + @(${GREP} -v ${PREFIX}/sbin/scponlyc /etc/shells.bak; \ + ${ECHO_CMD} ${PREFIX}/sbin/scponlyc) > /etc/shells + @${RM} /etc/shells.bak + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_SCRIPT} ${WRKSRC}/setup_chroot.sh ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/config.h ${EXAMPLESDIR} @${ECHO_MSG} "" - @${ECHO_MSG} "Run following script to setup chroot cage;" - @${ECHO_MSG} "${WRKSRC}/setup_chroot.sh" + @${ECHO_MSG} "To setup chroot cage, run following command:" + @${ECHO_MSG} " cd ${EXAMPLESDIR}/ && ${SH} setup_chroot.sh" @${ECHO_MSG} "" .endif .if !defined(NOPORTDOCS) Index: distinfo =================================================================== RCS file: /home/ncvs/ports/shells/scponly/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 3 May 2003 15:53:06 -0000 1.4 +++ distinfo 16 Mar 2004 20:22:16 -0000 @@ -1 +1,2 @@ -MD5 (scponly-3.8.tgz) = 7764ad781f1517100c380476ff104d5b +MD5 (scponly-3.9.tgz) = e18410e7d49f171e711954da836107ea +SIZE (scponly-3.9.tgz) = 77179 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/shells/scponly/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 2 Sep 2003 08:47:16 -0000 1.4 +++ pkg-plist 16 Mar 2004 20:22:16 -0000 @@ -1,8 +1,15 @@ bin/scponly +@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak +@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak %%SCPONLY_CHROOT%%sbin/scponlyc +%%SCPONLY_CHROOT%%@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak +%%SCPONLY_CHROOT%%@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak +%%SCPONLY_CHROOT%%%%EXAMPLESDIR%%/setup_chroot.sh +%%SCPONLY_CHROOT%%%%EXAMPLESDIR%%/config.h etc/scponly/debuglevel %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/TODO @dirrm etc/scponly %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%SCPONLY_CHROOT%%@dirrm %%EXAMPLESDIR%% Index: files/extra-patch-aa =================================================================== RCS file: files/extra-patch-aa diff -N files/extra-patch-aa --- files/extra-patch-aa 21 Nov 2003 00:59:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ ---- ./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 Index: files/extra-patch-ab =================================================================== RCS file: files/extra-patch-ab diff -N files/extra-patch-ab --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/extra-patch-ab 16 Mar 2004 20:22:16 -0000 @@ -0,0 +1,10 @@ +--- configure.in.orig Wed Mar 17 02:11:09 2004 ++++ configure.in Wed Mar 17 02:11:24 2004 +@@ -51,6 +51,7 @@ + AC_PATH_PROG(PROG_ID, id) + AC_PATH_PROG(PROG_PW, pw) + AC_PATH_PROG(PROG_PWD_MKDB, pwd_mkdb) ++AC_PATH_PROG(PROG_RM, rm) + + dnl Features wanted for this installation: + dnl Command-line args to ./configure