[freetz-stable-1.1] Merge in r3310, r3389, r3391:r3392, r3454, r3723,…

… r3736, r3768, r3836, r3876, r3887, r3892:r3893, r3954:r3955, r3965:r3966, r3993, r4013, r4015, r4094, r4134, r4244, r4287, r4294, r4398, r4400, r4410, r4497, r4588, r4605:r4606, r4618:r4619, r4718:r4719 from trunk:

------------------------------------------------------------------------
r3310 | cinereous | 2009-05-06 13:33:15 +0200 (Mi, 06 Mai 2009) | 1 line
vsftpd: bump to 2.1.0 (several bugfixes)
------------------------------------------------------------------------
r3389 | oliver | 2009-06-06 22:33:11 +0200 (Sa, 06 Jun 2009) | 1 line
* stunnel: Bumpt to version 4.27
------------------------------------------------------------------------
r3392 | oliver | 2009-06-07 11:03:17 +0200 (So, 07 Jun 2009) | 1 line
 * revert unwanted changes from r3380, r3389
------------------------------------------------------------------------
r3454 | Whoopie | 2009-06-29 10:25:44 +0200 (Mo, 29 Jun 2009) | 2 lines
tor: bump to 0.2.35 (by alpha1974)
------------------------------------------------------------------------
r3723 | Whoopie | 2009-10-02 14:04:05 +0200 (Fr, 02 Okt 2009) | 2 lines
openvpn: bump version to 2.1_rc20
------------------------------------------------------------------------
r3736 | Whoopie | 2009-10-07 10:21:13 +0200 (Mi, 07 Okt 2009) | 3 lines
bip: bump version to 0.8.2
wget: bump version to 1.12
------------------------------------------------------------------------
r3768 | cinereous | 2009-10-19 16:24:02 +0200 (Mo, 19 Okt 2009) | 1 line
 * vsftpd version bump to 2.2.1
------------------------------------------------------------------------
r3836 | cinereous | 2009-11-07 19:56:26 +0100 (Sa, 07 Nov 2009) | 1 line
 * openssl: bump to 0.9.8l (security workaround to avoid renegotiations)
------------------------------------------------------------------------
r3876 | Whoopie | 2009-11-13 12:01:58 +0100 (Fr, 13 Nov 2009) | 2 lines
openvpn: bump version to 2.1_rc21
------------------------------------------------------------------------
r3887 | Whoopie | 2009-11-16 14:04:01 +0100 (Mo, 16 Nov 2009) | 2 lines
openvpn: change static build procedure(thanks mape2k)
------------------------------------------------------------------------
r3892 | Whoopie | 2009-11-17 00:41:19 +0100 (Di, 17 Nov 2009) | 2 lines
tor: bump version to 0.2.1.20 (by alpha1974)
------------------------------------------------------------------------
r3893 | Whoopie | 2009-11-17 10:11:12 +0100 (Di, 17 Nov 2009) | 2 lines
bip: bump version to 0.8.4
------------------------------------------------------------------------
r3954 | er13 | 2009-11-24 01:09:23 +0100 (Di, 24 Nov 2009) | 1 line
bump vsftp to 2.2.2
------------------------------------------------------------------------
r3955 | er13 | 2009-11-24 01:11:55 +0100 (Di, 24 Nov 2009) | 1 line
vsftp: revert unintended change from r3954
------------------------------------------------------------------------
r3966 | Whoopie | 2009-11-25 15:52:20 +0100 (Mi, 25 Nov 2009) | 2 lines
stunnel: bump version to 4.28, add option to build statically, enable IPv6 only if FREETZ_TARGET_IPV6_SUPPORT is set
------------------------------------------------------------------------
r3993 | Whoopie | 2009-12-02 17:28:16 +0100 (Mi, 02 Dez 2009) | 4 lines
openvpn:
- bump version to 2.1_rc22, update IPv6 patch, add IPv6 fix for kernel < 2.6.14
- move option for "unencrypted" to the end of the choice list, show warning if this option is chosen (by MaxMuster)
------------------------------------------------------------------------
r4013 | oliver | 2009-12-08 22:42:18 +0100 (Di, 08 Dez 2009) | 1 line
 * tor: Bump version to 0.2.2.6-alpha because of compat fix for openssl
