merge of 0cd761de98072480e6e68e383c48e38bedd2f557

     and 52ebc3713b5433a8127e7b025d8d2f4f085214e8

38 files changed, 153 insertions, 1457 deletions

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
new file mode 100644
index 0000000000..f82af18d74
--- /dev/null
+++ b/classes/sanity.bbclass
@@ -0,0 +1,69 @@
+#
+# Sanity check the users setup for common misconfigurations
+#
+
+BB_MIN_VERSION = "1.3.3"
+
+def raise_sanity_error(msg):
+	import bb
+	bb.fatal("Openembedded's config sanity checker detected a potential misconfiguration.\nEither fix cause of this error or at your own risk disable the checker (see sanity.conf).\n%s" % msg)
+
+def check_conf_exists(fn, data):
+	import bb, os
+
+	bbpath = []
+	fn = bb.data.expand(fn, data)
+	vbbpath = bb.data.getVar("BBPATH", data)
+	if vbbpath:
+		bbpath += vbbpath.split(":")
+	for p in bbpath:
+		currname = os.path.join(bb.data.expand(p, data), fn)
+		if os.access(currname, os.R_OK):
+			return True
+	return False
+
+addhandler check_sanity_eventhandler
+python check_sanity_eventhandler() {
+	from bb import note, error, data, __version__
+	from bb.event import Handled, NotHandled, getName
+	from distutils.version import LooseVersion
+	import os
+
+	sanity_checked = bb.data.getVar('SANITY_CHECKED', e.data)
+	if sanity_checked == "1":
+		return
+
+	# Check the bitbake version meets minimum requirements
+	minversion = bb.data.getVar('BB_MIN_VERSION', e.data , True)
+	if not minversion:
+		# Hack: BB_MIN_VERSION hasn't been parsed yet so return 
+		# and wait for the next call
+		return
+
+	if (LooseVersion(bb.__version__) < LooseVersion(minversion)):
+		raise_sanity_error('Bitbake version %s is required and version %s was found' % (minversion, bb.__version__))
+
+	# Check TARGET_ARCH is set
+	if bb.data.getVar('TARGET_ARCH', e.data, True) == 'INVALID':
+		raise_sanity_error('Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.')
+	
+	# Check TARGET_OS is set
+	if bb.data.getVar('TARGET_OS', e.data, True) == 'INVALID':
+		raise_sanity_error('Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.')
+
+	# Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
+	if "diffstat-native" not in bb.data.getVar('ASSUME_PROVIDED', e.data, True).split():
+		raise_sanity_error('Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf')
+	
+	# Check the MACHINE is valid
+	if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+		raise_sanity_error('Please set a valid MACHINE in your local.conf')
+	
+	# Check the distro is valid
+	if not check_conf_exists("conf/distro/${DISTRO}.conf", e.data):
+		raise_sanity_error('Please set a valid DISTRO in your local.conf')
+	
+	bb.data.setVar('SANITY_CHECKED', "1", e.data)
+	return
+}
+
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a2ba5e6382..cd435a9cad 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -394,3 +394,4 @@ include conf/target/${TARGET_SYS}.conf
 include conf/machine/${MACHINE}.conf
 include conf/distro/${DISTRO}.conf
 include conf/documentation.conf
+require conf/sanity.conf
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 9c9f751bff..b0147aad55 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -63,3 +63,21 @@ PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
 PREFERRED_VERSION_dbus = "0.61"
 
+
+#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
+
+#### GPE section ###
+
+#Install libgtkinput in devices without a keyboard
+GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_simpad =  " libgtkinput" 
+GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
+#As soon as a kill switch is in place we can add it to devices with a keyboard
+#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_akita = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput"
+
+
diff --git a/conf/sanity.conf b/conf/sanity.conf
new file mode 100644
index 0000000000..df2ec3e82a
--- /dev/null
+++ b/conf/sanity.conf
@@ -0,0 +1,8 @@
+# Sanity checks for common user misconfigurations
+#
+# See sanity.bbclass
+#
+# Expert users can confirm their sanity with "touch conf/sanity.conf"
+
+INHERIT += "sanity"
+
diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab
index c693378d33..3d0e508dfd 100644
--- a/packages/base-files/base-files/borzoi/fstab
+++ b/packages/base-files/base-files/borzoi/fstab
@@ -19,7 +19,7 @@ tmpfs              /media/ram   tmpfs   defaults                0  0
 #
 /dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
 devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
