diff options
author | snj <snj@pkgsrc.org> | 2005-12-05 03:04:28 +0000 |
---|---|---|
committer | snj <snj@pkgsrc.org> | 2005-12-05 03:04:28 +0000 |
commit | bef99dce868d59865c3106c01d56b4373b622cda (patch) | |
tree | 9ea7d41a51006484153698ac98d912b3a1a84ec4 | |
parent | 2c5c7d6e7c7f431917cd51ef1af4f093af0f4240 (diff) | |
download | pkgsrc-bef99dce868d59865c3106c01d56b4373b622cda.tar.gz |
Update to 4.1, which brings numerous bugfixes.
While here, apply a patch from Eric Schnoebelen in PR pkg/31114
to fix a bogus reference to id.
-rw-r--r-- | shells/scponly/Makefile | 8 | ||||
-rw-r--r-- | shells/scponly/distinfo | 10 | ||||
-rw-r--r-- | shells/scponly/patches/patch-aa | 32 |
3 files changed, 25 insertions, 25 deletions
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile index c63eb1ea270..f1a3f8f4fc2 100644 --- a/shells/scponly/Makefile +++ b/shells/scponly/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2005/09/20 04:23:49 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 03:04:28 snj Exp $ -DISTNAME= scponly-4.0 -PKGREVISION= 2 +DISTNAME= scponly-4.1 CATEGORIES= shells security MASTER_SITES= http://www.sublimation.org/scponly/ EXTRACT_SUFX= .tgz @@ -12,13 +11,14 @@ COMMENT= Tiny shell that only permits scp and sftp GNU_CONFIGURE= yes -USE_TOOLS+= chgrp chmod chown echo ln ls mkdir mv pwd rm rmdir +USE_TOOLS+= chgrp chmod chown echo id ln ls mkdir mv pwd rm rmdir CONFIGURE_ENV+= scponly_PROG_CHGRP="${TOOLS_CHGRP}" CONFIGURE_ENV+= PROG_CHMOD="${TOOLS_CHMOD}" CONFIGURE_ENV+= scponly_PROG_CHMOD="${TOOLS_CHMOD}" CONFIGURE_ENV+= PROG_CHOWN="${TOOLS_CHOWN}" CONFIGURE_ENV+= scponly_PROG_CHOWN="${TOOLS_CHOWN}" CONFIGURE_ENV+= ac_cv_path_scponly_PROG_ECHO="${TOOLS_ECHO}" +CONFIGURE_ENV+= scponly_PROG_ID="${TOOLS_ID}" CONFIGURE_ENV+= scponly_PROG_LN="${TOOLS_LN}" CONFIGURE_ENV+= scponly_PROG_LS="${TOOLS_LS}" CONFIGURE_ENV+= scponly_PROG_MKDIR="${TOOLS_MKDIR}" diff --git a/shells/scponly/distinfo b/shells/scponly/distinfo index 3aec4d9e42e..cf65d78dc9f 100644 --- a/shells/scponly/distinfo +++ b/shells/scponly/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 13:14:41 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/12/05 03:04:28 snj Exp $ -SHA1 (scponly-4.0.tgz) = 418486395896dc2a528295a4b508c8b408bfb33c -RMD160 (scponly-4.0.tgz) = 9fbc81a06cf3fcc57cbcaac43f5dae1a0b593498 -Size (scponly-4.0.tgz) = 85053 bytes -SHA1 (patch-aa) = 0dd9c9daebe6ed5bdadbdf28695f7539c1bd21d4 +SHA1 (scponly-4.1.tgz) = 416ec072c2dc584358152ca4a3c0660b28399d4c +RMD160 (scponly-4.1.tgz) = ea4a119a05a23ff18870701d964c72ab7c9ce1c1 +Size (scponly-4.1.tgz) = 93138 bytes +SHA1 (patch-aa) = a09c070db3c46d776d57bf16354604b295f2f749 diff --git a/shells/scponly/patches/patch-aa b/shells/scponly/patches/patch-aa index 0cf1229c998..268e999bf25 100644 --- a/shells/scponly/patches/patch-aa +++ b/shells/scponly/patches/patch-aa @@ -1,27 +1,27 @@ -$NetBSD: patch-aa,v 1.2 2005/02/20 06:46:07 snj Exp $ +$NetBSD: patch-aa,v 1.3 2005/12/05 03:04:28 snj Exp $ ---- Makefile.in.orig Wed Nov 19 22:04:53 2003 -+++ Makefile.in Sat Feb 19 22:30:44 2005 +--- Makefile.in.orig 2005-03-18 00:40:18.000000000 -0800 ++++ Makefile.in 2005-12-04 18:49:02.000000000 -0800 @@ -9,7 +9,7 @@ CFLAGS = @CFLAGS@ -I$(srcdir) -I. INSTALL = @INSTALL@ CC = @CC@ - CHROOTED_NAME = @CHROOTED_NAME@ --CONFDIR := @sysconfdir@/scponly -+CONFDIR := @sysconfdir@ - DEBUGFILE := ${CONFDIR}/debuglevel - DEFS := @DEFS@ -DDEBUGFILE='"${DEBUGFILE}"' + CHROOTED_NAME = @CHROOTED_NAME@ +-CONFDIR = @sysconfdir@/scponly ++CONFDIR = @sysconfdir@ + DEBUGFILE = ${CONFDIR}/debuglevel + DEFS = @DEFS@ -DDEBUGFILE='"${DEBUGFILE}"' LN_S = @LN_S@ @@ -38,9 +38,10 @@ install: scponly debuglevel scponly.8 - ${INSTALL} -d ${bindir} - ${INSTALL} -d ${mandir}/man8 - ${INSTALL} -d ${CONFDIR} -- ${INSTALL} -o 0 -g 0 scponly ${bindir}/scponly -- ${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${mandir}/man8/scponly.8 -- ${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DEBUGFILE} + ${INSTALL} -d ${DESTDIR}${bindir} + ${INSTALL} -d ${DESTDIR}${mandir}/man8 + ${INSTALL} -d ${DESTDIR}${CONFDIR} +- ${INSTALL} -o 0 -g 0 scponly ${DESTDIR}${bindir}/scponly +- ${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8 +- ${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DESTDIR}${DEBUGFILE} + ${INSTALL} -d ${prefix}/share/examples/scponly + ${BSD_INSTALL_PROGRAM} scponly ${bindir}/scponly + ${BSD_INSTALL_DATA} scponly.8 ${mandir}/man8/scponly.8 + ${BSD_INSTALL_DATA} debuglevel ${prefix}/share/examples/scponly if test "x${CHROOTED_NAME}" != "x"; then \ - ${INSTALL} -d ${sbindir}; \ - rm -f ${sbindir}/${CHROOTED_NAME}; \ + ${INSTALL} -d ${DESTDIR}${sbindir}; \ + rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \ |