diff options
| -rw-r--r-- | data/stunnel/_metadata/homepage | 1 | ||||
| -rw-r--r-- | data/stunnel/_metadata/name | 1 | ||||
| -rw-r--r-- | data/stunnel/_metadata/version | 2 | ||||
| -rw-r--r-- | data/stunnel/dylib.diff | 53 | ||||
| -rw-r--r-- | data/stunnel/ipush.diff | 12 | ||||
| -rw-r--r-- | data/stunnel/make.sh | 6 | ||||
| -rw-r--r-- | data/stunnel/openssl.diff | 12 | ||||
| -rw-r--r-- | data/stunnel/stunnel-3.26.tar.gz | bin | 228923 -> 0 bytes | |||
| -rw-r--r-- | data/stunnel/stunnel-4.26.tar.gz | bin | 0 -> 531804 bytes | |||
| -rwxr-xr-x | data/stunnel/stunnel3 | 55 |
10 files changed, 73 insertions, 69 deletions
diff --git a/data/stunnel/_metadata/homepage b/data/stunnel/_metadata/homepage new file mode 100644 index 000000000..2d2f74a66 --- /dev/null +++ b/data/stunnel/_metadata/homepage @@ -0,0 +1 @@ +http://www.stunnel.org/ diff --git a/data/stunnel/_metadata/name b/data/stunnel/_metadata/name new file mode 100644 index 000000000..faf080411 --- /dev/null +++ b/data/stunnel/_metadata/name @@ -0,0 +1 @@ +Stunnel diff --git a/data/stunnel/_metadata/version b/data/stunnel/_metadata/version index cf6715346..54eaa22e2 100644 --- a/data/stunnel/_metadata/version +++ b/data/stunnel/_metadata/version @@ -1 +1 @@ -3.26 +4.26 diff --git a/data/stunnel/dylib.diff b/data/stunnel/dylib.diff deleted file mode 100644 index 79a6d100a..000000000 --- a/data/stunnel/dylib.diff +++ /dev/null @@ -1,53 +0,0 @@ -diff -ru stunnel-3.26/Makefile.in stunnel-3.26+iPhone/Makefile.in ---- stunnel-3.26/Makefile.in 2003-04-03 01:43:47.000000000 +0000 -+++ stunnel-3.26+iPhone/Makefile.in 2008-01-02 01:33:45.000000000 +0000 -@@ -24,7 +24,7 @@ - LIBS=@LIBS@ - HEADERS=common.h prototypes.h client.h - OBJS=client.o stunnel.o ssl.o protocol.o sthreads.o pty.o log.o options.o --DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8 $(PEM_DIR)/stunnel.pem -+DESTFILES=$(sbindir)/stunnel $(libdir)/libstunnel.dylib $(man8dir)/stunnel.8 $(PEM_DIR)/stunnel.pem - - # Settings that are probably only useful for creating tarball dists - WINGCC=i586-mingw32msvc-gcc -@@ -37,7 +37,7 @@ - - # standard external rules - --all: stunnel stunnel.8 stunnel.html stunnel.so stunnel.pem -+all: stunnel stunnel.8 stunnel.html libstunnel.dylib stunnel.pem - - install: all installdirs $(DESTFILES) - -@@ -48,7 +48,7 @@ - $(MAKE) INSTALL='$(INSTALL) -s' install - - clean: -- rm -f stunnel stunnel.so $(OBJS) core config.log stunnel.log -+ rm -f stunnel libstunnel.dylib $(OBJS) core config.log stunnel.log - - distclean: clean - rm -f config.cache config.status Makefile stunnel.pem stunnel.exe -@@ -93,9 +93,8 @@ - stunnel: $(OBJS) - $(CC) $(LDFLAGS) -o stunnel $(OBJS) $(LIBS) - --stunnel.so: Makefile env.c -- $(CC) -fPIC -shared $(LDFLAGS) -o stunnel.so env.c $(LIBS) || \ -- touch stunnel.so -+libstunnel.dylib: Makefile env.o -+ $(CC) -fPIC -shared $(LDFLAGS) -dynamiclib -o libstunnel.dylib env.o $(LIBS) - - Makefile: configure Makefile.in - ./configure -@@ -119,8 +118,8 @@ - $(sbindir)/stunnel: stunnel - $(INSTALL) -m 711 stunnel $(sbindir) - --$(libdir)/stunnel.so: stunnel.so -- test ! -s stunnel.so || $(INSTALL) -m 755 stunnel.so $(libdir) -+$(libdir)/libstunnel.dylib: libstunnel.dylib -+ test ! -s libstunnel.dylib || $(INSTALL) -m 755 libstunnel.dylib $(libdir) - - $(man8dir)/stunnel.8: stunnel.8 - $(INSTALLMAN) -m 644 stunnel.8 $(man8dir) diff --git a/data/stunnel/ipush.diff b/data/stunnel/ipush.diff deleted file mode 100644 index ee8758f0f..000000000 --- a/data/stunnel/ipush.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru stunnel-3.26/pty.c stunnel-3.26+iPhone/pty.c ---- stunnel-3.26/pty.c 2003-08-01 23:43:03.000000000 +0000 -+++ stunnel-3.26+iPhone/pty.c 2008-04-04 18:33:41.000000000 +0000 -@@ -54,6 +54,8 @@ - #define O_NOCTTY 0 - #endif /* O_NOCTTY */ - -+#include <OSServices/OpenTransportProtocol.h> -+ - /* - * Allocates and opens a pty. Returns -1 if no pty could be allocated, or - * zero if a pty was successfully allocated. On success, open file diff --git a/data/stunnel/make.sh b/data/stunnel/make.sh index e39149f28..6c22a7bb4 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" -touch stunnel.pem -make openssl="$(which openssl)" -make install prefix="${PKG_DEST}/usr" +make +y '' | pkg:install openssl="$(which openssl)" +pkg: cp -af %/stunnel3 /usr/bin diff --git a/data/stunnel/openssl.diff b/data/stunnel/openssl.diff new file mode 100644 index 000000000..bce496d8f --- /dev/null +++ b/data/stunnel/openssl.diff @@ -0,0 +1,12 @@ +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-3.26.tar.gz b/data/stunnel/stunnel-3.26.tar.gz Binary files differdeleted file mode 100644 index c618afd8c..000000000 --- a/data/stunnel/stunnel-3.26.tar.gz +++ /dev/null diff --git a/data/stunnel/stunnel-4.26.tar.gz b/data/stunnel/stunnel-4.26.tar.gz Binary files differnew file mode 100644 index 000000000..014a3f295 --- /dev/null +++ b/data/stunnel/stunnel-4.26.tar.gz diff --git a/data/stunnel/stunnel3 b/data/stunnel/stunnel3 new file mode 100755 index 000000000..86ed9264d --- /dev/null +++ b/data/stunnel/stunnel3 @@ -0,0 +1,55 @@ +#!/bin/bash +exec stunnel4 <( + (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";; + (T) echo "transparent = yes";; + (W) echo "RNDoverwrite = yes";; + (f) echo "foreground = yes";; + (D) echo "debug = $OPTARG";; + (O) echo "socket = $OPTARG";; + (o) echo "output = $OPTARG";; + (C) echo "ciphers = $OPTARG";; + (p) echo "cert = $OPTARG";; + (v) echo "verify = $OPTARG";; + (a) echo "CApath = $OPTARG";; + (A) echo "CAfile = $OPTARG";; + (t) echo "session = $OPTARG";; + (N) echo "service = $OPTARG";; + (u) echo "ident = $OPTARG";; + (n) echo "protocol = $OPTARG";; + (E) echo "EGD = $OPTARG";; + (R) echo "RNDfile = $OPTARG";; + (B) echo "RNDbytes = $OPTARG";; + (I) echo "local = $OPTARG";; + + (d) + echo "accept = $OPTARG" + stunnel3= + ;; + + (s) echo "setuid = $OPTARG";; + (g) echo "setgid = $OPTARG";; + (P) echo "pid = $OPTARG";; + (r) echo "connect = $OPTARG";; + + (L) + echo "pty = yes" + echo "exec = $OPTARG" + ;; + + (l) + echo "exec = $OPTARG" + ;; + esac + done + + if [[ ${stunnel3+@} ]]; then + echo "[stunnel3]" + fi + + shift $((OPTIND - 1)) + if [[ $# -ne 0 ]]; then + echo "execargs = $@" + fi) | tee /proc/self/fd/2 +) |