-usbdevfs        /proc/bus/usb   usbdevfs        noauto                0  0
+usbfs           /proc/bus/usb   usbfs           noauto                0  0
 
 #
 # Harddisk
diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index c693378d33..3d0e508dfd 100644
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -19,7 +19,7 @@ tmpfs              /media/ram   tmpfs   defaults                0  0
 #
 /dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
 devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
-usbdevfs        /proc/bus/usb   usbdevfs        noauto                0  0
+usbfs           /proc/bus/usb   usbfs           noauto                0  0
 
 #
 # Harddisk
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 0689cfa0f3..25cb1b1bbe 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r47"
+PR = "r48"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/dvbtools/dvbtraffic.bb b/packages/dvbtools/dvbtraffic.bb
index 4558038e92..14dd0af97d 100644
--- a/packages/dvbtools/dvbtraffic.bb
+++ b/packages/dvbtools/dvbtraffic.bb
@@ -3,7 +3,7 @@ SECTION = "console/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/dvbtraffic"
 
diff --git a/packages/dvbtools/sctzap_cvs.bb b/packages/dvbtools/sctzap_cvs.bb
index 4d33e89f0e..e2900e873d 100644
--- a/packages/dvbtools/sctzap_cvs.bb
+++ b/packages/dvbtools/sctzap_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "console/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/szap \
            cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/lib"
diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc
index 838924a75b..72f2dc2da3 100644
--- a/packages/hostap/hostap-modules.inc
+++ b/packages/hostap/hostap-modules.inc
@@ -3,6 +3,8 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
+PROVIDES = "hostap-conf"
+RPROVIDES = "virtual/kernel-hostap"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
 	   file://hostap_cs.conf"
diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb
index 7f2cc5628a..2a09550772 100644
--- a/packages/hostap/hostap-modules_0.3.10.bb
+++ b/packages/hostap/hostap-modules_0.3.10.bb
@@ -1,6 +1,5 @@
 include hostap-modules.inc
-LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
 	    file://add_event.patch;patch=1 \
diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb
index aead35d25b..5980783840 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -1,6 +1,5 @@
 include hostap-modules.inc
-PROVIDES = "virtual/kernel-hostap hostap-conf"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
 	    file://add_event.patch;patch=1 \
diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb
index 95bcbff5a6..508c653230 100644
--- a/packages/hostap/hostap-modules_0.3.9.bb
+++ b/packages/hostap/hostap-modules_0.3.9.bb
@@ -1,6 +1,5 @@
 include hostap-modules.inc
-PROVIDES = "virtual/kernel-hostap hostap-conf"
-PR = "r8"
+PR = "r9"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
 	    file://add_event.patch;patch=1 \
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
index 278b2ed0bc..b3d0a8e949 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -1,5 +1,4 @@
 include hostap-modules.inc
-PROVIDES = "virtual/kernel-hostap hostap-conf"
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"
diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb
index 57905fffed..e9efcb5617 100644
--- a/packages/hostap/hostap-modules_0.4.7.bb
+++ b/packages/hostap/hostap-modules_0.4.7.bb
@@ -1,4 +1,4 @@
 include hostap-modules.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"
diff --git a/packages/hostap/hostap-utils_0.3.7.bb b/packages/hostap/hostap-utils_0.3.7.bb
index cdfb0c1e3e..c5c5d5b3f9 100644
--- a/packages/hostap/hostap-utils_0.3.7.bb
+++ b/packages/hostap/hostap-utils_0.3.7.bb
@@ -4,8 +4,8 @@ SECTION = "kernel/userland"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-RDEPENDS = "virtual/kernel-hostap"
-PR = "r2"
+RRECOMMENDS = "virtual/kernel-hostap"
+PR = "r3"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
 	   file://hostap-fw-load.patch;patch=1"
