wok-6.x rev 23976
net-snmp: do not install darwin?.h
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Oct 31 15:07:33 2020 +0000 (2020-10-31) |
parents | e2073ef01171 |
children | b6120eeb6704 |
files | busybox/stuff/busybox-1.31-cpio.u busybox/stuff/busybox-1.32-cpio.u net-snmp/receipt |
line diff
1.1 --- a/busybox/stuff/busybox-1.31-cpio.u Wed Oct 28 17:24:13 2020 +0000 1.2 +++ b/busybox/stuff/busybox-1.31-cpio.u Sat Oct 31 15:07:33 2020 +0000 1.3 @@ -10,3 +10,14 @@ 1.4 /* Store hardlinks for later processing, dont output them */ 1.5 if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { 1.6 struct name_s *n; 1.7 +--- busybox-1.31/archival/libarchive/get_header_cpio.c 1.8 ++++ busybox-1.31/archival/libarchive/get_header_cpio.c 1.9 +@@ -80,7 +80,7 @@ 1.10 + /* Update offset amount and skip padding before file contents */ 1.11 + data_align(archive_handle, 4); 1.12 + 1.13 +- if (strcmp(file_header->name, cpio_TRAILER) == 0) { 1.14 ++ if ((strcmp(file_header->name, cpio_TRAILER) | file_header->mode) == 0) { 1.15 + /* Always round up. ">> 9" divides by 512 */ 1.16 + archive_handle->cpio__blocks = (uoff_t)(archive_handle->offset + 511) >> 9; 1.17 + goto create_hardlinks;
2.1 --- a/busybox/stuff/busybox-1.32-cpio.u Wed Oct 28 17:24:13 2020 +0000 2.2 +++ b/busybox/stuff/busybox-1.32-cpio.u Sat Oct 31 15:07:33 2020 +0000 2.3 @@ -10,3 +10,14 @@ 2.4 /* Store hardlinks for later processing, dont output them */ 2.5 if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { 2.6 struct name_s *n; 2.7 +--- busybox-1.32/archival/libarchive/get_header_cpio.c 2.8 ++++ busybox-1.32/archival/libarchive/get_header_cpio.c 2.9 +@@ -80,7 +80,7 @@ 2.10 + /* Update offset amount and skip padding before file contents */ 2.11 + data_align(archive_handle, 4); 2.12 + 2.13 +- if (strcmp(file_header->name, cpio_TRAILER) == 0) { 2.14 ++ if ((strcmp(file_header->name, cpio_TRAILER) | file_header->mode) == 0) { 2.15 + /* Always round up. ">> 9" divides by 512 */ 2.16 + archive_handle->cpio__blocks = (uoff_t)(archive_handle->offset + 511) >> 9; 2.17 + goto create_hardlinks;
3.1 --- a/net-snmp/receipt Wed Oct 28 17:24:13 2020 +0000 3.2 +++ b/net-snmp/receipt Sat Oct 31 15:07:33 2020 +0000 3.3 @@ -18,6 +18,8 @@ 3.4 # Rules to configure and make the package. 3.5 compile_rules() 3.6 { 3.7 + export LDFLAGS="$LDFLAGS -ltinfo" 3.8 + sed 's|darwin.\{1,2\}\.h||g' -i Makefile* 3.9 ./configure \ 3.10 --prefix=/usr \ 3.11 --with-default-snmp-version="1" \