Attachment #192302 for bug #227324




# $FreeBSD$

PORTNAME=	hexchat
PORTVERSION=	2.14.1
DISTVERSIONPREFIX=	v
CATEGORIES=	irc gnome ipv6


LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
LIB_DEPENDS=	libproxy.so:net/libproxy \
		libfontconfig.so:x11-fonts/fontconfig \
		libdbus-1.so:devel/dbus \
		libfreetype.so:print/freetype2 \
		libnotify.so:devel/libnotify
RUN_DEPENDS=	${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes

USES=		meson ninja desktop-file-utils libtool pkgconfig ssl shebangfix \
		gettext-tools
USE_GNOME=	cairo gtk20 intltool libxml2
USE_XORG=	x11
USE_GITHUB=	yes
MESON_ARGS=	-Dwith-ssl=true -Dwith-gtk=true -Dwith-sysinfo=false
CONFIGURE_ARGS=	--enable-openssl --enable-gtkfe --disable-sysinfo \
		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
		LUA=lua-${LUA_VER}
INSTALLS_ICONS=	yes
INSTALL_TARGET=	install-strip

MAKE_ARGS=	OBJC="${CC}"

CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib -lX11



PORTDOCS=	*

OPTIONS_DEFINE=		CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA NOTIFY \
			PERL PYTHON TEXTFE

OPTIONS_DEFAULT=	CA_BUNDLE CANBERRA DBUS NOTIFY PERL PYTHON


CANBERRA_DESC=		Audio support via Libcanberra
FISHLIM_DESC=		FiSHLiM plugin
TEXTFE_DESC=		Text frontend
SOCKS_DESC=		SOCKS proxy support, FORBIDDEN in FreeBSD 10+

CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
CA_BUNDLE_VARS=	CA_BUNDLE="${LOCALBASE}/share/certs/ca-root-nss.crt"
CA_BUNDLE_VARS_OFF=	CA_BUNDLE=NULL
CANBERRA_LIB_DEPENDS=	libcanberra.so:audio/libcanberra
CANBERRA_MESON_TRUE=	with-libcanberra
DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
DBUS_MESON_TRUE=	with-dbus
DBUS_USE=		GNOME=gconf2
FISHLIM_MESON_TRUE=	with-fishlim
LUA_MESON_ON=		-Dwith-lua=lua-${LUA_VER}
LUA_MESON_OFF=		-Dwith-lua=false
LUA_USES=		lua
LUA_USE=		GCC=any
NLS_CONFIGURE_ENABLE=	nls
NLS_USES=		gettext
NLS_USES_OFF=		gettext-tools # doesn't build otherwise
NOTIFY_RUN_DEPENDS=	notify-send:devel/libnotify
NOTIFY_MESON_TRUE=	with-libnotify
PERL_MESON_TRUE=	with-perl
PERL_USES=		perl5
PYTHON_MESON_ON=	-Dwith-python=python-${PYTHON_VER}
PYTHON_MESON_OFF=	-Dwith-python=false
PYTHON_USES=		python:3.4+ shebangfix
PYTHON_VARS=		SHEBANG_FILES=meson_post_install.py
PYTHON_VARS+=		SHEBANG_FILES=plugins/perl/generate_header.py
PYTHON_VARS+=		SHEBANG_FILES=src/common/make-te.py
TEXTFE_MESON_TRUE=	with-text

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MCA_BUNDLE}
CA_BUNDLE=	"${LOCALBASE}/share/certs/ca-root-nss.crt"
.else
CA_BUNDLE=	NULL
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \
		${WRKSRC}/src/common/server.c

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496752085	1	TIMESTAMP = 1521168316
2	SHA256 (hexchat-hexchat-v2.12.4_GH0.tar.gz) = eb9ebe45b1c9e39543517b48d63caa2f2736e82a8dbbd1da96132070752f8084	2	SHA256 (hexchat-hexchat-v2.14.1_GH0.tar.gz) = fcf96f54720f5284b8ac52964e7a5e406893069fc332535afa724f7d7d6a6a81
3	SIZE (hexchat-hexchat-v2.12.4_GH0.tar.gz) = 2780008	3	SIZE (hexchat-hexchat-v2.14.1_GH0.tar.gz) = 2748286




