From owner-svn-ports-head@freebsd.org Wed Feb 22 10:19:21 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BC84CE89F6; Wed, 22 Feb 2017 10:19:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBC661A1D; Wed, 22 Feb 2017 10:19:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1MAJJsw098351; Wed, 22 Feb 2017 10:19:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1MAJJOt098347; Wed, 22 Feb 2017 10:19:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702221019.v1MAJJOt098347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 22 Feb 2017 10:19:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434573 - in head/www/links1: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2017 10:19:21 -0000 Author: amdmi3 Date: Wed Feb 22 10:19:19 2017 New Revision: 434573 URL: https://svnweb.freebsd.org/changeset/ports/434573 Log: - Fix build with openssl-devel and libressl-devel - Add LICENSE - Pass maintainership to submitter PR: 216915 Submitted by: pkubaj@anongoth.pl Added: head/www/links1/files/patch-connect.c (contents, props changed) Deleted: head/www/links1/pkg-plist Modified: head/www/links1/Makefile head/www/links1/files/patch-default.c head/www/links1/files/patch-kbd.c head/www/links1/files/patch-types.c Modified: head/www/links1/Makefile ============================================================================== --- head/www/links1/Makefile Wed Feb 22 10:07:45 2017 (r434572) +++ head/www/links1/Makefile Wed Feb 22 10:19:19 2017 (r434573) @@ -9,9 +9,15 @@ CATEGORIES= www MASTER_SITES= http://www.jikos.cz/~mikulas/links/download/ PKGNAMESUFFIX= 1 -MAINTAINER= ports@FreeBSD.org +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 @@ -19,10 +25,4 @@ CONFLICTS= links-2* CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.include - -.if ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif - -.include +.include Added: head/www/links1/files/patch-connect.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/links1/files/patch-connect.c Wed Feb 22 10:19:19 2017 (r434573) @@ -0,0 +1,20 @@ +--- 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); Modified: head/www/links1/files/patch-default.c ============================================================================== --- head/www/links1/files/patch-default.c Wed Feb 22 10:07:45 2017 (r434572) +++ head/www/links1/files/patch-default.c Wed Feb 22 10:19:19 2017 (r434573) @@ -1,6 +1,6 @@ ---- default.c.orig Sun May 19 20:12:20 2002 -+++ default.c Sun May 19 20:12:23 2002 -@@ -267,7 +267,7 @@ +--- default.c.orig 2011-11-23 00:54:28 UTC ++++ default.c +@@ -361,7 +361,7 @@ void init_home() get_system_name(); links_home = get_home(&first_use); if (!links_home) { Modified: head/www/links1/files/patch-kbd.c ============================================================================== --- head/www/links1/files/patch-kbd.c Wed Feb 22 10:07:45 2017 (r434572) +++ head/www/links1/files/patch-kbd.c Wed Feb 22 10:19:19 2017 (r434573) @@ -1,6 +1,6 @@ ---- kbd.c.orig 2013-03-12 19:47:22.000000000 +0400 -+++ kbd.c 2013-03-12 19:47:24.000000000 +0400 -@@ -582,10 +582,10 @@ +--- kbd.c.orig 2011-11-22 22:27:53 UTC ++++ kbd.c +@@ -582,10 +582,10 @@ int process_queue(struct itrm *itrm) case 'B': ev.x = KBD_DOWN; break; case 'C': ev.x = KBD_RIGHT; break; case 'D': ev.x = KBD_LEFT; break; Modified: head/www/links1/files/patch-types.c ============================================================================== --- head/www/links1/files/patch-types.c Wed Feb 22 10:07:45 2017 (r434572) +++ head/www/links1/files/patch-types.c Wed Feb 22 10:19:19 2017 (r434573) @@ -1,6 +1,7 @@ ---- types.c.orig Fri Apr 26 09:11:15 2002 -+++ types.c Fri Apr 26 09:12:27 2002 -@@ -66,5 +66,6 @@ +--- types.c.orig 2011-11-16 19:19:29 UTC ++++ types.c +@@ -66,7 +66,8 @@ unsigned char *get_content_type(unsigned + if (*ct == '.') ext = ct + 1; else if (dir_sep(*ct)) ext = NULL; if (ext) while (ext[extl] && !dir_sep(ext[extl]) && !end_of_dir(ext[extl])) extl++; - if ((extl == 3 && !casecmp(ext, "htm", 3)) || @@ -8,3 +9,4 @@ + (extl == 3 && !casecmp(ext, "htm", 3)) || (extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html"); foreach(e, extensions) if (is_in_list(e->ext, ext, extl)) return stracpy(e->ct); + exxt = init_str(); el = 0;