Attachment #179758 for bug #216915

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




MASTER_SITES=	http://www.jikos.cz/~mikulas/links/download/
PKGNAMESUFFIX=	1

MAINTAINER=	pkubaj@anongoth.pl
COMMENT=	Lynx-like text WWW browser

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

PLIST_FILES=	man/man1/links.1.gz \
		bin/links

GNU_CONFIGURE=	yes

USES=		ssl


CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}

.include <bsd.port.mk>

.if ${SSL_DEFAULT:Mopenssl-devel}
BROKEN=		Does not build with openssl-devel
.endif

.include <bsd.port.post.mk>




--- connect.c.orig	2017-02-08 12:41:56 UTC
+++ connect.c
@@ -106,7 +106,7 @@ void ssl_want_read(struct connection *c)
 
 	set_timeout(c);
 
-	if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
+	if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
 	switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
 		case SSL_ERROR_NONE:
 			c->newconn = NULL;
@@ -186,7 +186,7 @@ void connected(struct connection *c)
 	if (c->ssl) {
 		c->ssl = getSSL();
 		SSL_set_fd(c->ssl, *b->sock);
-		if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
+		if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
 		switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
 			case SSL_ERROR_WANT_READ:
 				setcstate(c, S_SSL_NEG);

Lines 1-6 Link Here

(-)files/patch-default.c (-3 / +3 lines)
1	--- default.c.orig Sun May 19 20:12:20 2002	1	--- default.c.orig 2011-11-23 00:54:28 UTC
2	+++ default.c Sun May 19 20:12:23 2002	2	+++ default.c
3	@@ -267,7 +267,7 @@	3	@@ -361,7 +361,7 @@ void init_home()
4	get_system_name();	4	get_system_name();
5	links_home = get_home(&first_use);	5	links_home = get_home(&first_use);
6	if (!links_home) {	6	if (!links_home) {

Lines 1-6 Link Here

(-)files/patch-kbd.c (-3 / +3 lines)
1	--- kbd.c.orig 2013-03-12 19:47:22.000000000 +0400	1	--- kbd.c.orig 2011-11-22 22:27:53 UTC
2	+++ kbd.c 2013-03-12 19:47:24.000000000 +0400	2	+++ kbd.c
3	@@ -582,10 +582,10 @@	3	@@ -582,10 +582,10 @@ int process_queue(struct itrm *itrm)
4	case 'B': ev.x = KBD_DOWN; break;	4	case 'B': ev.x = KBD_DOWN; break;
5	case 'C': ev.x = KBD_RIGHT; break;	5	case 'C': ev.x = KBD_RIGHT; break;
6	case 'D': ev.x = KBD_LEFT; break;	6	case 'D': ev.x = KBD_LEFT; break;

Lines 1-6 Link Here

(-)files/patch-types.c (-3 / +5 lines)
1	--- types.c.orig Fri Apr 26 09:11:15 2002	1	--- types.c.orig 2011-11-16 19:19:29 UTC
2	+++ types.c Fri Apr 26 09:12:27 2002	2	+++ types.c
3	@@ -66,5 +66,6 @@	3	@@ -66,7 +66,8 @@ unsigned char *get_content_type(unsigned
		4	if (*ct == '.') ext = ct + 1;
4	else if (dir_sep(*ct)) ext = NULL;	5	else if (dir_sep(*ct)) ext = NULL;
5	if (ext) while (ext[extl] && !dir_sep(ext[extl]) && !end_of_dir(ext[extl])) extl++;	6	if (ext) while (ext[extl] && !dir_sep(ext[extl]) && !end_of_dir(ext[extl])) extl++;
6	- if ((extl == 3 && !casecmp(ext, "htm", 3)) \|\|	7	- if ((extl == 3 && !casecmp(ext, "htm", 3)) \|\|
Lines 8-10 Link Here
8	+ (extl == 3 && !casecmp(ext, "htm", 3)) \|\|	9	+ (extl == 3 && !casecmp(ext, "htm", 3)) \|\|
9	(extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html");	10	(extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html");
10	foreach(e, extensions) if (is_in_list(e->ext, ext, extl)) return stracpy(e->ct);	11	foreach(e, extensions) if (is_in_list(e->ext, ext, extl)) return stracpy(e->ct);
		12	exxt = init_str(); el = 0;

Lines 1-2 Link Here

(-)pkg-plist (-2 lines)
1	man/man1/links.1.gz
2	bin/links

Return to bug 216915

Lines 9-17 Link Here

(-)Makefile (-8 / +8 lines)
9	MASTER_SITES= http://www.jikos.cz/~mikulas/links/download/	9	MASTER_SITES= http://www.jikos.cz/~mikulas/links/download/
10	PKGNAMESUFFIX= 1	10	PKGNAMESUFFIX= 1
11		11
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= pkubaj@anongoth.pl
13	COMMENT= Lynx-like text WWW browser	13	COMMENT= Lynx-like text WWW browser
14		14
		15	LICENSE= GPLv2+
		16	LICENSE_FILE= ${WRKSRC}/COPYING
		17
		18	PLIST_FILES= man/man1/links.1.gz \
		19	bin/links
		20
15	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
16		22
17	USES= ssl	23	USES= ssl
Lines 19-28 Link Here
19		25
20	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}	26	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
21		27
22	.include <bsd.port.pre.mk>	28	.include <bsd.port.mk>
23
24	.if ${SSL_DEFAULT:Mopenssl-devel}
25	BROKEN= Does not build with openssl-devel
26	.endif
27
28	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-connect.c (+20 lines)
	1	--- connect.c.orig 2017-02-08 12:41:56 UTC
	2	+++ connect.c
	3	@@ -106,7 +106,7 @@ void ssl_want_read(struct connection *c)
	4
	5	set_timeout(c);
	6
	7	- if (c->no_tsl) c->ssl->options \|= SSL_OP_NO_TLSv1;
	8	+ if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
	9	switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
	10	case SSL_ERROR_NONE:
	11	c->newconn = NULL;
	12	@@ -186,7 +186,7 @@ void connected(struct connection *c)
	13	if (c->ssl) {
	14	c->ssl = getSSL();
	15	SSL_set_fd(c->ssl, *b->sock);
	16	- if (c->no_tsl) c->ssl->options \|= SSL_OP_NO_TLSv1;
	17	+ if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
	18	switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
	19	case SSL_ERROR_WANT_READ:
	20	setcstate(c, S_SSL_NEG);