diff options
| author | leeym <leeym@FreeBSD.org> | 2004-11-03 09:17:41 +0000 |
|---|---|---|
| committer | leeym <leeym@FreeBSD.org> | 2004-11-03 09:17:41 +0000 |
| commit | a389863aabb204e2228cd5555e4aeab18b801c92 (patch) | |
| tree | a7c699d57c65fb5665c12918b1550648618c79b9 /shells | |
| parent | 8eef85bf1ddb05b6d6173772e166fab19d4ae375 (diff) | |
| download | FreeBSD-ports-a389863aabb204e2228cd5555e4aeab18b801c92.zip FreeBSD-ports-a389863aabb204e2228cd5555e4aeab18b801c92.tar.gz | |
There is a string format vulnerability in rssh-2.2.1
http://www.pizzashack.org/rssh/security.shtml
- update to 2.2.2
- use REINPLACE_CMD instead of the patch file
- correct the knob for RDIST
PR: 73143
Submitted by: leeym
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/rssh/Makefile | 9 | ||||
| -rw-r--r-- | shells/rssh/distinfo | 4 | ||||
| -rw-r--r-- | shells/rssh/files/patch-Makefile.in | 13 |
3 files changed, 9 insertions, 17 deletions
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile index 2eafc12..508562c 100644 --- a/shells/rssh/Makefile +++ b/shells/rssh/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rssh -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= shells security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,6 +15,7 @@ MAINTAINER= enigmatyc@laposte.net COMMENT= A Restricted Secure SHell only for sftp or/and scp GNU_CONFIGURE= yes +USE_REINPLACE= yes MAN1= rssh.1 MAN5= rssh.conf.5 @@ -34,9 +35,13 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync CONFIGURE_ARGS+=--with-rsync=${LOCALBASE}/bin/rsync .endif -.if defined(WITH_RSYNC) +.if defined(WITH_RDIST) RUN_DEPENDS+= ${LOCALBASE}/bin/rdist6:${PORTSDIR}/net/rdist6 CONFIGURE_ARGS+=--with-rdist=${LOCALBASE}/bin/rdist6 .endif +post-patch: + ${REINPLACE_CMD} -E -e 's,(\$$\(DESTDIR\)\$$\(sysconfdir\)/\$$\$$f),\1.dist,g' \ + ${WRKSRC}/Makefile.in + .include <bsd.port.post.mk> diff --git a/shells/rssh/distinfo b/shells/rssh/distinfo index 50b868c..ce1aa32 100644 --- a/shells/rssh/distinfo +++ b/shells/rssh/distinfo @@ -1,2 +1,2 @@ -MD5 (rssh-2.2.1.tar.gz) = 2d427ee7f4ea46b075fa0ab3f39b4089 -SIZE (rssh-2.2.1.tar.gz) = 95552 +MD5 (rssh-2.2.2.tar.gz) = 351440cc3909214bae6f2ad2d57a4419 +SIZE (rssh-2.2.2.tar.gz) = 105255 diff --git a/shells/rssh/files/patch-Makefile.in b/shells/rssh/files/patch-Makefile.in deleted file mode 100644 index 496ce3c..0000000 --- a/shells/rssh/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Sun Jul 20 19:27:29 2003 -+++ Makefile.in Fri May 21 15:23:01 2004 -@@ -357,8 +357,8 @@ - @list='$(dist_sysconf_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ -- $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ -+ echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.dist"; \ -+ $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.dist; \ - done - - uninstall-dist_sysconfDATA: |
