Commit graph

234 commits

Author SHA1 Message Date
Bryan Drewery
fb7f0b4422 - Update to "6.6.1" [1]
- Switch to using @sample keyword, fixing orphans.

Upstream note on "6.6.1" [1]:

  OpenSSH 6.5 and 6.6 sometimes encode a value used in the curve25519
  key exchange incorrectly, causing connection failures about 0.2% of
  the time when this method is used against a peer that implements
  the method properly.

  Fix the problem and disable the curve25519 KEX when speaking to
  OpenSSH 6.5 or 6.6. This version will identify itself as 6.6.1
  to enable the compatability code.

[1] https://lists.mindrot.org/pipermail/openssh-unix-dev/2014-April/032494.html
2014-04-24 01:54:58 +00:00
Bryan Drewery
7d9abc27b5 Fix minor plist issues from check-plist 2014-04-24 01:04:52 +00:00
Bryan Drewery
24ab900c5b - Update GSS API Key Exchange patch with working version.
PR:		ports/183006
Submitted by:	Garrett Wollman (via email)
Tested by:	Garrett Wollman
2014-04-11 03:38:15 +00:00
Bryan Drewery
942706dc7a - Update to 6.6
- Capsicum patch no longer needed
- Update X509 patch to 7.9

Changelog: http://www.openssh.org/txt/release-6.6
2014-03-16 17:35:32 +00:00
Bryan Drewery
6a7c5e228e - Fix build with HEIMBAL_BASE
PR:		ports/186830
Reported by:	Robert Simmons <rsimmons0@gmail.com>
2014-03-02 08:43:40 +00:00
Bryan Drewery
208fbcfdfb - Fix RC script
Pointyhat to:	bdrewery
Reported by:	Kenta S. <kentas@hush.com>
2014-02-05 03:06:08 +00:00
Bryan Drewery
8543a6a920 - Update to 6.5
ChangeLog: http://www.openssh.org/txt/release-6.5

- Update X509 patch to 7.8
- Update LIB_DEPENDS to new format
- Revert r328706 and re-enable privilege separation sandboxing by default
  as the issue causing crashes has been fixed upstream
- capsicum(4) is now enabled upstream. A local patch is added to fix an issue
  with it [1]
- KERB_GSSAPI is marked BROKEN. It does not build.
  This patch lacks an upstream and I have no way to test it. It needs
  a non-trivial amount of refactoring for 6.5 as the key handling API
  has changed quite a bit.

Submitted by:	pjd@ [1]
2014-02-05 01:40:46 +00:00
Bryan Drewery
2e1923da13 - License is all of BSD2,BSD3,MIT,public domain,BSD-Style,BEER-WARE,
"any purpose with notice intact",ISC-Style. The framework does not
  support such a case easily.
  See http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/LICENCE?rev=HEAD
2014-02-02 15:47:08 +00:00
Bryan Drewery
d04fb1a7c7 - Fix packaging when not using HPN patches
PR:		ports/183895
Reported by:	mat
2013-11-12 15:35:02 +00:00
Bryan Drewery
f2db8331d8 - Update to 6.4p1
This release fixes a security bug:

 * sshd(8): fix a memory corruption problem triggered during rekeying
   when an AES-GCM cipher is selected. Full details of the vulnerability
   are available at: http://www.openssh.com/txt/gcmrekey.adv

Security:	http://www.openssh.com/txt/gcmrekey.adv
2013-11-08 12:41:44 +00:00
Bryan Drewery
9a7dab4b5a - Update to 6.3p1
Changelog: http://www.openssh.org/txt/release-6.3
- Use options helpers where possible
- Use upstream patch mirror for x509 and HPN
- Update HPN patch to v14 and use upstream version
- Add option NONECIPHER to allow disabling NONE in HPN patch
- Update x509 patch from 7.4.1 to 7.6
- Add support for LDNS and enable by it and VerifyHostKeyDNS/SSHFP by default.
  See http://lists.freebsd.org/pipermail/freebsd-security/2013-September/007180.html
  which describes this change, but is supported on releases before 10 as well
  with LDNS option.
- Update SCTP to patchlevel 2329
- Update recommendation on secure usage of SSH
- Add pkg-message warning about ECDSA key possibly being incorrect due to
  previously being written as DSA by the rc script and fixed in r299902 in
  2012
2013-10-13 02:20:07 +00:00
Bryan Drewery
df80a6ed9e - Now that :DEFAULT can be used in PATCH_SITES (fixed in 329679),
depend on the upstream mirror for the x509 patch and my mirror
  as a fallback
