support/libtool: add patch for newer versions
PATCH 1/6 support/libtool: add patch for newer versions
Add patch to support newer (>2.4.2) versions.
Adjust patch logic to check for patchlevel greater than 2 (apply new patch) or not (apply current patch).
Some people/distributions used unreleased versions, with the string being 2.4.2.x, this packages are AUTORECONFed and have to be kept like this since the up-to-2.4.2 patch doesn't work, neither does the from-2.4.3 version patch.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/pkg-autotools.mk | 8 ++- support/libtool/buildroot-libtool-v2.4.4.patch | 95 ++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 support/libtool/buildroot-libtool-v2.4.4.patch
package/pkg-autotools.mk +7 -1
@@ -62,12 +62,18 @@ define LIBTOOL_PATCH_HOOK $(Q)for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + ltmain_patchlevel=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9].\)\([0-9]*\).*/\2/' -e 's/\"//'`; \ if test $${ltmain_version} = '1.5'; then \ $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ elif test $${ltmain_version} = "2.2"; then\ $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ elif test $${ltmain_version} = "2.4"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + if test $${ltmain_patchlevel} -gt 2; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.4.patch; \ + else \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ fi \ done endef
support/libtool/buildroot-libtool-v2.4.4.patch new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
2.0.4
PATCH 2/6 libtool: bump to version 2.4.4
Patch is upstream so remove it.
Signed-off-by Gustavo Zacarias <[email protected]>
--- .../libtool/libtool-01-mips64-n64-linking.patch | 47 ---------------------- package/libtool/libtool.hash | 2 + package/libtool/libtool.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 package/libtool/libtool-01-mips64-n64-linking.patch create mode 100644 package/libtool/libtool.hash
package/libtool/libtool-01-mips64-n64-linking.patch deleted +0 -47
@@ -1,47 +0,0 @@ -sets correct linker ABI flags on MIPS64 -http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=5f7f7d9615bf650cf99d581a33b3e18357f79951 - -Signed-off-by: Vicente Olivert Riera <[email protected]> - -diff -ru libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4 ---- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2013-11-11 11:44:30.419396295 +0000 -+++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-11-11 11:44:07.055032308 +0000 -@@ -1312,6 +1312,38 @@ - rm -rf conftest* - ;; - -+mips64*-*linux*) -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. -+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ emul=elf -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ emul="${emul}32" -+ ;; -+ *64-bit*) -+ emul="${emul}64" -+ ;; -+ esac -+ case `/usr/bin/file conftest.$ac_objext` in -+ *MSB*) -+ emul="${emul}btsmip" -+ ;; -+ *LSB*) -+ emul="${emul}ltsmip" -+ ;; -+ esac -+ case `/usr/bin/file conftest.$ac_objext` in -+ *N32*) -+ emul="${emul}n32" -+ ;; -+ esac -+ LD="${LD-ld} -m $emul" -+ fi -+ rm -rf conftest* -+ ;; -+ - x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ - s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using.
package/libtool/libtool.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature +sha256 a8295b5853bf82a46635c944031e84970f2aa79c19df7a0c28f3ec8e11c07f6c libtool-2.4.4.tar.xz
package/libtool/libtool.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBTOOL_VERSION = 2.4.2 +LIBTOOL_VERSION = 2.4.4 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool LIBTOOL_INSTALL_STAGING = YES
Signature · 1 line
2.0.4
PATCH 3/6 subversion: security bump to version 1.7.19
In reply to Gustavo ZacariasFixes:
CVE-2014-3580: mod_dav_svn DoS from invalid REPORT requests.
CVE-2014-8108: mod_dav_svn DoS from use of invalid transaction names.
Also add hash file.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/subversion/subversion.hash | 2 ++ package/subversion/subversion.mk | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 package/subversion/subversion.hash
package/subversion/subversion.hash new file +2 -0
@@ -0,0 +1,2 @@ +# From https://mail-archives.apache.org/mod_mbox/subversion-dev/201412.mbox/%3C548F4EEB.7030601 at apache.org%3E +sha1 bb3cd135bbd856e7f0f2d59313f075b9bbec9848 subversion-1.7.19.tar.gz
package/subversion/subversion.mk +1 -2
@@ -4,11 +4,10 @@ # ################################################################################ -SUBVERSION_VERSION = 1.7.18 +SUBVERSION_VERSION = 1.7.19 SUBVERSION_SITE = http://archive.apache.org/dist/subversion SUBVERSION_LICENSE = Apache-2.0 SUBVERSION_LICENSE_FILES = LICENSE - SUBVERSION_DEPENDENCIES = host-pkgconf apr apr-util expat neon zlib sqlite SUBVERSION_CONF_OPTS = \ --with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \
Signature · 1 line
2.0.4
PATCH 4/6 lzo: adjust libtool comment
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- package/lzo/lzo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lzo/lzo.mk +1 -1
@@ -9,7 +9,7 @@ LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPLv2+ LZO_LICENSE_FILES = COPYING LZO_INSTALL_STAGING = YES -# Our libtool patch does not apply to bundled ltmain.sh since it's too new. +# Ships a beta libtool version hence our patch doesn't apply. # Run autoreconf to regenerate ltmain.sh. LZO_AUTORECONF = YES
Signature · 1 line
2.0.4
PATCH 5/6 libfribidi: adjust libtool comment
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- package/libfribidi/libfribidi.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/libfribidi/libfribidi.mk +2 -1
@@ -10,7 +10,8 @@ LIBFRIBIDI_SITE = http://www.fribidi.org/download LIBFRIBIDI_LICENSE = LGPLv2.1+ LIBFRIBIDI_LICENSE_FILES = COPYING LIBFRIBIDI_INSTALL_STAGING = YES -# BR's libtool patch doesn't apply +# Ships a beta libtool version hence our patch doesn't apply. +# Run autoreconf to regenerate ltmain.sh. LIBFRIBIDI_AUTORECONF = YES LIBFRIBIDI_DEPENDENCIES = host-pkgconf
Signature · 1 line
2.0.4
PATCH 6/6 sudo: adjust libtool comment
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- package/sudo/sudo.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/sudo/sudo.mk +2 -1
@@ -8,7 +8,8 @@ SUDO_VERSION = 1.8.10p3 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC BSD-3c SUDO_LICENSE_FILES = doc/LICENSE -# Ships a non-release libtool that isn't patch-friendly +# Ships a beta libtool version hence our patch doesn't apply. +# Run autoreconf to regenerate ltmain.sh. SUDO_AUTORECONF = YES SUDO_CONF_OPTS = \ --without-lecture \
Signature · 1 line
2.0.4
PATCH 1/6 support/libtool: add patch for newer versions
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 7 lines · Gustavo Zacarias
Add patch to support newer (>2.4.2) versions.
Adjust patch logic to check for patchlevel greater than 2 (apply new patch) or not (apply current patch).
Some people/distributions used unreleased versions, with the string being 2.4.2.x, this packages are AUTORECONFed and have to be kept like this since the up-to-2.4.2 patch doesn't work, neither does the from-2.4.3 version patch.
Quoted 6 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- package/pkg-autotools.mk | 8 ++- support/libtool/buildroot-libtool-v2.4.4.patch | 95 ++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 support/libtool/buildroot-libtool-v2.4.4.patch
Entire series applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com