--- meson.build.orig	2018-03-14 02:26:31 UTC
+++ meson.build
@@ -16,11 +16,21 @@ cc = meson.get_compiler('c')
 libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')
 libgmodule_dep = dependency('gmodule-2.0')
 global_deps = []
+libssl_dep_found = false
 if cc.get_id() == 'msvc'
   libssl_dep = cc.find_library('libeay32')
 else
   libssl_dep = dependency('openssl', version: '>= 0.9.8',
-                          required: get_option('with-ssl'))
+                          required: false)
+  if not libssl_dep.found()
+    libssl_dep = [
+        cc.find_library('ssl', required: get_option('with-ssl')),
+        cc.find_library('crypto', required: get_option('with-ssl'))
+    ]
+    libssl_dep_found = libssl_dep[0].found()
+  else
+    libssl_dep_found = libssl_dep.found()
+  endif
 endif
 
 config_h = configuration_data()
@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED'
 config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr'))
 config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h'))
 
-if libssl_dep.found()
+if libssl_dep_found
   config_h.set('HAVE_X509_GET_SIGNATURE_NID',
     cc.has_function('X509_get_signature_nid', dependencies: libssl_dep)
   )
@@ -131,9 +141,6 @@ global_ldflags = []
 test_ldflags = [
   '-Wl,-z,relro',
   '-Wl,-z,now',
-  # mingw
-  '-Wl,--dynamicbase',
-  '-Wl,--nxcompat',
 ]
 foreach ldflag : test_ldflags
   if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag)

Line 0 Link Here

(-)files/patch-meson__options.txt (+11 lines)
	1	--- meson_options.txt.orig 2018-03-14 02:26:31 UTC
	2	+++ meson_options.txt
	3	@@ -39,7 +39,7 @@ option('with-exec', type: 'boolean',
	4	option('with-fishlim', type: 'boolean',
	5	description: 'Fish encryption plugin, requires openssl'
	6	)
	7	-option('with-lua', type: 'string', value: 'luajit',
	8	+option('with-lua', type: 'string',
	9	description: 'Lua scripting plugin, value is pkg-config name to use or "false"'
	10	)
	11	option('with-perl', type: 'boolean',

Line 0 Link Here

(-)files/patch-plugins_fishlim_meson.build (+8 lines)
	1	--- plugins/fishlim/meson.build.orig 2018-03-14 02:26:31 UTC
	2	+++ plugins/fishlim/meson.build
	3	@@ -1,4 +1,4 @@
	4	-if not libssl_dep.found()
	5	+if not libssl_dep_found
	6	error('fish plugin requires openssl')
	7	endif
	8

Lines 1-11 Link Here

(-)files/patch-src__common__server.c (-3 / +3 lines)
1	--- src/common/server.c.orig 2016-12-10 14:30:51 UTC	1	--- src/common/server.c.orig 2018-03-14 02:26:31 UTC
2	+++ src/common/server.c	2	+++ src/common/server.c
3	@@ -743,7 +743,7 @@ server_connect_success (server *serv)	3	@@ -749,7 +749,7 @@ server_connect_success (server *serv)
4	/* it'll be a memory leak, if connection isn't terminated by	4	/* it'll be a memory leak, if connection isn't terminated by
5	server_cleanup() */	5	server_cleanup() */
6	serv->ssl = _SSL_socket (serv->ctx, serv->sok);	6	serv->ssl = _SSL_socket (serv->ctx, serv->sok);
7	- if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL)))	7	- if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL)))
8	+ if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, "/usr/local/share/certs/ca-root-nss.crt")))	8	+ if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, "%%CA_BUNDLE%%")))
9	{	9	{
10	EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,	10	EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,
11	NULL, NULL, 0);	11	NULL, NULL, 0);




