Commit Diff
Diff:
0c6701b76230be834bd04bc646c2756df0196a59
d7791c2447f47172d442b342bedf7db1b2eb9852
Commit:
d7791c2447f47172d442b342bedf7db1b2eb9852
Tree:
bedb6979f1bfca31073fe3db5e3bd3ea141a0513
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Fri Nov 7 08:15:50 2014 UTC
Message:
Untested change to libressl 2.1.1, I'll follow-up commit if this needs touchup
blob - 5dc5612fe1d26eb4410c2134e8489ace69327347
blob + bcc6af5a6d87b0ec6bb2428ee3d1d76322b69b31
--- Makefile.linux
+++ Makefile.linux
@@ -22,9 +22,9 @@ build:
$(CC) $(CFLAGS) -c filter.c
$(CC) $(CFLAGS) -c ratelimit.c
$(CC) $(CFLAGS) -c whitelist.c
- $(AR) -x libresslcrypto.a libcompat_la-arc4random.o
- $(AR) -x libresslcrypto.a libcompat_la-getentropy_linux.o
- $(AR) -x libresslcrypto.a libcompatnoopt_la-explicit_bzero.o
+ $(AR) -x libressllibcrypto.a libcompat_la-arc4random.o
+ $(AR) -x libressllibcrypto.a libcompat_la-getentropy_linux.o
+ $(AR) -x libressllibcrypto.a libcompatnoopt_la-explicit_bzero.o
$(CC) $(CFLAGS) -o wildcarddnsd additional.o main.o parse.o reply.o region.o wildcard.o recurse.o log.o axfr.o filter.o ratelimit.o whitelist.o libcompat_la-arc4random.o libcompat_la-getentropy_linux.o libcompatnoopt_la-explicit_bzero.o $(LDADD)
blob - 6aee7602f22e2fed55ce38f171bf5aebaa72819c
blob + a847cd1a14e85a3f1e1ad7938778ab11fc9b81e8
--- configure
+++ configure
@@ -39,8 +39,8 @@ linux() {
# libressl
- if [ ! -d ../libressl-2.0.5 ] ; then
- echo Please install libressl-2.0.5 in the directory before this one!
+ if [ ! -d ../libressl-2.1.1 ] ; then
+ echo Please install libressl-2.1.1 in the directory before this one!
echo You can get it from http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/
echo "Please extract it and ./configure && make check, this will not "
echo install it into your system only into that directory.
@@ -52,10 +52,10 @@ linux() {
exit 1
else
echo Now making a symlink for libcrypto and libssl...
- ln -s ../libressl-2.0.5/crypto/.libs/libcrypto.a libresslcrypto.a
- ln -s ../libressl-2.0.5/crypto/.libs/libcompat.a libresslcompat.a
- ln -s ../libressl-2.0.5/ssl/.libs/libssl.a libressl.a
- ln -s ../libressl-2.0.5/crypto/.libs/libcompatnoopt.a libresslcompatnoopt.a
+ ln -s ../libressl-2.1.1/crypto/.libs/libcrypto.a libressllibcrypto.a
+ ln -s ../libressl-2.1.1/crypto/.libs/libcompat.a libressllibcompat.a
+ ln -s ../libressl-2.1.1/ssl/.libs/libssl.a libressllibssl.a
+ ln -s ../libressl-2.1.1/crypto/.libs/libcompatnoopt.a libressllibcompatnoopt.a
echo done.
fi
}
repomaster@centroid.eu