diff options
| -rw-r--r-- | security/openssh-portable/Makefile | 17 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 9 |
2 files changed, 5 insertions, 21 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index bc13ce810fe0..488c4e74da9c 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%SUBDIR%/ \ ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/%SUBDIR%/ \ http://mirror.mcs.anl.gov/openssh/portable/%SUBDIR%/ MASTER_SITE_SUBDIR= # empty -PKGNAMESUFFIX?= ${PORTABLE_SUFFIX}${GSSAPI_SUFFIX}${BASE_SUFFIX} +PKGNAMESUFFIX= ${PORTABLE_SUFFIX}${GSSAPI_SUFFIX}${BASE_SUFFIX} DISTNAME= # empty MAINTAINER= mnag@FreeBSD.org @@ -62,7 +62,6 @@ OPTIONS= PAM "Enable pam(3) support" on \ OPENSSH_CHROOT "Enable CHROOT support" off \ OPENSC "Enable OpenSC smartcard support" off \ HPN "Enable HPN-11 SSH/SCP patch" off \ - HPN_NONECIPHER "Enable HPN-11 with None Cipher patch" off \ OVERWRITE_BASE "OpenSSH overwrite base" off .include <bsd.port.pre.mk> @@ -129,21 +128,9 @@ CONFIGURE_ARGS+= --with-opensc=${LOCALBASE} .endif .if defined(WITH_HPN) -.if defined(WITH_HPN_NONECIPHER) -IGNORE= please, select only one HPN patch. Rerun 'make config' -.endif -PATCH_DIST_STRIP= -p1 -PATCH_SITES+= http://www.psc.edu/networking/projects/hpn-ssh/ -PATCHFILES+= openssh-4.3p1-hpn11.diff -.endif - -.if defined(WITH_HPN_NONECIPHER) -.if defined(WITH_HPN) -IGNORE= please, select only one HPN patch. Rerun 'make config' -.endif PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://www.psc.edu/networking/projects/hpn-ssh/ -PATCHFILES+= openssh-4.3p1-hpn11-none.diff +PATCHFILES+= openssh-4.3p2-hpn12.diff.gz .endif .if defined(WITH_OVERWRITE_BASE) diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index e441aa702a8d..dee97a7c1f56 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,9 +1,6 @@ MD5 (openssh-4.3p2.tar.gz) = 7e9880ac20a9b9db0d3fea30a9ff3d46 SHA256 (openssh-4.3p2.tar.gz) = 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f SIZE (openssh-4.3p2.tar.gz) = 941455 -MD5 (openssh-4.3p1-hpn11.diff) = 7dd2a6716b81da33af4ca960185fdd1b -SHA256 (openssh-4.3p1-hpn11.diff) = 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740 -SIZE (openssh-4.3p1-hpn11.diff) = 11024 -MD5 (openssh-4.3p1-hpn11-none.diff) = bf4f192a36bbee39ea23423ab06b0fb6 -SHA256 (openssh-4.3p1-hpn11-none.diff) = ed9abd22a463e4aedaaac4fc04747741bbf8cddf32fa07e9d91433221cdf9dc3 -SIZE (openssh-4.3p1-hpn11-none.diff) = 16617 +MD5 (openssh-4.3p2-hpn12.diff.gz) = 5ade4be51e0d49c18f4107013c60ac14 +SHA256 (openssh-4.3p2-hpn12.diff.gz) = d98d8a016d6b7a83c9c821339e6d01b8d67a7607ec7ace11a72b347689411a74 +SIZE (openssh-4.3p2-hpn12.diff.gz) = 14806 |