Commit graph

299 commits

Author SHA1 Message Date
Bryan Drewery
d5324e3511 Fix build with NONE_CIPHER. 2017-01-17 19:38:38 +00:00
Bryan Drewery
8da82fad61 Update to 7.4p1.
- Update X509 patch to 9.3
- SCTP patch from soralx@cydem.org

Changes: https://www.openssh.com/txt/release-7.4
2017-01-16 19:30:31 +00:00
Bryan Drewery
b75ee34145 Fix to only enable SCTP patch with option from r431441 2017-01-13 23:44:24 +00:00
Bryan Drewery
dbbe36d335 Add forgotten patch in r431438 for CVE-2016-10009 and CVE-2016-10010.
Security:	2c948527-d823-11e6-9171-14dae9d210b8
Submitted by:	Tim Zingelman <zingelman@gmail.com>
MFH:		2017Q1
2017-01-13 23:39:48 +00:00
Bryan Drewery
0e17ced755 Add working SCTP patch.
This has 2 minor changes from the upstream bug 1604

PR:		215632
Submitted by:	soralx@cydem.org
2017-01-13 23:28:54 +00:00
Bryan Drewery
4e5701f44f Add patches to cover security issues CVE-2016-10009 and CVE-2016-10010.
Security:	2c948527-d823-11e6-9171-14dae9d210b8
Submitted by:	Tim Zingelman <zingelman@gmail.com>
MFH:		2017Q1
2017-01-13 23:23:35 +00:00
Bryan Drewery
f696ba7f44 Bring in upstream commit ec165c392ca54317dbe3064a8c200de6531e89ad:
Unregister the KEXINIT handler after message has been
  received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
  allocation of up to 128MB -- until the connection is closed. Reported by
  shilei-c at 360.cn

Security:	CVE-2016-8858
2016-10-24 22:52:17 +00:00
Bryan Drewery
4e90011c99 - Update to 7.3p1
- X509: Unbreak and update to 9.0
- SCTP: Mark BROKEN
- KERB_GSSAPI: Unbreak and update from Debian's patch

Release notes: http://www.openssh.com/txt/release-7.3
2016-08-08 19:22:37 +00:00
Dmitry Marakasov
e87a8bd319 - Fix trailing whitespace in pkg-messages
Approved by:	portmgr blanket
2016-05-19 11:09:14 +00:00
Dmitry Marakasov
1f8b48b772 - Fix trailing whitespace in pkg-descrs, categories [p-x]*
Approved by:	portmgr blanket
2016-05-19 10:53:05 +00:00
Bryan Drewery
bd72790e03 Bring in updated SCTP patch from gentoo.
Submitted by:	Eduardo Morras <emorrasg@yahoo.es>
2016-05-16 16:56:48 +00:00
Mathieu Arnold
597afc47ba Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:25:16 +00:00
Bryan Drewery
8699aa41f2 - Update to 7.2p2 which fixes X11Forwarding command injection vulnerability.
Changelog:	http://www.openssh.com/txt/release-7.2p2
Advisory:	http://www.openssh.com/txt/x11fwd.adv
2016-03-11 22:49:26 +00:00
Bryan Drewery
32641bdf90 - Update to 7.2p1
- Mark X509 and KERB_GSSAPI as BROKEN.

Changelog: http://www.openssh.com/txt/release-7.2

With help from:	brnrd
2016-02-29 18:36:57 +00:00
John Marino
6f41150b29 x11/xterm: document ncurses requirement (USES+=ncurses)
also link to libncurses rather than libcurses

approved by:	infrastructure blanket
2016-02-03 22:15:11 +00:00
Bryan Drewery
686faf2ce0 Fix the KERB_GSSAPI option using the latest patch from Debian.
This slightly refactors some of the HPN patch to avoid a conflict.

PR:		206346
Submitted by:	Garret Wollman
2016-01-20 02:18:42 +00:00
Bryan Drewery
4db8713801 Update to 7.1p2
Changes: http://www.openssh.com/txt/release-7.1p2

MFH:		2016Q1
Security:	CVE-2016-0777
Security:	CVE-2016-0778
2016-01-14 16:41:45 +00:00
Bryan Drewery
3f7ae3c03a Make portlint stop spamming me. It's gotten quite silly.
There's no reason to regenerate these for the sake of having 'UTC' in the patch
and it also considers patches with comments to be invalid.

