Backport:

10882 tar fix
10884, 10920, 11128 tail fixes
10885 tftp -g fix
10900 dpkg fix (script support)
And I guess 10918 isn't relevant?

4 files changed, 24 insertions, 1 deletions

diff --git a/busybox/archival/dpkg.c b/busybox/archival/dpkg.c
index d3b56e3..6a81029 100644
--- a/busybox/archival/dpkg.c
+++ b/busybox/archival/dpkg.c
@@ -1520,6 +1520,7 @@ static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, lli
 {
 	ar_handle->sub_archive->action_data = data_extract_to_buffer;
 	ar_handle->sub_archive->accept = myaccept;
+	ar_handle->sub_archive->filter = filter_accept_list;
 
 	unpack_ar_archive(ar_handle);
 	close(ar_handle->src_fd);
@@ -1714,6 +1715,7 @@ int dpkg_main(int argc, char **argv)
 
 			if (package_num == -1) {
 				bb_error_msg("Invalid control file in %s", argv[optind]);
+                                optind++;
 				continue;
 			}
 			deb_file[deb_count]->package = (unsigned int) package_num;
diff --git a/busybox/archival/libunarchive/get_header_tar.c b/busybox/archival/libunarchive/get_header_tar.c
index 1ad9ac5..513909d 100644
--- a/busybox/archival/libunarchive/get_header_tar.c
+++ b/busybox/archival/libunarchive/get_header_tar.c
@@ -62,6 +62,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 	} tar;
 	long sum = 0;
 	long i;
+	static int end = 0;
 
 	/* Align header */
 	data_align(archive_handle, 512);
@@ -74,8 +75,17 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 
 	/* If there is no filename its an empty header */
 	if (tar.formated.name[0] == 0) {
+		if (end) {
+			/* This is the second consecutive empty header! End of archive!
+			 * Read until the end to empty the pipe from gz or bz2
+			 */
+			while (bb_full_read(archive_handle->src_fd, tar.raw, 512) == 512);
+			return(EXIT_FAILURE);
+		}
+		end = 1;
 		return(EXIT_SUCCESS);
 	}
+	end = 0;
 
 	/* Check header has valid magic, "ustar" is for the proper tar
 	 * 0's are for the old tar format
diff --git a/busybox/coreutils/tail.c b/busybox/coreutils/tail.c
index e3f89d2..1db1e2b 100644
--- a/busybox/coreutils/tail.c
+++ b/busybox/coreutils/tail.c
@@ -79,7 +79,13 @@ static void tail_xbb_full_write(const char *buf, size_t len)
 static ssize_t tail_read(int fd, char *buf, size_t count)
 {
 	ssize_t r;
+	off_t current,end;
+	struct stat sbuf;
 
+	end = current = lseek(fd, 0, SEEK_CUR);
+	if (!fstat(fd, &sbuf))
+		end = sbuf.st_size;
+	lseek(fd, end < current ? 0 : current, SEEK_SET);
 	if ((r = safe_read(fd, buf, count)) < 0) {
 		bb_perror_msg("read");
 		status = EXIT_FAILURE;
diff --git a/busybox/networking/tftp.c b/busybox/networking/tftp.c
index 47fc387..bc57f10 100644
--- a/busybox/networking/tftp.c
+++ b/busybox/networking/tftp.c
@@ -320,7 +320,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 			FD_ZERO(&rfds);
 			FD_SET(socketfd, &rfds);
 
-			switch (select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) {
+			switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
 			case 1:
 				len = recvfrom(socketfd, buf, tftp_bufsize, 0,
 						(struct sockaddr *) &from, &fromlen);
@@ -463,6 +463,11 @@ static inline int tftp(const int cmd, const struct hostent *host,
 				--block_nr;
 				opcode = TFTP_ACK;
 				continue;
+			} else if (tmp + 1 == block_nr) {
+				/* Server lost our TFTP_ACK.  Resend it */
+				block_nr = tmp;
+				opcode = TFTP_ACK;
+				continue;
 			}
 		}