--- src/common/ssl.c.orig	2016-12-10 14:30:51 UTC
+++ src/common/ssl.c
@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *ce
 		return 1;
 
 	alg = OBJ_obj2nid (algor->algorithm);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
 #else
 	sign_alg = X509_get_signature_nid (peer_cert);
@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
 
 	SSL_set_fd (ssl, sd);
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
 	method = ctx->method;
 #else
 	method = SSL_CTX_get_ssl_method (ctx);
@@ -328,7 +328,7 @@ _SSL_set_verify (SSL_CTX *ctx, void *ver
 		__SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths");
 		return (err_buf);
 	}
-/*
+
 	if (cacert)
 	{
 		if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL))
@@ -337,7 +337,7 @@ _SSL_set_verify (SSL_CTX *ctx, void *ver
 			return (err_buf);
 		}
 	}
-*/
+
 	SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, verify_callback);
 
 	return (NULL);




%%FISHLIM%%lib/hexchat/plugins/fishlim.so
%%PERL%%lib/hexchat/plugins/perl.so
%%PYTHON%%lib/hexchat/plugins/python.so
%%LUA%%%%LUA_LIBDIR%%/hexchat/plugins/lua.so
libdata/pkgconfig/hexchat-plugin.pc
man/man1/hexchat.1.gz
share/metainfo/io.github.Hexchat.appdata.xml
share/applications/io.github.Hexchat.desktop
%%DBUS%%share/dbus-1/services/org.hexchat.service.service
share/icons/hicolor/48x48/apps/hexchat.png
share/icons/hicolor/scalable/apps/hexchat.svg
share/locale/af/LC_MESSAGES/hexchat.mo
share/locale/am/LC_MESSAGES/hexchat.mo
share/locale/ast/LC_MESSAGES/hexchat.mo
share/locale/az/LC_MESSAGES/hexchat.mo
share/locale/be/LC_MESSAGES/hexchat.mo
share/locale/bg/LC_MESSAGES/hexchat.mo
share/locale/ca/LC_MESSAGES/hexchat.mo
share/locale/cs/LC_MESSAGES/hexchat.mo
share/locale/da/LC_MESSAGES/hexchat.mo
share/locale/de/LC_MESSAGES/hexchat.mo
share/locale/el/LC_MESSAGES/hexchat.mo
share/locale/en_GB/LC_MESSAGES/hexchat.mo
share/locale/es/LC_MESSAGES/hexchat.mo
share/locale/et/LC_MESSAGES/hexchat.mo
share/locale/eu/LC_MESSAGES/hexchat.mo
share/locale/fi/LC_MESSAGES/hexchat.mo
share/locale/fr/LC_MESSAGES/hexchat.mo
share/locale/gl/LC_MESSAGES/hexchat.mo
share/locale/gu/LC_MESSAGES/hexchat.mo
share/locale/hi/LC_MESSAGES/hexchat.mo
share/locale/hu/LC_MESSAGES/hexchat.mo
share/locale/id/LC_MESSAGES/hexchat.mo
share/locale/it/LC_MESSAGES/hexchat.mo
share/locale/ja_JP/LC_MESSAGES/hexchat.mo
share/locale/kn/LC_MESSAGES/hexchat.mo
share/locale/ko/LC_MESSAGES/hexchat.mo
share/locale/lt/LC_MESSAGES/hexchat.mo
share/locale/lv/LC_MESSAGES/hexchat.mo
share/locale/mk/LC_MESSAGES/hexchat.mo
share/locale/ml/LC_MESSAGES/hexchat.mo
share/locale/ms/LC_MESSAGES/hexchat.mo
share/locale/nb/LC_MESSAGES/hexchat.mo
share/locale/nl/LC_MESSAGES/hexchat.mo
share/locale/no/LC_MESSAGES/hexchat.mo
share/locale/pa/LC_MESSAGES/hexchat.mo
share/locale/pl/LC_MESSAGES/hexchat.mo
share/locale/pt/LC_MESSAGES/hexchat.mo
share/locale/pt_BR/LC_MESSAGES/hexchat.mo
share/locale/ru/LC_MESSAGES/hexchat.mo
share/locale/rw/LC_MESSAGES/hexchat.mo
share/locale/sk/LC_MESSAGES/hexchat.mo
share/locale/sl/LC_MESSAGES/hexchat.mo
share/locale/sq/LC_MESSAGES/hexchat.mo
share/locale/sr/LC_MESSAGES/hexchat.mo
share/locale/sr@latin/LC_MESSAGES/hexchat.mo
share/locale/sv/LC_MESSAGES/hexchat.mo
share/locale/th/LC_MESSAGES/hexchat.mo
share/locale/tr/LC_MESSAGES/hexchat.mo
share/locale/uk/LC_MESSAGES/hexchat.mo
share/locale/vi/LC_MESSAGES/hexchat.mo
share/locale/wa/LC_MESSAGES/hexchat.mo
share/locale/zh_CN/LC_MESSAGES/hexchat.mo
share/locale/zh_TW/LC_MESSAGES/hexchat.mo
share/pixmaps/hexchat.png