WARN: /root/svn/ports/security/openssh-portable/files/patch-auth.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-auth2.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-readconf.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-regress__test-exec.sh: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-servconf.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-session.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-ssh-agent.1: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-ssh-agent.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-ssh.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-ssh_config: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-ssh_config.5: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-sshconnect.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-sshd.8: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-sshd.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-sshd_config: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /root/svn/ports/security/openssh-portable/files/patch-sshd_config.5: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
2015-11-11 21:21:44 +00:00
Bryan Drewery
7c7778bb96 Fix the NONECIPHER not actually being offered by the server.
Upstream issue: https://github.com/rapier1/openssh-portable/issues/3
2015-11-11 21:04:48 +00:00
Bryan Drewery
70381a9f0d Update advice to disable ChallengeResponseAuthentication for key usage.
PR:		204475
Reported by:	Mark.Martinec@ijs.si
2015-11-11 18:04:40 +00:00
Mathieu Arnold
7f0f664d7e Drop 8 support.
With hat:	portmgr
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3694
2015-10-15 14:55:14 +00:00
Bryan Drewery
d842425106 Stop trying to create the RSA protocol 1 key from the rc.d file. It is no
longer supported by default since 7.0. [1]

I do plan to make this configurable based on PR 202169 [2] soon.

PR:		202792 [1]
PR:		202169 [2]
Submitted by:	chrysalis@chrysalisnet.org [1]
2015-09-24 21:54:40 +00:00
Mathieu Arnold
320514f1dd It seems some people keep adding $FreeBSD$ to patch files.
Patches must not be changed by the vcs, this includes the
svn:keyword expansion.  Set fbsd:nokeywords to a couple of patches.

With hat:	portmgr
Sponsored by:	Absolight
2015-09-16 13:03:45 +00:00
Bryan Drewery
5dc15ea21d Fix patch from r395182 on head. The patch(1) command works fine on 8.4
and 9.3 but not head with this patch.
2015-08-25 03:59:54 +00:00
Bryan Drewery
c0ac4a505a Apply upstream fix for 'HostkeyAlgorithms +' support. 2015-08-24 18:51:07 +00:00
Bryan Drewery
82c509e276 Update to 7.1p1
Changes: http://www.openssh.com/txt/release-7.1
2015-08-21 21:51:01 +00:00
Bryan Drewery
b2806a22e4 - Update to OpenSSH 7.0p1
- Update X509 patch to 8.5

Changes: http://www.openssh.com/txt/release-7.0
2015-08-18 15:42:52 +00:00
Bryan Drewery
dfe1f78791 Add upstream fix to address CVE-2015-5600 for MaxAuthTries bypass.
Security:	5b74a5bc-348f-11e5-ba05-c80aa9043978
2015-07-27 18:47:55 +00:00
Bryan Drewery
9232111ac8 Fix accidental revert of PermitRootLogin default to NO.
This was due to the patch not being needed in the snapshot version
which I based the 6.9 update off of. The default is changed in
the upcoming 7.0 release
2015-07-27 18:41:02 +00:00
Bryan Drewery
2520291173 - Update to 6.9p1
- Update X509 patch to 8.4

Changes:	http://www.openssh.com/txt/release-6.9
2015-07-27 18:30:24 +00:00
Bryan Drewery
c3a9da2b6d Use new USES=libedit 2015-07-24 17:01:58 +00:00
Bryan Drewery
07d4a6adef Support changed ETCDIR in pkg-plist 2015-06-24 19:35:58 +00:00
Bryan Drewery
366d32fba5 Allow user overriding ETCDIR 2015-06-24 18:37:59 +00:00
Bryan Drewery
661be7b08d Add openssh-portable-devel which is based on the upstream snapshots for staging and testing.
Its initial version is 20150602 which is nearly the upcoming 6.9 version.
2015-06-02 15:00:43 +00:00
Mathieu Arnold
6172d4b590 Remove $FreeBSD$ from patches files everywhere.
With hat:	portmgr
Sponsored by:	Absolight
2015-05-22 20:34:27 +00:00
Bryan Drewery
eae73f59b6 Avoid a potential read overflow. This was not deemed a security issue by
upstream; it was fixed upstream comprehensively a few weeks ago in
77199d6ec8986d470487e66f8ea8f4cf43d2e20c.

PR:		200241
Patch by:	Hanno Böck <hanno@hboeck.de>
Obtained from:	http://www.openwall.com/lists/oss-security/2015/05/16/3
2015-05-16 16:28:39 +00:00
Mathieu Arnold
60d1a83c2a MASTER_SITES cleanup.
- Replace ${MASTER_SITE_FOO} with FOO.
- Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9%
  of the time.)
- Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and
  no hint of what it should be was present.
- Fix some logic.
- And generally, make things more simple and easy to understand.

While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and
SAMBA macros.

Also, replace some EXTRACT_SUFX occurences with USES=tar:*.

Checked by:	make fetch-urlall-list
With hat:	portmgr
Sponsored by:	Absolight
2015-05-14 10:15:04 +00:00
Bryan Drewery
0e8dd5854c Fix clients getting 'Bad packet length' and 'Disconnecting: Packet corrupt'
when the NONECIPHER option is selected but not the HPN option.  The server
banner was improperly sending a NULL byte after the newline causing confusion
on the client.  This was an error in my own modifications to the HPN patch
in r383231.

