# HG changeset patch # User Pascal Bellard # Date 1390857358 0 # Node ID 851490d19c0d0c452754bb02ba91a421c42aad52 # Parent 0afd1658238415df26bf9de02c4aac34c456c64a truecrypt: patch LFLAGS diff -r 0afd16582384 -r 851490d19c0d busybox/receipt --- a/busybox/receipt Mon Jan 27 22:02:29 2014 +0100 +++ b/busybox/receipt Mon Jan 27 21:15:58 2014 +0000 @@ -43,7 +43,6 @@ diff.u diet.u losetup.u -insmod.u EOT cp $stuff/$PACKAGE-${VERSION%.*}.config .config } diff -r 0afd16582384 -r 851490d19c0d busybox/stuff/busybox-1.22-insmod.u --- a/busybox/stuff/busybox-1.22-insmod.u Mon Jan 27 22:02:29 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---- busybox-1.22.0/modutils/modutils.c -+++ busybox-1.22.0/modutils/modutils.c -@@ -160,7 +160,11 @@ - mmaped = 1; - } else { - errno = ENOMEM; /* may be changed by e.g. open errors below */ -- image = xmalloc_open_zipped_read_close(filename, &image_size); -+ image = xmalloc_open_read_close(filename, &image_size); -+ if (image && image_size >= 4 && strncmp(image+1,"ELF",3)) { -+ free(image); -+ image = xmalloc_open_zipped_read_close(filename, &image_size); -+ } - if (!image) - return -errno; - } diff -r 0afd16582384 -r 851490d19c0d busybox/stuff/busybox-1.22-zmodules.u --- a/busybox/stuff/busybox-1.22-zmodules.u Mon Jan 27 22:02:29 2014 +0100 +++ b/busybox/stuff/busybox-1.22-zmodules.u Mon Jan 27 21:15:58 2014 +0000 @@ -49,6 +49,7 @@ + || (ENABLE_FEATURE_SEAMLESS_LZMA) + || (ENABLE_FEATURE_SEAMLESS_XZ) ) { - setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); +- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); ++ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); } diff -r 0afd16582384 -r 851490d19c0d truecrypt/receipt --- a/truecrypt/receipt Mon Jan 27 22:02:29 2014 +0100 +++ b/truecrypt/receipt Mon Jan 27 21:15:58 2014 +0000 @@ -16,6 +16,7 @@ # Rules to configure and make the package. compile_rules() { + sed -i 's/^export LFLAGS :=$/& -Wl,--copy-dt-needed-entries -ldl/' Makefile export PKCS11_INC="/usr/include/pkcs" cd $src make