org.openmoko.xora.qtopia: bdee510b775617ac882dd7c17e5a50a5c0e7dce1

oe at monotone.openmoko.org oe at monotone.openmoko.org
Thu Apr 17 16:32:02 CEST 2008


revision:            bdee510b775617ac882dd7c17e5a50a5c0e7dce1
date:                2008-04-15T08:21:11
author:              xora at openembedded.org
branch:              org.openmoko.xora.qtopia
changelog:
propagate from branch 'org.openmoko.zecke.april-update' (head a1c254ff522cc93280162eebe7431eb7b201087d)
            to branch 'org.openmoko.xora.qtopia' (head 8b73d8685079fab165ea431c61ee13f28634f9e7)

manifest:
format_version "1"

new_manifest [cbb6b967e3fb96dac88697f5ba98ef01752756df]

old_revision [8b73d8685079fab165ea431c61ee13f28634f9e7]

add_dir "packages/openssl/openssl-0.9.7m"

add_dir "packages/openssl/openssl-0.9.8g"

add_dir "packages/tslib/tslib/om-gta02"

add_dir "packages/wordlist"

add_dir "packages/wordlist/files"

add_dir "packages/wvdial"

add_dir "packages/wvstreams"

add_dir "packages/wvstreams/files"

add_file "packages/git/git_1.5.3.bb"
 content [bb6af29b2561ea01603ca6aa37a84ec16f597cb1]

add_file "packages/linux/linux-openmoko_2.6.24+git.bb"
 content [b5191bd5a6a02812c00983b18becbb791e375c18]

add_file "packages/openmoko-projects/openmoko-agpsui_svn.bb"
 content [ddb9f544ad8236ca190df4efcf0cf119f423dcc2]

add_file "packages/openmoko2/openmoko-alsa-scenarios.bb"
 content [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]

add_file "packages/openmoko2/openmoko-feed-configs.bb"
 content [36f682387c56d58cbf1c7eff8041ec2022a1dd00]

add_file "packages/openssl/openssl-0.9.7m/armeb.patch"
 content [faf20afb99b155b2cddce4e15a0feca6c02bee82]

add_file "packages/openssl/openssl-0.9.7m/avr32.patch"
 content [3b5c9b4ba8231648a8048095d6054f16289d3515]

add_file "packages/openssl/openssl-0.9.7m/debian.patch"
 content [2e7b0df685842cedf705926ea7cfb1a5f6ffbee4]

add_file "packages/openssl/openssl-0.9.7m/gnueabi-arm.patch"
 content [e12709094153709afff9c797c8fb84693556e5ab]

add_file "packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch"
 content [6667972d27eb2ab7dfbb6189e987578a7feb9a1e]

add_file "packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch"
 content [bd1bc954b5c2e8539a39128f09661d686716eba9]

add_file "packages/openssl/openssl-0.9.8g/configure-targets.patch"
 content [40d57766f81e17ec56ee4b10fd84987ba1d73129]

add_file "packages/openssl/openssl-0.9.8g/debian.patch"
 content [e2524f821f3c1693aabb548a7c6c9cfac5a7a56b]

add_file "packages/openssl/openssl-native_0.9.7m.bb"
 content [aee940409bd5054fbf284dbe9b7adbfd5269d114]

add_file "packages/openssl/openssl_0.9.7m.bb"
 content [e1c49f5a11a86d7eb04595e34aeed012e99f1071]

add_file "packages/openssl/openssl_0.9.8g.bb"
 content [e326706f63f853e3243bfc002f2f8d924885404d]

add_file "packages/tslib/tslib/om-gta02/ts.conf"
 content [7123e2647340fe6a95f41cd9f53f3307c08cd223]

add_file "packages/wordlist/files/rules"
 content [c05179a08d78dc9c946b1b4e3eaab857aae70513]

add_file "packages/wordlist/scowl_6.bb"
 content [3c879b1a8c2e4cb21bb186cd29601c95da176d93]

add_file "packages/wvdial/wvdial_1.60.bb"
 content [dfef3574421bb1df71ee7cfdc6899c21300a0c79]

add_file "packages/wvstreams/files/build-fixes-and-sanity.patch"
 content [01f17efed1dad3b066472e2a1501896f72a5154b]

add_file "packages/wvstreams/wvstreams_4.4.1.bb"
 content [663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3]

patch "classes/package_ipk.bbclass"
 from [74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1]
   to [242c256c8e04a09f38c2935be0882b1dee651600]

patch "classes/testlab.bbclass"
 from [c3d610ac3c54bb4174b19e9905964f8a4064cc07]
   to [b0992caaec4741e92e216e91c8385574a54b0863]

patch "conf/bitbake.conf"
 from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
   to [6ff864c9de6f26e92c7ab40bc46eddef334a4df4]

patch "conf/checksums.ini"
 from [3651c85a1810defc2616c43f6aaa207a5ee5a4bd]
   to [916b354f9de054441f0b2c130cb5a5501f017e12]

patch "conf/distro/include/moko-autorev.inc"
 from [06afeb644d8f709c7b8221dfa54dcc66b8ff3a49]
   to [687b91ec3b6b89ed01c40988b89f3c31694a9247]

patch "conf/distro/include/preferred-om-2008-versions.inc"
 from [8d7890848212c85a6b2089dcb71372d83b946777]
   to [c70b5347213d7bf32f261eaa409d0f26bf5bfbc1]

patch "conf/distro/include/sane-srcdates.inc"
 from [8b9fd0206baa49e75bdf70f5761e1fe4649d422e]
   to [8e1811ed73330ab1f62540173c87d9d46ede74c3]

patch "conf/distro/include/sane-srcrevs.inc"
 from [dfe387b5708ce4e3724bc61b208d258cfd6df174]
   to [f33b71cab36aa10b579792376f0845d420fbaf48]

patch "conf/distro/openmoko.conf"
 from [a8060f6771d31c1ba369637729e3123ddecb2dc3]
   to [57d6f40fc1f078d76f0824c8db3fa6facd01e0cb]

patch "conf/machine/om-gta02.conf"
 from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
   to [35cac2923a74e1958fce8ad3096cd77404df3753]

patch "contrib/oe-stylize.py"
 from [9e40dcd24e4d8f38580faf97a7ca791069087802]
   to [ccf166ea67ebcb8024d3d378d1ff66b5386d1023]

patch "packages/alsa/alsa-state.bb"
 from [37dfff2c0ef91306c2cb30e53f8d86c3088e7fc3]
   to [2590f4545ccf7d78835320f929293f7d773dc9f9]

patch "packages/efl1/etk_cvs.bb"
 from [1c4ad62955a3041ca60b191f4f46f758a4a45cb4]
   to [409c4526643bb84665f38a0a31a6e5596c432ae5]