diff --git a/packages/hostap/hostap-utils_0.4.0.bb b/packages/hostap/hostap-utils_0.4.0.bb
index 98254602aa..c5c5d5b3f9 100644
--- a/packages/hostap/hostap-utils_0.4.0.bb
+++ b/packages/hostap/hostap-utils_0.4.0.bb
@@ -4,7 +4,6 @@ SECTION = "kernel/userland"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel-hostap"
 RRECOMMENDS = "virtual/kernel-hostap"
 PR = "r3"
 
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index e3fc55a88f..d3b5dd46a8 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -5,6 +5,11 @@ DEPENDS = "libqpe-opie openssl pcre"
 LICENSE = "LGPL/GPL"
 PR = "r3"
 
+# Note if this .bb files fails with the error:
+# "No rule to make target `-lpcre', needed by `konqueror'.  Stop."
+# a workaround is to install the libpcre3-dev package onto your build 
+# machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel).
+
 SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \
            file://opie1.patch;patch=1 \
            file://packing.patch;patch=1 \
diff --git a/packages/konqueror/konqueror-embedded_20050322.bb b/packages/konqueror/konqueror-embedded_20050322.bb
index 36a59b0834..1fec1375c5 100644
--- a/packages/konqueror/konqueror-embedded_20050322.bb
+++ b/packages/konqueror/konqueror-embedded_20050322.bb
@@ -7,6 +7,11 @@ DEPENDS = "openssl pcre"
 LICENSE = "LGPL/GPL"
 PR = "r3"
 
+# Note if this .bb files fails with the error:
+# "No rule to make target `-lpcre', needed by `konqueror'.  Stop."
+# a workaround is to install the libpcre3-dev package onto your build
+# machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel).
+
 SRC_URI = "http://www.cirulla.net/kdenox-snapshots/snapshots/konqueror3-embedded-0.2-${PV}.tar.bz2 \
            file://qt-embedded.patch;patch=1"
 S = "${WORKDIR}/konqueror3-embedded-0.2-${PV}"
diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.7.bb
index 72bd6adfbd..369120e685 100644
--- a/packages/libmodplug/libmodplug_0.7.bb
+++ b/packages/libmodplug/libmodplug_0.7.bb
@@ -1,12 +1,13 @@
-SECTION = "libs"
 DESCRIPTION = "Library for reading mod-like audio files."
+HOMEPAGE = "http://modplug-xmms.sf.net"
+SECTION = "libs"
+LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
-LICENSE = "GPL"
-inherit autotools  pkgconfig
+
+inherit autotools pkgconfig
 
 do_stage() {
 	install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR}
-#FIXME!
-	cp -pPR src/.libs/libmodplug.so* ${STAGING_LIBDIR}
+	oe_libinstall -C src -so libmodplug ${STAGING_LIBDIR}
 }
diff --git a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch b/packages/libxine/files/libxine-gcc4.patch
index 0a370b9579..0a370b9579 100644
--- a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch
+++ b/packages/libxine/files/libxine-gcc4.patch
diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index 668a2176fb..62f1ac393e 100644
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -5,11 +5,11 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib libogg tremor libmad libmodplug"
 PROVIDES = "virtual/libxine"
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig gettext
 
-SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-${PV}.tar.gz \
 	file://cpu-${PV}.patch;patch=1 \
 	file://configure-${PV}.patch;patch=1 \
 	file://demuxogg.patch;patch=1 \
@@ -20,7 +20,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.
 	file://libxine-tremor-autoconf.patch;patch=1 \
 	file://mpegvideo-static-inlinine.patch;patch=1 \
 	file://libxine-arm-configure.patch;patch=1 \
-	file://no-caca.patch;patch=1 "
+	file://no-caca.patch;patch=1 \
+    file://libxine-gcc4.patch;patch=1"
 S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index ea70778517..03a47474b0 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.
 	file://libxine-cut-memusage.patch;patch=1 \
 	file://mpegvideo-static-inlinine.patch;patch=1 \
 	file://libxine-libavcodec.patch;patch=1 \
