Wireshark-commits: [Wireshark-commits] master-3.0 fd6476f: macOS: Fixup our libssh workaround.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 17 Feb 2019 16:46:53 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fd6476fe29975202e567ee1fe7e38dae69d08162
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

fd6476f by Gerald Combs (gerald@xxxxxxxxxxxxx):

    macOS: Fixup our libssh workaround.
    
    On the previous builder, `otool -L /path/to/libssh.4.dylib` returned a
    bare "libssh.4.dylib", which required a workaround. On the new builder
    it returns "@rpath/libssh.4.dylib". Adjust the workaround accordinly.
    
    Remove a couple of chmods while we're here. Permission issues are better
    addressed elsewhere.
    
    Change-Id: If0692219d9558c77b45620e7aad309853012b7e8
    Reviewed-on: https://code.wireshark.org/review/32059
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit a5e39b02b45f1062edc451ffed1459a4c71e4616)
    Reviewed-on: https://code.wireshark.org/review/32075
    

Actions performed:

    from  8977ff2   [Automatic update for 2019-02-17]
     add  fd6476f   macOS: Fixup our libssh workaround.


Summary of changes:
 packaging/macosx/osx-app.sh.in | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)