2013-10-07 10:41:10 +00:00
Bryan Drewery
32e60b1301 Remove useless -c flag 2013-10-06 17:24:26 +00:00
Bryan Drewery
86c43ef2c4 Perl has not been needed as a direct dependency since 6.0 2013-10-03 23:45:27 +00:00
Bryan Drewery
88a7df5687 - Fix KERB_GSSAPI incorrectly using a predictable cache file.
This was due to a mistake in r319062 when porting the patch from 5.8 to 6.2

  There is no active upstream for this patch. For reference here are the
  changes made in the patch:

  --- -	2013-10-03 11:07:21.262913573 -0500
  +++ /tmp/zdiff.XXXXXXXXXX.STScEeSI	2013-10-03 11:07:21.000000000 -0500
  @@ -183,7 +183,7 @@
	  if (ret < 0 || (size_t)ret >= sizeof(ccname))
		  return ENOMEM;

  -+#ifdef USE_CCAPI
  ++#ifndef USE_CCAPI
	  old_umask = umask(0177);
	  tmpfd = mkstemp(ccname + strlen("FILE:"));
	  oerrno = errno;

PR:		ports/180419
Reported by:	Garrett Wollman <wollman@khavrinen.csail.mit.edu>
2013-10-03 22:38:57 +00:00
Bryan Drewery
28c0576313 Mark IGNORE if KERB_GSSAPI incorrectly selected 2013-10-03 13:36:39 +00:00
Bryan Drewery
258902ed1f Cleanup patch-readconf.c to only have 1 diff 2013-10-03 13:31:42 +00:00
Bryan Drewery
fc9396666a Update descriptions to match current conventions 2013-10-03 12:57:46 +00:00
Bryan Drewery
6dff6e39eb - Copy base r251088 over (which removes a patch) and disable default sandbox
privilege separation as it causes crashes when using AES crypto devices.
  This now uses 'yes' for UsePrivilegeSeparation instead of 'sandbox' by
  default

Reminded by:	Garrett Wollman
2013-09-29 15:07:15 +00:00
Bryan Drewery
f636d59d65 Fix sshd.8 referring to LOCALBASE with OVERWRITE_BASE 2013-09-29 14:54:20 +00:00
Bryan Drewery
06178e7241 Don't extract mtree with OVERWRITE_BASE 2013-09-29 14:53:42 +00:00
Bryan Drewery
5df640eb97 Convert to stagedir 2013-09-29 14:51:29 +00:00
Bryan Drewery
2324655f20 - Add NO_STAGE until validated to be safe for upcoming staging support 2013-09-20 15:58:09 +00:00
Andrej Zverev
e22cb3e0ce - Convert to new perl5 framework
Approved by:	bdrewery@ (maintainer)
2013-08-20 11:43:44 +00:00
Bryan Drewery
cc016c4708 Add an openssh-portable-base slave port to install with OVERWRITE_BASE 2013-07-05 18:27:50 +00:00
Bryan Drewery
dcd945cc38 Add LICENSE 2013-07-05 12:46:45 +00:00
Bryan Drewery
37db06f38b - In rc script, be consistent in reload and check for and generate keys
if needed, as well as checking for port collision with base sshd.

Reported by:	delphij
2013-06-22 15:11:30 +00:00
Bryan Drewery
ef47aef18c - Update and re-add KERB_GSSAPI gsskex patch.
I did very minor porting of the upstream patch to make
  it apply.
  Note that this currently does not build with base heimdal, but
  does build with port MIT or port HEIMDAL.
- Bump PORTREVISION in case someone built the update, expecting
  this option to work and now have a broken ssh.

PR:		ports/178885
Reported by:	Garrett Wollman <wollman@csail.mit.edu>
2013-05-25 16:44:00 +00:00
Bryan Drewery
97ceaf35a1 - Fix sshd crash when not using HPN
This was due to not including the canohost.h header for our
  base customization to respect class login restrictions. I had
  missed this as I was only tested with the default (HPN enabled)
  which already was including this header.

Reported by:	runelind in ##freenode
Tested by:	runelind, myself
Reported by:	Krzysztof Stryjek
2013-05-23 00:30:30 +00:00
Bryan Drewery
342bde1646 Mark BROKEN as I have received 2 separate reports
of crashing.
2013-05-21 22:29:07 +00:00
Bryan Drewery
ac9ad08ef2 - Update to 6.2p2
- The LPK patch has been updated but is obsolete, deprecated and
  untested. It has been replaced by AuthorizedKeysCommand
- The upstream HPN's last update was for 6.1 and is mostly
  abandoned. The patch has had bugs since 5.9. I have reworked
  it and split into into HPN and AES_THREADED options. The
  debugging/logging part of the patch is incomplete. I may
  change the patch to more closely match our base version
  eventually.
- The KERB_GSSAPI option has been removed as the patch has not
  been updated by upstream since 5.7
- sshd VersionAddendum is currently not working as intended;
  it will be fixed later to allow removing the port/pkg version.
- Update our patchset to match latest base version
- Bring in ssh-agent -x support from base
- I incrementally updated the port from 5.8 up to 6.2p2 along
  with patches. You can find all of the versions at
  https://github.com/bdrewery/openssh

Changes:
    http://www.openssh.com/txt/release-5.9
    http://www.openssh.org/txt/release-6.0
    http://www.openssh.org/txt/release-6.1
    http://www.openssh.org/txt/release-6.2
    http://www.openssh.org/txt/release-6.2p2
