Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6569] branches/1.0/package
|
From: <abe...@us...> - 2014-06-27 18:14:36
|
Revision: 6569
http://sourceforge.net/p/astlinux/code/6569
Author: abelbeck
Date: 2014-06-27 18:14:33 +0000 (Fri, 27 Jun 2014)
Log Message:
-----------
lzo, version bump to 2.07, integer overflow security fix: CVE-2014-4608
Modified Paths:
--------------
branches/1.0/package/lzo/lzo.mk
Added Paths:
-----------
branches/1.0/package/buildroot-libtool-v2.4.2.patch
branches/1.0/package/lzo/lzo-configure-conformance-test.patch
Added: branches/1.0/package/buildroot-libtool-v2.4.2.patch
===================================================================
--- branches/1.0/package/buildroot-libtool-v2.4.2.patch (rev 0)
+++ branches/1.0/package/buildroot-libtool-v2.4.2.patch 2014-06-27 18:14:33 UTC (rev 6569)
@@ -0,0 +1,47 @@
+--- a/autoconf/ltmain.sh.orig 2014-06-27 12:04:53.000000000 -0500
++++ b/autoconf/ltmain.sh 2014-06-27 12:14:41.000000000 -0500
+@@ -2583,8 +2583,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
+@@ -4172,8 +4172,11 @@
+ # 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.
+@@ -7964,7 +7967,7 @@
+ *)
+ if test no = "$installed"; then
+ func_append notinst_deplibs " $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -10554,6 +10557,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"
Added: branches/1.0/package/lzo/lzo-configure-conformance-test.patch
===================================================================
--- branches/1.0/package/lzo/lzo-configure-conformance-test.patch (rev 0)
+++ branches/1.0/package/lzo/lzo-configure-conformance-test.patch 2014-06-27 18:14:33 UTC (rev 6569)
@@ -0,0 +1,89 @@
+--- lzo-2.07/configure.orig 2014-06-27 11:52:43.000000000 -0500
++++ lzo-2.07/configure 2014-06-27 11:54:36.000000000 -0500
+@@ -13942,86 +13942,6 @@
+ # ************************************************************************/
+
+
+-mfx_tmp="-I$srcdir"
+-mfx_save_CPPFLAGS=$CPPFLAGS
+-test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your compiler passes the LZO conformance test" >&5
+-$as_echo_n "checking whether your compiler passes the LZO conformance test... " >&6; }
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#define LZO_CFG_NO_CONFIG_HEADER 1
+-#define LZO_WANT_ACC_INCD_H 1
+-#include "include/lzo/lzodefs.h"
+-#include "src/lzo_supp.h"
+-
+-#undef LZOCHK_ASSERT
+-#define LZOCHK_ASSERT(expr) LZO_COMPILE_TIME_ASSERT_HEADER(expr)
+-#define LZO_WANT_ACC_CHK_CH 1
+-#include "src/lzo_supp.h"
+-
+-#undef LZOCHK_ASSERT
+-#define LZOCHK_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr)
+-static void test_lzo_compile_time_assert(void) {
+-#define LZO_WANT_ACC_CHK_CH 1
+-#include "src/lzo_supp.h"
+-}
+-
+-#undef NDEBUG
+-#include <assert.h>
+-#undef LZOCHK_ASSERT
+-#define LZOCHK_ASSERT(expr) assert(expr);
+-static int test_lzo_run_time_assert(int r) {
+-#define LZO_WANT_ACC_CHK_CH 1
+-#include "src/lzo_supp.h"
+-return r;
+-}
+-
+-int
+-main ()
+-{
+-
+-test_lzo_compile_time_assert();
+-if (test_lzo_run_time_assert(1) != 1) return 1;
+-
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-
+-mfx_tmp=FAILED
+-if ac_fn_c_try_compile "$LINENO"; then :
+- mfx_tmp=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-
+-CPPFLAGS=$mfx_save_CPPFLAGS
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mfx_tmp" >&5
+-$as_echo "$mfx_tmp" >&6; }
+-case x$mfx_tmp in
+- xpassed | xyes) ;;
+- *)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+-$as_echo "$as_me: " >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Your compiler failed the LZO conformance test - for details see " >&5
+-$as_echo "$as_me: Your compiler failed the LZO conformance test - for details see " >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: \`config.log'. Please check that log file and consider sending" >&5
+-$as_echo "$as_me: \`config.log'. Please check that log file and consider sending" >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: a patch or bug-report to <${PACKAGE_BUGREPORT}>." >&5
+-$as_echo "$as_me: a patch or bug-report to <${PACKAGE_BUGREPORT}>." >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Thanks for your support." >&5
+-$as_echo "$as_me: Thanks for your support." >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+-$as_echo "$as_me: " >&6;}
+- as_fn_error $? "LZO conformance test failed. Stop." "$LINENO" 5
+- ;;
+-esac
+-
+-
+ if test -r .Conf.settings2; then
+ . ./.Conf.settings2
+ fi
Modified: branches/1.0/package/lzo/lzo.mk
===================================================================
--- branches/1.0/package/lzo/lzo.mk 2014-06-26 17:57:36 UTC (rev 6568)
+++ branches/1.0/package/lzo/lzo.mk 2014-06-27 18:14:33 UTC (rev 6569)
@@ -3,9 +3,17 @@
# lzo
#
#############################################################
-LZO_VERSION = 2.05
+LZO_VERSION = 2.07
LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
LZO_INSTALL_STAGING = YES
+# Manually patch libtool
+LZO_LIBTOOL_PATCH = NO
+define LZO_LIBTOOL_PATCH_2.4.2
+ @echo "Patching libtool 2.4.2"
+ toolchain/patch-kernel.sh $(@D) package buildroot-libtool-v2.4.2.patch
+endef
+LZO_POST_PATCH_HOOKS += LZO_LIBTOOL_PATCH_2.4.2
+
$(eval $(call AUTOTARGETS,package,lzo))
$(eval $(call AUTOTARGETS,package,lzo,host))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
