Browse Source

update stunnel to latest stable version

Waldemar Brodkorb 9 years ago
parent
commit
faee1f6fd5
2 changed files with 18 additions and 35 deletions
  1. 3 2
      package/stunnel/Makefile
  2. 15 33
      package/stunnel/patches/patch-configure_ac

+ 3 - 2
package/stunnel/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		stunnel
-PKG_VERSION:=		5.08
+PKG_VERSION:=		5.16
 PKG_RELEASE:=		1
-PKG_HASH:=		830b21d24cd237e96f4d7993be43553d4eba4d3cfa2660faa78dec8d41d314fc
+PKG_HASH:=		b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d
 PKG_DESCR:=		encryption wrapper
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libopenssl
@@ -22,6 +22,7 @@ $(eval $(call PKG_template,STUNNEL,stunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--with-ssl=${STAGING_TARGET_DIR}/usr \
+			--disable-systemd \
 			--disable-libwrap
 
 stunnel-install:

+ 15 - 33
package/stunnel/patches/patch-configure_ac

@@ -1,34 +1,16 @@
---- 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"
+--- stunnel-5.16.orig/configure.ac	2015-04-16 16:03:28.000000000 +0200
++++ stunnel-5.16/configure.ac	2015-04-25 04:32:12.000000000 +0200
+@@ -71,13 +71,6 @@ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
+ AX_APPEND_COMPILE_FLAGS([-Wconversion])
+ AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
+ AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
+-AX_APPEND_COMPILE_FLAGS([-fstack-protector])
+-AX_APPEND_COMPILE_FLAGS([-fPIE])
+-AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
+-AX_APPEND_LINK_FLAGS([-fPIE -pie])
+-AX_APPEND_LINK_FLAGS([-Wl,-z,relro])
+-AX_APPEND_LINK_FLAGS([-Wl,-z,now])
+-AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
  
--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"
+ AC_MSG_NOTICE([**************************************** libtool])
+ LT_INIT([disable-static])