------------------------------------------------------------------------
r4015 | Whoopie | 2009-12-09 10:51:25 +0100 (Mi, 09 Dez 2009) | 2 lines
tor: change version number in Config.in
------------------------------------------------------------------------
r4094 | er13 | 2009-12-22 15:34:42 +0100 (Di, 22 Dez 2009) | 1 line
openvpn: don't regenerate configure without a need, touch files to workaround timestamp problem
------------------------------------------------------------------------
r4134 | er13 | 2009-12-29 21:07:27 +0100 (Di, 29 Dez 2009) | 1 line
openvpn: bump version to 2.1.1 (just a cosmetic update, new version contains almost no change compared to the previous one)
------------------------------------------------------------------------
r4244 | oliver | 2010-01-24 12:32:00 +0100 (So, 24 Jan 2010) | 2 lines
 * tor: Bump to 0.2.2.7-alpha (security fix)
  * patch by MyRaCoLi
------------------------------------------------------------------------
r4287 | er13 | 2010-02-07 13:07:33 +0100 (So, 07 Feb 2010) | 1 line
bump tor version to 0.2.2.8-alpha
------------------------------------------------------------------------
r4294 | oliver | 2010-02-10 20:16:30 +0100 (Mi, 10 Feb 2010) | 1 line
 * tor: Add patch that fixes link order of libcrypto and libssl
------------------------------------------------------------------------
r4398 | Whoopie | 2010-03-03 16:39:11 +0100 (Mi, 03 Mar 2010) | 2 lines
tor: bump version to 0.2.2.9-alpha
------------------------------------------------------------------------
r4400 | Whoopie | 2010-03-03 16:42:17 +0100 (Mi, 03 Mar 2010) | 2 lines
tor: delete patch which is incorporated in latest version
------------------------------------------------------------------------
r4410 | oliver | 2010-03-03 22:54:40 +0100 (Mi, 03 Mar 2010) | 3 lines
 * openssl: Bump to 0.9.8m
  * increases size of libs by 9kb
  * by MaxMuster
------------------------------------------------------------------------
r4497 | oliver | 2010-03-16 20:13:20 +0100 (Di, 16 Mar 2010) | 1 line
 * tor: Bump to 0.2.2.10-alpha (Patch by make)
------------------------------------------------------------------------
r4588 | er13 | 2010-03-27 00:37:40 +0100 (Sa, 27 Mar 2010) | 3 lines
openssl:
 * bump version to 0.9.8n (security fixes)
------------------------------------------------------------------------
r4605 | er13 | 2010-03-27 22:09:14 +0100 (Sa, 27 Mar 2010) | 3 lines
glib2:
 * bump version to 2.22.5
------------------------------------------------------------------------
r4606 | oliver | 2010-03-27 23:49:54 +0100 (Sa, 27 Mar 2010) | 1 line
 * stunnel: Bump to 4.32
------------------------------------------------------------------------
r4618 | oliver | 2010-03-28 12:37:16 +0200 (So, 28 Mar 2010) | 1 line
 * subversion: Call cleanup before modlib_restart
------------------------------------------------------------------------
r4619 | er13 | 2010-03-28 13:04:47 +0200 (So, 28 Mar 2010) | 3 lines
stunnel:
 * don't assume build-system has the same device files as the target, specify required environment values explicitly
------------------------------------------------------------------------
r4719 | er13 | 2010-04-14 00:21:48 +0200 (Mi, 14 Apr 2010) | 3 lines
stunnel:
 * bump version to 4.33
------------------------------------------------------------------------

 * refs #776

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

CHANGELOG

@@ -8,8 +8,15 @@ Latest changes:
     * added favicon by atomphil (Freetz-Webinterface only)
 
 - Updated packages and libs:
