summaryrefslogtreecommitdiff
path: root/shells/rssh
diff options
context:
space:
mode:
Diffstat (limited to 'shells/rssh')
-rw-r--r--shells/rssh/Makefile7
-rw-r--r--shells/rssh/distinfo10
-rw-r--r--shells/rssh/patches/patch-aa15
3 files changed, 18 insertions, 14 deletions
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 5db15689c86..184d96100b5 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2012/09/11 23:25:09 asau Exp $
+# $NetBSD: Makefile,v 1.15 2012/11/28 13:54:53 wiz Exp $
-DISTNAME= rssh-2.3.3
+DISTNAME= rssh-2.3.4
CATEGORIES= shells security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rssh/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pizzashack.org/rssh/
COMMENT= Restricted shell allowing only scp and/or sftp
+LICENSE= 2-clause-bsd
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -45,6 +46,6 @@ CONFIGURE_ARGS+= --with-rsync=${RSSH_RSYNC_PATH:Q}
.endif
post-install:
- ${INSTALL_DATA} ${WRKSRC}/rssh.conf ${DESTDIR}${EGDIR}/rssh.conf
+ ${INSTALL_DATA} ${WRKSRC}/rssh.conf.default ${DESTDIR}${EGDIR}/rssh.conf
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/rssh/distinfo b/shells/rssh/distinfo
index 7e540e3ba12..90c6fd61853 100644
--- a/shells/rssh/distinfo
+++ b/shells/rssh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/11/01 19:30:58 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/11/28 13:54:54 wiz Exp $
-SHA1 (rssh-2.3.3.tar.gz) = 0a6dd80b5e6059e0db12c9f1276121dd966b610a
-RMD160 (rssh-2.3.3.tar.gz) = e9f5c3a8f8cecd6b29c6b85a2672cd22481ef8b5
-Size (rssh-2.3.3.tar.gz) = 119510 bytes
-SHA1 (patch-aa) = 778908260daf0f73367037bd5a37a6e7c888ac78
+SHA1 (rssh-2.3.4.tar.gz) = e13ae1fdce4b0c89ef70f4695689139c8409e2e8
+RMD160 (rssh-2.3.4.tar.gz) = 4fdd086820fe67f6dc97671875c43dcad9c4afd3
+Size (rssh-2.3.4.tar.gz) = 113315 bytes
+SHA1 (patch-aa) = 0210a1c717098e6afa760192cc8f9d6811d2fd9f
SHA1 (patch-ab) = 19a5f7ffe3fef0c6aa17c1611c564c45a802ea96
SHA1 (patch-rsshconf.c) = a2c2b14bf3619f77cf4e3cbfeaaa4b356d145443
diff --git a/shells/rssh/patches/patch-aa b/shells/rssh/patches/patch-aa
index e7c7031820f..d5cd72eb673 100644
--- a/shells/rssh/patches/patch-aa
+++ b/shells/rssh/patches/patch-aa
@@ -1,18 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2010/10/16 09:57:39 adam Exp $
+$NetBSD: patch-aa,v 1.4 2012/11/28 13:54:55 wiz Exp $
---- Makefile.in.orig 2010-08-01 13:59:54.000000000 +0000
+Use pkgsrc framework for installing config files.
+Use pkgsrc framework for setuid permissions.
+
+--- Makefile.in.orig 2012-11-27 00:19:34.000000000 +0000
+++ Makefile.in
-@@ -755,7 +755,7 @@ install-dvi: install-dvi-am
+@@ -672,7 +672,7 @@ info-am:
- install-dvi-am:
+ install-data-am: install-man
-install-exec-am: install-binPROGRAMS install-dist_sysconfDATA \
+install-exec-am: install-binPROGRAMS \
install-libexecPROGRAMS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-@@ -830,7 +830,6 @@ uninstall-man: uninstall-man1 uninstall-
- $(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
+@@ -730,7 +730,6 @@ uninstall-man: uninstall-man1 uninstall-
+ $(CC) -c $(DEFS) $(ourdefs) $(AM_CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
install-exec-hook:
- chmod u+s $(libexecdir)/rssh_chroot_helper