From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 11 08:00:21 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FD7516A4B3 for ; Sat, 11 Oct 2003 08:00:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49C8443FBF for ; Sat, 11 Oct 2003 08:00:19 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9BF0JFY010951 for ; Sat, 11 Oct 2003 08:00:19 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9BF0JBJ010950; Sat, 11 Oct 2003 08:00:19 -0700 (PDT) (envelope-from gnats) Resent-Date: Sat, 11 Oct 2003 08:00:19 -0700 (PDT) Resent-Message-Id: <200310111500.h9BF0JBJ010950@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBBAD16A4B3 for ; Sat, 11 Oct 2003 07:54:38 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 114AF43F75 for ; Sat, 11 Oct 2003 07:54:37 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 81981 invoked by uid 85); 11 Oct 2003 16:54:36 +0200 Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 ( Clear:RC:1:. Processed in 0.042511 secs); 11 Oct 2003 14:54:36 -0000 Received: from lucifer.cultdeadsheep.org (192.168.0.2) by goofy.cultdeadsheep.org with SMTP; 11 Oct 2003 16:54:35 +0200 Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Sat, 11 Oct 2003 16:54:29 +0200 Message-Id: <20031011145437.114AF43F75@mx1.FreeBSD.org> Date: Sat, 11 Oct 2003 16:54:29 +0200 From: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/57866: [maintainer update] security/dropbear: update to 0.38 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Oct 2003 15:00:21 -0000 >Number: 57866 >Category: ports >Synopsis: [maintainer update] security/dropbear: update to 0.38 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 11 08:00:18 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: - Update to 0.38 - Added Files: * files/patch-Makefile.in * files/dropbear.sh >How-To-Repeat: N/A. >Fix: --- dropbear.diff begins here --- Index: dropbear/Makefile =================================================================== RCS file: /WORK/REPO/ports/security/dropbear/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- dropbear/Makefile 6 Oct 2003 12:30:05 -0000 1.3 +++ dropbear/Makefile 11 Oct 2003 14:30:37 -0000 @@ -6,7 +6,7 @@ # PORTNAME= dropbear -PORTVERSION= 0.37 +PORTVERSION= 0.38 CATEGORIES= security ipv6 MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/ @@ -21,21 +21,21 @@ CONFIGURE_ENV= LDFLAGS=-static .endif -BIN= dropbear dropbearkey dropbearconvert - +MAKE_ENV+= INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" post-configure: @${REINPLACE_CMD} -e "s,/etc/,${PREFIX}/etc/,g" ${WRKSRC}/options.h @${REINPLACE_CMD} -e "s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h @${REINPLACE_CMD} -e "s,^typedef int socklen_t,//typedef int socklen_t," \ ${WRKSRC}/includes.h + ${SED} -e 's:__PREFIX__:${PREFIX}:g' \ + ${FILESDIR}/dropbear.sh > ${WRKSRC}/dropbear.sh -do-install: -.for bin in ${BIN} - @${INSTALL_PROGRAM} ${WRKSRC}/${bin} ${PREFIX}/bin -.endfor +post-install: + @${MKDIR} ${PREFIX}/etc/dropbear .if !defined(NOPORTDOC) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif + @${INSTALL_SCRIPT} ${WRKSRC}/dropbear.sh ${PREFIX}/etc/rc.d/dropbear.sh.sample .include Index: dropbear/distinfo =================================================================== RCS file: /WORK/REPO/ports/security/dropbear/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- dropbear/distinfo 25 Sep 2003 10:22:59 -0000 1.2 +++ dropbear/distinfo 11 Oct 2003 14:30:37 -0000 @@ -1 +1 @@ -MD5 (dropbear-0.37.tar.gz) = d71da88922b23fa41e5baac582cf74dc +MD5 (dropbear-0.38.tar.gz) = 8e6d4d12db54d2f9dde3aa8365b41e27 Index: dropbear/pkg-plist =================================================================== RCS file: /WORK/REPO/ports/security/dropbear/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- dropbear/pkg-plist 8 Sep 2003 09:09:36 -0000 1.1 +++ dropbear/pkg-plist 11 Oct 2003 14:30:37 -0000 @@ -1,5 +1,7 @@ -bin/dropbear bin/dropbearkey bin/dropbearconvert +etc/rc.d/dropbear.sh.sample +sbin/dropbear %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% +@unexec rmdir %D/etc/dropbear 2>/dev/null || echo "===> You can safely remove %D/etc/dropbear directory, if you don't want to use dropbear anymore." Index: dropbear/files/dropbear.sh =================================================================== RCS file: dropbear/files/dropbear.sh diff -N dropbear/files/dropbear.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dropbear/files/dropbear.sh 11 Oct 2003 14:30:37 -0000 @@ -0,0 +1,27 @@ +#!/bin/sh +PREFIX=__PREFIX__ +ETCDIR=${PREFIX}/etc/dropbear +SBINDIR=${PREFIX}/sbin +BINDIR=${PREFIX}/bin +case "$1" in +start) + [ -f ${ETCDIR}/dropbear_rsa_host_key ] || \ + ${BINDIR}/dropbearkey -t rsa -f ${ETCDIR}/dropbear_rsa_host_key + [ -f __PREFIX__/dropbear_dss_host_key ] || \ + ${BINDIR}/dropbearkey -t dss -f ${ETCDIR}/dropbear_dss_host_key + ${SBINDIR}/dropbear + echo $! > /var/run/dropbear.pid + echo -n ' dropbear' + ;; +stop) + if [ -f /var/run/dropbear.pid ]; then + kill -TERM `cat /var/run/dropbear.pid` + rm -f /var/run/dropbear.pid + echo -n ' dropbear' + fi + ;; +*) + echo "Usage: ${0##*/}: { start | stop }" 2>&1 + exit 65 + ;; +esac Index: dropbear/files/patch-Makefile.in =================================================================== RCS file: dropbear/files/patch-Makefile.in diff -N dropbear/files/patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dropbear/files/patch-Makefile.in 11 Oct 2003 14:30:37 -0000 @@ -0,0 +1,22 @@ +--- Makefile.in.orig Sat Oct 11 10:08:19 2003 ++++ Makefile.in Sat Oct 11 14:58:58 2003 +@@ -46,14 +46,11 @@ + -strip dropbearconvert + + install: all +- install -d -m 755 $(DESTDIR)$(sbindir) +- install -d -m 755 $(DESTDIR)$(bindir) +- install -m 755 dropbear $(DESTDIR)$(sbindir) +- install -m 755 dropbearkey $(DESTDIR)$(bindir) +- install -m 755 dropbearconvert $(DESTDIR)$(bindir) +- -chown root:root $(DESTDIR)$(sbindir)/dropbear +- -chown root:root $(DESTDIR)$(bindir)/dropbearkey +- -chown root:root $(DESTDIR)$(bindir)/dropbearconvert ++ ${INSTALL} -d -m 755 $(DESTDIR)$(sbindir) ++ ${INSTALL} -d -m 755 $(DESTDIR)$(bindir) ++ ${INSTALL_PROGRAM} dropbear $(DESTDIR)$(sbindir) ++ ${INSTALL_PROGRAM} dropbearkey $(DESTDIR)$(bindir) ++ ${INSTALL_PROGRAM} dropbearconvert $(DESTDIR)$(bindir) + + + static: dropbear-static dropbearkey-static dropbearconvert-static --- dropbear.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: