[Buildroot] [PATCH 1/6] support/libtool: add patch for newer versions

[Buildroot] [PATCH 1/6] support/libtool: add patch for newer versions

[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.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 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

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index ad2d1a6..b20e20e 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -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
diff --git a/support/libtool/buildroot-libtool-v2.4.4.patch b/support/libtool/buildroot-libtool-v2.4.4.patch
new file mode 100644
index 0000000..bcdf30c
--- /dev/null
+++ b/support/libtool/buildroot-libtool-v2.4.4.patch
@@ -0,0 +1,95 @@
+Libtool fixes for cross-compilation, many past contributors/authors.
+Update based on libtool-2.4.4, useful for 2.4.3 as well but not 2.4.2.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/ltmain.sh	2014-12-16 09:51:23.068441045 -0300
++++ b/ltmain.sh	2014-12-16 09:57:10.509430339 -0300
+@@ -2687,8 +2687,8 @@
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+-	  func_echo "unable to infer tagged configuration"
+-	  func_fatal_error "specify a tag with '--tag'"
++	  func_echo "defaulting to \`CC'"
++	  func_echo "if this is not correct, specify a tag with \`--tag'"
+ #	else
+ #	  func_verbose "using $tagname tagged configuration"
+ 	fi
+@@ -4277,8 +4277,12 @@
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
++
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  #test "$inst_prefix_dir" = "$destdir" && \
++	  #  func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -6550,7 +6554,8 @@
+ 	;;
+       -all-static | -static | -static-libtool-libs)
+ 	case $arg in
+-	-all-static)
++	# Make -static behave like -all-static -GZ
++	-all-static | -static)
+ 	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+ 	    func_warning "complete static linking is impossible in this configuration"
+ 	  fi
+@@ -6559,12 +6564,6 @@
+ 	  fi
+ 	  prefer_static_libs=yes
+ 	  ;;
+-	-static)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	  prefer_static_libs=built
+-	  ;;
+ 	-static-libtool-libs)
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+@@ -6858,7 +6857,8 @@
+       prevarg=$arg
+ 
+       case $arg in
+-      -all-static)
++      # Make -static behave like -all-static -GZ
++      -all-static | -static)
+ 	if test -n "$link_static_flag"; then
+ 	  # See comment for -static flag below, for more details.
+ 	  func_append compile_command " $link_static_flag"
+@@ -7149,7 +7149,7 @@
+ 	continue
+ 	;;
+ 
+-      -static | -static-libtool-libs)
++      -static-libtool-libs)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+@@ -8112,7 +8112,7 @@
+ 	  *)
+ 	    if test no = "$installed"; then
+ 	      func_append notinst_deplibs " $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -10710,6 +10710,10 @@
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++	      # Replacing uninstalled with installed can easily break crosscompilation,
++	      # since the installed path is generally the wrong architecture.  -CL
++	      newdependency_libs="$newdependency_libs $deplib"
++	      continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"
-- 
2.0.4

[Buildroot] [PATCH 2/6] libtool: bump to version 2.4.4

[Gustavo Zacarias]

Patch is upstream so remove it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../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

diff --git a/package/libtool/libtool-01-mips64-n64-linking.patch b/package/libtool/libtool-01-mips64-n64-linking.patch
deleted file mode 100644
index ef9084d..0000000
--- a/package/libtool/libtool-01-mips64-n64-linking.patch
+++ /dev/null
@@ -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 <Vincent.Riera@imgtec.com>
-
-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.
diff --git a/package/libtool/libtool.hash b/package/libtool/libtool.hash
new file mode 100644
index 0000000..ffa3ea5
--- /dev/null
+++ b/package/libtool/libtool.hash
@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature
+sha256	a8295b5853bf82a46635c944031e84970f2aa79c19df7a0c28f3ec8e11c07f6c	libtool-2.4.4.tar.xz
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index a039267..c392e25 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -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
-- 
2.0.4

[Buildroot] [PATCH 3/6] subversion: security bump to version 1.7.19

[Gustavo Zacarias]

Fixes:
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 <gustavo@zacarias.com.ar>
---
 package/subversion/subversion.hash | 2 ++
 package/subversion/subversion.mk   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 package/subversion/subversion.hash

diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash
new file mode 100644
index 0000000..b6a0e88
--- /dev/null
+++ b/package/subversion/subversion.hash
@@ -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
diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk
index 5f37a87..3c6c3f0 100644
--- a/package/subversion/subversion.mk
+++ b/package/subversion/subversion.mk
@@ -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: \
-- 
2.0.4

[Buildroot] [PATCH 4/6] lzo: adjust libtool comment

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/lzo/lzo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 9f0729a..a94b5f5 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -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
 
-- 
2.0.4

[Buildroot] [PATCH 5/6] libfribidi: adjust libtool comment

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libfribidi/libfribidi.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk
index 2474d7a..20a5df0 100644
--- a/package/libfribidi/libfribidi.mk
+++ b/package/libfribidi/libfribidi.mk
@@ -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
 
-- 
2.0.4

[Buildroot] [PATCH 6/6] sudo: adjust libtool comment

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/sudo/sudo.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 61635ec..df3910e 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -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 \
-- 
2.0.4

[Buildroot] [PATCH 1/6] support/libtool: add patch for newer versions

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 16 Dec 2014 11:08:15 -0300, Gustavo Zacarias wrote:
> 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 <gustavo@zacarias.com.ar>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com