wok-6.x rev 15852
truecrypt: patch LFLAGS
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Jan 27 21:15:58 2014 +0000 (2014-01-27) |
parents | 0afd16582384 |
children | 165decb639cc |
files | busybox/receipt busybox/stuff/busybox-1.22-insmod.u busybox/stuff/busybox-1.22-zmodules.u truecrypt/receipt |
line diff
1.1 --- a/busybox/receipt Mon Jan 27 22:02:29 2014 +0100 1.2 +++ b/busybox/receipt Mon Jan 27 21:15:58 2014 +0000 1.3 @@ -43,7 +43,6 @@ 1.4 diff.u 1.5 diet.u 1.6 losetup.u 1.7 -insmod.u 1.8 EOT 1.9 cp $stuff/$PACKAGE-${VERSION%.*}.config .config 1.10 }
2.1 --- a/busybox/stuff/busybox-1.22-insmod.u Mon Jan 27 22:02:29 2014 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,15 +0,0 @@ 2.4 ---- busybox-1.22.0/modutils/modutils.c 2.5 -+++ busybox-1.22.0/modutils/modutils.c 2.6 -@@ -160,7 +160,11 @@ 2.7 - mmaped = 1; 2.8 - } else { 2.9 - errno = ENOMEM; /* may be changed by e.g. open errors below */ 2.10 -- image = xmalloc_open_zipped_read_close(filename, &image_size); 2.11 -+ image = xmalloc_open_read_close(filename, &image_size); 2.12 -+ if (image && image_size >= 4 && strncmp(image+1,"ELF",3)) { 2.13 -+ free(image); 2.14 -+ image = xmalloc_open_zipped_read_close(filename, &image_size); 2.15 -+ } 2.16 - if (!image) 2.17 - return -errno; 2.18 - }
3.1 --- a/busybox/stuff/busybox-1.22-zmodules.u Mon Jan 27 22:02:29 2014 +0100 3.2 +++ b/busybox/stuff/busybox-1.22-zmodules.u Mon Jan 27 21:15:58 2014 +0000 3.3 @@ -49,6 +49,7 @@ 3.4 + || (ENABLE_FEATURE_SEAMLESS_LZMA) 3.5 + || (ENABLE_FEATURE_SEAMLESS_XZ) 3.6 ) { 3.7 - setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); 3.8 +- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); 3.9 ++ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); 3.10 } 3.11
4.1 --- a/truecrypt/receipt Mon Jan 27 22:02:29 2014 +0100 4.2 +++ b/truecrypt/receipt Mon Jan 27 21:15:58 2014 +0000 4.3 @@ -16,6 +16,7 @@ 4.4 # Rules to configure and make the package. 4.5 compile_rules() 4.6 { 4.7 + sed -i 's/^export LFLAGS :=$/& -Wl,--copy-dt-needed-entries -ldl/' Makefile 4.8 export PKCS11_INC="/usr/include/pkcs" 4.9 cd $src 4.10 make