diff options
48 files changed, 495 insertions, 136 deletions
@@ -26,7 +26,6 @@ source "target/config/Config.in.arch" source "target/config/Config.in.system" source "target/config/Config.in.subsystem" source "target/config/Config.in.tc" -source "target/config/Config.in.mips" source "target/config/Config.in.xtensa" source "target/config/Config.in.qemu" source "target/config/Config.in.qemuopts" @@ -110,6 +109,7 @@ config ADK_VENDOR Vendor string is used for toolchain. source "target/config/Config.in.endian" +source "target/config/Config.in.mips" source "target/config/Config.in.fpu" source "target/config/Config.in.float" source "target/config/Config.in.binfmt" diff --git a/mk/vars.mk b/mk/vars.mk index 3dc51948a..92ed74075 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -265,7 +265,7 @@ TARGET_CXXFLAGS+= -fno-unwind-tables -fno-asynchronous-unwind-tables endif ifeq ($(ADK_TARGET_ARCH_ARM),y) -ifeq ($(ADK_TARGET_CPU_WITH_NEON),y) +ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) TARGET_CFLAGS+= -funsafe-math-optimizations TARGET_CXXFLAGS+= -funsafe-math-optimizations endif diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index cd28ee7a2..a0bf5a984 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -28,7 +28,7 @@ XAKE_FLAGS+= CC="$(TARGET_CC)" TOOL_PREFIX="$(TARGET_CROSS)" \ CFLAGS="$(TARGET_CFLAGS) -Wall" \ OSNAME="Linux" prefix="/usr" -post-install: +aircrack-ng-install: $(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/bin $(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng \ diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 8fd42f7cd..9e556d80a 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -19,7 +19,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${ADK_TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \ --with-libevent=${STAGING_TARGET_DIR}/usr \ @@ -28,7 +28,7 @@ MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS}" \ INCLS="-I. ${TARGET_CPPFLAGS}" \ LIBS="-lpcap -ldnet -levent" -post-install: +arpd-install: ${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/arpd ${IDIR_ARPD}/usr/sbin/ diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index 9fae71e91..ac66abe74 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RE CONFIGURE_ARGS+= --libdir=/lib -post-install: +bluez-firmware-install: ${INSTALL_DIR} ${IDIR_BLUEZ_FIRMWARE}/lib/firmware ${CP} ${WRKINST}/lib/firmware/BCM* \ ${IDIR_BLUEZ_FIRMWARE}/lib/firmware diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile index e53290628..e33490ef1 100644 --- a/package/ca-certificates/Makefile +++ b/package/ca-certificates/Makefile @@ -24,7 +24,7 @@ $(eval $(call PKG_template,CA_CERTIFICATES,ca-certificates,${PKG_VERSION}-${PKG_ CONFIG_STYLE:= manual -post-install: +ca-certificates-install: ifeq (${ADK_PACKAGE_CA_CERTIFICATES_SMALL},y) ${INSTALL_DIR} ${IDIR_CA_CERTIFICATES}/etc/ssl ${INSTALL_DATA} ./extra/cert.pem ${IDIR_CA_CERTIFICATES}/etc/ssl/ diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 94d33ec8c..1d80f4097 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --enable-orig-ip \ --with-proxyuser=proxy \ --with-proxygroup=proxy -post-install: +dansguardian-install: ${INSTALL_DIR} ${IDIR_DANSGUARDIAN}/usr/sbin \ ${IDIR_DANSGUARDIAN}/etc/dansguardian \ ${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index 3d1fff97b..ef7b77431 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -17,9 +17,10 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DHCP_FORWARDER,dhcp-forwarder,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-dietlibc +CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes XAKE_FLAGS+= cfg_filename="/etc/dhcp-fwd.conf" -post-install: +dhcp-forwarder-install: ${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin \ ${IDIR_DHCP_FORWARDER}/etc ${INSTALL_DATA} ${WRKBUILD}/contrib/dhcp-fwd.conf \ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 83e3c66e0..539e89125 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -62,15 +62,14 @@ CONFIGURE_ARGS+= --enable-elf-shlibs endif CONFIGURE_ARGS+= --disable-rpath \ - --enable-libuuid \ --disable-uuidd \ - --enable-libblkid \ --disable-testio-debug \ + --disable-defrag \ --disable-debugfs \ --enable-verbose-makecmds \ - --disable-defrag + --enable-libblkid \ + --enable-libuuid TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include -#TARGET_LDFLAGS+= -L${WRKSRC}/lib -L${WRKSRC}/lib/ext2fs MAKE_FLAGS+= BUILD_CC="$(HOST_CC)" \ BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \ BUILD_LDFLAGS="$(HOST_LDFLAGS)" diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 4a51b68cd..16e7b2ea8 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 3.0.2 -PKG_RELEASE:= 3 -PKG_HASH:= 687f6ca9870709bd433c044947225e365f5099499abba51419bf77134223713b +PKG_VERSION:= 3.0.8 +PKG_RELEASE:= 1 +PKG_HASH:= c27252d7a86ba252904612d9b1f90e846f3ef1f4afee6a748f5287b730e87e3a PKG_DESCR:= flexible radius server PKG_SECTION:= net/radius -PKG_DEPENDS:= libltdl libopenssl libpthread libpcre -PKG_BUILDDEP:= libtool openssl samba pcre +PKG_DEPENDS:= libltdl libopenssl libpthread libpcre libtalloc +PKG_BUILDDEP:= libtool openssl pcre talloc PKG_URL:= http://www.freeradius.org/ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ @@ -136,6 +136,10 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,)) AUTOTOOL_STYLE:= autoreconf XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ + --libdir=/usr/lib/freeradius \ + --libexecdir=/usr/lib/freeradius \ + --disable-openssl-version-check \ + --with-execinfo-include-dir=/dev/null \ --with-openssl-includes=${STAGING_TARGET_DIR}/usr/include \ --with-openssl-libraries=${STAGING_TARGET_DIR}/usr/lib \ --with-system-libltld \ @@ -160,6 +164,7 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --without-rlm_perl \ --without-rlm_python \ --without-rlm_radutmp \ + --without-rlm_rest \ --without-rlm_ruby \ --without-rlm_smb \ --without-rlm_sqlcounter \ @@ -173,15 +178,18 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --without-rlm_unix \ --without-rlm_eap_ikev2 \ --without-rlm_eap_tnc \ + --without-rlm_cache_memcached \ --without-rlm_opendirectory \ --without-rlm_sql_firebird \ - --without-rlm_sql_sqlite \ - --libdir=/usr/lib/freeradius \ - --libexecdir=/usr/lib/freeradius + --without-rlm_sql_sqlite +CONFIGURE_ENV+= ax_cv_cc_builtin_choose_expr=yes \ + ax_cv_cc_builtin_types_compatible_p=yes \ + ax_cv_cc_builtin_bswap64=yes \ + ax_cv_cc_bounded_attribute=yes FAKE_FLAGS+= R="${WRKINST}" \ INSTALLSTRIP="" -post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} +freeradius-server-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius ${CP} ./files/users ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ ${INSTALL_DATA} ./files/radiusd.conf \ diff --git a/package/freeradius-server/patches/patch-acinclude_m4 b/package/freeradius-server/patches/patch-acinclude_m4 new file mode 100644 index 000000000..f1cefae77 --- /dev/null +++ b/package/freeradius-server/patches/patch-acinclude_m4 @@ -0,0 +1,164 @@ +--- freeradius-server-3.0.8.orig/acinclude.m4 2015-04-22 19:21:34.000000000 +0200 ++++ freeradius-server-3.0.8/acinclude.m4 2015-05-13 22:13:54.000000000 +0200 +@@ -218,22 +218,22 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` + old_CPPFLAGS="$CPPFLAGS" + smart_include= + dnl # The default directories we search in (in addition to the compilers search path) +-smart_include_dir="/usr/local/include /opt/include" ++dnl smart_include_dir="/usr/local/include /opt/include" + + dnl # Our local versions + _smart_try_dir= + _smart_include_dir= + + dnl # Add variants with the different prefixes and one with no prefix +-for _prefix in $smart_prefix ""; do +- for _dir in $smart_try_dir; do +- _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}" +- done +- +- for _dir in $smart_include_dir; do +- _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}" +- done +-done ++dnl for _prefix in $smart_prefix ""; do ++dnl for _dir in $smart_try_dir; do ++dnl _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}" ++dnl done ++dnl ++dnl for _dir in $smart_include_dir; do ++dnl _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}" ++dnl done ++dnl done + + dnl # + dnl # Try any user-specified directory first otherwise we may pick up +@@ -262,73 +262,73 @@ fi + dnl # + dnl # Try using the default includes (with prefixes). + dnl # +-if test "x$smart_include" = "x"; then +- for _prefix in $smart_prefix; do +- AC_MSG_CHECKING([for ${_prefix}/$1]) +- +- AC_TRY_COMPILE([$2 +- #include <$1>], +- [int a = 1;], +- [ +- smart_include="-isystem ${_prefix}/" +- AC_MSG_RESULT(yes) +- break +- ], +- [ +- smart_include= +- AC_MSG_RESULT(no) +- ]) +- done +-fi ++dnl if test "x$smart_include" = "x"; then ++dnl for _prefix in $smart_prefix; do ++dnl AC_MSG_CHECKING([for ${_prefix}/$1]) ++dnl ++dnl AC_TRY_COMPILE([$2 ++dnl #include <$1>], ++dnl [int a = 1;], ++dnl [ ++dnl smart_include="-isystem ${_prefix}/" ++dnl AC_MSG_RESULT(yes) ++dnl break ++dnl ], ++dnl [ ++dnl smart_include= ++dnl AC_MSG_RESULT(no) ++dnl ]) ++dnl done ++dnl fi + + dnl # + dnl # Try using the default includes (without prefixes). + dnl # + if test "x$smart_include" = "x"; then +- AC_MSG_CHECKING([for $1]) +- +- AC_TRY_COMPILE([$2 ++ AC_MSG_CHECKING([for $1]) ++ ++ AC_TRY_COMPILE([$2 + #include <$1>], +- [int a = 1;], +- [ +- smart_include=" " +- AC_MSG_RESULT(yes) +- break +- ], +- [ +- smart_include= ++ [int a = 1;], ++ [ ++ smart_include=" " ++ AC_MSG_RESULT(yes) ++ break ++ ], ++ [ ++ smart_include= + AC_MSG_RESULT(no) +- ]) ++ ]) + fi + + dnl # + dnl # Try to guess possible locations. + dnl # +-if test "x$smart_include" = "x"; then +- +- for prefix in $smart_prefix; do +- FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}") +- done +- FR_LOCATE_DIR(_smart_include_dir, $1) +- +- for try in $_smart_include_dir; do +- AC_MSG_CHECKING([for $1 in $try]) +- CPPFLAGS="-isystem $try $old_CPPFLAGS" +- AC_TRY_COMPILE([$2 +- #include <$1>], +- [int a = 1;], +- [ +- smart_include="-isystem $try" +- AC_MSG_RESULT(yes) +- break +- ], +- [ +- smart_include= +- AC_MSG_RESULT(no) +- ]) +- done +- CPPFLAGS="$old_CPPFLAGS" +-fi ++dnl if test "x$smart_include" = "x"; then ++dnl ++dnl for prefix in $smart_prefix; do ++dnl FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}") ++dnl done ++dnl FR_LOCATE_DIR(_smart_include_dir, $1) ++dnl ++dnl for try in $_smart_include_dir; do ++dnl AC_MSG_CHECKING([for $1 in $try]) ++dnl CPPFLAGS="-isystem $try $old_CPPFLAGS" ++dnl AC_TRY_COMPILE([$2 ++dnl #include <$1>], ++dnl [int a = 1;], ++dnl [ ++dnl smart_include="-isystem $try" ++dnl AC_MSG_RESULT(yes) ++dnl break ++dnl ], ++dnl [ ++dnl smart_include= ++dnl AC_MSG_RESULT(no) ++dnl ]) ++dnl done ++dnl CPPFLAGS="$old_CPPFLAGS" ++dnl fi + + dnl # + dnl # Found it, set the appropriate variable. diff --git a/package/freeradius-server/patches/patch-configure_ac b/package/freeradius-server/patches/patch-configure_ac index c3901ee32..e107143de 100644 --- a/package/freeradius-server/patches/patch-configure_ac +++ b/package/freeradius-server/patches/patch-configure_ac @@ -1,38 +1,38 @@ ---- freeradius-server-3.0.2.orig/configure.ac 2014-03-21 13:27:25.000000000 +0100 -+++ freeradius-server-3.0.2/configure.ac 2014-04-24 13:10:35.000000000 +0200 -@@ -932,35 +932,6 @@ if test "x$WITH_OPENSSL" = xyes; then - OPENSSL_INCLUDE="-DOPENSSL_NO_KRB5" +--- freeradius-server-3.0.8.orig/configure.ac 2015-04-22 19:21:34.000000000 +0200 ++++ freeradius-server-3.0.8/configure.ac 2015-05-13 12:57:21.000000000 +0200 +@@ -1146,35 +1146,6 @@ if test "x$WITH_OPENSSL" = xyes; then + dnl # + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$OPENSSL_CPPFLAGS $CPPFLAGS" +- +- dnl # +- dnl # Now check that the header versions match the library +- dnl # +- AC_MSG_CHECKING([OpenSSL library and header version consistency]) +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[ +- #include <stdio.h> +- #include <openssl/opensslv.h> +- #include <openssl/crypto.h> +- ]], +- [[ +- printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER); +- if (SSLeay() == OPENSSL_VERSION_NUMBER) { +- return 0; +- } else { +- return 1; +- } +- ]] +- )], +- [ +- AC_MSG_RESULT(yes) +- ], +- [ +- AC_MSG_RESULT(no) +- AC_MSG_FAILURE([OpenSSL library version does not match header version]) +- ] +- ) + CPPFLAGS="$old_CPPFLAGS" fi -- dnl # -- dnl # Now check that the header versions match the library -- dnl # -- AC_MSG_CHECKING([OpenSSL library and header version consistency]) -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [[ -- #include <stdio.h> -- #include <openssl/opensslv.h> -- #include <openssl/crypto.h> -- ]], -- [[ -- if (SSLeay() == OPENSSL_VERSION_NUMBER) { -- return 0; -- } else { -- printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER); -- return 1; -- } -- ]] -- )], -- [ -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- AC_MSG_FAILURE([OpenSSL library version does not match header version]) -- ] -- ) -- - if test "x$OPENSSL_LIBS" = x; then - LIBS=$old_LIBS - LDFLAGS="$old_LDFLAGS" diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk index 957397302..94e30ed46 100644 --- a/package/freeradius-server/patches/patch-scripts_libtool_mk +++ b/package/freeradius-server/patches/patch-scripts_libtool_mk @@ -1,11 +1,11 @@ ---- freeradius-server-3.0.2.orig/scripts/libtool.mk 2014-03-21 13:27:25.000000000 +0100 -+++ freeradius-server-3.0.2/scripts/libtool.mk 2014-04-24 15:58:56.000000000 +0200 +--- freeradius-server-3.0.8.orig/scripts/libtool.mk 2015-04-22 19:21:34.000000000 +0200 ++++ freeradius-server-3.0.8/scripts/libtool.mk 2015-05-13 16:40:27.000000000 +0200 @@ -33,7 +33,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL" ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) $(Q)echo CC jlibtool.c -- $(Q)${CC} $< -o $@ ${DARWIN_CFLAGS} -+ $(Q)${CC_FOR_BUILD} $< -o $@ ${CFLAGS_FOR_BUILD} +- $(Q)${CC} $< -o $@ ++ $(Q)${CC_FOR_BUILD} $< -o $@ clean: jlibtool_clean diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index a2d005dbd..227a77810 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.3.14 +PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 -PKG_HASH:= 0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52 +PKG_HASH:= b422544431bfb5c4e24a605b6c793ee34792cc791c1060562ab46eaf77f3472e PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp PKG_BUILDDEP:= libgcrypt liblzo libtasn1 PKG_BUILDDEP+= zlib ncurses libnettle PKG_URL:= http://www.gnutls.org/ -PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/ +PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/ PKG_LIBNAME:= libgnutls PKG_OPTS:= dev @@ -45,6 +45,7 @@ endif TARGET_LDFLAGS+= -pthread CONFIGURE_ARGS+= --disable-rpath \ + --disable-doc \ --without-libz-prefix \ --without-p11-kit CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar' diff --git a/package/gpu-viv-bin-mx6q/Makefile b/package/imx-gpu-viv/Makefile index 948e97190..df9ba77a4 100644 --- a/package/gpu-viv-bin-mx6q/Makefile +++ b/package/imx-gpu-viv/Makefile @@ -3,11 +3,11 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= gpu-viv-bin-mx6q -PKG_VERSION:= 3.10.17-1.0.0 +PKG_NAME:= imx-gpu-viv +PKG_VERSION:= 5.0.11.p4.4 PKG_RELEASE:= 1 -PKG_HASH:= 7e5a3db22b99740756f408b881691f81c03090256754e44f69369bf039e9cbcf -PKG_DESCR:= imx gpu library (vivante gpu) +PKG_HASH:= 92654c185835e139cc9485806ad184fdac21f4d640ec9d0e493669235d21de9b +PKG_DESCR:= imx vivante gpu library PKG_SECTION:= libs/video PKG_URL:= http://www.freescale.com/ PKG_SITES:= http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ @@ -17,18 +17,18 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-hfp include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,GPU_VIV_BIN_MX6Q,gpu-viv-bin-mx6q,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,IMX_GPU_VIV,imx-gpu-viv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -gpu-viv-bin-mx6q-install: - $(INSTALL_DIR) $(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib - $(CP) $(WRKBUILD)/usr/lib/lib*.so* \ - $(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib +imx-gpu-viv-install: + $(INSTALL_DIR) $(IDIR_IMX_GPU_VIV)/usr/lib + $(CP) $(WRKBUILD)/gpu-core/usr/lib/lib*.so* \ + $(IDIR_IMX_GPU_VIV)/usr/lib $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/include - $(CP) $(WRKBUILD)/usr/include/* \ + $(CP) $(WRKBUILD)/gpu-core/usr/include/* \ $(STAGING_TARGET_DIR)/usr/include include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 572c6826b..330fd453e 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -5,13 +5,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi PKG_VERSION:= 7cc53a9a3da77869d1d5d3d3d9971b4bd1641b50 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv PKG_DEPENDS+= libass libmpeg2 libmad libdbus libglew mesalib PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl -PKG_DEPENDS+= libflac libbz2 libtiff liblzo libopenssl +PKG_DEPENDS+= libflac libbz2 libtiff liblzo libopenssl libnettle PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng libncurses PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd libgtk2 @@ -65,8 +65,8 @@ PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs PKG_BUILDDEP_RASPBERRY_PI2:= bcm28xx-vc -PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q -PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q +PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap imx-gpu-viv +PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap imx-gpu-viv PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6 DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index a16662b92..6bf32d875 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= krb5 -PKG_VERSION:= 1.12.1 +PKG_VERSION:= 1.13.1 PKG_RELEASE:= 1 -PKG_HASH:= 72f1b6c166cb42c0b03814ab7ea10f91926d8a665a5ba1cee430a3f31e62c580 +PKG_HASH:= 4df629fdf97f362cf81edbf38d613b32b492dd88c876cf3aa1c66562f296663e PKG_DESCR:= kerberos server PKG_SECTION:= app/crypto PKG_DEPENDS:= libkrb5 libncurses keyutils libpthread PKG_BUILDDEP:= ncurses gettext-tiny bison-host PKG_URL:= http://web.mit.edu/kerberos/ -PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.12/ +PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.13/ PKG_LIBNAME:= libkrb5 PKG_OPTS:= dev PKG_NOPARALLEL:= 1 @@ -35,8 +35,8 @@ $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGS CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ - --without-system-ss \ --without-system-et \ + --without-system-ss \ --without-system-verto \ --without-tcl CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ diff --git a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c index e29061185..cbe02c798 100644 --- a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c +++ b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c @@ -1,6 +1,6 @@ ---- krb5-1.12.1.orig/src/lib/kadm5/alt_prof.c 2014-01-16 01:44:15.000000000 +0100 -+++ krb5-1.12.1/src/lib/kadm5/alt_prof.c 2014-02-11 18:55:39.000000000 +0100 -@@ -155,7 +155,7 @@ krb5_aprof_get_boolean(krb5_pointer acon +--- krb5-1.13.1.orig/src/lib/kadm5/alt_prof.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/lib/kadm5/alt_prof.c 2015-05-02 15:11:04.883427001 -0500 +@@ -154,7 +154,7 @@ krb5_aprof_get_boolean(krb5_pointer acon krb5_error_code ret; char **values, *valp; int idx; diff --git a/package/krb5/patches/patch-src_lib_krb5_ccache_cc_file_c b/package/krb5/patches/patch-src_lib_krb5_ccache_cc_file_c new file mode 100644 index 000000000..be64a4947 --- /dev/null +++ b/package/krb5/patches/patch-src_lib_krb5_ccache_cc_file_c @@ -0,0 +1,20 @@ +--- krb5-1.13.1.orig/src/lib/krb5/ccache/cc_file.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/lib/krb5/ccache/cc_file.c 2015-05-02 15:20:59.335427054 -0500 +@@ -401,7 +401,7 @@ read_principal(krb5_context context, krb + { + krb5_error_code ret; + struct k5buf buf; +- size_t maxsize; ++ size_t maxsize = 0; + + *princ = NULL; + k5_cc_mutex_assert_locked(context, &((fcc_data *)id->data)->lock); +@@ -1088,7 +1088,7 @@ fcc_next_cred(krb5_context context, krb5 + krb5_fcc_cursor *fcursor = *cursor; + fcc_data *data = id->data; + struct k5buf buf; +- size_t maxsize; ++ size_t maxsize = 0; + + memset(creds, 0, sizeof(*creds)); + k5_cc_mutex_lock(context, &data->lock); diff --git a/package/krb5/patches/patch-src_lib_rpc_bindresvport_c b/package/krb5/patches/patch-src_lib_rpc_bindresvport_c index 925485160..3999aa242 100644 --- a/package/krb5/patches/patch-src_lib_rpc_bindresvport_c +++ b/package/krb5/patches/patch-src_lib_rpc_bindresvport_c @@ -1,6 +1,6 @@ ---- krb5-1.11.3.orig/src/lib/rpc/bindresvport.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/rpc/bindresvport.c 2013-08-14 14:52:36.000000000 +0200 -@@ -37,6 +37,7 @@ +--- krb5-1.13.1.orig/src/lib/rpc/bindresvport.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/lib/rpc/bindresvport.c 2015-05-02 15:11:04.955427001 -0500 +@@ -39,6 +39,7 @@ #include <sys/types.h> #include <sys/errno.h> #include <sys/socket.h> diff --git a/package/krb5/patches/patch-src_plugins_preauth_pkinit_pkinit_crypto_openssl_c b/package/krb5/patches/patch-src_plugins_preauth_pkinit_pkinit_crypto_openssl_c new file mode 100644 index 000000000..41831586e --- /dev/null +++ b/package/krb5/patches/patch-src_plugins_preauth_pkinit_pkinit_crypto_openssl_c @@ -0,0 +1,11 @@ +--- krb5-1.13.1.orig/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-05-02 15:39:13.727426998 -0500 +@@ -3593,7 +3593,7 @@ pkinit_open_session(krb5_context context + { + CK_ULONG i, r; + unsigned char *cp; +- size_t label_len; ++ size_t label_len = 0; + CK_ULONG count = 0; + CK_SLOT_ID_PTR slotlist; + CK_TOKEN_INFO tinfo; diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index d308952fa..c5fb7ab8a 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -24,15 +24,15 @@ $(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(P CONFIGURE_ARGS+= --disable-asm \ --with-gpg-error-prefix="$(STAGING_TARGET_DIR)/usr" +libgcrypt-install: + $(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgcrypt.so* \ + $(IDIR_LIBGCRYPT)/usr/lib + post-install: # provides own automake macros $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) $(WRKINST)/usr/share/aclocal/libgcrypt.m4 \ $(STAGING_HOST_DIR)/usr/share/aclocal -libgcrypt-install: - $(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib - $(CP) $(WRKINST)/usr/lib/libgcrypt.so* \ - $(IDIR_LIBGCRYPT)/usr/lib - include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile index 4337f0bad..a09317110 100644 --- a/package/libmicrohttpd/Makefile +++ b/package/libmicrohttpd/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libmicrohttpd -PKG_VERSION:= 0.9.41 +PKG_VERSION:= 0.9.42 PKG_RELEASE:= 1 -PKG_HASH:= 9798be637d4a1d76a377e1d805d142e6edcfd3ec99c443926448f647af1a7a7c +PKG_HASH:= 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b PKG_DESCR:= library make it easy to run an webserver PKG_SECTION:= libs/net PKG_URL:= http://www.gnu.org/software/libmicrohttpd/ diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile index e640b6b18..90d86e599 100644 --- a/package/libnettle/Makefile +++ b/package/libnettle/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libnettle -PKG_VERSION:= 2.7.1 +PKG_VERSION:= 3.1 PKG_RELEASE:= 2 -PKG_HASH:= bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 +PKG_HASH:= f6859d4ec88e70805590af9862b4b8c43a2d1fc7991df0a7a711b1e7ca9fc9d3 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgmp @@ -22,6 +22,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-documentation + libnettle-install: $(INSTALL_DIR) $(IDIR_LIBNETTLE)/usr/lib $(CP) $(WRKINST)/usr/lib/libnettle*.so* \ diff --git a/package/libnettle/patches/patch-Makefile_in b/package/libnettle/patches/patch-Makefile_in index d63bbdc56..fb5b2e914 100644 --- a/package/libnettle/patches/patch-Makefile_in +++ b/package/libnettle/patches/patch-Makefile_in @@ -1,8 +1,8 @@ ---- nettle-2.4.orig/Makefile.in 2011-09-03 14:51:07.000000000 +0200 -+++ nettle-2.4/Makefile.in 2012-04-03 15:14:44.000000000 +0200 -@@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s - MKDIR_P = @MKDIR_P@ +--- nettle-3.1.orig/Makefile.in 2015-04-07 14:00:08.000000000 -0500 ++++ nettle-3.1/Makefile.in 2015-05-13 17:12:36.605171868 -0500 +@@ -17,7 +17,7 @@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@ + + OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ -SUBDIRS = tools testsuite examples +SUBDIRS = tools testsuite diff --git a/package/libnettle/patches/patch-hogweed_pc_in b/package/libnettle/patches/patch-hogweed_pc_in new file mode 100644 index 000000000..85fe0489d --- /dev/null +++ b/package/libnettle/patches/patch-hogweed_pc_in @@ -0,0 +1,15 @@ +--- nettle-3.1.orig/hogweed.pc.in 2015-04-07 14:00:09.000000000 -0500 ++++ nettle-3.1/hogweed.pc.in 2015-05-14 02:43:51.148857825 -0500 +@@ -11,9 +11,9 @@ Name: Hogweed + Description: Nettle low-level cryptographic library (public-key algorithms) + URL: http://www.lysator.liu.se/~nisse/nettle + Version: @PACKAGE_VERSION@ +-Requires: @IF_NOT_SHARED@ nettle ++Requires: nettle + Requires.private: @IF_SHARED@ nettle +-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ +-Libs.private: @IF_SHARED@ @LIBS@ ++Libs: -L${libdir} -lhogweed @LIBS@ ++Libs.private: @LIBS@ + Cflags: -I${includedir} + diff --git a/package/libressl/Makefile b/package/libressl/Makefile index 20740271c..271547e54 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 2.1.3 +PKG_VERSION:= 2.1.6 PKG_RELEASE:= 1 -PKG_HASH:= eb2f370971408fb10af6453e556465c8eee728ac333bf1eb47ec1a5112304f7c -PKG_DESCR:= ssl library +PKG_HASH:= 4f826dd97b3b8001707073bde8401493f9cd4668465b481c042d28e3973653a8 +PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org PKG_SITES:= http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/ @@ -29,7 +29,7 @@ endif libressl-install: $(INSTALL_DIR) $(IDIR_LIBRESSL)/usr/lib - $(CP) $(WRKINST)/usr/lib/lib{crypto,ssl}.so* \ + $(CP) $(WRKINST)/usr/lib/lib{crypto,ssl,tls}.so* \ $(IDIR_LIBRESSL)/usr/lib include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 883da9eb4..9de638a02 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -146,7 +146,7 @@ else CONFIGURE_ARGS+= --without-openssl endif -post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} +lighttpd-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d ${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd ${INSTALL_DATA} ./files/modules.conf $(IDIR_LIGHTTPD)/etc/lighttpd diff --git a/package/pam/Makefile b/package/pam/Makefile index be3543b96..3c9089e76 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -15,8 +15,6 @@ PKG_SITES:= http://www.linux-pam.org/library/ PKG_OPTS:= dev PKG_BB:= 1 -PKG_CFLINE_PAM:= depends on !ADK_TARGET_USE_STATIC_LIBS - DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION} @@ -29,12 +27,6 @@ CONFIGURE_ARGS+= --disable-nis \ --disable-regenerate-docu \ --enable-db=no -post-install: -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) - # /lib is not automatically installed to staging area - $(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_TARGET_DIR)/usr/lib -endif - pam-install: $(INSTALL_DIR) $(IDIR_PAM)/etc/security $(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security diff --git a/package/php/Makefile b/package/php/Makefile index e2196d0fb..061127fab 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.6.7 +PKG_VERSION:= 5.6.8 PKG_RELEASE:= 1 -PKG_HASH:= a85522dd2e6f80ee5637e537447ee54896c77a8fabe49d2310830d0e20952787 +PKG_HASH:= 4c417387b88e100ca306adeda8051eb9fad93dae8da983f962dabf91a14b2b7b PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_DEPENDS:= libpthread librt @@ -24,7 +24,7 @@ PKGSN_PHP_CLI:= php PKG_FLAVOURS_PHP:= MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MYSQL PKG_FLAVOURS_PHP+= MOD_OPENSSL MOD_PGSQL MOD_SESSION MOD_SNMP MOD_SQLITE PKG_FLAVOURS_PHP+= MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB MOD_JSON -PKG_FLAVOURS_PHP+= MOD_LDAP +PKG_FLAVOURS_PHP+= MOD_LDAP MOD_PCNTL PKGFD_MOD_BZ2:= bzip2 support PKGFB_MOD_BZ2:= bzip2 @@ -49,6 +49,7 @@ PKGFB_MOD_MYSQL:= mysql PKGFD_MOD_OPENSSL:= openssl support PKGFB_MOD_OPENSSL:= openssl PKGFS_MOD_OPENSSL:= libopenssl +PKGFD_MOD_PCNTL:= process control support PKGFD_MOD_PGSQL:= pgsql support PKGFB_MOD_PGSQL:= postgresql PKGFS_MOD_PGSQL:= libpq @@ -133,7 +134,6 @@ PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \ --with-png-dir="$(STAGING_TARGET_DIR)/usr" \ --with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \ --without-freetype-dir \ - --without-ttf \ --without-t1lib \ --enable-gd-native-ttf \ --disable-gd-jis-conv @@ -167,6 +167,11 @@ PKG_CONFIGURE_OPTS+= --with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \ else PKG_CONFIGURE_OPTS+= --without-openssl endif +ifneq ($(ADK_PACKAGE_PHP_MOD_PCNTL),) +PKG_CONFIGURE_OPTS+= --enable-pcntl +else +PKG_CONFIGURE_OPTS+= --disable-pcntl +endif ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),) PKG_CONFIGURE_OPTS+= --with-pgsql=shared,"$(STAGING_TARGET_DIR)/usr" else diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index b28d4e85e..f60f7d8a7 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -36,4 +36,9 @@ libpq-install: $(INSTALL_DIR) $(IDIR_LIBPQ)/usr/lib $(CP) $(WRKINST)/usr/lib/libpq.so* $(IDIR_LIBPQ)/usr/lib +post-install: + PATH='$(HOST_PATH)' sed -e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \ + ./files/pg_config > $(STAGING_HOST_DIR)/usr/bin/pg_config + -rm $(STAGING_TARGET_DIR)/usr/bin/pg_config + include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/postgresql/files/pg_config b/package/postgresql/files/pg_config new file mode 100644 index 000000000..0d82c24a1 --- /dev/null +++ b/package/postgresql/files/pg_config @@ -0,0 +1,19 @@ +#!/bin/sh + +# +# Minimal pg_config implementation as replacement for the native pg_config application +# Only implements --includedir and --libdir +# + +prefix=@@STAGING_TARGET_DIR@@/usr + +case "$1" in + --includedir) + echo "$prefix/include" + ;; + --libdir) + echo "$prefix/lib" + ;; + *) + echo "Usage: $0 {--includedir|--libdir}" +esac diff --git a/package/samba/Makefile b/package/samba/Makefile index e37e0f979..34bc29045 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba PKG_VERSION:= 4.2.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_HASH:= 37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3 PKG_DESCR:= file and print server PKG_SECTION:= net/fs diff --git a/package/samba/patches/patch-source4_lib_tls_tls_c b/package/samba/patches/patch-source4_lib_tls_tls_c new file mode 100644 index 000000000..f473f4ca0 --- /dev/null +++ b/package/samba/patches/patch-source4_lib_tls_tls_c @@ -0,0 +1,11 @@ +--- samba-4.2.1.orig/source4/lib/tls/tls.c 2014-10-01 11:16:21.000000000 +0200 ++++ samba-4.2.1/source4/lib/tls/tls.c 2015-05-13 08:33:06.000000000 +0200 +@@ -598,7 +598,7 @@ struct socket_context *tls_init_client(s + gnutls_certificate_set_x509_trust_file(tls->xcred, ca_path, GNUTLS_X509_FMT_PEM); + TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT)); + TLSCHECK(gnutls_set_default_priority(tls->session)); +- gnutls_certificate_type_set_priority(tls->session, cert_type_priority); ++ //gnutls_certificate_type_set_priority(tls->session, cert_type_priority); + TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred)); + + talloc_set_destructor(tls, tls_destructor); diff --git a/package/samba/patches/patch-source4_lib_tls_tls_tstream_c b/package/samba/patches/patch-source4_lib_tls_tls_tstream_c new file mode 100644 index 000000000..dfef22004 --- /dev/null +++ b/package/samba/patches/patch-source4_lib_tls_tls_tstream_c @@ -0,0 +1,11 @@ +--- samba-4.2.1.orig/source4/lib/tls/tls_tstream.c 2014-10-01 11:16:21.000000000 +0200 ++++ samba-4.2.1/source4/lib/tls/tls_tstream.c 2015-05-13 08:33:16.000000000 +0200 +@@ -1014,7 +1014,7 @@ struct tevent_req *_tstream_tls_connect_ + return tevent_req_post(req, ev); + } + +- gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority); ++ //gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority); + + ret = gnutls_credentials_set(tlss->tls_session, + GNUTLS_CRD_CERTIFICATE, diff --git a/package/squid/Makefile b/package/squid/Makefile index cb182b9c8..0fa1a2461 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.5.3 +PKG_VERSION:= 3.5.4 PKG_RELEASE:= 1 -PKG_HASH:= 73ec65a08384a3ec93ccc17e89ef7a06ba221816551946f2f051cc736c2981c0 +PKG_HASH:= dce615d08e349caf3975fc5d51ce4c3c69b9995fb83f51dc5d55ae873d8bf6a4 PKG_DESCR:= web and cache proxy PKG_SECTION:= net/proxy PKG_DEPENDS:= libpthread librt libstdcxx libltdl @@ -172,7 +172,7 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --enable-auth-digest="${DIGEST_AUTH_HELPERS}" \ --enable-external-acl-helpers="${EXTERNAL_ACL_HELPERS}" -post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} +squid-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_SQUID}/etc/squid ${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \ ${IDIR_SQUID}/etc/squid/ diff --git a/package/talloc/Makefile b/package/talloc/Makefile new file mode 100644 index 000000000..0af42b737 --- /dev/null +++ b/package/talloc/Makefile @@ -0,0 +1,42 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= talloc +PKG_VERSION:= 2.1.2 +PKG_RELEASE:= 1 +PKG_HASH:= 230d78a3fca75a15ab0f5d76d7bbaeadd3c1e695adcbb085932d227f5c31838d +PKG_DESCR:= memory allocation library +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= python2-host python2 +PKG_URL:= https://talloc.samba.org/talloc/doc/html/index.html +PKG_SITES:= https://www.samba.org/ftp/talloc/ +PKG_LIBNAME:= libtalloc + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBTALLOC,libtalloc,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= minimal +CONFIGURE_ARGS+= --prefix=/usr \ + --cross-compile \ + --cross-answers=$(WRKSRC)/cache.txt \ + --hostcc=gcc + +CONFIGURE_ENV+= PYTHON_CONFIG="$(STAGING_TARGET_DIR)/usr/bin/python-config" \ + python_LDFLAGS="" \ + python_LIBDIR="" + +pre-configure: + $(CP) ./files/cache.txt $(WRKSRC) + echo 'Checking uname machine type: "$(ADK_TARGET_ARCH)"' >>$(WRKSRC)/cache.txt + +libtalloc-install: + $(INSTALL_DIR) $(IDIR_LIBTALLOC)/usr/lib + $(CP) $(WRKINST)/usr/lib/libtalloc.so* \ + $(IDIR_LIBTALLOC)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/talloc/files/cache.txt b/package/talloc/files/cache.txt new file mode 100644 index 000000000..c9e34b630 --- /dev/null +++ b/package/talloc/files/cache.txt @@ -0,0 +1,38 @@ +Checking simple C program: OK +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking for large file support without additional flags: OK +Checking for -D_LARGE_FILES: OK +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: OK +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +Checking whether we can use Linux thread-specific credentials with 32-bit system calls: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether setreuid is available: OK +Checking whether setresuid is available: OK +Checking whether seteuid is available: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking whether POSIX capabilities are available: OK +Checking for ftruncate extend: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +getcwd takes a NULL argument: OK +Checking uname sysname type: "Linux" +Checking uname release type: "3.0.0" +Checking uname version type: "#1 Tue Nov 1 12:34:56 UTC 2013" +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" diff --git a/package/talloc/patches/patch-buildtools_wafsamba_samba_autoconf_py b/package/talloc/patches/patch-buildtools_wafsamba_samba_autoconf_py new file mode 100644 index 000000000..3c6833672 --- /dev/null +++ b/package/talloc/patches/patch-buildtools_wafsamba_samba_autoconf_py @@ -0,0 +1,13 @@ +--- talloc-2.1.2.orig/buildtools/wafsamba/samba_autoconf.py 2015-02-27 09:40:16.000000000 +0100 ++++ talloc-2.1.2/buildtools/wafsamba/samba_autoconf.py 2015-05-13 11:22:52.000000000 +0200 +@@ -646,10 +646,6 @@ def SAMBA_CONFIG_H(conf, path=None): + if not IN_LAUNCH_DIR(conf): + return + +- if conf.CHECK_CFLAGS(['-fstack-protector']) and conf.CHECK_LDFLAGS(['-fstack-protector']): +- conf.ADD_CFLAGS('-fstack-protector') +- conf.ADD_LDFLAGS('-fstack-protector') +- + if Options.options.debug: + conf.ADD_CFLAGS('-g', testflags=True) + diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index 765e1cfd0..72e4f73bb 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -46,7 +46,7 @@ $(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PK CONFIGURE_ARGS+= ac_cv_lib_nsl_gethostbyname=no -post-install: +updatedd-install: ${INSTALL_DIR} ${IDIR_UPDATEDD}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/updatedd ${IDIR_UPDATEDD}/usr/bin/ ${INSTALL_DIR} ${IDIR_UPDATEDD}/usr/lib/updatedd diff --git a/package/wolfssl/Makefile b/package/wolfssl/Makefile index 23ef53510..456f922fa 100644 --- a/package/wolfssl/Makefile +++ b/package/wolfssl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wolfssl -PKG_VERSION:= 3.4.0 +PKG_VERSION:= 3.4.6 PKG_RELEASE:= 1 -PKG_HASH:= 22622295ef42e9e37341009e4b134165fb06db53cbc8509dbeb822b9dd613c45 +PKG_HASH:= 267a75ff2b81ac793d8170904c97635d74bed1c353162622eb66d8e7fa6260fa PKG_DESCR:= portable embedded ssl library PKG_SECTION:= libs/crypto PKG_URL:= http://www.wolfssl.com diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance index 68232afa4..4982a6f77 100644 --- a/target/appliances/kodi.appliance +++ b/target/appliances/kodi.appliance @@ -23,7 +23,7 @@ config ADK_APPLIANCE_KODI select ADK_PACKAGE_BCM28XX_VC_LIBS if ADK_TARGET_BOARD_BCM28XX select ADK_PACKAGE_BCM28XX_VC_GL_LIBS if ADK_TARGET_BOARD_BCM28XX select ADK_PACKAGE_LIBFSLVPUWRAP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + select ADK_PACKAGE_IMX_GPU_VIV if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_ARCH_ARM_WITH_NEON if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 help Create a small kodi multimedia appliance. Please enable additional features diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 3b42ead5a..28675ccf2 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -101,8 +101,8 @@ config ADK_TARGET_LIB_UCLIBC_0_9_33_2 bool "0.9.33.2" depends on ADK_TARGET_LIB_UCLIBC -config ADK_TARGET_LIB_MUSL_1_1_8 - bool "1.1.8" +config ADK_TARGET_LIB_MUSL_1_1_9 + bool "1.1.9" depends on ADK_TARGET_LIB_MUSL config ADK_TARGET_LIB_MUSL_GIT diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index b9b5b1c73..e689eed8a 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -19,7 +19,7 @@ config ADK_LIBC_VERSION default "1.0.2" if ADK_TARGET_LIB_UCLIBC_NG_1_0_2 default "1.0.1" if ADK_TARGET_LIB_UCLIBC_NG_1_0_1 default "1.0.0" if ADK_TARGET_LIB_UCLIBC_NG_1_0_0 - default "1.1.8" if ADK_TARGET_LIB_MUSL_1_1_8 + default "1.1.9" if ADK_TARGET_LIB_MUSL_1_1_9 default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2 default "2.20" if ADK_TARGET_LIB_GLIBC_2_20 default "2.21" if ADK_TARGET_LIB_GLIBC_2_21 diff --git a/target/config/Config.in.mips.choice b/target/config/Config.in.mips.choice index 71e6c8ea2..7fb09ec3c 100644 --- a/target/config/Config.in.mips.choice +++ b/target/config/Config.in.mips.choice @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. choice ADK_TARGET_MIPS_CPU_ARCH -prompt "MIPS ISA" +prompt "ISA configuration" depends on ADK_TARGET_ARCH_MIPS config ADK_CPU_MIPS_MIPS32 diff --git a/target/config/Config.in.subsystem b/target/config/Config.in.subsystem index dab19f2b4..492bc7dc5 100644 --- a/target/config/Config.in.subsystem +++ b/target/config/Config.in.subsystem @@ -51,5 +51,3 @@ config ADK_TARGET_HUMMINGBOARD_I2EX select ADK_TARGET_WITH_SATA endchoice - - diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 557b12708..2197a89e5 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -4,6 +4,7 @@ config ADK_TARGET_CFLAGS_OPT string default "-Os -pipe" if ADK_TARGET_CFLAGS_OPT_OS + default "-Og -pipe" if ADK_TARGET_CFLAGS_OPT_OG default "-O2 -pipe" if ADK_TARGET_CFLAGS_OPT_O2 default "-O3 -pipe" if ADK_TARGET_CFLAGS_OPT_O3 default "-O0 -pipe" if ADK_TARGET_CFLAGS_OPT_O0 @@ -15,11 +16,14 @@ bool config ADK_TARGET_CFLAGS_OPT_OS prompt "optimize for size (-Os)" +config ADK_TARGET_CFLAGS_OPT_OG + prompt "optimize, but allow debugging (-Og)" + config ADK_TARGET_CFLAGS_OPT_O2 prompt "optimize for performance (-O2)" config ADK_TARGET_CFLAGS_OPT_O3 - prompt "optimize for performance (-O3)" + prompt "optimize for extra performance (-O3)" config ADK_TARGET_CFLAGS_OPT_O0 prompt "no optimization (-O0)" diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 18f328ff7..9c93937cd 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -10,7 +10,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz else PKG_VERSION:= $(ADK_LIBC_VERSION) PKG_RELEASE:= 1 -PKG_HASH:= fa928506415b9c555977daaf874c190eaf7fbbd16028cc5c5f33a00a83227813 +PKG_HASH:= 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif |