Attachment #141644 for bug #188508

View | Details | Raw Unified | Return to bug 188508
Collapse All | Expand All





PORTNAME=	hexchat
PORTVERSION=	2.9.6.1
PORTREVISION=	3
CATEGORIES=	irc gnome ipv6
MASTER_SITES=	http://dl.hexchat.org/${PORTNAME}/


PORTDOCS=	*

OPTIONS_DEFINE=		CANBERRA DBUS DOAT DOCS FISHLIM NLS NOTIFY PERL \
			PYTHON SOCKS TEXTFE XFT CA_BUNDLE

OPTIONS_RADIO=		SPELL
OPTIONS_RADIO_SPELL=	GTKSPELL LIBSEXY STATIC

OPTIONS_DEFAULT=	CANBERRA DBUS NOTIFY LIBSEXY PERL PYTHON SOCKS XFT CA_BUNDLE

OPTIONS_SUB=	yes


LIBSEXY_DESC=		Spell checking support via Libsexy
STATIC_DESC=		Spell checking embedded in the binary
TEXTFE_DESC=		Text frontend
CA_BUNDLE_DESC=		Install CA bundle for SSL verification

CANBERRA_LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra
CANBERRA_CONFIGURE_ENABLE=	libcanberra

XFT_CONFIGURE_ENABLE=	xft
GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
LIBSEXY_LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
CA_BUNDLE_RUN_DEPENDS=  ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss

.include <bsd.port.options.mk>


USE_GNOME+=	gconf2
.endif

.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|/bin/bash|/bin/sh|g' ${WRKSRC}/autogen.sh
	@${REINPLACE_CMD} -e '/^appdata_DATA/s|hexchat.appdata.xml||' \
		${WRKSRC}/share/misc/Makefile.am ${WRKSRC}/share/misc/Makefile.in
	@${REINPLACE_CMD} -e 's,%%PATH_TO_CA_BUNDLE%%,${CA_BUNDLE},g' \
		${WRKSRC}/src/common/server.c

pre-configure:
	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)





$FreeBSD$

--- src/common/server.c.orig
+++ src/common/server.c
@@ -862,7 +862,7 @@
 		/* it'll be a memory leak, if connection isn't terminated by
 		   server_cleanup() */
 		serv->ssl = _SSL_socket (ctx, serv->sok);
-		if ((err = _SSL_set_verify (ctx, ssl_cb_verify, NULL)))
+		if ((err = _SSL_set_verify (ctx, ssl_cb_verify, %%PATH_TO_CA_BUNDLE%%)))
 		{
 			EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,
 							 NULL, NULL, 0);





$FreeBSD$

--- src/common/ssl.c.orig
+++ src/common/ssl.c
@@ -305,7 +305,7 @@
 		__SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths");
 		return (err_buf);
 	}
-/*
+
 	if (cacert)
 	{
 		if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL))
@@ -314,7 +314,7 @@
 			return (err_buf);
 		}
 	}
-*/
+
 	SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, verify_callback);
 
 	return (NULL);

Return to bug 188508

Lines 3-9 Link Here

(-)hexchat/Makefile (-3 / +13 lines)
3		3
4	PORTNAME= hexchat	4	PORTNAME= hexchat
5	PORTVERSION= 2.9.6.1	5	PORTVERSION= 2.9.6.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= irc gnome ipv6	7	CATEGORIES= irc gnome ipv6
8	MASTER_SITES= http://dl.hexchat.org/${PORTNAME}/	8	MASTER_SITES= http://dl.hexchat.org/${PORTNAME}/
9		9
Lines 30-41 Link Here
30	PORTDOCS= *	30	PORTDOCS= *
31		31
32	OPTIONS_DEFINE= CANBERRA DBUS DOAT DOCS FISHLIM NLS NOTIFY PERL \	32	OPTIONS_DEFINE= CANBERRA DBUS DOAT DOCS FISHLIM NLS NOTIFY PERL \
33	PYTHON SOCKS TEXTFE XFT	33	PYTHON SOCKS TEXTFE XFT CA_BUNDLE
34		34
35	OPTIONS_RADIO= SPELL	35	OPTIONS_RADIO= SPELL
36	OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY STATIC	36	OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY STATIC
37		37
38	OPTIONS_DEFAULT= CANBERRA DBUS NOTIFY LIBSEXY PERL PYTHON SOCKS XFT	38	OPTIONS_DEFAULT= CANBERRA DBUS NOTIFY LIBSEXY PERL PYTHON SOCKS XFT CA_BUNDLE
39		39
40	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
41		41
Lines 46-51 Link Here
46	LIBSEXY_DESC= Spell checking support via Libsexy	46	LIBSEXY_DESC= Spell checking support via Libsexy
47	STATIC_DESC= Spell checking embedded in the binary	47	STATIC_DESC= Spell checking embedded in the binary
48	TEXTFE_DESC= Text frontend	48	TEXTFE_DESC= Text frontend
		49	CA_BUNDLE_DESC= Install CA bundle for SSL verification
