pidgin/pidgin

Support gsasl version 1.10.0 as fedora and openbsd don't have 2.0.0

15 months ago, Gary Kramlich
b1826d4885af
Parents 14aae1aaeb98
Children f3090252de57
Support gsasl version 1.10.0 as fedora and openbsd don't have 2.0.0

Testing Done:
Used convey to compile under fedora 36 successfully.

Reviewed at https://reviews.imfreedom.org/r/2202/
2 files changed, 9 insertions(+), 6 deletions(-)
  • +8 -5
    libpurple/protocols/ircv3/purpleircv3sasl.c
  • +1 -1
    meson.build
    • --- a/libpurple/protocols/ircv3/purpleircv3sasl.c Tue Jan 17 02:25:21 2023 -0600
    +++ b/libpurple/protocols/ircv3/purpleircv3sasl.c Tue Jan 17 02:27:41 2023 -0600
    @@ -72,8 +72,9 @@
    switch(property) {
    case GSASL_AUTHID:
    - res = gsasl_property_set(session, GSASL_AUTHID,
    - purple_ircv3_sasl_get_username(data->connection));
    + gsasl_property_set(session, GSASL_AUTHID,
    + purple_ircv3_sasl_get_username(data->connection));
    + res = GSASL_OK;
    break;
    case GSASL_AUTHZID:
    /* AUTHZID is typically set to empty string because it's the user
    @@ -84,11 +85,13 @@
    * See https://www.gnu.org/software/gsasl/manual/gsasl.html#PLAIN
    * for further explanation.
    */
    - res = gsasl_property_set(session, GSASL_AUTHZID, "");
    + gsasl_property_set(session, GSASL_AUTHZID, "");
    + res = GSASL_OK;
    break;
    case GSASL_PASSWORD:
    - res = gsasl_property_set(session, GSASL_PASSWORD,
    - purple_connection_get_password(data->connection));
    + gsasl_property_set(session, GSASL_PASSWORD,
    + purple_connection_get_password(data->connection));
    + res = GSASL_OK;
    break;
    default:
    g_warning("Unknown property %d", property);
    --- a/meson.build Tue Jan 17 02:25:21 2023 -0600
    +++ b/meson.build Tue Jan 17 02:27:41 2023 -0600
    @@ -483,7 +483,7 @@
    #######################################################################
    sasl = dependency('libsasl2', version : '>= 2.0')
    -gsasl = dependency('libgsasl', version : '>= 2.0')
    +gsasl = dependency('libgsasl', version : '>= 1.10.0')
    #AC_MSG_CHECKING(for me pot o' gold)
    #AC_MSG_RESULT(no)