update axtls to 1.1.4, rename awhttpd to axhttpd, (un)install dev files

SVN-Revision: 6894

diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile
index 591af371bd67bbfc471b6063146e969c7ee575e0..778a38b1c3391ccb77cf3db82b8fb9b925112f11 100644 (file)
--- a/libs/axtls/Makefile
+++ b/libs/axtls/Makefile
@@ -9,32 +9,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=axtls
-PKG_VERSION:=1.01
+PKG_VERSION:=1.1.4
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/axTLS
 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/axtls http://www.leroc.com.au/axTLS/
-PKG_MD5SUM:=ff71cb64234cad020f92bffa534ab2b8
+PKG_MD5SUM:=baf34d35459c6cb15e2c3a683b3233c2
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/axTLS
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaxtls
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Embedded client/server TLSv1 SSL library
-  DEPENDS:=libgdbm
-  DESCRIPTION:=Embedded client/server TLSv1 SSL library.
   URL:=http://sourceforge.net/projects/axtls
 endef
 
-define Package/awhttpd
+define Package/axhttpd
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libaxtls
-  TITLE:=Anti-Web webserver
-  DESCRIPTION:=Anti-Web webserver.
+  TITLE:=A small embedded web server using the axTLS library
   URL:=http://www.axtls.co.nr/
 endef
 
@@ -46,18 +45,36 @@ endef
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
-               OPT_CFLAGS="$(TARGET_CFLAGS)" OPT_LDFLAGS=""
+               STRIP="/bin/true" \
+               OPT_CFLAGS="$(TARGET_CFLAGS)" OPT_LDFLAGS="" \
+               all
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               PREFIX="$(PKG_INSTALL_DIR)/usr" \
+               install
+endef
+
+define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(STAGING_DIR)/usr/lib/
+endef
+
+define Build/UninstallDev
+       rm -rf \
+               $(STAGING_DIR)/usr/include/axTLS \
+               $(STAGING_DIR)/usr/lib/libaxtls.{a,so*}
 endef
 
 define Package/libaxtls/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/libaxtls.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.so.* $(1)/usr/lib/
 endef
 
-define Package/awhttpd/install
+define Package/axhttpd/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/awhttpd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/axhttpd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,libaxtls))
-$(eval $(call BuildPackage,awhttpd))
+$(eval $(call BuildPackage,axhttpd))

diff --git a/libs/axtls/files/config b/libs/axtls/files/config
index 3477096ae104f171490b1ef8eb755abb85177da5..a9b54f5e833aec9e92d91ad778d16fd7e78d9340 100644 (file)
--- a/libs/axtls/files/config
+++ b/libs/axtls/files/config
@@ -10,6 +10,7 @@ CONFIG_PLATFORM_LINUX=y
 #
 # General Configuration
 #
+PREFIX="/usr"
 # CONFIG_DEBUG is not set
 # CONFIG_VISUAL_STUDIO_6_0 is not set
 # CONFIG_VISUAL_STUDIO_7_0 is not set
@@ -38,30 +39,31 @@ CONFIG_SSL_USE_PKCS12=y
 CONFIG_SSL_EXPIRY_TIME=24
 CONFIG_X509_MAX_CA_CERTS=4
 CONFIG_SSL_MAX_CERTS=2
+# CONFIG_SSL_CTX_MUTEXING is not set
 CONFIG_USE_DEV_URANDOM=y
 # CONFIG_WIN32_USE_CRYPTO_LIB is not set
+# CONFIG_OPENSSL_COMPATIBLE is not set
 # CONFIG_PERFORMANCE_TESTING is not set
 # CONFIG_SSL_TEST is not set
-CONFIG_AWHTTPD=y
+CONFIG_AXHTTPD=y
 
 #
-# Awhttpd Configuration
+# Axhttpd Configuration
 #
 # CONFIG_HTTP_STATIC_BUILD is not set
-CONFIG_HTTP_HAS_SSL=y
+CONFIG_HTTP_PORT=0
 CONFIG_HTTP_HTTPS_PORT=443
-CONFIG_STANDARD_AWHTTPD=y
+CONFIG_HTTP_SESSION_CACHE_SIZE=5
 CONFIG_HTTP_WEBROOT=""
-CONFIG_HTTP_PORT=0
-# CONFIG_HTTP_USE_TIMEOUT is not set
 CONFIG_HTTP_TIMEOUT=0
-CONFIG_HTTP_INITIAL_SLOTS=0
-CONFIG_HTTP_MAX_USERS=0
 # CONFIG_HTTP_HAS_CGI is not set
-CONFIG_HTTP_CGI_EXTENSION=""
+CONFIG_HTTP_CGI_EXTENSIONS=""
 # CONFIG_HTTP_DIRECTORIES is not set
-# CONFIG_HTTP_PERM_CHECK 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_VERBOSE is not set
 # CONFIG_HTTP_IS_DAEMON is not set