diff options
| author | Steven Barth <steven@midlink.org> | 2015-08-03 08:03:48 +0200 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-08-03 08:03:48 +0200 |
| commit | 3b3542cc5ffd3afb3ebdc10ae8fa8c1e369d39c2 (patch) | |
| tree | 4ea4d16c27eca721034532d841a8b2bb11d0a439 | |
| parent | 94f87dc1e1bd076b443e86aa7ba2ccc9c4182cb8 (diff) | |
| parent | d3a38dc6a8085a23e77088fcf4dde1882b513fc5 (diff) | |
Merge pull request #1615 from mhaas/stunnel-5.20
stunnel: Update from 5.14 to 5.20
| -rw-r--r-- | net/stunnel/Makefile | 4 | ||||
| -rw-r--r-- | net/stunnel/patches/010_fix_getnameinfo.patch | 25 | ||||
| -rw-r--r-- | net/stunnel/patches/012-cron-without-pthread-fix.patch | 14 |
3 files changed, 16 insertions, 27 deletions
diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 0b928b7f6..58a6bbea6 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stunnel -PKG_VERSION:=5.14 +PKG_VERSION:=5.20 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0+ @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL PKG_SOURCE_URL:=http://stunnel.cybermirror.org/archive/5.x/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=e716501960dc6856d80f92547298f724 +PKG_MD5SUM:=3264375026c2b496b5d258e243222de8 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/stunnel/patches/010_fix_getnameinfo.patch b/net/stunnel/patches/010_fix_getnameinfo.patch deleted file mode 100644 index 03acfafac..000000000 --- a/net/stunnel/patches/010_fix_getnameinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/prototypes.h -+++ b/src/prototypes.h -@@ -590,7 +590,7 @@ extern GETNAMEINFO s_getnameinfo; - - #endif /* USE_WIN32 */ - --int getnameinfo(const struct sockaddr *, int, char *, int, char *, int, int); -+int getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, unsigned int); - - #endif /* !defined HAVE_GETNAMEINFO */ - ---- a/src/resolver.c -+++ b/src/resolver.c -@@ -538,8 +538,9 @@ const char *s_gai_strerror(int err) { - /* implementation is limited to functionality needed by stunnel */ - - #ifndef HAVE_GETNAMEINFO --int getnameinfo(const struct sockaddr *sa, int salen, -- char *host, int hostlen, char *serv, int servlen, int flags) { -+int getnameinfo(const struct sockaddr *sa, socklen_t salen, -+ char *host, socklen_t hostlen, char *serv, socklen_t servlen, -+ unsigned int flags) { - - #if defined(USE_WIN32) && !defined(_WIN32_WCE) - if(s_getnameinfo) diff --git a/net/stunnel/patches/012-cron-without-pthread-fix.patch b/net/stunnel/patches/012-cron-without-pthread-fix.patch new file mode 100644 index 000000000..0f644b3c1 --- /dev/null +++ b/net/stunnel/patches/012-cron-without-pthread-fix.patch @@ -0,0 +1,14 @@ +Index: stunnel-5.20/src/cron.c +=================================================================== +--- stunnel-5.20.orig/src/cron.c ++++ stunnel-5.20/src/cron.c +@@ -46,6 +46,9 @@ NOEXPORT void cron_thread(void *arg); + #endif + #if defined(USE_PTHREAD) || defined(USE_WIN32) + NOEXPORT void cron_worker(void); ++#endif ++ ++#ifndef OPENSSL_NO_DH + NOEXPORT void cron_dh_param(void); + #endif + |