[package] iptables: remove CHAOS and TARPIT patches

[openwrt.git] / package / busybox / config / archival / Config.in

diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 4350076..d6120b7 100644 (file)
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -29,7 +29,7 @@ config BUSYBOX_CONFIG_AR
          probably say N here.
 
 config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES
-       bool "Enable support for long filenames (not need for debs)"
+       bool "Support for long filenames (not need for debs)"
        default n
        depends on BUSYBOX_CONFIG_AR
        help
@@ -78,6 +78,14 @@ config BUSYBOX_CONFIG_CPIO
          Unless you have a specific application which requires cpio, you should
          probably say N here.
 
+config BUSYBOX_CONFIG_FEATURE_CPIO_O
+       bool "Support for archive creation"
+       default n
+       depends on BUSYBOX_CONFIG_CPIO
+       help
+         This implementation of cpio can create cpio archives in the "newc"
+         format only.
+
 config BUSYBOX_CONFIG_DPKG
        bool "dpkg"
        default n
@@ -99,7 +107,7 @@ config BUSYBOX_CONFIG_DPKG_DEB
          probably say N here.
 
 config BUSYBOX_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
-       bool "extract only (-x)"
+       bool "Extract only (-x)"
        default n
        depends on BUSYBOX_CONFIG_DPKG_DEB
        help
@@ -131,17 +139,6 @@ config BUSYBOX_CONFIG_GZIP
          gzip is used to compress files.
          It's probably the most widely used UNIX compression program.
 
-config BUSYBOX_CONFIG_IPKG
-       bool "ipkg"
-       default y
-       select BUSYBOX_CONFIG_MD5SUM
-       select BUSYBOX_CONFIG_WGET
-       select BUSYBOX_CONFIG_DIFF
-       select BUSYBOX_CONFIG_TAR
-       select BUSYBOX_CONFIG_GUNZIP
-       help
-         ipkg is the itsy package management system.
-
 config BUSYBOX_CONFIG_RPM2CPIO
        bool "rpm2cpio"
        default n
@@ -177,6 +174,14 @@ config BUSYBOX_CONFIG_FEATURE_TAR_CREATE
          If you enable this option you'll be able to create
          tar archives using the `-c' option.
 
+config BUSYBOX_CONFIG_FEATURE_TAR_GZIP
+       bool "Enable -z option"
+       default y
+       depends on BUSYBOX_CONFIG_TAR
+       help
+         If you enable this option tar will be able to call gzip,
+         when creating or extracting tar gziped archives.
+
 config BUSYBOX_CONFIG_FEATURE_TAR_BZIP2
        bool "Enable -j option to handle .tar.bz2 files"
        default y
@@ -193,22 +198,6 @@ config BUSYBOX_CONFIG_FEATURE_TAR_LZMA
          If you enable this option you'll be able to extract
          archives compressed with lzma.
 
-config BUSYBOX_CONFIG_FEATURE_TAR_FROM
-       bool "Enable -X (exclude from) and -T (include from) options)"
-       default y
-       depends on BUSYBOX_CONFIG_TAR
-       help
-         If you enable this option you'll be able to specify
-         a list of files to include or exclude from an archive.
-
-config BUSYBOX_CONFIG_FEATURE_TAR_GZIP
-       bool "Enable -z option"
-       default y
-       depends on BUSYBOX_CONFIG_TAR
-       help
-         If you enable this option tar will be able to call gzip,
-         when creating or extracting tar gziped archives.
-
 config BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS
        bool "Enable -Z option"
        default n
@@ -217,8 +206,24 @@ config BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS
          If you enable this option tar will be able to call uncompress,
          when extracting .tar.Z archives.
 
+config BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT
+       bool "Let tar autodetect gz/bz2 compresses tarballs"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_TAR_GZIP || BUSYBOX_CONFIG_FEATURE_TAR_BZIP2
+       help
+         With this option tar can automatically detect gzip/bzip2 compressed
+         tarballs. Currently it works only on seekable streams.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_FROM
+       bool "Enable -X (exclude from) and -T (include from) options)"
+       default y
+       depends on BUSYBOX_CONFIG_TAR
+       help
+         If you enable this option you'll be able to specify
+         a list of files to include or exclude from an archive.
+
 config BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY
-       bool "Enable support for old tar header format"
+       bool "Support for old tar header format"
        default n
        depends on BUSYBOX_CONFIG_TAR
        help
@@ -236,7 +241,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY
          It is said to be fixed in newer Sun tar, but "old" tarballs still exist.
 
 config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-       bool "Enable support for some GNU tar extensions"
+       bool "Support for GNU tar extensions (long filenames)"
        default y
        depends on BUSYBOX_CONFIG_TAR
        help
@@ -248,7 +253,16 @@ config BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
        default n
        depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_GETOPT_LONG
        help
-               Enable use of long options, increases size by about 400 Bytes
+         Enable use of long options, increases size by about 400 Bytes
+
+config BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME
+       bool "Enable use of user and group names"
+       default n
+       depends on BUSYBOX_CONFIG_TAR
+       help
+         Enables use of user and group names in tar. This affects contents
+         listings (-t) and preserving permissions when unpacking (-p).
+         +200 bytes.
 
 config BUSYBOX_CONFIG_UNCOMPRESS
        bool "uncompress"
@@ -273,7 +287,7 @@ config BUSYBOX_CONFIG_UNLZMA
          should probably say N here.
 
 config BUSYBOX_CONFIG_FEATURE_LZMA_FAST
-       bool "Optimze unlzma for speed"
+       bool "Optimize unlzma for speed"
        default n
        depends on BUSYBOX_CONFIG_UNLZMA
        help
@@ -293,13 +307,6 @@ config BUSYBOX_CONFIG_UNZIP
 comment "Common options for cpio and tar"
        depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR
 
-config BUSYBOX_CONFIG_FEATURE_UNARCHIVE_TAPE
-       bool "Enable tape drive support"
-       default n
-       depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR
-       help
-         I don't think this is needed anymore.
-
 comment "Common options for dpkg and dpkg_deb"
        depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB