diff options
75 files changed, 1429 insertions, 247 deletions
diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 599e814ce..6cb716b3c 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -4,11 +4,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= axtls -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.4.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= b2cdafaa93c033cd4f3ebfca2c7e66b4 -PKG_DESCR:= small embedded webserver -PKG_SECTION:= net/security +PKG_MD5SUM:= 6d519bc3b5f20faa6ef8d423f5062241 +PKG_DESCR:= small embedded webserver with TLS +PKG_SECTION:= www PKG_DEPENDS:= libaxtls PKG_URL:= http://axtls.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init index a7e25938a..fd662f132 100644 --- a/package/axtls/files/axhttpd.init +++ b/package/axtls/files/axhttpd.init @@ -17,7 +17,7 @@ start) /usr/sbin/axhttpd >>/var/log/axhttpd.access ;; stop) - kill $(pgrep -f /usr/sbin/axhttpd) + kill $(pgrep -f axhttpd) ;; restart) sh $0 stop diff --git a/package/axtls/files/config b/package/axtls/files/config index a37878b3a..c2d8c2ffb 100644 --- a/package/axtls/files/config +++ b/package/axtls/files/config @@ -14,8 +14,10 @@ CONFIG_DEBUG=y # 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_10_0 is not set CONFIG_VISUAL_STUDIO_7_0_BASE="" CONFIG_VISUAL_STUDIO_8_0_BASE="" +CONFIG_VISUAL_STUDIO_10_0_BASE="" CONFIG_EXTRA_CFLAGS_OPTIONS="" CONFIG_EXTRA_LDFLAGS_OPTIONS="" @@ -70,8 +72,8 @@ CONFIG_HTTP_HAS_CGI=y 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_CGI_LAUNCHER="/usr/bin/cgi" CONFIG_HTTP_DIRECTORIES=y CONFIG_HTTP_HAS_AUTHORIZATION=y # CONFIG_HTTP_HAS_IPV6 is not set diff --git a/package/easy-rsa/Makefile b/package/easy-rsa/Makefile new file mode 100644 index 000000000..9b350cd92 --- /dev/null +++ b/package/easy-rsa/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= easy-rsa +PKG_VERSION:= 2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0937fb2f91d534d4fb961e047f714946 +PKG_DESCR:= openssl ca scripts +PKG_SECTION:= crypto +PKG_DEPENDS:= openssl-util +PKG_URL:= https://github.com/OpenVPN/easy-rsa +PKG_SITES:= http://openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,EASY_RSA,easy-rsa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +easy-rsa-install: + ${INSTALL_DIR} $(IDIR_EASY_RSA)/usr/sbin \ + $(IDIR_EASY_RSA)/etc/easy-rsa/keys + touch $(IDIR_EASY_RSA)/etc/easy-rsa/keys/index.txt + $(CP) ./files/serial $(IDIR_EASY_RSA)/etc/easy-rsa/keys + $(CP) $(WRKBUILD)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} \ + $(IDIR_EASY_RSA)/usr/sbin + ${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl-1.0.0.cnf \ + $(IDIR_EASY_RSA)/etc/easy-rsa/openssl.cnf + ${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars \ + $(IDIR_EASY_RSA)/etc/easy-rsa/vars + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openvpn/files/serial b/package/easy-rsa/files/serial index 8a0f05e16..8a0f05e16 100644 --- a/package/openvpn/files/serial +++ b/package/easy-rsa/files/serial diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_build-dh b/package/easy-rsa/patches/patch-easy-rsa_2_0_build-dh index 771800a17..771800a17 100644 --- a/package/openvpn/patches/patch-easy-rsa_2_0_build-dh +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_build-dh diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_clean-all b/package/easy-rsa/patches/patch-easy-rsa_2_0_clean-all index 03df1d1c9..03df1d1c9 100644 --- a/package/openvpn/patches/patch-easy-rsa_2_0_clean-all +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_clean-all diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_list-crl b/package/easy-rsa/patches/patch-easy-rsa_2_0_list-crl index 66f5d764d..66f5d764d 100644 --- a/package/openvpn/patches/patch-easy-rsa_2_0_list-crl +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_list-crl diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf b/package/easy-rsa/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf index 9dd542d8a..9dd542d8a 100644 --- a/package/openvpn/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_pkitool b/package/easy-rsa/patches/patch-easy-rsa_2_0_pkitool index 87b0c33db..87b0c33db 100644 --- a/package/openvpn/patches/patch-easy-rsa_2_0_pkitool +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_pkitool diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_revoke-full b/package/easy-rsa/patches/patch-easy-rsa_2_0_revoke-full index ac66c4bb9..ac66c4bb9 100644 --- a/package/openvpn/patches/patch-easy-rsa_2_0_revoke-full +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_revoke-full diff --git a/package/easy-rsa/patches/patch-easy-rsa_2_0_vars b/package/easy-rsa/patches/patch-easy-rsa_2_0_vars new file mode 100644 index 000000000..964c6bc6a --- /dev/null +++ b/package/easy-rsa/patches/patch-easy-rsa_2_0_vars @@ -0,0 +1,20 @@ +--- easy-rsa-2.0.orig/easy-rsa/2.0/vars 2013-08-18 10:11:06.000000000 +0200 ++++ easy-rsa-2.0/easy-rsa/2.0/vars 2013-08-18 10:38:50.635782024 +0200 +@@ -12,7 +12,7 @@ + # This variable should point to + # the top level of the easy-rsa + # tree. +-export EASY_RSA="`pwd`" ++export EASY_RSA="/etc/easy-rsa" + + # + # This variable should point to +@@ -26,7 +26,7 @@ export GREP="grep" + # This variable should point to + # the openssl.cnf file included + # with easy-rsa. +-export KEY_CONFIG=`$EASY_RSA/whichopensslcnf $EASY_RSA` ++export KEY_CONFIG=/etc/easy-rsa/openssl.cnf + + # Edit this variable to point to + # your soon-to-be-created key diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 2ebad3fa9..8951a1462 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.0.21 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7480dff7115e5af85215893c06b3ac5c +PKG_VERSION:= 3.2.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7c0dd4f77dc70c64d2f385aeb2df4157 PKG_DESCR:= GNU TLS library PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp PKG_BUILDDEP:= libgcrypt liblzo libtasn1 zlib ncurses libnettle PKG_URL:= http://www.gnu.org/software/gnutls/ -PKG_SITES:= ${MASTER_SITE_GNU:=gnutls/} +PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/ PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL PKGSD_GNUTLS_UTILS:= GNU TLS utilities @@ -43,8 +43,7 @@ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_LDFLAGS+= -pthread -L$(STAGING_DIR)/usr/lib64 CONFIGURE_ARGS+= --disable-rpath \ --without-libz-prefix \ - --without-p11-kit \ - --with-libnettle-prefix="$(STAGING_DIR)/usr" + --without-p11-kit CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar' post-install: diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 1647234a5..4c3337a08 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -76,6 +76,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes post-extract: + (cd $(WRKBUILD);patch -p1 < $(TOPDIR)/package/heimdal/files/patch-lib_asn1_Makefile.in) (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ diff --git a/package/heimdal/files/patch-lib_asn1_Makefile.in b/package/heimdal/files/patch-lib_asn1_Makefile.in new file mode 100644 index 000000000..490b6057f --- /dev/null +++ b/package/heimdal/files/patch-lib_asn1_Makefile.in @@ -0,0 +1,12 @@ +diff -Nur heimdal-1.5.2.orig/lib/asn1/Makefile.in heimdal-1.5.2/lib/asn1/Makefile.in +--- heimdal-1.5.2.orig/lib/asn1/Makefile.in 2012-01-11 14:04:24.000000000 +0100 ++++ heimdal-1.5.2/lib/asn1/Makefile.in 2013-08-20 08:22:27.576686750 +0200 +@@ -457,7 +457,7 @@ + top_srcdir = @top_srcdir@ + SUFFIXES = .et .h .x .z .hx .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include +-AM_CPPFLAGS = $(INCLUDES_roken) ++AM_CPPFLAGS = $(INCLUDES_roken) -I$(top_builddir)/lib/com_err + @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME + AM_CFLAGS = $(WFLAGS) + CP = cp diff --git a/package/heimdal/patches/patch-tools_krb5-config.in b/package/heimdal/patches/patch-tools_krb5-config.in new file mode 100644 index 000000000..76f1ac7e5 --- /dev/null +++ b/package/heimdal/patches/patch-tools_krb5-config.in @@ -0,0 +1,20 @@ +diff -Nur heimdal-1.5.2.orig/tools/krb5-config.in heimdal-1.5.2/tools/krb5-config.in +--- heimdal-1.5.2.orig/tools/krb5-config.in 2012-01-10 22:53:51.000000000 +0100 ++++ heimdal-1.5.2/tools/krb5-config.in 2013-08-20 09:44:59.580220171 +0200 +@@ -120,7 +120,6 @@ + fi + + if test "$do_libs" = "yes"; then +- lib_flags="-L${libdir}" + case $library in + gssapi) + lib_flags="$lib_flags -lgssapi -lheimntlm" +@@ -142,7 +141,7 @@ + echo $lib_flags + fi + if test "$do_cflags" = "yes"; then +- echo "-I${includedir} @INCLUDE_hcrypto@" ++ echo "@INCLUDE_hcrypto@" + fi + + exit 0 diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 4202c26f8..21e38f214 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,12 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 3.4.0 +PKG_VERSION:= 3.10.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 879d3fac4e90809598b2864ec4a0cbf8 +PKG_MD5SUM:= 45fb5427fc723a0001c72b92c931ba02 PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= route PKG_BUILDDEP:= iptables libnl linux-atm +PKG_DEPENDS:= libnl PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/ diff --git a/package/iproute2/patches/patch-bridge_fdb_c b/package/iproute2/patches/patch-bridge_fdb_c new file mode 100644 index 000000000..e8e899e78 --- /dev/null +++ b/package/iproute2/patches/patch-bridge_fdb_c @@ -0,0 +1,10 @@ +--- iproute2-3.10.0.orig/bridge/fdb.c 2013-07-16 19:06:36.000000000 +0200 ++++ iproute2-3.10.0/bridge/fdb.c 2013-08-17 15:23:48.127356022 +0200 +@@ -20,6 +20,7 @@ + #include <linux/if_ether.h> + #include <linux/neighbour.h> + #include <string.h> ++#include <limits.h> + + #include "libnetlink.h" + #include "br_common.h" diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure deleted file mode 100644 index 0d7bea8ae..000000000 --- a/package/iproute2/patches/patch-configure +++ /dev/null @@ -1,75 +0,0 @@ - - use the compiler passed in $CC - - predefine iptables modules dir, since the check would - always fail (cause of absolute search paths) and OpenADK - (for now) doesn't compile iptables with shared objects - - do not discard compiler output from tests, they're useful - for debugging - ---- iproute2-3.3.0.orig/configure 2012-03-20 01:27:12.000000000 +0100 -+++ iproute2-3.3.0/configure 2012-03-22 20:48:53.022784090 +0100 -@@ -17,7 +17,7 @@ int main(int argc, char **argv) { - return 0; - } - EOF --gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 -+$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "TC_CONFIG_ATM:=y" >>Config -@@ -51,7 +51,7 @@ int main(int argc, char **argv) - - EOF - --if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 -+if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 - then - echo "TC_CONFIG_XT:=y" >>Config - echo "using xtables" -@@ -88,7 +88,7 @@ int main(int argc, char **argv) { - } - - EOF --gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 - - if |