Changeset 2015

Timestamp:

02/16/07 15:57:14 (2 years ago)

Author:

wbx

Message:

sync axtls with 1.0

Files:

• trunk/freewrt/package/Config.in (modified) (2 diffs)
• trunk/freewrt/package/axtls/Config.in (modified) (1 diff)
• trunk/freewrt/package/axtls/Config.in.lib (added)
• trunk/freewrt/package/axtls/Makefile (modified) (3 diffs)
• trunk/freewrt/package/axtls/files/config (modified) (4 diffs)
• trunk/freewrt/package/axtls/ipkg/awhttpd.control (deleted)
• trunk/freewrt/package/axtls/ipkg/axhttpd.control (added)
• trunk/freewrt/package/axtls/patches/001-opt_flags.patch (deleted)
• trunk/freewrt/package/axtls/patches/patch-httpd_main_c (added)

trunk/freewrt/package/Config.in

@@ -92 +92 @@
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
+source "package/axtls/Config.in"
-source "package/bind/Config.in"
-source "package/bitlbee/Config.in"
@@ -247 +248 @@
-source "package/apr/Config.in"
-source "package/apr-util/Config.in"
-
+.lib
-source "package/cgilib/Config.in"
-source "package/glib/Config.in"

trunk/freewrt/package/axtls/Config.in

@@ -1 @@
-#menu "axtls............................. Embedded client/server TLSv1 SSL library"
-
-config FWRT_COMPILE_AXTLS
-        tristate
-        default n
-
+ || FWRT_PACKAGE_AXHTTPD
-
-LIBAXTLS
-"libaxtls.......................... Embedded client/server TLSv1 SSL library
+AXHTTPD
+  "axhttpd........................... small embedded webserver
-        tristate
-        default n
-        select FWRT_COMPILE_AXTLS
+        select FWRT_PACKAGE_LIBAXTLS
-        help
-Embedded client/server TLSv1 SSL library
+axhttpd is a small embedded web server using the axTLS library.
-
-          http://www.axtls.co.nr/
+          
-
-config FWRT_PACKAGE_AWHTTPD
-        prompt   "  awhttpd....................... Anti-Web webserver"
-        tristate
-        default n
-        depends FWRT_PACKAGE_LIBAXTLS
-        help
-          Anti-Web is a light-weight, single-process, non-threaded webserver
-          that emphasizes simplicity, efficiency, and security.
-
-          http://www.axtls.co.nr/
-
-#endmenu

trunk/freewrt/package/axtls/Makefile

@@ -8 +8 @@
-
-PKG_NAME:=              axtls
-0.95
+1.1.0
-PKG_RELEASE:=           1
-cd887f379f303dd3ef691d8641307f0
+4a834edc93f46fdca4f9c93ec665376
-PKG_SOURCE:=            axTLS-${PKG_VERSION}.tar.gz
-
-
+
-WRKDIST=                ${WRKDIR}/axTLS
-
@@ -19 +18 @@
-
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-WHTTPD,awhttpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}
+XHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)
-
-BUILD_STYLE=            auto
@@ -34 +33 @@
-        # axtls library
-        ${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib
-{CP} ${WRKBUILD}/libaxtls.so ${IDIR_LIBAXTLS}
+(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)
-        # awhttpd server
-W
-{WRKBUILD}/awhttpd ${IDIR_AWHTTPD}
+X
+(WRKBUILD)/_stage/axhttpd $(IDIR_AXHTTPD)
-
-include ${TOPDIR}/mk/pkg-bottom.mk

trunk/freewrt/package/axtls/files/config

@@ -11 +11 @@
-# General Configuration
-#
-
-
-
+
+
-# CONFIG_VISUAL_STUDIO_6_0 is not set
+# 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=""
-CONFIG_EXTRA_LDFLAGS_OPTIONS=""
@@ -24 +27 @@
-# CONFIG_SSL_SERVER_ONLY is not set
-# CONFIG_SSL_CERT_VERIFICATION is not set
-
-
+
+
+
-# CONFIG_SSL_PROT_LOW is not set
-CONFIG_SSL_PROT_MEDIUM=y
-# CONFIG_SSL_PROT_HIGH is not set
-CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
-CONFIG_SSL_HAS_PEM=y
-CONFIG_SSL_USE_PKCS12=y
@@ -35 +40 @@
-CONFIG_X509_MAX_CA_CERTS=4
-CONFIG_SSL_MAX_CERTS=2
+# CONFIG_SSLCTX_MUTEXING is not set
+CONFIG_USE_DEV_URANDOM=y
-# CONFIG_WIN32_USE_CRYPTO_LIB is not set
-# CONFIG_PERFORMANCE_TESTING is not set
-# CONFIG_SSL_TEST is not set
-W
+X
-
-#
-w
+x
-#
-# CONFIG_HTTP_STATIC_BUILD is not set
-CONFIG_HTTP_HAS_SSL=y
-CONFIG_HTTP_HTTPS_PORT=443
-
-
-
-
+
+
+
-CONFIG_HTTP_TIMEOUT=0
-
-
-
-
-
+
+
+
-# CONFIG_HTTP_PERM_CHECK is not set
-# CONFIG_HTTP_HAS_IPV6 is not set
-
-
+
+
+
-
-#
@@ -90 +94 @@
-# CONFIG_BIGINT_MONTGOMERY is not set
-CONFIG_BIGINT_BARRETT=y
-
+
-# CONFIG_BIGINT_KARATSUBA is not set
-MUL_KARATSUBA_THRESH=0
-SQU_KARATSUBA_THRESH=0
-
-
+
+
-# CONFIG_BIGINT_CHECK_ON is not set