2013-05-17 19:47:35 +00:00
Bryan Drewery
c56d4773a5 - Bring in r199804 and r206397 from base to avoid killing sshd in
high-pressure swapping environments
2013-05-17 14:36:34 +00:00
Bryan Drewery
86f302336e - Remove copyright as it was a base customization that was removed in
base r213250
2013-05-17 14:16:10 +00:00
Bryan Drewery
b3a7b6b7c2 - Remove CHROOT option and patch. ChrootDirectory was added in 5.0
to achieve the same thing.
2013-05-17 13:56:29 +00:00
Bryan Drewery
f2ec55247e Fix xauth and ssh-askpass still being expected in /usr/X11R6
This was fixed in base in 2007 in r169966
2013-05-02 02:03:09 +00:00
Bryan Drewery
34c529eb2e - Add support for base and port Heimdal for Kerberos
PR:		ports/167554
Requested by:	Volodymyr Kostyrko <c.kworr@gmail.com>
2013-04-30 13:13:49 +00:00
Bryan Drewery
553e0f5788 - Remove compatibiliy for FreeBSD <4.x
* /var/empty has been in hier(7) since 4.x
  * User sshd has been in base since 4.x
  * Simplify a patch for realhostname_sa(3) usage
- Remove SUID_SSH - It was removed from ssh in 2002
- Fix 'make test'
- Add some hints into the patches on where they came from
- Mirror all patches
- Move LPK patch out of files/
- Remove the need for 2 patches
  * Removal of 'host-key check-config' in install phase
  * Adding -lutil
- Add SCTP support [1]
- Remove FILECONTROL as it has not been supported since the 5.8
  update
- Replace tab with space pkg-descr
- Remove default WRKSRC
- Add 'configtest' command to rc script
- Mark X509 broken with other patches due to PATCH_DIST_STRIP=-p1

PR:		ports/174570 [1]
Submitted by:	oleg <proler@gmail.com> [1]
Obtained from:	https://bugzilla.mindrot.org/show_bug.cgi?id=2016 (upstream) [1]
Feature safe:	yes
2013-04-17 00:35:31 +00:00
Bryan Drewery
237fa6c0d4 - Fix runtime crash on CURRENT due to import of NetBSD strnvis() [1]
which differs in prototype from OpenBSD strnvis() [2]

[1] http://lists.freebsd.org/pipermail/freebsd-stable/2013-January/071703.html
[2] http://gnats.netbsd.org/44977

Submitted by:	dim
2013-02-08 00:03:18 +00:00
Alex Kozlov
05a9235c98 - Fix all cases of 'No newline at end of file' in ports tree
Approved by: portmgr (bapt)
2013-02-01 15:04:00 +00:00
Bryan Drewery
cf84cfcb04 - Update mirror site for HPN patch
Feature safe:	yes
2012-12-05 22:32:29 +00:00
Bryan Drewery
9c27afcde5 - Take maintainership
Feature safe:	yes
2012-10-29 15:08:30 +00:00
Eitan Adler
b66d828585 Convert to OptionsNG
Trim Headers

PR:	ports/172429
Submitted by:	Michael Gmelin <freebsd@grem.de>
Feature safe:	yes
2012-10-13 17:13:33 +00:00
Doug Barton
47b836bfe5 When installing in the base, USE_RCORDER does the right thing without
all the gymnastics
2012-08-05 23:05:24 +00:00
Doug Barton
399881097f Add KEYWORD: shutdown
Simplify some code
Fix an error message
2012-06-24 22:49:52 +00:00
Sunpoet Po-Chuan Hsieh
2de4b06af2 - Fix ECDSA key generation in openssh rc.d script
- Bump PORTREVISION for package change

Submitted by:	J. Hellenthal <jhellenthal@dataix.net>
2012-06-24 17:51:21 +00:00
Eitan Adler
f10427bf15 Change HPN patch mirror location to one that works
PR:		ports/168306
Submitted by:	"Bryan Drewery" <bryan@shatow.net>
2012-06-13 03:02:04 +00:00
Sunpoet Po-Chuan Hsieh
36cd8ba256 - Reset maintainership
PR:		ports/167423
Submitted by:	Grzegorz Blach <magik@roorback.net> (maintainer)
2012-05-01 09:56:31 +00:00
Michael Scheidell
30d069e579 - Perl only needed to build, not needed to run. remove PERL5_RUN from Makefile
- Bump PORTREVISION

PR:		ports/166413
Submitted by:	Gleb Smirnoff <glebius@cell.glebius.int.ru>
Approved by:	Grzegorz Blach <magik@roorback.net> (maintainer)
Feature safe:	yes
2012-03-28 18:04:42 +00:00
Doug Barton
83eb2c3700 In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.
2012-01-14 08:57:23 +00:00
Michael Scheidell
ffb8909855 - Add USE_PERL5_BUILD
PR:		ports/163414
Submitted by:	portmgr (pav)
Approved by:	gabor (mentor)
2011-12-23 12:52:28 +00:00