changeset 608:2929b2af4c15

crypto/libressl: initial import, closes #1687
author David Demelier <markand@malikania.fr>
date Fri, 19 Jul 2019 20:45:00 +0200
parents 0be721db8410
children 233c38f24590
files compression/libarchive/libarchive.sh core/coreutils/coreutils.sh core/kmod/kmod.sh core/rhash/rhash.sh crypto/libressl/libressl.sh lib/libevent/libevent.sh network/curl/curl.sh network/iputils/iputils.sh network/libssh2/libssh2.sh network/ntp/ntp.sh network/openssl/ca-directory.patch network/openssl/openssl.sh network/openssl/openssl.sha1 network/wget/wget.sh network/wpa-supplicant/wpa-supplicant.sh python/python/python.sh python/python2/python2.sh
diffstat 17 files changed, 61 insertions(+), 96 deletions(-) [+]
line wrap: on
line diff
--- a/compression/libarchive/libarchive.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/compression/libarchive/libarchive.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -91,7 +91,7 @@
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
 else
 	with_ssl="--without-openssl"
--- a/core/coreutils/coreutils.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/core/coreutils/coreutils.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -46,7 +46,7 @@
 	with_nls="--disable-nls"
 fi
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
 else
 	with_ssl="--with-openssl"
--- a/core/kmod/kmod.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/core/kmod/kmod.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -35,7 +35,7 @@
 : ${ZLIB:=yes}
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
 else
 	with_ssl="--without-openssl"
--- a/core/rhash/rhash.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/core/rhash/rhash.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -39,7 +39,7 @@
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--enable-openssl"
 else
 	with_ssl="--disable-openssl"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/libressl/libressl.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+PKGNAME=libressl