This may have occurred with stale builds as well, such as running
'make configure' then 'portsnap update' and then 'make build'.

Pointyhat to:	bdrewery
Reported by:	many
PR:		199352
2015-05-06 18:39:41 +00:00
Bryan Drewery
01f1b90dd0 Replace the TTSH patch from r383618 with the one that upstream took.
Obtained from upstream d8f391caef623
2015-04-14 16:42:24 +00:00
Bryan Drewery
08dd690c4a Cleanup some unneeded patches.
1. There's no need to patch the xauth(1) location as the OpenSSH build already
   does so based on the --with-xauth path provided. It also updates manpages.
2. Don't modify manpage for shosts location as it was wrong. The proper
   LOCALBASE path is now used due to OpenSSH's build already handling it
   properly.
3. Remove confusing UsePrivilegeSeparation change in sshd_config. The default
   upstream is to have it disabled by default. The sshd_config line is in
   upstream to enable it by default in new installations. We always enable
   it though. So remove the sshd_config change which makes it look like
   we don't use it; it was not a needed difference with upstream.

From discussion with:	TJ <tj@mrsk.me>
2015-04-09 20:57:23 +00:00
Bryan Drewery
e574b487b5 Limit the TTSSH bug fix in r383618 to only versions that have it.
Submitted by:	IWAMOTO Kouichi <sue@iwmt.org>
2015-04-09 20:19:17 +00:00
Bryan Drewery
c1edee9622 Fix TTSSH (Tera Type/Term) client crash:
Unexpected SSH2 message(80) on current stage(6)

This patch was submitted upstream. The client has fixed it in their SVN [1][2]
but not yet released a fixed build.

[1] http://en.sourceforge.jp/ticket/browse.php?group_id=1412&tid=35010
[2] http://en.sourceforge.jp/projects/ttssh2/scm/svn/commits/5829
2015-04-09 02:33:47 +00:00
Bryan Drewery
fff0fb586b Remove debugging leftover in release.
error: mm_request_receive: socket closed

Obtained from:	Upstream c7fe79ed7db427f1474e72b9f8b465901d61d3f6
2015-04-09 01:49:10 +00:00
Bryan Drewery
60e9c53853 - Update to 6.8p1
- Fix 'make test'
- HPN:
  - NONECIPHER is no longer default. This is not default in base and should not
    be default here as it introduces security holes.
  - HPN: I've audited the patch and included it in the port directory for
    transparency. I identified several bugs and submitted them to the new
    upstream: https://github.com/rapier1/openssh-portable/pull/2
  - HPN: The entire patch is now ifdef'd to ensure various bits are properly
    removed depending on the OPTIONS selected.
  - AES_THREADED is removed. It has questionable benefit on modern HW and is not
    stable.
  - The "enhanced logging" was removed from the patch as it is too
    intrusive and difficult to maintain in the port.
  - The progress meter "peak throughput" patch was removed.
  - Fixed HPN version showing in client/server version string when HPN
    was disabled in the config.
- KERB_GSSAPI is currently BROKEN as it does not apply.
- Update X509 to 8.3

Changelog: http://www.openssh.com/txt/release-6.8
2015-04-04 17:16:58 +00:00
Bryan Drewery
4fad9f2d4f Remove unused variable PRECIOUS 2015-04-02 02:21:59 +00:00
Bryan Drewery
816304d141 Make the check added in 2013 in r330200 for a bad ECDSA key actually work. 2015-04-01 01:04:23 +00:00
Bryan Drewery
ff0a43e2f0 Remove useless IGNORE for TCP_WRAPPERS and PAM.
TCP_WRAPPERS: /usr/include/tcpd.h is always installed by the base system.
              It is only libwrap.so that is conditional on WITH_TCP_WRAPPERS.

PAM:          /usr/include/security/pam_modules.h is always installed.

This fixes FreshPorts claiming this port is ignored.
2015-03-31 19:07:25 +00:00
Bryan Drewery
6014ebaef2 Make the VersionAddendum fix use the proper default.
Once I ran into the X509 issue previously I failed to retest that the patch
worked.

PR:		193127
2015-03-29 04:17:53 +00:00
John Marino
c55ac89dcd security category: Remove $PTHREAD_LIBS
approved by:	PTHREAD blanket
2015-03-25 08:30:27 +00:00
Bryan Drewery
258fa75735 Stop forcing the port version string into the server banner.
The port now uses VersionAddendum in the sshd_config to allow overriding
this value. Using "none" allows disabling the default of the port
version string. The default is kept to show the port version string to
remain close to the base version.

Support for the client VersionAddendum may be added soon as well to better
match base and not give surprises when switching from base to the port.

PR:		193127
Requested by:	many, including myself when this was broken years ago.
2015-03-23 04:23:08 +00:00