Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/openvpn/Makefile

@@ -71,7 +71,7 @@ ifeq ($(ADK_PACKAGE_OPENVPN_SERVER),y)
 	echo "/etc/openvpn/server.conf" > ./files/openvpn.conffiles
 endif
 ifeq ($(ADK_PACKAGE_OPENVPN_CLIENT),y)
-	$(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/
+	$(CP) ./files/client.conf $(IDIR_OPENVPN)/etc/openvpn/
 	echo "/etc/openvpn/client.conf" > ./files/openvpn.conffiles
 endif
 

package/openvpn/files/openvpn.conffiles

@@ -1 +1 @@
-/etc/openvpn/server.conf
+/etc/openvpn/client.conf

target/packages/pkg-available/vpn-client

@@ -0,0 +1,18 @@
+config ADK_PKG_VPN_CLIENT
+	bool "Compile a OpenVPN client system"
+	default n
+	select ADK_PACKAGE_OPENVPN
+	select ADK_PACKAGE_OPENVPN_WITH_LZO
+	select ADK_PACKAGE_OPENVPN_WITH_MANAGEMENT
+	select ADK_PACKAGE_OPENVPN_CLIENT
+	select ADK_PACKAGE_OPENNTPD
+	select ADK_PACKAGE_IPTABLES
+	select ADK_PACKAGE_PPP
+	select ADK_PACKAGE_PPP_MOD_PPPOE
+	# optional
+	select ADK_PACKAGE_VIM
+	select ADK_PACKAGE_SCREEN
+	select ADK_PACKAGE_STRACE
+	select ADK_PACKAGE_TCPDUMP
+	help
+	 VPN Client system with OpenVPN.

target/packages/pkg-available/vpn-server

@@ -1,5 +1,5 @@
 config ADK_PKG_VPN_SERVER
-	bool "Compile a VPN server system"
+	bool "Compile a OpenVPN server system"
 	default n
 	select ADK_PACKAGE_OPENVPN
 	select ADK_PACKAGE_OPENVPN_EASY_RSA