From 6ee412aa4801387990ea6250167616a1a0c87cd9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 28 May 2014 12:08:39 +0200
Subject: add stunnel

---
 TODO                                       |  2 --
 package/stunnel/Makefile                   | 32 ++++++++++++++++++++++++++++
 package/stunnel/patches/patch-configure_ac | 34 ++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 package/stunnel/Makefile
 create mode 100644 package/stunnel/patches/patch-configure_ac

diff --git a/TODO b/TODO
index f136a568f..94186551f 100644
--- a/TODO
+++ b/TODO
@@ -12,9 +12,7 @@ base system:
 - essid with spaces
 
 new or update packages:
-- add rsyslog
 - add btrfs-utils
-- add stunnel
 - port uuterm
 - port opkg with gpg signing
 - port msmtp
diff --git a/package/stunnel/Makefile b/package/stunnel/Makefile
new file mode 100644
index 000000000..46289171d
--- /dev/null
+++ b/package/stunnel/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		stunnel
+PKG_VERSION:=		5.01
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		7b63266b6fa05da696729e245100da65
+PKG_DESCR:=		encryption wrapper
+PKG_SECTION:=		net/security
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP:=		autotool openssl
+PKG_URL:=		https://www.stunnel.org
+PKG_SITES:=		https://www.stunnel.org/downloads/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,STUNNEL,stunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--with-ssl=${STAGING_TARGET_DIR}/usr \
+			--disable-libwrap
+
+stunnel-install:
+	$(INSTALL_DIR) $(IDIR_STUNNEL)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/stunnel \
+		$(IDIR_STUNNEL)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/stunnel/patches/patch-configure_ac b/package/stunnel/patches/patch-configure_ac
new file mode 100644
index 000000000..eb4595995
--- /dev/null
+++ b/package/stunnel/patches/patch-configure_ac
@@ -0,0 +1,34 @@
+--- stunnel-5.01.orig/configure.ac	2014-03-09 23:14:33.000000000 +0100
++++ stunnel-5.01/configure.ac	2014-05-28 11:55:04.000000000 +0200
+@@ -44,31 +44,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([int main
+     ])
+ CFLAGS="$valid_CFLAGS"; LDFLAGS="$valid_LDFLAGS"
+ 
+-AC_MSG_CHECKING([whether $CC accepts -fstack-protector])
+-valid_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -fstack-protector"
+-valid_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS -fstack-protector"
+-AC_LINK_IFELSE([AC_LANG_SOURCE([int main() {return 0;}])],
+-    [
+-        AC_MSG_RESULT([yes])
+-        AC_SUBST([stunnel_CFLAGS], ["$stunnel_CFLAGS -fstack-protector"])
+-        AC_SUBST([stunnel_LDFLAGF], ["$stunnel_LDFLAGF -fstack-protector"])
+-    ], [
+-        AC_MSG_RESULT([no])
+-    ])
+-CFLAGS="$valid_CFLAGS"; LDFLAGS="$valid_LDFLAGS"
+-
+-AC_MSG_CHECKING([whether $CC accepts -pie])
+-valid_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -fPIE"
+-valid_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS -pie -fPIE"
+-AC_LINK_IFELSE([AC_LANG_SOURCE([int main() {return 0;}])],
+-    [
+-        AC_MSG_RESULT([yes])
+-        AC_SUBST([stunnel_CFLAGS], ["$stunnel_CFLAGS -fPIE"])
+-        AC_SUBST([stunnel_LDFLAGF], ["$stunnel_LDFLAGF -pie -fPIE"])
+-    ], [
+-        AC_MSG_RESULT([no])
+-    ])
+-CFLAGS="$valid_CFLAGS"; LDFLAGS="$valid_LDFLAGS"
+ 
+ AC_MSG_CHECKING([whether $CC accepts -Wall])
+ valid_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -Wall"
-- 
cgit v1.2.3