Return to bug 227324

Lines 2-8 Link Here

(-)Makefile (-35 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= hexchat	4	PORTNAME= hexchat
5	PORTVERSION= 2.12.4	5	PORTVERSION= 2.14.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= irc gnome ipv6	7	CATEGORIES= irc gnome ipv6
8		8
Lines 12-36 Link Here
12	LICENSE= GPLv2+	12	LICENSE= GPLv2+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	BUILD_DEPENDS= devel/autoconf-archive>0:devel/autoconf-archive	15	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
16	LIB_DEPENDS= libproxy.so:net/libproxy \	16	LIB_DEPENDS= libproxy.so:net/libproxy \
17	libfontconfig.so:x11-fonts/fontconfig \	17	libfontconfig.so:x11-fonts/fontconfig \
18	libdbus-1.so:devel/dbus \	18	libdbus-1.so:devel/dbus \
19	libfreetype.so:print/freetype2	19	libfreetype.so:print/freetype2 \
		20	libnotify.so:devel/libnotify
		21	RUN_DEPENDS= ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes
20		22
21	USES= autoreconf gmake desktop-file-utils libtool pkgconfig ssl	23	USES= meson ninja desktop-file-utils libtool pkgconfig ssl shebangfix \
		24	gettext-tools
22	USE_GNOME= cairo gtk20 intltool libxml2	25	USE_GNOME= cairo gtk20 intltool libxml2
23	USE_XORG= x11	26	USE_XORG= x11
24	USE_GITHUB= yes	27	USE_GITHUB= yes
25	GNU_CONFIGURE= yes	28	MESON_ARGS= -Dwith-ssl=true -Dwith-gtk=true -Dwith-sysinfo=false
26	CONFIGURE_ARGS= --enable-openssl --enable-gtkfe --disable-sysinfo \
27	--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
28	LUA=lua-${LUA_VER}
29	INSTALLS_ICONS= yes	29	INSTALLS_ICONS= yes
30	INSTALL_TARGET= install-strip	30	INSTALL_TARGET= install-strip
31		31
32	MAKE_ARGS= OBJC="${CC}"
33
34	CPPFLAGS+= -I${LOCALBASE}/include	32	CPPFLAGS+= -I${LOCALBASE}/include
35	LIBS+= -L${LOCALBASE}/lib -lX11	33	LIBS+= -L${LOCALBASE}/lib -lX11
36		34
Lines 38-45 Link Here
38		36
39	PORTDOCS= *	37	PORTDOCS= *
40		38
41	OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA NLS NOTIFY \	39	OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA NOTIFY \
42	PERL PYTHON SOCKS TEXTFE	40	PERL PYTHON TEXTFE
43		41
44	OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL PYTHON	42	OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL PYTHON
45		43
Lines 49-87 Link Here
49	CANBERRA_DESC= Audio support via Libcanberra	47	CANBERRA_DESC= Audio support via Libcanberra
50	FISHLIM_DESC= FiSHLiM plugin	48	FISHLIM_DESC= FiSHLiM plugin
51	TEXTFE_DESC= Text frontend	49	TEXTFE_DESC= Text frontend
52	SOCKS_DESC= SOCKS proxy support, FORBIDDEN in FreeBSD 10+
53		50
54	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	51	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
		52	CA_BUNDLE_VARS= CA_BUNDLE="${LOCALBASE}/share/certs/ca-root-nss.crt"
		53	CA_BUNDLE_VARS_OFF= CA_BUNDLE=NULL
55	CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra	54	CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra
56	CANBERRA_CONFIGURE_ENABLE=libcanberra	55	CANBERRA_MESON_TRUE= with-libcanberra
57	DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib	56	DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
58	DBUS_CONFIGURE_ENABLE= dbus	57	DBUS_MESON_TRUE= with-dbus
59	DBUS_USE= GNOME=gconf2	58	DBUS_USE= GNOME=gconf2
60	FISHLIM_CONFIGURE_ENABLE=fishlim	59	FISHLIM_MESON_TRUE= with-fishlim
61	LUA_CONFIGURE_ENABLE= lua	60	LUA_MESON_ON= -Dwith-lua=lua-${LUA_VER}
		61	LUA_MESON_OFF= -Dwith-lua=false
62	LUA_USES= lua	62	LUA_USES= lua
63	LUA_USE= GCC=any	63	LUA_USE= GCC=any
64	NLS_CONFIGURE_ENABLE= nls
65	NLS_USES= gettext
66	NLS_USES_OFF= gettext-tools # doesn't build otherwise
67	NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify	64	NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify
68	NOTIFY_CONFIGURE_ENABLE=libnotify	65	NOTIFY_MESON_TRUE= with-libnotify
69	PERL_CONFIGURE_ENABLE= perl	66	PERL_MESON_TRUE= with-perl
70	PERL_USES= perl5	67	PERL_USES= perl5
71	PYTHON_CONFIGURE_ENABLE=python	68	PYTHON_MESON_ON= -Dwith-python=python-${PYTHON_VER}
72	PYTHON_USES= python	69	PYTHON_MESON_OFF= -Dwith-python=false
73	SOCKS_LIB_DEPENDS= libsocks.so:net/dante	70	PYTHON_USES= python:3.4+ shebangfix
74	SOCKS_CONFIGURE_ENABLE= socks	71	PYTHON_VARS= SHEBANG_FILES=meson_post_install.py
75	TEXTFE_CONFIGURE_ENABLE=textfe	72	PYTHON_VARS+= SHEBANG_FILES=plugins/perl/generate_header.py
		73	PYTHON_VARS+= SHEBANG_FILES=src/common/make-te.py
		74	TEXTFE_MESON_TRUE= with-text
76		75
77	.include <bsd.port.options.mk>
78
79	.if ${PORT_OPTIONS:MCA_BUNDLE}
80	CA_BUNDLE= "${LOCALBASE}/share/certs/ca-root-nss.crt"
81	.else
82	CA_BUNDLE= NULL
83	.endif
84
85	post-patch:	76	post-patch:
86	@${REINPLACE_CMD} -e 's\|%%CA_BUNDLE%%\|${CA_BUNDLE}\|' \	77	@${REINPLACE_CMD} -e 's\|%%CA_BUNDLE%%\|${CA_BUNDLE}\|' \
87	${WRKSRC}/src/common/server.c	78	${WRKSRC}/src/common/server.c

Line 0 Link Here

(-)files/patch-meson.build (+44 lines)
	1	--- meson.build.orig 2018-03-14 02:26:31 UTC
	2	+++ meson.build
	3	@@ -16,11 +16,21 @@ cc = meson.get_compiler('c')
	4	libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')
	5	libgmodule_dep = dependency('gmodule-2.0')
	6	global_deps = []
	7	+libssl_dep_found = false
	8	if cc.get_id() == 'msvc'
	9	libssl_dep = cc.find_library('libeay32')
	10	else
	11	libssl_dep = dependency('openssl', version: '>= 0.9.8',
	12	- required: get_option('with-ssl'))
	13	+ required: false)
	14	+ if not libssl_dep.found()
	15	+ libssl_dep = [
	16	+ cc.find_library('ssl', required: get_option('with-ssl')),
	17	+ cc.find_library('crypto', required: get_option('with-ssl'))
	18	+ ]
	19	+ libssl_dep_found = libssl_dep[0].found()
	20	+ else
	21	+ libssl_dep_found = libssl_dep.found()
	22	+ endif
	23	endif
	24
	25	config_h = configuration_data()
	26	@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED'
	27	config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr'))
	28	config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h'))
	29
	30	-if libssl_dep.found()
	31	+if libssl_dep_found
	32	config_h.set('HAVE_X509_GET_SIGNATURE_NID',
	33	cc.has_function('X509_get_signature_nid', dependencies: libssl_dep)
	34	)
	35	@@ -131,9 +141,6 @@ global_ldflags = []
	36	test_ldflags = [
	37	'-Wl,-z,relro',
	38	'-Wl,-z,now',
	39	- # mingw
	40	- '-Wl,--dynamicbase',
	41	- '-Wl,--nxcompat',
	42	]
	43	foreach ldflag : test_ldflags
	44	if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag)

