diff options
| author | pawel <pawel@FreeBSD.org> | 2016-12-05 20:23:19 +0000 |
|---|---|---|
| committer | pawel <pawel@FreeBSD.org> | 2016-12-05 20:23:19 +0000 |
| commit | e0683aab839b915d6805adf24b7a2ffdee140c24 (patch) | |
| tree | 5504ba8a1a614eccc12e47127a4b0acefa31bb93 | |
| parent | b83682023a5703c82180cf0189a72a77b57501ab (diff) | |
| download | FreeBSD-ports-e0683aab839b915d6805adf24b7a2ffdee140c24.zip FreeBSD-ports-e0683aab839b915d6805adf24b7a2ffdee140c24.tar.gz | |
Switch to GnuTLS for secure connections, it's upstream first
choice. Also newer polish/kadu (version >= 3.0, soon to be
committed) have documented problems with connecting to GaduGadu
servers when using OpenSSL.
| -rw-r--r-- | polish/libgadu/Makefile | 16 | ||||
| -rw-r--r-- | polish/libgadu/files/patch-src_events.c | 14 |
2 files changed, 4 insertions, 26 deletions
diff --git a/polish/libgadu/Makefile b/polish/libgadu/Makefile index f9076b0..44c60dd 100644 --- a/polish/libgadu/Makefile +++ b/polish/libgadu/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgadu PORTVERSION= 1.12.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= polish net-im @@ -12,7 +13,8 @@ COMMENT= Instant messaging library for Gadu-Gadu protocol LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c +LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c \ + libgnutls.so:security/gnutls CONFLICTS= pl-ekg-1.[0-6]* @@ -22,7 +24,7 @@ GH_ACCOUNT= wojtekka USES= autoreconf gmake libtool localbase pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --disable-static --with-pthread \ - --disable-tests --without-gnutls + --disable-tests INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -32,14 +34,4 @@ PLIST_FILES= include/libgadu.h \ lib/libgadu.so.3.13.0 \ libdata/pkgconfig/libgadu.pc -OPTIONS_DEFINE= OPENSSL -OPTIONS_DEFAULT=OPENSSL - -OPENSSL_CONFIGURE_WITH= openssl -OPENSSL_USES= ssl - -pre-install-OPENSSL-on: -# OpenSSL from base system lacks .pc file for pkgconfig - @${REINPLACE_CMD} -e 's|openssl| |g' ${WRKSRC}/pkgconfig/libgadu.pc - .include <bsd.port.mk> diff --git a/polish/libgadu/files/patch-src_events.c b/polish/libgadu/files/patch-src_events.c deleted file mode 100644 index c5989db..0000000 --- a/polish/libgadu/files/patch-src_events.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/events.c.orig 2014-12-20 12:09:17 UTC -+++ src/events.c -@@ -294,7 +294,11 @@ int gg_session_init_ssl(struct gg_sessio - } - - if (gs->ssl_ctx == NULL) { -+#ifndef OPENSSL_NO_SSL3 - gs->ssl_ctx = SSL_CTX_new(SSLv3_client_method()); -+#else -+ gs->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); -+#endif - - if (gs->ssl_ctx == NULL) { - ERR_error_string_n(ERR_get_error(), buf, sizeof(buf)); |
