diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2009-12-17 00:43:21 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2009-12-17 00:43:21 +0800 |
| commit | 019705edcdbac90ff99c1812d68b403bce569773 (patch) | |
| tree | a832a03f48f4bbb8a07af0ca0e25607f6bf8b75b /security/openssh-portable | |
| parent | 29a0e6f72263d773cf7f6247eca6b9d4a3222ecb (diff) | |
| download | freebsd-ports-gnome-019705edcdbac90ff99c1812d68b403bce569773.tar.gz freebsd-ports-gnome-019705edcdbac90ff99c1812d68b403bce569773.tar.zst freebsd-ports-gnome-019705edcdbac90ff99c1812d68b403bce569773.zip | |
- Remove BROKEN on 8.x WITH_KERBEROS case. Builds fine on 8.0 and 9.0, i386 and amd64
- While here, fix minor plist issue for WITH_X509 case
PR: 141679
Submitted by: Denis Barov <dindin@dindin.ru> (maintainer)
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 9 | ||||
| -rw-r--r-- | security/openssh-portable/pkg-plist | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index af88de3d3e0c..34f910f89977 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -126,12 +126,6 @@ CONFIGURE_ARGS+= --with-kerberos5 EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch .endif .endif - -.if ${OSVERSION} >= 800000 -.if !defined(WITHOUT_KERBEROS) -BROKEN= does not link -.endif -.endif .endif .if ${OPENSSLBASE} != "/usr" @@ -184,6 +178,9 @@ EXTRA_PATCHES+= ${FILESDIR}/contrib-openssh-5.1_p1-lpk-64bit.patch PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://www.roumenpetrov.info/openssh/x509-6.2/ PATCHFILES+= openssh-5.2p1+x509-6.2.diff.gz +PLIST_SUB+= X509="" +.else +PLIST_SUB+= X509="@comment " .endif .if defined(WITH_OVERWRITE_BASE) diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist index 75f2e7046725..8053e5e2a6ae 100644 --- a/security/openssh-portable/pkg-plist +++ b/security/openssh-portable/pkg-plist @@ -18,6 +18,7 @@ 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%%%%X509%%@dirrmtry etc/ssh/ca %%NOTBASE%%@dirrmtry etc/ssh sbin/sshd share/Ssh.bin |