From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 20 May 2009 16:55:01 +0000 (+0000)
Subject: [package] update axTLS to 1.2.2 (#5167)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ed6ae7940906f8a4b50495f5b6cbced0f9623b8;p=openwrt%2Fsvn-archive%2Farchive.git

[package] update axTLS to 1.2.2 (#5167)

SVN-Revision: 15938
---

diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile
index d520aceded..dff554609b 100644
--- a/libs/axtls/Makefile
+++ b/libs/axtls/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=axtls
-PKG_VERSION:=1.1.6
-PKG_RELEASE:=2
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/axtls http://www.leroc.com.au/axTLS/
-PKG_MD5SUM:=50e63d5fe002399e2ae63591908f7f5a
+PKG_SOURCE_URL:=@SF/axtls
+PKG_MD5SUM:=03471b5a5874e2ce86025f24b3fa0958
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/axTLS
 
@@ -22,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libaxtls
   SECTION:=libs
   CATEGORY:=Libraries
+  SUBMENU:=ssl
   TITLE:=Embedded client/server TLSv1 SSL library
   URL:=http://sourceforge.net/projects/axtls
 endef
@@ -54,9 +55,10 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
+
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(1)/usr/lib/
 endef
 
diff --git a/libs/axtls/files/config b/libs/axtls/files/config
index a9b54f5e83..b944156ac6 100644
--- a/libs/axtls/files/config
+++ b/libs/axtls/files/config
@@ -4,7 +4,6 @@
 HAVE_DOT_CONFIG=y
 CONFIG_PLATFORM_LINUX=y
 # CONFIG_PLATFORM_CYGWIN is not set
-# CONFIG_PLATFORM_SOLARIS is not set
 # CONFIG_PLATFORM_WIN32 is not set
 
 #
@@ -12,10 +11,9 @@ CONFIG_PLATFORM_LINUX=y
 #
 PREFIX="/usr"
 # CONFIG_DEBUG is not set
-# CONFIG_VISUAL_STUDIO_6_0 is not set
+CONFIG_STRIP_UNWANTED_SECTIONS=y
 # CONFIG_VISUAL_STUDIO_7_0 is not set
 # CONFIG_VISUAL_STUDIO_8_0 is not set
-CONFIG_VISUAL_STUDIO_6_0_BASE=""
 CONFIG_VISUAL_STUDIO_7_0_BASE=""
 CONFIG_VISUAL_STUDIO_8_0_BASE=""
 CONFIG_EXTRA_CFLAGS_OPTIONS=""
@@ -33,6 +31,13 @@ CONFIG_SSL_FULL_MODE=y
 CONFIG_SSL_PROT_MEDIUM=y
 # CONFIG_SSL_PROT_HIGH is not set
 CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
+CONFIG_SSL_X509_CERT_LOCATION=""
+# CONFIG_SSL_GENERATE_X509_CERT is not set
+CONFIG_SSL_X509_COMMON_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
 CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
 CONFIG_SSL_HAS_PEM=y
 CONFIG_SSL_USE_PKCS12=y
@@ -56,14 +61,21 @@ CONFIG_HTTP_HTTPS_PORT=443
 CONFIG_HTTP_SESSION_CACHE_SIZE=5
 CONFIG_HTTP_WEBROOT=""
 CONFIG_HTTP_TIMEOUT=0
+
+#
+# CGI
+#
 # CONFIG_HTTP_HAS_CGI is not set
 CONFIG_HTTP_CGI_EXTENSIONS=""
+# CONFIG_HTTP_ENABLE_LUA is not set
+CONFIG_HTTP_LUA_PREFIX=""
+CONFIG_HTTP_LUA_CGI_LAUNCHER=""
+# CONFIG_HTTP_BUILD_LUA is not set
 # CONFIG_HTTP_DIRECTORIES is not set
 # CONFIG_HTTP_HAS_AUTHORIZATION is not set
-# CONFIG_HTTP_USE_CHROOT is not set
-# CONFIG_HTTP_CHANGE_UID is not set
 # CONFIG_HTTP_HAS_IPV6 is not set
-# CONFIG_HTTP_ALL_MIME_TYPES is not set
+# CONFIG_HTTP_ENABLE_DIFFERENT_USER is not set
+CONFIG_HTTP_USER=""
 # CONFIG_HTTP_VERBOSE is not set
 # CONFIG_HTTP_IS_DAEMON is not set
 
@@ -79,6 +91,8 @@ CONFIG_JAVA_HOME=""
 # CONFIG_PERL_BINDINGS is not set
 CONFIG_PERL_CORE=""
 CONFIG_PERL_LIB=""
+# CONFIG_LUA_BINDINGS is not set
+CONFIG_LUA_CORE=""
 
 #
 # Samples
@@ -89,6 +103,7 @@ CONFIG_PERL_LIB=""
 # CONFIG_VBNET_SAMPLES is not set
 # CONFIG_JAVA_SAMPLES is not set
 # CONFIG_PERL_SAMPLES is not set
+# CONFIG_LUA_SAMPLES is not set
 
 #
 # BigInt Options
diff --git a/libs/axtls/patches/001-opt_flags.patch b/libs/axtls/patches/001-opt_flags.patch
index a27b3a4491..6a33deece5 100644
--- a/libs/axtls/patches/001-opt_flags.patch
+++ b/libs/axtls/patches/001-opt_flags.patch
@@ -1,7 +1,7 @@
-diff -ruN axTLS-0.95-old/config/makefile.conf axTLS-0.95-new/config/makefile.conf
---- axTLS-0.95-old/config/makefile.conf	2006-02-28 02:50:28.000000000 +0100
-+++ axTLS-0.95-new/config/makefile.conf	2006-05-18 22:24:02.000000000 +0200
-@@ -87,20 +87,23 @@
+diff -pruN axTLS.orig/config/makefile.conf axTLS/config/makefile.conf
+--- axTLS.orig/config/makefile.conf	2009-05-20 15:27:07.425684975 +0200
++++ axTLS/config/makefile.conf	2009-05-20 15:29:51.697489368 +0200
+@@ -105,20 +105,23 @@ endif
  endif
  
  ifdef CONFIG_DEBUG
diff --git a/libs/axtls/patches/002-strip.patch b/libs/axtls/patches/002-strip.patch
deleted file mode 100644
index 95570b697a..0000000000
--- a/libs/axtls/patches/002-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN axTLS-0.95-old/httpd/Makefile axTLS-0.95-new/httpd/Makefile
---- axTLS-0.95-old/httpd/Makefile	2006-02-28 02:50:28.000000000 +0100
-+++ axTLS-0.95-new/httpd/Makefile	2006-05-18 22:24:02.000000000 +0200
-@@ -87,7 +87,7 @@
- 	$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
- ifndef CONFIG_DEBUG
- ifndef CONFIG_PLATFORM_SOLARIS
--	strip --remove-section=.comment $(TARGET)
-+	$(STRIP) --remove-section=.comment $(TARGET)
- endif
- endif
- else    # Win32