diff options
| author | mnag <mnag@FreeBSD.org> | 2006-10-04 21:53:54 +0800 |
|---|---|---|
| committer | mnag <mnag@FreeBSD.org> | 2006-10-04 21:53:54 +0800 |
| commit | 7327e63ac9dda1a900a12b348cc5749c7707ab28 (patch) | |
| tree | 5e30c7b7d0e2aa23cfc4b27f95712be15bee9eed /security/openssh-portable | |
| parent | 237801785c9a1f779b3a60ebc13e3b77cd1bf788 (diff) | |
| download | freebsd-ports-gnome-7327e63ac9dda1a900a12b348cc5749c7707ab28.tar.gz freebsd-ports-gnome-7327e63ac9dda1a900a12b348cc5749c7707ab28.tar.zst freebsd-ports-gnome-7327e63ac9dda1a900a12b348cc5749c7707ab28.zip | |
- Fix package creation. [1]
- Update HPN patch and remove IGNORE. [2]
- Bump PORTREVISION
PR: 103961
Submitted by: Phil Oleson <oz___nixil.net> [1], ale [2]
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 3 | ||||
| -rw-r--r-- | security/openssh-portable/pkg-plist | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index dc3183b9e4ea..868cbe37dcd5 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -7,6 +7,7 @@ PORTNAME= openssh DISTVERSION= 4.4p1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%SUBDIR%/ \ @@ -133,10 +134,9 @@ EXTRA_PATCHES+= ${FILESDIR}/scardpin.patch .endif .if defined(WITH_HPN) -IGNORE= option HPN is temporary disabled, waiting patch for new openssh release PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://www.psc.edu/networking/projects/hpn-ssh/ -PATCHFILES+= openssh-4.3p2-hpn12.diff.gz +PATCHFILES+= openssh-4.4p1-hpn.diff.gz .endif .if defined(WITH_OVERWRITE_BASE) @@ -148,9 +148,9 @@ PREFIX= /usr ETCSSH= /etc/ssh USE_RC_SUBR= yes SUB_FILES+= openssh -SUB_LIST+= ETCSSH="${ETCSSH}" PLIST_SUB+= NOTBASE="@comment " PLIST_SUB+= BASE="" +PLIST_SUB+= BASEPREFIX="${PREFIX}" .else .if exists(/var/empty) EMPTYDIR= /var/empty @@ -159,12 +159,12 @@ EMPTYDIR= ${PREFIX}/empty .endif ETCSSH= ${PREFIX}/etc/ssh USE_RC_SUBR= openssh -SUB_LIST+= ETCSSH="${ETCSSH}" PLIST_SUB+= NOTBASE="" PLIST_SUB+= BASE="@comment " .endif # After all +SUB_LIST+= ETCSSH="${ETCSSH}" PLIST_SUB+= EMPTYDIR="${EMPTYDIR}" CONFIGURE_ARGS+= --sysconfdir=${ETCSSH} --with-privsep-path=${EMPTYDIR} diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 58e7e8569bff..571d1ec1a474 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,3 +1,6 @@ MD5 (openssh-4.4p1.tar.gz) = 793a709a8de695c22f523024d7e9bf07 SHA256 (openssh-4.4p1.tar.gz) = 0252474af4009129cde6a2df2893fb1ac24316436758796f6adc043ac73b35ac SIZE (openssh-4.4p1.tar.gz) = 1044334 +MD5 (openssh-4.4p1-hpn.diff.gz) = d5f07fcb10360b52bdcacf3c7de803b6 +SHA256 (openssh-4.4p1-hpn.diff.gz) = 6febe17260ff66a8dbb7b466252889f855dcc5dec50c93eff25050839cf65977 +SIZE (openssh-4.4p1-hpn.diff.gz) = 16258 diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist index b5f32bf8cf17..0a523674b9e3 100644 --- a/security/openssh-portable/pkg-plist +++ b/security/openssh-portable/pkg-plist @@ -12,8 +12,10 @@ bin/ssh-keyscan %%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 %%BASEPREFIX%% %%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 |