+    * bip 0.8.4
     * php 5.2.10 (download for 5.2.9 was removed)
     * davfs 1.4.5 (older versions have problems with gmx)
+    * openssl 0.9.8n (security issues)
+    * openvpn 2.1.1
+    * stunnel 4.33
+    * tor 0.2.2.10-alpha
+    * vsftpd 2.2.2
+    * wget 1.12
 
 - Firmware updates:
    * Please see FIRMWARES for the list of currently supported boxes and firmwares.

make/bip/Config.in

@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_BIP
-	bool "Bip 0.8.0 (binary only)"
+	bool "Bip 0.8.4 (binary only)"
 	default n
 	help
 		Bip is an IRC proxy, which means it keeps connected to your

make/bip/bip.mk

@@ -1,8 +1,9 @@
-$(call PKG_INIT_BIN,0.8.0)
+$(call PKG_INIT_BIN,0.8.4)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
 $(PKG)_SITE:=http://bip.t1r.net/downloads
 $(PKG)_BINARY:=$($(PKG)_DIR)/src/bip
 $(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/bip
+$(PKG)_SOURCE_MD5:=76fe2800efdfbe54bf72540e40a91150
 
 ifeq ($(strip $(FREETZ_BIP_WITH_SSL)),y)
 $(PKG)_DEPENDS_ON := openssl

make/bip/patches/100-freenode-quiet.patch

@@ -0,0 +1,12 @@
+--- src/irc.c
++++ src/irc.c
+@@ -944,7 +944,8 @@ static int irc_cli_mode(struct link_client *ic, struct line *line)
+
+ 	/* This is a wild guess and that sucks. */
+ 	if (!irc_line_elem_equals(line, 0, "MODE") ||
+-			strchr(irc_line_elem(line, 2), 'b') == NULL)
++			(strchr(irc_line_elem(line, 2), 'b') == NULL &&
++                        strchr(irc_line_elem(line, 2), 'q') == NULL))
+ 		return OK_COPY;
+
+ 	++ic->who_count;

make/libs/glib2.mk

@@ -31,6 +31,8 @@ $(PKG)_CONFIGURE_OPTIONS += --disable-rebuilds
 $(PKG)_CONFIGURE_OPTIONS += --with-libiconv=gnu
 $(PKG)_CONFIGURE_OPTIONS += --with-threads=posix
 $(PKG)_CONFIGURE_OPTIONS += --disable-gtk-doc
+$(PKG)_CONFIGURE_OPTIONS += --disable-gtk-doc-html
+$(PKG)_CONFIGURE_OPTIONS += --disable-gtk-doc-pdf
 $(PKG)_CONFIGURE_OPTIONS += --disable-man
 
 $(PKG_SOURCE_DOWNLOAD)

make/libs/openssl.mk

@@ -1,7 +1,9 @@
-$(call PKG_INIT_LIB, 0.9.8k)
+$(call PKG_INIT_LIB, 0.9.8n)
 $(PKG)_LIB_VERSION:=0.9.8
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
+$(PKG)_SOURCE_MD5:=076d8efc3ed93646bd01f04e23c07066
 $(PKG)_SITE:=http://www.openssl.org/source
+
 $(PKG)_SSL_BINARY:=$($(PKG)_DIR)/libssl.so.$($(PKG)_LIB_VERSION)
 $(PKG)_CRYPTO_BINARY:=$($(PKG)_DIR)/libcrypto.so.$($(PKG)_LIB_VERSION)
 $(PKG)_STAGING_SSL_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libssl.so.$($(PKG)_LIB_VERSION)
@@ -14,24 +16,21 @@ OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime \
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-engines \
 	no-sse2 no-perlasm
 
