Bug 215632 - security/openssh-portable: re-adding SCTP
Summary: security/openssh-portable: re-adding SCTP
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Bryan Drewery
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-28 12:24 UTC by Kurt Jaeger
Modified: 2017-01-13 23:32 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (bdrewery)


Attachments
patch (27.44 KB, patch)
2016-12-28 12:24 UTC, Kurt Jaeger
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kurt Jaeger freebsd_committer 2016-12-28 12:24:37 UTC
Created attachment 178347 [details]
patch

Testbuild on 12a looks ok.

patch provided by soralx@cydem.org, see

https://lists.freebsd.org/pipermail/freebsd-ports/2016-December/106435.html
Comment 1 Bryan Drewery freebsd_committer 2017-01-13 21:30:17 UTC
The proper place to submit this is at the patch's upstream of https://bugzilla.mindrot.org/show_bug.cgi?id=1604
Comment 2 Bryan Drewery freebsd_committer 2017-01-13 23:28:20 UTC
I'm about to upgrade the port to 7.4 and the patch has more conflicts now:
1 out of 5 hunks failed--saving rejects to readconf.c.rej
2 out of 9 hunks failed--saving rejects to servconf.c.rej
1 out of 2 hunks failed--saving rejects to servconf.h.rej
1 out of 3 hunks failed--saving rejects to ssh.c.rej
1 out of 1 hunks failed--saving rejects to ssh_config.5.rej
1 out of 4 hunks failed--saving rejects to sshd.c.rej
1 out of 1 hunks failed--saving rejects to sshd_config.5.rej
Comment 3 commit-hook freebsd_committer 2017-01-13 23:29:55 UTC
A commit references this bug:

Author: bdrewery
Date: Fri Jan 13 23:28:54 UTC 2017
New revision: 431441
URL: https://svnweb.freebsd.org/changeset/ports/431441

Log:
  Add working SCTP patch.

  This has 2 minor changes from the upstream bug 1604

  PR:		215632
  Submitted by:	soralx@cydem.org

Changes:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/extra-patch-sctp
Comment 4 Bryan Drewery freebsd_committer 2017-01-13 23:30:28 UTC
Fixed in current 7.3 port. Thanks!
Comment 5 Bryan Drewery freebsd_committer 2017-01-13 23:32:08 UTC
The difference with the upstream version is:

--- openssh-7.2_p1-sctp.patch   2017-01-13 13:35:15.669244000 -0800
+++ files/extra-patch-sctp      2017-01-13 15:25:44.146106000 -0800
@@ -135,7 +135,7 @@ index 69d4553..83a2c06 100644
 @@ -136,6 +136,7 @@ typedef enum {
        oChallengeResponseAuthentication, oXAuthLocation,
        oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
-       oCertificateFile, oAddKeysToAgent,
+       oCertificateFile, oAddKeysToAgent, oIdentityAgent,
 +      oTransport,
        oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
        oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
@@ -544,7 +544,7 @@ index f9ff91f..d0d92ce 100644
   again:
 -      while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
 +      while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" SCTP_OPT
-           "ACD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
+           "ACD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
                switch (opt) {
                case '1':
 @@ -845,6 +850,11 @@ main(int ac, char **av)