+PKGVERSION=2.9.2
+PKGREVISION=1
+PKGLICENSE="CUSTOM"
+PKGSUMMARY="OpenSSL fork from OpenBSD"
+PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz"
+PKGDEPENDS="dev/cmake:build"
+
+: ${CC:=clang}
+: ${CFLAGS:=-O2}
+
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
+
+	mkdir build && cd build
+	cmake .. \
+		-DBUILD_SHARED_LIBS=On \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_C_COMPILER="$CC" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_INSTALL_PREFIX=
+	make
+	make install DESTDIR=$DESTDIR
+	cd ..
+
+	cd ..
+	rm -rf $PKGNAME-$PKGVERSION
+}
--- a/lib/libevent/libevent.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/lib/libevent/libevent.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -32,7 +32,7 @@
 : ${SSL:=yes}
 
 if [ "$SS" = "yes" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--enable-openssl"
 else
 	with_ssl="--disable-openssl"
--- a/network/curl/curl.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/network/curl/curl.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -63,7 +63,7 @@
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--with-ssl"
 else
 	with_ssl="--without-ssl"
--- a/network/iputils/iputils.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/network/iputils/iputils.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE GPLv2+"
 PKGSUMMARY="IP configuration utilities"
 PKGDOWNLOAD="https://github.com/iputils/$PKGNAME/archive/s$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/linux-headers network/openssl"
+PKGDEPENDS="lib/linux-headers crypto/libressl"
 PKGOPTIONS="CAP IDN2"
 
 : ${CC:=clang}
--- a/network/libssh2/libssh2.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/network/libssh2/libssh2.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="C library that implements SSHv2 protocol"
 PKGDOWNLOAD="https://www.libssh2.org/download/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build compression/zlib crypto/openssl"
+PKGDEPENDS="dev/cmake:build compression/zlib crypto/libressl"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/network/ntp/ntp.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/network/ntp/ntp.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="network time protocol"
 PKGDOWNLOAD="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="network/openssl"
+PKGDEPENDS="crypto/libressl"
 PKGOPTIONS="CAP IPV6 NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/network/openssl/ca-directory.patch	Thu Jul 18 12:31:40 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- apps/CA.pl.in.orig	2019-02-24 09:24:25.728912737 +0100
-+++ apps/CA.pl.in	2019-02-24 09:24:38.662267481 +0100
-@@ -33,7 +33,7 @@
- my $PKCS12 = "$openssl pkcs12";
- 
- # default openssl.cnf file has setup as per the following
--my $CATOP = "./demoCA";
-+my $CATOP = "/etc/ssl";
- my $CAKEY = "cakey.pem";
- my $CAREQ = "careq.pem";
- my $CACERT = "cacert.pem";
---- apps/openssl.cnf.orig	2019-02-24 09:25:17.409016676 +0100
-+++ apps/openssl.cnf	2019-02-24 09:25:33.522392103 +0100
-@@ -42,7 +42,7 @@
- ####################################################################
- [ CA_default ]
- 
--dir		= ./demoCA		# Where everything is kept
-+dir		= /etc/ssl		# Where everything is kept
- certs		= $dir/certs		# Where the issued certs are kept
- crl_dir		= $dir/crl		# Where the issued crl are kept
- database	= $dir/index.txt	# database index file.
--- a/network/openssl/openssl.sh	Thu Jul 18 12:31:40 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=openssl
-PKGVERSION=1.1.1a
-PKGREVISION=1
-PKGLICENSE="CUSTOM"
-PKGSUMMARY="toolkit for SSL/TLS"
-PKGDOWNLOAD="https://www.openssl.org/source/$PKGNAME-$PKGVERSION.tar.gz"
-
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-
-case $(uname -m) in
-x86_64)
-	TRIPLET="linux-x86_64"
-	;;
-arm*)
-	TRIPLET="linux-armv4"
-	;;
-aarch*)
-	TRIPLET="linux-aarch64"
-	;;
-esac
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
-	cd $PKGNAME-$PKGVERSION
-
-	patch -p0 < ../ca-directory.patch
-	./Configure \
-		--prefix=/. \
-		--openssldir=/etc/ssl \
-		--libdir=lib \
-		shared linux-x86_64
-		CC="$CC" CFLAGS="$CFLAGS"
-	make depend
-	make
-	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/lib{crypto,ssl}.a
-
-	cd ..
-	rm -rf $PKGNAME-$PKGVERSION
-}
--- a/network/openssl/openssl.sha1	Thu Jul 18 12:31:40 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-8fae27b4f34445a5500c9dc50ae66b4d6472ce29  openssl-1.1.1a.tar.gz
--- a/network/wget/wget.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/network/wget/wget.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -42,7 +42,7 @@
 fi
 
 if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
 	with_ssl="--with-ssl=openssl"
 elif [ "$SSL" = "gnutls" ]; then
 	PKGDEPENDS="network/gnutls $PKGDEPENDS"
--- a/network/wpa-supplicant/wpa-supplicant.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/network/wpa-supplicant/wpa-supplicant.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -34,7 +34,7 @@
 fi
 
 if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="$PKGDEPENDS network/openssl"
+	PKGDEPENDS="$PKGDEPENDS crypto/libressl"
 elif [ "$SSL" = "gnutls" ]; then
 	PKGDEPENDS="$PKGDEPENDS crypto/gnutls"
 else
--- a/python/python/python.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/python/python/python.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PSF"
 PKGSUMMARY="high-level scripting language"
 PKGDOWNLOAD="https://www.python.org/ftp/python/$PKGVERSION/Python-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/libffi lib/expat compression/zlib network/openssl"
+PKGDEPENDS="lib/libffi lib/expat compression/zlib crypto/libressl"
 PKGOPTIONS="IPV6"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/python/python2/python2.sh	Thu Jul 18 12:31:40 2019 +0200
+++ b/python/python2/python2.sh	Fri Jul 19 20:45:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PSF"
 PKGSUMMARY="high-level scripting language"
 PKGDOWNLOAD="https://www.python.org/ftp/python/$PKGVERSION/Python-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/libffi lib/expat compression/zlib network/openssl"
+PKGDEPENDS="lib/libffi lib/expat compression/zlib crypto/libressl"
 PKGOPTIONS="IPV6"
 
 : ${CHOST:=$(uname -m)-linux-musl}