From d072beaa1963ca5dde4750ac5f6f970f6f6986cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 01/13] taglib: update to taglib-1.11 Signed-off-by: Stephan Raue (cherry picked from commit 2206ae835fe013a7eafa5f15ff9b4fbe931f48dc) --- packages/audio/taglib/package.mk | 2 +- .../taglib/patches/taglib-01_bytevector.patch | 128 ------------------ 2 files changed, 1 insertion(+), 129 deletions(-) delete mode 100644 packages/audio/taglib/patches/taglib-01_bytevector.patch diff --git a/packages/audio/taglib/package.mk b/packages/audio/taglib/package.mk index 2c82d957e8..0114fafe31 100644 --- a/packages/audio/taglib/package.mk +++ b/packages/audio/taglib/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="taglib" -PKG_VERSION="1.9.1" +PKG_VERSION="1.11" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/audio/taglib/patches/taglib-01_bytevector.patch b/packages/audio/taglib/patches/taglib-01_bytevector.patch deleted file mode 100644 index 3a89ec3cc0..0000000000 --- a/packages/audio/taglib/patches/taglib-01_bytevector.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001 -From: Tsuda Kageyu -Date: Thu, 14 Nov 2013 14:05:32 +0900 -Subject: [PATCH] Rewrote ByteVector::replace() simpler - ---- - taglib/toolkit/tbytevector.cpp | 77 +++++++++++++++--------------------------- - tests/test_bytevector.cpp | 5 +++ - 2 files changed, 33 insertions(+), 49 deletions(-) - -diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp -index b658246..566a20f 100644 ---- a/taglib/toolkit/tbytevector.cpp -+++ b/taglib/toolkit/tbytevector.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -508,62 +509,40 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit - if(pattern.size() == 0 || pattern.size() > size()) - return *this; - -- const uint withSize = with.size(); -- const uint patternSize = pattern.size(); -- int offset = 0; -+ const size_t withSize = with.size(); -+ const size_t patternSize = pattern.size(); -+ const ptrdiff_t diff = withSize - patternSize; -+ -+ size_t offset = 0; -+ while (true) -+ { -+ offset = find(pattern, offset); -+ if(offset == static_cast(-1)) // Use npos in taglib2. -+ break; - -- if(withSize == patternSize) { -- // I think this case might be common enough to optimize it - detach(); -- offset = find(pattern); -- while(offset >= 0) { -- ::memcpy(data() + offset, with.data(), withSize); -- offset = find(pattern, offset + withSize); -- } -- return *this; -- } - -- // calculate new size: -- uint newSize = 0; -- for(;;) { -- int next = find(pattern, offset); -- if(next < 0) { -- if(offset == 0) -- // pattern not found, do nothing: -- return *this; -- newSize += size() - offset; -- break; -+ if(diff < 0) { -+ ::memmove( -+ data() + offset + withSize, -+ data() + offset + patternSize, -+ size() - offset - patternSize); -+ resize(size() + diff); - } -- newSize += (next - offset) + withSize; -- offset = next + patternSize; -- } -- -- // new private data of appropriate size: -- ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0); -- char *target = DATA(newData); -- const char *source = data(); -- -- // copy modified data into new private data: -- offset = 0; -- for(;;) { -- int next = find(pattern, offset); -- if(next < 0) { -- ::memcpy(target, source + offset, size() - offset); -- break; -+ else if(diff > 0) { -+ resize(size() + diff); -+ ::memmove( -+ data() + offset + withSize, -+ data() + offset + patternSize, -+ size() - diff - offset - patternSize); - } -- int chunkSize = next - offset; -- ::memcpy(target, source + offset, chunkSize); -- target += chunkSize; -- ::memcpy(target, with.data(), withSize); -- target += withSize; -- offset += chunkSize + patternSize; -- } - -- // replace private data: -- if(d->deref()) -- delete d; -+ ::memcpy(data() + offset, with.data(), with.size()); - -- d = newData; -+ offset += withSize; -+ if(offset > size() - patternSize) -+ break; -+ } - - return *this; - } -diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp -index 9efd23a..eca74f8 100644 ---- a/tests/test_bytevector.cpp -+++ b/tests/test_bytevector.cpp -@@ -239,6 +239,11 @@ class TestByteVector : public CppUnit::TestFixture - a.replace(ByteVector("ab"), ByteVector()); - CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a); - } -+ { -+ ByteVector a("abcdabf"); -+ a.replace(ByteVector("bf"), ByteVector("x")); -+ CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a); -+ } - } - - }; From 60c40f4d0c0fea4ce78a93d2fcf412705edeff08 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 02/13] xkeyboard-config: cleanup --- .../xkeyboard-config-01_autoconf-macrodir.patch.bk | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-01_autoconf-macrodir.patch.bk diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-01_autoconf-macrodir.patch.bk b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-01_autoconf-macrodir.patch.bk deleted file mode 100644 index 09fac12df4..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-01_autoconf-macrodir.patch.bk +++ /dev/null @@ -1,8 +0,0 @@ -diff -Naur xkeyboard-config-2.10.1/configure.ac xkeyboard-config-2.10.1.patch/configure.ac ---- xkeyboard-config-2.10.1/configure.ac 2013-10-03 23:28:04.000000000 +0200 -+++ xkeyboard-config-2.10.1.patch/configure.ac 2013-12-11 01:08:51.903855838 +0100 -@@ -1,3 +1,4 @@ -+AC_CONFIG_MACRO_DIR([m4]) - AC_INIT(xkeyboard-config, 2.10.1) - AC_CONFIG_SRCDIR(rules/base.xml.in) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) From eeefc316a0e98113f8ea3a8835bae55061e6df44 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 03/13] rtmpdump: build statically only Signed-off-by: Stephan Raue (cherry picked from commit 929b6ebfe0bab854c98ec9b46124fe6732693154) --- packages/multimedia/rtmpdump/package.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/multimedia/rtmpdump/package.mk b/packages/multimedia/rtmpdump/package.mk index 9c66b5c006..ec315a67b9 100644 --- a/packages/multimedia/rtmpdump/package.mk +++ b/packages/multimedia/rtmpdump/package.mk @@ -41,6 +41,7 @@ make_target() { CC="$CC" \ LD="$LD" \ AR="$AR" \ + SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ XCFLAGS="$CFLAGS" \ @@ -57,6 +58,7 @@ makeinstall_target() { CC="$CC" \ LD="$LD" \ AR="$AR" \ + SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ XCFLAGS="$CFLAGS" \ @@ -72,6 +74,7 @@ makeinstall_target() { CC="$CC" \ LD="$LD" \ AR="$AR" \ + SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ XCFLAGS="$CFLAGS" \ @@ -83,7 +86,7 @@ makeinstall_target() { post_makeinstall_target() { rm -rf $INSTALL/usr/sbin - # to be removed: hack for "compatibility" - mkdir -p $INSTALL/usr/lib - ln -sf librtmp.so.1 $INSTALL/usr/lib/librtmp.so.0 +# # to be removed: hack for "compatibility" +# mkdir -p $INSTALL/usr/lib +# ln -sf librtmp.so.1 $INSTALL/usr/lib/librtmp.so.0 } From f04b32f040cc831386d5e62b3ee334c350fe74ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 04/13] openssh: update to openssh-7.3p1 Signed-off-by: Stephan Raue (cherry picked from commit ba32b916e3be0169401fdc68e52d04aa238da723) --- packages/network/openssh/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk index 343c71cdf6..f03913094f 100644 --- a/packages/network/openssh/package.mk +++ b/packages/network/openssh/package.mk @@ -17,12 +17,12 @@ ################################################################################ PKG_NAME="openssh" -PKG_VERSION="7.2p2" +PKG_VERSION="7.3p1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.openssh.com/" -PKG_URL="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib libressl" PKG_SECTION="network" PKG_SHORTDESC="openssh: An open re-implementation of the SSH package" From ef501be8e5b1c64e2d944dc7b77dd9598f626e74 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 05/13] binutils: remove old patch Signed-off-by: Stephan Raue (cherry picked from commit 377ed14d09ae53c77854b04d8808c58b3aa5fc20) --- .../binutils-2.24-multi_os_directory.patch | 96 ------------------- 1 file changed, 96 deletions(-) delete mode 100644 packages/devel/binutils/patches/binutils-2.24-multi_os_directory.patch diff --git a/packages/devel/binutils/patches/binutils-2.24-multi_os_directory.patch b/packages/devel/binutils/patches/binutils-2.24-multi_os_directory.patch deleted file mode 100644 index 852874d88a..0000000000 --- a/packages/devel/binutils/patches/binutils-2.24-multi_os_directory.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Naur binutils-2.21-old/bfd/configure binutils-2.21-new/bfd/configure ---- binutils-2.21-old/bfd/configure 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/bfd/configure 2010-12-08 07:12:23.000000000 -0800 -@@ -10326,7 +10326,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -diff -Naur binutils-2.21-old/binutils/configure binutils-2.21-new/binutils/configure ---- binutils-2.21-old/binutils/configure 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/binutils/configure 2010-12-08 07:12:23.000000000 -0800 -@@ -10120,7 +10120,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -diff -Naur binutils-2.21-old/gas/configure binutils-2.21-new/gas/configure ---- binutils-2.21-old/gas/configure 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/gas/configure 2010-12-08 07:12:23.000000000 -0800 -@@ -10109,7 +10109,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -diff -Naur binutils-2.21-old/gprof/configure binutils-2.21-new/gprof/configure ---- binutils-2.21-old/gprof/configure 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/gprof/configure 2010-12-08 07:12:23.000000000 -0800 -@@ -10039,7 +10039,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -diff -Naur binutils-2.21-old/ld/configure binutils-2.21-new/ld/configure ---- binutils-2.21-old/ld/configure 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/ld/configure 2010-12-08 07:12:23.000000000 -0800 -@@ -10536,7 +10536,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -diff -Naur binutils-2.21-old/libiberty/Makefile.in binutils-2.21-new/libiberty/Makefile.in ---- binutils-2.21-old/libiberty/Makefile.in 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/libiberty/Makefile.in 2010-12-08 07:12:23.000000000 -0800 -@@ -346,7 +346,7 @@ - # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the - # default multilib, so we have to take CFLAGS into account as well, - # since it will be passed the multilib flags. --MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` -+MULTIOSDIR = '../lib' - install_to_libdir: all - ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR) - $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n -diff -Naur binutils-2.21-old/libtool.m4 binutils-2.21-new/libtool.m4 ---- binutils-2.21-old/libtool.m4 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/libtool.m4 2010-12-08 07:12:23.000000000 -0800 -@@ -2043,7 +2043,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -diff -Naur binutils-2.21-old/opcodes/configure binutils-2.21-new/opcodes/configure ---- binutils-2.21-old/opcodes/configure 2010-12-08 07:11:15.000000000 -0800 -+++ binutils-2.21-new/opcodes/configure 2010-12-08 07:12:23.000000000 -0800 -@@ -10056,7 +10056,7 @@ - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir='../lib' - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" From c35e290e1c8b13df03638d1fa9a299343ec0d599 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 06/13] binutils: update to binutils-2.27 Signed-off-by: Stephan Raue (cherry picked from commit 361d2bf3eaa76804ea1abde78c77be3cdd8efbcb) --- packages/devel/binutils/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk index 3b888c6828..ae29f9c403 100644 --- a/packages/devel/binutils/package.mk +++ b/packages/devel/binutils/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="binutils" -PKG_VERSION="2.26" +PKG_VERSION="2.27" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 55c6872f3bef2a6f156dc45492cb679ed8cc78fb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 07/13] boost: update to boost-1_61_0 Signed-off-by: Stephan Raue (cherry picked from commit 0db55e49235e80ffa46f3cc4edf696d299b2af00) --- packages/devel/boost/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk index ab1700180b..360a46831f 100644 --- a/packages/devel/boost/package.mk +++ b/packages/devel/boost/package.mk @@ -17,12 +17,12 @@ ################################################################################ PKG_NAME="boost" -PKG_VERSION="1_60_0" +PKG_VERSION="1_61_0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.boost.org/" -PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.60.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2" +PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.61.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2" PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}" PKG_DEPENDS_HOST="" PKG_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2" From 0bb3bf0c5681e9c050f64646f9fe41fe24a86725 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 08/13] make: update to make-4.2.1 Signed-off-by: Stephan Raue (cherry picked from commit 311749f27c19a77746d04c05616267b459383f40) --- packages/devel/make/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk index 68a9e8f34d..caf494a41f 100644 --- a/packages/devel/make/package.mk +++ b/packages/devel/make/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="make" -PKG_VERSION="4.1" +PKG_VERSION="4.2.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv3" From e9d16a9dbcd1e2ac2e9ed9a4080719468d1a3003 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 09/13] kmod: update to kmod-23 Signed-off-by: Stephan Raue (cherry picked from commit ee6c8625d93c735f9383a248c3eb8f6222e7fd05) --- packages/sysutils/kmod/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk index 09b9fe5e37..d653afd842 100644 --- a/packages/sysutils/kmod/package.mk +++ b/packages/sysutils/kmod/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kmod" -PKG_VERSION="22" +PKG_VERSION="23" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 3dd3941fbf440c09e935f7af805fd2efb77b1900 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 10/13] gdb: update to gdb-7.11.1 Signed-off-by: Stephan Raue (cherry picked from commit 3696010d45cdd7818c7fb9bc3481ee6a87ab7731) --- packages/debug/gdb/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/debug/gdb/package.mk b/packages/debug/gdb/package.mk index ad8cd3bae9..b87401f508 100644 --- a/packages/debug/gdb/package.mk +++ b/packages/debug/gdb/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="gdb" -PKG_VERSION="7.11" +PKG_VERSION="7.11.1" PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" From 921b2946bb434a8f8a9463e927e4d1cc73b7a53d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 11/13] libgcrypt: update to libgcrypt-1.7.3 Signed-off-by: Stephan Raue (cherry picked from commit 2f80c79a0bbb3226bacb0266764202f2a2530e3d) --- packages/security/libgcrypt/package.mk | 14 +++++++++++--- .../libgcrypt/patches/libgcrypt-disable-docs.patch | 14 -------------- 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk index 5d349fc43f..4579c4a25c 100644 --- a/packages/security/libgcrypt/package.mk +++ b/packages/security/libgcrypt/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libgcrypt" -PKG_VERSION="1.6.5" +PKG_VERSION="1.7.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" @@ -31,10 +31,18 @@ PKG_LONGDESC="Libgcrypt is a general purpose cryptographic library based on the PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="ac_cv_sys_symbol_underscore=no \ +PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \ + ac_cv_sys_symbol_underscore=no \ --enable-asm \ --with-gnu-ld \ - --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr" + --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \ + --disable-doc" + +pre_configure_target() { + # libgcrypt-1.7.x fails to build with LTO support + # see for example https://bugs.gentoo.org/show_bug.cgi?id=581114 + strip_lto +} post_makeinstall_target() { sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config diff --git a/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch b/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch deleted file mode 100644 index 6fe71ddbe9..0000000000 --- a/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur libgcrypt-1.6.4/Makefile.am libgcrypt-1.6.4.patch/Makefile.am ---- libgcrypt-1.6.4/Makefile.am 2015-09-07 14:05:57.000000000 +0200 -+++ libgcrypt-1.6.4.patch/Makefile.am 2016-01-03 00:00:27.392411468 +0100 -@@ -24,8 +24,8 @@ - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) - GITLOG_TO_CHANGELOG=gitlog-to-changelog - --DIST_SUBDIRS = m4 compat mpi cipher random src doc tests --SUBDIRS = compat mpi cipher random src doc tests -+DIST_SUBDIRS = m4 compat mpi cipher random src -+SUBDIRS = compat mpi cipher random src - - EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ - ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ From f7baa8b0e7886b37e27aaa16a5c21b3cd08849f1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 12/13] util-linux: update to util-linux-2.28.1 Signed-off-by: Stephan Raue (cherry picked from commit 0e486f8261328d7c9906a316054ecaa260fa4e9c) --- packages/sysutils/util-linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 335b8aedfc..66bae1e760 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="util-linux" -PKG_VERSION="2.28" +PKG_VERSION="2.28.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d8f59d003891759b27bb3e7cb4e0c6fe16f29506 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 16 Nov 2016 00:13:28 +0000 Subject: [PATCH 13/13] libamcodec: update to libamcodec-5e23a81 --- packages/multimedia/libamcodec/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/libamcodec/package.mk b/packages/multimedia/libamcodec/package.mk index 4979573db0..4f9e189650 100644 --- a/packages/multimedia/libamcodec/package.mk +++ b/packages/multimedia/libamcodec/package.mk @@ -23,7 +23,7 @@ PKG_LICENSE="other" PKG_SITE="http://openlinux.amlogic.com" case $TARGET_ARCH in arm) - PKG_VERSION="45a1086" + PKG_VERSION="5e23a81" PKG_URL="https://github.com/codesnake/libamcodec/archive/$PKG_VERSION.tar.gz" ;; aarch64)