Date: Tue, 3 Oct 2006 17:37:45 -0600 (MDT) From: Phil Oleson <oz@nixil.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mnag@FreeBSD.org Subject: ports/103961: OpenSSH-portable OPENSSH_OVERWRITE_BASE fix rev-2 Message-ID: <200610032337.k93NbjWM052420@nixil.net> Resent-Message-ID: <200610032340.k93NeLa9008493@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610032337.k93NbjWM052420>