<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70271a8de6c3032aca36d994f8de4477fc8e422d">https://github.com/macports/macports-ports/commit/70271a8de6c3032aca36d994f8de4477fc8e422d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 70271a8 links1: update to 1.03, apply FreeBSD patches
</span>70271a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70271a8de6c3032aca36d994f8de4477fc8e422d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 21 23:23:02 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> links1: update to 1.03, apply FreeBSD patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also remove the ssl variant and just enable SSL/TLS all the time, use
</span><span style='display:block; white-space:pre;color:#404040;'> the preferred openssl depspec, and update the homepage.
</span>---
www/links1/Portfile | 24 ++++++++++++++----------
www/links1/files/connect.c.patch | 20 ++++++++++++++++++++
www/links1/files/default.c.patch | 11 +++++++++++
www/links1/files/https.c.patch | 14 ++++++++++++++
www/links1/files/kbd.c.patch | 15 +++++++++++++++
www/links1/files/types.c.patch | 12 ++++++++++++
6 files changed, 86 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links1/Portfile b/www/links1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9986e81..f450b26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/links1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> PortSystem 1.0
name links1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.00pre14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.03
</span> distname links-${version}
categories www
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,13 +9,22 @@ maintainers nomaintainer
</span> description text WWW browser with tables
long_description \
Links is a text-based browser with support for HTML tables and frames.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://artax.karlin.mff.cuni.cz/~mikulas/links/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.jikos.cz/~mikulas/links/
</span> platforms darwin
master_sites ${homepage}download/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 87713eaab818c73503807fc13340fe5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-ssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 41add0bed0574f7e7ee29ae1ba0cf5056be49beb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 32443c6f011216a8a43ed0806d9d23c1defdd19bc4b021ee00cda197782e175a
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir-append mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/libssl.dylib:openssl port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles connect.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kbd.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ types.c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --mandir=${prefix}/share/man
</span>
post-destroot {
set bindir ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +32,3 @@ post-destroot {
</span> set man1dir ${destroot}${prefix}/share/man/man1
file rename ${man1dir}/links.1 ${man1dir}/links1.1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ssl {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-ssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append lib:libssl.0.9:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links1/files/connect.c.patch b/www/links1/files/connect.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4219cf4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links1/files/connect.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- connect.c.orig 2017-02-08 12:41:56 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ connect.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,7 +106,7 @@ void ssl_want_read(struct connection *c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_timeout(c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SSL_ERROR_NONE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->newconn = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@ void connected(struct connection *c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (c->ssl) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->ssl = getSSL();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_set_fd(c->ssl, *b->sock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SSL_ERROR_WANT_READ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setcstate(c, S_SSL_NEG);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links1/files/default.c.patch b/www/links1/files/default.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e4e7da9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links1/files/default.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- default.c.orig 2011-11-23 00:54:28 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ default.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,7 +361,7 @@ void init_home()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_system_name();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ links_home = get_home(&first_use);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!links_home) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n\007");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sleep(3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links1/files/https.c.patch b/www/links1/files/https.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ce46080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links1/files/https.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- https.c.orig 2006-09-11 02:09:24 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ https.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,10 @@ SSL *getSSL(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char f_randfile[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *f = RAND_file_name(f_randfile, sizeof(f_randfile));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (f && RAND_egd(f)<0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_EGD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (f && RAND_egd(f)<0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Not an EGD, so read and write to it */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RAND_load_file(f_randfile, -1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RAND_write_file(f_randfile);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links1/files/kbd.c.patch b/www/links1/files/kbd.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e0dc3a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links1/files/kbd.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kbd.c.orig 2011-11-22 22:27:53 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kbd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -582,10 +582,10 @@ int process_queue(struct itrm *itrm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'B': ev.x = KBD_DOWN; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'C': ev.x = KBD_RIGHT; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'D': ev.x = KBD_LEFT; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case 'F':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 'F': ev.x = KBD_END; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'K':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'e': ev.x = KBD_END; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case 'H':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 'H': ev.x = KBD_HOME; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 0: ev.x = KBD_HOME; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'V':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'I': ev.x = KBD_PAGE_UP; break;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links1/files/types.c.patch b/www/links1/files/types.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..eca6fec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links1/files/types.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- types.c.orig 2011-11-16 19:19:29 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ types.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,8 @@ unsigned char *get_content_type(unsigned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (*ct == '.') ext = ct + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (dir_sep(*ct)) ext = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ext) while (ext[extl] && !dir_sep(ext[extl]) && !end_of_dir(ext[extl])) extl++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((extl == 3 && !casecmp(ext, "htm", 3)) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_html ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (extl == 3 && !casecmp(ext, "htm", 3)) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(e, extensions) if (is_in_list(e->ext, ext, extl)) return stracpy(e->ct);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exxt = init_str(); el = 0;
</span></pre><pre style='margin:0'>
</pre>