-    file://libxine-gcc4.patch;patch=1"
+	file://libxine-gcc4.patch;patch=1"
 S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"
diff --git a/packages/openssl/openssl-0.9.7b/.mtn2git_empty b/packages/openssl/openssl-0.9.7b/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openssl/openssl-0.9.7b/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openssl/openssl-0.9.7b/armeb.patch b/packages/openssl/openssl-0.9.7b/armeb.patch
deleted file mode 100644
index dc1d866bee..0000000000
--- a/packages/openssl/openssl-0.9.7b/armeb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: openssl-0.9.7b/Configure
-===================================================================
---- openssl-0.9.7b.orig/Configure	2005-02-03 13:02:06.876524776 -0500
-+++ openssl-0.9.7b/Configure	2005-02-03 13:03:12.869492320 -0500
-@@ -415,6 +415,7 @@
- 
- # Linux on ARM
- "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- # SCO/Caldera targets.
- #
diff --git a/packages/openssl/openssl-0.9.7b/debian.patch b/packages/openssl/openssl-0.9.7b/debian.patch
deleted file mode 100644
index 176789a2b9..0000000000
--- a/packages/openssl/openssl-0.9.7b/debian.patch
+++ /dev/null
@@ -1,682 +0,0 @@
---- openssl-0.9.7b.orig/apps/der_chop
-+++ openssl-0.9.7b/apps/der_chop
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # der_chop ... this is one total hack that Eric is really not proud of
- #              so don't look at it and don't ask for support
---- openssl-0.9.7b.orig/apps/Makefile.ssl
-+++ openssl-0.9.7b/apps/Makefile.ssl
-@@ -3,7 +3,7 @@
- #
- 
- DIR=		apps
--TOP=		..
-+TOP=		$(shell pwd)/..
- CC=		cc
- INCLUDES=	-I$(TOP) -I../include $(KRB5_INCLUDES)
- CFLAG=		-g -static
-@@ -30,9 +30,14 @@
- 
- GENERAL=Makefile makeapps.com install.com
- 
-+TOP=$(shell pwd)/..
-+#DLIBCRYPTO=../crypto/.libs/libcrypto.a
- DLIBCRYPTO=../libcrypto.a
-+#DLIBSSL=../ssl/.libs/libssl.a
- DLIBSSL=../libssl.a
-+#LIBCRYPTO=-L$(TOP)/crypto/.libs -lcrypto
- LIBCRYPTO=-L.. -lcrypto
-+#LIBSSL=-L$(TOP)/ssl/.libs -lssl
- LIBSSL=-L.. -lssl
- 
- PROGRAM= openssl
-@@ -136,6 +141,8 @@
- clean:
- 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
- 	rm -f req
-+	rm -f *.lo
-+	rm -fr .libs
- 
- $(DLIBSSL):
- 	(cd ..; $(MAKE) DIRS=ssl all)
---- openssl-0.9.7b.orig/apps/progs.h
-+++ openssl-0.9.7b/apps/progs.h
-@@ -35,9 +35,7 @@
- extern int spkac_main(int argc,char *argv[]);
- extern int smime_main(int argc,char *argv[]);
- extern int rand_main(int argc,char *argv[]);
--#ifndef OPENSSL_NO_ENGINE
- extern int engine_main(int argc,char *argv[]);
--#endif
- extern int ocsp_main(int argc,char *argv[]);
- 
- #define FUNC_TYPE_GENERAL	1
-@@ -94,9 +92,7 @@
- #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
- 	{FUNC_TYPE_GENERAL,"s_client",s_client_main},
- #endif
--#ifndef OPENSSL_NO_SPEED
- 	{FUNC_TYPE_GENERAL,"speed",speed_main},
--#endif
- #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
- 	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
- #endif
-@@ -115,9 +111,7 @@
- 	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
- 	{FUNC_TYPE_GENERAL,"smime",smime_main},
- 	{FUNC_TYPE_GENERAL,"rand",rand_main},
--#ifndef OPENSSL_NO_ENGINE
- 	{FUNC_TYPE_GENERAL,"engine",engine_main},
--#endif
- 	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
- #ifndef OPENSSL_NO_MD2
- 	{FUNC_TYPE_MD,"md2",dgst_main},
---- openssl-0.9.7b.orig/Configure
-+++ openssl-0.9.7b/Configure
-@@ -1,4 +1,4 @@
--:
-+#!/usr/bin/perl
- eval 'exec perl -S $0 ${1+"$@"}'
-     if $running_under_some_shell;
- ##
-@@ -1257,7 +1290,8 @@
- 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
- 		{
- 		my $sotmp = $1;
--		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+#		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
- 		}
- 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
- 		{
---- openssl-0.9.7b.orig/crypto/asn1/charmap.pl
-+++ openssl-0.9.7b/crypto/asn1/charmap.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- 
- use strict;
- 
---- openssl-0.9.7b.orig/crypto/Makefile.ssl
-+++ openssl-0.9.7b/crypto/Makefile.ssl
-@@ -34,6 +34,7 @@
- 
- GENERAL=Makefile README crypto-lib.com install.com
- 
-+#LIB= libcrypto.la
- LIB= $(TOP)/libcrypto.a
- SHARED_LIB= libcrypto$(SHLIB_EXT)
- LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c
-@@ -69,8 +70,9 @@
- 	@for i in $(SDIRS) ;\
- 	do \
- 	(cd $$i && echo "making all in crypto/$$i..." && \
--	$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-+	$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='true' all ) || exit 1; \
- 	done;
-+#	$(AR) $(LIB) *.lo */*.lo
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
-@@ -145,7 +147,9 @@
- 	done;
- 
- clean:
--	rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-+	rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff date.h
-+	$(RM) -f *.lo */*.lo *.la
-+	$(RM) -rf .libs
- 	@for i in $(SDIRS) ;\
- 	do \
- 	(cd $$i && echo "making clean in crypto/$$i..." && \
---- openssl-0.9.7b.orig/crypto/md5/asm/md5-sparcv9.S
-+++ openssl-0.9.7b/crypto/md5/asm/md5-sparcv9.S
-@@ -72,14 +72,14 @@
- #define Dval	R8
- 
- #if defined(MD5_BLOCK_DATA_ORDER)
--# if defined(OPENSSL_SYSNAME_ULTRASPARC)
-+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
- #  define	LOAD			lda
- #  define	X(i)			[%i1+i*4]%asi
- #  define	md5_block		md5_block_asm_data_order_aligned
- #  define	ASI_PRIMARY_LITTLE	0x88
--# else
-+/*# else
- #  error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
--# endif
-+# endif*/
- #else
- # define	LOAD			ld
- # define	X(i)			[%i1+i*4]
---- openssl-0.9.7b.orig/crypto/opensslconf.h
-+++ openssl-0.9.7b/crypto/opensslconf.h
-@@ -4,17 +4,38 @@
- /* OpenSSL was configured with the following options: */
- #ifndef OPENSSL_DOING_MAKEDEPEND
- 
-+#ifndef OPENSSL_NO_IDEA
-+# define OPENSSL_NO_IDEA
-+#endif
-+#ifndef OPENSSL_NO_MDC2
-+# define OPENSSL_NO_MDC2
-+#endif
-+#ifndef OPENSSL_NO_RC5
-+# define OPENSSL_NO_RC5
-+#endif
- #ifndef OPENSSL_NO_KRB5
- # define OPENSSL_NO_KRB5
- #endif
- 
- #endif /* OPENSSL_DOING_MAKEDEPEND */
-+#ifndef OPENSSL_THREADS
-+# define OPENSSL_THREADS
-+#endif
- 
- /* The OPENSSL_NO_* macros are also defined as NO_* if the application
-    asks for it.  This is a transient feature that is provided for those
-    who haven't had the time to do the appropriate changes in their
-    applications.  */
- #ifdef OPENSSL_ALGORITHM_DEFINES
-+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
-+#  define NO_IDEA
-+# endif
-+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
-+#  define NO_MDC2
-+# endif
-+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
-+#  define NO_RC5
-+# endif
- # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
- #  define NO_KRB5
- # endif
-@@ -27,7 +48,7 @@
- 
- #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
- #if defined(H