Bug 233157 - [patch] security/openssh-portable: fix OPENSSL_VERSION_NUMBER comparison
Summary: [patch] security/openssh-portable: fix OPENSSL_VERSION_NUMBER comparison
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: 2018-11-12 12:58 UTC by Robert Schulze
Modified: 2018-11-12 21:06 UTC (History)
0 users

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


Attachments
compare openssl version with 1.1.0 instead of 1.0.1 (393 bytes, text/plain)
2018-11-12 12:58 UTC, Robert Schulze
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Schulze 2018-11-12 12:58:01 UTC
Created attachment 199161 [details]
compare openssl version with 1.1.0 instead of 1.0.1

This patch fixes a wrong interpretation of OPENSSL_VERSION_NUMBER
in openbsd-compat/openssl-compat.c

As documented in https://www.openssl.org/docs/man1.1.0/crypto/OPENSSL_init_new.html
the function OPENSSL_init_crypto() is available since OpenSSL-1.1.0.
In openssl-compat.c, the availability is compared with version 1.0.1 instead.

This minor typo prevents building security/openssh-portable(7.9p1)
on FreeBSD-11.2.

with kind regards,
Robert Schulze
Comment 1 Sunpoet Po-Chuan Hsieh freebsd_committer 2018-11-12 14:25:32 UTC
FYI, upstream fixed it in https://anongit.mindrot.org/openssh.git/commit/?id=c0a35265907533be10ca151ac797f34ae0d68969
Comment 2 Bryan Drewery freebsd_committer 2018-11-12 17:36:00 UTC
Thanks. Will get it committed shortly as I have another update to commit.
Comment 3 commit-hook freebsd_committer 2018-11-12 20:56:47 UTC
A commit references this bug:

Author: bdrewery
Date: Mon Nov 12 20:56:12 UTC 2018
New revision: 484823
URL: https://svnweb.freebsd.org/changeset/ports/484823

Log:
  - Fix HPN for 7.9p1
  - DOCS is required for HPN but it's not exclusively a flavor so needs to be
    in the default list.
  - Fix a build-time OpenSSL version comparison [1]

  PR:		233157 [1]
  Reported by:	Robert Schulze <rs@bytecamp.net> [1]
  Obtained from:	upstream c0a35265907533be10ca151ac797f34ae0d68969 [1]

Changes:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/extra-patch-hpn
  head/security/openssh-portable/files/patch-c0a35265907533be10ca151ac797f34ae0d68969
Comment 4 commit-hook freebsd_committer 2018-11-12 21:06:56 UTC
A commit references this bug:

Author: bdrewery
Date: Mon Nov 12 21:06:49 UTC 2018
New revision: 484825
URL: https://svnweb.freebsd.org/changeset/ports/484825

Log:
  MFH: r484765 r484823 r484824

  Update to 7.9p1.

  - Fixes build on 12, head, and openssl-devel.
  - GSSAPI and HPN are currently marked BROKEN as I don't want to block
    the main update for anyone.

    http://www.openssh.com/txt/release-7.8
    http://www.openssh.com/txt/release-7.9

  - Fix HPN for 7.9p1
  - DOCS is required for HPN but it's not exclusively a flavor so needs to be
    in the default list.
  - Fix a build-time OpenSSL version comparison [1]

  PR:		233157 [1]
  Reported by:	Robert Schulze <rs@bytecamp.net> [1]
  Obtained from:	upstream c0a35265907533be10ca151ac797f34ae0d68969 [1]

  - Update KERB_GSSAPI for 7.9p1

  Approved by:	portmgr (implicit)

Changes:
_U  branches/2018Q4/
  branches/2018Q4/security/openssh-portable/Makefile
  branches/2018Q4/security/openssh-portable/distinfo
  branches/2018Q4/security/openssh-portable/files/extra-patch-hpn
  branches/2018Q4/security/openssh-portable/files/extra-patch-hpn-compat
  branches/2018Q4/security/openssh-portable/files/extra-patch-tcpwrappers
  branches/2018Q4/security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb
  branches/2018Q4/security/openssh-portable/files/patch-85fe48fd49f2e81fa30902841b362cfbb7f1933b
  branches/2018Q4/security/openssh-portable/files/patch-868afa68469de50d8a43e5daf867d7c624a34d20
  branches/2018Q4/security/openssh-portable/files/patch-auth2.c
  branches/2018Q4/security/openssh-portable/files/patch-b81b2d120e9c8a83489e241620843687758925ad
  branches/2018Q4/security/openssh-portable/files/patch-c0a35265907533be10ca151ac797f34ae0d68969
  branches/2018Q4/security/openssh-portable/files/patch-f5baa36ba79a6e8c534fb4e0a00f2614ccc42ea6
  branches/2018Q4/security/openssh-portable/files/patch-misc.c
  branches/2018Q4/security/openssh-portable/files/patch-serverloop.c
  branches/2018Q4/security/openssh-portable/files/patch-session.c