[freetz-stable-1.1] Merge in r4762 from trunk:

 * tor: switch back to stable version 0.2.1.25 (we only used the alpha version because the SSL fix was included earlier than in the stable version!)
 ------------------------------------------------------------------------
 * openvpn, stunnel: Fix --disable-ipv6 switch

git-svn-id: http://svn.freetz.org/branches/freetz-stable-1.1@4763 f5190166-0702-4917-9039-51ec32eddaf5

make/openvpn/openvpn.mk

@@ -40,7 +40,7 @@ $(PKG)_CONFIGURE_OPTIONS += --disable-socks
 $(PKG)_CONFIGURE_OPTIONS += --disable-http
 $(PKG)_CONFIGURE_OPTIONS += --enable-password-save
 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_ENABLE_SMALL),--enable-small,--disable-small)
-$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_TARGET_IPV6_SUPPORT),--enable-ipv6,--disable-ipv6)
+$(PKG)_CONFIGURE_OPTIONS += --disable-ipv6
 
 $(PKG_SOURCE_DOWNLOAD)
 $(PKG_UNPACKED)

make/stunnel/stunnel.mk

@@ -24,7 +24,7 @@ $(PKG)_CONFIGURE_OPTIONS += --disable-libwrap
 $(PKG)_CONFIGURE_OPTIONS += --with-threads=fork
 #$(PKG)_CONFIGURE_OPTIONS += --with-threads=pthread
 $(PKG)_CONFIGURE_OPTIONS += --with-ssl="$(TARGET_MAKE_PATH)/../usr"
-$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_TARGET_IPV6_SUPPORT),--enable-ipv6,--disable-ipv6)
+$(PKG)_CONFIGURE_OPTIONS += --disable-ipv6
 
 $(PKG)_CONFIG_SUBOPTS += FREETZ_PACKAGE_STUNNEL_STATIC
 

make/tor/Config.in

@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_TOR
-	bool "Tor 0.2.2.10-alpha"
+	bool "Tor 0.2.1.25"
 	select FREETZ_LIB_libevent if ! FREETZ_PACKAGE_TOR_STATIC
 	select FREETZ_LIB_libcrypto if ! FREETZ_PACKAGE_TOR_STATIC
 	select FREETZ_LIB_libssl if ! FREETZ_PACKAGE_TOR_STATIC

make/tor/tor.mk

@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 0.2.2.10-alpha)
+$(call PKG_INIT_BIN, 0.2.1.25)
 $(PKG)_SOURCE:=tor-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=e2576c3c355b1c6830c91fb0643f06be
+$(PKG)_SOURCE_MD5:=f58540b3c5835ac4f5de1b02bbddc703
 $(PKG)_SITE:=http://www.torproject.org/dist
 $(PKG)_STARTLEVEL=40
 $(PKG)_BINARY:=$($(PKG)_DIR)/src/or/tor
@@ -19,7 +19,7 @@ $(PKG)_CONFIGURE_ENV += tor_cv_time_t_signed=yes
 $(PKG)_CONFIGURE_OPTIONS += --sysconfdir=/mod/etc
 $(PKG)_CONFIGURE_OPTIONS += --enable-shared
 $(PKG)_CONFIGURE_OPTIONS += --enable-static
-$(PKG)_CONFIGURE_OPTIONS += --with-ssl-dir="$(TARGET_MAKE_PATH)/../usr/lib"
+$(PKG)_CONFIGURE_OPTIONS += --with-openssl-dir="$(TARGET_MAKE_PATH)/../usr/lib"
 $(PKG)_CONFIGURE_OPTIONS += --with-libevent-dir="$(TARGET_MAKE_PATH)/../usr/lib"
 $(PKG)_CONFIGURE_OPTIONS += --disable-asciidoc