diff options
author | nia <nia@pkgsrc.org> | 2021-04-13 10:26:57 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2021-04-13 10:26:57 +0000 |
commit | 654af51cb57c3c851afda2da7e216294270a0376 (patch) | |
tree | b9ce851f8480701cbfeaf8b645e9598a282d17ac | |
parent | cf77709c6f6a35753c81a0f534beedd71cab67bd (diff) | |
download | pkgsrc-654af51cb57c3c851afda2da7e216294270a0376.tar.gz |
lhs: fix build.
-rw-r--r-- | www/lhs/Makefile | 5 | ||||
-rw-r--r-- | www/lhs/distinfo | 4 | ||||
-rw-r--r-- | www/lhs/patches/patch-ac | 19 |
3 files changed, 24 insertions, 4 deletions
diff --git a/www/lhs/Makefile b/www/lhs/Makefile index b66bd19e7d2..e062beb67c0 100644 --- a/www/lhs/Makefile +++ b/www/lhs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2020/01/18 21:51:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.24 2021/04/13 10:26:57 nia Exp $ # DISTNAME= lhs-0.1 @@ -20,6 +20,9 @@ MAKE_ENV+= DEFAULT_ROOT_DIR=${PREFIX}/share/httpd/htdocs LIBS.SunOS+= -lsocket +# overrides definition of read +FORTIFY_SUPPORTED= no + INSTALLATION_DIRS= sbin do-install: diff --git a/www/lhs/distinfo b/www/lhs/distinfo index 1bbfbce8392..b6d3b41afe3 100644 --- a/www/lhs/distinfo +++ b/www/lhs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2020/01/12 23:01:38 joerg Exp $ +$NetBSD: distinfo,v 1.7 2021/04/13 10:26:57 nia Exp $ SHA1 (lhs-0.1.tar.gz) = 74fbb0a982cd00c668c9f07b7c3c583759f14fd6 RMD160 (lhs-0.1.tar.gz) = 176d8149d11383fc4d82e4a13991f156f3ab42ca @@ -6,5 +6,5 @@ SHA512 (lhs-0.1.tar.gz) = 38eaa65eea5e2ac1ec914e2a88d10402abab6d3f03349d24d4f0c7 Size (lhs-0.1.tar.gz) = 10665 bytes SHA1 (patch-aa) = 682df4329c32b01438221ba78055761468ede8fa SHA1 (patch-ab) = a066f92aa5f47e85863b23e92247c2fad8f3c5bf -SHA1 (patch-ac) = 1ed366392bd2f189d7c3091c23b681712dbbc611 +SHA1 (patch-ac) = 2b41fc262e497d97669dbd849df89811b6392a7b SHA1 (patch-configure) = 21e675f56bd36f6bb880cb0179db952fa18a25a3 diff --git a/www/lhs/patches/patch-ac b/www/lhs/patches/patch-ac index 207fe36b5f9..b094efcac8a 100644 --- a/www/lhs/patches/patch-ac +++ b/www/lhs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2020/01/12 23:01:38 joerg Exp $ +$NetBSD: patch-ac,v 1.5 2021/04/13 10:26:57 nia Exp $ * Include sys/filio.h for FIONBIO etc. * Drop SSLv2 support @@ -51,6 +51,23 @@ $NetBSD: patch-ac,v 1.4 2020/01/12 23:01:38 joerg Exp $ default: debug("nieznany standard szyfrowania\n"); } +@@ -536,14 +537,14 @@ SSL *init_ssl_socket(int sock) + return ssl; + } + +-inline int my_read(int fd, char *buf, int size, void *ssl) ++int my_read(int fd, char *buf, int size, void *ssl) + { + return (!ssl) ? + read(fd, buf, size) : + SSL_read((SSL*) ssl, buf, size); + } + +-inline int my_write(int fd, char *buf, int size, void *ssl) ++int my_write(int fd, char *buf, int size, void *ssl) + { + int res, one; + @@ -592,7 +593,7 @@ void usage(char *a0) " -s version set SSL protocol version (default: SSLv2)\n" " -c filename load certificate file (default: lhs.pem)\n" |