Lines 1-38 Link Here

(-)files/patch-src__common__ssl.c (-38 lines)
1	--- src/common/ssl.c.orig 2016-12-10 14:30:51 UTC
2	+++ src/common/ssl.c
3	@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *ce
4	return 1;
5
6	alg = OBJ_obj2nid (algor->algorithm);
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| LIBRESSL_VERSION_NUMBER
9	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
10	#else
11	sign_alg = X509_get_signature_nid (peer_cert);
12	@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
13
14	SSL_set_fd (ssl, sd);
15
16	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| LIBRESSL_VERSION_NUMBER
18	method = ctx->method;
19	#else
20	method = SSL_CTX_get_ssl_method (ctx);
21	@@ -328,7 +328,7 @@ _SSL_set_verify (SSL_CTX ctx, void ver
22	__SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths");
23	return (err_buf);
24	}
25	-/*
26	+
27	if (cacert)
28	{
29	if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL))
30	@@ -337,7 +337,7 @@ _SSL_set_verify (SSL_CTX ctx, void ver
31	return (err_buf);
32	}
33	}
34	-*/
35	+
36	SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, verify_callback);
37
38	return (NULL);

Lines 5-68 Link Here

(-)pkg-plist (-55 / +56 lines)
5	%%FISHLIM%%lib/hexchat/plugins/fishlim.so	5	%%FISHLIM%%lib/hexchat/plugins/fishlim.so
6	%%PERL%%lib/hexchat/plugins/perl.so	6	%%PERL%%lib/hexchat/plugins/perl.so
7	%%PYTHON%%lib/hexchat/plugins/python.so	7	%%PYTHON%%lib/hexchat/plugins/python.so
		8	%%LUA%%%%LUA_LIBDIR%%/hexchat/plugins/lua.so
