Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1618309617148640"
MIME-Version: 1.0
Date: Tue, 13 Apr 2021 10:26:57 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/www/lhs
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20210413102657.9D603FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1618309617148640
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Tue Apr 13 10:26:57 UTC 2021

Modified Files:
	pkgsrc/www/lhs: Makefile distinfo
	pkgsrc/www/lhs/patches: patch-ac

Log Message:
lhs: fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/lhs/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/lhs/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/lhs/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1618309617148640
Content-Disposition: inline
Content-Length: 2596
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/lhs/Makefile
diff -u pkgsrc/www/lhs/Makefile:1.23 pkgsrc/www/lhs/Makefile:1.24
--- pkgsrc/www/lhs/Makefile:1.23	Sat Jan 18 21:51:07 2020
+++ pkgsrc/www/lhs/Makefile	Tue Apr 13 10:26:57 2021
@@ -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}/sh
 
 LIBS.SunOS+=	-lsocket
 
+# overrides definition of read
+FORTIFY_SUPPORTED=	no
+
 INSTALLATION_DIRS=	sbin
 
 do-install:

Index: pkgsrc/www/lhs/distinfo
diff -u pkgsrc/www/lhs/distinfo:1.6 pkgsrc/www/lhs/distinfo:1.7
--- pkgsrc/www/lhs/distinfo:1.6	Sun Jan 12 23:01:38 2020
+++ pkgsrc/www/lhs/distinfo	Tue Apr 13 10:26:57 2021
@@ -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) = 38eaa65eea5e2a
 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

Index: pkgsrc/www/lhs/patches/patch-ac
diff -u pkgsrc/www/lhs/patches/patch-ac:1.4 pkgsrc/www/lhs/patches/patch-ac:1.5
--- pkgsrc/www/lhs/patches/patch-ac:1.4	Sun Jan 12 23:01:38 2020
+++ pkgsrc/www/lhs/patches/patch-ac	Tue Apr 13 10:26:57 2021
@@ -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
  		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"


--_----------=_1618309617148640--