From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 3 23:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 D1CBA16A415 for ; Tue, 3 Oct 2006 23:40:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0341343D49 for ; Tue, 3 Oct 2006 23:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k93NeLsF008494 for ; Tue, 3 Oct 2006 23:40:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k93NeLa9008493; Tue, 3 Oct 2006 23:40:21 GMT (envelope-from gnats) Resent-Date: Tue, 3 Oct 2006 23:40:21 GMT Resent-Message-Id: <200610032340.k93NeLa9008493@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, Phil Oleson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 076E316A407; Tue, 3 Oct 2006 23:37:47 +0000 (UTC) (envelope-from oz@nixil.net) Received: from nixil.net (nixil.net [161.58.222.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BADF43D5A; Tue, 3 Oct 2006 23:37:46 +0000 (GMT) (envelope-from oz@nixil.net) Received: from nixil.net (localhost [127.0.0.1]) by nixil.net (8.13.6.20060614/8.13.6) with ESMTP id k93NbjR8052421 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 3 Oct 2006 17:37:46 -0600 (MDT) Received: (from oz@localhost) by nixil.net (8.13.6.20060614/8.13.6/Submit) id k93NbjWM052420; Tue, 3 Oct 2006 17:37:45 -0600 (MDT) Message-Id: <200610032337.k93NbjWM052420@nixil.net> Date: Tue, 3 Oct 2006 17:37:45 -0600 (MDT) From: Phil Oleson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mnag@FreeBSD.org Subject: ports/103961: OpenSSH-portable OPENSSH_OVERWRITE_BASE fix rev-2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Phil Oleson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2006 23:40:23 -0000 >Number: 103961 >Category: ports >Synopsis: OpenSSH-portable OPENSSH_OVERWRITE_BASE fix rev-2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Oct 03 23:40:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Phil Oleson >Release: FreeBSD 4.7-RELEASE-p28 i386 >Organization: N/A >Environment: System: FreeBSD nixil.net 4.7-RELEASE-p28 FreeBSD 4.7-RELEASE-p28 #43: Wed Jul 20 09:35:30 MDT 2005 root@nixil.net:/usr/src/sys/compile/nixil i386 >Description: compiling the openssh-portable port with the OPENSSH_OVERWRITE_BASE option is still broken when making a package. >How-To-Repeat: Build the port package with OPENSSH_OVERWRITE_BASE enabled >Fix: This patch seems to fix it for me. --- openssh-portable.patch begins here --- diff -ru openssh-portable.orig/Makefile openssh-portable/Makefile --- openssh-portable.orig/Makefile Sun Oct 1 13:37:54 2006 +++ openssh-portable/Makefile Tue Oct 3 17:12:57 2006 @@ -151,6 +151,7 @@ SUB_LIST+= ETCSSH="${ETCSSH}" PLIST_SUB+= NOTBASE="@comment " PLIST_SUB+= BASE="" +PLIST_SUB+= PREFIX="${PREFIX}" .else .if exists(/var/empty) EMPTYDIR= /var/empty diff -ru openssh-portable.orig/pkg-plist openssh-portable/pkg-plist --- openssh-portable.orig/pkg-plist Sun Oct 1 13:37:54 2006 +++ openssh-portable/pkg-plist Tue Oct 3 17:12:08 2006 @@ -12,8 +12,10 @@ %%NOTBASE%%@exec if [ -f %D/etc/sshd_config -a ! -f %D/etc/ssh/sshd_config ]; then ln %D/etc/sshd_config %D/etc/ssh/sshd_config ; fi %%NOTBASE%%@unexec if cmp -s %D/etc/ssh/ssh_config %D/etc/ssh/ssh_config-dist; then rm -f %D/etc/ssh/ssh_config; fi %%NOTBASE%%@unexec if cmp -s %D/etc/ssh/sshd_config %D/etc/ssh/sshd_config-dist; then rm -f %D/etc/ssh/sshd_config; fi +%%BASE%%@cwd / etc/ssh/ssh_config-dist etc/ssh/sshd_config-dist +%%BASE%%@cwd %%PREFIX%% %%NOTBASE%%@exec if [ ! -f %D/etc/ssh/ssh_config ]; then cp -p %D/etc/ssh/ssh_config-dist %D/etc/ssh/ssh_config ; fi %%NOTBASE%%@exec if [ ! -f %D/etc/ssh/sshd_config ]; then cp -p %D/etc/ssh/sshd_config-dist %D/etc/ssh/sshd_config ; fi %%NOTBASE%%@dirrmtry etc/ssh --- openssh-portable.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: