Bug 241761
| Summary: | security/libssh: Update to 0.9.2 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Lorenzo Salvadore <salvadore> | ||||||||||
| Component: | Individual Port(s) | Assignee: | Tobias C. Berner <tcberner> | ||||||||||
| Status: | Closed FIXED | ||||||||||||
| Severity: | Affects Only Me | CC: | salvadore, swills, tcberner | ||||||||||
| Priority: | --- | Keywords: | buildisok | ||||||||||
| Version: | Latest | ||||||||||||
| Hardware: | Any | ||||||||||||
| OS: | Any | ||||||||||||
| URL: | https://www.libssh.org/2019/10/25/libssh-0-9-1/ | ||||||||||||
| Attachments: |
|
||||||||||||
|
Description
Lorenzo Salvadore
2019-11-06 17:34:12 UTC
Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/94150746 Moin moin The following is most likely a wronlgy applied substitution by makeplist: lib/cmake/libssh/libssh-config-%%CMAKE_BUILD_TYPE%%.cmake that should most likely be lib/cmake/libssh/libssh-config-release.cmake mfg Tobias devel/kio-extras fails to build with this. A commit references this bug: Author: tcberner Date: Sat Nov 9 12:39:34 UTC 2019 New revision: 517124 URL: https://svnweb.freebsd.org/changeset/ports/517124 Log: devel/kio-extras: prepare for libssh-0.9.2 PR: 241761 Obtained from: https://phabricator.kde.org/D25170 Changes: head/devel/kio-extras/files/ head/devel/kio-extras/files/patch-D25170 There is a 0.9.2 release [1] and a patch to make kio-extras [2] work against that. Could you upgrade your diff to 0.9.2? [1] https://www.libssh.org/2019/11/07/libssh-0-9-2/ [2] https://svnweb.freebsd.org/ports?view=revision&revision=517124 Created attachment 209101 [details]
patch for 0.9.2
Here's a patch that updates to 0.9.2 and cleans up the REINPLACE_CMD stuff a bit.
(In reply to Steve Wills from comment #6) Thanks for helping: I am very busy in these days :) I am looking into your patch. In particular I notice that you add a special post-install target when the STATIC option is enabled: indeed I saw that libssh.a was not installed automatically and your solution should work. In pkg-plist we probably have to replace %%CMAKE_BUILD_TYPE%% with "release" as suggested in comment #2. I am unsure about the .if block you introduced in the Makefile: is there a reason you choose to run it only if ${LOCALBASE} is different from "/usr/local"? My impression is that we can run the conditional replacement even in the case ${LOCALBASE}="/usr/local", which would make the Makefile simpler and permit us to include "bsd.port.mk" only again. Created attachment 209130 [details]
libssh - swills with CMAKE_BUILD_TYPE=release
This is swills patch with the substitution CMAKE_BUILD_TYPE=release.
Tested successfully with poudriere on {11.3,12.1}-RELEASE {i386,amd64}.
Created attachment 209131 [details]
libssh - no conditional
This is the same patch as above, but without the conditional ${LOCALBASE} != "/usr/local".
Tested successfully with poudriere on {11.3,12.1}-RELEASE {i386,amd64}.
Comment on attachment 209101 [details]
patch for 0.9.2
I deny approval for this patch because it has been improved by replacing %%CMAKE_BUILD_TYPE%% with "release" (and maybe also by removing an unneeded condition test).
See the other attachments.
(In reply to Lorenzo Salvadore from comment #7) The reason for the conditional is that there's no need to run sed if it's doing nothing, so skip it. Comment on attachment 209130 [details]
libssh - swills with CMAKE_BUILD_TYPE=release
Thanks for clarifying swills.
Since the conditional block is so simple (only a ${REINPLACE_CMD}), I think it is better to just run it in any case: I think it will not make any difference with respect to performances. On the other hand it makes a simpler Makefile (no .if/.endif block, only 1 .include instead of 2).
All dependent ports have been tested successfully with poudriere on 12.0-RELEASE except for: - net-mgmt/netxms: the port is broken on 12 and 13; it has been tested successfully on 11.3-RELEASE; - sysutils/tmate-slave: the port is marked as broken, indipendently from libssh. Thanks, committed. I changed one little thing before committing: CMAKE_OFF= WITH_EXAMPLES instead of using CMAKE_ARGS. mfg Tobias A commit references this bug: Author: tcberner Date: Sat Dec 7 21:30:19 UTC 2019 New revision: 519242 URL: https://svnweb.freebsd.org/changeset/ports/519242 Log: security/libssh: Update to 0.9.2 PR: 241761 Submitted by: Lorenzo Salvadore <phascolarctos@protonmail.ch> (maintainer) Changes: head/security/libssh/Makefile head/security/libssh/distinfo head/security/libssh/pkg-plist |