patch "packages/git/git.inc"
 from [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
   to [78d5cbf5201f942c64ae36ae924b01ac6152208a]

patch "packages/gsm/files/gsmd"
 from [a69e07c69d9829380159b5196cda1f68221a0f1a]
   to [fdee1d8e482c2582c1a80cfb216d202d3026d9fe]

patch "packages/gsm/gsmd.inc"
 from [458030ab86c43118e7b10e86a51f62df510fd307]
   to [8a4214514d16c0ff2bed8f49cee4bdfaee7b9f47]

patch "packages/gtk+/gtk+-fastscaling_2.10.14.bb"
 from [4327a093907014dbbe461ad66db3a0495a986aa7]
   to [54ad523638041226cf56881f6f1ed3e5cbb4b4c6]

patch "packages/gtk+/gtk+_2.10.14.bb"
 from [3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d]
   to [39e110e549a3660d333553d85d228e50544ddc8d]

patch "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
 from [bcce07d7c1acb2892a59f8be552f77994e17e98c]
   to [e66a4afa1f9a57edd969a060f0b99fc5bfb33e50]

patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
 from [054d2acb3ff8284167043e5554633713ebdba2cf]
   to [2fffa65764b445bac4b2ec9f7b7b01d1b11a0651]

patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
 from [53716efd0be08661e891166feef9298502f1ff73]
   to [6ca2e19f7611e0124df8a7be84f3cab7f69e1963]

patch "packages/openmoko-projects/assassin_svn.bb"
 from [ec54896d60155ed78661fbb53074c68150c9077c]
   to [1e8ad042e56fd3840bbbaf252f5b243db31955ec]

patch "packages/openmoko-projects/diversity-nav_svn.bb"
 from [e70dd159aa10e5d331469df680d7a92b6a17ed69]
   to [e644c87944a195094f119122d12117683f987d83]

patch "packages/openmoko-projects/enlazar_svn.bb"
 from [6d67fcb5d517922c2a93896a9657e5856dd147ff]
   to [3eebf6592022236be82998d5d51941aa8ccd89a2]

patch "packages/openmoko-projects/illume_svn.bb"
 from [f0d1ea3f7f065e02920803bee606469fccb5db16]
   to [41d78bc73011aab120638b3ff084513fbbeeeb4e]

patch "packages/settings-daemon/files/70settings-daemon"
 from [70c8c167bec306d4135dd5cbf159e6cae849a18a]
   to [fd2db3c1fc805b65926439f53fd8dba081004766]

patch "packages/settings-daemon/settings-daemon_svn.bb"
 from [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
   to [232ef26e8f78ffc82665195719a830883eaf51d5]

patch "packages/tasks/task-base.bb"
 from [50285a37437adccf62033cd89c0d329f69d4e191]
   to [1c6a6dd44e00b5b989c55064fd1fee2792a273da]

patch "packages/tslib/tslib_1.0.bb"
 from [5d5d2fe05b80425f25473bfe084177b902b207f9]
   to [d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f]

patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
 from [2779a8ad2f3000e5d53079b90e3c64b3352acb0e]
   to [ce8e1c9449b9bd4a0d2136113fa3b648937bd798]

patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
 from [2915a14313602fff89685477aaabe69d4e32a457]
   to [b6120434f910d084652aecf6c1d3d4c501be78cc]

patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
 from [60b23f2d6507ed740f14d2d710ab0b1fe8f1dca0]
   to [e41ab9242ae6d5e9acea897aa94ca13e00b76f1b]

old_revision [a1c254ff522cc93280162eebe7431eb7b201087d]

patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
 from [a93597ca618095b4d174aa972afb07241bb3df6a]
   to [418b4c5767e8e38f347241e85caa35bebf6c428c]
-------------- next part --------------
#
#
# add_dir "packages/openssl/openssl-0.9.7m"
# 
# add_dir "packages/openssl/openssl-0.9.8g"
# 
# add_dir "packages/tslib/tslib/om-gta02"
# 
# add_dir "packages/wordlist"
# 
# add_dir "packages/wordlist/files"
# 
# add_dir "packages/wvdial"
# 
# add_dir "packages/wvstreams"
# 
# add_dir "packages/wvstreams/files"
# 
# add_file "packages/git/git_1.5.3.bb"
#  content [bb6af29b2561ea01603ca6aa37a84ec16f597cb1]
# 
# add_file "packages/linux/linux-openmoko_2.6.24+git.bb"
#  content [b5191bd5a6a02812c00983b18becbb791e375c18]
# 
# add_file "packages/openmoko-projects/openmoko-agpsui_svn.bb"
#  content [ddb9f544ad8236ca190df4efcf0cf119f423dcc2]
# 
# add_file "packages/openmoko2/openmoko-alsa-scenarios.bb"
#  content [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
# 
# add_file "packages/openmoko2/openmoko-feed-configs.bb"
#  content [36f682387c56d58cbf1c7eff8041ec2022a1dd00]
# 
# add_file "packages/openssl/openssl-0.9.7m/armeb.patch"
#  content [faf20afb99b155b2cddce4e15a0feca6c02bee82]
# 
# add_file "packages/openssl/openssl-0.9.7m/avr32.patch"
#  content [3b5c9b4ba8231648a8048095d6054f16289d3515]
# 
# add_file "packages/openssl/openssl-0.9.7m/debian.patch"
#  content [2e7b0df685842cedf705926ea7cfb1a5f6ffbee4]
# 
# add_file "packages/openssl/openssl-0.9.7m/gnueabi-arm.patch"
#  content [e12709094153709afff9c797c8fb84693556e5ab]
# 
# add_file "packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch"
#  content [6667972d27eb2ab7dfbb6189e987578a7feb9a1e]
# 
# add_file "packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch"
#  content [bd1bc954b5c2e8539a39128f09661d686716eba9]
# 
# add_file "packages/openssl/openssl-0.9.8g/configure-targets.patch"
#  content [40d57766f81e17ec56ee4b10fd84987ba1d73129]
# 
# add_file "packages/openssl/openssl-0.9.8g/debian.patch"
#  content [e2524f821f3c1693aabb548a7c6c9cfac5a7a56b]
# 
# add_file "packages/openssl/openssl-native_0.9.7m.bb"
#  content [aee940409bd5054fbf284dbe9b7adbfd5269d114]
# 
# add_file "packages/openssl/openssl_0.9.7m.bb"
#  content [e1c49f5a11a86d7eb04595e34aeed012e99f1071]
# 
# add_file "packages/openssl/openssl_0.9.8g.bb"
#  content [e326706f63f853e3243bfc002f2f8d924885404d]
# 
# add_file "packages/tslib/tslib/om-gta02/ts.conf"
#  content [7123e2647340fe6a95f41cd9f53f3307c08cd223]
# 
# add_file "packages/wordlist/files/rules"
#  content [c05179a08d78dc9c946b1b4e3eaab857aae70513]
# 
# add_file "packages/wordlist/scowl_6.bb"
#  content [3c879b1a8c2e4cb21bb186cd29601c95da176d93]
# 
# add_file "packages/wvdial/wvdial_1.60.bb"
#  content [dfef3574421bb1df71ee7cfdc6899c21300a0c79]
# 
# add_file "packages/wvstreams/files/build-fixes-and-sanity.patch"
#  content [01f17efed1dad3b066472e2a1501896f72a5154b]
# 
# add_file "packages/wvstreams/wvstreams_4.4.1.bb"
#  content [663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3]
# 
# patch "classes/package_ipk.bbclass"
#  from [74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1]
#    to [242c256c8e04a09f38c2935be0882b1dee651600]
# 
# patch "classes/testlab.bbclass"
#  from [c3d610ac3c54bb4174b19e9905964f8a4064cc07]
#    to [b0992caaec4741e92e216e91c8385574a54b0863]
# 
# patch "conf/bitbake.conf"
#  from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
#    to [6ff864c9de6f26e92c7ab40bc46eddef334a4df4]
# 
# patch "conf/checksums.ini"
#  from [3651c85a1810defc2616c43f6aaa207a5ee5a4bd]
#    to [916b354f9de054441f0b2c130cb5a5501f017e12]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [06afeb644d8f709c7b8221dfa54dcc66b8ff3a49]
#    to [687b91ec3b6b89ed01c40988b89f3c31694a9247]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [8d7890848212c85a6b2089dcb71372d83b946777]
#    to [c70b5347213d7bf32f261eaa409d0f26bf5bfbc1]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [8b9fd0206baa49e75bdf70f5761e1fe4649d422e]
#    to [8e1811ed73330ab1f62540173c87d9d46ede74c3]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [dfe387b5708ce4e3724bc61b208d258cfd6df174]
#    to [f33b71cab36aa10b579792376f0845d420fbaf48]
# 
# patch "conf/distro/openmoko.conf"
#  from [a8060f6771d31c1ba369637729e3123ddecb2dc3]
#    to [57d6f40fc1f078d76f0824c8db3fa6facd01e0cb]
# 
# patch "conf/machine/om-gta02.conf"
#  from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
#    to [35cac2923a74e1958fce8ad3096cd77404df3753]
# 
# patch "contrib/oe-stylize.py"
#  from [9e40dcd24e4d8f38580faf97a7ca791069087802]
#    to [ccf166ea67ebcb8024d3d378d1ff66b5386d1023]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [37dfff2c0ef91306c2cb30e53f8d86c3088e7fc3]
#    to [2590f4545ccf7d78835320f929293f7d773dc9f9]
# 
# patch "packages/efl1/etk_cvs.bb"
#  from [1c4ad62955a3041ca60b191f4f46f758a4a45cb4]
#    to [409c4526643bb84665f38a0a31a6e5596c432ae5]
# 
# patch "packages/git/git.inc"
#  from [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
#    to [78d5cbf5201f942c64ae36ae924b01ac6152208a]
# 
# patch "packages/gsm/files/gsmd"
#  from [a69e07c69d9829380159b5196cda1f68221a0f1a]
#    to [fdee1d8e482c2582c1a80cfb216d202d3026d9fe]
# 
# patch "packages/gsm/gsmd.inc"
#  from [458030ab86c43118e7b10e86a51f62df510fd307]
#    to [8a4214514d16c0ff2bed8f49cee4bdfaee7b9f47]
# 
# patch "packages/gtk+/gtk+-fastscaling_2.10.14.bb"
#  from [4327a093907014dbbe461ad66db3a0495a986aa7]
#    to [54ad523638041226cf56881f6f1ed3e5cbb4b4c6]
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d]
#    to [39e110e549a3660d333553d85d228e50544ddc8d]
# 
# patch "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
#  from [bcce07d7c1acb2892a59f8be552f77994e17e98c]
#    to [e66a4afa1f9a57edd969a060f0b99fc5bfb33e50]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [054d2acb3ff8284167043e5554633713ebdba2cf]
#    to [2fffa65764b445bac4b2ec9f7b7b01d1b11a0651]
# 
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
#  from [53716efd0be08661e891166feef9298502f1ff73]
#    to [6ca2e19f7611e0124df8a7be84f3cab7f69e1963]
# 
# patch "packages/openmoko-projects/assassin_svn.bb"
#  from [ec54896d60155ed78661fbb53074c68150c9077c]
#    to [1e8ad042e56fd3840bbbaf252f5b243db31955ec]
# 
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
#  from [e70dd159aa10e5d331469df680d7a92b6a17ed69]
#    to [e644c87944a195094f119122d12117683f987d83]
# 
# patch "packages/openmoko-projects/enlazar_svn.bb"
#  from [6d67fcb5d517922c2a93896a9657e5856dd147ff]
#    to [3eebf6592022236be82998d5d51941aa8ccd89a2]
# 
# patch "packages/openmoko-projects/illume_svn.bb"
#  from [f0d1ea3f7f065e02920803bee606469fccb5db16]
#    to [41d78bc73011aab120638b3ff084513fbbeeeb4e]
# 
# patch "packages/settings-daemon/files/70settings-daemon"
#  from [70c8c167bec306d4135dd5cbf159e6cae849a18a]
#    to [fd2db3c1fc805b65926439f53fd8dba081004766]
# 
# patch "packages/settings-daemon/settings-daemon_svn.bb"
#  from [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
#    to [232ef26e8f78ffc82665195719a830883eaf51d5]
# 
# patch "packages/tasks/task-base.bb"
#  from [50285a37437adccf62033cd89c0d329f69d4e191]
#    to [1c6a6dd44e00b5b989c55064fd1fee2792a273da]
# 
# patch "packages/tslib/tslib_1.0.bb"
#  from [5d5d2fe05b80425f25473bfe084177b902b207f9]
#    to [d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f]
# 
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
#  from [2779a8ad2f3000e5d53079b90e3c64b3352acb0e]
#    to [ce8e1c9449b9bd4a0d2136113fa3b648937bd798]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [2915a14313602fff89685477aaabe69d4e32a457]
#    to [b6120434f910d084652aecf6c1d3d4c501be78cc]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [60b23f2d6507ed740f14d2d710ab0b1fe8f1dca0]
#    to [e41ab9242ae6d5e9acea897aa94ca13e00b76f1b]
#
============================================================
--- packages/git/git_1.5.3.bb	bb6af29b2561ea01603ca6aa37a84ec16f597cb1
+++ packages/git/git_1.5.3.bb	bb6af29b2561ea01603ca6aa37a84ec16f597cb1
@@ -0,0 +1,5 @@
+require git.inc
+DEPENDS = "openssl curl zlib expat"
+RDEPENDS = "perl perl-module-file-path cpio findutils sed"
+PR = "r1"
+
============================================================
--- packages/linux/linux-openmoko_2.6.24+git.bb	b5191bd5a6a02812c00983b18becbb791e375c18
+++ packages/linux/linux-openmoko_2.6.24+git.bb	b5191bd5a6a02812c00983b18becbb791e375c18
@@ -0,0 +1,52 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
+
+PE = "1"
+PV = "${KERNEL_RELEASE}+git${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+        cp -f ${S}/defconfig-${CONFIG_NAME} ${WORKDIR}/defconfig
+}
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+ALLOW_EMPTY = "1"
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = "om-gta01|om-gta02"
+DEFAULT_PREFERENCE = "1"
+
+KERNEL_IMAGETYPE = "uImage"
+KERNEL_RELEASE = "2.6.24"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+CONFIG_NAME_om-gta01 = "gta01"
+CONFIG_NAME_om-gta02 = "gta02"
+
+UBOOT_ENTRYPOINT = "30008000"
+
+###############################################################
+# module configs specific to this kernel
+#
+
+# usb
+module_autoload_ohci-hcd = "ohci-hcd"
+module_autoload_hci_usb = "hci_usb"
+module_autoload_g_ether = "g_ether"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
============================================================
--- packages/openmoko-projects/openmoko-agpsui_svn.bb	ddb9f544ad8236ca190df4efcf0cf119f423dcc2
+++ packages/openmoko-projects/openmoko-agpsui_svn.bb	ddb9f544ad8236ca190df4efcf0cf119f423dcc2
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPS diagnostic tool"
+HOMEPAGE = "http://openmoko-agpsui.projects.openmoko.org/"
+SECTION = "openmoko/apps"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/openmoko-agpsui;module=trunk;proto=https"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
============================================================
--- packages/openmoko2/openmoko-alsa-scenarios.bb	eb767fd7563c9ddc41f630dbd3dd444d81f8a950
+++ packages/openmoko2/openmoko-alsa-scenarios.bb	eb767fd7563c9ddc41f630dbd3dd444d81f8a950
@@ -0,0 +1,21 @@
+DESCRIPTION = "Package for the different scenarios used by OpenMoko"
+SECTION = "openmoko/base"
+PV = "1.0+svnr${SRCREV}"
+PR = "r1"
+
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
+
+SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
+
+S = "${WORKDIR}/${MACHINE_ARCH}"
+
+do_install() {
+    install -d ${D}${datadir}/openmoko/scenarios/
+    install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
+    install -d ${D}${sysconfdir}/
+    install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+FILES_${PN} += "${datadir}/openmoko"
============================================================
--- packages/openmoko2/openmoko-feed-configs.bb	36f682387c56d58cbf1c7eff8041ec2022a1dd00
+++ packages/openmoko2/openmoko-feed-configs.bb	36f682387c56d58cbf1c7eff8041ec2022a1dd00
@@ -0,0 +1,23 @@
+DESCRIPTION = "Configuration files for online package repositories aka feeds"
+PR = "r0"
+
+do_compile() {
+    mkdir -p ${S}/${sysconfdir}/opkg
+    for feed in all armv4t neo1973 ${MACHINE_ARCH}; do
+        echo "src/gz daily-${feed} ${OPENMOKO_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
+    done
+}
+do_install () {
+        install -d ${D}${sysconfdir}/opkg
+        install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CONFFILES_${PN} += "${sysconfdir}/opkg/all-feed.conf \
+                    ${sysconfdir}/opkg/armv4t-feed.conf \
+                    ${sysconfdir}/opkg/neo1973-feed.conf \
+                    ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
+                   "
+
+OPENMOKO_URI = "http://buildhost.openmoko.org/daily-feed"
============================================================
--- packages/openssl/openssl-0.9.7m/armeb.patch	faf20afb99b155b2cddce4e15a0feca6c02bee82
+++ packages/openssl/openssl-0.9.7m/armeb.patch	faf20afb99b155b2cddce4e15a0feca6c02bee82
@@ -0,0 +1,18 @@
+--- Configure.orig	2006-03-22 16:29:20.000000000 +0100
++++ Configure	2006-03-22 16:31:44.000000000 +0100
+@@ -395,6 +395,7 @@
+ "debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #"debian-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -474,6 +475,7 @@
+ # ARM comes in both little- and big-endian flavors. The following line is
+ # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl: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::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
============================================================
--- packages/openssl/openssl-0.9.7m/avr32.patch	3b5c9b4ba8231648a8048095d6054f16289d3515
+++ packages/openssl/openssl-0.9.7m/avr32.patch	3b5c9b4ba8231648a8048095d6054f16289d3515
@@ -0,0 +1,10 @@
+--- Configure~	2008-01-23 17:44:04.000000000 +0100
++++ Configure	2008-01-23 17:44:04.000000000 +0100
+@@ -442,6 +442,7 @@
+ "linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc32.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # -bpowerpc64-linux is transient option, -m64 should be the one to use...
++"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
+ "linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
+ "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
============================================================
--- packages/openssl/openssl-0.9.7m/debian.patch	2e7b0df685842cedf705926ea7cfb1a5f6ffbee4
+++ packages/openssl/openssl-0.9.7m/debian.patch	2e7b0df685842cedf705926ea7cfb1a5f6ffbee4
@@ -0,0 +1,832 @@
+Index: openssl-0.9.7m/tools/c_rehash.in
+===================================================================
+--- openssl-0.9.7m.orig/tools/c_rehash.in	2002-10-11 22:35:45.000000000 +0200
++++ openssl-0.9.7m/tools/c_rehash.in	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ 
+ # Perl c_rehash script, scan all files in a directory
+Index: openssl-0.9.7m/tools/c_rehash
+===================================================================
+--- openssl-0.9.7m.orig/tools/c_rehash	2007-02-23 13:52:38.000000000 +0100
++++ openssl-0.9.7m/tools/c_rehash	2008-04-12 02:37:45.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ my $openssl;
+ 
+-my $dir = "/usr/local/ssl";
++my $dir = "/usr/lib/ssl";
+ 
+ if(defined $ENV{OPENSSL}) {
+ 	$openssl = $ENV{OPENSSL};
+Index: openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S
+===================================================================
+--- openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S	2003-05-30 00:22:34.000000000 +0200
++++ openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S	2008-04-12 02:37:45.000000000 +0200
+@@ -74,14 +74,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]
+Index: openssl-0.9.7m/crypto/pkcs7/pk7_mime.c
+===================================================================
+--- openssl-0.9.7m.orig/crypto/pkcs7/pk7_mime.c	2005-05-01 14:47:33.000000000 +0200
++++ openssl-0.9.7m/crypto/pkcs7/pk7_mime.c	2008-04-12 02:37:45.000000000 +0200
+@@ -297,9 +297,9 @@
+ 
+ 		if(strcmp(hdr->value, "application/x-pkcs7-signature") &&
+ 			strcmp(hdr->value, "application/pkcs7-signature")) {
+-			sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+ 			PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE);
+ 			ERR_add_error_data(2, "type: ", hdr->value);
++			sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+ 			sk_BIO_pop_free(parts, BIO_vfree);
+ 			return NULL;
+ 		}
+Index: openssl-0.9.7m/crypto/dsa/dsa_ossl.c
+===================================================================
+--- openssl-0.9.7m.orig/crypto/dsa/dsa_ossl.c	2006-09-28 13:53:49.000000000 +0200
++++ openssl-0.9.7m/crypto/dsa/dsa_ossl.c	2008-04-12 02:37:45.000000000 +0200
+@@ -286,6 +286,18 @@
+ 		return -1;
+ 		}
+ 
++	if (BN_num_bits(dsa->q) != 160)
++		{
++		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE);
++		return -1;
++		}
++
++	if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS)
++		{
++		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);
++		return -1;
++		}
++
+ 	BN_init(&u1);
+ 	BN_init(&u2);
+ 	BN_init(&t1);
+Index: openssl-0.9.7m/crypto/dsa/dsa.h
+===================================================================
+--- openssl-0.9.7m.orig/crypto/dsa/dsa.h	2006-09-28 13:53:49.000000000 +0200
++++ openssl-0.9.7m/crypto/dsa/dsa.h	2008-04-12 02:37:45.000000000 +0200
+@@ -83,6 +83,10 @@
+ # define OPENSSL_DSA_MAX_MODULUS_BITS	10000
+ #endif
+ 
++#ifndef OPENSSL_DSA_MAX_MODULUS_BITS
++# define OPENSSL_DSA_MAX_MODULUS_BITS	10000
++#endif
++
+ #define DSA_FLAG_CACHE_MONT_P	0x01
+ #define DSA_FLAG_NO_EXP_CONSTTIME       0x02 /* new with 0.9.7h; the built-in DSA
+                                               * implementation now uses constant time
+Index: openssl-0.9.7m/crypto/rc4/asm/rc4-x86_64.pl
+===================================================================
+--- openssl-0.9.7m.orig/crypto/rc4/asm/rc4-x86_64.pl	2005-05-04 18:12:07.000000000 +0200
++++ openssl-0.9.7m/crypto/rc4/asm/rc4-x86_64.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+Index: openssl-0.9.7m/crypto/asn1/charmap.pl
+===================================================================
+--- openssl-0.9.7m.orig/crypto/asn1/charmap.pl	2000-07-28 03:58:11.000000000 +0200
++++ openssl-0.9.7m/crypto/asn1/charmap.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ 
+ use strict;
+ 
+Index: openssl-0.9.7m/crypto/sha/asm/sha1-ia64.pl
+===================================================================
+--- openssl-0.9.7m.orig/crypto/sha/asm/sha1-ia64.pl	2004-12-09 21:55:52.000000000 +0100
++++ openssl-0.9.7m/crypto/sha/asm/sha1-ia64.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+Index: openssl-0.9.7m/crypto/bn/asm/ppc.pl
+===================================================================
+--- openssl-0.9.7m.orig/crypto/bn/asm/ppc.pl	2005-07-03 11:24:35.000000000 +0200
++++ openssl-0.9.7m/crypto/bn/asm/ppc.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # Implemented as a Perl wrapper as we want to support several different
+ # architectures with single file. We pick up the target based on the
+Index: openssl-0.9.7m/crypto/rsa/rsa_eay.c
+===================================================================
+--- openssl-0.9.7m.orig/crypto/rsa/rsa_eay.c	2006-12-04 21:41:46.000000000 +0100
++++ openssl-0.9.7m/crypto/rsa/rsa_eay.c	2008-04-12 02:37:45.000000000 +0200
+@@ -336,6 +336,28 @@
+ 	int local_blinding = 0;
+ 	BN_BLINDING *blinding = NULL;
+ 
++	if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS)
++		{
++		RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_MODULUS_TOO_LARGE);
++		return -1;
++		}
++
++	if (BN_ucmp(rsa->n, rsa->e) <= 0)
++		{
++		RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_BAD_E_VALUE);
++		return -1;
++		}
++
++	/* for large moduli, enforce exponent limit */
++	if (BN_num_bits(rsa->n) > OPENSSL_RSA_SMALL_MODULUS_BITS)
++		{
++		if (BN_num_bits(rsa->e) > OPENSSL_RSA_MAX_PUBEXP_BITS)
++			{
++			RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_BAD_E_VALUE);
++			return -1;
++			}
++		}
++	
+ 	BN_init(&f);
+ 	BN_init(&ret);
+ 
+@@ -644,6 +666,28 @@
+ 			}
+ 		}
+ 
++	if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS)
++		{
++		RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_MODULUS_TOO_LARGE);
++		return -1;
++		}
++
++	if (BN_ucmp(rsa->n, rsa->e) <= 0)
++		{
++		RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_BAD_E_VALUE);
++		return -1;
++		}
++
++	/* for large moduli, enforce exponent limit */
++	if (BN_num_bits(rsa->n) > OPENSSL_RSA_SMALL_MODULUS_BITS)
++		{
++		if (BN_num_bits(rsa->e) > OPENSSL_RSA_MAX_PUBEXP_BITS)
++			{
++			RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_BAD_E_VALUE);
++			return -1;
++			}
++		}
++	
+ 	BN_init(&f);
+ 	BN_init(&ret);
+ 	ctx=BN_CTX_new();
+Index: openssl-0.9.7m/crypto/rsa/rsa.h
+===================================================================
+--- openssl-0.9.7m.orig/crypto/rsa/rsa.h	2006-09-28 13:53:50.000000000 +0200
++++ openssl-0.9.7m/crypto/rsa/rsa.h	2008-04-12 02:37:45.000000000 +0200
+@@ -165,6 +165,17 @@
+ # define OPENSSL_RSA_MAX_PUBEXP_BITS	64 /* exponent limit enforced for "large" modulus only */
+ #endif
+ 
++#ifndef OPENSSL_RSA_MAX_MODULUS_BITS
++# define OPENSSL_RSA_MAX_MODULUS_BITS	16384
++#endif
++
++#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
++# define OPENSSL_RSA_SMALL_MODULUS_BITS	3072
++#endif
++#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
++# define OPENSSL_RSA_MAX_PUBEXP_BITS	64 /* exponent limit enforced for "small" modulus only */
++#endif
++
+ #define RSA_3	0x3L
+ #define RSA_F4	0x10001L
+ 
+Index: openssl-0.9.7m/crypto/opensslconf.h
+===================================================================
+--- openssl-0.9.7m.orig/crypto/opensslconf.h	2007-02-23 13:52:32.000000000 +0100
++++ openssl-0.9.7m/crypto/opensslconf.h	2008-04-12 02:37:45.000000000 +0200
+@@ -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(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+-#define OPENSSLDIR "/usr/local/ssl"
++#define OPENSSLDIR "/usr/lib/ssl"
+ #endif
+ #endif
+ 
+@@ -79,7 +100,7 @@
+ 
+ #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
+ #define CONFIG_HEADER_BN_H
+-#undef BN_LLONG
++#define BN_LLONG
+ 
+ /* Should we define BN_DIV2W here? */
+ 
+@@ -98,7 +119,7 @@
+ #define CONFIG_HEADER_RC4_LOCL_H
+ /* if this is defined data[i] is used instead of *data, this is a %20
+  * speedup on x86 */
+-#undef RC4_INDEX
++#define RC4_INDEX
+ #endif
+ 
+ #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
+@@ -112,14 +133,14 @@
+ /* the following is tweaked from a config script, that is why it is a
+  * protected undef/define */
+ #ifndef DES_PTR
+-#undef DES_PTR
++#define DES_PTR
+ #endif
+ 
+ /* This helps C compiler generate the correct code for multiple functional
+  * units.  It reduces register dependancies at the expense of 2 more
+  * registers */
+ #ifndef DES_RISC1
+-#undef DES_RISC1
++#define DES_RISC1
+ #endif
+ 
+ #ifndef DES_RISC2
+@@ -133,7 +154,7 @@
+ /* Unroll the inner loop, this sometimes helps, sometimes hinders.
+  * Very mucy CPU dependant */
+ #ifndef DES_UNROLL
+-#undef DES_UNROLL
++#define DES_UNROLL
+ #endif
+ 
+ /* These default values were supplied by
+Index: openssl-0.9.7m/ms/fipscheck.pl
+===================================================================
+--- openssl-0.9.7m.orig/ms/fipscheck.pl	2006-01-28 14:34:27.000000000 +0100
++++ openssl-0.9.7m/ms/fipscheck.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ # fipscheck.pl
+ # sample perl script to check integrity of critical FIPS files
+Index: openssl-0.9.7m/Configure
+===================================================================
+--- openssl-0.9.7m.orig/Configure	2007-02-22 23:30:49.000000000 +0100
++++ openssl-0.9.7m/Configure	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-:
++#!/usr/local/bin/perl
+ eval 'exec perl -S $0 ${1+"$@"}'
+     if $running_under_some_shell;
+ ##
+@@ -390,6 +390,43 @@
+ # assembler versions -- currently defunct:
+ ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
+ 
++# Debian GNU/* (various architectures)
++"debian-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++#"debian-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
++"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-i386",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-m68k",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-sparc",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
++"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
+ # bn86-elf.o file file since it is hand tweaked assembler.
+ "linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+Index: openssl-0.9.7m/os2/backwardify.pl
+===================================================================
+--- openssl-0.9.7m.orig/os2/backwardify.pl	2003-11-28 15:51:17.000000000 +0100
++++ openssl-0.9.7m/os2/backwardify.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/local/bin/perl
+ use strict;
+ 
+ # Use as $0
+Index: openssl-0.9.7m/Makefile.org
+===================================================================
+--- openssl-0.9.7m.orig/Makefile.org	2007-01-16 20:30:19.000000000 +0100
++++ openssl-0.9.7m/Makefile.org	2008-04-12 02:37:45.000000000 +0200
+@@ -57,6 +57,7 @@
+ # equal 4.
+ # PKCS1_CHECK - pkcs1 tests.
+ 
++#TOP=$(shell pwd)
+ CC= gcc
+ #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+ CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+@@ -195,7 +196,7 @@
+ # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
+ SHLIB_MARK=
+ 
+-DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools
++DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps doc tools
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+@@ -214,10 +215,10 @@
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=/usr/share/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
++MANSUFFIX=ssl
+ SHELL=/bin/sh
+ 
+ TOP=    .
+Index: openssl-0.9.7m/util/selftest.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/selftest.pl	2005-06-20 22:45:44.000000000 +0200
++++ openssl-0.9.7m/util/selftest.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ #
+ # Run the test suite and generate a report
+ #
+Index: openssl-0.9.7m/util/extract-names.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/extract-names.pl	2004-03-25 20:52:36.000000000 +0100
++++ openssl-0.9.7m/util/extract-names.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ $/ = "";			# Eat a paragraph at once.
+ while(<STDIN>) {
+Index: openssl-0.9.7m/util/checkhash.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/checkhash.pl	2005-05-26 23:29:03.000000000 +0200
++++ openssl-0.9.7m/util/checkhash.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl -w
++#!/usr/local/bin/perl
+ 
+ my $package = caller;
+ 
+Index: openssl-0.9.7m/util/clean-depend.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/clean-depend.pl	2001-10-10 10:27:28.000000000 +0200
++++ openssl-0.9.7m/util/clean-depend.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ # Clean the dependency list in a makefile of standard includes...
+ # Written by Ben Laurie <ben at algroup.co.uk> 19 Jan 1999
+ 
+Index: openssl-0.9.7m/util/mkerr.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/mkerr.pl	2006-11-21 20:19:09.000000000 +0100
++++ openssl-0.9.7m/util/mkerr.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ 
+ my $config = "crypto/err/openssl.ec";
+ my $debug = 0;
+Index: openssl-0.9.7m/util/mkdef.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/mkdef.pl	2006-02-05 00:05:40.000000000 +0100
++++ openssl-0.9.7m/util/mkdef.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ #
+ # generate a .def file
+ #
+Index: openssl-0.9.7m/util/mkstack.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/mkstack.pl	2004-10-04 18:27:36.000000000 +0200
++++ openssl-0.9.7m/util/mkstack.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ 
+ # This is a utility that searches out "DECLARE_STACK_OF()"
+ # declarations in .h and .c files, and updates/creates/replaces
+Index: openssl-0.9.7m/util/pod2man.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/pod2man.pl	2005-06-18 06:27:11.000000000 +0200
++++ openssl-0.9.7m/util/pod2man.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-: #!/usr/bin/perl-5.005
++#!/usr/local/bin/perl
+     eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+ 	if $running_under_some_shell;
+ 
+Index: openssl-0.9.7m/util/fipslink.pl
+===================================================================
+--- openssl-0.9.7m.orig/util/fipslink.pl	2006-02-06 00:49:06.000000000 +0100
++++ openssl-0.9.7m/util/fipslink.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ sub check_env
+ 	{
+Index: openssl-0.9.7m/config
+===================================================================
+--- openssl-0.9.7m.orig/config	2007-01-16 14:48:16.000000000 +0100
++++ openssl-0.9.7m/config	2008-04-12 02:37:45.000000000 +0200
+@@ -179,8 +179,8 @@
+ 	echo "${MACHINE}-whatever-linux1"; exit 0
+ 	;;
+ 
+-    GNU*)
+-	echo "hurd-x86"; exit 0;
++    GNU:*|GNU/*:*)
++	echo "${MACHINE}-gnuish"; exit 0;
+ 	;;
+ 
+     LynxOS:*)
+Index: openssl-0.9.7m/doc/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ openssl-0.9.7m/doc/Makefile	2008-04-12 02:37:45.000000000 +0200
+@@ -0,0 +1,40 @@
++VERSION =
++
++#PODS = $(wildcard *.pod)
++#MANS = $(addsuffix .man, $(basename $(PODS)))
++
++MANS = openssl.1 ssl.3 crypto.3
++
++P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)"
++
++all: manpages
++
++.PHONY: manpages 
++
++manpages: openssl.1 crypto.3 ssl.3
++
++openssl.1:
++	$(P2M) --section=1 openssl.pod > openssl.1
++
++crypto.3:
++	$(P2M) --section=3 crypto.pod > crypto.3
++
++ssl.3:
++	$(P2M) --section=3 ssl.pod > ssl.3
++
++.PHONY: install
++install:
++	mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
++	mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
++	install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
++	install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
++	install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
++	rm -f $(MANS)
++
++.PHONY: clean
++clean:
++	rm -f $(MANS)
++
++.PHONY: realclean
++realclean:
++	-$(MAKE) clean
+Index: openssl-0.9.7m/Makefile
+===================================================================
+--- openssl-0.9.7m.orig/Makefile	2007-02-23 13:52:32.000000000 +0100
++++ openssl-0.9.7m/Makefile	2008-04-12 02:46:16.000000000 +0200
+@@ -11,11 +11,11 @@
+ SHLIB_VERSION_HISTORY=
+ SHLIB_MAJOR=0
+ SHLIB_MINOR=9.7
+-SHLIB_EXT=
+-PLATFORM=dist
+-OPTIONS= no-krb5
+-CONFIGURE_ARGS=dist
+-SHLIB_TARGET=
++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
++PLATFORM=debian-i386
++OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug no-krb5
++CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib-dynamic debug debian-i386
++SHLIB_TARGET=linux-shared
+ 
+ # HERE indicates where this Makefile lives.  This can be used to indicate
+ # where sub-Makefiles are expected to be.  Currently has very limited usage,
+@@ -26,10 +26,10 @@
+ # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
+ # Normally it is left empty.
+ INSTALL_PREFIX=
+-INSTALLTOP=/usr/local/ssl
++INSTALLTOP=/usr
+ 
+ # Do not edit this manually. Use Configure --openssldir=DIR do change this!
+-OPENSSLDIR=/usr/local/ssl
++OPENSSLDIR=/usr/lib/ssl
+ 
+ # NO_IDEA - Define to build without the IDEA algorithm
+ # NO_RC4  - Define to build without the RC4 algorithm
+@@ -59,12 +59,12 @@
+ # equal 4.
+ # PKCS1_CHECK - pkcs1 tests.
+ 
+-CC= cc
++CC= gcc
+ #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+-CFLAG= -DOPENSSL_NO_KRB5 -O
+-DEPFLAG= 
++CFLAG= -DZLIB_SHARED -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DL_ENDIAN -DTERMIO -O3  -Wall -g
++DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5
+ PEX_LIBS= 
+-EX_LIBS= 
++EX_LIBS= -ldl 
+ EXE_EXT= 
+ ARFLAGS= 
+ AR=ar $(ARFLAGS) r
+@@ -72,7 +72,7 @@
+ PERL= /usr/bin/perl
+ TAR= tar
+ TARFLAGS= --no-recursion
+-MAKEDEPPROG=makedepend
++MAKEDEPPROG= gcc
+ 
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+@@ -197,13 +197,13 @@
+ # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
+ SHLIB_MARK=
+ 
+-DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools
++DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps doc tools
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+ SDIRS=  objects \
+-	md2 md4 md5 sha mdc2 hmac ripemd \
+-	des rc2 rc4 rc5 idea bf cast \
++	md2 md4 md5 sha hmac ripemd \
++	des rc2 rc4 bf cast \
+ 	bn ec rsa dsa dh dso engine aes \
+ 	buffer bio stack lhash rand err \
+ 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
+@@ -216,10 +216,10 @@
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=/usr/share/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
++MANSUFFIX=ssl
+ SHELL=/bin/sh
+ 
+ TOP=    .
+@@ -230,7 +230,7 @@
+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+ SHARED_SSL=libssl$(SHLIB_EXT)
+ SHARED_LIBS=
+-SHARED_LIBS_LINK_EXTS=
++SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
+ SHARED_LDFLAGS=
+ 
+ GENERAL=        Makefile
+Index: openssl-0.9.7m/VMS/VMSify-conf.pl
+===================================================================
+--- openssl-0.9.7m.orig/VMS/VMSify-conf.pl	2004-05-13 23:38:23.000000000 +0200
++++ openssl-0.9.7m/VMS/VMSify-conf.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ use strict;
+ use warnings;
+Index: openssl-0.9.7m/ssl/ssl_lib.c
+===================================================================
+--- openssl-0.9.7m.orig/ssl/ssl_lib.c	2006-09-28 13:53:51.000000000 +0200
++++ openssl-0.9.7m/ssl/ssl_lib.c	2008-04-12 02:48:25.000000000 +0200
+@@ -1169,7 +1169,6 @@
+ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
+ 	{
+ 	char *p;
+-	const char *cp;
+ 	STACK_OF(SSL_CIPHER) *sk;
+ 	SSL_CIPHER *c;
+ 	int i;
+@@ -1182,20 +1181,21 @@
+ 	sk=s->session->ciphers;
+ 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
+ 		{
+-		/* Decrement for either the ':' or a '\0' */
+-		len--;
++ 		int n;
++ 
+ 		c=sk_SSL_CIPHER_value(sk,i);
+-		for (cp=c->name; *cp; )
++ 		n=strlen(c->name);
++ 		if (n+1 > len)
+ 			{
+-			if (len-- <= 0)
+-				{
+-				*p='\0';
+-				return(buf);
+-				}
+-			else
+-				*(p++)= *(cp++);
++ 			if (p != buf)
++ 				--p;
++ 			*p='\0';
++ 			return buf;
+ 			}
++ 		strcpy(p,c->name);
++ 		p+=n;
+ 		*(p++)=':';
++ 		len-=n+1;
+ 		}
+ 	p[-1]='\0';
+ 	return(buf);
+Index: openssl-0.9.7m/ssl/ssl_algs.c
+===================================================================
+--- openssl-0.9.7m.orig/ssl/ssl_algs.c	2001-02-20 09:11:58.000000000 +0100
++++ openssl-0.9.7m/ssl/ssl_algs.c	2008-04-12 02:37:45.000000000 +0200
+@@ -109,3 +109,8 @@
+ 	return(1);
+ 	}
+ 
++#undef SSLeay_add_ssl_algorithms
++int SSLeay_add_ssl_algorithms(void)
++    {
++         return SSL_library_init();
++    }
+Index: openssl-0.9.7m/demos/tunala/configure.in
+===================================================================
+--- openssl-0.9.7m.orig/demos/tunala/configure.in	2002-01-08 03:58:54.000000000 +0100
++++ openssl-0.9.7m/demos/tunala/configure.in	2008-04-12 02:37:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-dnl Process this file with autoconf to produce a configure script.
++#!/usr/local/bin/perl
+ AC_INIT(tunala.c)
+ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
+Index: openssl-0.9.7m/apps/CA.pl
+===================================================================
+--- openssl-0.9.7m.orig/apps/CA.pl	2007-02-23 13:52:38.000000000 +0100
++++ openssl-0.9.7m/apps/CA.pl	2008-04-12 02:37:45.000000000 +0200
+@@ -63,6 +63,7 @@
+ foreach (@ARGV) {
+ 	if ( /^(-\?|-h|-help)$/ ) {
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 0;
+ 	} elsif (/^-newcert$/) {
+ 	    # create a certificate
+@@ -159,6 +160,7 @@
+ 	} else {
+ 	    print STDERR "Unknown arg $_\n";
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 1;
+ 	}
+ }
+Index: openssl-0.9.7m/apps/CA.pl.in
+===================================================================
+--- openssl-0.9.7m.orig/apps/CA.pl.in	2005-07-04 23:44:19.000000000 +0200
++++ openssl-0.9.7m/apps/CA.pl.in	2008-04-12 02:37:45.000000000 +0200
+@@ -63,6 +63,7 @@
+ foreach (@ARGV) {
+ 	if ( /^(-\?|-h|-help)$/ ) {
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 0;
+ 	} elsif (/^-newcert$/) {
+ 	    # create a certificate
+@@ -159,6 +160,7 @@
+ 	} else {
+ 	    print STDERR "Unknown arg $_\n";
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 1;
+ 	}
+ }
+Index: openssl-0.9.7m/apps/progs.h
+===================================================================
+--- openssl-0.9.7m.orig/apps/progs.h	2004-06-19 15:54:59.000000000 +0200
++++ openssl-0.9.7m/apps/progs.h	2008-04-12 02:37:45.000000000 +0200
+@@ -35,11 +35,9 @@
+ extern int spkac_main(int argc,char *argv[]);
+ extern int smime_main(int argc,char *argv[]);
+ extern int rand_main(int argc,char *argv[]);
+-extern int prime_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[]);
++extern int prime_main(int argc,char *argv[]);
+ 
+ #define FUNC_TYPE_GENERAL	1
+ #define FUNC_TYPE_MD		2
+@@ -95,9 +93,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
+@@ -116,11 +112,9 @@
+ 	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
+ 	{FUNC_TYPE_GENERAL,"smime",smime_main},
+ 	{FUNC_TYPE_GENERAL,"rand",rand_main},
+-	{FUNC_TYPE_GENERAL,"prime",prime_main},
+-#ifndef OPENSSL_NO_ENGINE
+ 	{FUNC_TYPE_GENERAL,"engine",engine_main},
+-#endif
+ 	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
++	{FUNC_TYPE_GENERAL,"prime",prime_main},
+ #ifndef OPENSSL_NO_MD2
+ 	{FUNC_TYPE_MD,"md2",dgst_main},
+ #endif
============================================================
--- packages/openssl/openssl-0.9.7m/gnueabi-arm.patch	e12709094153709afff9c797c8fb84693556e5ab
+++ packages/openssl/openssl-0.9.7m/gnueabi-arm.patch	e12709094153709afff9c797c8fb84693556e5ab
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- openssl-0.9.7e/Configure~gnueabi-arm	2006-03-19 21:04:31.000000000 +0100
++++ openssl-0.9.7e/Configure	2006-03-19 21:07:22.000000000 +0100
+@@ -462,6 +462,7 @@
+ # Linux on ARM
+ "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl: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::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
============================================================
--- packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch	6667972d27eb2ab7dfbb6189e987578a7feb9a1e
+++ packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch	6667972d27eb2ab7dfbb6189e987578a7feb9a1e
@@ -0,0 +1,10 @@
+--- openssl-0.9.7g/Configure~	2007-07-07 21:08:27.000000000 +0930
++++ openssl-0.9.7g/Configure	2007-07-07 21:13:41.000000000 +0930
+@@ -477,6 +477,7 @@
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl: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::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
============================================================
--- packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch	bd1bc954b5c2e8539a39128f09661d686716eba9
+++ packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch	bd1bc954b5c2e8539a39128f09661d686716eba9
@@ -0,0 +1,12 @@
+--- /tmp/Configure.patched	2007-08-27 18:34:23.412489103 +0200
++++ openssl-0.9.7g/Configure	2007-08-27 18:35:05.134866725 +0200
+@@ -478,6 +478,9 @@
+ "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibcgnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibcgnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ 
+ # SCO/Caldera targets.
+ #
============================================================
--- packages/openssl/openssl-0.9.8g/configure-targets.patch	40d57766f81e17ec56ee4b10fd84987ba1d73129
+++ packages/openssl/openssl-0.9.8g/configure-targets.patch	40d57766f81e17ec56ee4b10fd84987ba1d73129
@@ -0,0 +1,24 @@
+
+The number of colons are important :)
+
+Index: openssl-0.9.8g/Configure
+===================================================================
+--- openssl-0.9.8g.orig/Configure	2008-04-12 04:27:22.000000000 +0200
++++ openssl-0.9.8g/Configure	2008-04-12 04:38:56.000000000 +0200
+@@ -395,6 +395,16 @@
+ "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}",
+ 
++ # Linux on ARM
++"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibcgnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibcgnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
++"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
++
+ #### *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)",
+ "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
============================================================
--- packages/openssl/openssl-0.9.8g/debian.patch	e2524f821f3c1693aabb548a7c6c9cfac5a7a56b
+++ packages/openssl/openssl-0.9.8g/debian.patch	e2524f821f3c1693aabb548a7c6c9cfac5a7a56b
@@ -0,0 +1,1281 @@
+--- openssl-0.9.8g.orig/Makefile
++++ openssl-0.9.8g/Makefile
+@@ -11,11 +11,11 @@
+ SHLIB_VERSION_HISTORY=
+ SHLIB_MAJOR=0
+ SHLIB_MINOR=9.8
+-SHLIB_EXT=
+-PLATFORM=dist
+-OPTIONS= no-camellia no-gmp no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-tlsext no-zlib no-zlib-dynamic
+-CONFIGURE_ARGS=dist
+-SHLIB_TARGET=
++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
++PLATFORM=debian-amd64
++OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl enable-zlib enable-tlsext no-camellia no-gmp no-idea no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-zlib-dynamic
++CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext debian-amd64
++SHLIB_TARGET=linux-shared
+ 
+ # HERE indicates where this Makefile lives.  This can be used to indicate
+ # where sub-Makefiles are expected to be.  Currently has very limited usage,
+@@ -26,10 +26,10 @@
+ # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
+ # Normally it is left empty.
+ INSTALL_PREFIX=
+-INSTALLTOP=/usr/local/ssl
++INSTALLTOP=/usr
+ 
+ # Do not edit this manually. Use Configure --openssldir=DIR do change this!
+-OPENSSLDIR=/usr/local/ssl
++OPENSSLDIR=/usr/lib/ssl
+ 
+ # NO_IDEA - Define to build without the IDEA algorithm
+ # NO_RC4  - Define to build without the RC4 algorithm
+@@ -59,11 +59,11 @@
+ # equal 4.
+ # PKCS1_CHECK - pkcs1 tests.
+ 
+-CC= cc
+-CFLAG= -O
+-DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT 
++CC= gcc
++CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int -DMD5_ASM
++DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED 
+ PEX_LIBS= 
+-EX_LIBS= 
++EX_LIBS= -ldl -lz
+ EXE_EXT= 
+ ARFLAGS= 
+ AR=ar $(ARFLAGS) r
+@@ -71,7 +71,7 @@
+ PERL= /usr/bin/perl
+ TAR= tar
+ TARFLAGS= --no-recursion
+-MAKEDEPPROG=makedepend
++MAKEDEPPROG= gcc
+ 
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+@@ -86,15 +86,15 @@
+ PROCESSOR= 
+ 
+ # CPUID module collects small commonly used assembler snippets
+-CPUID_OBJ= 
+-BN_ASM= bn_asm.o
++CPUID_OBJ= x86_64cpuid.o
++BN_ASM= x86_64-gcc.o
+ DES_ENC= des_enc.o fcrypt_b.o
+ AES_ASM_OBJ= aes_core.o aes_cbc.o
+ BF_ENC= bf_enc.o
+ CAST_ENC= c_enc.o
+ RC4_ENC= rc4_enc.o
+ RC5_ENC= rc5_enc.o
+-MD5_ASM_OBJ= 
++MD5_ASM_OBJ= md5-x86_64.o
+ SHA1_ASM_OBJ= 
+ RMD160_ASM_OBJ= 
+ 
+@@ -106,14 +106,14 @@
+ ZLIB_INCLUDE=
+ LIBZLIB=
+ 
+-DIRS=   crypto ssl engines apps test tools
++DIRS=   crypto ssl engines apps tools
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+ SDIRS=  \
+ 	objects \
+ 	md2 md4 md5 sha hmac ripemd \
+-	des aes rc2 rc4 idea bf cast \
++	des aes rc2 rc4 bf cast \
+ 	bn ec rsa dsa ecdsa dh ecdh dso engine \
+ 	buffer bio stack lhash rand err \
+ 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
+@@ -127,10 +127,11 @@
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=/usr/share/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
++MANSUFFIX=ssl
++MANSECTION=SSL
+ SHELL=/bin/sh
+ 
+ TOP=    .
+@@ -141,8 +142,8 @@
+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+ SHARED_SSL=libssl$(SHLIB_EXT)
+ SHARED_LIBS=
+-SHARED_LIBS_LINK_EXTS=
+-SHARED_LDFLAGS=
++SHARED_LIBS_LINK_EXTS=.so
++SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld
+ 
+ GENERAL=        Makefile
+ BASENAME=       openssl
+@@ -310,7 +311,8 @@
+ 	    echo 'Description: OpenSSL cryptography library'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
+ 
+ libssl.pc: Makefile
+@@ -323,7 +325,8 @@
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl'; \
++	    echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
+ openssl.pc: Makefile
+@@ -336,7 +339,8 @@
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
+ 
+ Makefile: Makefile.org Configure config
+@@ -480,7 +484,7 @@
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+@@ -558,7 +562,7 @@
+ 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+-			--section=$$sec --center=OpenSSL \
++			--section=$${sec}$(MANSECTION) --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+ 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+@@ -575,7 +579,7 @@
+ 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+-			--section=$$sec --center=OpenSSL \
++			--section=$${sec}$(MANSECTION) --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+ 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+--- openssl-0.9.8g.orig/VMS/VMSify-conf.pl
++++ openssl-0.9.8g/VMS/VMSify-conf.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ use strict;
+ use warnings;
+--- openssl-0.9.8g.orig/Netware/do_tests.pl
++++ openssl-0.9.8g/Netware/do_tests.pl
+@@ -1,4 +1,4 @@
+-# perl script to run OpenSSL tests
++#!/usr/local/bin/perl
+ 
+ 
+ my $base_path      = "\\openssl";
+--- openssl-0.9.8g.orig/apps/CA.sh
++++ openssl-0.9.8g/apps/CA.sh
+@@ -91,6 +91,7 @@
+ 			   -out ${CATOP}/$CAREQ
+ 	    $CA -out ${CATOP}/$CACERT $CADAYS -batch \
+ 			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
++			   -extensions v3_ca \
+ 			   -infiles ${CATOP}/$CAREQ 
+ 	    RET=$?
+ 	fi
+--- openssl-0.9.8g.orig/apps/CA.pl.in
++++ openssl-0.9.8g/apps/CA.pl.in
+@@ -65,6 +65,7 @@
+ foreach (@ARGV) {
+ 	if ( /^(-\?|-h|-help)$/ ) {
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 0;
+ 	} elsif (/^-newcert$/) {
+ 	    # create a certificate
+@@ -165,6 +166,7 @@
+ 	} else {
+ 	    print STDERR "Unknown arg $_\n";
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 1;
+ 	}
+ }
+--- openssl-0.9.8g.orig/apps/speed.c
++++ openssl-0.9.8g/apps/speed.c
+@@ -577,7 +577,7 @@
+ #define MAX_BLOCK_SIZE 64
+ #endif
+ 	unsigned char DES_iv[8];
+-	unsigned char iv[MAX_BLOCK_SIZE/8];
++	unsigned char iv[2*MAX_BLOCK_SIZE/8];
+ #ifndef OPENSSL_NO_DES
+ 	DES_cblock *buf_as_des_cblock = NULL;
+ 	static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
+--- openssl-0.9.8g.orig/apps/CA.pl
++++ openssl-0.9.8g/apps/CA.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ #
+ # CA - wrapper around ca to make it easier to use ... basically ca requires
+ #      some setup stuff to be done before you can use it and this makes
+@@ -65,6 +65,7 @@
+ foreach (@ARGV) {
+ 	if ( /^(-\?|-h|-help)$/ ) {
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 0;
+ 	} elsif (/^-newcert$/) {
+ 	    # create a certificate
+@@ -165,6 +166,7 @@
+ 	} else {
+ 	    print STDERR "Unknown arg $_\n";
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 1;
+ 	}
+ }
+--- openssl-0.9.8g.orig/os2/backwardify.pl
++++ openssl-0.9.8g/os2/backwardify.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/local/bin/perl
+ use strict;
+ 
+ # Use as $0
+--- openssl-0.9.8g.orig/Configure
++++ openssl-0.9.8g/Configure
+@@ -1,4 +1,4 @@
+-:
++#!/usr/local/bin/perl
+ eval 'exec perl -S $0 ${1+"$@"}'
+     if $running_under_some_shell;
+ ##
+@@ -118,7 +118,8 @@
+ my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
+ my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o";
+ 
+-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";
++#my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";
++my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::::";
+ my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o::";
+ 
+ my $no_asm="::::::::::";
+@@ -308,6 +309,47 @@
+ "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
+ "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
+ 
++# Debian GNU/* (various architectures)
++"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
++"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-i386",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-m68k",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-sparc",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
++"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ ####
+ #### Variety of LINUX:-)
+ ####
+@@ -476,7 +518,7 @@
+ # Cygwin
+ "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
+ "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
++-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ 
+ # NetWare from David Ward (dsward at novell.com) - requires MetroWerks NLM development tools
+ # netware-clib => legacy CLib c-runtime support
+@@ -1300,6 +1342,8 @@
+ 	$shlib_minor=$2;
+ 	}
+ 
++$shared_ldflag .= " -Wl,--version-script=openssl.ld";
++
+ open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
+ unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
+ open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
+@@ -1371,7 +1415,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$/)
+ 		{
+@@ -1490,7 +1535,7 @@
+ 	if	(/^#define\s+OPENSSLDIR/)
+ 		{ print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
+ 	elsif	(/^#define\s+ENGINESDIR/)
+-		{ print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
++		{ print OUT "#define ENGINESDIR \"$prefix/lib/ssl/engines\"\n"; }
+ 	elsif	(/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
+ 		{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
+ 			if $export_var_as_fn;
+--- openssl-0.9.8g.orig/engines/Makefile
++++ openssl-0.9.8g/engines/Makefile
+@@ -97,13 +97,13 @@
+ 				*DSO_DL*)	sfx="sl";;	\
+ 				*)		sfx="bad";;	\
+ 				esac; \
+-				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
++				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \
+ 			  else \
+ 			  	sfx="so"; \
+ 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+ 			  fi; \
+-			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+-			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
++			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \
++			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx ); \
+ 		done; \
+ 	fi
+ 
+--- openssl-0.9.8g.orig/engines/openssl.ld
++++ openssl-0.9.8g/engines/openssl.ld
+@@ -0,0 +1,5 @@
++OPENSSL_0.9.8 {
++	 global:
++		 *;
++};
++
+--- openssl-0.9.8g.orig/tools/c_rehash
++++ openssl-0.9.8g/tools/c_rehash
+@@ -6,7 +6,7 @@
+ 
+ my $openssl;
+ 
+-my $dir = "/usr/local/ssl";
++my $dir = "/usr/lib/ssl";
+ 
+ if(defined $ENV{OPENSSL}) {
+ 	$openssl = $ENV{OPENSSL};
+@@ -59,12 +59,15 @@
+ 		}
+ 	}
+ 	closedir DIR;
+-	FILE: foreach $fname (grep {/\.pem$/} @flist) {
++	FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
+ 		# Check to see if certificates and/or CRLs present.
+ 		my ($cert, $crl) = check_file($fname);
+ 		if(!$cert && !$crl) {
+-			print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
+-			next;
++			($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der  -outform pem | ");
++			if(!$cert && !$crl) {
++				print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
++				next;
++			}
+ 		}
+ 		link_hash_cert($fname) if($cert);
+ 		link_hash_crl($fname) if($crl);
+@@ -102,6 +105,9 @@
+ 		my $fname = $_[0];
+ 		$fname =~ s/'/'\\''/g;
+ 		my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
++		if(!$hash || !fprint) {
++			($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
++		}
+ 		chomp $hash;
+ 		chomp $fprint;
+ 		$fprint =~ s/^.*=//;
+--- openssl-0.9.8g.orig/tools/c_rehash.in
++++ openssl-0.9.8g/tools/c_rehash.in
+@@ -59,12 +59,15 @@
+ 		}
+ 	}
+ 	closedir DIR;
+-	FILE: foreach $fname (grep {/\.pem$/} @flist) {
++	FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
+ 		# Check to see if certificates and/or CRLs present.
+ 		my ($cert, $crl) = check_file($fname);
+ 		if(!$cert && !$crl) {
+-			print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
+-			next;
++			($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der  -outform pem | ");
++			if(!$cert && !$crl) {
++				print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
++				next;
++			}
+ 		}
+ 		link_hash_cert($fname) if($cert);
+ 		link_hash_crl($fname) if($crl);
+@@ -102,6 +105,9 @@
+ 		my $fname = $_[0];
+ 		$fname =~ s/'/'\\''/g;
+ 		my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
++		if(!$hash || !fprint) {
++			($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
++		}
+ 		chomp $hash;
+ 		chomp $fprint;
+ 		$fprint =~ s/^.*=//;
+--- openssl-0.9.8g.orig/Makefile.shared
++++ openssl-0.9.8g/Makefile.shared
+@@ -151,9 +151,9 @@
+ 	SHLIB_SUFFIX=; \
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
++	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to
+--- openssl-0.9.8g.orig/ssl/t1_lib.c
++++ openssl-0.9.8g/ssl/t1_lib.c
+@@ -132,6 +132,10 @@
+ 	int extdatalen=0;
+ 	unsigned char *ret = p;
+ 
++	/* don't add extensions for SSLv3 */
++	if (s->client_version == SSL3_VERSION)
++		return p;
++
+ 	ret+=2;
+ 
+ 	if (ret>=limit) return NULL; /* this really never occurs, but ... */
+@@ -202,6 +206,10 @@
+ 	int extdatalen=0;
+ 	unsigned char *ret = p;
+ 
++	/* don't add extensions for SSLv3 */
++	if (s->version == SSL3_VERSION)
++		return p;
++	
+ 	ret+=2;
+ 	if (ret>=limit) return NULL; /* this really never occurs, but ... */
+ 
+--- openssl-0.9.8g.orig/ms/uplink.pl
++++ openssl-0.9.8g/ms/uplink.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # For Microsoft CL this is implemented as inline assembler. So that
+ # even though this script can generate even Win32 code, we'll be
+--- openssl-0.9.8g.orig/config
++++ openssl-0.9.8g/config
+@@ -162,8 +162,8 @@
+ 	echo "${MACHINE}-whatever-linux1"; exit 0
+ 	;;
+ 
+-    GNU*)
+-	echo "hurd-x86"; exit 0;
++    GNU:*|GNU/*:*)
++	echo "${MACHINE}-gnuish"; exit 0;
+ 	;;
+ 
+     LynxOS:*)
+--- openssl-0.9.8g.orig/demos/tunala/configure.in
++++ openssl-0.9.8g/demos/tunala/configure.in
+@@ -1,4 +1,4 @@
+-dnl Process this file with autoconf to produce a configure script.
++#!/usr/local/bin/perl
+ AC_INIT(tunala.c)
+ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
+--- openssl-0.9.8g.orig/doc/Makefile
++++ openssl-0.9.8g/doc/Makefile
+@@ -0,0 +1,40 @@
++VERSION =
++
++#PODS = $(wildcard *.pod)
++#MANS = $(addsuffix .man, $(basename $(PODS)))
++
++MANS = openssl.1 ssl.3 crypto.3
++
++P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)"
++
++all: manpages
++
++.PHONY: manpages 
++
++manpages: openssl.1 crypto.3 ssl.3
++
++openssl.1:
++	$(P2M) --section=1 openssl.pod > openssl.1
++
++crypto.3:
++	$(P2M) --section=3 crypto.pod > crypto.3
++
++ssl.3:
++	$(P2M) --section=3 ssl.pod > ssl.3
++
++.PHONY: install
++install:
++	mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
++	mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
++	install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
++	install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
++	install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
++	rm -f $(MANS)
++
++.PHONY: clean
++clean:
++	rm -f $(MANS)
++
++.PHONY: realclean
++realclean:
++	-$(MAKE) clean
+--- openssl-0.9.8g.orig/doc/apps/c_rehash.pod
++++ openssl-0.9.8g/doc/apps/c_rehash.pod
+@@ -0,0 +1,55 @@
++
++=pod
++
++=head1 NAME
++
++c_rehash - Create symbolic links to files named by the hash values
++
++=head1 SYNOPSIS
++
++B<c_rehash>
++[directory] ...
++
++=head1 DESCRIPTION
++
++c_rehash scans directories and takes a hash value of each .pem and .crt file in the directory. It then creates symbolic links for each of the files named by the hash value. This is useful as many programs require directories to be set up like this in order to find the certificates they require. 
++
++If any directories are named on the command line then these directories are processed in turn. If not then and the environment variable SSL_CERT_DIR is defined then that is consulted. This variable should be a colon (:) separated list of directories, all of which will be processed. If neither of these conditions are true then /usr/lib/ssl/certs is processed. 
++
++For each directory that is to be processed he user must have write permissions on the directory, if they do not then nothing will be printed for that directory.
++
++Note that this program deletes all the symbolic links that look like ones that it creates before processing a directory. Beware that if you run the program on a directory that contains symbolic links for other purposes that are named in the same format as those created by this program they will be lost.
++
++The hashes for certificate files are of the form <hash>.<n> where n is an integer. If the hash value already exists then n will be incremented, unless the file is a duplicate. Duplicates are detected using the fingerprint of the certificate. A warning will be printed if a duplicate is detected. The hashes for CRL files are of the form <hash>.r<n> and have the same behavior.
++
++The program will also warn if there are files with extension .pem which are not certificate or CRL files.
++
++The program uses the openssl program to compute the hashes and fingerprints. It expects the executable to be named openssl and be on the PATH, or in the /usr/lib/ssl/bin directory. If the OPENSSL environment variable is defined then this is used instead as the executable that provides the hashes and fingerprints. When called as $OPENSSL x509 -hash -fingerprint -noout -in $file it must output the hash of $file on the first line followed by the fingerprint on the second line, optionally prefixed with some text and an equals sign (=). 
++
++=head1 OPTIONS
++
++None
++
++=head1 ENVIRONMENT
++
++=over 4
++
++=item B<OPENSSL>
++
++The name (and path) of an executable to use to generate hashes and fingerprints (see above).
++
++=item B<SSL_CERT_DIR>
++
++Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
++
++=head1 SEE ALSO
++
++L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
++
++=back
++
++=head1 BUGS
++
++No known bugs
++
++=cut
+--- openssl-0.9.8g.orig/Makefile.org
++++ openssl-0.9.8g/Makefile.org
+@@ -104,7 +104,7 @@
+ ZLIB_INCLUDE=
+ LIBZLIB=
+ 
+-DIRS=   crypto ssl engines apps test tools
++DIRS=   crypto ssl engines apps tools
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+@@ -125,10 +125,11 @@
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=/usr/share/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
++MANSUFFIX=ssl
++MANSECTION=SSL
+ SHELL=/bin/sh
+ 
+ TOP=    .
+@@ -308,7 +309,8 @@
+ 	    echo 'Description: OpenSSL cryptography library'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
+ 
+ libssl.pc: Makefile
+@@ -321,7 +323,8 @@
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl'; \
++	    echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
+ openssl.pc: Makefile
+@@ -334,7 +337,8 @@
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
+ 
+ Makefile: Makefile.org Configure config
+@@ -478,7 +482,7 @@
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+@@ -556,7 +560,7 @@
+ 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+-			--section=$$sec --center=OpenSSL \
++			--section=$${sec}$(MANSECTION) --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+ 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+@@ -573,7 +577,7 @@
+ 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+-			--section=$$sec --center=OpenSSL \
++			--section=$${sec}$(MANSECTION) --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+ 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+--- openssl-0.9.8g.orig/openssl.ld
++++ openssl-0.9.8g/openssl.ld
+@@ -0,0 +1,5 @@
++OPENSSL_0.9.8 {
++	 global:
++		 *;
++};
++
+--- openssl-0.9.8g.orig/crypto/md5/asm/md5-x86_64.pl
++++ openssl-0.9.8g/crypto/md5/asm/md5-x86_64.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/local/bin/perl
+ #
+ # MD5 optimized for AMD64.
+ #
+--- openssl-0.9.8g.orig/crypto/md5/asm/md5-sparcv9.S
++++ openssl-0.9.8g/crypto/md5/asm/md5-sparcv9.S
+@@ -74,14 +74,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.8g.orig/crypto/Makefile
++++ openssl-0.9.8g/crypto/Makefile
+@@ -57,7 +57,7 @@
+ 	echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
+ 	echo '#endif' ) >buildinf.h
+ 
+-x86cpuid-elf.s:	x86cpuid.pl perlasm/x86asm.pl
++x86cpuid-elf.S:	x86cpuid.pl perlasm/x86asm.pl
+ 	$(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
+ x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
+ 	$(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
+@@ -70,7 +70,7 @@
+ uplink-cof.s:	../ms/uplink.pl
+ 	$(PERL) ../ms/uplink.pl coff > $@
+ 
+-x86_64cpuid.s: x86_64cpuid.pl
++x86_64cpuid.S: x86_64cpuid.pl
+ 	$(PERL) x86_64cpuid.pl $@
+ ia64cpuid.s: ia64cpuid.S
+ 	$(CC) $(CFLAGS) -E ia64cpuid.S > $@
+--- openssl-0.9.8g.orig/crypto/sha/asm/sha1-ia64.pl
++++ openssl-0.9.8g/crypto/sha/asm/sha1-ia64.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+--- openssl-0.9.8g.orig/crypto/sha/asm/sha512-sse2.pl
++++ openssl-0.9.8g/crypto/sha/asm/sha512-sse2.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+--- openssl-0.9.8g.orig/crypto/sha/asm/sha512-ia64.pl
++++ openssl-0.9.8g/crypto/sha/asm/sha512-ia64.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+--- openssl-0.9.8g.orig/crypto/sha/sha.h
++++ openssl-0.9.8g/crypto/sha/sha.h
+@@ -59,6 +59,7 @@
+ #ifndef HEADER_SHA_H
+ #define HEADER_SHA_H
+ 
++#include <stddef.h>
+ #include <openssl/e_os2.h>
+ #include <stddef.h>
+ 
+--- openssl-0.9.8g.orig/crypto/rand/md_rand.c
++++ openssl-0.9.8g/crypto/rand/md_rand.c
+@@ -271,7 +271,10 @@
+ 		else
+ 			MD_Update(&m,&(state[st_idx]),j);
+ 			
++/*		
++ * Don't add uninitialised data.
+ 		MD_Update(&m,buf,j);
++*/
+ 		MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
+ 		MD_Final(&m,local_md);
+ 		md_c[1]++;
+@@ -465,8 +468,10 @@
+ 		MD_Update(&m,local_md,MD_DIGEST_LENGTH);
+ 		MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
+ #ifndef PURIFY
++#if 0 /* Don't add uninitialised data. */
+ 		MD_Update(&m,buf,j); /* purify complains */
+ #endif
++#endif
+ 		k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;
+ 		if (k > 0)
+ 			{
+--- openssl-0.9.8g.orig/crypto/des/asm/desboth.pl
++++ openssl-0.9.8g/crypto/des/asm/desboth.pl
+@@ -16,6 +16,11 @@
+ 
+ 	&push("edi");
+ 
++	&call   (&label("pic_point0"));
++	&set_label("pic_point0");
++	&blindpop("ebp");
++	&add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
++
+ 	&comment("");
+ 	&comment("Load the data words");
+ 	&mov($L,&DWP(0,"ebx","",0));
+@@ -47,15 +52,21 @@
+ 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
+ 	&mov(&swtmp(1),	"eax");
+ 	&mov(&swtmp(0),	"ebx");
+-	&call("DES_encrypt2");
++	&exch("ebx", "ebp");
++	&call("DES_encrypt2\@PLT");
++	&exch("ebx", "ebp");
+ 	&mov(&swtmp(2),	(DWC(($enc)?"0":"1")));
+ 	&mov(&swtmp(1),	"edi");
+ 	&mov(&swtmp(0),	"ebx");
+-	&call("DES_encrypt2");
++	&exch("ebx", "ebp");
++	&call("DES_encrypt2\@PLT");
++	&exch("ebx", "ebp");
+ 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
+ 	&mov(&swtmp(1),	"esi");
+ 	&mov(&swtmp(0),	"ebx");
+-	&call("DES_encrypt2");
++	&exch("ebx", "ebp");
++	&call("DES_encrypt2\@PLT");
++	&exch("ebx", "ebp");
+ 
+ 	&stack_pop(3);
+ 	&mov($L,&DWP(0,"ebx","",0));
+--- openssl-0.9.8g.orig/crypto/x86cpuid.pl
++++ openssl-0.9.8g/crypto/x86cpuid.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ 
+ push(@INC,"perlasm");
+ require "x86asm.pl";
+--- openssl-0.9.8g.orig/crypto/rc4/asm/rc4-x86_64.pl
++++ openssl-0.9.8g/crypto/rc4/asm/rc4-x86_64.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+--- openssl-0.9.8g.orig/crypto/perlasm/x86unix.pl
++++ openssl-0.9.8g/crypto/perlasm/x86unix.pl
+@@ -399,6 +399,29 @@
+ 	$stack=4;
+ 	}
+ 
++sub main'function_begin_B_static
++	{
++	local($func,$extra)=@_;
++
++	&main'external_label($func);
++	$func=$under.$func;
++
++	local($tmp)=<<"EOF";
++.text
++EOF
++	push(@out,$tmp);
++	if ($main'cpp)
++		{ push(@out,"TYPE($func,\@function)\n"); }
++	elsif ($main'coff)
++		{ $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
++	elsif ($main'aout and !$main'pic)
++		{ }
++	else	{ push(@out,".type	$func,\@function\n"); }
++	push(@out,".align\t$align\n");
++	push(@out,"$func:\n");
++	$stack=4;
++	}
++
+ sub main'function_end
+ 	{
+ 	local($func)=@_;
+@@ -730,7 +753,17 @@
+ 		{
+ 		$tmp=<<___;
+ .section	.init
++#ifdef OPENSSL_PIC
++	pushl	%ebx
++	call    .pic_point0
++.pic_point0:
++	popl    %ebx
++	addl    \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
++	call	$under$f\@PLT
++	popl	%ebx
++#else
+ 	call	$under$f
++#endif
+ 	jmp	.Linitalign
+ .align	$align
+ .Linitalign:
+--- openssl-0.9.8g.orig/crypto/perlasm/cbc.pl
++++ openssl-0.9.8g/crypto/perlasm/cbc.pl
+@@ -122,7 +122,11 @@
+ 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
+ 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
+ 
+-	&call($enc_func);
++	&call	(&label("pic_point0"));
++	&set_label("pic_point0");
++	&blindpop("ebx");
++	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
++	&call("$enc_func\@PLT");
+ 
+ 	&mov("eax",	&DWP($data_off,"esp","",0));
+ 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
+@@ -187,7 +191,11 @@
+ 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
+ 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
+ 
+-	&call($enc_func);
++	&call	(&label("pic_point1"));
++	&set_label("pic_point1");
++	&blindpop("ebx");
++	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
++	&call("$enc_func\@PLT");
+ 
+ 	&mov("eax",	&DWP($data_off,"esp","",0));
+ 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
+@@ -220,7 +228,11 @@
+ 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
+ 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
+ 
+-	&call($dec_func);
++	&call	(&label("pic_point2"));
++	&set_label("pic_point2");
++	&blindpop("ebx");
++	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
++	&call("$dec_func\@PLT");
+ 
+ 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
+ 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
+@@ -263,7 +275,11 @@
+ 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
+ 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
+ 
+-	&call($dec_func);
++	&call	(&label("pic_point3"));
++	&set_label("pic_point3");
++	&blindpop("ebx");
++	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
++	&call("$dec_func\@PLT");
+ 
+ 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
+ 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
+--- openssl-0.9.8g.orig/crypto/perlasm/x86_64-xlate.pl
++++ openssl-0.9.8g/crypto/perlasm/x86_64-xlate.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ 
+ # Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
+ #
+--- openssl-0.9.8g.orig/crypto/opensslconf.h
++++ openssl-0.9.8g/crypto/opensslconf.h
+@@ -10,6 +10,9 @@
+ #ifndef OPENSSL_NO_GMP
+ # define OPENSSL_NO_GMP
+ #endif
++#ifndef OPENSSL_NO_IDEA
++# define OPENSSL_NO_IDEA
++#endif
+ #ifndef OPENSSL_NO_KRB5
+ # define OPENSSL_NO_KRB5
+ #endif
+@@ -25,11 +28,11 @@
+ #ifndef OPENSSL_NO_SEED
+ # define OPENSSL_NO_SEED
+ #endif
+-#ifndef OPENSSL_NO_TLSEXT
+-# define OPENSSL_NO_TLSEXT
+-#endif
+ 
+ #endif /* OPENSSL_DOING_MAKEDEPEND */
++#ifndef OPENSSL_THREADS
++# define OPENSSL_THREADS
++#endif
+ #ifndef OPENSSL_NO_DYNAMIC_ENGINE
+ # define OPENSSL_NO_DYNAMIC_ENGINE
+ #endif
+@@ -45,6 +48,9 @@
+ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
+ #  define NO_GMP
+ # endif
++# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
++#  define NO_IDEA
++# endif
+ # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
+ #  define NO_KRB5
+ # endif
+@@ -60,11 +66,10 @@
+ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
+ #  define NO_SEED
+ # endif
+-# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
+-#  define NO_TLSEXT
+-# endif
+ #endif
+ 
++#define OPENSSL_CPUID_OBJ
++
+ /* crypto/opensslconf.h.in */
+ 
+ /* Generate 80386 code? */
+@@ -72,8 +77,8 @@
+ 
+ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
+ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+-#define ENGINESDIR "/usr/local/ssl/lib/engines"
+-#define OPENSSLDIR "/usr/local/ssl"
++#define ENGINESDIR "/usr/lib/ssl/engines"
++#define OPENSSLDIR "/usr/lib/ssl"
+ #endif
+ #endif
+ 
+@@ -104,14 +109,14 @@
+  * - Intel P6 because partial register stalls are very expensive;
+  * - elder Alpha because it lacks byte load/store instructions;
+  */
+-#define RC4_INT unsigned int
++#define RC4_INT unsigned char
+ #endif
+ #if !defined(RC4_CHUNK)
+ /*
+  * This enables code handling data aligned at natural CPU word
+  * boundary. See crypto/rc4/rc4_enc.c for further details.
+  */
+-#undef RC4_CHUNK
++#define RC4_CHUNK unsigned long
+ #endif
+ #endif
+ 
+@@ -119,7 +124,7 @@
+ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+  * %20 speed up (longs are 8 bytes, int's are 4). */
+ #ifndef DES_LONG
+-#define DES_LONG unsigned long
++#define DES_LONG unsigned int
+ #endif
+ #endif
+ 
+@@ -133,9 +138,9 @@
+ /* The prime number generation stuff may not work when
+  * EIGHT_BIT but I don't care since I've only used this mode
+  * for debuging the bignum libraries */
+-#undef SIXTY_FOUR_BIT_LONG
++#define SIXTY_FOUR_BIT_LONG
+ #undef SIXTY_FOUR_BIT
+-#define THIRTY_TWO_BIT
++#undef THIRTY_TWO_BIT
+ #undef SIXTEEN_BIT
+ #undef EIGHT_BIT
+ #endif
+@@ -149,7 +154,7 @@
+ 
+ #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
+ #define CONFIG_HEADER_BF_LOCL_H
+-#undef BF_PTR
++#define BF_PTR2
+ #endif /* HEADER_BF_LOCL_H */
+ 
+ #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
+@@ -179,7 +184,7 @@
+ /* Unroll the inner loop, this sometimes helps, sometimes hinders.
+  * Very mucy CPU dependant */
+ #ifndef DES_UNROLL
+-#undef DES_UNROLL
++#define DES_UNROLL
+ #endif
+ 
+ /* These default values were supplied by
+--- openssl-0.9.8g.orig/crypto/pkcs7/pk7_mime.c
++++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c
+@@ -335,9 +335,9 @@
+ 
+ 		if(strcmp(hdr->value, "application/x-pkcs7-signature") &&
+ 			strcmp(hdr->value, "application/pkcs7-signature")) {
+-			sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+ 			PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE);
+ 			ERR_add_error_data(2, "type: ", hdr->value);
++			sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+ 			sk_BIO_pop_free(parts, BIO_vfree);
+ 			return NULL;
+ 		}
+--- openssl-0.9.8g.orig/crypto/bn/asm/ppc.pl
++++ openssl-0.9.8g/crypto/bn/asm/ppc.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # Implemented as a Perl wrapper as we want to support several different
+ # architectures with single file. We pick up the target based on the
+--- openssl-0.9.8g.orig/crypto/x86_64cpuid.pl
++++ openssl-0.9.8g/crypto/x86_64cpuid.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ 
+ $output=shift;
+ $win64a=1 if ($output =~ /win64a\.[s|asm]/);
+@@ -134,5 +134,9 @@
+ .size	OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
+ 
+ .section	.init
++#ifdef OPENSSL_PIC
++	call	OPENSSL_cpuid_setup\@PLT
++#else
+ 	call	OPENSSL_cpuid_setup
++#endif
+ ___
+--- openssl-0.9.8g.orig/crypto/aes/asm/aes-586.pl
++++ openssl-0.9.8g/crypto/aes/asm/aes-586.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # ====================================================================
+ # Written by Andy Polyakov <appro at fy.chalmers.se> for the OpenSSL
+@@ -250,7 +250,7 @@
+ sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
+ 
+ &public_label("AES_Te");
+-&function_begin_B("_x86_AES_encrypt");
++&function_begin_B_static("_x86_AES_encrypt");
+ 	if ($vertical_spin) {
+ 		# I need high parts of volatile registers to be accessible...
+ 		&exch	($s1="edi",$key="ebx");
+@@ -539,7 +539,7 @@
+ }
+ 
+ &public_label("AES_Td");
+-&function_begin_B("_x86_AES_decrypt");
++&function_begin_B_static("_x86_AES_decrypt");
+ 	# note that caller is expected to allocate stack frame for me!
+ 	&mov	(&DWP(12,"esp"),$key);		# save key
+ 
+@@ -1460,15 +1460,22 @@
+ &public_label("AES_Td");
+ &public_label("AES_Te");
+ &function_begin_B("AES_set_decrypt_key");
++	&push	("ebx");
+ 	&mov	("eax",&wparam(0));
+ 	&mov	("ecx",&wparam(1));
+ 	&mov	("edx",&wparam(2));
+ 	&sub	("esp",12);
++
++	&call	(&label("pic_point0")); 
++	&set_label("pic_point0");
++	&blindpop("ebx");
++	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
+ 	&mov	(&DWP(0,"esp"),"eax");
+ 	&mov	(&DWP(4,"esp"),"ecx");
+ 	&mov	(&DWP(8,"esp"),"edx");
+-	&call	("AES_set_encrypt_key");
++	&call	("AES_set_encrypt_key\@PLT");
+ 	&add	("esp",12);
++	&pop	("ebx");
+ 	&cmp	("eax",0);
+ 	&je	(&label("proceed"));
+ 	&ret	();
+--- openssl-0.9.8g.orig/crypto/asn1/charmap.pl
++++ openssl-0.9.8g/crypto/asn1/charmap.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ 
+ use strict;
+ 
+--- openssl-0.9.8g.orig/util/mkerr.pl
++++ openssl-0.9.8g/util/mkerr.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ 
+ my $config = "crypto/err/openssl.ec";
+ my $debug = 0;
+--- openssl-0.9.8g.orig/util/clean-depend.pl
++++ openssl-0.9.8g/util/clean-depend.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ # Clean the dependency list in a makefile of standard includes...
+ # Written by Ben Laurie <ben at algroup.co.uk> 19 Jan 1999
+ 
+--- openssl-0.9.8g.orig/util/extract-names.pl
++++ openssl-0.9.8g/util/extract-names.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ $/ = "";			# Eat a paragraph at once.
+ while(<STDIN>) {
+--- openssl-0.9.8g.orig/util/pod2man.pl
++++ openssl-0.9.8g/util/pod2man.pl
+@@ -1,4 +1,4 @@
+-: #!/usr/bin/perl-5.005
++#!/usr/local/bin/perl
+     eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+ 	if $running_under_some_shell;
+ 
+--- openssl-0.9.8g.orig/util/mkstack.pl
++++ openssl-0.9.8g/util/mkstack.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ 
+ # This is a utility that searches out "DECLARE_STACK_OF()"
+ # declarations in .h and .c files, and updates/creates/replaces
+--- openssl-0.9.8g.orig/util/selftest.pl
++++ openssl-0.9.8g/util/selftest.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ #
+ # Run the test suite and generate a report
+ #
+--- openssl-0.9.8g.orig/util/extract-section.pl
++++ openssl-0.9.8g/util/extract-section.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ 
+ while(<STDIN>) {
+ 	if (/=for\s+comment\s+openssl_manual_section:(\S+)/)
+--- openssl-0.9.8g.orig/util/pl/netware.pl
++++ openssl-0.9.8g/util/pl/netware.pl
+@@ -1,4 +1,4 @@
+-# Metrowerks Codewarrior for NetWare
++#!/usr/local/bin/perl
+ #
+ 
+ # The import files and other misc imports needed to link
+--- openssl-0.9.8g.orig/util/mkdef.pl
++++ openssl-0.9.8g/util/mkdef.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/local/bin/perl
+ #
+ # generate a .def file
+ #
============================================================
--- packages/openssl/openssl-native_0.9.7m.bb	aee940409bd5054fbf284dbe9b7adbfd5269d114
+++ packages/openssl/openssl-native_0.9.7m.bb	aee940409bd5054fbf284dbe9b7adbfd5269d114
@@ -0,0 +1,16 @@
+inherit pkgconfig native
+
+require openssl.inc
+
+PR = "r1"
+
+SRC_URI += "file://debian.patch;patch=1 \
+            file://armeb.patch;patch=1;pnum=0 \
+            file://gnueabi-arm.patch;patch=1"
+
+FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+do_install() {
+	:
+}
+
============================================================
--- packages/openssl/openssl_0.9.7m.bb	e1c49f5a11a86d7eb04595e34aeed012e99f1071
+++ packages/openssl/openssl_0.9.7m.bb	e1c49f5a11a86d7eb04595e34aeed012e99f1071
@@ -0,0 +1,12 @@
+inherit pkgconfig
+
+require openssl.inc
+
+PR = "r6"
+
+SRC_URI += "file://debian.patch;patch=1 \
+            file://armeb.patch;patch=1;pnum=0 \
+            file://gnueabi-arm.patch;patch=1 \
+            file://gnueabi-armeb.patch;patch=1 \
+            file://uclibcgnueabi.patch;patch=1 \
+            file://avr32.patch;patch=1;pnum=0"
============================================================
--- packages/openssl/openssl_0.9.8g.bb	e326706f63f853e3243bfc002f2f8d924885404d
+++ packages/openssl/openssl_0.9.8g.bb	e326706f63f853e3243bfc002f2f8d924885404d
@@ -0,0 +1,10 @@
+inherit pkgconfig
+
+require openssl.inc
+
+PR = "r6"
+
+SRC_URI += "file://debian.patch;patch=1 \
+            file://configure-targets.patch;patch=1"
+
+PARALLEL_MAKE = ""
============================================================
--- packages/tslib/tslib/om-gta02/ts.conf	7123e2647340fe6a95f41cd9f53f3307c08cd223
+++ packages/tslib/tslib/om-gta02/ts.conf	7123e2647340fe6a95f41cd9f53f3307c08cd223
@@ -0,0 +1,25 @@
+# Uncomment if you wish to use the linux input layer event interface
+module_raw input grab_events=1
+
+# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
+# module_raw collie
+
+# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
+# module_raw corgi
+
+# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
+# module_raw ucb1x00
+
+# Uncomment if you're using an HP iPaq h3600 or similar
+# module_raw h3600
+
+# Uncomment if you're using a Hitachi Webpad
+# module_raw mk712
+
+# Uncomment if you're using an IBM Arctic II
+# module_raw arctic2
+
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
============================================================
--- packages/wordlist/files/rules	c05179a08d78dc9c946b1b4e3eaab857aae70513
+++ packages/wordlist/files/rules	c05179a08d78dc9c946b1b4e3eaab857aae70513
@@ -0,0 +1,218 @@
+#!/usr/bin/make -f
+# -*- Makefile -*- $Id: rules,v 1.18 2005/10/15 03:03:48 david Exp $
+# Sample debian/rules that uses debhelper. 
+# GNU copyright 1997 to 1999 by Joey Hess.
+# Customized 27 Oct 1999 by David Coe for wenglish, later moved to scowl
+# This version is for packages that are architecture independent.
+
+# Copied & modified 20080409 from debian source package by John Lee
+# into OpenEmbedded.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# In addition to the scowl binary package, we create wamerican-small, wamerican, wamerican-large, wamerican-huge, and the
+# corresponding packages for wbritish and wcanadian.
+# The medium size packages have no -size part in their names
+# These are the scowl extensions (complexity numbers?) that contribute to each word list (i.e. each size);
+# the -size parts "-small", "", "-large", and "-huge" correspond to the end of the binary package name:
+export SIZE_EXTENSIONS-small:=10 20 35
+export SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS-small) 40 50
+export SIZE_EXTENSIONS-large:=$(SIZE_EXTENSIONS) 55 60 70
+export SIZE_EXTENSIONS-huge:=$(SIZE_EXTENSIONS-large) 80
+
+# These are the scowl word list classes we use:
+CLASSES:=words proper-names upper contractions
+VARIANTS:=0 1
+
+build: build-stamp
+build-stamp:
+#	dh_testdir
+
+	set -e;\
+	for SPELLING in american british canadian; do\
+	  for SIZE in -small "" -large -huge; do\
+	    echo "The following SCOWL word lists were concatenated and sorted (with duplicates" > w$$SPELLING$$SIZE.scowl-word-lists-used;\
+	    echo "removed) to create this word list (see README.Debian for more details):" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+	    for CLASS in $(CLASSES); do\
+	      for EXT in $$(eval echo \\$$SIZE_EXTENSIONS$$SIZE); do\
+		if [ -f final/english-$$CLASS.$$EXT ]; then\
+		  echo "cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+		  cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+		  echo "  english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+		fi;\
+		for VARIANT in $(VARIANTS); do\
+		  if [ -f final/variant_$$VARIANT-$$CLASS.$$EXT ]; then\
+		    echo "cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+		    cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+		    echo "  variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+		  fi;\
+		done;\
+		if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\
+		  echo "cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+		  cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+		  echo "  $$SPELLING-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+		fi;\
+	      done;\
+	    done;\
+	  echo "sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
+	  sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+	  done;\
+	done
+
+	touch build-stamp
+
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	set -e;\
+	for SIZE in -small "" -large -huge; do\
+	  for SPELLING in american british canadian; do\
+	    rm -f $$SPELLING-english$$SIZE.unsorted $$SPELLING-english$$SIZE $$SPELLING-english$$SIZE.5 w$$SPELLING$$SIZE.scowl-word-lists-used;\
+	  done;\
+	done
+
+	dh_clean
+
+
+install: DH_OPTIONS=
+install: install-scowl install-wamerican install-wamerican-small install-wamerican-large install-wamerican-huge install-wbritish install-wbritish-small install-wbritish-large install-wbritish-huge install-wcanadian install-wcanadian-small install-wcanadian-large install-wcanadian-huge
+
+
+
+.PHONY: install-scowl
+install-scowl: PKG=scowl
+install-scowl: 
+	dh_testdir
+	dh_testroot
+	dh_installdirs --package=$(PKG)
+
+	dh_install --package=$(PKG) final/*.[0-9][0-9] usr/share/dict/scowl
+	dh_installdocs --package=$(PKG) README debian/README.Debian
+
+
+.PHONY: install-wordlist
+install-wordlist:
+#	PKG and WORDLIST must have been set to the binary package name and word list file name, respectively.
+	dh_testdir
+	dh_testroot
+	dh_installdirs --package=$(PKG)
+
+	dh_install --package=$(PKG) $(WORDLIST) usr/share/dict
+
+	dh_installdocs --package=$(PKG) $(PKG).scowl-word-lists-used debian/README.Debian
+
+	installdeb-wordlist --package=$(PKG) # This internally uses dh_installdebcon
+
+	sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template > $(WORDLIST).5
+	dh_installman --package=$(PKG) $(WORDLIST).5
+
+
+.PHONY: install-wamerican
+install-wamerican: build-stamp
+	 $(MAKE) -f debian/rules PKG=wamerican WORDLIST=american-english install-wordlist
+
+.PHONY: install-wamerican-small
+install-wamerican-small: build-stamp
+	 $(MAKE) -f debian/rules PKG=wamerican-small WORDLIST=american-english-small install-wordlist
+
+.PHONY: install-wamerican-large
+install-wamerican-large: build-stamp
+	 $(MAKE) -f debian/rules PKG=wamerican-large WORDLIST=american-english-large install-wordlist
+
+.PHONY: install-wamerican-huge
+install-wamerican-huge: build-stamp
+	 $(MAKE) -f debian/rules PKG=wamerican-huge WORDLIST=american-english-huge install-wordlist
+
+
+.PHONY: install-wbritish
+install-wbritish: build-stamp
+	 $(MAKE) -f debian/rules PKG=wbritish WORDLIST=british-english install-wordlist
+
+.PHONY: install-wbritish-small
+install-wbritish-small: build-stamp
+	 $(MAKE) -f debian/rules PKG=wbritish-small WORDLIST=british-english-small install-wordlist
+
+.PHONY: install-wbritish-large
+install-wbritish-large: build-stamp
+	 $(MAKE) -f debian/rules PKG=wbritish-large WORDLIST=british-english-large install-wordlist
+
+.PHONY: install-wbritish-huge
+install-wbritish-huge: build-stamp
+	 $(MAKE) -f debian/rules PKG=wbritish-huge WORDLIST=british-english-huge install-wordlist
+
+
+.PHONY: install-wcanadian
+install-wcanadian: build-stamp
+	 $(MAKE) -f debian/rules PKG=wcanadian WORDLIST=canadian-english install-wordlist
+
+.PHONY: install-wcanadian-small
+install-wcanadian-small: build-stamp
+	 $(MAKE) -f debian/rules PKG=wcanadian-small WORDLIST=canadian-english-small install-wordlist
+
+.PHONY: install-wcanadian-large
+install-wcanadian-large: build-stamp
+	 $(MAKE) -f debian/rules PKG=wcanadian-large WORDLIST=canadian-english-large install-wordlist
+
+.PHONY: install-wcanadian-huge
+install-wcanadian-huge: build-stamp
+	 $(MAKE) -f debian/rules PKG=wcanadian-huge WORDLIST=canadian-english-huge install-wordlist
+
+
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+#	dh_installdocs    # moved to the install targets, because it doesn't DWIM with "-A -p scowl README"
+#	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installcatalogs
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installman
+#	dh_installcron
+#	dh_installinfo
+#	dh_undocumented
+#	dh_strip
+	dh_link
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+# (Uncomment this next line if you have such packages.)
+#	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install
============================================================
--- packages/wordlist/scowl_6.bb	3c879b1a8c2e4cb21bb186cd29601c95da176d93
+++ packages/wordlist/scowl_6.bb	3c879b1a8c2e4cb21bb186cd29601c95da176d93
@@ -0,0 +1,37 @@
+DESCRIPTION = "SCOWL (Spell Checker Oriented Word Lists) is a collection of word lists split up in various sizes, and other categories, intended to be suitable for use in spell checkers. However, I am sure it will have numerous other uses as well."
+HOMEPAGE = "http://wordlist.sourceforge.net/"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wordlist/scowl-6.tar.gz \
+           file://rules"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_compile() {
+    cp -f ${WORKDIR}/rules ${S}
+    oe_runmake -f rules build
+}
+do_install() {
+    install -d ${D}/${datadir}/dict
+    install ${S}/american-english ${D}/${datadir}/dict
+    install ${S}/british-english ${D}/${datadir}/dict
+    install ${S}/canadian-english ${D}/${datadir}/dict
+}
+
+PACKAGE_ARCH = "all"
+PACKAGES = "wamerican wbritish wcanadian"
+
+FILES = "${datadir}/dict/${DICTNAME}"
+
+pkg_postinst() {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+cd ${datadir}/dict
+ln -sf ${DICTNAME} words
+}
+
+DICTNAME_wamerican = "american-english"
+DICTNAME_wbritish = "british-english"
+DICTNAME_wcanadian = "canadian-english"
============================================================
--- packages/wvdial/wvdial_1.60.bb	dfef3574421bb1df71ee7cfdc6899c21300a0c79
+++ packages/wvdial/wvdial_1.60.bb	dfef3574421bb1df71ee7cfdc6899c21300a0c79
@@ -0,0 +1,15 @@
+HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial"
+DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet."
+
+LICENSE = "LGPL"
+SRC_URI = "http://www.alumnit.ca/download/wvdial-1.60.tar.gz"
+
+DEPENDS = "wvstreams"
+RDEPENDS = "ppp"
+
+EXTRA_OEMAKE = ""
+export WVLINK="${LD}"
+
+do_install() {
+    oe_runmake prefix=${D}/usr PPPDIR=${D}/etc install
+}
============================================================
--- packages/wvstreams/files/build-fixes-and-sanity.patch	01f17efed1dad3b066472e2a1501896f72a5154b
+++ packages/wvstreams/files/build-fixes-and-sanity.patch	01f17efed1dad3b066472e2a1501896f72a5154b
@@ -0,0 +1,84 @@
+Index: wvstreams-4.4.1/configure.ac
+===================================================================
+--- wvstreams-4.4.1.orig/configure.ac	2007-08-30 04:47:54.000000000 +0200
++++ wvstreams-4.4.1/configure.ac	2008-04-12 00:15:13.000000000 +0200
+@@ -445,7 +445,6 @@
+ # tcl
+ if test "$with_tcl" != "no"; then
+     CPPFLAGS_save="$CPPFLAGS"
+-    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)
+     AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])
+     AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])
+     if test "$with_tcl" != "no"; then
+Index: wvstreams-4.4.1/Makefile
+===================================================================
+--- wvstreams-4.4.1.orig/Makefile	2007-08-30 04:48:09.000000000 +0200
++++ wvstreams-4.4.1/Makefile	2008-04-12 00:51:51.000000000 +0200
+@@ -76,7 +76,7 @@
+ 	$(call configure)
+ 
+ include/wvautoconf.h: include/wvautoconf.h.in
+-	$(call configure)
++	
+ 
+ gnulib/Makefile: gnulib/Makefile.in
+ 	$(call configure)
+@@ -97,9 +97,7 @@
+ 	@touch $@
+ 
+ configure: configure.ac include/wvautoconf.h.in aclocal.m4
+-	autoconf
+-	@rm -f config.mk include/wvautoconf.h gnulib/Makefile
+-	@touch $@
++	@echo hey@
+ 
+ include/wvautoconf.h.in: configure.ac aclocal.m4
+ 	autoheader
+Index: wvstreams-4.4.1/config.mk.in
+===================================================================
+--- wvstreams-4.4.1.orig/config.mk.in	2007-08-17 07:15:31.000000000 +0200
++++ wvstreams-4.4.1/config.mk.in	2008-04-12 00:25:54.000000000 +0200
+@@ -31,6 +31,7 @@
+ 
+ prefix=@prefix@
+ datadir=@datadir@
++datarootdir=@datarootdir@
+ includedir=@includedir@
+ infodir=@infodir@
+ localstatedir=@localstatedir@
+Index: wvstreams-4.4.1/vars.mk
+===================================================================
+--- wvstreams-4.4.1.orig/vars.mk	2007-08-17 07:15:31.000000000 +0200
++++ wvstreams-4.4.1/vars.mk	2008-04-12 01:44:03.000000000 +0200
+@@ -174,7 +174,7 @@
+ 
+ libwvutils.a libwvutils.so: $(filter-out $(BASEOBJS) $(TESTOBJS),$(call objects,utils)) gnulib/libgnu.a
+ libwvutils.so: libwvbase.so
+-libwvutils.so: -lz -lcrypt
++libwvutils.so: LIBS+=-lz -lcrypt
+ 
+ libwvstreams.a libwvstreams.so: $(filter-out $(BASEOBJS), \
+ 	$(call objects,configfile crypto ipstreams \
+Index: wvstreams-4.4.1/wvrules.mk
+===================================================================
+--- wvstreams-4.4.1.orig/wvrules.mk	2007-08-17 07:15:31.000000000 +0200
++++ wvstreams-4.4.1/wvrules.mk	2008-04-12 01:00:05.000000000 +0200
+@@ -51,7 +51,7 @@
+ LIBWVTEST=$(WVSTREAMS_LIB)/libwvtest.a $(LIBWVUTILS)
+ 
+ # Default compiler we use for linking
+-WVLINK_CC = gcc
++WVLINK_CC = $(CC)
+ 
+ # FIXME: what does this do??
+ XX_LIBS := $(XX_LIBS) $(shell $(CC) -lsupc++ -lgcc_eh 2>&1 | grep -q "undefined reference" && echo " -lsupc++ -lgcc_eh")
+Index: wvstreams-4.4.1/xplc/config/config.mk.in
+===================================================================
+--- wvstreams-4.4.1.orig/xplc/config/config.mk.in	2005-10-31 23:33:26.000000000 +0100
++++ wvstreams-4.4.1/xplc/config/config.mk.in	2008-04-12 00:27:33.000000000 +0200
+@@ -49,4 +49,4 @@
+ LN_S:=@LN_S@
+ LIBS:=@LIBS@
+ CVS2CL:=@CVS2CL@
+-
++datarootdir:=@datarootdir@
============================================================
--- packages/wvstreams/wvstreams_4.4.1.bb	663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3
+++ packages/wvstreams/wvstreams_4.4.1.bb	663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3
@@ -0,0 +1,38 @@
+HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
+LICENSE = "LGPL"
+DESCRIPTION = "WvStreams is a network programming library in C++"
+DEPENDS = "zlib openssl (>= 0.9.8)"
+
+PR = "r1"
+
+SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
+           file://build-fixes-and-sanity.patch;patch=1 "
+
+inherit autotools
+
+LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
+
+EXTRA_AUTORECONF += " -I${S}/gnulib/m4"
+EXTRA_OECONF = " --without-tcl --without-qt --without-pam"
+
+PACKAGES_prepend = "libuniconf libuniconf-dbg "
+PACKAGES_prepend = "uniconfd uniconfd-dbg "
+PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
+PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg "
+
+FILES_libuniconf     = "${libdir}/libuniconf.so.*"
+FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*"
+
+FILES_uniconfd     = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf"
+FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd"
+
+FILES_libwvstreams-base     = "${libdir}/libwvutils.so.*"
+FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*"
+
+FILES_libwvstreams-extras     = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*"
+FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*"
+
+
+do_stage() {
+    autotools_stage_all
+}
============================================================
--- classes/package_ipk.bbclass	74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1
+++ classes/package_ipk.bbclass	242c256c8e04a09f38c2935be0882b1dee651600
@@ -203,20 +203,21 @@ python do_package_ipk () {
 		fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
 		fields.append(["OE: %s\n", ['PN']])
 		fields.append(["Homepage: %s\n", ['HOMEPAGE']])
+		fields.append(["Tags: %s\n", ['PKG_TAGS']])
 
 		def pullData(l, d):
 			l2 = []
 			for i in l:
-				l2.append(bb.data.getVar(i, d, 1))
+				v = bb.data.getVar(i, d, 1)
+				if v is None:
+					raise KeyError(f)
+				l2.append(v)
 			return l2
 
 		ctrlfile.write("Package: %s\n" % pkgname)
 		# check for required fields
 		try:
 			for (c, fs) in fields:
-				for f in fs:
-					if bb.data.getVar(f, localdata) is None:
-						raise KeyError(f)
 				ctrlfile.write(c % tuple(pullData(fs, localdata)))
 		except KeyError:
 			(type, value, traceback) = sys.exc_info()
============================================================
--- classes/testlab.bbclass	c3d610ac3c54bb4174b19e9905964f8a4064cc07
+++ classes/testlab.bbclass	b0992caaec4741e92e216e91c8385574a54b0863
@@ -31,7 +31,7 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] ; th
 	echo > ${TESTLAB_DIR}/installed-packages.txt
 	echo -e "digraph depends {\n    node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
 
-	for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do 
+	for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | tee ${TESTLAB_DIR}/list-installed.txt | awk '{print $1}') ; do 
     		opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}'  >> ${TESTLAB_DIR}/installed-packages.txt
 
     		for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o  ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do 
============================================================
--- conf/bitbake.conf	86fdaa0747310ea3f83914cbb3f62e00cd500cec
+++ conf/bitbake.conf	6ff864c9de6f26e92c7ab40bc46eddef334a4df4
@@ -143,6 +143,7 @@ HOMEPAGE = "unknown"
 LICENSE = "unknown"
 MAINTAINER = "OpenEmbedded Team <openembedded-devel at lists.openembedded.org>"
 HOMEPAGE = "unknown"
+PKG_TAGS = ""
 
 # Package dependencies and provides.
 
============================================================
--- conf/checksums.ini	3651c85a1810defc2616c43f6aaa207a5ee5a4bd
+++ conf/checksums.ini	916b354f9de054441f0b2c130cb5a5501f017e12
@@ -8918,6 +8918,14 @@ sha256=e7e1a287141dd1be7f4b4fedd54ec29fa
 md5=991615f73338a571b6a1be7d74906934
 sha256=e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062
 
+[http://www.openssl.org/source/openssl-0.9.7m.tar.gz]
+md5=74a4d1b87e1e6e1ec95dbe58cb4c5b9a
+sha256=c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
+
+[http://www.openssl.org/source/openssl-0.9.8g.tar.gz]
+md5=acf70a16359bf3658bdfb74bda1c4419
+sha256=0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0
+
 [http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz]
 md5=5c54040bba6fea2bfb47df01056e953f
 sha256=d35213dc854f1e1a08512154c7a92fb94d9f0506cc5107f8b2f248412679fb53
@@ -11942,6 +11950,14 @@ sha256=2f9755e2e3f96d26380857ef95be7765e
 md5=7bb22f2bcdeed54b3fb5407d6d8bc9bb
 sha256=2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
 
+[http://wvstreams.googlecode.com/files/wvstreams-4.4.1.tar.gz]
+md5=907b0cba8931553d848620ea16f006b9
+sha256=cff48f9a87e94672c7a819661a3a5c893ee44e763c6e5775d00aff3de43619b1
+
+[http://www.alumnit.ca/download/wvdial-1.60.tar.gz]
+md5=27fbbde89f8fd9f6e735a8efa5217fc9
+sha256=0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b
+
 [http://switch.dl.sourceforge.net/sourceforge/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
============================================================
--- conf/distro/include/moko-autorev.inc	06afeb644d8f709c7b8221dfa54dcc66b8ff3a49
+++ conf/distro/include/moko-autorev.inc	687b91ec3b6b89ed01c40988b89f3c31694a9247
@@ -10,13 +10,17 @@ SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-assassin ?= "${AUTOREV}"
 SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
 SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-illume ?= "${AUTOREV}"
+SRCREV_pn-illume-theme ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
+SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
 SRCREV_pn-opkg ?= "${AUTOREV}"
 SRCREV_pn-opkg-native ?= "${AUTOREV}"
 
 SRCREV_pn-multitap-pad ?= "${AUTOREV}"
 
+SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
@@ -62,3 +66,5 @@ SRCREV_pn-usbpath-native ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
 SRCREV_pn-usbpath-native ?= "${AUTOREV}"
+
+EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	8d7890848212c85a6b2089dcb71372d83b946777
+++ conf/distro/include/preferred-om-2008-versions.inc	c70b5347213d7bf32f261eaa409d0f26bf5bfbc1
@@ -613,7 +613,7 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_gst-plugins-good ?= "0.10.7"
 PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gstreamer ?= "0.10.14"
+PREFERRED_VERSION_gstreamer ?= "0.10.17"
 PREFERRED_VERSION_gthumb ?= "2.6.9"
 PREFERRED_VERSION_gtk+ ?= "2.10.14"
 PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3"
@@ -648,7 +648,7 @@ PREFERRED_VERSION_hal ?= "0.5.9"
 PREFERRED_VERSION_gxine ?= "0.4.1enhanced"
 PREFERRED_VERSION_gzip ?= "1.3.5"
 PREFERRED_VERSION_hal ?= "0.5.9"
-PREFERRED_VERSION_hal-info ?= "20070918+git"
+PREFERRED_VERSION_hal-info ?= "20070618"
 PREFERRED_VERSION_haserl ?= "0.8.0"
 PREFERRED_VERSION_havp ?= "0.86"
 PREFERRED_VERSION_hdparm ?= "6.9"
@@ -917,8 +917,8 @@ PREFERRED_VERSION_libid3 ?= "1.1"
 PREFERRED_VERSION_libice ?= "1.0.4"
 PREFERRED_VERSION_libiconv ?= "1.11"
 PREFERRED_VERSION_libid3 ?= "1.1"
-PREFERRED_VERSION_libidl ?= "0.8.6"
-PREFERRED_VERSION_libidl-native ?= "0.8.6"
+PREFERRED_VERSION_libidl ?= "0.8.10"
+PREFERRED_VERSION_libidl-native ?= "0.8.10"
 PREFERRED_VERSION_libidn ?= "0.5.19"
 PREFERRED_VERSION_libim ?= "0.2"
 PREFERRED_VERSION_libintl-perl ?= "1.16"
@@ -1273,8 +1273,8 @@ PREFERRED_VERSION_mpeg2dec ?= "0.4.0b"
 PREFERRED_VERSION_mp3blaster ?= "3.2.3"
 PREFERRED_VERSION_mpc ?= "0.12.1"
 PREFERRED_VERSION_mpeg2dec ?= "0.4.0b"
-PREFERRED_VERSION_mpfr ?= "2.3.0"
-PREFERRED_VERSION_mpfr-native ?= "2.3.0"
+PREFERRED_VERSION_mpfr ?= "2.3.1"
+PREFERRED_VERSION_mpfr-native ?= "2.3.1"
 PREFERRED_VERSION_mpg123 ?= "0.66"
 PREFERRED_VERSION_mpg321 ?= "0.2.10"
 PREFERRED_VERSION_mplayer-common ?= "0.0.1"
@@ -1371,8 +1371,8 @@ PREFERRED_VERSION_orage ?= "4.4.1"
 PREFERRED_VERSION_oplinux-packages ?= "1.0"
 PREFERRED_VERSION_oprofile ?= "0.9.3"
 PREFERRED_VERSION_orage ?= "4.4.1"
-PREFERRED_VERSION_orbit2 ?= "2.14.0"
-PREFERRED_VERSION_orbit2-native ?= "2.14.0"
+PREFERRED_VERSION_orbit2 ?= "2.14.12"
+PREFERRED_VERSION_orbit2-native ?= "2.14.12"
 PREFERRED_VERSION_orinoco-conf ?= "1.0"
 PREFERRED_VERSION_orinoco-modules ?= "0.15rc2"
 PREFERRED_VERSION_orpheus ?= "1.5"
============================================================
--- conf/distro/include/sane-srcdates.inc	8b9fd0206baa49e75bdf70f5761e1fe4649d422e
+++ conf/distro/include/sane-srcdates.inc	8e1811ed73330ab1f62540173c87d9d46ede74c3
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080402"
+EFL_SRCDATE ?= "20080411"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	dfe387b5708ce4e3724bc61b208d258cfd6df174
+++ conf/distro/include/sane-srcrevs.inc	f33b71cab36aa10b579792376f0845d420fbaf48
@@ -12,15 +12,15 @@ SRCREV_pn-aircrack-ng ?= "802"
 # you know what that means? like... a, b, c, d, e, f, g...
 
 SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-assassin ?= "25"
+SRCREV_pn-assassin ?= "41"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
-SRCREV_pn-diversity-daemon ?= "276"
-SRCREV_pn-diversity-nav ?= "276"
+SRCREV_pn-diversity-daemon ?= "277"
+SRCREV_pn-diversity-nav ?= "284"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "5522"
 SRCREV_pn-eglibc-initial ?= "5522"
@@ -38,19 +38,19 @@ SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "21"
-SRCREV_pn-illume-theme ?= "21"
+SRCREV_pn-illume ?= "39"
+SRCREV_pn-illume-theme ?= "39"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "4216"
+SRCREV_pn-libgsmd ?= "4245"
 SRCREV_pn-libgsmd-devel ?= "3293"
 SRCREV_pn-libjana ?= "704"
-SRCREV_pn-libmokogsmd2 ?= "3663"
+SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "3349"
-SRCREV_pn-libmokoui2 ?= "3976"
+SRCREV_pn-libmokoui2 ?= "4342"
 SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
@@ -58,7 +58,7 @@ SRCREV_pn-linux-ixp4xx ?= "1056"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1056"
-SRCREV_pn-linux-openmoko ?= "4194"
+SRCREV_pn-linux-openmoko ?= "64dccdd24aad13353645c7c032b6fce61a15e2ab"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -70,8 +70,8 @@ SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "24587"
-SRCREV_pn-multitap-pad ?= "337"
-SRCREV_pn-neod ?= "4219"
+SRCREV_pn-multitap-pad ?= "373"
+SRCREV_pn-neod ?= "4336"
 SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
@@ -80,6 +80,8 @@ SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
+SRCREV_pn-openmoko-agpsui ?= "7"
+SRCREV_pn-openmoko-alsa-scenarios ?= "4317"
 SRCREV_pn-openmoko-appearance ?= "3262"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
@@ -89,39 +91,39 @@ SRCREV_pn-openmoko-contacts ?= "2298"
 SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "3259"
 SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "412"
+SRCREV_pn-openmoko-contacts2 ?= "418"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "673"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "4224"
+SRCREV_pn-openmoko-dialer2 ?= "4343"
 SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "4225"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4225"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4232"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
 SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "4182"
+SRCREV_pn-openmoko-messages2 ?= "4340"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
-SRCREV_pn-openmoko-panel-bt ?= "4197"
+SRCREV_pn-openmoko-panel-bt ?= "4331"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
-SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "4191"
+SRCREV_pn-openmoko-panel-gps ?= "4330"
+SRCREV_pn-openmoko-panel-gsm ?= "4335"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-memory ?= "3903"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
-SRCREV_pn-openmoko-panel-wifi ?= "4290"
+SRCREV_pn-openmoko-panel-wifi ?= "4344"
 SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
-SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
 SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
@@ -130,7 +132,7 @@ SRCREV_pn-openmoko-theme-standard-qvga ?
 SRCREV_pn-openmoko-terminal2 ?= "4039"
 SRCREV_pn-openmoko-theme-standard ?= "4167"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "4167"
-SRCREV_pn-openmoko-theme-standard2 ?= "3425"
+SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "4168"
@@ -139,8 +141,8 @@ SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4235"
-SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg ?= "4345"
+SRCREV_pn-opkg-native ?= "4345"
 SRCREV_pn-opkg-sdk ?= "4235"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
@@ -154,11 +156,11 @@ SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
-SRCREV_pn-settings-daemon ?= "1755"
+SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4230"
+SRCREV_pn-u-boot-openmoko ?= "4297"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-webkit-gtk ?= "30762"
@@ -166,4 +168,4 @@ SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1971"
+SRCREV_pn-xserver-kdrive-glamo ?= "fac1616ce854e52cdc9315b652d79a42f97dc3eb"
-
============================================================
--- conf/distro/openmoko.conf	a8060f6771d31c1ba369637729e3123ddecb2dc3
+++ conf/distro/openmoko.conf	57d6f40fc1f078d76f0824c8db3fa6facd01e0cb
@@ -22,16 +22,7 @@ PREMIRRORS = "(ftp|https?)$://.*/.* http
 
 PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
-FEED_URIS = "\
-  snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
-  snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \
-  snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \
-  snapshot-om-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/om-gta01 \
-  \
-  updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
-  updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
-  updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \
-  updates-om-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/om-gta01 "
+ANGSTROM_FEED_CONFIGS = "openmoko-feed-configs"
 
 # 2.18 seems to break badly on 64-bit systems
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
============================================================
--- conf/machine/om-gta02.conf	bb34d745d24d709bd9a6fe113c95e816ba6c788a
+++ conf/machine/om-gta02.conf	35cac2923a74e1958fce8ad3096cd77404df3753
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
============================================================
--- contrib/oe-stylize.py	9e40dcd24e4d8f38580faf97a7ca791069087802
+++ contrib/oe-stylize.py	ccf166ea67ebcb8024d3d378d1ff66b5386d1023
@@ -32,6 +32,7 @@ OE_vars = [
     'AUTHOR',
     'HOMEPAGE',
     'SECTION',
+    'PKG_TAGS',
     'PRIORITY',
     'LICENSE',
     'DEPENDS',
============================================================
--- packages/alsa/alsa-state.bb	37dfff2c0ef91306c2cb30e53f8d86c3088e7fc3
+++ packages/alsa/alsa-state.bb	2590f4545ccf7d78835320f929293f7d773dc9f9
@@ -7,8 +7,9 @@ RRECOMMENDS_alsa-state = "alsa-states"
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
+RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
 PV = "0.1.0"
-PR = "r14"
+PR = "r14.1"
 
 SRC_URI = " \
   file://asoundrc \
============================================================
--- packages/efl1/etk_cvs.bb	1c4ad62955a3041ca60b191f4f46f758a4a45cb4
+++ packages/efl1/etk_cvs.bb	409c4526643bb84665f38a0a31a6e5596c432ae5
@@ -2,7 +2,7 @@ PV = "0.1.0.042+cvs${SRCDATE}"
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
 PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r0.01"
 
 inherit efl
 
@@ -17,20 +17,20 @@ RRECOMMENDS_${PN} = "${PN}-engines"
 
 RRECOMMENDS_${PN} = "${PN}-engines"
 
-PACKAGES += "etk-engines-software-x11"
-FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
+#PACKAGES += "etk-engines-software-x11"
+#FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
 
 #PACKAGES =+ "etk-engines-gl-x11"
 #FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so"
 
-PACKAGES =+ "etk-engines-evas"
-FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
+#PACKAGES =+ "etk-engines-evas"
+#FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
 
-PACKAGES =+ "etk-engines-fb"
-FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
+#PACKAGES =+ "etk-engines-fb"
+#FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
 
-PACKAGES =+ "etk-engines-x11"
-FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+#PACKAGES =+ "etk-engines-x11"
+#FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
 
+#PACKAGES =+ "etk-engines-software-x11-16"
+#FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
-PACKAGES =+ "etk-engines-software-x11-16"
-FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
============================================================
--- packages/git/git.inc	3453fcb16ca1b5323af9d9ede90cd878559c2ddb
+++ packages/git/git.inc	78d5cbf5201f942c64ae36ae924b01ac6152208a
@@ -8,14 +8,14 @@ S = "${WORKDIR}/git-${PV}"
 	   "
 S = "${WORKDIR}/git-${PV}"
 
-EXTRA_OEMAKE = "NO_TCLTL=1"
+EXTRA_OEMAKE = "NO_TCLTK=1"
 
 inherit autotools
 
 do_install () {
-	oe_runmake install prefix=${D} bindir=${D}${bindir} \
-		template_dir=${D}${datadir}/git-core/templates \
-		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
+		template_dir=${datadir}/git-core/templates \
+		GIT_PYTHON_DIR=${datadir}/git-core/python
 }
 
 FILES_${PN} += "${datadir}/git-core"
============================================================
--- packages/gsm/files/gsmd	a69e07c69d9829380159b5196cda1f68221a0f1a
+++ packages/gsm/files/gsmd	fdee1d8e482c2582c1a80cfb216d202d3026d9fe
@@ -13,7 +13,6 @@ case "$1" in
 
 case "$1" in
     start)
-        [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 )
         [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
         [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
         [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
============================================================
--- packages/gsm/gsmd.inc	458030ab86c43118e7b10e86a51f62df510fd307
+++ packages/gsm/gsmd.inc	8a4214514d16c0ff2bed8f49cee4bdfaee7b9f47
@@ -5,7 +5,7 @@ PV = "0.1+svnr${SRCREV}"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r42"
+PR = "r44"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
============================================================
--- packages/gtk+/gtk+-fastscaling_2.10.14.bb	4327a093907014dbbe461ad66db3a0495a986aa7
+++ packages/gtk+/gtk+-fastscaling_2.10.14.bb	54ad523638041226cf56881f6f1ed3e5cbb4b4c6
@@ -6,7 +6,7 @@ RPROVIDES_${PN} = "gtk+"
 
 PROVIDES = "gtk+"
 RPROVIDES_${PN} = "gtk+"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
 
============================================================
--- packages/gtk+/gtk+_2.10.14.bb	3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d
+++ packages/gtk+/gtk+_2.10.14.bb	39e110e549a3660d333553d85d228e50544ddc8d
@@ -1,6 +1,6 @@ require gtk-2.10.inc
 require gtk-2.10.inc
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
@@ -12,7 +12,6 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
            file://scroll-timings.patch;patch=1 \
            file://small-gtkfilesel.patch;patch=1 \
            file://small-gtkfilechooser.patch;patch=1 \
-           file://migration.patch;patch=1;pnum=0 \
            file://run-iconcache.patch;patch=1 \
            file://hardcoded_libtool.patch;patch=1 \
            file://no-demos.patch;patch=1 \
============================================================
--- packages/ipkg-utils/ipkg-utils/fields_tweaks.patch	bcce07d7c1acb2892a59f8be552f77994e17e98c
+++ packages/ipkg-utils/ipkg-utils/fields_tweaks.patch	e66a4afa1f9a57edd969a060f0b99fc5bfb33e50
@@ -6,9 +6,9 @@ Index: ipkg-utils/Makefile
 
 Index: ipkg-utils/Makefile
 ===================================================================
---- ipkg-utils.orig/Makefile	2007-06-13 22:45:47.000000000 +0100
-+++ ipkg-utils/Makefile	2007-06-13 22:46:50.000000000 +0100
-@@ -15,6 +15,8 @@ install: ${UTILS}
+--- ipkg-utils.orig/Makefile	2004-12-28 23:32:20.000000000 +0800
++++ ipkg-utils/Makefile	2008-04-08 18:42:36.000000000 +0800
+@@ -15,6 +15,8 @@
  	python setup.py install
  	chmod agu+rx ipkg-make-index
  	cp -f ipkg-make-index $(PREFIX)/bin
@@ -20,7 +20,7 @@ Index: ipkg-utils/ipkg-list-fields
 Index: ipkg-utils/ipkg-list-fields
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/ipkg-list-fields	2007-06-13 22:43:32.000000000 +0100
++++ ipkg-utils/ipkg-list-fields	2008-04-08 18:42:36.000000000 +0800
 @@ -0,0 +1,13 @@
 +#!/usr/bin/python
 +
@@ -37,19 +37,20 @@ Index: ipkg-utils/ipkg.py
 +
 Index: ipkg-utils/ipkg.py
 ===================================================================
---- ipkg-utils.orig/ipkg.py	2007-06-13 22:44:50.000000000 +0100
-+++ ipkg-utils/ipkg.py	2007-06-13 22:39:44.000000000 +0100
-@@ -139,6 +139,9 @@ class Package:
+--- ipkg-utils.orig/ipkg.py	2008-04-08 18:42:35.000000000 +0800
++++ ipkg-utils/ipkg.py	2008-04-08 18:45:28.000000000 +0800
+@@ -139,6 +139,10 @@
          self.installed_size = None
          self.filename = None
          self.isdeb = 0
 +        self.homepage = None
 +        self.oe = None
 +        self.priority = None
++        self.tags = None
          self.fn = fn
  
  	if fn:
-@@ -211,7 +214,7 @@ class Package:
+@@ -212,7 +216,7 @@
                  elif self.__dict__.has_key(name):
                      self.__dict__[name] = value
  		else:
@@ -58,13 +59,14 @@ Index: ipkg-utils/ipkg.py
                      pass
  
                  if line and line[0] == '\n':
-@@ -402,6 +405,9 @@ class Package:
+@@ -413,6 +417,10 @@
          if self.filename: out = out + "Filename: %s\n" % (self.filename)
          if self.source: out = out + "Source: %s\n" % (self.source)
          if self.description: out = out + "Description: %s\n" % (self.description)
 +        if self.oe: out = out + "OE: %s\n" % (self.oe)
 +        if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
 +        if self.priority: out = out + "Priority: %s\n" % (self.priority)
++        if self.tags: out = out + "Tags: %s\n" % (self.tags)
  	out = out + "\n"
  
  	return out
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	054d2acb3ff8284167043e5554633713ebdba2cf
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	2fffa65764b445bac4b2ec9f7b7b01d1b11a0651
@@ -1,7 +1,7 @@ RDEPENDS = ""
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r16"
+PR = "r16.01"
 
 inherit native
 
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb	53716efd0be08661e891166feef9298502f1ff73
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb	6ca2e19f7611e0124df8a7be84f3cab7f69e1963
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r18"
+PR = "r18.01"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
============================================================
--- packages/openmoko-projects/assassin_svn.bb	ec54896d60155ed78661fbb53074c68150c9077c
+++ packages/openmoko-projects/assassin_svn.bb	1e8ad042e56fd3840bbbaf252f5b243db31955ec
@@ -2,8 +2,8 @@ DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
-PV = "0.2+svn${SRCREV}"
-PR = "r4"
+PV = "0.2+svnr${SRCREV}"
+PR = "r5"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
 
============================================================
--- packages/openmoko-projects/diversity-nav_svn.bb	e70dd159aa10e5d331469df680d7a92b6a17ed69
+++ packages/openmoko-projects/diversity-nav_svn.bb	e644c87944a195094f119122d12117683f987d83
@@ -1,11 +1,12 @@ SECTION = "openmoko/applications"
 DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
 HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "openmoko/applications"
+PKG_TAGS_${PN} = "group::maps"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus ewl"
-RDEPENDS_${PN} = "diversity-daemon"
+RDEPENDS_${PN} = "diversity-daemon ewl-themes"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r3"
+PR = "r3.02"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
 
============================================================
--- packages/openmoko-projects/enlazar_svn.bb	6d67fcb5d517922c2a93896a9657e5856dd147ff
+++ packages/openmoko-projects/enlazar_svn.bb	3eebf6592022236be82998d5d51941aa8ccd89a2
@@ -5,7 +5,7 @@ PV = "0.1+svn${SRCREV}"
 RDEPENDS = "networkmanager"
 SRCREV = "${AUTOREV}"
 PV = "0.1+svn${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
 
============================================================
--- packages/openmoko-projects/illume_svn.bb	f0d1ea3f7f065e02920803bee606469fccb5db16
+++ packages/openmoko-projects/illume_svn.bb	41d78bc73011aab120638b3ff084513fbbeeeb4e
@@ -1,11 +1,10 @@ LICENSE = "MIT/BSD"
 DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
-
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
-
+RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
            file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
@@ -23,6 +22,4 @@ FILES_${PN} = "${libdir}/enlightenment/m
                ${libdir}/enlightenment/modules/*/*.desktop \
                ${libdir}/enlightenment/modules/*/*/* \
                ${datadir}/${PN} "
-               
-
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
============================================================
--- packages/settings-daemon/files/70settings-daemon	70c8c167bec306d4135dd5cbf159e6cae849a18a
+++ packages/settings-daemon/files/70settings-daemon	fd2db3c1fc805b65926439f53fd8dba081004766
@@ -1,3 +1,3 @@
 #!/bin/sh
 
+/usr/bin/settings-daemon
-/usr/bin/settings-daemon &
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb	f266cffda5f763fbd31050c83eb2c9e97bfcaaac
+++ packages/settings-daemon/settings-daemon_svn.bb	232ef26e8f78ffc82665195719a830883eaf51d5
@@ -5,7 +5,7 @@ PV = "0.0+svnr${SRCREV}"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://70settings-daemon"
============================================================
--- packages/tasks/task-base.bb	50285a37437adccf62033cd89c0d329f69d4e191
+++ packages/tasks/task-base.bb	1c6a6dd44e00b5b989c55064fd1fee2792a273da
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r67"
+PR = "r67.01"
 
 inherit task
 
============================================================
--- packages/tslib/tslib_1.0.bb	5d5d2fe05b80425f25473bfe084177b902b207f9
+++ packages/tslib/tslib_1.0.bb	d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://tslib-input_raw-grab_events.patch;patch=1 \
============================================================
--- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	2779a8ad2f3000e5d53079b90e3c64b3352acb0e
+++ packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	ce8e1c9449b9bd4a0d2136113fa3b648937bd798
@@ -9,11 +9,10 @@ PE = "1"
 RDEPENDS_${PN} = "xserver-kdrive"
 PROVIDES = "virtual/xserver"
 PE = "1"
-PR = "r1"
+PR = "r4"
+PV = "1.3.0.0+git${SRCREV}"
 
-XGLAMO_GIT_REV = "0d2605edeb50a4b118ac00ae1f00abd085477323"
-
-SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
+SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \
         file://kmode.patch;patch=1 \
         file://disable-apm.patch;patch=1 \
         file://no-serial-probing.patch;patch=1 \
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	2915a14313602fff89685477aaabe69d4e32a457
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	b6120434f910d084652aecf6c1d3d4c501be78cc
@@ -16,6 +16,7 @@ if [ -f /usr/bin/Xglamo ]; then
   XSERVER=/usr/bin/Xomap
 fi
 if [ -f /usr/bin/Xglamo ]; then
+  export USE_EXA=no
   XSERVER=/usr/bin/Xglamo
 fi
 
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	60b23f2d6507ed740f14d2d710ab0b1fe8f1dca0
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	e41ab9242ae6d5e9acea897aa94ca13e00b76f1b
@@ -2,7 +2,7 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r27"
+PR = "r27.01"
 
 SRC_URI = "\
   file://Xdefaults \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080417/2514e760/attachment.htm 
-------------- next part --------------
#
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  from [a93597ca618095b4d174aa972afb07241bb3df6a]
#    to [418b4c5767e8e38f347241e85caa35bebf6c428c]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	a93597ca618095b4d174aa972afb07241bb3df6a
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	418b4c5767e8e38f347241e85caa35bebf6c428c
@@ -11,9 +11,9 @@ DEPENDS = "glib-2.0 dbus freetype alsa-l
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst gst-plugins-base"
-RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic \
+RDEPENDS_${PN} = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic \
             tzdata-australia tzdata-europe tzdata-pacific gst-meta-audio"
-PROVIDES = "qtopia-phone"
+PROVIDES_${PN} = "qtopia-phone"
 PR = "r10"
 SRCREV = "${AUTOREV}"
 SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
@@ -97,6 +97,13 @@ do_install() {
    done 
 
    # Install good icons for the desktop files
+   install -d ${D}${datadir}/pixmaps
+   ICONS=`cat ${S}/apps-fdo/*/*.desktop | grep Icon | cut -f 2 -d "="`
+   for icon in $ICONS; do
+      if [ -f "${S}/pics/$icon.png" ] ; then
+         install -D ${S}/pics/$icon.png ${D}${datadir}/pixmaps/$icon.png
+      fi
+   done
 
    # Make sure qpe gets launched by X
    install -d ${D}/${sysconfdir}/X11/Xsession.d
@@ -110,8 +117,580 @@ do_install() {
    install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
 }
 
+python populate_packages_prepend() {
+	codec_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/codecs/', d)
+	codec_name = bb.data.expand('${PN}-codec-%s', d)
+	do_split_packages(d, codec_dir, '^lib(.*).so$', codec_name, '${PN} codec for %s', extra_depends='' )
+
+	audiohw_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/audiohardware/', d)
+	audiohw_name = bb.data.expand('${PN}-audiohw-%s', d)
+	do_split_packages(d, audiohw_dir, '^lib(.*).so$', audiohw_name, '${PN} audiohw for %s', extra_depends='' )
+
+	composer_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/composers/', d)
+	composer_name = bb.data.expand('${PN}-composer-%s', d)
+	do_split_packages(d, composer_dir, '^lib(.*).so$', composer_name, '${PN} composer for %s', extra_depends='' )
+
+	content_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/content/', d)
+	content_name = bb.data.expand('${PN}-content-%s', d)
+	do_split_packages(d, content_dir, '^lib(.*).so$', content_name, '${PN} content %s', extra_depends='' )
+
+	media_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/mediaengines/', d)
+	media_name = bb.data.expand('${PN}-media-%s', d)
+	do_split_packages(d, media_dir, '^lib(.*).so$', media_name, '${PN} mediaengine %s', extra_depends='' )
+
+	multi_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/multiplexers/', d)
+	multi_name = bb.data.expand('${PN}-multiplexer-%s', d)
+	do_split_packages(d, multi_dir, '^lib(.*).so$', multi_name, '${PN} multiplexer for %s', extra_depends='' )
+
+	viewer_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/viewers/', d)
+	viewer_name = bb.data.expand('${PN}-viewer-%s', d)
+	do_split_packages(d, viewer_dir, '^lib(.*).so$', viewer_name, '${PN} viewer for %s', extra_depends='' )
+	
+	network_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/network/', d)
+	network_name = bb.data.expand('${PN}-network-%s', d)
+	do_split_packages(d, network_dir, '^lib(.*).so$', network_name, '${PN} network %s', extra_depends='' )	
+
+	print_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/qtopiaprinting/', d)
+	print_name = bb.data.expand('${PN}-qtopiaprinting-%s', d)
+	do_split_packages(d, print_dir, '^lib(.*).so$', print_name, '${PN} printingg %s', extra_depends='' )
+
+	vendor_dir = bb.data.expand('${OE_QT_PREFIX}/plugins/phonevendors/', d)
+	vendor_name = bb.data.expand('${PN}-phonevendor-%s', d)
+	do_split_packages(d, vendor_dir, '^lib(.*).so$', vendor_name, '${PN} phonevendor %s', extra_depends='' )
+}
+
+PACKAGES =+ "\
+${PN}-addressbook \
+${PN}-bluetooth \
+${PN}-calculator \
+${PN}-clock \
+${PN}-datebook \
+${PN}-helpbrowser \
+${PN}-mediaplayer \
+${PN}-mediarecorder \
+${PN}-packagemanager \
+${PN}-photoedit \
+${PN}-qtmail \
+${PN}-ringprofile \
+${PN}-serverwidgets \
+${PN}-startupflags \
+${PN}-sysinfo \
+${PN}-systemtime \
+${PN}-textedit \
+${PN}-todolist \
+\
+${PN}-appearance \
+${PN}-beaming \
+${PN}-callforwarding \
+${PN}-fifteen \
+${PN}-homescreen \
+${PN}-language \
+${PN}-light-and-power \
+${PN}-logging \
+${PN}-minesweep \
+${PN}-network \
+${PN}-phonenetworks \
+${PN}-phonesettings \
+${PN}-qdsync \
+${PN}-security \
+${PN}-sip \
+${PN}-snake \
+${PN}-speeddial \
+${PN}-words \
+${PN}-worldtime \
+\
+${PN}-libamr \
+${PN}-libdissipate2 \
+${PN}-libgsm \
+${PN}-libinputmatch \
+${PN}-libmd5 \
+${PN}-libopenobex \
+${PN}-libqmstroke \
+${PN}-libqtcore \
+${PN}-libqtdbus \
+${PN}-libqtgui \
+${PN}-libqtnetwork \
+${PN}-libqtopengl \
+${PN}-libqtopiaaudio \
+${PN}-libqtopiabase \
+${PN}-libqtopiacomm \
+${PN}-libqtopiamail \
+${PN}-libqtopiamedia \
+${PN}-libqtopiaphonemodem \
+${PN}-libqtopiaphone \
+${PN}-libqtopiapim \
+${PN}-libqtopiaprinting \
+${PN}-libqtopiasmil \
+${PN}-libqtopia \
+${PN}-libqtopia-sqlite \
+${PN}-libqtscript \
+${PN}-libqtsql \
+${PN}-libqtsvg \
+${PN}-libqtxml \
+${PN}-libtimidity \
+${PN}-libvorbisidec \
+\
+${PN}-mediaserver \
+\
+${PN}-manual \
+${PN}-qpf-fonts \
+"
+
+DEBIAN_NOAUTONAME_${PN}-libamr = "1"
+DEBIAN_NOAUTONAME_${PN}-libdissipate2 = "1"
+DEBIAN_NOAUTONAME_${PN}-libgsm = "1"
+DEBIAN_NOAUTONAME_${PN}-libinputmatch = "1"
+DEBIAN_NOAUTONAME_${PN}-libmd5 = "1"
+DEBIAN_NOAUTONAME_${PN}-libopenobex  = "1"
+DEBIAN_NOAUTONAME_${PN}-libqmstroke = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtcore = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtdbus = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtgui = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtnetwork = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopengl = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaaudio = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiabase = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiacomm = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiamail = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiamedia = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaphonemodem = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaphone = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiapim = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiaprinting = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopiasmil = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopia = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtopia-sqlite = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtscript = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtsql = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtsvg = "1"
+DEBIAN_NOAUTONAME_${PN}-libqtxml = "1"
+DEBIAN_NOAUTONAME_${PN}-libtimidity = "1"
+DEBIAN_NOAUTONAME_${PN}-libvorbisidec = "1"
+
+# quicklaunched apps
+
+FILES_${PN}-addressbook = "\
+${OE_QT_PREFIX}/plugins/application/libaddressbook.so \
+${OE_QT_PREFIX}/bin/addressbook \
+${OE_QT_PREFIX}/services/Contacts/addressbook \
+${OE_QT_PREFIX}/services/ContactsPhone/addressbook \
+${OE_QT_PREFIX}/pics/addressbook \
+${datadir}/applications/qtopia-addressbook.desktop \
+${datadir}/pixmaps/addressbook/AddressBook.png"
+
+FILES_${PN}-bluetooth ="\
+${OE_QT_PREFIX}/bin/bluetooth \
+${OE_QT_PREFIX}/bin/btsettings \
+${OE_QT_PREFIX}/bin/bt-poweroff.sh \
+${OE_QT_PREFIX}/bin/bt-poweron.sh \
+${OE_QT_PREFIX}/plugins/application/libbluetooth.so \
+${OE_QT_PREFIX}/plugins/application/libbtsettings.so \
+${OE_QT_PREFIX}/plugins/network/libbluetooth.so \
+${OE_QT_PREFIX}/pics/bluetooth \
+${OE_QT_PREFIX}/pics/btsettings \
+${OE_QT_PREFIX}/etc/network/bluetoothDUN.conf \
+${OE_QT_PREFIX}/etc/bluetooth \
+${datadir}/applications/qtopia-bluetooth.desktop \
+${datadir}/applications/qtopia-btsettings.desktop \
+${datadir}/pixmaps/btsettings/BTSettings.png"
+
+FILES_${PN}-calculator = "\
+${OE_QT_PREFIX}/plugins/application/libcalculator.so \
+${OE_QT_PREFIX}/bin/calculator \
+${OE_QT_PREFIX}/pics/calculator \
+${datadir}/applications/qtopia-calculator.desktop \
+${datadir}/pixmaps/calculator/Calculator.png"
+
+FILES_${PN}-clock = "\
+${OE_QT_PREFIX}/plugins/application/libclock.so \
+${OE_QT_PREFIX}/bin/clock \
+${OE_QT_PREFIX}/services/Alarm/clock \
+${OE_QT_PREFIX}/services/Clock/clock \
+${OE_QT_PREFIX}/services/TimeMonitor/clock \
+${OE_QT_PREFIX}/pics/clock \
+${datadir}/applications/qtopia-clock.desktop \
+${datadir}/pixmaps/clock/Clock.png"
+
+FILES_${PN}-datebook = "\
+${OE_QT_PREFIX}/plugins/application/libdatebook.so \
+${OE_QT_PREFIX}/bin/datebook \
+${OE_QT_PREFIX}/services/Calendar/datebook \
+${OE_QT_PREFIX}/services/Receive/text/x-vcalendar-Events/datebook \
+${OE_QT_PREFIX}/services/TimeMonitor/datebook \
+${OE_QT_PREFIX}/pics/datebook \
+${datadir}/applications/qtopia-datebook.desktop \
+${datadir}/pixmaps/datebook/DateBook.png"
+
+FILES_${PN}-helpbrowser = "\
+${OE_QT_PREFIX}/plugins/application/libhelpbrowser.so \
+${OE_QT_PREFIX}/bin/helpbrowser \
+${OE_QT_PREFIX}/services/Help/helpbrowser \
+${OE_QT_PREFIX}/pics/helpbrowser \
+${datadir}/applications/qtopia-helpbrowser.desktop \
+${datadir}/pixmaps/helpbrowser/HelpBrowser.png"
+
+FILES_${PN}-mediaplayer = "\
+${OE_QT_PREFIX}/plugins/application/libmediaplayer.so \
+${OE_QT_PREFIX}/bin/mediaplayer \
+${OE_QT_PREFIX}/pics/mediaplayer \
+${datadir}/applications/qtopia-mediaplayer.desktop \
+${datadir}/pixmaps/mediaplayer/VideoPlayer.png"
+
+FILES_${PN}-mediarecorder = "\
+${OE_QT_PREFIX}/plugins/application/libmediarecorder.so \
+${OE_QT_PREFIX}/bin/mediarecorder \
+${OE_QT_PREFIX}/services/VoiceRecording/mediarecorder \
+${OE_QT_PREFIX}/pics/mediarecorder \
+${datadir}/applications/qtopia-mediarecorder.desktop \
+${datadir}/pixmaps/mediarecorder/SoundRecorder.png"
+
+FILES_${PN}-packagemanager = "\
+${OE_QT_PREFIX}/plugins/application/libpackagemanager.so \
+${OE_QT_PREFIX}/bin/packagemanager \
+${OE_QT_PREFIX}/services/PackageManager/packagemanager \
+${OE_QT_PREFIX}/pics/packagemanager \
+${datadir}/applications/qtopia-packagemanager.desktop \
+${datadir}/pixmaps/packagemanager/PackageManager.png"
+
+FILES_${PN}-photoedit = "\
+${OE_QT_PREFIX}/plugins/application/libphotoedit.so \
+${OE_QT_PREFIX}/bin/photoedit \
+${OE_QT_PREFIX}/services/PhotoEdit/photoedit \
+${OE_QT_PREFIX}/pics/photoedit \
+${datadir}/applications/qtopia-photoedit.desktop \
+${datadir}/pixmaps/ImageViewer.png"
+
+FILES_${PN}-qtmail = "\
+${OE_QT_PREFIX}/plugins/application/libqtmail.so \
+${OE_QT_PREFIX}/bin/qtmail \
+${OE_QT_PREFIX}/services/SMS/qtmail \
+${OE_QT_PREFIX}/services/Email/qtmail \
+${OE_QT_PREFIX}/services/Messages/qtmail \
+${OE_QT_PREFIX}/pics/qtmail \
+${datadir}/applications/qtopia-qtmail.desktop \
+${datadir}/pixmaps/qtmail/EMail.png"
+
+FILES_${PN}-ringprofile = "\
+${OE_QT_PREFIX}/plugins/application/libprofileedit.so \
+${OE_QT_PREFIX}/bin/profileedit \
+${OE_QT_PREFIX}/services/SettingsManager/profileedit \
+${OE_QT_PREFIX}/services/Profiles/profileedit \
+${OE_QT_PREFIX}/pics/profileedit \
+${datadir}/applications/qtopia-ringprofile.desktop \
+${datadir}/pixmaps/profileedit/Note.png"
+
+FILES_${PN}-serverwidgets = "\
+${OE_QT_PREFIX}/plugins/application/libserverwidgets.so \
+${OE_QT_PREFIX}/bin/serverwidgets \
+${OE_QT_PREFIX}/pics/serverwidgets \
+${datadir}/applications/qtopia-serverwidgets.desktop \
+${datadir}/pixmaps/serverwidgets/ServerWidgets.png"
+
+FILES_${PN}-startupflags = "\
+${OE_QT_PREFIX}/plugins/application/libstartupflags.so \
+${OE_QT_PREFIX}/bin/startupflags \
+${OE_QT_PREFIX}/bin/startupflags.sh \
+${datadir}/applications/qtopia-startupflags.desktop \
+${datadir}/pixmaps/icons/flag.png"
+
+FILES_${PN}-sysinfo = "\
+${OE_QT_PREFIX}/plugins/application/libsysinfo.so \
+${OE_QT_PREFIX}/bin/sysinfo \
+${OE_QT_PREFIX}/services/CleanupWizard/sysinfo \
+${OE_QT_PREFIX}/pics/sysinfo \
+${datadir}/applications/qtopia-sysinfo.desktop \
+${datadir}/pixmaps/sysinfo/SystemInfo.png"
+
+FILES_${PN}-systemtime = "\
+${OE_QT_PREFIX}/plugins/application/libsystemtime.so \
+${OE_QT_PREFIX}/bin/systemtime \
+${OE_QT_PREFIX}/services/Date/systemtime \
+${OE_QT_PREFIX}/services/Time/systemtime \
+${OE_QT_PREFIX}/pics/systemtime \
+${datadir}/applications/qtopia-systemtime.desktop \
+${datadir}/pixmaps/systemtime/DateTime.png"
+
+FILES_${PN}-textedit = "\
+${OE_QT_PREFIX}/plugins/application/libtextedit.so \
+${OE_QT_PREFIX}/bin/textedit \
+${OE_QT_PREFIX}/services/View/text/plain/textedit \
+${OE_QT_PREFIX}/services/Open/text/plain/textedit \
+${OE_QT_PREFIX}/pics/textedit \
+${datadir}/applications/qtopia-textedit.desktop \
+${datadir}/pixmaps/textedit/TextEditor.png"
+
+FILES_${PN}-todolist = "\
+${OE_QT_PREFIX}/plugins/application/libtodolist.so \
+${OE_QT_PREFIX}/bin/todolist \
+${OE_QT_PREFIX}/services/Tasks/todolist \
+${OE_QT_PREFIX}/services/Receive/text/x-vcalendar-Tasks/todolist \
+${OE_QT_PREFIX}/pics/todolist \
+${datadir}/applications/qtopia-todolist.desktop \
+${datadir}/pixmaps/todolist/TodoList.png"
+
+# non quicklaunched apps
+
+FILES_${PN}-appearance = "\
+${OE_QT_PREFIX}/bin/appearance \
+${OE_QT_PREFIX}/services/Settings/appearance \
+${OE_QT_PREFIX}/pics/appearance \
+${datadir}/applications/qtopia-appearance.desktop \
+${datadir}/pixmaps/appearance/Appearance.png"
+
+FILES_${PN}-beaming = "\
+${OE_QT_PREFIX}/bin/beaming \
+${OE_QT_PREFIX}/pics/beaming \
+${datadir}/applications/qtopia-beaming.desktop \
+${datadir}/pixmaps/beaming/Infrared.png"
+
+FILES_${PN}-callforwarding = "\
+${OE_QT_PREFIX}/bin/callforwarding \
+${OE_QT_PREFIX}/services/CallForwarding/callforwarding \
+${OE_QT_PREFIX}/services/Settings/callforwarding \
+${OE_QT_PREFIX}/pics/callforwarding \
+${datadir}/applications/qtopia-callforwarding.desktop \
+${datadir}/pixmaps/callforwarding/CallForwarding.png"
+
+FILES_${PN}-fifteen = "\
+${OE_QT_PREFIX}/bin/fifteen \
+${OE_QT_PREFIX}/pics/fifteen \
+${datadir}/applications/qtopia-fifteen.desktop \
+${datadir}/pixmaps/fifteen/Fifteen.png"
+
+FILES_${PN}-homescreen = "\
+${OE_QT_PREFIX}/bin/homescreen \
+${OE_QT_PREFIX}/pics/homescreen \
+${datadir}/applications/qtopia-homescreen.desktop \
+${datadir}/pixmaps/homescreen/homescreen.png"
+
+FILES_${PN}-language = "\
+${OE_QT_PREFIX}/bin/language \
+${OE_QT_PREFIX}/pics/language \
+${datadir}/applications/qtopia-language.desktop \
+${datadir}/pixmaps/language/Language.png"
+
+FILES_${PN}-light-and-power = "\
+${OE_QT_PREFIX}/bin/light-and-power \
+${OE_QT_PREFIX}/services/Settings/light-and-power \
+${OE_QT_PREFIX}/pics/light-and-power \
+${datadir}/applications/qtopia-light-and-power.desktop \
+${datadir}/pixmaps/light-and-power/Light.png"
+
+FILES_${PN}-logging = "\
+${OE_QT_PREFIX}/bin/logging \
+${OE_QT_PREFIX}/pics/logging \
+${datadir}/applications/qtopia-logging.desktop \
+${datadir}/pixmaps/logging/logging.png"
+
+FILES_${PN}-minesweep = "\
+${OE_QT_PREFIX}/bin/minesweep \
+${OE_QT_PREFIX}/pics/minesweep \
+${datadir}/applications/qtopia-minesweep.desktop \
+${datadir}/pixmaps/minesweep/MineHunt.png"
+
+FILES_${PN}-network = "\
+${OE_QT_PREFIX}/bin/netsetup \
+${OE_QT_PREFIX}/services/NetworkSetup/netsetup \
+${OE_QT_PREFIX}/pics/netsetup \
+${datadir}/applications/qtopia-network.desktop \
+${datadir}/pixmaps/netsetup/PPPConnect.png"
+
+FILES_${PN}-phonenetworks = "\
+${OE_QT_PREFIX}/bin/phonenetworks \
+${OE_QT_PREFIX}/services/CallNetworks/phonenetworks \
+${OE_QT_PREFIX}/pics/phonenetworks \
+${datadir}/applications/qtopia-phonenetworks.desktop \
+${datadir}/pixmaps/phonenetworks/PhoneNetworks.png"
+
+FILES_${PN}-phonesettings = "\
+${OE_QT_PREFIX}/bin/phonesettings \
+${OE_QT_PREFIX}/pics/phonesettings \
+${datadir}/applications/qtopia-phonesettings.desktop \
+${datadir}/pixmaps/phonesettings/PhoneSettings.png"
+
+FILES_${PN}-qdsync = "\
+${OE_QT_PREFIX}/bin/qdsync \
+${OE_QT_PREFIX}/plugins/qdsync/*.so \
+${OE_QT_PREFIX}/pics/qdsync \
+${OE_QT_PREFIX}/lib/libqdsync_common.so.*"
+
+FILES_${PN}-security = "\
+${OE_QT_PREFIX}/bin/security \
+${OE_QT_PREFIX}/pics/security \
+${datadir}/applications/qtopia-security.desktop \
+${datadir}/pixmaps/security/Security.png"
+
+FILES_${PN}-sip = "\
+${OE_QT_PREFIX}/bin/sipagent \
+${OE_QT_PREFIX}/bin/sipsettings \
+${OE_QT_PREFIX}/services/Telephony/sipagent \
+${OE_QT_PREFIX}/services/MediaSession/sipagent \
+${OE_QT_PREFIX}/pics/sipsettings \
+${datadir}/applications/qtopia-sipsettings.desktop \
+${datadir}/pixmaps/sipsettings/SIP.png"
+
+FILES_${PN}-snake = "\
+${OE_QT_PREFIX}/bin/snake \
+${OE_QT_PREFIX}/pics/snake \
+${datadir}/applications/qtopia-snake.desktop \
+${datadir}/pixmaps/snake/Snake.png"
+
+FILES_${PN}-speeddial = "\
+${OE_QT_PREFIX}/bin/speeddial \
+${OE_QT_PREFIX}/pics/speeddial \
+${OE_QT_PREFIX}/sounds/speeddial \
+${datadir}/applications/qtopia-speeddial.desktop \
+${datadir}/pixmaps/speeddial/speeddial.png"
+
+FILES+_${PN}-words = "\
+${OE_QT_PREFIX}/bin/words \
+${OE_QT_PREFIX}/pics/words \
+${OE_QT_PREFIX}/etc/dict/en_US/words.dawg \
+${datadir}/applications/qtopia-words.desktop \
+${datadir}/pixmaps/words/Words.png"
+
+FILES_${PN}-worldtime = "\
+${OE_QT_PREFIX}/bin/worldtime \
+${OE_QT_PREFIX}/pics/worldtime \
+${datadir}/applications/qtopia-worldtime.desktop \
+${datadir}/pixmaps/worldtime/CityTime.png"
+
+# libs
+
+FILES_${PN}-libamr = "\
+${OE_QT_PREFIX}/lib/libamr.so.* \
+"
+
+FILES_${PN}-libdissipate2 = "\
+${OE_QT_PREFIX}/lib/libdissipate2.so.* \
+"
+
+FILES_${PN}-libgsm = "\
+${OE_QT_PREFIX}/lib/libgsm.so.* \
+"
+
+FILES_${PN}-libinputmatch = "\
+${OE_QT_PREFIX}/lib/libinputmatch.so.* \
+"
+
+FILES_${PN}-libmd5 = "\
+${OE_QT_PREFIX}/lib/libmd5.so.* \
+"
+
+FILES_${PN}-libopenobex = "\
+${OE_QT_PREFIX}/lib/libopenobex.so.* \
+"
+
+FILES_${PN}-libqmstroke = "\
+${OE_QT_PREFIX}/lib/libqmstroke.so.* \
+"
+
+FILES_${PN}-libqtcore = "\
+${OE_QT_PREFIX}/lib/libQtCore.so.* \
+"
+
+FILES_${PN}-libqtdbus = "\
+${OE_QT_PREFIX}/lib/libQtDBus.so.* \
+"
+
+FILES_${PN}-libqtgui = "\
+${OE_QT_PREFIX}/lib/libQtGui.so.* \
+"
+
+FILES_${PN}-libqtnetwork = "\
+${OE_QT_PREFIX}/lib/libQtNetwork.so.* \
+"
+
+FILES_${PN}-libqtopengl = "\
+${OE_QT_PREFIX}/lib/libQtOpenGL.so.* \
+"
+
+FILES_${PN}-libqtopiaaudio = "\
+${OE_QT_PREFIX}/lib/libqtopiaaudio.so.* \
+"
+
+FILES_${PN}-libqtopiabase = "\
+${OE_QT_PREFIX}/lib/libqtopiabase.so.* \
+"
+
+FILES_${PN}-libqtopiacomm = "\
+${OE_QT_PREFIX}/lib/libqtopiacomm.so.* \
+"
+
+FILES_${PN}-libqtopiamail = "\
+${OE_QT_PREFIX}/lib/libqtopiamail.so.* \
+"
+
+FILES_${PN}-libqtopiamedia = "\
+${OE_QT_PREFIX}/lib/libqtopiamedia.so.* \
+"
+
+FILES_${PN}-libqtopiaphonemodem = "\
+${OE_QT_PREFIX}/lib/libqtopiaphonemodem.so.* \
+"
+
+FILES_${PN}-libqtopiaphone = "\
+${OE_QT_PREFIX}/lib/libqtopiaphone.so.* \
+"
+
+FILES_${PN}-libqtopiapim = "\
+${OE_QT_PREFIX}/lib/libqtopiapim.so.* \
+"
+
+FILES_${PN}-libqtopiaprinting = "\
+${OE_QT_PREFIX}/lib/libqtopiaprinting.so.* \
+"
+
+FILES_${PN}-libqtopiasmil = "\
+${OE_QT_PREFIX}/lib/libqtopiasmil.so.* \
+"
+
+FILES_${PN}-libqtopia = "\
+${OE_QT_PREFIX}/lib/libqtopia.so.* \
+"
+
+FILES_${PN}-libqtopia-sqlite = "\
+${OE_QT_PREFIX}/lib/libqtopia-sqlite.so.* \
+"
+
+FILES_${PN}-libqtscript = "\
+${OE_QT_PREFIX}/lib/libQtScript.so.* \
+"
+
+FILES_${PN}-libqtsql = "\
+${OE_QT_PREFIX}/lib/libQtSql.so.* \
+"
+
+FILES_${PN}-libqtsvg = "\
+${OE_QT_PREFIX}/lib/libQtSvg.so.* \
+"
+
+FILES_${PN}-libqtxml = "\
+${OE_QT_PREFIX}/lib/libQtXml.so.* \
+"
+
+FILES_${PN}-libtimidity = "\
+${OE_QT_PREFIX}/lib/libtimidity.so.* \
+${OE_QT_PREFIX}/etc/timidity \
+"
+
+FILES_${PN}-libvorbisidec = "\
+${OE_QT_PREFIX}/lib/libvorbisidec.so.* \
+"
+
+# misc stuff
+
+FILES_${PN}-mediaserver = "\
+${OE_QT_PREFIX}/bin/mediaserver \
+${OE_QT_PREFIX}/services/MediaServer/mediaserver \
+"
+
+FILES_${PN}-manual = "${OE_QT_PREFIX}/help"
+
+FILES_${PN}-qpf-fonts = "${OE_QT_PREFIX}/lib/fonts"
+
 FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help  \
-                ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \
+                ${OE_QT_PREFIX}/lib/*.so.* \
                 ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \
                 ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \
                 ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080417/2514e760/attachment-0001.htm 


More information about the commitlog mailing list