8	libdata/pkgconfig/hexchat-plugin.pc	9	libdata/pkgconfig/hexchat-plugin.pc
9	man/man1/hexchat.1.gz	10	man/man1/hexchat.1.gz
10	share/appdata/hexchat.appdata.xml	11	share/metainfo/io.github.Hexchat.appdata.xml
11	share/applications/hexchat.desktop	12	share/applications/io.github.Hexchat.desktop
12	%%DBUS%%share/dbus-1/services/org.hexchat.service.service	13	%%DBUS%%share/dbus-1/services/org.hexchat.service.service
13	share/icons/hicolor/48x48/apps/hexchat.png	14	share/icons/hicolor/48x48/apps/hexchat.png
14	share/icons/hicolor/scalable/apps/hexchat.svg	15	share/icons/hicolor/scalable/apps/hexchat.svg
15	%%NLS%%share/locale/af/LC_MESSAGES/hexchat.mo	16	share/locale/af/LC_MESSAGES/hexchat.mo
16	%%NLS%%share/locale/am/LC_MESSAGES/hexchat.mo	17	share/locale/am/LC_MESSAGES/hexchat.mo
17	%%NLS%%share/locale/ast/LC_MESSAGES/hexchat.mo	18	share/locale/ast/LC_MESSAGES/hexchat.mo
18	%%NLS%%share/locale/az/LC_MESSAGES/hexchat.mo	19	share/locale/az/LC_MESSAGES/hexchat.mo
19	%%NLS%%share/locale/be/LC_MESSAGES/hexchat.mo	20	share/locale/be/LC_MESSAGES/hexchat.mo
20	%%NLS%%share/locale/bg/LC_MESSAGES/hexchat.mo	21	share/locale/bg/LC_MESSAGES/hexchat.mo
21	%%NLS%%share/locale/ca/LC_MESSAGES/hexchat.mo	22	share/locale/ca/LC_MESSAGES/hexchat.mo
22	%%NLS%%share/locale/cs/LC_MESSAGES/hexchat.mo	23	share/locale/cs/LC_MESSAGES/hexchat.mo
23	%%NLS%%share/locale/da/LC_MESSAGES/hexchat.mo	24	share/locale/da/LC_MESSAGES/hexchat.mo
24	%%NLS%%share/locale/de/LC_MESSAGES/hexchat.mo	25	share/locale/de/LC_MESSAGES/hexchat.mo
25	%%NLS%%share/locale/el/LC_MESSAGES/hexchat.mo	26	share/locale/el/LC_MESSAGES/hexchat.mo
26	%%NLS%%share/locale/en_GB/LC_MESSAGES/hexchat.mo	27	share/locale/en_GB/LC_MESSAGES/hexchat.mo
27	%%NLS%%share/locale/es/LC_MESSAGES/hexchat.mo	28	share/locale/es/LC_MESSAGES/hexchat.mo
28	%%NLS%%share/locale/et/LC_MESSAGES/hexchat.mo	29	share/locale/et/LC_MESSAGES/hexchat.mo
29	%%NLS%%share/locale/eu/LC_MESSAGES/hexchat.mo	30	share/locale/eu/LC_MESSAGES/hexchat.mo
30	%%NLS%%share/locale/fi/LC_MESSAGES/hexchat.mo	31	share/locale/fi/LC_MESSAGES/hexchat.mo
31	%%NLS%%share/locale/fr/LC_MESSAGES/hexchat.mo	32	share/locale/fr/LC_MESSAGES/hexchat.mo
32	%%NLS%%share/locale/gl/LC_MESSAGES/hexchat.mo	33	share/locale/gl/LC_MESSAGES/hexchat.mo
33	%%NLS%%share/locale/gu/LC_MESSAGES/hexchat.mo	34	share/locale/gu/LC_MESSAGES/hexchat.mo
34	%%NLS%%share/locale/hi/LC_MESSAGES/hexchat.mo	35	share/locale/hi/LC_MESSAGES/hexchat.mo
35	%%NLS%%share/locale/hu/LC_MESSAGES/hexchat.mo	36	share/locale/hu/LC_MESSAGES/hexchat.mo
36	%%NLS%%share/locale/id/LC_MESSAGES/hexchat.mo	37	share/locale/id/LC_MESSAGES/hexchat.mo
37	%%NLS%%share/locale/it/LC_MESSAGES/hexchat.mo	38	share/locale/it/LC_MESSAGES/hexchat.mo
38	%%NLS%%share/locale/ja_JP/LC_MESSAGES/hexchat.mo	39	share/locale/ja_JP/LC_MESSAGES/hexchat.mo
39	%%NLS%%share/locale/kn/LC_MESSAGES/hexchat.mo	40	share/locale/kn/LC_MESSAGES/hexchat.mo
40	%%NLS%%share/locale/ko/LC_MESSAGES/hexchat.mo	41	share/locale/ko/LC_MESSAGES/hexchat.mo
41	%%NLS%%share/locale/lt/LC_MESSAGES/hexchat.mo	42	share/locale/lt/LC_MESSAGES/hexchat.mo
42	%%NLS%%share/locale/lv/LC_MESSAGES/hexchat.mo	43	share/locale/lv/LC_MESSAGES/hexchat.mo
43	%%NLS%%share/locale/mk/LC_MESSAGES/hexchat.mo	44	share/locale/mk/LC_MESSAGES/hexchat.mo
44	%%NLS%%share/locale/ml/LC_MESSAGES/hexchat.mo	45	share/locale/ml/LC_MESSAGES/hexchat.mo
45	%%NLS%%share/locale/ms/LC_MESSAGES/hexchat.mo	46	share/locale/ms/LC_MESSAGES/hexchat.mo
46	%%NLS%%share/locale/nb/LC_MESSAGES/hexchat.mo	47	share/locale/nb/LC_MESSAGES/hexchat.mo
47	%%NLS%%share/locale/nl/LC_MESSAGES/hexchat.mo	48	share/locale/nl/LC_MESSAGES/hexchat.mo
48	%%NLS%%share/locale/no/LC_MESSAGES/hexchat.mo	49	share/locale/no/LC_MESSAGES/hexchat.mo
49	%%NLS%%share/locale/pa/LC_MESSAGES/hexchat.mo	50	share/locale/pa/LC_MESSAGES/hexchat.mo
50	%%NLS%%share/locale/pl/LC_MESSAGES/hexchat.mo	51	share/locale/pl/LC_MESSAGES/hexchat.mo
51	%%NLS%%share/locale/pt/LC_MESSAGES/hexchat.mo	52	share/locale/pt/LC_MESSAGES/hexchat.mo
52	%%NLS%%share/locale/pt_BR/LC_MESSAGES/hexchat.mo	53	share/locale/pt_BR/LC_MESSAGES/hexchat.mo
53	%%NLS%%share/locale/ru/LC_MESSAGES/hexchat.mo	54	share/locale/ru/LC_MESSAGES/hexchat.mo
54	%%NLS%%share/locale/rw/LC_MESSAGES/hexchat.mo	55	share/locale/rw/LC_MESSAGES/hexchat.mo
55	%%NLS%%share/locale/sk/LC_MESSAGES/hexchat.mo	56	share/locale/sk/LC_MESSAGES/hexchat.mo
56	%%NLS%%share/locale/sl/LC_MESSAGES/hexchat.mo	57	share/locale/sl/LC_MESSAGES/hexchat.mo
57	%%NLS%%share/locale/sq/LC_MESSAGES/hexchat.mo	58	share/locale/sq/LC_MESSAGES/hexchat.mo
58	%%NLS%%share/locale/sr/LC_MESSAGES/hexchat.mo	59	share/locale/sr/LC_MESSAGES/hexchat.mo
59	%%NLS%%share/locale/sr@latin/LC_MESSAGES/hexchat.mo	60	share/locale/sr@latin/LC_MESSAGES/hexchat.mo
60	%%NLS%%share/locale/sv/LC_MESSAGES/hexchat.mo	61	share/locale/sv/LC_MESSAGES/hexchat.mo
61	%%NLS%%share/locale/th/LC_MESSAGES/hexchat.mo	62	share/locale/th/LC_MESSAGES/hexchat.mo
62	%%NLS%%share/locale/tr/LC_MESSAGES/hexchat.mo	63	share/locale/tr/LC_MESSAGES/hexchat.mo
63	%%NLS%%share/locale/uk/LC_MESSAGES/hexchat.mo	64	share/locale/uk/LC_MESSAGES/hexchat.mo
64	%%NLS%%share/locale/vi/LC_MESSAGES/hexchat.mo	65	share/locale/vi/LC_MESSAGES/hexchat.mo
65	%%NLS%%share/locale/wa/LC_MESSAGES/hexchat.mo	66	share/locale/wa/LC_MESSAGES/hexchat.mo
66	%%NLS%%share/locale/zh_CN/LC_MESSAGES/hexchat.mo	67	share/locale/zh_CN/LC_MESSAGES/hexchat.mo
67	%%NLS%%share/locale/zh_TW/LC_MESSAGES/hexchat.mo	68	share/locale/zh_TW/LC_MESSAGES/hexchat.mo
68	share/pixmaps/hexchat.png	69	share/pixmaps/hexchat.png