commit 27116babeb4b68f6da9628f32b17251141c24cdb
author maxwen <max.weninger@gmail.com> Fri Aug 14 21:41:28 2015 +0200
committer Ethan Yonker <dees_troy@teamw.in> Thu Oct 15 14:54:06 2015 -0500
tree 6880bf3c93c160c176ba7b1706436f2ed90f06b4
parent cd3f398fa3715f3fd0850b2b26d660595dc7e7cd

busybox: squashed commit of merging cm-12.1

With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
some missing includes to enable building for 64 bit devices

Conflicts:
	Android.mk
	android/libc/arch-x86/syscalls/swapoff.S
	android/libc/arch-x86/syscalls/swapon.S
	android/libc/arch-x86/syscalls/sysinfo.S
	android/librpc/pmap_rmt.c
	android/reboot.c
	include-full/copy-current.sh
	include-minimal/copy-current.sh
	include/platform.h
	networking/interface.c
	networking/nslookup.c

Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660

include/bb_archive.h

diff --git a/include/bb_archive.h b/include/bb_archive.h
index a7a2a11..fc976f2 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -122,6 +122,12 @@
 #define ARCHIVE_NUMERIC_OWNER       (1 << 7)
 #define ARCHIVE_O_TRUNC             (1 << 8)
 #define ARCHIVE_REMEMBER_NAMES      (1 << 9)
+#if ENABLE_RPM
+#define ARCHIVE_REPLACE_VIA_RENAME  (1 << 10)
+#endif
+#if ENABLE_FEATURE_TAR_SELINUX
+#define ARCHIVE_STORE_SELINUX		(1 << 15)
+#endif
 
 
 /* POSIX tar Header Block, from POSIX 1003.1-1990  */
@@ -143,7 +149,7 @@
 	/* Normally it's defined as magic[6] followed by
 	 * version[2], but we put them together to save code.
 	 */
-	char magic[8];            /* 257-264 */
+	char magic[8];            /* 257-264 (magic 6 + version 2) */
 	char uname[32];           /* 265-296 */
 	char gname[32];           /* 297-328 */
 	char devmajor[8];         /* 329-336 */