+$(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -e 's/FREETZ_MOD_OPTIMIZATION_FLAGS/$(TARGET_CFLAGS)/g' Configure;
+$(PKG)_CONFIGURE_PRE_CMDS += ln -s Configure configure;
+
+$(PKG)_CONFIGURE_DEFOPTS := n
+$(PKG)_CONFIGURE_OPTIONS += linux-freetz
+$(PKG)_CONFIGURE_OPTIONS += --prefix=/usr
+$(PKG)_CONFIGURE_OPTIONS += --openssldir=/mod/etc/ssl
+$(PKG)_CONFIGURE_OPTIONS += -DOPENSSL_SMALL_FOOTPRINT
+$(PKG)_CONFIGURE_OPTIONS += $(OPENSSL_NO_CIPHERS)
+$(PKG)_CONFIGURE_OPTIONS += $(OPENSSL_OPTIONS)
+#$(PKG)_CONFIGURE_OPTIONS += -ldl
+
 $(PKG_SOURCE_DOWNLOAD)
 $(PKG_UNPACKED)
-
-$($(PKG)_DIR)/.configured: $($(PKG)_DIR)/.unpacked
-	$(SED) -i -e 's/FREETZ_MOD_OPTIMIZATION_FLAGS/$(TARGET_CFLAGS)/g' $(OPENSSL_DIR)/Configure
-	( cd $(OPENSSL_DIR); \
-		PATH="$(TARGET_TOOLCHAIN_PATH)" \
-		./Configure linux-freetz \
-		--prefix=/usr \
-		--openssldir=/mod/etc/ssl \
-		-I$(TARGET_TOOLCHAIN_STAGING_DIR)/include \
-		-L$(TARGET_TOOLCHAIN_STAGING_DIR)/lib \
-		-ldl \
-		-DOPENSSL_SMALL_FOOTPRINT \
-		$(OPENSSL_NO_CIPHERS) \
-		$(OPENSSL_OPTIONS) \
-	);
-	touch $@
+$(PKG_CONFIGURED_CONFIGURE)
 
 $($(PKG)_SSL_BINARY) $($(PKG)_CRYPTO_BINARY): $($(PKG)_DIR)/.configured
 	PATH=$(TARGET_TOOLCHAIN_PATH) \

make/libs/patches/110-optimize-for-size.openssl.patch

@@ -1,6 +1,6 @@
 --- Configure.orig	2008-12-29 01:18:23.000000000 +0100
 +++ Configure	2009-01-08 11:58:34.000000000 +0100
-@@ -364,6 +364,8 @@
+@@ -370,6 +370,8 @@
  "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",

make/libs/patches/120-makedepend.openssl.patch

@@ -7,16 +7,6 @@ diff -ruN util/domd util/domd
  # Do a makedepend, only leave out the standard headers
  # Written by Ben Laurie <[email protected]> 19 Jan 1999
 
-@@ -14,7 +14,8 @@
- cp Makefile Makefile.save
- # fake the presence of Kerberos
- touch $TOP/krb5.h
--if [ "$MAKEDEPEND" = "gcc" ]; then
-+D=${MAKEDEPEND/%*gcc/gcc}
-+if [ "$D" = "gcc" ]; then
-     args=""
-     while [ $# -gt 0 ]; do
- 	if [ "$1" != "--" ]; then args="$args $1"; fi
 @@ -22,7 +23,7 @@
      done
      sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp

make/libs/patches/140-makefile-dirs.openssl.patch

@@ -1,6 +1,6 @@
 --- Makefile.org.orig	2009-01-08 14:58:51.000000000 +0100
 +++ Makefile.org	2009-01-08 14:59:15.000000000 +0100
-@@ -131,7 +131,7 @@
+@@ -132,7 +132,7 @@
 
  BASEADDR=
 

make/libs/patches/150-no_engines.openssl.patch

@@ -67,7 +67,7 @@
  X509_CERT_PAIR_it                       3534	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 --- Configure.orig	2009-01-08 11:58:35.000000000 +0100
 +++ Configure	2009-01-08 11:58:35.000000000 +0100
-@@ -1850,6 +1850,11 @@
+@@ -1904,6 +1904,11 @@
  	close(OUT);
    }
 

make/libs/patches/160-disable_doc_tests.openssl.patch

@@ -1,6 +1,6 @@
 --- Makefile.orig	2009-01-07 12:57:01.000000000 +0100
 +++ Makefile	2009-01-08 15:37:02.000000000 +0100
-@@ -162,7 +162,7 @@
+@@ -163,7 +163,7 @@
 
  TOP=    .
  ONEDIRS=out tmp
@@ -9,7 +9,7 @@
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -321,7 +321,7 @@
+@@ -323,7 +323,7 @@
  	../crypto/uid.o
 
  sub_all: build_all
@@ -18,7 +18,7 @@
 
  build_libs: build_crypto build_fips build_ssl build_shared build_engines
 
-@@ -613,7 +613,7 @@
+@@ -617,7 +617,7 @@
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 
@@ -29,7 +29,7 @@
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
 --- Makefile.org.orig	2009-01-08 15:37:02.000000000 +0100
 +++ Makefile.org	2009-01-08 15:37:03.000000000 +0100
-@@ -148,7 +148,7 @@
+@@ -149,7 +149,7 @@
 
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
@@ -38,7 +38,7 @@
 
  MAKEFILE= Makefile
 
-@@ -160,7 +160,7 @@
+@@ -161,7 +161,7 @@
 
  TOP=    .
  ONEDIRS=out tmp
@@ -47,7 +47,7 @@
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -319,7 +319,7 @@
+@@ -321,7 +321,7 @@
  	../crypto/uid.o
 
  sub_all: build_all
@@ -56,16 +56,16 @@
 
  build_libs: build_crypto build_fips build_ssl build_shared build_engines
 
-@@ -344,7 +344,7 @@
- build_tools:
+@@ -346,7 +346,7 @@
+ build_tools: build_libs
  	@dir=tools; target=all; $(BUILD_ONE_CMD)
 
 -all_testapps: build_libs build_testapps
 +all_testapps: build_libs
  build_testapps:
  	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-@@ -611,7 +611,7 @@
+@@ -615,7 +615,7 @@
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 

make/libs/patches/180-makefile.openssl.patch

@@ -1,32 +1,96 @@
---- Makefile.org.orig	2009-01-13 17:44:06.000000000 +0100
-+++ Makefile.org	2009-01-13 17:42:39.000000000 +0100
-@@ -321,7 +321,7 @@
+--- Makefile.org.orig	2009-12-03 15:10:41.000000000 +0100
++++ Makefile.org	2009-12-03 15:10:41.000000000 +0100
+@@ -323,10 +323,10 @@
  sub_all: build_all
  build_all: build_libs build_apps build_tools
 
 -build_libs: build_crypto build_fips build_ssl build_shared build_engines
 +build_libs: build_crypto build_fips build_ssl build_engines
 
  build_crypto:
- 	if [ -n "$(FIPSCANLIB)" ]; then \
-@@ -333,15 +333,15 @@
+-	if [ -n "$(FIPSCANLIB)" ]; then \
++	+if [ -n "$(FIPSCANLIB)" ]; then \
+ 		EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
+ 		ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
+ 	else \
+@@ -334,17 +334,17 @@
+ 	fi ; export ARX ; \
  		dir=crypto; target=all; $(BUILD_ONE_CMD)
  build_fips:
- 	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
--build_ssl:
+-	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
+-build_ssl: build_crypto
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines: build_crypto
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps: build_libs
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests: build_libs
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools: build_libs
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
++	@+dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
 +build_ssl: build_crypto
- 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines:
++	@+dir=ssl; target=all; $(BUILD_ONE_CMD)
 +build_engines: build_crypto
- 	@dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps:
++	@+dir=engines; target=all; $(BUILD_ONE_CMD)
 +build_apps: build_libs
- 	@dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
++	@+dir=apps; target=all; $(BUILD_ONE_CMD)
 +build_tests: build_libs
- 	@dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools:
++	@+dir=test; target=all; $(BUILD_ONE_CMD)
 +build_tools: build_libs
- 	@dir=tools; target=all; $(BUILD_ONE_CMD)
++	@+dir=tools; target=all; $(BUILD_ONE_CMD)
 
  all_testapps: build_libs
+ build_testapps:
+@@ -500,7 +500,7 @@
+
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
+-	@set -e; target=files; $(RECURSIVE_BUILD_CMD)
++	@+set -e; target=files; $(RECURSIVE_BUILD_CMD)
+
+ links:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
+@@ -631,7 +631,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
++	@+set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ 	@set -e; for i in $(LIBS) ;\
+ 	do \
+ 		if [ -f "$$i" ]; then \
+--- crypto/Makefile.orig	2009-11-05 14:53:07.000000000 +0100
++++ crypto/Makefile	2009-12-03 15:10:41.000000000 +0100
+@@ -82,11 +82,11 @@
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+ subdirs:
+-	@target=all; $(RECURSIVE_MAKE)
++	@+target=all; $(RECURSIVE_MAKE)
+
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+-	@target=files; $(RECURSIVE_MAKE)
++	@+target=files; $(RECURSIVE_MAKE)
+
+ links:
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -107,7 +107,7 @@
+ 	fi
+
+ libs:
+-	@target=lib; $(RECURSIVE_MAKE)
++	@+target=lib; $(RECURSIVE_MAKE)
+
+ install:
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -116,7 +116,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@target=install; $(RECURSIVE_MAKE)
++	@+target=install; $(RECURSIVE_MAKE)
+
+ lint:
+ 	@target=lint; $(RECURSIVE_MAKE)

make/openvpn/Config.in

@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_OPENVPN
-	bool "OpenVPN 2.1_rc15"
+	bool "OpenVPN 2.1.1"
 	select FREETZ_LIB_libcrypto if ! FREETZ_PACKAGE_OPENVPN_STATIC
 	select FREETZ_LIB_libssl if ! FREETZ_PACKAGE_OPENVPN_STATIC
 	default n

make/openvpn/files/root/usr/lib/cgi-bin/openvpn.cgi

@@ -129,8 +129,8 @@ sec_begin '$(lang de:"Sicherheit" en:"Security")'
 cat << EOF
 <p>$(lang de:"Authentifizierungsmethode" en:"Authentification Type"): <input id="id_act_static" type="radio" name="my_auth_type" onclick='(local_auth_type[act_conf]="static"); changeval()'; ><label for="id_static"> $(lang de:"statischer Schl&uuml;ssel" en:"static key")</label>
 &nbsp;<input id="id_act_certs" type="radio" name="my_auth_type" onclick='(local_auth_type[act_conf]="certs"); changeval()';><label for="id_certs"> $(lang de:"Zertifikate" en:"Certificates")</label></p>
-Cipher: <select id="id_act_cipher" name="my_cipher" onchange="changeval()"><option value="BF-CBC">Blowfish</option><option value="AES-128-CBC">AES 128</option>
-<option value="AES-256-CBC">AES 256</option><option value="DES-EDE3-CBC">Triple-DES</option></select>
+Cipher: <select id="id_act_cipher" name="my_cipher" onchange='if (this.value=="none") (alert($(lang de:"\"Achtung, Verkehr durch das VPN ist so vollkommen unverschl&uuml;sselt!\"" en:"\"Caution: All traffic will be totally unencrypted!\""))); changeval()'><option value="BF-CBC">Blowfish</option><option value="AES-128-CBC">AES 128</option>
+<option value="AES-256-CBC">AES 256</option><option value="DES-EDE3-CBC">Triple-DES</option><option value="none">$(lang de:"unverschl&uuml;sselt" en:"unencrypted")</option></select>
 <div id="div_tls"  style="display:inline">   &nbsp; &nbsp; &nbsp; &nbsp; $(lang de:"bei Zertifikaten" en:"with certificates"): 
 <input id="id_act_tls_auth" type="checkbox" name="my_tls_auth" onclick='if (this.checked) (local_tls_auth[act_conf]="yes"); else (local_tls_auth[act_conf]=""); changeval()'>
 <label for="id_act_tls_auth">TLS-$(lang de:"Authentifizierung" en:"Authentication") </label>