diff options
Diffstat (limited to 'package')
93 files changed, 3339 insertions, 39 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile index a2a92df00..ab7b73097 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost PKG_VERSION:= 1.55.0 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17 PKG_DESCR:= boost C++ library PKG_SECTION:= libs @@ -105,7 +105,7 @@ BOOST_ARCH:= $(ARCH) endif # some variables for build -GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++ +GPP_PATH:= ${TOOLCHAIN_DIR}/usr/bin/${GNU_TARGET_NAME}-g++ GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`" PYTHON_PATH:= ${STAGING_HOST_DIR}/usr/bin/python diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index ecb827b09..64b27a8da 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux PKG_VERSION:= 1.6 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto @@ -26,7 +26,7 @@ INSTALL_STYLE:= manual do-build: ${MAKE} -C "${WRKBUILD}"/tests check ${MAKE} -C "${WRKBUILD}" version.h - GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \ + GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} -C ${LINUX_DIR} ${KERNEL_MAKE_OPTS} \ M="${WRKBUILD}" modules ${INSTALL_DIR} ${WRKINST}/usr/include/crypto ${INSTALL_DATA} ${WRKBUILD}/crypto/cryptodev.h \ diff --git a/package/curl/Makefile b/package/curl/Makefile index f2fb4d573..7a03fcd9e 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -24,7 +24,7 @@ PKGSS_LIBCURL:= zlib PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support -PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_LIBCURL:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL PKGCD_WITHOUT_SSL:= use no SSL PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index 369264c6d..624d47672 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= mail PKG_URL:= http://www.dovecot.org/ PKG_SITES:= http://www.dovecot.org/releases/2.0/ -PKG_CHOICES_DOVECOT:= WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_DOVECOT:= WITH_GNUTLS WITH_OPENSSL PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 17c49f3af..9fa4cf7bb 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -32,7 +32,7 @@ INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) - for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \ + for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 0b8d3aa7a..99ca40234 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= http://hostap.epitest.fi/releases/ PKG_MULTI:= 1 PKG_SUBPKGS:= HOSTAPD HOSTAPD_UTILS -PKG_CHOICES_HOSTAPD:= WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_HOSTAPD:= WITH_GNUTLS WITH_OPENSSL PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 157d9db03..3ebdc2f6b 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= kexec-tools PKG_VERSION:= 2.0.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257 PKG_DESCR:= kexec tools PKG_SECTION:= misc diff --git a/package/kexec-tools/patches/patch-kexec_kexec_c b/package/kexec-tools/patches/patch-kexec_kexec_c index 68dc2bee9..8ce2ac370 100644 --- a/package/kexec-tools/patches/patch-kexec_kexec_c +++ b/package/kexec-tools/patches/patch-kexec_kexec_c @@ -1,6 +1,6 @@ ---- kexec-tools-2.0.2.orig/kexec/kexec.c 2010-07-29 06:19:59.000000000 +0200 -+++ kexec-tools-2.0.2/kexec/kexec.c 2011-09-05 18:50:27.679232756 +0200 -@@ -796,17 +796,14 @@ int k_unload (unsigned long kexec_flags) +--- kexec-tools-2.0.5.orig/kexec/kexec.c 2013-12-13 01:52:47.000000000 +0100 ++++ kexec-tools-2.0.5/kexec/kexec.c 2014-03-18 14:46:58.000000000 +0100 +@@ -807,17 +807,14 @@ static int k_unload (unsigned long kexec static int my_shutdown(void) { char *args[] = { diff --git a/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c new file mode 100644 index 000000000..5f6484789 --- /dev/null +++ b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c @@ -0,0 +1,41 @@ +--- kexec-tools-2.0.5.orig/vmcore-dmesg/vmcore-dmesg.c 2014-01-15 00:51:14.000000000 +0100 ++++ kexec-tools-2.0.5/vmcore-dmesg/vmcore-dmesg.c 2014-03-18 15:00:45.000000000 +0100 +@@ -26,14 +26,14 @@ static Elf64_Ehdr ehdr; + static Elf64_Phdr *phdr; + + static char osrelease[4096]; +-static loff_t log_buf_vaddr; +-static loff_t log_end_vaddr; +-static loff_t log_buf_len_vaddr; +-static loff_t logged_chars_vaddr; ++static off_t log_buf_vaddr; ++static off_t log_end_vaddr; ++static off_t log_buf_len_vaddr; ++static off_t logged_chars_vaddr; + + /* record format logs */ +-static loff_t log_first_idx_vaddr; +-static loff_t log_next_idx_vaddr; ++static off_t log_first_idx_vaddr; ++static off_t log_next_idx_vaddr; + + /* struct log size */ + static uint64_t log_sz; +@@ -266,7 +266,7 @@ static void scan_vmcoreinfo(char *start, + const char *str; + const char *name; + size_t len; +- loff_t *vaddr; ++ off_t *vaddr; + } symbol[] = { + SYMBOL(log_buf), + SYMBOL(log_end), +@@ -344,7 +344,7 @@ static void scan_vmcoreinfo(char *start, + } + } + +-static void scan_notes(int fd, loff_t start, loff_t lsize) ++static void scan_notes(int fd, off_t start, off_t lsize) + { + char *buf, *last, *note, *next; + size_t size; diff --git a/package/libpng/Makefile b/package/libpng/Makefile index ea4c3a1f8..3f16ecf3f 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.6.8 +PKG_VERSION:= 1.6.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 29b7065906e2551508a0d7eacd19174e -PKG_DESCR:= A library for reading/writing PNG images +PKG_MD5SUM:= b0f0c38a02dc92f70f0053a40abc7e0b +PKG_DESCR:= library for reading/writing PNG images PKG_SECTION:= libs PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib @@ -23,8 +23,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - libpng-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib ${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib diff --git a/package/mksh/Makefile b/package/mksh/Makefile index a38b97733..63d391e18 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -27,6 +27,7 @@ TARGET_LDFLAGS+= -static endif TARGET_CPPFLAGS+= -DMKSH_SMALL=1 +TARGET_LDFLAGS+= -static-libgcc CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index e96d04e38..5d662f20f 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pcrepp PKG_VERSION:= 0.9.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1fe6ea8e23ece01fde2ce5fb4746acc2 PKG_DESCR:= Cpp Wrapper classes for PCRE PKG_SECTION:= libs diff --git a/package/pcrepp/patches/patch-configure b/package/pcrepp/patches/patch-configure index 0ee82218e..da7ab7b3e 100644 --- a/package/pcrepp/patches/patch-configure +++ b/package/pcrepp/patches/patch-configure @@ -1,5 +1,23 @@ --- pcre++-0.9.5.orig/configure 2004-08-25 01:38:03.000000000 +0200 -+++ pcre++-0.9.5/configure 2011-08-05 07:30:53.000000000 +0200 ++++ pcre++-0.9.5/configure 2014-03-17 20:07:03.000000000 +0100 +@@ -3844,7 +3844,7 @@ irix5* | irix6* | nonstopux*) + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + case $host_cpu in + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) + lt_cv_deplibs_check_method=pass_all ;; +@@ -6598,7 +6598,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the CPPFLAGS="$CPPFLAGS -I/include" ;; diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 08d545c79..2c3c17bc3 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ppp PKG_VERSION:= 2.4.5 -PKG_RELEASE:= 6 +PKG_RELEASE:= 7 PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57 PKG_DESCR:= Point-to-Point Protocol software PKG_SECTION:= ppp @@ -15,8 +15,6 @@ PKG_URL:= http://ppp.samba.org/ PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ PKG_MULTI:= 1 -PKG_LIBC_DEPENDS:= uclibc glibc - PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS PKGSS_PPP_MOD_PPPOE:= kmod-pppoe diff --git a/package/ppp/patches/patch-chat_chat_c b/package/ppp/patches/patch-chat_chat_c new file mode 100644 index 000000000..2718fbd8d --- /dev/null +++ b/package/ppp/patches/patch-chat_chat_c @@ -0,0 +1,74 @@ +--- ppp-2.4.5.orig/chat/chat.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/chat/chat.c 2014-03-17 16:13:08.000000000 +0100 |