From c544adacd4d6979aa850704cd7a81c0d42bc5700 Mon Sep 17 00:00:00 2001 From: Michael Haas Date: Sat, 25 Jul 2015 09:24:39 +0200 Subject: [PATCH 1/3] stunnel: Update from 5.14 to 5.20 * 010_fix_getnameinfo.patch is no longer needed * 011-cron-without-pthread-fix.patch added, fixes incorrect ifdef when building without pthreads Signed-off-by: Michael Haas --- net/stunnel/Makefile | 4 +-- net/stunnel/patches/010_fix_getnameinfo.patch | 25 ------------------- .../012-cron-without-pthread-fix.patch | 14 +++++++++++ 3 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 net/stunnel/patches/010_fix_getnameinfo.patch create mode 100644 net/stunnel/patches/012-cron-without-pthread-fix.patch 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 + From 1c9d3861d82e7f98d4bce002ac00d716f7402c3f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 24 Jul 2016 14:52:50 +0200 Subject: [PATCH 2/3] stunnel: add missing zlib dependency Signed-off-by: Felix Fietkau --- net/stunnel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 58a6bbea6..671ee511b 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/stunnel SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenssl + DEPENDS:=+libopenssl +zlib TITLE:=SSL TCP Wrapper URL:=http://www.stunnel.org/ endef From 0396883a08d7feec7028da7945e7f69b7e742b81 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Fri, 10 Nov 2017 13:19:14 +0100 Subject: [PATCH 3/3] stunnel: use archive/ as download source Anything below 5.43 is archived, update download source to use paths accordingly. Signed-off-by: Zoltan HERPAI --- net/stunnel/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 671ee511b..196196b25 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -15,7 +15,9 @@ PKG_LICENSE:=GPL-2.0+ PKG_MAINTAINER:=Michael Haas PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL -PKG_SOURCE_URL:=http://stunnel.cybermirror.org/archive/5.x/ +PKG_SOURCE_URL:=\ + http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/ \ + http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MD5SUM:=3264375026c2b496b5d258e243222de8