pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wolfssl: Implements some reviews and suggestions
Module Name: pkgsrc-wip
Committed By: Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By: fox
Date: Mon Jan 27 16:19:59 2020 -0500
Changeset: d01a6f4390a25ea50f9d1ee007d014b7be93ae46
Modified Files:
wolfssl/DESCR
wolfssl/Makefile
wolfssl/buildlink3.mk
wolfssl/distinfo
Added Files:
wolfssl/patches/patch-certs_intermediate_genintcerts.sh
wolfssl/patches/patch-configure.ac
Log Message:
wolfssl: Implements some reviews and suggestions
- Remove CHECK_PORTABILITY_SKIP and fix the scripts
- Remove INSTALL_TARGET since it does the right thing
- Removes unncessary cruft from DESC
- Adds autoreconf to USES
- Re-organize the CONFIGURE_ARGS variable
- Fixes ID tag and version in buildlink3.mk.
Thanks to kamil@, leot@ and nia@ for suggesting the fixes.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d01a6f4390a25ea50f9d1ee007d014b7be93ae46
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wolfssl/DESCR | 18 --------
wolfssl/Makefile | 48 ++++++++++------------
wolfssl/buildlink3.mk | 5 +--
wolfssl/distinfo | 2 +
.../patch-certs_intermediate_genintcerts.sh | 20 +++++++++
wolfssl/patches/patch-configure.ac | 24 +++++++++++
6 files changed, 70 insertions(+), 47 deletions(-)
diffs:
diff --git a/wolfssl/DESCR b/wolfssl/DESCR
index 509c07661f..37aa3d10f7 100644
--- a/wolfssl/DESCR
+++ b/wolfssl/DESCR
@@ -1,20 +1,2 @@
WolfSSL is an embedded SSL Library for programmers building security
functionality into their applications and devices.
-
-Highlights
-- Up to TLS 1.3 and DTLS 1.2
-- Full client and server support
-- Progressive list of supported ciphers
-- Key and Certificate generation
-- OCSP, CRL support
-
-Lightweight
-- Small Size: 20-100kB
-- Runtime Memory: 1-36kB
-- 20x smaller than OpenSSL
-
-Portable
-- Abstraction Layers (OS, Custom I/O, Standard C library, and more)
-- Simple API
-- OpenSSL Compatibility Layer
-- Long list of supported platforms
diff --git a/wolfssl/Makefile b/wolfssl/Makefile
index 386daf878e..16d3f3a9a0 100644
--- a/wolfssl/Makefile
+++ b/wolfssl/Makefile
@@ -11,37 +11,33 @@ COMMENT= Embedded SSL C-Library
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-dependency-tracking \
- --enable-dh \
- --enable-dsa \
- --enable-dtls \
- --enable-ecc \
- --enable-ipv6 \
- --enable-keygen \
- --enable-opensslextra \
- --enable-ripemd \
- --enable-sha512 \
- --enable-shared \
- --enable-sni \
- --enable-ssh \
- --enable-static \
- --enable-tls13 \
- --enable-tls13-draft18 \
- --enable-tls13-draft22 \
- --enable-tls13-draft23 \
- --enable-tls13-draft26 \
- --enable-tls13-draft28
-
-USE_TOOLS+= autoconf automake gawk gmake m4 pkg-config zip
+CONFIGURE_ARGS+= --disable-dependency-tracking
+CONFIGURE_ARGS+= --enable-dh
+CONFIGURE_ARGS+= --enable-dsa
+CONFIGURE_ARGS+= --enable-dtls
+CONFIGURE_ARGS+= --enable-ecc
+CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+= --enable-keygen
+CONFIGURE_ARGS+= --enable-opensslextra
+CONFIGURE_ARGS+= --enable-ripemd
+CONFIGURE_ARGS+= --enable-sha512
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-sni
+CONFIGURE_ARGS+= --enable-ssh
+CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-tls13
+CONFIGURE_ARGS+= --enable-tls13-draft18
+CONFIGURE_ARGS+= --enable-tls13-draft22
+CONFIGURE_ARGS+= --enable-tls13-draft23
+CONFIGURE_ARGS+= --enable-tls13-draft26
+CONFIGURE_ARGS+= --enable-tls13-draft28
+
+USE_TOOLS+= autoreconf autoconf automake gawk gmake m4 pkg-config zip
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-INSTALL_TARGET= install-strip
-
TEST_TARGET= check
-CHECK_PORTABILITY_SKIP= certs/intermediate/genintcerts.sh configure
-
pre-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} autoreconf -vif
diff --git a/wolfssl/buildlink3.mk b/wolfssl/buildlink3.mk
index e70f09c033..14acaf0e0a 100644
--- a/wolfssl/buildlink3.mk
+++ b/wolfssl/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBS$
+# $NetBSD$
BUILDLINK_TREE+= wolfssl
.if !defined(WOLFSSL_BUILDLINK3_MK)
WOLFSSL_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.wolfssl+= wolfssl>=1.0.0
-BUILDLINK_ABI_DEPENDS.wolfssl+= wolfssl>=1.0.0
+BUILDLINK_API_DEPENDS.wolfssl+= wolfssl>=4.3.0
#BUILDLINK_PKGSRCDIR.wolfssl?= ../../security/wolfssl
BUILDLINK_PKGSRCDIR.wolfssl?= ../../wip/wolfssl
diff --git a/wolfssl/distinfo b/wolfssl/distinfo
index 888c928f9c..d3cbb8dba0 100644
--- a/wolfssl/distinfo
+++ b/wolfssl/distinfo
@@ -4,3 +4,5 @@ SHA1 (wolfssl-4.3.0.zip) = 6531ee86d411db0d113b1afab9069ad6bbf6a22a
RMD160 (wolfssl-4.3.0.zip) = eabf566d1ed80bca0d2188e1194e6569f21821dd
SHA512 (wolfssl-4.3.0.zip) = ebfe85a5a815ca626e936b4529d6655b9e361bcda551d4bf82b05e1a492a13255705f649224113c587ed2c5249ddfd996b5915bbc6a50fc36da976c581ba9be3
Size (wolfssl-4.3.0.zip) = 7428521 bytes
+SHA1 (patch-certs_intermediate_genintcerts.sh) = bdcf9a1fd14170aaf780ab9677fd8bc6e4ddc75c
+SHA1 (patch-configure.ac) = e562814f8c2d1c4a242383820e5b730c88e48211
diff --git a/wolfssl/patches/patch-certs_intermediate_genintcerts.sh b/wolfssl/patches/patch-certs_intermediate_genintcerts.sh
new file mode 100644
index 0000000000..c66eaf8040
--- /dev/null
+++ b/wolfssl/patches/patch-certs_intermediate_genintcerts.sh
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Make the script portable.
+
+--- certs/intermediate/genintcerts.sh.orig 2020-01-27 21:06:17.351863728 +0000
++++ certs/intermediate/genintcerts.sh
+@@ -175,11 +175,11 @@ create_cert() {
+ mv ./certs/intermediate/tmp.pem ./certs/intermediate/$4.pem
+ }
+
+-if [ "$1" == "clean" ]; then
++if [ "$1" = "clean" ]; then
+ echo "Cleaning temp files"
+ cleanup_files
+ fi
+-if [ "$1" == "cleanall" ]; then
++if [ "$1" = "cleanall" ]; then
+ echo "Cleaning all files"
+ rm -f ./certs/intermediate/*.pem
+ rm -f ./certs/intermediate/*.der
diff --git a/wolfssl/patches/patch-configure.ac b/wolfssl/patches/patch-configure.ac
new file mode 100644
index 0000000000..b3e363605b
--- /dev/null
+++ b/wolfssl/patches/patch-configure.ac
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Make the script portable.
+
+--- configure.ac.orig 2020-01-27 21:11:42.388896166 +0000
++++ configure.ac
+@@ -3462,7 +3462,7 @@ then
+ ENABLED_ENCRYPT_THEN_MAC=yes
+ fi
+
+-AS_IF([test "x$ENABLED_SNIFFER" == "xyes"],[ENABLED_ENCRYPT_THEN_MAC="no"])
++AS_IF([test "x$ENABLED_SNIFFER" = "xyes"],[ENABLED_ENCRYPT_THEN_MAC="no"])
+
+ if test "x$ENABLED_ENCRYPT_THEN_MAC" = "xyes"
+ then
+@@ -3995,7 +3995,7 @@ AS_IF([test "x$ENABLED_INTEL_QA" = "xyes
+
+ AC_MSG_RESULT([yes])
+
+- AS_IF([test "x$BUILD_INTEL_QAT_VERSION" == "x1"],
++ AS_IF([test "x$BUILD_INTEL_QAT_VERSION" = "x1"],
+ [LIB_ADD="-ladf_proxy -losal -lrt $LIB_ADD"],
+ [LIB_ADD="-losal -lrt $LIB_ADD"])
+ CPPFLAGS="$OLD_CPPFLAGS"
Home |
Main Index |
Thread Index |
Old Index