head	1.4;
access;
symbols
	pkgsrc-2022Q4:1.3.0.4
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.2
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.1.0.4
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.2
	pkgsrc-2022Q1-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2023.01.10.17.03.59;	author schmonz;	state dead;
branches;
next	1.3;
commitid	f0WUZ9PYQfiN819E;

1.3
date	2022.09.11.19.33.05;	author schmonz;	state Exp;
branches;
next	1.2;
commitid	U2Ki3xiyPWB5RtTD;

1.2
date	2022.08.30.17.55.31;	author schmonz;	state Exp;
branches;
next	1.1;
commitid	TzVUibcj0mpxHVRD;

1.1
date	2022.01.04.22.10.37;	author schmonz;	state Exp;
branches;
next	;
commitid	OWRNTom1KhgmLmnD;


desc
@@


1.4
log
@Update to 20230101. From the changelog:

20230101:
- removed duplicit crypto_scalarmult_curve25519.* implementation and
  used X25519 from bearssl library
- randombytes: rollback to /dev/urandom variant only
- Makefile: removed bearssl target

20221229:
- fixed parallel build

20221227:
- LICENCE updated from public-domain to CC0
- updated examples and linked examples.md from README.md
- added more error log messages when proxy-protocol is used
@
text
@$NetBSD: patch-Makefile,v 1.3 2022/09/11 19:33:05 schmonz Exp $

Do not consider building a local copy of BearSSL.

--- Makefile.orig	2022-08-30 13:33:51.000000000 +0000
+++ Makefile
@@@@ -267,9 +267,6 @@@@ tlswrapper-test: tlswrapper-test.o $(OBJ
 
 
 bearssl:
-	echo 'int main(){}' > try.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o try try.c || (sh bearssl.sh; cd bearssl; make; rm build/*.so; )
-	rm -f try.c try
 	mkdir -p bearssl/inc
 
 tlswrapper-tcp: tlswrapper
@


1.3
log
@Update to 20220901. From the changelog:

- fixed randombytes(), uses getentropy() and /dev/urandom where
  getentropy() does not exist
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.2 2022/08/30 17:55:31 schmonz Exp $
@


1.2
log
@Apply upstream commit 0cb7bb4 to fall back to /dev/urandom on systems
where getentropy() is not present. Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.1 2022/01/04 22:10:37 schmonz Exp $
a3 2
Apply upstream commit 0cb7bb4 to fall back to /dev/urandom on systems
where getentropy() is not present.
d5 1
a5 1
--- Makefile.orig	2022-08-14 12:18:16.000000000 +0000
d7 1
a7 15
@@@@ -10,6 +10,13 @@@@ BINARIES+=tlswrapper-test
 
 all: bearssl $(BINARIES) tlswrapper-tcp tlswrapper-smtp
 
+randombytes.h:
+	(grep -v "randombytes.h" "randombytes.c-01getentropy"; echo "int main() {}";) > try.c
+	[ ! -f randombytes.h ] && $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o try try.c && cat randombytes.h-01getentropy > randombytes.h || :
+	(grep -v "randombytes.h" "randombytes.c-02devurandom"; echo "int main() {}";) > try.c
+	[ ! -f randombytes.h ] && $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o try try.c && cat randombytes.h-02devurandom > randombytes.h || :
+	rm try.c try
+
 alloc.o: alloc.c log.h alloc.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c alloc.c
 
@@@@ -267,9 +274,6 @@@@ tlswrapper-test: tlswrapper-test.o $(OBJ
d12 2
a13 2
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o try.o $(LDFLAGS) try.c || (sh bearssl.sh; cd bearssl; make; rm build/*.so; )
-	rm -f try.o try.c
a16 6
@@@@ -296,4 +300,5 @@@@ test: bearssl $(BINARIES) tlswrapper-tcp
 
 clean:
 	rm -f *.o *.out $(BINARIES) tlswrapper-tcp tlswrapper-smtp
+	rm -f randombytes.h
 
@


1.1
log
@Fix build on BSDs and Solarish.
@
text
@d1 1
a1 1
$NetBSD$
d4 2
d7 1
a7 1
--- Makefile.orig	2021-12-28 05:36:39.000000000 +0000
d9 15
a23 1
@@@@ -227,9 +227,6 @@@@ tlswrapper-test: tlswrapper-test.o $(OBJ
d33 6
@