49		50
50	CANBERRA_LIB_DEPENDS= libcanberra.so:${PORTSDIR}/audio/libcanberra	51	CANBERRA_LIB_DEPENDS= libcanberra.so:${PORTSDIR}/audio/libcanberra
51	CANBERRA_CONFIGURE_ENABLE= libcanberra	52	CANBERRA_CONFIGURE_ENABLE= libcanberra
Lines 65-70 Link Here
65	XFT_CONFIGURE_ENABLE= xft	66	XFT_CONFIGURE_ENABLE= xft
66	GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell	67	GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell
67	LIBSEXY_LIB_DEPENDS= libsexy.so:${PORTSDIR}/x11-toolkits/libsexy	68	LIBSEXY_LIB_DEPENDS= libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
		69	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
68		70
69	.include <bsd.port.options.mk>	71	.include <bsd.port.options.mk>
70		72
Lines 100-109 Link Here
100	USE_GNOME+= gconf2	102	USE_GNOME+= gconf2
101	.endif	103	.endif
102		104
		105	.if ${PORT_OPTIONS:MCA_BUNDLE}
		106	CA_BUNDLE= "${LOCALBASE}/share/certs/ca-root-nss.crt"
		107	.else
		108	CA_BUNDLE= NULL
		109	.endif
		110
103	post-patch:	111	post-patch:
104	@${REINPLACE_CMD} -e 's\|/bin/bash\|/bin/sh\|g' ${WRKSRC}/autogen.sh	112	@${REINPLACE_CMD} -e 's\|/bin/bash\|/bin/sh\|g' ${WRKSRC}/autogen.sh
105	@${REINPLACE_CMD} -e '/^appdata_DATA/s\|hexchat.appdata.xml\|\|' \	113	@${REINPLACE_CMD} -e '/^appdata_DATA/s\|hexchat.appdata.xml\|\|' \
106	${WRKSRC}/share/misc/Makefile.am ${WRKSRC}/share/misc/Makefile.in	114	${WRKSRC}/share/misc/Makefile.am ${WRKSRC}/share/misc/Makefile.in
		115	@${REINPLACE_CMD} -e 's,%%PATH_TO_CA_BUNDLE%%,${CA_BUNDLE},g' \
		116	${WRKSRC}/src/common/server.c
107		117
108	pre-configure:	118	pre-configure:
109	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)	119	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)

Line 0 Link Here

(-)hexchat/files/patch-src_common_server.c (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- src/common/server.c.orig
	5	+++ src/common/server.c
	6	@@ -862,7 +862,7 @@
	7	/* it'll be a memory leak, if connection isn't terminated by
	8	server_cleanup() */
	9	serv->ssl = _SSL_socket (ctx, serv->sok);
	10	- if ((err = _SSL_set_verify (ctx, ssl_cb_verify, NULL)))
	11	+ if ((err = _SSL_set_verify (ctx, ssl_cb_verify, %%PATH_TO_CA_BUNDLE%%)))
	12	{
	13	EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,
	14	NULL, NULL, 0);

Line 0 Link Here

(-)hexchat/files/patch-src_common_ssl.c (+23 lines)
	1
	2	$FreeBSD$
	3
	4	--- src/common/ssl.c.orig
	5	+++ src/common/ssl.c
	6	@@ -305,7 +305,7 @@
	7	__SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths");
	8	return (err_buf);
	9	}
	10	-/*
	11	+
	12	if (cacert)
	13	{
	14	if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL))
	15	@@ -314,7 +314,7 @@
	16	return (err_buf);
	17	}
	18	}
	19	-*/
	20	+
	21	SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, verify_callback);
	22
	23	return (NULL);