From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/axtls/Makefile | 23 ++++++++++++--------- package/axtls/files/axhttpd.init | 3 ++- package/axtls/files/axhttpd.postinst | 3 +++ package/axtls/files/config | 34 ++++++++++++++++++++++++-------- package/axtls/ipkg/axhttpd.control | 5 ----- package/axtls/ipkg/axhttpd.postinst | 3 --- package/axtls/ipkg/libaxtls.control | 5 ----- package/axtls/patches/patch-httpd_main_c | 21 -------------------- 8 files changed, 45 insertions(+), 52 deletions(-) create mode 100644 package/axtls/files/axhttpd.postinst delete mode 100644 package/axtls/ipkg/axhttpd.control delete mode 100644 package/axtls/ipkg/axhttpd.postinst delete mode 100644 package/axtls/ipkg/libaxtls.control delete mode 100644 package/axtls/patches/patch-httpd_main_c (limited to 'package/axtls') diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 530ef0b6a..7f4f76097 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -6,17 +6,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= axtls -PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 8 -PKG_MD5SUM:= 4a834edc93f46fdca4f9c93ec665376e +PKG_VERSION:= 1.2.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958 +PKG_DESCR:= small embedded webserver +PKG_SECTION:= net +PKG_DEPENDS:= libaxtls +PKG_URL:= http://axtls.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} + +PKG_DESCR_1:= small tls library +PKG_SECTION_1:= libs + DISTFILES:= axTLS-${PKG_VERSION}.tar.gz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} WRKDIST= ${WRKDIR}/axTLS include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) BUILD_STYLE= auto XAKE_FLAGS+= STRIP='' \ @@ -33,11 +41,8 @@ do-install: ${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib $(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/ # awhttpd server - ${INSTALL_DIR} ${IDIR_AXHTTPD}/etc/init.d ${INSTALL_DIR} ${IDIR_AXHTTPD}/www ${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin ${INSTALL_BIN} $(WRKBUILD)/_stage/axhttpd $(IDIR_AXHTTPD)/usr/sbin/ - $(INSTALL_BIN) ./files/axhttpd.init \ - $(IDIR_AXHTTPD)/etc/init.d/axhttpd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init index 70ccc48d5..bc11e0b4c 100644 --- a/package/axtls/files/axhttpd.init +++ b/package/axtls/files/axhttpd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 80 +#PKG axhttpd +#INIT 80 . /etc/rc.conf case $1 in diff --git a/package/axtls/files/axhttpd.postinst b/package/axtls/files/axhttpd.postinst new file mode 100644 index 000000000..d19a62e8a --- /dev/null +++ b/package/axtls/files/axhttpd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf axhttpd diff --git a/package/axtls/files/config b/package/axtls/files/config index caa5dc35a..ed4e64806 100644 --- a/package/axtls/files/config +++ b/package/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=y -# CONFIG_VISUAL_STUDIO_6_0 is not set +# CONFIG_STRIP_UNWANTED_SECTIONS 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="" @@ -33,15 +31,23 @@ CONFIG_SSL_ENABLE_CLIENT=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 CONFIG_SSL_EXPIRY_TIME=24 CONFIG_X509_MAX_CA_CERTS=4 CONFIG_SSL_MAX_CERTS=2 -# CONFIG_SSLCTX_MUTEXING is not set +# 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_AXHTTPD=y @@ -50,17 +56,26 @@ CONFIG_AXHTTPD=y # Axhttpd Configuration # # CONFIG_HTTP_STATIC_BUILD is not set +CONFIG_HTTP_PORT=80 CONFIG_HTTP_HTTPS_PORT=443 CONFIG_HTTP_SESSION_CACHE_SIZE=5 CONFIG_HTTP_WEBROOT="/www" -CONFIG_HTTP_PORT=80 CONFIG_HTTP_TIMEOUT=0 + +# +# CGI +# CONFIG_HTTP_HAS_CGI=y -CONFIG_HTTP_CGI_EXTENSION=".cgi" +CONFIG_HTTP_CGI_EXTENSIONS=".lua,.lp" +# 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=y -# CONFIG_HTTP_PERM_CHECK is not set +CONFIG_HTTP_HAS_AUTHORIZATION=y # CONFIG_HTTP_HAS_IPV6 is not set -CONFIG_HTTP_ALL_MIME_TYPES=y +CONFIG_HTTP_ENABLE_DIFFERENT_USER=y +CONFIG_HTTP_USER="axhttp" CONFIG_HTTP_VERBOSE=y CONFIG_HTTP_IS_DAEMON=y @@ -76,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 @@ -86,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/package/axtls/ipkg/axhttpd.control b/package/axtls/ipkg/axhttpd.control deleted file mode 100644 index e19f3fc4c..000000000 --- a/package/axtls/ipkg/axhttpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: axhttpd -Priority: optional -Section: net -Depends: libaxtls -Description: small embedded webserver diff --git a/package/axtls/ipkg/axhttpd.postinst b/package/axtls/ipkg/axhttpd.postinst deleted file mode 100644 index d19a62e8a..000000000 --- a/package/axtls/ipkg/axhttpd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf axhttpd diff --git a/package/axtls/ipkg/libaxtls.control b/package/axtls/ipkg/libaxtls.control deleted file mode 100644 index b9c9d4be4..000000000 --- a/package/axtls/ipkg/libaxtls.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libaxtls -Priority: optional -Section: libs -Description: an embedded client/server TLSv1 SSL implementation -Depends: diff --git a/package/axtls/patches/patch-httpd_main_c b/package/axtls/patches/patch-httpd_main_c deleted file mode 100644 index b4017803e..000000000 --- a/package/axtls/patches/patch-httpd_main_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id$ ---- axTLS.orig/httpd/main.c 2007-01-31 22:35:53.000000000 +0100 -+++ axTLS/httpd/main.c 2007-02-10 12:15:20.000000000 +0100 -@@ -98,11 +98,12 @@ int main(int argc, char *argv[]) - WSADATA wsaData; - WSAStartup(wVersionRequested,&wsaData); - #else -- if (getuid() == 0) /* change our uid if we are root */ -- { -- setgid(32767); -- setuid(32767); -- } -+ /* we can't bind to port 80/443 if we are nobody ?! */ -+ //if (getuid() == 0) /* change our uid if we are root */ -+ //{ -+ // setgid(32767); -+ // setuid(32767); -+ //} - - signal(SIGQUIT, die); - signal(SIGPIPE, SIG_IGN); -- cgit v1.2.3