[or-cvs] r19002: {torvm} Revert to 2.6.26 until vm reboot / halt crashes are fixed; r (torvm/trunk/build/kamikaze/patches)
coderman at seul.org
coderman at seul.org
Sun Mar 15 00:35:36 UTC 2009
Author: coderman
Date: 2009-03-14 20:35:36 -0400 (Sat, 14 Mar 2009)
New Revision: 19002
Modified:
torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch
torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch
torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
Log:
Revert to 2.6.26 until vm reboot / halt crashes are fixed; remove unnecessary openssl patches from rebase against rev 14298.
Modified: torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch 2009-03-15 00:32:40 UTC (rev 19001)
+++ torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch 2009-03-15 00:35:36 UTC (rev 19002)
@@ -1,7 +1,16 @@
diff -Naur a/package/openssl/Makefile b/package/openssl/Makefile
--- a/package/openssl/Makefile 2009-01-19 09:50:41.579748000 +0000
-+++ b/package/openssl/Makefile 2009-02-04 14:29:04.905022952 +0000
-@@ -73,19 +73,18 @@
++++ b/package/openssl/Makefile 2009-03-14 23:01:32.442069224 +0000
+@@ -19,8 +19,6 @@
+ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
+ PKG_MD5SUM:=a5cb5f6c3d11affb387ecf7a997cac0c
+
+-PKG_BUILD_DEPENDS:=ocf-crypto-headers
+-
+ include $(INCLUDE_DIR)/package.mk
+
+ define Package/openssl/Default
+@@ -73,25 +71,26 @@
OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \
no-sse2 no-perlasm --with-cryptodev
else
@@ -23,3 +32,1553 @@
$(OPENSSL_NO_CIPHERS) \
$(OPENSSL_OPTIONS) \
)
+ endef
+
+ TARGET_CFLAGS += $(FPIC)
++# apps is currently broken
++TARGET_BUILDDIRS=crypto fips ssl
+
+ define Build/Compile
+ rm -rf $(PKG_INSTALL_DIR)
+@@ -99,21 +98,24 @@
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ MAKEDEPPROG="$(TARGET_CROSS)gcc" \
+ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
++ DIRS="$(TARGET_BUILDDIRS)" \
+ depend
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ CC="$(TARGET_CC)" \
+ AR="$(TARGET_CROSS)ar r" \
+ RANLIB="$(TARGET_CROSS)ranlib" \
+ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
++ DIRS="$(TARGET_BUILDDIRS)" \
+ all build-shared
+ # Work around openssl build bug to link libssl.so with libcrypto.so.
+- -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
+- $(MAKE) -C $(PKG_BUILD_DIR) \
+- CC="$(TARGET_CC)" \
+- OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+- do_linux-shared
++ # -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
++ # $(MAKE) -C $(PKG_BUILD_DIR) \
++ # CC="$(TARGET_CC)" \
++ # OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
++ # do_linux-shared
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
++ DIRS="$(TARGET_BUILDDIRS)" \
+ install
+ endef
+
+diff -Naur a/package/openssl/patches/100-parallel-build.patch b/package/openssl/patches/100-parallel-build.patch
+--- a/package/openssl/patches/100-parallel-build.patch 2009-01-19 09:50:41.579748000 +0000
++++ b/package/openssl/patches/100-parallel-build.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,24 +0,0 @@
+-diff -uNr openssl-0.9.8j.ORIG/Makefile.org openssl-0.9.8j/Makefile.org
+---- openssl-0.9.8j.ORIG/Makefile.org 2009-01-07 18:06:31.000000000 +0000
+-+++ openssl-0.9.8j/Makefile.org 2009-01-07 18:08:38.000000000 +0000
+-@@ -333,15 +333,15 @@
+- dir=crypto; target=all; $(BUILD_ONE_CMD)
+- build_fips:
+- @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
+--build_ssl:
+-+build_ssl: build_crypto
+- @dir=ssl; target=all; $(BUILD_ONE_CMD)
+--build_engines:
+-+build_engines: build_crypto
+- @dir=engines; target=all; $(BUILD_ONE_CMD)
+--build_apps:
+-+build_apps: build_libs
+- @dir=apps; target=all; $(BUILD_ONE_CMD)
+--build_tests:
+-+build_tests: build_libs
+- @dir=test; target=all; $(BUILD_ONE_CMD)
+--build_tools:
+-+build_tools: build_libs
+- @dir=tools; target=all; $(BUILD_ONE_CMD)
+-
+- all_testapps: build_libs build_testapps
+diff -Naur a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch
+--- a/package/openssl/patches/110-optimize-for-size.patch 2008-05-31 15:52:11.560038000 +0000
++++ b/package/openssl/patches/110-optimize-for-size.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,12 +0,0 @@
+-diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
+---- openssl-0.9.8h.orig/Configure 2008-05-31 17:27:47.000000000 +0200
+-+++ openssl-0.9.8h/Configure 2008-05-31 17:28:16.000000000 +0200
+-@@ -357,6 +357,8 @@
+- "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
+- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
+-+# OpenWrt targets
+-+"linux-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-
+- #### *BSD [do see comment about ${BSDthreads} above!]
+- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+diff -Naur a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch
+--- a/package/openssl/patches/150-no_engines.patch 2008-11-03 21:26:27.396977000 +0000
++++ b/package/openssl/patches/150-no_engines.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,83 +0,0 @@
+-diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure
+---- openssl-0.9.8i.orig/Configure 2008-05-31 17:31:04.000000000 +0200
+-+++ openssl-0.9.8i/Configure 2008-05-31 17:30:47.000000000 +0200
+-@@ -1714,6 +1714,11 @@
+- close(OUT);
+- }
+-
+-+# ugly hack to disable engines
+-+if($target eq "mingwx") {
+-+ system("sed -e s/^LIB/XLIB/g -i engines/Makefile");
+-+}
+-+
+- print <<EOF;
+-
+- Configured for $target.
+-diff -ur openssl-0.9.8i.orig/util/libeay.num openssl-0.9.8i/util/libeay.num
+---- openssl-0.9.8i.orig/util/libeay.num 2008-05-31 17:27:46.000000000 +0200
+-+++ openssl-0.9.8i/util/libeay.num 2008-05-31 17:30:47.000000000 +0200
+-@@ -2071,7 +2071,6 @@
+- UI_add_error_string 2633 EXIST::FUNCTION:
+- KRB5_CHECKSUM_free 2634 EXIST::FUNCTION:
+- OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION:
+--ENGINE_load_ubsec 2636 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE
+- PKEY_USAGE_PERIOD_it 2638 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+- PKEY_USAGE_PERIOD_it 2638 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+-@@ -2545,7 +2544,6 @@
+- AES_set_encrypt_key 3024 EXIST::FUNCTION:AES
+- OCSP_resp_count 3025 EXIST::FUNCTION:
+- KRB5_CHECKSUM_new 3026 EXIST::FUNCTION:
+--ENGINE_load_cswift 3027 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- OCSP_onereq_get0_id 3028 EXIST::FUNCTION:
+- ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE
+- NOTICEREF_it 3030 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+-@@ -2576,7 +2574,6 @@
+- i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION:
+- i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION:
+- asn1_enc_save 3054 EXIST::FUNCTION:
+--ENGINE_load_nuron 3055 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- _ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES
+- PKCS12_MAC_DATA_it 3057 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+- PKCS12_MAC_DATA_it 3057 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+-@@ -2600,7 +2597,6 @@
+- i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION:
+- ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE
+- AES_options 3074 EXIST::FUNCTION:AES
+--ENGINE_load_chil 3075 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- OCSP_id_cmp 3076 EXIST::FUNCTION:
+- OCSP_BASICRESP_new 3077 EXIST::FUNCTION:
+- OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION:
+-@@ -2667,7 +2663,6 @@
+- OCSP_CRLID_it 3127 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+- i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION:
+- OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION:
+--ENGINE_load_atalla 3130 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+- X509_NAME_it 3131 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+- USERNOTICE_it 3132 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+-@@ -2762,8 +2757,6 @@
+- DES_read_password 3207 EXIST::FUNCTION:DES
+- UI_UTIL_read_pw 3208 EXIST::FUNCTION:
+- UI_UTIL_read_pw_string 3209 EXIST::FUNCTION:
+--ENGINE_load_aep 3210 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+--ENGINE_load_sureware 3211 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION:
+- OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION:
+- OPENSSL_add_all_algorithms_conf 3213 EXIST:!VMS:FUNCTION:
+-@@ -2772,7 +2765,6 @@
+- AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES
+- AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
+- AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
+--ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+- _ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
+- EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
+- EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES
+-@@ -3107,7 +3099,6 @@
+- STORE_method_set_modify_function 3530 EXIST:!VMS:FUNCTION:
+- STORE_meth_set_modify_fn 3530 EXIST:VMS:FUNCTION:
+- STORE_parse_attrs_next 3531 EXIST::FUNCTION:
+--ENGINE_load_padlock 3532 EXIST::FUNCTION:ENGINE
+- EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC
+- X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+- X509_CERT_PAIR_it 3534 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+diff -Naur a/package/openssl/patches/200-ocf-20080917.patch b/package/openssl/patches/200-ocf-20080917.patch
+--- a/package/openssl/patches/200-ocf-20080917.patch 2008-11-18 20:52:33.148086000 +0000
++++ b/package/openssl/patches/200-ocf-20080917.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,1359 +0,0 @@
+---- a/Configure
+-+++ b/Configure
+-@@ -34,6 +34,8 @@ my $usage="Usage: Configure [no-<cipher>
+- # (Default: KRB5_DIR/include)
+- # --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
+- # supported values are "MIT" and "Heimdal". A value is required.
+-+# --with-cryptodev Force support for cryptodev (ie., ocf-linux)
+-+# --with-cryptodev-digests Force support for cryptodev digests (generally slow)
+- #
+- # --test-sanity Make a number of sanity checks on the data in this file.
+- # This is a debugging tool for OpenSSL developers.
+-@@ -540,6 +542,9 @@ my %table=(
+- ##### Compaq Non-Stop Kernel (Tandem)
+- "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
+-
+-+# uClinux
+-+"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG::::::::::::\$(LIBSSL_dlfcn):linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}",
+-+
+- );
+-
+- my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
+-@@ -589,6 +594,8 @@ my $montasm=1; # but "no-montasm" is d
+- my $no_asm=0;
+- my $no_dso=0;
+- my $no_gmp=0;
+-+my $have_cryptodev=0;
+-+my $use_cryptodev_digests=0;
+- my @skip=();
+- my $Makefile="Makefile";
+- my $des_locl="crypto/des/des_locl.h";
+-@@ -716,6 +723,14 @@ PROCESS_ARGS:
+- {
+- exit(&test_sanity());
+- }
+-+ elsif (/^--with-cryptodev$/)
+-+ {
+-+ $have_cryptodev = 1;
+-+ }
+-+ elsif (/^--with-cryptodev-digests$/)
+-+ {
+-+ $use_cryptodev_digests = 1;
+-+ }
+- elsif (/^reconfigure/ || /^reconf/)
+- {
+- if (open(IN,"<$Makefile"))
+-@@ -924,6 +939,7 @@ foreach (sort (keys %disabled))
+- print " OPENSSL_NO_$ALGO";
+-
+- if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; }
+-+ elsif (/^hw$/) { $flags .= "-DOPENSSL_NO_HW "; }
+- elsif (/^asm$/) { $no_asm = 1; }
+- }
+- else
+-@@ -1064,6 +1080,16 @@ if (!$no_krb5)
+- $withargs{"krb5-dir"} ne "";
+- }
+-
+-+# enable the linux cryptodev (ocf-linux) support
+-+if ($have_cryptodev)
+-+ {
+-+ if ($use_cryptodev_digests)
+-+ {
+-+ $cflags = "-DUSE_CRYPTODEV_DIGESTS $cflags";
+-+ }
+-+ $cflags = "-DHAVE_CRYPTODEV $cflags";
+-+ }
+-+
+- # The DSO code currently always implements all functions so that no
+- # applications will have to worry about that from a compilation point
+- # of view. However, the "method"s may return zero unless that platform
+---- a/INSTALL
+-+++ b/INSTALL
+-@@ -103,6 +103,12 @@
+- define preprocessor symbols, specify additional libraries,
+- library directories or other compiler options.
+-
+-+ --with-cryptodev Enabled the BSD cryptodev engine even if we are not using
+-+ BSD. Useful if you are running ocf-linux or something
+-+ similar. Once enabled you can also enable the use of
+-+ cryptodev digests, with is usually slower unless you have
+-+ large amounts data. Use --with-cryptodev-digests to force
+-+ it.
+-
+- Installation in Detail
+- ----------------------
+---- a/Makefile.org
+-+++ b/Makefile.org
+-@@ -367,7 +367,7 @@ files:
+-
+- links:
+- @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
+-- @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
+-+ @$(PERL) $(TOP)/util/mklink.pl include/openssl $(HEADER) $(EXHEADER)
+- @set -e; target=links; $(RECURSIVE_BUILD_CMD)
+-
+- gentests:
+---- a/Makefile.shared
+-+++ b/Makefile.shared
+-@@ -6,13 +6,13 @@
+- # properly
+-
+- # CC contains the current compiler. This one MUST be defined
+--CC=cc
+--CFLAGS=$(CFLAG)
+-+CC?=cc
+-+CFLAGS?=$(CFLAG)
+- # LDFLAGS contains flags to be used when temporary object files (when building
+- # shared libraries) are created, or when an application is linked.
+- # SHARED_LDFLAGS contains flags to be used when the shared library is created.
+--LDFLAGS=
+--SHARED_LDFLAGS=
+-+LDFLAGS?=
+-+SHARED_LDFLAGS?=
+-
+- # LIBNAME contains just the name of the library, without prefix ("lib"
+- # on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
+---- a/config
+-+++ b/config
+-@@ -48,10 +48,10 @@ done
+-
+- # First get uname entries that we use below
+-
+--MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
+--RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
+--SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown"
+--VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
+-+[ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
+-+[ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
+-+[ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown"
+-+[ "$VERSION" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
+-
+-
+- # Now test for ISC and SCO, since it is has a braindamaged uname.
+-@@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+- echo "ppc-apple-darwin${VERSION}"
+- ;;
+- *)
+-- echo "i386-apple-darwin${VERSION}"
+-+ echo "${MACHINE}-apple-darwin${VERSION}"
+- ;;
+- esac
+- exit 0
+-@@ -401,9 +401,9 @@ exit 0
+-
+- # figure out if gcc is available and if so we use it otherwise
+- # we fallback to whatever cc does on the system
+--GCCVER=`(gcc -dumpversion) 2>/dev/null`
+-+CC="${CC:-gcc}"
+-+GCCVER=`(${CC} -dumpversion) 2>/dev/null`
+- if [ "$GCCVER" != "" ]; then
+-- CC=gcc
+- # then strip off whatever prefix egcs prepends the number with...
+- # Hopefully, this will work for any future prefixes as well.
+- GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
+-@@ -413,7 +413,7 @@ if [ "$GCCVER" != "" ]; then
+- # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
+- else
+-- CC=cc
+-+ CC="${CC:-cc}"
+- fi
+- GCCVER=${GCCVER:-0}
+- if [ "$SYSTEM" = "HP-UX" ];then
+-@@ -482,6 +482,9 @@ echo Operating system: $GUESSOS
+- # script above so we end up with values in vars but that would take
+- # more time that I want to waste at the moment
+- case "$GUESSOS" in
+-+ uClinux*)
+-+ OUT=uClinux-dist
+-+ ;;
+- mips2-sgi-irix)
+- CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+- CPU=${CPU:-0}
+---- /dev/null
+-+++ b/makefile-uclinuxdist
+-@@ -0,0 +1,138 @@
+-+#
+-+# this makefile gets recursed through by various bits of the build
+-+# so we need to only setup some things when invoked from outside
+-+# this directory.
+-+#
+-+# davidm at snapgear.com
+-+#
+-+
+-+IN_LIBSSL := true
+-+export IN_LIBSSL
+-+
+-+CONFIG_OPTS := --prefix=// --install_prefix=$(shell pwd)/build/install
+-+
+-+ifdef CONFIG_USER_FLATFSD_FLATFSD
+-+CONFIG_OPTS += --openssldir=/etc/config
+-+else
+-+CONFIG_OPTS += --openssldir=/etc
+-+endif
+-+ifdef DISABLE_SHARED_SSL
+-+CONFIG_OPTS += no-shared
+-+else
+-+CONFIG_OPTS += shared
+-+endif
+-+
+-+CONFIG_OPTS += no-rc2
+-+CONFIG_OPTS += no-krb5
+-+CONFIG_OPTS += no-rc5
+-+CONFIG_OPTS += no-md2
+-+CONFIG_OPTS += no-idea
+-+#CONFIG_OPTS += no-pem
+-+#CONFIG_OPTS += no-md5
+-+#CONFIG_OPTS += no-sha
+-+#CONFIG_OPTS += no-hmac
+-+#CONFIG_OPTS += no-des
+-+#CONFIG_OPTS += no-aes
+-+#CONFIG_OPTS += no-bn
+-+CONFIG_OPTS += no-ec
+-+#CONFIG_OPTS += no-rsa
+-+#CONFIG_OPTS += no-dsa
+-+CONFIG_OPTS += no-ecdsa
+-+#CONFIG_OPTS += no-dh
+-+CONFIG_OPTS += no-ecdh
+-+CONFIG_OPTS += no-dso
+-+#CONFIG_OPTS += no-engine
+-+#CONFIG_OPTS += no-buffer
+-+#CONFIG_OPTS += no-bio
+-+#CONFIG_OPTS += no-stack
+-+#CONFIG_OPTS += no-lhash
+-+#CONFIG_OPTS += no-rand
+-+CONFIG_OPTS += no-err
+-+#CONFIG_OPTS += no-evp
+-+#CONFIG_OPTS += no-asn1
+-+#CONFIG_OPTS += no-x509
+-+#CONFIG_OPTS += no-x509v3
+-+#CONFIG_OPTS += no-txt_db
+-+#CONFIG_OPTS += no-pkcs7
+-+#CONFIG_OPTS += no-pkcs12
+-+#CONFIG_OPTS += no-comp
+-+#CONFIG_OPTS += no-ocsp
+-+#CONFIG_OPTS += no-ui
+-+#CONFIG_OPTS += no-store
+-+CONFIG_OPTS += no-pqueue
+-+
+-+# REVISIT: It would be better to have OPENSSL config options
+-+# which turn on this support as needed
+-+ifeq ($(CONFIG_USER_NESSUS_NASL)$(CONFIG_USER_SSH_SSH),)
+-+CONFIG_OPTS += no-ripemd
+-+CONFIG_OPTS += no-cast
+-+CONFIG_OPTS += no-rc4
+-+endif
+-+
+-+ifeq ($(CONFIG_USER_NESSUS_NASL)$(CONFIG_USER_SSH_SSH)$(CONFIG_PROP_SSCEP_SSCEP),)
+-+CONFIG_OPTS += no-bf
+-+endif
+-+
+-+ifeq ($(CONFIG_USER_OPENVPN_OPENVPN)$(CONFIG_USER_WGET),)
+-+CONFIG_OPTS += no-md4
+-+endif
+-+
+-+ifdef CONFIG_OCF_OCF
+-+CONFIG_OPTS += --with-cryptodev
+-+#CONFIG_OPTS += --with-cryptodev-digests
+-+endif
+-+
+-+#
+-+# if you want engines (they are dl loaded), a few things
+-+# need to be setup, you will also need to mod everything
+-+# to link against -ldl if it uses libcrypto. By default we
+-+# disable it (cryptodev suport is still included).
+-+#
+-+ifdef YOU_WANT_DYNAMIC_HW_ENGINES_ENABLED
+-+LIBSSL_dlfcn = dlfcn
+-+else
+-+CONFIG_OPTS += no-hw
+-+LIBSSL_dlfcn =
+-+endif
+-+
+-+#
+-+# our libs aren't in the default location yet
+-+#
+-+LDFLAGS += -L$(ROOTDIR)/lib/libssl/build
+-+export LDFLAGS
+-+
+-+all: build/configured
+-+ $(MAKE) -C build
+-+ $(MAKE) -C build install_sw
+-+
+-+build/configured: makefile config Configure
+-+ rm -rf build
+-+ find . -type d > .dirs
+-+ find . ! -type d | grep -v ./makefile > .files
+-+ while read t; do mkdir -p build/$$t; done < .dirs
+-+ while read t; do ln -s `pwd`/$$t build/$$t; done < .files
+-+ rm -f .dirs .files
+-+ chmod +x build/config
+-+ cd build; MACHINE=uClinux-dist ./config $(CONFIG_OPTS)
+-+ $(MAKE) -C build depend
+-+ $(MAKE) -C build links
+-+ touch build/configured
+-+
+-+clean:
+-+ -rm -rf build
+-+
+-+romfs:
+-+ cd build/install/lib; \
+-+ for i in *.so*; do \
+-+ if [ -L $$i ]; then \
+-+ $(ROMFSINST) -s `find $$i -printf %l` /lib/$$i; \
+-+ elif [ -f $$i ]; then \
+-+ $(ROMFSINST) /lib/$$i; \
+-+ fi; \
+-+ done
+-+
+-+romfs_user:
+-+ $(ROMFSINST) -e CONFIG_USER_OPENSSL_APPS build/install/bin/openssl /bin/openssl
+-+ # $(ROMFSINST) -e CONFIG_USER_OPENSSL_APPS build/install/bin/c_rehash /bin/c_rehash
+-+
+-+
+---- a/apps/apps.h
+-+++ b/apps/apps.h
+-@@ -112,7 +112,7 @@
+- #ifndef HEADER_APPS_H
+- #define HEADER_APPS_H
+-
+--#include "e_os.h"
+-+#include <openssl/e_os.h>
+-
+- #include <openssl/bio.h>
+- #include <openssl/x509.h>
+---- a/apps/progs.h
+-+++ b/apps/progs.h
+-@@ -129,7 +129,9 @@ FUNCTION functions[] = {
+- #ifndef OPENSSL_NO_ENGINE
+- {FUNC_TYPE_GENERAL,"engine",engine_main},
+- #endif
+-+#ifndef OPENSSL_NO_OCSP
+- {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
+-+#endif
+- {FUNC_TYPE_GENERAL,"prime",prime_main},
+- #ifndef OPENSSL_NO_MD2
+- {FUNC_TYPE_MD,"md2",dgst_main},
+---- a/apps/speed.c
+-+++ b/apps/speed.c
+-@@ -292,7 +292,7 @@ static const char *names[ALGOR_NUM]={
+- "evp","sha256","sha512",
+- "aes-128 ige","aes-192 ige","aes-256 ige"};
+- static double results[ALGOR_NUM][SIZE_NUM];
+--static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
+-+static int lengths[SIZE_NUM]={16,64,256,1024,2*1024,4*1024};
+- static double rsa_results[RSA_NUM][2];
+- static double dsa_results[DSA_NUM][2];
+- #ifndef OPENSSL_NO_ECDSA
+-@@ -328,6 +328,79 @@ static SIGRETTYPE sig_done(int sig)
+- #define START 0
+- #define STOP 1
+-
+-+#ifdef __linux__
+-+/*
+-+ * record CPU usage as well
+-+ */
+-+
+-+static int do_cpu = 0;
+-+
+-+struct cpu_stat {
+-+ unsigned int user;
+-+ unsigned int nice;
+-+ unsigned int system;
+-+ unsigned int idle;
+-+ unsigned int total;
+-+};
+-+
+-+static unsigned int cpu_usage[ALGOR_NUM][SIZE_NUM];
+-+static unsigned int rsa_cpu_usage[RSA_NUM][2];
+-+static unsigned int dsa_cpu_usage[DSA_NUM][2];
+-+static struct cpu_stat cpu_start, cpu_finish;
+-+
+-+static void
+-+get_cpu(int s)
+-+{
+-+ FILE *fp = NULL;
+-+ unsigned char buf[80];
+-+ struct cpu_stat *st = s == START ? &cpu_start : &cpu_finish;
+-+
+-+ memset(st, 0, sizeof(*st));
+-+
+-+ if (fp == NULL)
+-+ fp = fopen("/proc/stat", "r");
+-+ if (!fp)
+-+ return;
+-+ if (fseek(fp, 0, SEEK_SET) == -1) {
+-+ fclose(fp);
+-+ return;
+-+ }
+-+ fscanf(fp, "%s %d %d %d %d", &buf[0], &st->user, &st->nice,
+-+ &st->system, &st->idle);
+-+ st->total = st->user + st->nice + st->system + st->idle;
+-+ fclose(fp);
+-+}
+-+
+-+static unsigned int
+-+calc_cpu()
+-+{
+-+ unsigned int total, res;
+-+
+-+ total = cpu_finish.total - cpu_start.total;
+-+ if (total <= 0)
+-+ return 0;
+-+#if 1 // busy
+-+ res = ((cpu_finish.system + cpu_finish.user + cpu_finish.nice) -
+-+ (cpu_start.system + cpu_start.user + cpu_start.nice)) *
+-+ 100 / total;
+-+#endif
+-+#if 0 // system
+-+ res = (cpu_finish.system - cpu_start.system) * 100 / total;
+-+#endif
+-+#if 0 // user
+-+ res = (cpu_finish.user - cpu_start.user) * 100 / total;
+-+#endif
+-+#if 0 // nice
+-+ res = (cpu_finish.nice - cpu_start.nice) * 100 / total;
+-+#endif
+-+#if 0 // idle
+-+ res = (cpu_finish.idle - cpu_start.idle) * 100 / total;
+-+#endif
+-+ return(res);
+-+}
+-+
+-+#endif
+-+
+- #if defined(OPENSSL_SYS_NETWARE)
+-
+- /* for NetWare the best we can do is use clock() which returns the
+-@@ -358,6 +431,11 @@ static double Time_F(int s)
+- {
+- double ret;
+-
+-+#ifdef __linux__
+-+ if (do_cpu)
+-+ get_cpu(s);
+-+#endif
+-+
+- #ifdef USE_TOD
+- if(usertime)
+- {
+-@@ -832,6 +910,14 @@ int MAIN(int argc, char **argv)
+- j--; /* Otherwise, -elapsed gets confused with
+- an algorithm. */
+- }
+-+#ifdef __linux__
+-+ else if ((argc > 0) && (strcmp(*argv,"-cpu") == 0))
+-+ {
+-+ do_cpu = 1;
+-+ j--; /* Otherwise, -cpu gets confused with
+-+ an algorithm. */
+-+ }
+-+#endif
+- else if ((argc > 0) && (strcmp(*argv,"-evp") == 0))
+- {
+- argc--;
+-@@ -1260,6 +1346,9 @@ int MAIN(int argc, char **argv)
+- #ifdef HAVE_FORK
+- BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n");
+- #endif
+-+#ifdef __linux__
+-+ BIO_printf(bio_err,"-cpu calculate cpu utilisation.\n");
+-+#endif
+- goto end;
+- }
+- argc--;
+-@@ -1267,11 +1356,6 @@ int MAIN(int argc, char **argv)
+- j++;
+- }
+-
+--#ifdef HAVE_FORK
+-- if(multi && do_multi(multi))
+-- goto show_res;
+--#endif
+--
+- if (j == 0)
+- {
+- for (i=0; i<ALGOR_NUM; i++)
+-@@ -1604,6 +1688,11 @@ int MAIN(int argc, char **argv)
+- signal(SIGALRM,sig_done);
+- #endif /* SIGALRM */
+-
+-+#ifdef HAVE_FORK /* DM */
+-+ if(multi && do_multi(multi))
+-+ goto show_res;
+-+#endif
+-+
+- #ifndef OPENSSL_NO_MD2
+- if (doit[D_MD2])
+- {
+-@@ -2033,8 +2122,6 @@ int MAIN(int argc, char **argv)
+- /* -O3 -fschedule-insns messes up an
+- * optimization here! names[D_EVP]
+- * somehow becomes NULL */
+-- print_message(names[D_EVP],save_count,
+-- lengths[j]);
+-
+- EVP_CIPHER_CTX_init(&ctx);
+- if(decrypt)
+-@@ -2043,6 +2130,9 @@ int MAIN(int argc, char **argv)
+- EVP_EncryptInit_ex(&ctx,evp_cipher,NULL,key16,iv);
+- EVP_CIPHER_CTX_set_padding(&ctx, 0);
+-
+-+ print_message(names[D_EVP],save_count,
+-+ lengths[j]);
+-+
+- Time_F(START);
+- if(decrypt)
+- for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
+-@@ -2107,6 +2197,8 @@ int MAIN(int argc, char **argv)
+- }
+- }
+- d=Time_F(STOP);
+-+ if (do_cpu)
+-+ rsa_cpu_usage[j][0] = calc_cpu();
+- BIO_printf(bio_err,mr ? "+R1:%ld:%d:%.2f\n"
+- : "%ld %d bit private RSA's in %.2fs\n",
+- count,rsa_bits[j],d);
+-@@ -2142,6 +2234,8 @@ int MAIN(int argc, char **argv)
+- }
+- }
+- d=Time_F(STOP);
+-+ if (do_cpu)
+-+ rsa_cpu_usage[j][1] = calc_cpu();
+- BIO_printf(bio_err,mr ? "+R2:%ld:%d:%.2f\n"
+- : "%ld %d bit public RSA's in %.2fs\n",
+- count,rsa_bits[j],d);
+-@@ -2201,6 +2295,8 @@ int MAIN(int argc, char **argv)
+- }
+- }
+- d=Time_F(STOP);
+-+ if (do_cpu)
+-+ dsa_cpu_usage[j][0] = calc_cpu();
+- BIO_printf(bio_err,mr ? "+R3:%ld:%d:%.2f\n"
+- : "%ld %d bit DSA signs in %.2fs\n",
+- count,dsa_bits[j],d);
+-@@ -2236,6 +2332,8 @@ int MAIN(int argc, char **argv)
+- }
+- }
+- d=Time_F(STOP);
+-+ if (do_cpu)
+-+ dsa_cpu_usage[j][1] = calc_cpu();
+- BIO_printf(bio_err,mr ? "+R4:%ld:%d:%.2f\n"
+- : "%ld %d bit DSA verify in %.2fs\n",
+- count,dsa_bits[j],d);
+-@@ -2530,14 +2628,23 @@ show_res:
+- fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n");
+- fprintf(stdout,"type ");
+- }
+-- for (j=0; j<SIZE_NUM; j++)
+-+ for (j=0; j<SIZE_NUM; j++) {
+- fprintf(stdout,mr ? ":%d" : "%7d bytes",lengths[j]);
+-+ if (do_cpu && !mr)
+-+ fprintf(stdout, " /cpu");
+-+ }
+- fprintf(stdout,"\n");
+- }
+-
+- for (k=0; k<ALGOR_NUM; k++)
+- {
+- if (!doit[k]) continue;
+-+ if (k == D_EVP) {
+-+ if (evp_cipher)
+-+ names[D_EVP]=OBJ_nid2ln(evp_cipher->nid);
+-+ else
+-+ names[D_EVP]=OBJ_nid2ln(evp_md->type);
+-+ }
+- if(mr)
+- fprintf(stdout,"+F:%d:%s",k,names[k]);
+- else
+-@@ -2548,6 +2655,8 @@ show_res:
+- fprintf(stdout," %11.2fk",results[k][j]/1e3);
+- else
+- fprintf(stdout,mr ? ":%.2f" : " %11.2f ",results[k][j]);
+-+ if (do_cpu)
+-+ fprintf(stdout, mr ? "/%d" : "/%%%-3d", cpu_usage[k][j]);
+- }
+- fprintf(stdout,"\n");
+- }
+-@@ -2562,13 +2671,18 @@ show_res:
+- j=0;
+- }
+- if(mr)
+-- fprintf(stdout,"+F2:%u:%u:%f:%f\n",
+-- k,rsa_bits[k],rsa_results[k][0],
+-- rsa_results[k][1]);
+-- else
+-- fprintf(stdout,"rsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
+-- rsa_bits[k],rsa_results[k][0],rsa_results[k][1],
+-- 1.0/rsa_results[k][0],1.0/rsa_results[k][1]);
+-+ fprintf(stdout,"+F2:%u:%u:%f", k,rsa_bits[k],rsa_results[k][0]);
+-+ else
+-+ fprintf(stdout,"rsa %4u bits %8.6fs",rsa_bits[k],rsa_results[k][0]);
+-+ if (do_cpu)
+-+ fprintf(stdout, mr ? "/%d": "/%%%-3d", rsa_cpu_usage[k][0]);
+-+ fprintf(stdout, mr ? ":%f" : " %8.6fs", rsa_results[k][1]);
+-+ if (do_cpu)
+-+ fprintf(stdout, mr ? "/%d": "/%%%-3d", rsa_cpu_usage[k][1]);
+-+ if(!mr)
+-+ fprintf(stdout, " %8.1f %8.1f",
+-+ 1.0/rsa_results[k][0],1.0/rsa_results[k][1]);
+-+ fprintf(stdout, "\n");
+- }
+- #endif
+- #ifndef OPENSSL_NO_DSA
+-@@ -2582,12 +2696,18 @@ show_res:
+- j=0;
+- }
+- if(mr)
+-- fprintf(stdout,"+F3:%u:%u:%f:%f\n",
+-- k,dsa_bits[k],dsa_results[k][0],dsa_results[k][1]);
+-+ fprintf(stdout,"+F3:%u:%u:%f", k,dsa_bits[k],dsa_results[k][0]);
+- else
+-- fprintf(stdout,"dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
+-- dsa_bits[k],dsa_results[k][0],dsa_results[k][1],
+-- 1.0/dsa_results[k][0],1.0/dsa_results[k][1]);
+-+ fprintf(stdout,"dsa %4u bits %8.6fs",dsa_bits[k],dsa_results[k][0]);
+-+ if (do_cpu)
+-+ fprintf(stdout, mr ? "/%d": "/%%%-3d", dsa_cpu_usage[k][0]);
+-+ fprintf(stdout, mr ? ":%f" : " %8.6fs", dsa_results[k][1]);
+-+ if (do_cpu)
+-+ fprintf(stdout, mr ? "/%d": "/%%%-3d", dsa_cpu_usage[k][1]);
+-+ if(!mr)
+-+ fprintf(stdout, " %8.1f %8.1f",
+-+ 1.0/dsa_results[k][0],1.0/dsa_results[k][1]);
+-+ fprintf(stdout, "\n");
+- }
+- #endif
+- #ifndef OPENSSL_NO_ECDSA
+-@@ -2712,8 +2832,10 @@ static void pkey_print_message(const cha
+-
+- static void print_result(int alg,int run_no,int count,double time_used)
+- {
+-- BIO_printf(bio_err,mr ? "+R:%d:%s:%f\n"
+-- : "%d %s's in %.2fs\n",count,names[alg],time_used);
+-+ if (do_cpu)
+-+ cpu_usage[alg][run_no] = calc_cpu();
+-+ BIO_printf(bio_err,mr ? "+R:%ld:%s:%f\n"
+-+ : "%ld %s's in %.2fs\n",count,names[alg],time_used);
+- results[alg][run_no]=((double)count)/time_used*lengths[run_no];
+- }
+-
+-@@ -2806,29 +2928,11 @@ static int do_multi(int multi)
+- p=buf+3;
+- alg=atoi(sstrsep(&p,sep));
+- sstrsep(&p,sep);
+-- for(j=0 ; j < SIZE_NUM ; ++j)
+-+ for(j=0 ; j < SIZE_NUM ; ++j) {
+-+ if (do_cpu && strchr(p, '/'))
+-+ cpu_usage[alg][j] = atoi(strchr(p, '/') + 1);
+- results[alg][j]+=atof(sstrsep(&p,sep));
+- }
+-- else if(!strncmp(buf,"+F2:",4))
+-- {
+-- int k;
+-- double d;
+--
+-- p=buf+4;
+-- k=atoi(sstrsep(&p,sep));
+-- sstrsep(&p,sep);
+--
+-- d=atof(sstrsep(&p,sep));
+-- if(n)
+-- rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);
+-- else
+-- rsa_results[k][0]=d;
+--
+-- d=atof(sstrsep(&p,sep));
+-- if(n)
+-- rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
+-- else
+-- rsa_results[k][1]=d;
+- }
+- else if(!strncmp(buf,"+F2:",4))
+- {
+-@@ -2839,12 +2943,18 @@ static int do_multi(int multi)
+- k=atoi(sstrsep(&p,sep));
+- sstrsep(&p,sep);
+-
+-+ /* before we move the token along */
+-+ if (do_cpu && strchr(p, '/'))
+-+ rsa_cpu_usage[k][0] = atoi(strchr(p, '/') + 1);
+- d=atof(sstrsep(&p,sep));
+- if(n)
+- rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);
+- else
+- rsa_results[k][0]=d;
+-
+-+ /* before we move the token along */
+-+ if (do_cpu && strchr(p, '/'))
+-+ rsa_cpu_usage[k][1] = atoi(strchr(p, '/') + 1);
+- d=atof(sstrsep(&p,sep));
+- if(n)
+- rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
+-@@ -2860,12 +2970,18 @@ static int do_multi(int multi)
+- k=atoi(sstrsep(&p,sep));
+- sstrsep(&p,sep);
+-
+-+ /* before we move the token along */
+-+ if (do_cpu && strchr(p, '/'))
+-+ dsa_cpu_usage[k][0] = atoi(strchr(p, '/') + 1);
+- d=atof(sstrsep(&p,sep));
+- if(n)
+- dsa_results[k][0]=1/(1/dsa_results[k][0]+1/d);
+- else
+- dsa_results[k][0]=d;
+-
+-+ /* before we move the token along */
+-+ if (do_cpu && strchr(p, '/'))
+-+ dsa_cpu_usage[k][1] = atoi(strchr(p, '/') + 1);
+- d=atof(sstrsep(&p,sep));
+- if(n)
+- dsa_results[k][1]=1/(1/dsa_results[k][1]+1/d);
+---- a/crypto/cryptlib.h
+-+++ b/crypto/cryptlib.h
+-@@ -62,7 +62,7 @@
+- #include <stdlib.h>
+- #include <string.h>
+-
+--#include "e_os.h"
+-+#include <openssl/e_os.h>
+-
+- #ifdef OPENSSL_USE_APPLINK
+- #define BIO_FLAGS_UPLINK 0x8000
+---- a/crypto/engine/eng_all.c
+-+++ b/crypto/engine/eng_all.c
+-@@ -104,7 +104,7 @@ void ENGINE_load_builtin_engines(void)
+- #endif
+- #endif
+- #ifndef OPENSSL_NO_HW
+--#if defined(__OpenBSD__) || defined(__FreeBSD__)
+-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+- ENGINE_load_cryptodev();
+- #endif
+- #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+-@@ -113,7 +113,7 @@ void ENGINE_load_builtin_engines(void)
+- #endif
+- }
+-
+--#if defined(__OpenBSD__) || defined(__FreeBSD__)
+-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+- void ENGINE_setup_bsd_cryptodev(void) {
+- static int bsd_cryptodev_default_loaded = 0;
+- if (!bsd_cryptodev_default_loaded) {
+---- a/crypto/engine/eng_cryptodev.c
+-+++ b/crypto/engine/eng_cryptodev.c
+-@@ -68,6 +68,16 @@ ENGINE_load_cryptodev(void)
+- struct dev_crypto_state {
+- struct session_op d_sess;
+- int d_fd;
+-+
+-+#ifdef USE_CRYPTODEV_DIGESTS
+-+ char dummy_mac_key[20];
+-+
+-+ unsigned char digest_res[20];
+-+ char *mac_data;
+-+ int mac_len;
+-+
+-+ int copy;
+-+#endif
+- };
+-
+- static u_int32_t cryptodev_asymfeat = 0;
+-@@ -75,9 +85,11 @@ static u_int32_t cryptodev_asymfeat = 0;
+- static int get_asym_dev_crypto(void);
+- static int open_dev_crypto(void);
+- static int get_dev_crypto(void);
+-+#if 0
+- static int cryptodev_max_iv(int cipher);
+- static int cryptodev_key_length_valid(int cipher, int len);
+- static int cipher_nid_to_cryptodev(int nid);
+-+#endif
+- static int get_cryptodev_ciphers(const int **cnids);
+- static int get_cryptodev_digests(const int **cnids);
+- static int cryptodev_usable_ciphers(const int **nids);
+-@@ -100,7 +112,7 @@ static int cryptodev_asym(struct crypt_k
+- static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a,
+- const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+- static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I,
+-- RSA *rsa);
+-+ RSA *rsa, BN_CTX *ctx);
+- static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
+- static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a,
+- const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+-@@ -130,9 +142,12 @@ static struct {
+- int ivmax;
+- int keylen;
+- } ciphers[] = {
+-+ { CRYPTO_ARC4, NID_rc4, 0, 16, },
+- { CRYPTO_DES_CBC, NID_des_cbc, 8, 8, },
+- { CRYPTO_3DES_CBC, NID_des_ede3_cbc, 8, 24, },
+- { CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16, },
+-+ { CRYPTO_AES_CBC, NID_aes_192_cbc, 16, 24, },
+-+ { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, },
+- { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
+- { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
+- { CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
+-@@ -142,14 +157,15 @@ static struct {
+- static struct {
+- int id;
+- int nid;
+-+ int keylen;
+- } digests[] = {
+-- { CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, },
+-- { CRYPTO_RIPEMD160_HMAC, NID_ripemd160, },
+-- { CRYPTO_MD5_KPDK, NID_undef, },
+-- { CRYPTO_SHA1_KPDK, NID_undef, },
+-- { CRYPTO_MD5, NID_md5, },
+-- { CRYPTO_SHA1, NID_undef, },
+-- { 0, NID_undef, },
+-+ { CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, 20},
+-+ { CRYPTO_RIPEMD160_HMAC, NID_ripemd160, 16/*?*/},
+-+ { CRYPTO_MD5_KPDK, NID_undef, 0},
+-+ { CRYPTO_SHA1_KPDK, NID_undef, 0},
+-+ { CRYPTO_MD5, NID_md5, 16},
+-+ { CRYPTO_SHA1, NID_sha1, 20},
+-+ { 0, NID_undef, 0},
+- };
+-
+- /*
+-@@ -176,10 +192,17 @@ open_dev_crypto(void)
+- static int
+- get_dev_crypto(void)
+- {
+-- int fd, retfd;
+-+ static int fd = -1;
+-+ int retfd;
+-
+-- if ((fd = open_dev_crypto()) == -1)
+-- return (-1);
+-+ if (fd == -1) {
+-+ if ((fd = open_dev_crypto()) == -1)
+-+ return (-1);
+-+ if (fcntl(fd, F_SETFD, 1) == -1) {
+-+ close(fd);
+-+ return (-1);
+-+ }
+-+ }
+- if (ioctl(fd, CRIOGET, &retfd) == -1)
+- return (-1);
+-
+-@@ -202,6 +225,7 @@ get_asym_dev_crypto(void)
+- return fd;
+- }
+-
+-+#if 0
+- /*
+- * XXXX this needs to be set for each alg - and determined from
+- * a running card.
+-@@ -245,6 +269,7 @@ cipher_nid_to_cryptodev(int nid)
+- return (ciphers[i].id);
+- return (0);
+- }
+-+#endif
+-
+- /*
+- * Find out what ciphers /dev/crypto will let us have a session for.
+-@@ -264,7 +289,7 @@ get_cryptodev_ciphers(const int **cnids)
+- return (0);
+- }
+- memset(&sess, 0, sizeof(sess));
+-- sess.key = (caddr_t)"123456781234567812345678";
+-+ sess.key = (caddr_t)"123456789abcdefghijklmno";
+-
+- for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
+- if (ciphers[i].nid == NID_undef)
+-@@ -303,10 +328,12 @@ get_cryptodev_digests(const int **cnids)
+- return (0);
+- }
+- memset(&sess, 0, sizeof(sess));
+-+ sess.mackey = (caddr_t)"123456789abcdefghijklmno";
+- for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
+- if (digests[i].nid == NID_undef)
+- continue;
+- sess.mac = digests[i].id;
+-+ sess.mackeylen = digests[i].keylen;
+- sess.cipher = 0;
+- if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
+- ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
+-@@ -351,6 +378,9 @@ cryptodev_usable_ciphers(const int **nid
+- static int
+- cryptodev_usable_digests(const int **nids)
+- {
+-+#ifdef USE_CRYPTODEV_DIGESTS
+-+ return (get_cryptodev_digests(nids));
+-+#else
+- /*
+- * XXXX just disable all digests for now, because it sucks.
+- * we need a better way to decide this - i.e. I may not
+-@@ -365,6 +395,7 @@ cryptodev_usable_digests(const int **nid
+- */
+- *nids = NULL;
+- return (0);
+-+#endif
+- }
+-
+- static int
+-@@ -427,16 +458,20 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx,
+- {
+- struct dev_crypto_state *state = ctx->cipher_data;
+- struct session_op *sess = &state->d_sess;
+-- int cipher;
+-+ int cipher, i;
+-
+-- if ((cipher = cipher_nid_to_cryptodev(ctx->cipher->nid)) == NID_undef)
+-- return (0);
+--
+-- if (ctx->cipher->iv_len > cryptodev_max_iv(cipher))
+-- return (0);
+-+ for (i = 0; ciphers[i].id; i++)
+-+ if (ctx->cipher->nid == ciphers[i].nid &&
+-+ ctx->cipher->iv_len <= ciphers[i].ivmax &&
+-+ ctx->key_len == ciphers[i].keylen) {
+-+ cipher = ciphers[i].id;
+-+ break;
+-+ }
+-
+-- if (!cryptodev_key_length_valid(cipher, ctx->key_len))
+-+ if (!ciphers[i].id) {
+-+ state->d_fd = -1;
+- return (0);
+-+ }
+-
+- memset(sess, 0, sizeof(struct session_op));
+-
+-@@ -496,6 +531,20 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
+- * gets called when libcrypto requests a cipher NID.
+- */
+-
+-+/* RC4 */
+-+const EVP_CIPHER cryptodev_rc4 = {
+-+ NID_rc4,
+-+ 1, 16, 0,
+-+ EVP_CIPH_VARIABLE_LENGTH,
+-+ cryptodev_init_key,
+-+ cryptodev_cipher,
+-+ cryptodev_cleanup,
+-+ sizeof(struct dev_crypto_state),
+-+ NULL,
+-+ NULL,
+-+ NULL
+-+};
+-+
+- /* DES CBC EVP */
+- const EVP_CIPHER cryptodev_des_cbc = {
+- NID_des_cbc,
+-@@ -563,6 +612,32 @@ const EVP_CIPHER cryptodev_aes_cbc = {
+- NULL
+- };
+-
+-+const EVP_CIPHER cryptodev_aes_192_cbc = {
+-+ NID_aes_192_cbc,
+-+ 16, 24, 16,
+-+ EVP_CIPH_CBC_MODE,
+-+ cryptodev_init_key,
+-+ cryptodev_cipher,
+-+ cryptodev_cleanup,
+-+ sizeof(struct dev_crypto_state),
+-+ EVP_CIPHER_set_asn1_iv,
+-+ EVP_CIPHER_get_asn1_iv,
+-+ NULL
+-+};
+-+
+-+const EVP_CIPHER cryptodev_aes_256_cbc = {
+-+ NID_aes_256_cbc,
+-+ 16, 32, 16,
+-+ EVP_CIPH_CBC_MODE,
+-+ cryptodev_init_key,
+-+ cryptodev_cipher,
+-+ cryptodev_cleanup,
+-+ sizeof(struct dev_crypto_state),
+-+ EVP_CIPHER_set_asn1_iv,
+-+ EVP_CIPHER_get_asn1_iv,
+-+ NULL
+-+};
+-+
+- /*
+- * Registered by the ENGINE when used to find out how to deal with
+- * a particular NID in the ENGINE. this says what we'll do at the
+-@@ -576,6 +651,9 @@ cryptodev_engine_ciphers(ENGINE *e, cons
+- return (cryptodev_usable_ciphers(nids));
+-
+- switch (nid) {
+-+ case NID_rc4:
+-+ *cipher = &cryptodev_rc4;
+-+ break;
+- case NID_des_ede3_cbc:
+- *cipher = &cryptodev_3des_cbc;
+- break;
+-@@ -591,6 +669,12 @@ cryptodev_engine_ciphers(ENGINE *e, cons
+- case NID_aes_128_cbc:
+- *cipher = &cryptodev_aes_cbc;
+- break;
+-+ case NID_aes_192_cbc:
+-+ *cipher = &cryptodev_aes_192_cbc;
+-+ break;
+-+ case NID_aes_256_cbc:
+-+ *cipher = &cryptodev_aes_256_cbc;
+-+ break;
+- default:
+- *cipher = NULL;
+- break;
+-@@ -598,6 +682,234 @@ cryptodev_engine_ciphers(ENGINE *e, cons
+- return (*cipher != NULL);
+- }
+-
+-+
+-+#ifdef USE_CRYPTODEV_DIGESTS
+-+
+-+/* convert digest type to cryptodev */
+-+static int
+-+digest_nid_to_cryptodev(int nid)
+-+{
+-+ int i;
+-+
+-+ for (i = 0; digests[i].id; i++)
+-+ if (digests[i].nid == nid)
+-+ return (digests[i].id);
+-+ return (0);
+-+}
+-+
+-+
+-+static int
+-+digest_key_length(int nid)
+-+{
+-+ int i;
+-+
+-+ for (i = 0; digests[i].id; i++)
+-+ if (digests[i].nid == nid)
+-+ return digests[i].keylen;
+-+ return (0);
+-+}
+-+
+-+
+-+static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+-+{
+-+ struct dev_crypto_state *state = ctx->md_data;
+-+ struct session_op *sess = &state->d_sess;
+-+ int digest;
+-+
+-+ if ((digest = digest_nid_to_cryptodev(ctx->digest->type)) == NID_undef){
+-+ printf("cryptodev_digest_init: Can't get digest \n");
+-+ return (0);
+-+ }
+-+
+-+ memset(state, 0, sizeof(struct dev_crypto_state));
+-+
+-+ if ((state->d_fd = get_dev_crypto()) < 0) {
+-+ printf("cryptodev_digest_init: Can't get Dev \n");
+-+ return (0);
+-+ }
+-+
+-+ sess->mackey = state->dummy_mac_key;
+-+ sess->mackeylen = digest_key_length(ctx->digest->type);
+-+ sess->mac = digest;
+-+
+-+ if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) {
+-+ close(state->d_fd);
+-+ state->d_fd = -1;
+-+ printf("cryptodev_digest_init: Open session failed\n");
+-+ return (0);
+-+ }
+-+
+-+ return (1);
+-+}
+-+
+-+static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+-+ size_t count)
+-+{
+-+ struct crypt_op cryp;
+-+ struct dev_crypto_state *state = ctx->md_data;
+-+ struct session_op *sess = &state->d_sess;
+-+
+-+ if (!data || state->d_fd < 0) {
+-+ printf("cryptodev_digest_update: illegal inputs \n");
+-+ return (0);
+-+ }
+-+
+-+ if (!count) {
+-+ return (0);
+-+ }
+-+
+-+ if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) {
+-+ /* if application doesn't support one buffer */
+-+ state->mac_data = OPENSSL_realloc(state->mac_data, state->mac_len + count);
+-+
+-+ if (!state->mac_data) {
+-+ printf("cryptodev_digest_update: realloc failed\n");
+-+ return (0);
+-+ }
+-+
+-+ memcpy(state->mac_data + state->mac_len, data, count);
+-+ state->mac_len += count;
+-+
+-+ return (1);
+-+ }
+-+
+-+ memset(&cryp, 0, sizeof(cryp));
+-+
+-+ cryp.ses = sess->ses;
+-+ cryp.flags = 0;
+-+ cryp.len = count;
+-+ cryp.src = (caddr_t) data;
+-+ cryp.dst = NULL;
+-+ cryp.mac = state->digest_res;
+-+ if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
+-+ printf("cryptodev_digest_update: digest failed\n");
+-+ return (0);
+-+ }
+-+ return (1);
+-+}
+-+
+-+
+-+static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+-+{
+-+ struct crypt_op cryp;
+-+ struct dev_crypto_state *state = ctx->md_data;
+-+ struct session_op *sess = &state->d_sess;
+-+
+-+ int ret = 1;
+-+
+-+ if (!md || state->d_fd < 0) {
+-+ printf("cryptodev_digest_final: illegal input\n");
+-+ return(0);
+-+ }
+-+
+-+ if (! (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) ) {
+-+ /* if application doesn't support one buffer */
+-+ memset(&cryp, 0, sizeof(cryp));
+-+
+-+ cryp.ses = sess->ses;
+-+ cryp.flags = 0;
+-+ cryp.len = state->mac_len;
+-+ cryp.src = state->mac_data;
+-+ cryp.dst = NULL;
+-+ cryp.mac = md;
+-+
+-+ if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
+-+ printf("cryptodev_digest_final: digest failed\n");
+-+ return (0);
+-+ }
+-+
+-+ return 1;
+-+ }
+-+
+-+ memcpy(md, state->digest_res, ctx->digest->md_size);
+-+
+-+ return (ret);
+-+}
+-+
+-+
+-+static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
+-+{
+-+ int ret = 1;
+-+ struct dev_crypto_state *state = ctx->md_data;
+-+ struct session_op *sess = &state->d_sess;
+-+
+-+ if (state->d_fd < 0) {
+-+ printf("cryptodev_digest_cleanup: illegal input\n");
+-+ return (0);
+-+ }
+-+
+-+ if (state->mac_data) {
+-+ OPENSSL_free(state->mac_data);
+-+ state->mac_data = NULL;
+-+ state->mac_len = 0;
+-+ }
+-+
+-+ if (state->copy)
+-+ return 1;
+-+
+-+ if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) {
+-+ printf("cryptodev_digest_cleanup: failed to close session\n");
+-+ ret = 0;
+-+ } else {
+-+ ret = 1;
+-+ }
+-+ close(state->d_fd);
+-+ state->d_fd = -1;
+-+
+-+ return (ret);
+-+}
+-+
+-+static int cryptodev_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from)
+-+{
+-+ struct dev_crypto_state *fstate = from->md_data;
+-+ struct dev_crypto_state *dstate = to->md_data;
+-+
+-+ memcpy(dstate, fstate, sizeof(struct dev_crypto_state));
+-+
+-+ if (fstate->mac_len != 0) {
+-+ dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
+-+ memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len);
+-+ }
+-+
+-+ dstate->copy = 1;
+-+
+-+ return 1;
+-+}
+-+
+-+
+-+const EVP_MD cryptodev_sha1 = {
+-+ NID_sha1,
+-+ NID_undef,
+-+ SHA_DIGEST_LENGTH,
+-+ EVP_MD_FLAG_ONESHOT,
+-+ cryptodev_digest_init,
+-+ cryptodev_digest_update,
+-+ cryptodev_digest_final,
+-+ cryptodev_digest_copy,
+-+ cryptodev_digest_cleanup,
+-+ EVP_PKEY_NULL_method,
+-+ SHA_CBLOCK,
+-+ sizeof(struct dev_crypto_state),
+-+};
+-+
+-+const EVP_MD cryptodev_md5 = {
+-+ NID_md5,
+-+ NID_undef,
+-+ 16 /* MD5_DIGEST_LENGTH */,
+-+ EVP_MD_FLAG_ONESHOT,
+-+ cryptodev_digest_init,
+-+ cryptodev_digest_update,
+-+ cryptodev_digest_final,
+-+ cryptodev_digest_copy,
+-+ cryptodev_digest_cleanup,
+-+ EVP_PKEY_NULL_method,
+-+ 64 /* MD5_CBLOCK */,
+-+ sizeof(struct dev_crypto_state),
+-+};
+-+
+-+#endif /* USE_CRYPTODEV_DIGESTS */
+-+
+-+
+- static int
+- cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
+- const int **nids, int nid)
+-@@ -606,10 +918,15 @@ cryptodev_engine_digests(ENGINE *e, cons
+- return (cryptodev_usable_digests(nids));
+-
+- switch (nid) {
+-+#ifdef USE_CRYPTODEV_DIGESTS
+- case NID_md5:
+-- *digest = NULL; /* need to make a clean md5 critter */
+-+ *digest = &cryptodev_md5;
+- break;
+-+ case NID_sha1:
+-+ *digest = &cryptodev_sha1;
+-+ break;
+- default:
+-+#endif /* USE_CRYPTODEV_DIGESTS */
+- *digest = NULL;
+- break;
+- }
+-@@ -625,7 +942,7 @@ static int
+- bn2crparam(const BIGNUM *a, struct crparam *crp)
+- {
+- int i, j, k;
+-- ssize_t words, bytes, bits;
+-+ ssize_t bytes, bits;
+- u_char *b;
+-
+- crp->crp_p = NULL;
+-@@ -637,6 +954,7 @@ bn2crparam(const BIGNUM *a, struct crpar
+- b = malloc(bytes);
+- if (b == NULL)
+- return (1);
+-+ memset(b, 0, bytes);
+-
+- crp->crp_p = b;
+- crp->crp_nbits = bits;
+-@@ -681,7 +999,7 @@ zapparams(struct crypt_kop *kop)
+- {
+- int i;
+-
+-- for (i = 0; i <= kop->crk_iparams + kop->crk_oparams; i++) {
+-+ for (i = 0; i < kop->crk_iparams + kop->crk_oparams; i++) {
+- if (kop->crk_param[i].crp_p)
+- free(kop->crk_param[i].crp_p);
+- kop->crk_param[i].crp_p = NULL;
+-@@ -756,12 +1074,10 @@ err:
+- }
+-
+- static int
+--cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+-+cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+- {
+- int r;
+-- BN_CTX *ctx;
+--
+-- ctx = BN_CTX_new();
+-+ ctx = BN_CTX_new(); /* not sure why we reallocate this. DM */
+- r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL);
+- BN_CTX_free(ctx);
+- return (r);
+---- a/crypto/engine/engine.h
+-+++ b/crypto/engine/engine.h
+-@@ -703,7 +703,7 @@ typedef int (*dynamic_bind_engine)(ENGIN
+- * values. */
+- void *ENGINE_get_static_state(void);
+-
+--#if defined(__OpenBSD__) || defined(__FreeBSD__)
+-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+- void ENGINE_setup_bsd_cryptodev(void);
+- #endif
+-
+---- a/crypto/evp/c_all.c
+-+++ b/crypto/evp/c_all.c
+-@@ -83,7 +83,7 @@ void OPENSSL_add_all_algorithms_noconf(v
+- OpenSSL_add_all_ciphers();
+- OpenSSL_add_all_digests();
+- #ifndef OPENSSL_NO_ENGINE
+--# if defined(__OpenBSD__) || defined(__FreeBSD__)
+-+# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+- ENGINE_setup_bsd_cryptodev();
+- # endif
+- #endif
+---- a/crypto/evp/c_alld.c
+-+++ b/crypto/evp/c_alld.c
+-@@ -81,7 +81,7 @@ void OpenSSL_add_all_digests(void)
+- EVP_add_digest(EVP_dss());
+- #endif
+- #endif
+--#ifndef OPENSSL_NO_SHA
+-+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+- EVP_add_digest(EVP_sha1());
+- EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+- EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+---- a/engines/Makefile
+-+++ b/engines/Makefile
+-@@ -96,6 +96,7 @@ install:
+- ( echo installing $$l; \
+- if [ "$(PLATFORM)" != "Cygwin" ]; then \
+- case "$(CFLAGS)" in \
+-+ *OPENSSL_NO_HW*) continue;; \
+- *DSO_DLFCN*) sfx="so";; \
+- *DSO_DL*) sfx="sl";; \
+- *) sfx="bad";; \
+---- a/util/domd
+-+++ b/util/domd
+-@@ -23,13 +23,17 @@ if [ "$D" = "gcc" ]; then
+- done
+- sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
+- echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
+-- ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
+-+ ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp && \
+- ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
+-+ RC=$?
+- rm -f Makefile.tmp
+- else
+-- ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@
+-+ ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ && \
+- ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
+-+ RC=$?
+- fi
+- mv Makefile.new Makefile
+- # unfake the presence of Kerberos
+- rm $TOP/krb5.h
+-+
+-+exit $RC
+diff -Naur a/package/openssl/patches/300-etrax_support.patch b/package/openssl/patches/300-etrax_support.patch
+--- a/package/openssl/patches/300-etrax_support.patch 2008-11-03 21:26:27.396977000 +0000
++++ b/package/openssl/patches/300-etrax_support.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,14 +0,0 @@
+-diff -urN openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
+---- openssl-0.9.8h.orig/Configure 2008-05-02 01:11:30.000000000 +0200
+-+++ openssl-0.9.8h/Configure 2008-06-19 13:27:42.000000000 +0200
+-@@ -389,6 +389,10 @@
+- "qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
+- "qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
+-
+-+# cris
+-+"linux-cris", "\$(TARGET_CC):-DL_ENDIAN -DTERMIO -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG THIRTY_TWO_BIT RC4_CHAR::::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+-+
+-+
+- #### SCO/Caldera targets.
+- #
+- # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.
Modified: torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch 2009-03-15 00:32:40 UTC (rev 19001)
+++ torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch 2009-03-15 00:35:36 UTC (rev 19002)
@@ -17,6 +17,914 @@
$(eval $(call BuildTarget))
+diff -Naur a/target/linux/x86/config-2.6.26 b/target/linux/x86/config-2.6.26
+--- a/target/linux/x86/config-2.6.26 2008-11-25 13:52:25.936515000 +0000
++++ b/target/linux/x86/config-2.6.26 2009-03-14 19:17:34.353969136 +0000
+@@ -1,11 +1,8 @@
++CONFIG_LOCALVERSION="-torvm"
++CONFIG_LOG_BUF_SHIFT=17
+ # CONFIG_3C515 is not set
+-CONFIG_4KSTACKS=y
+ # CONFIG_60XX_WDT is not set
+ # CONFIG_64BIT is not set
+-CONFIG_8139TOO=m
+-# CONFIG_8139TOO_8129 is not set
+-CONFIG_8139TOO_PIO=y
+-# CONFIG_8139TOO_TUNE_TWISTER is not set
+ # CONFIG_8139_OLD_RX_RESET is not set
+ # CONFIG_AC3200 is not set
+ CONFIG_AC97_BUS=m
+@@ -17,27 +14,21 @@
+ # CONFIG_ALIM7101_WDT is not set
+ # CONFIG_APRICOT is not set
+ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+ CONFIG_ARCH_HAS_CPU_RELAX=y
+ # CONFIG_ARCH_HAS_ILOG2_U32 is not set
+ # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
++# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
+ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+ CONFIG_ARCH_POPULATES_NODE_MAP=y
+ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+ CONFIG_ARCH_SPARSEMEM_ENABLE=y
+ CONFIG_ARCH_SUPPORTS_AOUT=y
+-CONFIG_ARCH_SUPPORTS_MSI=y
+-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+-CONFIG_ARCH_SUSPEND_POSSIBLE=y
++# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
+ # CONFIG_AT1700 is not set
+-CONFIG_ATA=m
+-# CONFIG_ATA_NONSTANDARD is not set
+ # CONFIG_AUDIT_ARCH is not set
+ CONFIG_BASE_SMALL=0
+ # CONFIG_BINFMT_AOUT is not set
+-CONFIG_BINFMT_MISC=y
+ CONFIG_BITREVERSE=y
+ # CONFIG_BLK_DEV_4DRIVES is not set
+ # CONFIG_BLK_DEV_ALI14XX is not set
+@@ -47,44 +38,21 @@
+ CONFIG_BLK_DEV_IDE=y
+ CONFIG_BLK_DEV_IDEDISK=y
+ CONFIG_BLK_DEV_IDEDMA=y
+-CONFIG_BLK_DEV_IDEDMA_PCI=y
+ CONFIG_BLK_DEV_IDEDMA_SFF=y
+ CONFIG_BLK_DEV_IDEPCI=y
+ # CONFIG_BLK_DEV_QD65XX is not set
+-CONFIG_BLK_DEV_SC1200=y
+ # CONFIG_BLK_DEV_UMC8672 is not set
+-CONFIG_BLK_DEV_VIA82CXXX=y
+ # CONFIG_BLK_DEV_XD is not set
+ CONFIG_BOUNCE=y
+-# CONFIG_BT_HIDP is not set
+ CONFIG_CLASSIC_RCU=y
+ CONFIG_CLOCKSOURCE_WATCHDOG=y
+ CONFIG_COMPAT_VDSO=y
+ # CONFIG_CPU5_WDT is not set
+-CONFIG_CPU_FREQ=y
+-# CONFIG_CPU_FREQ_DEBUG is not set
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+-CONFIG_CPU_FREQ_STAT=y
+-CONFIG_CPU_FREQ_STAT_DETAILS=y
+-CONFIG_CPU_FREQ_TABLE=y
+ # CONFIG_CPU_IDLE is not set
+-CONFIG_CRYPTO_AES_586=m
+-CONFIG_CRYPTO_GF128MUL=m
+-# CONFIG_CRYPTO_SALSA20_586 is not set
+-CONFIG_CRYPTO_TWOFISH_586=m
+ # CONFIG_CS5535_GPIO is not set
+ # CONFIG_CS89x0 is not set
+ # CONFIG_DCDBAS is not set
+-CONFIG_DEBUG_BUGVERBOSE=y
++# CONFIG_DEBUG_BUGVERBOSE is not set
+ CONFIG_DEFAULT_IO_DELAY_TYPE=0
+ # CONFIG_DELL_RBU is not set
+ # CONFIG_DEPCA is not set
+@@ -95,10 +63,6 @@
+ CONFIG_DNOTIFY=y
+ CONFIG_DOUBLEFAULT=y
+ CONFIG_DUMMY_CONSOLE=y
+-CONFIG_E1000=m
+-# CONFIG_E1000E_ENABLED is not set
+-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+-CONFIG_E1000_NAPI=y
+ CONFIG_EARLY_PRINTK=y
+ # CONFIG_EDAC is not set
+ # CONFIG_EDD is not set
+@@ -114,36 +78,28 @@
+ CONFIG_EXT2_FS=y
+ CONFIG_FAST_CMPXCHG_LOCAL=y
+ CONFIG_FIX_EARLYCON_MEM=y
+-CONFIG_FS_POSIX_ACL=y
+ CONFIG_GENERIC_BUG=y
+ CONFIG_GENERIC_CLOCKEVENTS=y
+ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+ CONFIG_GENERIC_CMOS_UPDATE=y
+ # CONFIG_GENERIC_CPU is not set
+-CONFIG_GENERIC_FIND_FIRST_BIT=y
+-CONFIG_GENERIC_FIND_NEXT_BIT=y
+ # CONFIG_GENERIC_GPIO is not set
+ CONFIG_GENERIC_IOMAP=y
+ CONFIG_GENERIC_ISA_DMA=y
+ # CONFIG_GENERIC_LOCKBREAK is not set
+-CONFIG_GENERIC_PENDING_IRQ=y
+ # CONFIG_GENERIC_TIME_VSYSCALL is not set
+ # CONFIG_HANGCHECK_TIMER is not set
+ CONFIG_HAS_DMA=y
+ CONFIG_HAS_IOMEM=y
+ CONFIG_HAS_IOPORT=y
+-CONFIG_HAVE_ARCH_KGDB=y
+-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+-# CONFIG_HAVE_DMA_ATTRS is not set
+ CONFIG_HAVE_IDE=y
+-CONFIG_HAVE_KPROBES=y
+-CONFIG_HAVE_KRETPROBES=y
+-CONFIG_HAVE_KVM=y
+-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+-CONFIG_HAVE_OPROFILE=y
+-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
++# CONFIG_HAVE_KPROBES is not set
++# CONFIG_HAVE_KRETPROBES is not set
++# CONFIG_HAVE_KVM is not set
++# CONFIG_HAVE_LATENCYTOP_SUPPORT is not set
++# CONFIG_HAVE_OPROFILE is not set
++# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+ CONFIG_HID=y
+ CONFIG_HID_SUPPORT=y
+ # CONFIG_HIGHMEM4G is not set
+@@ -153,19 +109,7 @@
+ # CONFIG_HP_WATCHDOG is not set
+ CONFIG_HT_IRQ=y
+ # CONFIG_HUGETLBFS is not set
+-CONFIG_HWMON=m
+-# CONFIG_HWMON_DEBUG_CHIP is not set
+-CONFIG_HWMON_VID=m
+ CONFIG_HW_CONSOLE=y
+-CONFIG_HW_RANDOM=y
+-# CONFIG_HW_RANDOM_AMD is not set
+-CONFIG_HW_RANDOM_GEODE=y
+-# CONFIG_HW_RANDOM_INTEL is not set
+-CONFIG_HW_RANDOM_VIA=y
+-CONFIG_I2C=m
+-CONFIG_I2C_ALGOBIT=m
+-CONFIG_I2C_BOARDINFO=y
+-CONFIG_I2C_CHARDEV=m
+ # CONFIG_I6300ESB_WDT is not set
+ # CONFIG_I82365 is not set
+ # CONFIG_I8K is not set
+@@ -178,17 +122,15 @@
+ # CONFIG_IBM_NEW_EMAC_ZMII is not set
+ CONFIG_IDE=y
+ CONFIG_IDEPCI_PCIBUS_ORDER=y
++CONFIG_IDE_ARCH_OBSOLETE_INIT=y
+ CONFIG_IDE_GENERIC=y
+ # CONFIG_IDE_PROC_FS is not set
+ CONFIG_INITRAMFS_SOURCE=""
+ CONFIG_INPUT=y
++CONFIG_INPUT_APANEL=n
+ # CONFIG_INPUT_EVDEV is not set
+ CONFIG_INPUT_KEYBOARD=y
+-CONFIG_INPUT_MOUSE=y
+-CONFIG_INPUT_MOUSEDEV=y
+-CONFIG_INPUT_MOUSEDEV_PSAUX=y
+-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_INPUT_MOUSE is not set
+ # CONFIG_IOMMU_HELPER is not set
+ CONFIG_IO_DELAY_0X80=y
+ # CONFIG_IO_DELAY_0XED is not set
+@@ -198,18 +140,14 @@
+ CONFIG_IO_DELAY_TYPE_NONE=3
+ CONFIG_IO_DELAY_TYPE_UDELAY=2
+ # CONFIG_IO_DELAY_UDELAY is not set
+-CONFIG_IPV6_NDISC_NODETYPE=y
+ # CONFIG_IPWIRELESS is not set
+ CONFIG_IRQBALANCE=y
+ CONFIG_ISA=y
+ CONFIG_ISAPNP=y
+ CONFIG_ISA_DMA_API=y
+-# CONFIG_ISCSI_IBFT_FIND is not set
+ # CONFIG_IT8712F_WDT is not set
+ # CONFIG_ITCO_WDT is not set
+-# CONFIG_IWLWIFI_LEDS is not set
+ CONFIG_KALLSYMS=y
+-CONFIG_KEXEC=y
+ CONFIG_KEYBOARD_ATKBD=y
+ # CONFIG_KEYBOARD_LKKBD is not set
+ # CONFIG_KEYBOARD_NEWTON is not set
+@@ -222,14 +160,9 @@
+ # CONFIG_LATENCYTOP is not set
+ # CONFIG_LEDS_ALIX is not set
+ # CONFIG_LEDS_CLEVO_MAIL is not set
+-CONFIG_LEDS_NET48XX=m
++# CONFIG_LEDS_NET48XX is not set
+ # CONFIG_LEDS_WRAP is not set
+-CONFIG_LOCK_KERNEL=y
+-CONFIG_M386=y
+ # CONFIG_M486 is not set
+-# CONFIG_M586 is not set
+-# CONFIG_M586MMX is not set
+-# CONFIG_M586TSC is not set
+ # CONFIG_M686 is not set
+ # CONFIG_MACHZ_WDT is not set
+ # CONFIG_MACINTOSH_DRIVERS is not set
+@@ -239,31 +172,22 @@
+ # CONFIG_MCRUSOE is not set
+ # CONFIG_MCYRIXIII is not set
+ # CONFIG_MDA_CONSOLE is not set
+-CONFIG_MEDIA_TUNER=m
+-CONFIG_MEDIA_TUNER_MT20XX=m
+-CONFIG_MEDIA_TUNER_SIMPLE=m
+-CONFIG_MEDIA_TUNER_TDA8290=m
+-CONFIG_MEDIA_TUNER_TDA9887=m
+-CONFIG_MEDIA_TUNER_TEA5761=m
+-CONFIG_MEDIA_TUNER_TEA5767=m
+-CONFIG_MEDIA_TUNER_XC2028=m
+-CONFIG_MEDIA_TUNER_XC5000=m
+ # CONFIG_MEFFICEON is not set
++# CONFIG_MEMSTICK is not set
+ # CONFIG_MGEODEGX1 is not set
+ # CONFIG_MGEODE_LX is not set
+-CONFIG_MICROCODE=y
+-CONFIG_MICROCODE_OLD_INTERFACE=y
++# CONFIG_MICROCODE is not set
+ # CONFIG_MIXCOMWD is not set
+ # CONFIG_MK6 is not set
+ # CONFIG_MK7 is not set
+ # CONFIG_MK8 is not set
+-CONFIG_MOUSE_PS2=y
+-CONFIG_MOUSE_PS2_ALPS=y
+-CONFIG_MOUSE_PS2_LIFEBOOK=y
+-CONFIG_MOUSE_PS2_LOGIPS2PP=y
+-CONFIG_MOUSE_PS2_SYNAPTICS=y
++# CONFIG_MOUSE_PS2 is not set
++# CONFIG_MOUSE_PS2_ALPS=y
++# CONFIG_MOUSE_PS2_LIFEBOOK is not set
++# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
++# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+ # CONFIG_MOUSE_PS2_TOUCHKIT is not set
+-CONFIG_MOUSE_PS2_TRACKPOINT=y
++# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+ # CONFIG_MOUSE_SERIAL is not set
+ # CONFIG_MOUSE_VSXXXAA is not set
+ # CONFIG_MPENTIUM4 is not set
+@@ -271,42 +195,6 @@
+ # CONFIG_MPENTIUMIII is not set
+ # CONFIG_MPENTIUMM is not set
+ # CONFIG_MPSC is not set
+-CONFIG_MTD=y
+-# CONFIG_MTD_ABSENT is not set
+-CONFIG_MTD_BLKDEVS=y
+-CONFIG_MTD_BLOCK=y
+-CONFIG_MTD_BLOCK2MTD=y
+-# CONFIG_MTD_CFI is not set
+-CONFIG_MTD_CFI_I1=y
+-CONFIG_MTD_CFI_I2=y
+-# CONFIG_MTD_CFI_I4 is not set
+-# CONFIG_MTD_CFI_I8 is not set
+-CONFIG_MTD_CHAR=y
+-# CONFIG_MTD_CMDLINE_PARTS is not set
+-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+-# CONFIG_MTD_CONCAT is not set
+-# CONFIG_MTD_DEBUG is not set
+-# CONFIG_MTD_DOC2000 is not set
+-# CONFIG_MTD_DOC2001 is not set
+-# CONFIG_MTD_DOC2001PLUS is not set
+-# CONFIG_MTD_JEDECPROBE is not set
+-CONFIG_MTD_MAP_BANK_WIDTH_1=y
+-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+-CONFIG_MTD_MAP_BANK_WIDTH_2=y
+-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+-CONFIG_MTD_MAP_BANK_WIDTH_4=y
+-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+-# CONFIG_MTD_MTDRAM is not set
+-# CONFIG_MTD_ONENAND is not set
+-CONFIG_MTD_PARTITIONS=y
+-# CONFIG_MTD_PHRAM is not set
+-# CONFIG_MTD_PLATRAM is not set
+-# CONFIG_MTD_PMC551 is not set
+-# CONFIG_MTD_RAM is not set
+-# CONFIG_MTD_REDBOOT_PARTS is not set
+-# CONFIG_MTD_ROM is not set
+-# CONFIG_MTD_SLRAM is not set
+-# CONFIG_MTD_TS5500 is not set
+ CONFIG_MTRR=y
+ # CONFIG_MVIAC3_2 is not set
+ # CONFIG_MVIAC7 is not set
+@@ -314,25 +202,15 @@
+ # CONFIG_MWINCHIP3D is not set
+ # CONFIG_MWINCHIPC6 is not set
+ CONFIG_NAMESPACES=y
+-CONFIG_NATSEMI=m
+-CONFIG_NE2K_PCI=m
+-CONFIG_NET_VENDOR_3COM=y
+ # CONFIG_NET_VENDOR_RACAL is not set
+ # CONFIG_NET_VENDOR_SMC is not set
+ CONFIG_NOHIGHMEM=y
+-# CONFIG_NONPROMISC_DEVMEM is not set
+-CONFIG_NR_CPUS=8
+-CONFIG_NSC_GPIO=m
++# CONFIG_NR_CPUS is not set
+ CONFIG_NVRAM=y
+-# CONFIG_OCF_OCF is not set
+-# CONFIG_OLPC is not set
+-CONFIG_PAGEFLAGS_EXTENDED=y
+ CONFIG_PAGE_OFFSET=0xC0000000
+ # CONFIG_PARAVIRT_GUEST is not set
+-CONFIG_PC8736x_GPIO=m
++# CONFIG_PATA_CS5536 is not set
+ # CONFIG_PC87413_WDT is not set
+-CONFIG_PCCARD=m
+-CONFIG_PCCARD_NONSTATIC=m
+ CONFIG_PCI=y
+ # CONFIG_PCIEPORTBUS is not set
+ # CONFIG_PCIPCWATCHDOG is not set
+@@ -343,13 +221,7 @@
+ # CONFIG_PCI_GOBIOS is not set
+ # CONFIG_PCI_GODIRECT is not set
+ # CONFIG_PCI_GOMMCONFIG is not set
+-# CONFIG_PCI_GOOLPC is not set
+-CONFIG_PCMCIA=m
+-CONFIG_PCMCIA_IOCTL=y
+-CONFIG_PCMCIA_LOAD_CIS=y
+-CONFIG_PCMCIA_PROBE=y
+-CONFIG_PCNET32=m
+-CONFIG_PCSPKR_PLATFORM=y
++# CONFIG_PCMCIA is not set
+ # CONFIG_PCWATCHDOG is not set
+ CONFIG_PHYSICAL_ALIGN=0x100000
+ CONFIG_PHYSICAL_START=0x100000
+@@ -361,102 +233,62 @@
+ # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+ # CONFIG_R6040 is not set
+ # CONFIG_RELOCATABLE is not set
+-CONFIG_RFKILL_LEDS=y
+ CONFIG_RTC=y
+-CONFIG_RWSEM_GENERIC_SPINLOCK=y
+-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+ # CONFIG_SBC7240_WDT is not set
+ # CONFIG_SBC8360_WDT is not set
+ # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+-CONFIG_SC1200_WDT=m
++# CONFIG_SC1200_WDT is not set
+ # CONFIG_SC520_WDT is not set
+ # CONFIG_SCC is not set
+ # CONFIG_SCHED_HRTICK is not set
+ CONFIG_SCHED_MC=y
+ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+-CONFIG_SCHED_SMT=y
+-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+-CONFIG_SCSI_WAIT_SCAN=m
+-CONFIG_SCx200=y
+-CONFIG_SCx200HR_TIMER=y
+-CONFIG_SCx200_ACB=m
+-CONFIG_SCx200_GPIO=m
+-CONFIG_SCx200_I2C=m
+-CONFIG_SCx200_I2C_SCL=12
+-CONFIG_SCx200_I2C_SDA=13
+-CONFIG_SCx200_WDT=m
++# CONFIG_SCHED_SMT is not set
++# CONFIG_SEMAPHORE_SLEEPERS is not set
+ # CONFIG_SENSORS_FSCHMD is not set
+-CONFIG_SENSORS_PC87360=m
++# CONFIG_SENSORS_PC87360 is not set
+ # CONFIG_SERIAL_8250_CS is not set
+ # CONFIG_SERIAL_8250_EXTENDED is not set
+-CONFIG_SERIAL_8250_PCI=y
+-CONFIG_SERIAL_8250_PNP=y
+-CONFIG_SERIO=y
+-# CONFIG_SERIO_CT82C710 is not set
+-CONFIG_SERIO_I8042=y
+-CONFIG_SERIO_LIBPS2=y
+-# CONFIG_SERIO_PCIPS2 is not set
+-# CONFIG_SERIO_RAW is not set
+-CONFIG_SERIO_SERPORT=y
++# CONFIG_SERIAL_8250_PCI is not set
++# CONFIG_SERIAL_8250_PNP is not set
++# CONFIG_SERIO is not set
+ CONFIG_SLABINFO=y
+-CONFIG_SLUB_DEBUG=y
+-# CONFIG_SLUB_DEBUG_ON is not set
+-# CONFIG_SLUB_STATS is not set
+-CONFIG_SMP=y
++# CONFIG_SMP is not set
+ # CONFIG_SMSC37B787_WDT is not set
+-CONFIG_SND_AC97_CODEC=m
+-CONFIG_SND_HDA_CODEC_ANALOG=y
+-CONFIG_SND_HDA_CODEC_ATIHDMI=y
+-CONFIG_SND_HDA_CODEC_CMEDIA=y
+-CONFIG_SND_HDA_CODEC_CONEXANT=y
+-CONFIG_SND_HDA_CODEC_REALTEK=y
+-CONFIG_SND_HDA_CODEC_SI3054=y
+-CONFIG_SND_HDA_CODEC_SIGMATEL=y
+-CONFIG_SND_HDA_CODEC_VIA=y
+-CONFIG_SND_HDA_GENERIC=y
+-# CONFIG_SND_HDA_HWDEP is not set
+-CONFIG_SND_HDA_INTEL=m
+-# CONFIG_SND_HDA_POWER_SAVE is not set
+-CONFIG_SND_INTEL8X0=m
+-# CONFIG_SND_SC6000 is not set
+-# CONFIG_SND_SIS7019 is not set
+-CONFIG_SND_VMASTER=y
+-CONFIG_SOFT_WATCHDOG=m
+ # CONFIG_SONYPI is not set
+ CONFIG_SPARSEMEM_STATIC=y
+ # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+ CONFIG_SSB_POSSIBLE=y
+-CONFIG_STOP_MACHINE=y
+ CONFIG_SYSVIPC_SYSCTL=y
+ # CONFIG_TCIC is not set
+ # CONFIG_TELCLOCK is not set
+-# CONFIG_TICK_ONESHOT is not set
++# CONFIG_THERMAL is not set
+ # CONFIG_TOSHIBA is not set
+ # CONFIG_TYPHOON is not set
+ CONFIG_UID16=y
+-CONFIG_USB=m
+-CONFIG_USB_EHCI_HCD=m
++# CONFIG_USB is not set
++# CONFIG_USBPCWATCHDOG is not set
++# CONFIG_USB_EHCI_HCD is not set
+ # CONFIG_USB_NET_DM9601 is not set
+ # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+ # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+-CONFIG_USB_OHCI_HCD=m
++# CONFIG_USB_OHCI_HCD is not set
++# CONFIG_USB_R8A66597_HCD is not set
+ # CONFIG_USB_SERIAL_OTI6858 is not set
+-CONFIG_USB_SUPPORT=y
+-CONFIG_USB_UHCI_HCD=m
++# CONFIG_USB_UHCI_HCD is not set
+ # CONFIG_USER_NS is not set
+ # CONFIG_VGACON_SOFT_SCROLLBACK is not set
+ # CONFIG_VGASTATE is not set
+ CONFIG_VGA_CONSOLE=y
+-CONFIG_VIA_RHINE=m
+-CONFIG_VIA_RHINE_MMIO=y
+-CONFIG_VIA_RHINE_NAPI=y
+-CONFIG_VIDEO_MEDIA=m
++# CONFIG_VIA_RHINE is not set
++# CONFIG_VIA_RHINE_MMIO is not set
++# CONFIG_VIA_RHINE_NAPI is not set
+ # CONFIG_VIDEO_SELECT is not set
+-CONFIG_VIDEO_V4L2=m
+-CONFIG_VIDEO_V4L2_COMMON=m
++# CONFIG_VIDEO_V4L2_COMMON is not set
++# CONFIG_VIRTUALIZATION is not set
+ CONFIG_VM86=y
+ CONFIG_VM_EVENT_COUNTERS=y
+-CONFIG_VORTEX=m
++# CONFIG_VORTEX is not set
+ CONFIG_VT=y
+ CONFIG_VT_CONSOLE=y
+ # CONFIG_VT_HW_CONSOLE_BINDING is not set
+@@ -464,58 +296,416 @@
+ # CONFIG_WDT is not set
+ CONFIG_X86=y
+ CONFIG_X86_32=y
+-CONFIG_X86_32_SMP=y
+ # CONFIG_X86_64 is not set
+ # CONFIG_X86_BIGSMP is not set
+ CONFIG_X86_BIOS_REBOOT=y
+-# CONFIG_X86_CMPXCHG is not set
+-CONFIG_X86_CPU=y
+ # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+ # CONFIG_X86_CPUID is not set
+ # CONFIG_X86_ELAN is not set
+ # CONFIG_X86_ES7000 is not set
+ # CONFIG_X86_E_POWERSAVER is not set
+ CONFIG_X86_F00F_BUG=y
+-CONFIG_X86_FIND_SMP_CONFIG=y
+ CONFIG_X86_GENERIC=y
+ # CONFIG_X86_GENERICARCH is not set
+-CONFIG_X86_GX_SUSPMOD=m
+-CONFIG_X86_HT=y
++# CONFIG_X86_GX_SUSPMOD is not set
+ CONFIG_X86_INTEL_USERCOPY=y
+ CONFIG_X86_IO_APIC=y
+ CONFIG_X86_L1_CACHE_SHIFT=7
+ CONFIG_X86_LOCAL_APIC=y
+ # CONFIG_X86_LONGRUN is not set
+-CONFIG_X86_MCE=y
++# CONFIG_X86_MCE is not set
+ # CONFIG_X86_MCE_NONFATAL is not set
+ # CONFIG_X86_MCE_P4THERMAL is not set
+-CONFIG_X86_MINIMUM_CPU_FAMILY=3
+ CONFIG_X86_MPPARSE=y
+ # CONFIG_X86_MSR is not set
+ # CONFIG_X86_NUMAQ is not set
+ # CONFIG_X86_P4_CLOCKMOD is not set
+ # CONFIG_X86_PAE is not set
+-CONFIG_X86_PAT=y
+ CONFIG_X86_PC=y
++CONFIG_M586=y
+ # CONFIG_X86_POWERNOW_K6 is not set
+ # CONFIG_X86_POWERNOW_K7 is not set
+ # CONFIG_X86_POWERNOW_K8 is not set
+-CONFIG_X86_PPRO_FENCE=y
+ # CONFIG_X86_RDC321X is not set
+-# CONFIG_X86_REBOOTFIXUPS is not set
+-CONFIG_X86_SMP=y
+ # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+ # CONFIG_X86_SPEEDSTEP_ICH is not set
+ # CONFIG_X86_SPEEDSTEP_LIB is not set
+ # CONFIG_X86_SPEEDSTEP_SMI is not set
+ # CONFIG_X86_SUMMIT is not set
+-CONFIG_X86_TRAMPOLINE=y
+ # CONFIG_X86_VISWS is not set
+ # CONFIG_X86_VOYAGER is not set
+ # CONFIG_X86_VSMP is not set
+-CONFIG_YENTA_ENE_TUNE=y
+-CONFIG_YENTA_O2=y
+-CONFIG_YENTA_RICOH=y
+-CONFIG_YENTA_TI=y
+-CONFIG_YENTA_TOSHIBA=y
++# CONFIG_ZONE_DMA32 is not setQ
++CONFIG_RWSEM_XCHGADD_ALGORITHM=y
++CONFIG_BROKEN_ON_SMP=y
++CONFIG_TICK_ONESHOT=y
++CONFIG_NO_HZ=y
++CONFIG_M586=y
++CONFIG_X86_CMPXCHG=y
++CONFIG_X86_XADD=y
++CONFIG_X86_WP_WORKS_OK=y
++CONFIG_X86_INVLPG=y
++CONFIG_X86_BSWAP=y
++CONFIG_X86_POPAD_OK=y
++CONFIG_X86_ALIGNMENT_16=y
++CONFIG_X86_REBOOTFIXUPS=y
++CONFIG_NET_IPIP=y
++CONFIG_BRIDGE_NETFILTER=y
++CONFIG_NF_CONNTRACK_FTP=y
++CONFIG_NF_CONNTRACK_H323=y
++CONFIG_NF_CONNTRACK_IRC=y
++CONFIG_NF_CONNTRACK_SIP=y
++CONFIG_NF_CONNTRACK_TFTP=y
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
++CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
++CONFIG_NETFILTER_XT_TARGET_MARK=y
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
++CONFIG_NETFILTER_XT_TARGET_NFLOG=y
++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
++CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
++CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
++CONFIG_NETFILTER_XT_MATCH_LENGTH=y
++CONFIG_NETFILTER_XT_MATCH_MAC=y
++CONFIG_NETFILTER_XT_MATCH_MARK=y
++CONFIG_NETFILTER_XT_MATCH_OWNER=y
++CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
++CONFIG_NETFILTER_XT_MATCH_LAYER7=y
++CONFIG_NETFILTER_XT_MATCH_STRING=y
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
++CONFIG_NETFILTER_XT_MATCH_U32=y
++CONFIG_IP_NF_MATCH_ADDRTYPE=y
++CONFIG_IP_NF_TARGET_LOG=y
++CONFIG_IP_NF_TARGET_REDIRECT=y
++CONFIG_IP_NF_TARGET_NETMAP=y
++CONFIG_NF_NAT_FTP=y
++CONFIG_NF_NAT_IRC=y
++CONFIG_NF_NAT_TFTP=y
++CONFIG_NF_NAT_H323=y
++CONFIG_NF_NAT_SIP=y
++CONFIG_IP_NF_ARPTABLES=y
++CONFIG_IP_NF_ARPFILTER=y
++CONFIG_IP_NF_ARP_MANGLE=y
++CONFIG_IP_NF_SET=y
++CONFIG_IP_NF_SET_IPMAP=y
++CONFIG_IP_NF_SET_MACIPMAP=y
++CONFIG_IP_NF_SET_PORTMAP=y
++CONFIG_IP_NF_SET_IPHASH=y
++CONFIG_IP_NF_SET_NETHASH=y
++CONFIG_IP_NF_SET_IPPORTHASH=y
++CONFIG_IP_NF_SET_IPTREE=y
++CONFIG_IP_NF_SET_IPTREEMAP=y
++CONFIG_IP_NF_MATCH_SET=y
++CONFIG_IP_NF_TARGET_SET=y
++CONFIG_NET_SCH_CBQ=y
++CONFIG_NET_SCH_HTB=y
++CONFIG_NET_SCH_HFSC=y
++CONFIG_NET_SCH_PRIO=y
++CONFIG_NET_SCH_SFQ=y
++CONFIG_NET_SCH_ESFQ=y
++CONFIG_NET_SCH_TBF=y
++CONFIG_NET_SCH_INGRESS=y
++CONFIG_NET_CLS_BASIC=y
++CONFIG_NET_CLS_TCINDEX=y
++CONFIG_NET_CLS_ROUTE4=y
++CONFIG_NET_CLS_FW=y
++CONFIG_NET_CLS_U32=y
++CONFIG_NET_CLS_FLOW=y
++CONFIG_NET_EMATCH_CMP=y
++CONFIG_NET_EMATCH_NBYTE=y
++CONFIG_NET_EMATCH_U32=y
++CONFIG_NET_ACT_GACT=y
++CONFIG_NET_ACT_MIRRED=y
++CONFIG_NET_ACT_IPT=y
++CONFIG_NET_ACT_PEDIT=y
++CONFIG_BLK_DEV_LOOP=y
++CONFIG_BLK_DEV_IDECD=y
++CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
++CONFIG_BLK_DEV_IDEDMA_PCI=y
++CONFIG_TUN=y
++CONFIG_PCNET32=y
++CONFIG_E100=y
++CONFIG_NE2K_PCI=y
++CONFIG_8139TOO=y
++CONFIG_E1000=y
++CONFIG_R8169=y
++CONFIG_PPP=y
++CONFIG_PPP_BSDCOMP=y
++CONFIG_PPP_MPPE=y
++CONFIG_PPPOL2TP=y
++CONFIG_SLHC=y
++CONFIG_HIDRAW=y
++CONFIG_ISO9660_FS=y
++CONFIG_NLS=y
++CONFIG_CRYPTO_ALGAPI=y
++CONFIG_CRYPTO_AEAD=y
++CONFIG_CRYPTO_BLKCIPHER=y
++CONFIG_CRYPTO_SEQIV=y
++CONFIG_CRYPTO_HASH=y
++CONFIG_CRYPTO_MANAGER=y
++CONFIG_CRYPTO_HMAC=y
++CONFIG_CRYPTO_NULL=y
++CONFIG_CRYPTO_MD5=y
++CONFIG_CRYPTO_SHA1=y
++CONFIG_CRYPTO_GF128MUL=y
++CONFIG_CRYPTO_ECB=y
++CONFIG_CRYPTO_CBC=y
++CONFIG_CRYPTO_CTR=y
++CONFIG_CRYPTO_AES=y
++CONFIG_CRYPTO_AES_586=y
++CONFIG_CRYPTO_ARC4=y
++CONFIG_CRYPTO_DEFLATE=y
++CONFIG_CRYPTO_CRC32C=y
++CONFIG_CRYPTO_LZO=y
++CONFIG_LIBCRC32C=y
++CONFIG_LZO_COMPRESS=y
++CONFIG_TEXTSEARCH_KMP=y
++CONFIG_TEXTSEARCH_BM=y
++CONFIG_TEXTSEARCH_FSM=y
++# CONFIG_TCP_CONG_SCALABLE is not set
++# CONFIG_TCP_CONG_LP is not set
++# CONFIG_TCP_CONG_VENO is not set
++# CONFIG_TCP_CONG_YEAH is not set
++# CONFIG_TCP_CONG_ILLINOIS is not set
++# CONFIG_IPV6 is not set
++# CONFIG_INET6_XFRM_TUNNEL is not set
++# CONFIG_INET6_TUNNEL is not set
++# CONFIG_NF_CONNTRACK_AMANDA is not set
++# CONFIG_NF_CONNTRACK_PPTP is not set
++# CONFIG_NF_CONNTRACK_RTSP is not set
++# CONFIG_NETFILTER_XT_TARGET_CHAOS is not set
++# CONFIG_NETFILTER_XT_TARGET_DELUDE is not set
++# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
++# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
++# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
++# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
++# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
++# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
++# CONFIG_NETFILTER_XT_MATCH_ESP is not set
++# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
++# CONFIG_NETFILTER_XT_MATCH_PORTSCAN is not set
++# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
++# CONFIG_NETFILTER_XT_MATCH_REALM is not set
++# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
++# CONFIG_NETFILTER_XT_MATCH_TIME is not set
++# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
++# CONFIG_IP_NF_QUEUE is not set
++# CONFIG_IP_NF_MATCH_IPP2P is not set
++# CONFIG_IP_NF_MATCH_TIME is not set
++# CONFIG_IP_NF_MATCH_RECENT is not set
++# CONFIG_IP_NF_MATCH_ECN is not set
++# CONFIG_IP_NF_MATCH_AH is not set
++# CONFIG_IP_NF_MATCH_TTL is not set
++# CONFIG_IP_NF_TARGET_ULOG is not set
++# CONFIG_NF_NAT_SNMP_BASIC is not set
++# CONFIG_NF_NAT_RTSP is not set
++# CONFIG_NF_NAT_AMANDA is not set
++# CONFIG_NF_NAT_PPTP is not set
++# CONFIG_IP_NF_TARGET_ECN is not set
++# CONFIG_IP_NF_TARGET_TTL is not set
++# CONFIG_IP_NF_RAW is not set
++# CONFIG_BRIDGE_NF_EBTABLES is not set
++# CONFIG_ATM is not set
++# CONFIG_VLAN_8021Q is not set
++# CONFIG_LLC2 is not set
++# CONFIG_NET_SCH_RR is not set
++# CONFIG_NET_SCH_RED is not set
++# CONFIG_NET_SCH_TEQL is not set
++# CONFIG_NET_SCH_GRED is not set
++# CONFIG_NET_SCH_DSMARK is not set
++# CONFIG_NET_SCH_NETEM is not set
++# CONFIG_NET_CLS_RSVP is not set
++# CONFIG_NET_CLS_RSVP6 is not set
++# CONFIG_NET_EMATCH_META is not set
++# CONFIG_NET_EMATCH_TEXT is not set
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_BT is not set
++# CONFIG_WIRELESS_EXT is not set
++# CONFIG_IEEE80211 is not set
++# CONFIG_MTD is not set
++# CONFIG_BLK_DEV_CRYPTOLOOP is not set
++# CONFIG_BLK_DEV_NBD is not set
++# CONFIG_MISC_DEVICES is not set
++# CONFIG_BLK_DEV_SC1200 is not set
++# CONFIG_BLK_DEV_VIA82CXXX is not set
++# CONFIG_SCSI is not set
++# CONFIG_SCSI_DMA is not set
++# CONFIG_ATA is not set
++# CONFIG_IFB is not set
++# CONFIG_BONDING is not set
++# CONFIG_IMQ is not set
++# CONFIG_IMQ_BEHAVIOR_BA is not set
++# CONFIG_NET_VENDOR_3COM is not set
++# CONFIG_PCNET32_NAPI is not set
++# CONFIG_NATSEMI is not set
++# CONFIG_8139TOO_PIO is not set
++# CONFIG_E1000_NAPI is not set
++# CONFIG_R8169_NAPI is not set
++# CONFIG_WLAN_80211 is not set
++# CONFIG_BCM43XX_DMA_AND_PIO_MODE is not set
++# CONFIG_PPP_ASYNC is not set
++# CONFIG_PPP_SYNC_TTY is not set
++# CONFIG_PPP_DEFLATE is not set
++# CONFIG_PPPOE is not set
++# CONFIG_ISDN is not set
++# CONFIG_HW_RANDOM is not set
++# CONFIG_PC8736x_GPIO is not set
++# CONFIG_NSC_GPIO is not set
++# CONFIG_I2C is not set
++# CONFIG_W1 is not set
++# CONFIG_HWMON is not set
++# CONFIG_WATCHDOG is not set
++# CONFIG_VIDEO_DEV is not set
++# CONFIG_SOUND is not set
++# CONFIG_USB_SUPPORT is not set
++# CONFIG_NEW_LEDS is not set
++# CONFIG_EXT3_FS is not set
++# CONFIG_FS_POSIX_ACL is not set
++CONFIG_XFS_FS=y
++# CONFIG_XFS_DEBUG is not set
++# CONFIG_XFS_QUOTA is not set
++# CONFIG_XFS_SECURITY is not set
++# CONFIG_XFS_POSIX_ACL is not set
++# CONFIG_XFS_RT is not set
++# CONFIG_VXFS_FS is not set
++# CONFIG_UDF_FS is not set
++# CONFIG_MSDOS_FS is not set
++# CONFIG_VFAT_FS is not set
++# CONFIG_HFS_FS is not set
++# CONFIG_HFSPLUS_FS is not set
++# CONFIG_JFFS2_CMODE_PRIORITY is not set
++# CONFIG_SQUASHFS is not set
++# CONFIG_MINI_FO is not set
++# CONFIG_MINIX_FS is not set
++# CONFIG_NETWORK_FILESYSTEMS is not set
++# CONFIG_MAC_PARTITION is not set
++# CONFIG_CRYPTO_MD4 is not set
++# CONFIG_CRYPTO_SHA256 is not set
++# CONFIG_CRYPTO_SHA512 is not set
++# CONFIG_CRYPTO_WP512 is not set
++# CONFIG_CRYPTO_TGR192 is not set
++# CONFIG_CRYPTO_GCM is not set
++# CONFIG_CRYPTO_CCM is not set
++# CONFIG_CRYPTO_DES is not set
++# CONFIG_CRYPTO_BLOWFISH is not set
++# CONFIG_CRYPTO_TWOFISH is not set
++# CONFIG_CRYPTO_TWOFISH_586 is not set
++# CONFIG_CRYPTO_SERPENT is not set
++# CONFIG_CRYPTO_CAST5 is not set
++# CONFIG_CRYPTO_CAST6 is not set
++# CONFIG_CRYPTO_TEA is not set
++# CONFIG_CRYPTO_KHAZAD is not set
++# CONFIG_CRYPTO_ANUBIS is not set
++# CONFIG_CRYPTO_SALSA20 is not set
++# CONFIG_CRYPTO_MICHAEL_MIC is not set
++# CONFIG_CRYPTO_CAMELLIA is not set
++# CONFIG_CRYPTO_TEST is not set
++# CONFIG_CRYPTO_AUTHENC is not set
++# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
++# CONFIG_GENERIC_PENDING_IRQ is not set
++# CONFIG_X86_SMP is not set
++# CONFIG_X86_32_SMP is not set
++# CONFIG_X86_HT is not set
++# CONFIG_X86_TRAMPOLINE is not set
++# CONFIG_LOCK_KERNEL is not set
++# CONFIG_STOP_MACHINE is not set
++# CONFIG_M386 is not set
++# CONFIG_X86_UP_APIC is not set
++# CONFIG_KEXEC is not set
++# CONFIG_CPU_FREQ is not set
++# CONFIG_ARCH_SUPPORTS_MSI is not set
++# CONFIG_SCx200 is not set
++# CONFIG_PCCARD is not set
++# CONFIG_CARDBUS is not set
++# CONFIG_YENTA is not set
++# CONFIG_BINFMT_MISC is not set
++# CONFIG_IP_MULTICAST is not set
++# CONFIG_XFRM is not set
++# CONFIG_IP_ROUTE_MULTIPATH is not set
++# CONFIG_SYN_COOKIES is not set
++# CONFIG_INET_AH is not set
++# CONFIG_INET_ESP is not set
++# CONFIG_INET_IPCOMP is not set
++# CONFIG_INET_XFRM_TUNNEL is not set
++# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
++# CONFIG_8139CP is not set
++# CONFIG_8139TOO_8129 is not set
++# CONFIG_8139TOO_TUNE_TWISTER is not set
++# CONFIG_ACENIC is not set
++# CONFIG_ACORN_PARTITION is not set
++# CONFIG_ADAPTEC_STARFIRE is not set
++# CONFIG_ADFS_FS is not set
++# CONFIG_AFFS_FS is not set
++# CONFIG_AF_RXRPC is not set
++# CONFIG_AMD8111_ETH is not set
++# CONFIG_AMIGA_PARTITION is not set
++# CONFIG_APPLICOM is not set
++# CONFIG_ARCNET is not set
++# CONFIG_ATALK is not set
++# CONFIG_ATARI_PARTITION is not set
++# CONFIG_ATA_OVER_ETH is not set
++# CONFIG_ATL1 is not set
++# CONFIG_AUDIT is not set
++# CONFIG_AUTOFS4_FS is not set
++# CONFIG_AUTOFS_FS is not set
++# CONFIG_B44 is not set
++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
++# CONFIG_CAN is not set
++# CONFIG_CASSINI is not set
++# CONFIG_CDROM_PKTCDVD is not set
++# CONFIG_CFG80211 is not set
++# CONFIG_CGROUPS is not set
++# CONFIG_COMPAT_BRK is not set
++# CONFIG_CONNECTOR is not set
++# CONFIG_CRYPTO_CRYPTD is not set
++# CONFIG_CRAMFS is not set
++CONFIG_M586MMX=y
++CONFIG_M586TSC=y
++# CONFIG_MFD_SM501 is not set
++# CONFIG_PARPORT is not set
++# CONFIG_QUOTA is not set
++# CONFIG_R3964 is not set
++# CONFIG_SERIAL_JSM is not set
++# CONFIG_SERIAL_NONSTANDARD is not set
++# CONFIG_SERIO_CT82C710 is not set
++# CONFIG_SERIO_PCIPS2 is not set
++# CONFIG_SERIO_RAW is not set
++# CONFIG_SERIO_SERPORT is not set
++# CONFIG_X86_PPRO_FENCE is not set
++# CONFIG_XFRM_MIGRATE is not set
++# CONFIG_XFRM_STATISTICS is not set
++# CONFIG_XFRM_SUB_POLICY is not set
++# CONFIG_YELLOWFIN is not set
+ # CONFIG_ZONE_DMA32 is not set
++CONFIG_MII=y
++CONFIG_MMU=y
++CONFIG_SERIAL_8250=y
++CONFIG_SERIAL_8250_CONSOLE=y
++CONFIG_SERIAL_8250_NR_UARTS=2
++CONFIG_SERIAL_8250_PCI=y
++CONFIG_SERIAL_8250_PNP=y
++CONFIG_SERIAL_8250_RUNTIME_UARTS=2
++CONFIG_SERIAL_CORE=y
++CONFIG_SERIAL_CORE_CONSOLE=y
++CONFIG_SERIO=y
++CONFIG_SERIO_I8042=y
++CONFIG_SERIO_LIBPS2=y
++CONFIG_ZONE_DMA=y
++CONFIG_ZONE_DMA_FLAG=1
++# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
++CONFIG_INPUT_MOUSEDEV_PSAUX=y
++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_CRYPTO_SALSA20_586 is not set
++# CONFIG_NONPROMISC_DEVMEM is not set
++# CONFIG_X86_PAT is not set
++# CONFIG_OLPC is not set
++# CONFIG_BLK_DEV_HD_ONLY is not set
++# CONFIG_THERMAL_HWMON is not set
++# CONFIG_ACCESSIBILITY is not set
++# CONFIG_ISCSI_IBFT_FIND is not set
++# CONFIG_4KSTACKS is not set
diff -Naur a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27
--- a/target/linux/x86/config-2.6.27 2008-12-10 01:39:29.530827000 +0000
+++ b/target/linux/x86/config-2.6.27 2009-03-14 14:08:31.048979984 +0000
Modified: torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch 2009-03-15 00:32:40 UTC (rev 19001)
+++ torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch 2009-03-15 00:35:36 UTC (rev 19002)
@@ -1,7 +1,12 @@
diff -Naur a/.config b/.config
--- a/.config 1970-01-01 00:00:00.000000000 +0000
-+++ b/.config 2009-03-14 13:28:04.407885504 +0000
-@@ -0,0 +1,1298 @@
++++ b/.config 2009-03-14 19:50:51.158408720 +0000
+@@ -0,0 +1,1291 @@
++#
++# Automatically generated make config: don't edit
++# OpenWrt version: Kamikaze (unknown)
++# Sat Mar 14 12:50:32 2009
++#
+CONFIG_HAVE_DOT_CONFIG=y
+# CONFIG_TARGET_ppc40x is not set
+# CONFIG_TARGET_ppc44x is not set
@@ -218,7 +223,7 @@
+CONFIG_LOCALMIRROR=""
+CONFIG_AUTOREBUILD=y
+CONFIG_BUILD_SUFFIX=""
-+# CONFIG_CCACHE is not set
++CONFIG_CCACHE=y
+CONFIG_EXTERNAL_KERNEL_TREE=""
+CONFIG_KERNEL_GIT_CLONE_URI=""
+CONFIG_KERNEL_GIT_LOCAL_REPOSITORY=""
@@ -292,13 +297,13 @@
+#
+# CONFIG_BUSYBOX_CONFIG_DESKTOP is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE is not set
-+CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_BUSYBOX_CONFIG_SHOW_USAGE=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_INSTALLER is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_INSTALLER=y
+# CONFIG_BUSYBOX_CONFIG_LOCALE_SUPPORT is not set
+CONFIG_BUSYBOX_CONFIG_GETOPT_LONG=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_DEVPTS=y
@@ -315,8 +320,7 @@
+#
+# Build Options
+#
-+# CONFIG_BUSYBOX_CONFIG_STATIC is not set
-+# CONFIG_BUSYBOX_CONFIG_PIE is not set
++CONFIG_BUSYBOX_CONFIG_STATIC=y
+# CONFIG_BUSYBOX_CONFIG_NOMMU is not set
+CONFIG_BUSYBOX_CONFIG_LFS=y
+CONFIG_BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX=""
@@ -329,7 +333,7 @@
+CONFIG_BUSYBOX_CONFIG_NO_DEBUG_LIB=y
+# CONFIG_BUSYBOX_CONFIG_DMALLOC is not set
+# CONFIG_BUSYBOX_CONFIG_EFENCE is not set
-+CONFIG_BUSYBOX_CONFIG_INCLUDE_SUSv2=y
++# CONFIG_BUSYBOX_CONFIG_INCLUDE_SUSv2 is not set
+
+#
+# Installation Options
@@ -350,9 +354,9 @@
+# CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN=512
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_VI is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_VI=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY=256
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -392,7 +396,7 @@
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME=y
+# CONFIG_BUSYBOX_CONFIG_UNCOMPRESS is not set
+# CONFIG_BUSYBOX_CONFIG_UNLZMA is not set
+# CONFIG_BUSYBOX_CONFIG_UNZIP is not set
@@ -419,7 +423,7 @@
+CONFIG_BUSYBOX_CONFIG_DATE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_BUSYBOX_CONFIG_DD=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_BUSYBOX_CONFIG_DF=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_DF_INODE is not set
@@ -453,7 +457,7 @@
+CONFIG_BUSYBOX_CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-+CONFIG_BUSYBOX_CONFIG_MD5SUM=y
++# CONFIG_BUSYBOX_CONFIG_MD5SUM is not set
+CONFIG_BUSYBOX_CONFIG_MKDIR=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_BUSYBOX_CONFIG_MKFIFO=y
@@ -490,11 +494,11 @@
+CONFIG_BUSYBOX_CONFIG_TEE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_BUSYBOX_CONFIG_TEST=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64 is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64=y
+CONFIG_BUSYBOX_CONFIG_TOUCH=y
+CONFIG_BUSYBOX_CONFIG_TR=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TR_CLASSES is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TR_EQUIV is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_TR_CLASSES=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_BUSYBOX_CONFIG_TRUE=y
+# CONFIG_BUSYBOX_CONFIG_TTY is not set
+CONFIG_BUSYBOX_CONFIG_UNAME=y
@@ -506,7 +510,7 @@
+CONFIG_BUSYBOX_CONFIG_WC=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_WC_LARGE is not set
+# CONFIG_BUSYBOX_CONFIG_WHO is not set
-+CONFIG_BUSYBOX_CONFIG_WHOAMI=y
++# CONFIG_BUSYBOX_CONFIG_WHOAMI is not set
+CONFIG_BUSYBOX_CONFIG_YES=y
+
+#
@@ -699,24 +703,8 @@
+# CONFIG_BUSYBOX_CONFIG_MDEV is not set
+# CONFIG_BUSYBOX_CONFIG_MKSWAP is not set
+# CONFIG_BUSYBOX_CONFIG_MORE is not set
-+CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y
-+CONFIG_BUSYBOX_CONFIG_VOLUMEID=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS is not set
-+CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS is not set
++# CONFIG_BUSYBOX_CONFIG_VOLUMEID is not set
+CONFIG_BUSYBOX_CONFIG_MOUNT=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE is not set
@@ -750,8 +738,10 @@
+# CONFIG_BUSYBOX_CONFIG_BBCONFIG is not set
+# CONFIG_BUSYBOX_CONFIG_CHAT is not set
+# CONFIG_BUSYBOX_CONFIG_CHRT is not set
-+# CONFIG_BUSYBOX_CONFIG_CROND is not set
-+# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
++CONFIG_BUSYBOX_CONFIG_CROND=y
++# CONFIG_BUSYBOX_CONFIG_DEBUG_CROND_OPTION is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
++CONFIG_BUSYBOX_CONFIG_CRONTAB=y
+# CONFIG_BUSYBOX_CONFIG_DC is not set
+# CONFIG_BUSYBOX_CONFIG_DEVFSD is not set
+# CONFIG_BUSYBOX_CONFIG_EJECT is not set
@@ -783,12 +773,13 @@
+# CONFIG_BUSYBOX_CONFIG_TASKSET is not set
+CONFIG_BUSYBOX_CONFIG_TIME=y
+# CONFIG_BUSYBOX_CONFIG_TTYSIZE is not set
-+# CONFIG_BUSYBOX_CONFIG_WATCHDOG is not set
++CONFIG_BUSYBOX_CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+CONFIG_BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+CONFIG_BUSYBOX_CONFIG_ARP=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
@@ -820,13 +811,16 @@
+CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_BUSYBOX_CONFIG_NSLOOKUP=y
+CONFIG_BUSYBOX_CONFIG_PING=y
++# CONFIG_BUSYBOX_CONFIG_PING6 is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_BUSYBOX_CONFIG_PSCAN is not set
+CONFIG_BUSYBOX_CONFIG_ROUTE=y
+# CONFIG_BUSYBOX_CONFIG_SENDMAIL is not set
+# CONFIG_BUSYBOX_CONFIG_FETCHMAIL is not set
+# CONFIG_BUSYBOX_CONFIG_SLATTACH is not set
-+# CONFIG_BUSYBOX_CONFIG_TELNET is not set
++CONFIG_BUSYBOX_CONFIG_TELNET=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_BUSYBOX_CONFIG_TELNETD is not set
+# CONFIG_BUSYBOX_CONFIG_TFTP is not set
+# CONFIG_BUSYBOX_CONFIG_TFTPD is not set
@@ -839,7 +833,7 @@
+CONFIG_BUSYBOX_CONFIG_FEATURE_RFC3397=y
+CONFIG_BUSYBOX_CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-+# CONFIG_BUSYBOX_CONFIG_VCONFIG is not set
++CONFIG_BUSYBOX_CONFIG_VCONFIG=y
+# CONFIG_BUSYBOX_CONFIG_WGET is not set
+# CONFIG_BUSYBOX_CONFIG_ZCIP is not set
+# CONFIG_BUSYBOX_CONFIG_TCPSVD is not set
@@ -947,27 +941,27 @@
+# CONFIG_PACKAGE_dnsmasq is not set
+# CONFIG_PACKAGE_dropbear is not set
+# CONFIG_PACKAGE_ead is not set
-+# CONFIG_PACKAGE_firewall is not set
++CONFIG_PACKAGE_firewall=y
+# CONFIG_PACKAGE_hotplug2 is not set
+CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_iptables-mod-conntrack=y
-+# CONFIG_PACKAGE_iptables-mod-conntrack-extra is not set
-+# CONFIG_PACKAGE_iptables-mod-extra is not set
++CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
++CONFIG_PACKAGE_iptables-mod-extra=y
+CONFIG_PACKAGE_iptables-mod-filter=y
+CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_iptables-mod-iprange=y
+# CONFIG_PACKAGE_iptables-mod-ipsec is not set
+# CONFIG_PACKAGE_iptables-mod-ipset is not set
+CONFIG_PACKAGE_iptables-mod-nat=y
-+# CONFIG_PACKAGE_iptables-mod-nat-extra is not set
++CONFIG_PACKAGE_iptables-mod-nat-extra=y
+# CONFIG_PACKAGE_iptables-mod-ulog is not set
+CONFIG_PACKAGE_iptables-utils=y
-+CONFIG_PACKAGE_ldconfig=y
-+# CONFIG_PACKAGE_libc is not set
++# CONFIG_PACKAGE_ldconfig is not set
++CONFIG_PACKAGE_libc=y
+CONFIG_PACKAGE_libgcc=y
+CONFIG_PACKAGE_libpthread=y
+CONFIG_PACKAGE_librt=y
-+CONFIG_PACKAGE_mtd=y
++# CONFIG_PACKAGE_mtd is not set
+# CONFIG_PACKAGE_opkg is not set
+# CONFIG_PACKAGE_swconfig is not set
+# CONFIG_PACKAGE_uci is not set
@@ -982,7 +976,7 @@
+# disc
+#
+# CONFIG_PACKAGE_libfuse is not set
-+CONFIG_PACKAGE_libblkid=y
++# CONFIG_PACKAGE_libblkid is not set
+CONFIG_PACKAGE_libevent=y
+# CONFIG_PACKAGE_libext2fs is not set
+# CONFIG_PACKAGE_libiw is not set
@@ -995,7 +989,7 @@
+# CONFIG_PACKAGE_libreadline is not set
+# CONFIG_PACKAGE_libuci is not set
+# CONFIG_PACKAGE_libuci-lua is not set
-+CONFIG_PACKAGE_libuuid=y
++# CONFIG_PACKAGE_libuuid is not set
+# CONFIG_PACKAGE_linux-atm is not set
+CONFIG_PACKAGE_zlib=y
+
@@ -1034,8 +1028,8 @@
+# CONFIG_PACKAGE_kmod-aoe is not set
+# CONFIG_PACKAGE_kmod-ata-core is not set
+# CONFIG_PACKAGE_kmod-ide-aec62xx is not set
-+# CONFIG_PACKAGE_kmod-ide-core is not set
-+# CONFIG_PACKAGE_kmod-loop is not set
++CONFIG_PACKAGE_kmod-ide-core=y
++CONFIG_PACKAGE_kmod-loop=y
+# CONFIG_PACKAGE_kmod-nbd is not set
+# CONFIG_PACKAGE_kmod-scsi-core is not set
+# CONFIG_PACKAGE_kmod-scsi-generic is not set
@@ -1044,9 +1038,9 @@
+# Cryptographic API modules
+#
+# CONFIG_PACKAGE_kmod-crypto-aes is not set
-+# CONFIG_PACKAGE_kmod-crypto-arc4 is not set
++CONFIG_PACKAGE_kmod-crypto-arc4=y
+# CONFIG_PACKAGE_kmod-crypto-authenc is not set
-+# CONFIG_PACKAGE_kmod-crypto-core is not set
++CONFIG_PACKAGE_kmod-crypto-core=y
+# CONFIG_PACKAGE_kmod-crypto-des is not set
+# CONFIG_PACKAGE_kmod-crypto-hmac is not set
+# CONFIG_PACKAGE_kmod-crypto-hw-geode is not set
@@ -1057,7 +1051,7 @@
+# CONFIG_PACKAGE_kmod-crypto-misc is not set
+# CONFIG_PACKAGE_kmod-crypto-null is not set
+# CONFIG_PACKAGE_kmod-crypto-ocf is not set
-+# CONFIG_PACKAGE_kmod-crypto-sha1 is not set
++CONFIG_PACKAGE_kmod-crypto-sha1=y
+# CONFIG_PACKAGE_kmod-crypto-test is not set
+
+#
@@ -1068,7 +1062,7 @@
+# CONFIG_PACKAGE_kmod-fs-ext3 is not set
+# CONFIG_PACKAGE_kmod-fs-hfs is not set
+# CONFIG_PACKAGE_kmod-fs-hfsplus is not set
-+# CONFIG_PACKAGE_kmod-fs-isofs is not set
++CONFIG_PACKAGE_kmod-fs-isofs=y
+CONFIG_PACKAGE_kmod-fs-mbcache=y
+# CONFIG_PACKAGE_kmod-fs-minix is not set
+# CONFIG_PACKAGE_kmod-fs-msdos is not set
@@ -1079,7 +1073,7 @@
+# CONFIG_PACKAGE_kmod-fs-vfat is not set
+# CONFIG_PACKAGE_kmod-fs-xfs is not set
+# CONFIG_PACKAGE_kmod-fuse is not set
-+# CONFIG_PACKAGE_kmod-nls-base is not set
++CONFIG_PACKAGE_kmod-nls-base=y
+# CONFIG_PACKAGE_kmod-nls-cp1250 is not set
+# CONFIG_PACKAGE_kmod-nls-cp1251 is not set
+# CONFIG_PACKAGE_kmod-nls-cp437 is not set
@@ -1108,21 +1102,21 @@
+#
+# Netfilter Extensions
+#
-+# CONFIG_PACKAGE_kmod-arptables is not set
++CONFIG_PACKAGE_kmod-arptables=y
+# CONFIG_PACKAGE_kmod-ebtables is not set
+# CONFIG_PACKAGE_kmod-ip6tables is not set
+CONFIG_PACKAGE_kmod-ipt-core=y
+CONFIG_PACKAGE_kmod-ipt-conntrack=y
-+# CONFIG_PACKAGE_kmod-ipt-conntrack-extra is not set
-+# CONFIG_PACKAGE_kmod-ipt-extra is not set
++CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
++CONFIG_PACKAGE_kmod-ipt-extra=y
+CONFIG_PACKAGE_kmod-ipt-filter=y
+CONFIG_PACKAGE_kmod-ipt-ipopt=y
+CONFIG_PACKAGE_kmod-ipt-iprange=y
+# CONFIG_PACKAGE_kmod-ipt-ipsec is not set
+# CONFIG_PACKAGE_kmod-ipt-ipset is not set
+CONFIG_PACKAGE_kmod-ipt-nat=y
-+# CONFIG_PACKAGE_kmod-ipt-nat-extra is not set
-+# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
++CONFIG_PACKAGE_kmod-ipt-nat-extra=y
++CONFIG_PACKAGE_kmod-ipt-nathelper=y
+# CONFIG_PACKAGE_kmod-ipt-nathelper-extra is not set
+# CONFIG_PACKAGE_kmod-ipt-queue is not set
+# CONFIG_PACKAGE_kmod-ipt-ulog is not set
@@ -1131,14 +1125,14 @@
+# Network Devices
+#
+# CONFIG_PACKAGE_kmod-3c59x is not set
-+# CONFIG_PACKAGE_kmod-8139too is not set
-+# CONFIG_PACKAGE_kmod-e100 is not set
-+# CONFIG_PACKAGE_kmod-e1000 is not set
++CONFIG_PACKAGE_kmod-8139too=y
++CONFIG_PACKAGE_kmod-e100=y
++CONFIG_PACKAGE_kmod-e1000=y
+# CONFIG_PACKAGE_kmod-hfcmulti is not set
-+# CONFIG_PACKAGE_kmod-natsemi is not set
-+# CONFIG_PACKAGE_kmod-ne2k-pci is not set
-+# CONFIG_PACKAGE_kmod-pcnet32 is not set
-+# CONFIG_PACKAGE_kmod-r8169 is not set
++CONFIG_PACKAGE_kmod-natsemi=y
++CONFIG_PACKAGE_kmod-ne2k-pci=y
++CONFIG_PACKAGE_kmod-pcnet32=y
++CONFIG_PACKAGE_kmod-r8169=y
+# CONFIG_PACKAGE_kmod-siit is not set
+# CONFIG_PACKAGE_kmod-sis900 is not set
+# CONFIG_PACKAGE_kmod-sky2 is not set
@@ -1163,7 +1157,7 @@
+# CONFIG_PACKAGE_kmod-mp-alg is not set
+# CONFIG_PACKAGE_kmod-ppp is not set
+# CONFIG_PACKAGE_kmod-pktgen is not set
-+# CONFIG_PACKAGE_kmod-sched is not set
++CONFIG_PACKAGE_kmod-sched=y
+# CONFIG_PACKAGE_kmod-sit is not set
+CONFIG_PACKAGE_kmod-tun=y
+
@@ -1284,7 +1278,6 @@
+# CONFIG_UDEVEXTRAS_scsi_id is not set
+# CONFIG_UDEVEXTRAS_usb_id is not set
+# CONFIG_UDEVEXTRAS_volume_id is not set
-+# CONFIG_PACKAGE_uuidgen is not set
+
+#
+# Extra packages
More information about the tor-commits
mailing list