diff options
| author | Sam Bingner <sam@bingner.com> | 2018-08-16 13:43:07 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-08-16 13:43:07 -1000 |
| commit | c11737050dd962fd01350def3a0a5ceb3f7af023 (patch) | |
| tree | b0191347ce15a93eb4baff0dc4c0505f2b690c3d | |
| parent | 4f1355f0d9232155bf3b6bdd1313c6d781fb7807 (diff) | |
Update stunnel to 5.48
| -rw-r--r-- | data/stunnel/_metadata/version | 2 | ||||
| -rw-r--r-- | data/stunnel/make.sh | 2 | ||||
| -rw-r--r-- | data/stunnel/openssl.diff | 12 | ||||
| -rw-r--r-- | data/stunnel/stunnel-4.26.tar.gz | bin | 531804 -> 0 bytes | |||
| -rw-r--r-- | data/stunnel/stunnel-5.48.tar.gz | bin | 0 -> 708356 bytes | |||
| -rwxr-xr-x | data/stunnel/stunnel3 | 4 |
6 files changed, 4 insertions, 16 deletions
diff --git a/data/stunnel/_metadata/version b/data/stunnel/_metadata/version index 54eaa22e2..dd362a27b 100644 --- a/data/stunnel/_metadata/version +++ b/data/stunnel/_metadata/version @@ -1 +1 @@ -4.26 +5.48 diff --git a/data/stunnel/make.sh b/data/stunnel/make.sh index 6c22a7bb4..980523002 100644 --- a/data/stunnel/make.sh +++ b/data/stunnel/make.sh @@ -1,5 +1,5 @@ pkg:setup pkg:configure ac_cv_file___dev_urandom_=yes ac_cv_file___dev_ptmx_=yes ac_cv_file___dev_ptc_=no --with-ssl="$(PKG_DEST_ openssl)/usr" -make +make -j8 y '' | pkg:install openssl="$(which openssl)" pkg: cp -af %/stunnel3 /usr/bin diff --git a/data/stunnel/openssl.diff b/data/stunnel/openssl.diff deleted file mode 100644 index bce496d8f..000000000 --- a/data/stunnel/openssl.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru stunnel-4.26/tools/Makefile.in stunnel-4.26+iPhone/tools/Makefile.in ---- stunnel-4.26/tools/Makefile.in 2008-09-20 20:32:29.000000000 +0000 -+++ stunnel-4.26+iPhone/tools/Makefile.in 2008-12-03 13:26:33.000000000 +0000 -@@ -173,7 +173,7 @@ - examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \ - stunnel.spec stunnel.init - --openssl = $(ssldir)/bin/openssl -+openssl ?= $(ssldir)/bin/openssl - all: all-am - - .SUFFIXES: diff --git a/data/stunnel/stunnel-4.26.tar.gz b/data/stunnel/stunnel-4.26.tar.gz Binary files differdeleted file mode 100644 index 014a3f295..000000000 --- a/data/stunnel/stunnel-4.26.tar.gz +++ /dev/null diff --git a/data/stunnel/stunnel-5.48.tar.gz b/data/stunnel/stunnel-5.48.tar.gz Binary files differnew file mode 100644 index 000000000..3ab4a123e --- /dev/null +++ b/data/stunnel/stunnel-5.48.tar.gz diff --git a/data/stunnel/stunnel3 b/data/stunnel/stunnel3 index 86ed9264d..ea1457537 100755 --- a/data/stunnel/stunnel3 +++ b/data/stunnel/stunnel3 @@ -1,5 +1,5 @@ #!/bin/bash -exec stunnel4 <( +exec stunnel <( (while getopts 'cTWfD:O:o:C:p:v:a:A:t:N:u:n:E:R:B:I:d:s:g:P:r:L:l:' OPTKEY; do case $OPTKEY in (c) echo "client = yes";; @@ -51,5 +51,5 @@ exec stunnel4 <( shift $((OPTIND - 1)) if [[ $# -ne 0 ]]; then echo "execargs = $@" - fi) | tee /proc/self/fd/2 + fi) | tee >(cat>&2) ) |