[prev in list] [next in list] [prev in thread] [next in thread]
List: openmoko-commitlog
Subject: commitlog Digest, Vol 489, Issue 3
From: commitlog-request () lists ! openmoko ! org
Date: 2008-04-22 22:32:41
Message-ID: E1JoR2X-0008Qp-JY () sita ! openmoko ! org
[Download RAW message or body]
Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
commitlog-request@lists.openmoko.org
You can reach the person managing the list at
commitlog-owner@lists.openmoko.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. org.openmoko.zecke.april-update:
6cea201f0b818fb3b63ec140219dbf42fff2aabc (oe@monotone.openmoko.org)
[Attachment #4 (multipart/digest)]
[Attachment #6 (message/rfc822)]
revision: 6cea201f0b818fb3b63ec140219dbf42fff2aabc
date: 2008-04-21T17:58:31
author: freyther@openembedded.org
branch: org.openmoko.zecke.april-update
changelog:
propagate from branch 'org.openmoko.dev' (head 39e5f6a80d9fb6c05976e90c19a5=
67c1e8248ab4)
to branch 'org.openmoko.zecke.april-update' (head 0a6241232b9a9=
62279353c137889906fd1ebb881)
manifest:
format_version "1"
new_manifest [4a62970102e0baf201f91044393515ce7ab8ff2b]
old_revision [0a6241232b9a962279353c137889906fd1ebb881]
add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
add_file "packages/hal/hal-info_20080313.bb"
content [5389659078578f1501bf847f45a6a405058621b7]
add_file "packages/notification-daemon/files/notification-daemon-fix-text-c=
olor.diff"
content [4dd28f5a824b69e10af37851a3ddb38462a9e6bd]
patch "conf/distro/include/moko-autorev.inc"
from [874414ea97223b337c23ffb66e4cbd28401832db]
to [03bc5e80481dfb6e8ef93d0031d1191c9031db0b]
patch "conf/distro/include/sane-srcrevs.inc"
from [a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe]
to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
patch "packages/efl1/imlib2_cvs.bb"
from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
patch "packages/notification-daemon/notification-daemon_0.3.7.bb"
from [2651b1bc5c5efb73799947ba1466e4ad1dec44cc]
to [a7ebdf98090ed6e927affd6bbb3854a3ee53174d]
old_revision [39e5f6a80d9fb6c05976e90c19a567c1e8248ab4]
delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"
delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"
delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
delete "packages/alsa/alsa-state/om-gta01/stereoout.state"
delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"
delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"
delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
delete "packages/alsa/alsa-state/om-gta02/stereoout.state"
add_dir "packages/openssl/openssl-0.9.7m"
add_dir "packages/openssl/openssl-0.9.8g"
add_dir "packages/wvdial"
add_dir "packages/wvstreams"
add_dir "packages/wvstreams/files"
add_file "packages/gdb/gdb-cross-sdk_6.8.bb"
content [9444a910f04467593c5c669381d5ed60212c8324]
add_file "packages/gdb/gdb-cross_6.8.bb"
content [80cc44c65e3370b012eff9b3dc7c84f1f080bd88]
add_file "packages/gdb/gdb_6.8.bb"
content [70de988e33bb0f209d1bd9a050d5691c210ee877]
add_file "packages/git/git_1.5.3.bb"
content [bb6af29b2561ea01603ca6aa37a84ec16f597cb1]
add_file "packages/libnl/files/linux-header.patch"
content [c80bf7e1a37a991954debd494073a91d32f42ede]
add_file "packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch"
content [c4d94662df225a0ee6e10889d64e44b213e8a5e8]
add_file "packages/libnl/libnl_1.0-pre8.bb"
content [75a1ae1e39545b0ba22753221a95f7101f36a2cb]
add_file "packages/openmoko-projects/enlazar_svn.bb"
content [da06261f116197bb096f6cef1c9740f28fc8a734]
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/wvdial/wvdial_1.60.bb"
content [ccbc1ba0ccfa6b93039796cdc3f11943de252a06]
add_file "packages/wvstreams/files/build-fixes-and-sanity.patch"
content [01f17efed1dad3b066472e2a1501896f72a5154b]
add_file "packages/wvstreams/wvstreams_4.4.1.bb"
content [663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3]
patch "MAINTAINERS"
from [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
to [5556c9277c3381070987310400058abdd5f4c820]
patch "classes/insane.bbclass"
from [071cc4297bda486033be0ee2ba642fda644a63e8]
to [8a4b746dec67863e553a4824eecb3a7e6e9830d9]
patch "conf/checksums.ini"
from [45003c6575eee344823ebc073a31240ba42d22cc]
to [7133e53e683443e4522bb1dd79fea538f45d2bb9]
patch "conf/distro/include/sane-srcrevs.inc"
from [3959d79eb2b982cbd834472ccedfa58de152d874]
to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
patch "packages/alsa/alsa-state.bb"
from [2590f4545ccf7d78835320f929293f7d773dc9f9]
to [b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32]
patch "packages/efl1/edbus_cvs.bb"
from [d3da1a158da97f38b8d2c32c4994ac557c07dc4e]
to [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
patch "packages/git/git.inc"
from [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
to [78d5cbf5201f942c64ae36ae924b01ac6152208a]
patch "packages/networkmanager/networkmanager.inc"
from [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
to [bbb1ef257c00587fd0792c0671c5da3bf098c0b6]
patch "packages/networkmanager/networkmanager_0.6.5.bb"
from [c44eba44dd018961750b625359c57e42f53463aa]
to [b6f945c3ef7f135e07832220bac70bc8b91016d8]
patch "packages/networkmanager/networkmanager_svn.bb"
from [9b937ee39ef7fa695a9532effa744c53c1caec94]
to [3999d93f5e5da815a8cf63fe164ae8ea1926420c]
patch "packages/openmoko-projects/assassin_svn.bb"
from [080e285125a168b5f6d613c3bbd62d5d53591ad0]
to [1e8ad042e56fd3840bbbaf252f5b243db31955ec]
patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
from [0e72debac8a32ac92bb891159d502240447deef4]
to [a93597ca618095b4d174aa972afb07241bb3df6a]
patch "packages/tasks/task-openmoko-qtopia-x11.bb"
from [a655b432f441812cb360f6ef19a77ef83becbbfa]
to [9ba089cc7d924228e8bf151d1ad3d5279cc23c13]
patch "packages/tasks/task-openmoko-qtopia.bb"
from [eac4758da810225f99e5ea824c618acbf74c5b18]
to [7d1cecae9b4ec98093b90bcf86c71d5a9144c9b4]
patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
from [e0a1d661be0f01d4779998587e419896d9504ca9]
to [d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042]
[Attachment #9 (multipart/alternative)]
#
#
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
# content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
#
# add_file "packages/hal/hal-info_20080313.bb"
# content [5389659078578f1501bf847f45a6a405058621b7]
#
# add_file "packages/notification-daemon/files/notification-daemon-fix-text-color.diff"
# content [4dd28f5a824b69e10af37851a3ddb38462a9e6bd]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [874414ea97223b337c23ffb66e4cbd28401832db]
# to [03bc5e80481dfb6e8ef93d0031d1191c9031db0b]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe]
# to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
# to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
#
# patch "packages/notification-daemon/notification-daemon_0.3.7.bb"
# from [2651b1bc5c5efb73799947ba1466e4ad1dec44cc]
# to [a7ebdf98090ed6e927affd6bbb3854a3ee53174d]
#
============================================================
--- packages/efl1/imlib2/remove-local-includes-20080421.patch 6cb1af5e1d744afaed49d06493a112c10cf8210b
+++ packages/efl1/imlib2/remove-local-includes-20080421.patch 6cb1af5e1d744afaed49d06493a112c10cf8210b
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in 2008-04-21 14:28:58.000000000 +0800
++++ imlib2/configure.in 2008-04-21 14:30:07.000000000 +0800
+@@ -191,9 +191,7 @@
+
+ if test "x$have_x" = "xyes"; then
+ AC_PATH_XTRA
+- x_dir=${x_dir:-/usr/X11R6}
+- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="-lX11 -lXext"
+ AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+ x_cflags=""
============================================================
--- packages/hal/hal-info_20080313.bb 5389659078578f1501bf847f45a6a405058621b7
+++ packages/hal/hal-info_20080313.bb 5389659078578f1501bf847f45a6a405058621b7
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hardware Abstraction Layer device information"
+HOMEPAGE = "http://hal.freedesktop.org/"
+SECTION = "unknown"
+LICENSE = "GPL AFL"
+
+SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-recall --disable-video"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "${datadir}/hal/"
============================================================
--- packages/notification-daemon/files/notification-daemon-fix-text-color.diff 4dd28f5a824b69e10af37851a3ddb38462a9e6bd
+++ packages/notification-daemon/files/notification-daemon-fix-text-color.diff 4dd28f5a824b69e10af37851a3ddb38462a9e6bd
@@ -0,0 +1,44 @@
+--- notification-daemon-0.3.7.orig/src/themes/standard/theme.c 2007-01-26 \
04:20:15.000000000 +0000 ++++ \
notification-daemon-0.3.7/src/themes/standard/theme.c 2008-04-18 12:14:33.000000000 \
+0100 +@@ -653,6 +653,23 @@
+ return FALSE;
+ }
+
++
++static void
++style_set_cb (GtkWidget *label, GtkStyle *previous_style, WindowData *windata)
++{
++ static gboolean in_style_set_cb;
++
++ if (in_style_set_cb)
++ return;
++
++ in_style_set_cb = TRUE;
++
++ gtk_widget_modify_fg (label, GTK_STATE_NORMAL,
++ &label->style->text[GTK_STATE_NORMAL]);
++
++ in_style_set_cb = FALSE;
++}
++
+ GtkWindow *
+ create_notification(UrlClickedCb url_clicked)
+ {
+@@ -753,6 +770,8 @@
+ gtk_widget_set_size_request(spacer, SPACER_LEFT, -1);
+
+ windata->summary_label = gtk_label_new(NULL);
++ g_signal_connect(windata->summary_label, "style-set",
++ G_CALLBACK(style_set_cb), windata);
+ gtk_widget_show(windata->summary_label);
+ gtk_box_pack_start(GTK_BOX(hbox), windata->summary_label, TRUE, TRUE, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
+@@ -800,6 +819,8 @@
+ gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
+
+ windata->body_label = sexy_url_label_new();
++ g_signal_connect(windata->body_label, "style-set",
++ G_CALLBACK(style_set_cb), windata);
+ gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
+ gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
============================================================
--- conf/distro/include/moko-autorev.inc 874414ea97223b337c23ffb66e4cbd28401832db
+++ conf/distro/include/moko-autorev.inc 03bc5e80481dfb6e8ef93d0031d1191c9031db0b
@@ -22,8 +22,8 @@ SRCREV_pn-openmoko-agpsui ?= "${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-opkg ?= "${AUTOREV}"
+#SRCREV_pn-opkg-native ?= "${AUTOREV}"
SRCREV_pn-multitap-pad ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe
+++ conf/distro/include/sane-srcrevs.inc 08a36f5f6e39c385d9c689389a96689cc687ad5b
@@ -147,9 +147,9 @@ SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4345"
-SRCREV_pn-opkg-native ?= "4345"
-SRCREV_pn-opkg-sdk ?= "4235"
+SRCREV_pn-opkg ?= "4247"
+SRCREV_pn-opkg-native ?= "4247"
+SRCREV_pn-opkg-sdk ?= "4247"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
SRCREV_pn-psplash ?= "249"
============================================================
--- packages/efl1/imlib2_cvs.bb 90324b9d8bfadfca430da3b72c2b1f9c7089ee52
+++ packages/efl1/imlib2_cvs.bb 41b7537a6af77e700c6236af3c40b2b7a8d80604
@@ -3,11 +3,13 @@ PV = "1.4.1.000+cvs${SRCDATE}"
# can also depend on tiff34, ungif or gif, z, bz2, id3tag
DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
PV = "1.4.1.000+cvs${SRCDATE}"
-PR = "r0"
+PR = "r0.01"
inherit efl
-SRC_URI += "file://remove-local-includes.patch;patch=1"
+# The original patch was out of date in 20080420
+SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \
+ file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "
EXTRA_OECONF = "--with-x"
============================================================
--- packages/notification-daemon/notification-daemon_0.3.7.bb 2651b1bc5c5efb73799947ba1466e4ad1dec44cc
+++ packages/notification-daemon/notification-daemon_0.3.7.bb a7ebdf98090ed6e927affd6bbb3854a3ee53174d
@@ -3,8 +3,10 @@ DEPENDS = "gettext dbus gtk+ libsexy gco
SECTION = "x11"
LICENSE = "GPL"
DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
+PR = "r1"
-SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
+ file://notification-daemon-fix-text-color.diff;patch=1"
EXTRA_OECONF = "--disable-binreloc"
[Attachment #12 (text/html)]
<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
# content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
#
# add_file "packages/hal/hal-info_20080313.bb"
# content [5389659078578f1501bf847f45a6a405058621b7]
#
# add_file "packages/notification-daemon/files/notification-daemon-fix-text-color.diff"
# content [4dd28f5a824b69e10af37851a3ddb38462a9e6bd]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [874414ea97223b337c23ffb66e4cbd28401832db]
# to [03bc5e80481dfb6e8ef93d0031d1191c9031db0b]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe]
# to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
# to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
#
# patch "packages/notification-daemon/notification-daemon_0.3.7.bb"
# from [2651b1bc5c5efb73799947ba1466e4ad1dec44cc]
# to [a7ebdf98090ed6e927affd6bbb3854a3ee53174d]
#
============================================================
<font color="#FF6600">--- \
packages/efl1/imlib2/remove-local-includes-20080421.patch 6cb1af5e1d744afaed49d06493a112c10cf8210b</font>
<font color="#009900">+++ \
packages/efl1/imlib2/remove-local-includes-20080421.patch 6cb1af5e1d744afaed49d06493a112c10cf8210b</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+Index: imlib2/configure.in</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- imlib2.orig/configure.in 2008-04-21 14:28:58.000000000 \
+0800</font> <font color="#009900">++++ imlib2/configure.in 2008-04-21 \
14:30:07.000000000 +0800</font> <font color="#009900">+@@ -191,9 +191,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ if test "x$have_x" = "xyes"; then</font>
<font color="#009900">+ AC_PATH_XTRA</font>
<font color="#009900">+- x_dir=${x_dir:-/usr/X11R6}</font>
<font color="#009900">+- \
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}</font> <font color="#009900">+- \
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"</font> <font \
color="#009900">++ x_libs="-lX11 -lXext"</font> <font color="#009900">+ \
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])</font> <font color="#009900">+ \
else</font> <font color="#009900">+ x_cflags=""</font>
============================================================
<font color="#FF6600">--- \
packages/hal/hal-info_20080313.bb 5389659078578f1501bf847f45a6a405058621b7</font> \
<font color="#009900">+++ \
packages/hal/hal-info_20080313.bb 5389659078578f1501bf847f45a6a405058621b7</font> \
<font color="#0000FF">@@ -0,0 +1,20 @@</font> <font color="#009900">+DESCRIPTION = \
"Hardware Abstraction Layer device information"</font> <font \
color="#009900">+HOMEPAGE = "http://hal.freedesktop.org/"</font> <font \
color="#009900">+SECTION = "unknown"</font> <font color="#009900">+LICENSE = "GPL \
AFL"</font> <font color="#009900">+</font>
<font color="#009900">+SRC_URI = \
"http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz"</font> <font \
color="#009900">+S = "${WORKDIR}/${PN}-${PV}"</font> <font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF = "--disable-recall --disable-video"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure() {</font>
<font color="#009900">+ gnu-configize</font>
<font color="#009900">+ libtoolize --force</font>
<font color="#009900">+ oe_runconf</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGE_ARCH = "all"</font>
<font color="#009900">+FILES_${PN} += "${datadir}/hal/"</font>
============================================================
<font color="#FF6600">--- \
packages/notification-daemon/files/notification-daemon-fix-text-color.diff 4dd28f5a824b69e10af37851a3ddb38462a9e6bd</font>
<font color="#009900">+++ \
packages/notification-daemon/files/notification-daemon-fix-text-color.diff 4dd28f5a824b69e10af37851a3ddb38462a9e6bd</font>
<font color="#0000FF">@@ -0,0 +1,44 @@</font>
<font color="#009900">+--- \
notification-daemon-0.3.7.orig/src/themes/standard/theme.c 2007-01-26 \
04:20:15.000000000 +0000</font> <font color="#009900">++++ \
notification-daemon-0.3.7/src/themes/standard/theme.c 2008-04-18 12:14:33.000000000 \
+0100</font> <font color="#009900">+@@ -653,6 +653,23 @@</font>
<font color="#009900">+ return FALSE;</font>
<font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++</font>
<font color="#009900">++static void</font>
<font color="#009900">++style_set_cb (GtkWidget *label, GtkStyle *previous_style, \
WindowData *windata)</font> <font color="#009900">++{</font>
<font color="#009900">++ static gboolean in_style_set_cb;</font>
<font color="#009900">++</font>
<font color="#009900">++ if (in_style_set_cb)</font>
<font color="#009900">++ return;</font>
<font color="#009900">++</font>
<font color="#009900">++ in_style_set_cb = TRUE;</font>
<font color="#009900">++</font>
<font color="#009900">++ gtk_widget_modify_fg (label, GTK_STATE_NORMAL,</font>
<font color="#009900">++ \
&label->style->text[GTK_STATE_NORMAL]);</font> <font \
color="#009900">++</font> <font color="#009900">++ in_style_set_cb = FALSE;</font>
<font color="#009900">++}</font>
<font color="#009900">++</font>
<font color="#009900">+ GtkWindow *</font>
<font color="#009900">+ create_notification(UrlClickedCb url_clicked)</font>
<font color="#009900">+ {</font>
<font color="#009900">+@@ -753,6 +770,8 @@</font>
<font color="#009900">+ gtk_widget_set_size_request(spacer, SPACER_LEFT, -1);</font>
<font color="#009900">+ </font>
<font color="#009900">+ windata->summary_label = gtk_label_new(NULL);</font>
<font color="#009900">++ g_signal_connect(windata->summary_label, \
"style-set",</font> <font color="#009900">++ G_CALLBACK(style_set_cb), \
windata);</font> <font color="#009900">+ \
gtk_widget_show(windata->summary_label);</font> <font color="#009900">+ \
gtk_box_pack_start(GTK_BOX(hbox), windata->summary_label, TRUE, TRUE, 0);</font> \
<font color="#009900">+ gtk_misc_set_alignment(GTK_MISC(windata->summary_label), \
0, 0);</font> <font color="#009900">+@@ -800,6 +819,8 @@</font>
<font color="#009900">+ gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, \
TRUE, TRUE, 0);</font> <font color="#009900">+ </font>
<font color="#009900">+ windata->body_label = sexy_url_label_new();</font>
<font color="#009900">++ g_signal_connect(windata->body_label, "style-set",</font>
<font color="#009900">++ G_CALLBACK(style_set_cb), windata);</font>
<font color="#009900">+ gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, \
TRUE, TRUE, 0);</font> <font color="#009900">+ \
gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);</font> <font \
color="#009900">+ gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), \
TRUE);</font> ============================================================
<font color="#FF6600">--- \
conf/distro/include/moko-autorev.inc 874414ea97223b337c23ffb66e4cbd28401832db</font> \
<font color="#009900">+++ \
conf/distro/include/moko-autorev.inc 03bc5e80481dfb6e8ef93d0031d1191c9031db0b</font> \
<font color="#0000FF">@@ -22,8 +22,8 @@ SRCREV_pn-openmoko-agpsui ?= \
"${AUTOREV}</font> SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
<font color="#FF6600">-SRCREV_pn-opkg ?= "${AUTOREV}"</font>
<font color="#FF6600">-SRCREV_pn-opkg-native ?= "${AUTOREV}"</font>
<font color="#009900">+#SRCREV_pn-opkg ?= "${AUTOREV}"</font>
<font color="#009900">+#SRCREV_pn-opkg-native ?= "${AUTOREV}"</font>
SRCREV_pn-multitap-pad ?= "${AUTOREV}"
============================================================
<font color="#FF6600">--- \
conf/distro/include/sane-srcrevs.inc a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe</font> \
<font color="#009900">+++ \
conf/distro/include/sane-srcrevs.inc 08a36f5f6e39c385d9c689389a96689cc687ad5b</font> \
<font color="#0000FF">@@ -147,9 +147,9 @@ SRCREV_pn-openocd-native ?= "517"</font> \
SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
<font color="#FF6600">-SRCREV_pn-opkg ?= "4345"</font>
<font color="#FF6600">-SRCREV_pn-opkg-native ?= "4345"</font>
<font color="#FF6600">-SRCREV_pn-opkg-sdk ?= "4235"</font>
<font color="#009900">+SRCREV_pn-opkg ?= "4247"</font>
<font color="#009900">+SRCREV_pn-opkg-native ?= "4247"</font>
<font color="#009900">+SRCREV_pn-opkg-sdk ?= "4247"</font>
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
SRCREV_pn-psplash ?= "249"
============================================================
<font color="#FF6600">--- \
packages/efl1/imlib2_cvs.bb 90324b9d8bfadfca430da3b72c2b1f9c7089ee52</font> <font \
color="#009900">+++ packages/efl1/imlib2_cvs.bb 41b7537a6af77e700c6236af3c40b2b7a8d80604</font>
<font color="#0000FF">@@ -3,11 +3,13 @@ PV = "1.4.1.000+cvs${SRCDATE}"</font>
# can also depend on tiff34, ungif or gif, z, bz2, id3tag
DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
PV = "1.4.1.000+cvs${SRCDATE}"
<font color="#FF6600">-PR = "r0"</font>
<font color="#009900">+PR = "r0.01"</font>
inherit efl
<font color="#FF6600">-SRC_URI += "file://remove-local-includes.patch;patch=1"</font>
<font color="#009900">+# The original patch was out of date in 20080420</font>
<font color="#009900">+SRC_URI += \
"file://remove-local-includes.patch;patch=1;maxdate=20080420 \</font> <font \
color="#009900">+ \
file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "</font>
EXTRA_OECONF = "--with-x"
============================================================
<font color="#FF6600">--- \
packages/notification-daemon/notification-daemon_0.3.7.bb 2651b1bc5c5efb73799947ba1466e4ad1dec44cc</font>
<font color="#009900">+++ \
packages/notification-daemon/notification-daemon_0.3.7.bb a7ebdf98090ed6e927affd6bbb3854a3ee53174d</font>
<font color="#0000FF">@@ -3,8 +3,10 @@ DEPENDS = "gettext dbus gtk+ libsexy \
gco</font> SECTION = "x11"
LICENSE = "GPL"
DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
<font color="#009900">+PR = "r1"</font>
<font color="#FF6600">-SRC_URI = \
"http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"</font> <font \
color="#009900">+SRC_URI = \
"http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \</font> <font \
color="#009900">+ \
file://notification-daemon-fix-text-color.diff;patch=1"</font>
EXTRA_OECONF = "--disable-binreloc"
</tt></pre>
[Attachment #13 (multipart/alternative)]
#
#
# delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/stereoout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/stereoout.state"
#
# add_dir "packages/openssl/openssl-0.9.7m"
#
# add_dir "packages/openssl/openssl-0.9.8g"
#
# add_dir "packages/wvdial"
#
# add_dir "packages/wvstreams"
#
# add_dir "packages/wvstreams/files"
#
# add_file "packages/gdb/gdb-cross-sdk_6.8.bb"
# content [9444a910f04467593c5c669381d5ed60212c8324]
#
# add_file "packages/gdb/gdb-cross_6.8.bb"
# content [80cc44c65e3370b012eff9b3dc7c84f1f080bd88]
#
# add_file "packages/gdb/gdb_6.8.bb"
# content [70de988e33bb0f209d1bd9a050d5691c210ee877]
#
# add_file "packages/git/git_1.5.3.bb"
# content [bb6af29b2561ea01603ca6aa37a84ec16f597cb1]
#
# add_file "packages/libnl/files/linux-header.patch"
# content [c80bf7e1a37a991954debd494073a91d32f42ede]
#
# add_file "packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch"
# content [c4d94662df225a0ee6e10889d64e44b213e8a5e8]
#
# add_file "packages/libnl/libnl_1.0-pre8.bb"
# content [75a1ae1e39545b0ba22753221a95f7101f36a2cb]
#
# add_file "packages/openmoko-projects/enlazar_svn.bb"
# content [da06261f116197bb096f6cef1c9740f28fc8a734]
#
# 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/wvdial/wvdial_1.60.bb"
# content [ccbc1ba0ccfa6b93039796cdc3f11943de252a06]
#
# add_file "packages/wvstreams/files/build-fixes-and-sanity.patch"
# content [01f17efed1dad3b066472e2a1501896f72a5154b]
#
# add_file "packages/wvstreams/wvstreams_4.4.1.bb"
# content [663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3]
#
# patch "MAINTAINERS"
# from [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
# to [5556c9277c3381070987310400058abdd5f4c820]
#
# patch "classes/insane.bbclass"
# from [071cc4297bda486033be0ee2ba642fda644a63e8]
# to [8a4b746dec67863e553a4824eecb3a7e6e9830d9]
#
# patch "conf/checksums.ini"
# from [45003c6575eee344823ebc073a31240ba42d22cc]
# to [7133e53e683443e4522bb1dd79fea538f45d2bb9]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [3959d79eb2b982cbd834472ccedfa58de152d874]
# to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
#
# patch "packages/alsa/alsa-state.bb"
# from [2590f4545ccf7d78835320f929293f7d773dc9f9]
# to [b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [d3da1a158da97f38b8d2c32c4994ac557c07dc4e]
# to [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
#
# patch "packages/git/git.inc"
# from [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
# to [78d5cbf5201f942c64ae36ae924b01ac6152208a]
#
# patch "packages/networkmanager/networkmanager.inc"
# from [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
# to [bbb1ef257c00587fd0792c0671c5da3bf098c0b6]
#
# patch "packages/networkmanager/networkmanager_0.6.5.bb"
# from [c44eba44dd018961750b625359c57e42f53463aa]
# to [b6f945c3ef7f135e07832220bac70bc8b91016d8]
#
# patch "packages/networkmanager/networkmanager_svn.bb"
# from [9b937ee39ef7fa695a9532effa744c53c1caec94]
# to [3999d93f5e5da815a8cf63fe164ae8ea1926420c]
#
# patch "packages/openmoko-projects/assassin_svn.bb"
# from [080e285125a168b5f6d613c3bbd62d5d53591ad0]
# to [1e8ad042e56fd3840bbbaf252f5b243db31955ec]
#
# patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
# from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
# to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [0e72debac8a32ac92bb891159d502240447deef4]
# to [a93597ca618095b4d174aa972afb07241bb3df6a]
#
# patch "packages/tasks/task-openmoko-qtopia-x11.bb"
# from [a655b432f441812cb360f6ef19a77ef83becbbfa]
# to [9ba089cc7d924228e8bf151d1ad3d5279cc23c13]
#
# patch "packages/tasks/task-openmoko-qtopia.bb"
# from [eac4758da810225f99e5ea824c618acbf74c5b18]
# to [7d1cecae9b4ec98093b90bcf86c71d5a9144c9b4]
#
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
# from [e0a1d661be0f01d4779998587e419896d9504ca9]
# to [d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042]
#
============================================================
--- packages/gdb/gdb-cross-sdk_6.8.bb 9444a910f04467593c5c669381d5ed60212c8324
+++ packages/gdb/gdb-cross-sdk_6.8.bb 9444a910f04467593c5c669381d5ed60212c8324
@@ -0,0 +1,7 @@
+require gdb-cross.inc
+
+inherit sdk
+
+do_stage() {
+ :
+}
============================================================
--- packages/gdb/gdb-cross_6.8.bb 80cc44c65e3370b012eff9b3dc7c84f1f080bd88
+++ packages/gdb/gdb-cross_6.8.bb 80cc44c65e3370b012eff9b3dc7c84f1f080bd88
@@ -0,0 +1,7 @@
+require gdb-cross.inc
+
+SRC_URI += "file://sim-install-6.6.patch;patch=1"
+
+inherit cross
+
+PR = "r0"
============================================================
--- packages/gdb/gdb_6.8.bb 70de988e33bb0f209d1bd9a050d5691c210ee877
+++ packages/gdb/gdb_6.8.bb 70de988e33bb0f209d1bd9a050d5691c210ee877
@@ -0,0 +1,4 @@
+require gdb.inc
+
+PR = "r0"
+
============================================================
--- 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/libnl/files/linux-header.patch c80bf7e1a37a991954debd494073a91d32f42ede
+++ packages/libnl/files/linux-header.patch c80bf7e1a37a991954debd494073a91d32f42ede
@@ -0,0 +1,24 @@
+Index: libnl-1.0-pre8/include/netlink/netlink.h
+===================================================================
+--- libnl-1.0-pre8.orig/include/netlink/netlink.h 2007-11-21 18:25:39.000000000 \
+0100 ++++ libnl-1.0-pre8/include/netlink/netlink.h 2008-04-07 03:18:14.000000000 \
+0200 +@@ -24,7 +24,6 @@
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/genetlink.h>
+-#include <linux/ip_mp_alg.h>
+ #include <linux/netfilter/nfnetlink.h>
+ #include <netlink/types.h>
+ #include <netlink/handlers.h>
+Index: libnl-1.0-pre8/lib/route/route_obj.c
+===================================================================
+--- libnl-1.0-pre8.orig/lib/route/route_obj.c 2008-04-07 03:20:25.000000000 +0200
++++ libnl-1.0-pre8/lib/route/route_obj.c 2008-04-07 03:20:35.000000000 +0200
+@@ -33,6 +33,7 @@
+ * @{
+ */
+
++#include <linux/ip_mp_alg.h>
+ #include <netlink-local.h>
+ #include <netlink/netlink.h>
+ #include <netlink/cache.h>
============================================================
--- packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch c4d94662df225a0ee6e10889d64e44b213e8a5e8
+++ packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch c4d94662df225a0ee6e10889d64e44b213e8a5e8
@@ -0,0 +1,13 @@
+--- libnl-1.0-pre8/Makefile.opts.in.orig 2007-11-21 18:25:39.000000000 +0100
++++ libnl-1.0-pre8/Makefile.opts.in 2008-04-04 23:38:40.000000000 +0200
+@@ -10,8 +10,8 @@
+ #
+
+ CC := @CC@
+-CFLAGS := @CFLAGS@
+-LDFLAGS := @LDFLAGS@
++CFLAGS := -I./include -I. -I../include @CFLAGS@
++LDFLAGS :=
+ CPPFLAGS := @CPPFLAGS@
+ PACKAGE_NAME := @PACKAGE_NAME@
+ PACKAGE_VERSION := @PACKAGE_VERSION@
============================================================
--- packages/libnl/libnl_1.0-pre8.bb 75a1ae1e39545b0ba22753221a95f7101f36a2cb
+++ packages/libnl/libnl_1.0-pre8.bb 75a1ae1e39545b0ba22753221a95f7101f36a2cb
@@ -0,0 +1,19 @@
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
+PRIORITY = "optional"
+PV = "0.99+1.0-pre8"
+
+inherit autotools pkgconfig gpe
+
+SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre8.tar.gz \
+ file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \
+ file://linux-header.patch;patch=1 "
+
+S = "${WORKDIR}/${PN}-1.0-pre8"
+
+do_stage () {
+ autotools_stage_all prefix=${prefix}
+}
+
============================================================
--- packages/openmoko-projects/enlazar_svn.bb da06261f116197bb096f6cef1c9740f28fc8a734
+++ packages/openmoko-projects/enlazar_svn.bb da06261f116197bb096f6cef1c9740f28fc8a734
@@ -0,0 +1,17 @@
+DESCRIPTION = "Enlazar - Network part for Assasin"
+HOMEPAGE = "http://enlazar.projects.openmoko.org/"
+LICENSE = "GPL"
+DEPENDS = "evas edje ecore edbus"
+RDEPENDS = "networkmanager"
+SRCREV = "${AUTOREV}"
+PV = "0.1+svn${SRCREV}"
+PR = "r3"
+PE = "1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
============================================================
--- 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@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@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@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@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@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@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@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@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@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@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/wvdial/wvdial_1.60.bb ccbc1ba0ccfa6b93039796cdc3f11943de252a06
+++ packages/wvdial/wvdial_1.60.bb ccbc1ba0ccfa6b93039796cdc3f11943de252a06
@@ -0,0 +1,17 @@
+HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial"
+DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux \
workstation to the Internet." +
+PR = "r1"
+
+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/ppp/peers 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
+}
============================================================
--- MAINTAINERS 68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb
+++ MAINTAINERS 5556c9277c3381070987310400058abdd5f4c820
@@ -165,7 +165,7 @@ Mail: mlauer@vanille-media.de
Person: Michael 'Mickey' Lauer
Mail: mlauer@vanille-media.de
-Distros: OpenMoko, Ångström, Generic
+Distros: Openmoko, Ångström, Generic
Machines: om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
Interests: Core OE infrastructure, everything Python, EFL, E17, Qt4
Recipes: *python*, efl/*, e17*
============================================================
--- classes/insane.bbclass 071cc4297bda486033be0ee2ba642fda644a63e8
+++ classes/insane.bbclass 8a4b746dec67863e553a4824eecb3a7e6e9830d9
@@ -336,7 +336,7 @@ def package_qa_check_staged(path,d):
workdir = os.path.join(tmpdir, "work")
installed = "installed=yes"
- if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d):
+ if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d) or \
bb.data.inherits_class("sdk", d): pkgconfigcheck = workdir
else:
pkgconfigcheck = tmpdir
============================================================
--- conf/checksums.ini 45003c6575eee344823ebc073a31240ba42d22cc
+++ conf/checksums.ini 7133e53e683443e4522bb1dd79fea538f45d2bb9
@@ -334,6 +334,10 @@ sha256=d0b5d4dce02c56d2eb0728db3ebd63afc
md5=70084ffa561660f07de466c2c8c4842d
sha256=d0b5d4dce02c56d2eb0728db3ebd63afc3dae906d158be6532ae4480d311e167
+[http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2]
+md5=afb5451049eda91fbde10bd5a4b7fadc
+sha256=f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
+
[http://jerakeen.org/files/PythonDaap-0.4.tar.gz]
md5=f7672bfd563787a76fb7e9a43c062f18
sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
@@ -958,6 +962,106 @@ sha256=26c99025b59e30779300b68adb764f824
md5=00bfa16d58e034e3c2aa27f390390d30
sha256=26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001]
+md5=d8e10c754f477e3f3a581af566b89301
+sha256=beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002]
+md5=d38a5288b2f0ea6c9ac76b66cc74ef7d
+sha256=a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003]
+md5=0b90d37911827d8cb95f3b4353cc225e
+sha256=7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004]
+md5=8062f3a59631f58d78b180d83759b68a
+sha256=3de0938673637089c3b0f0f355de377bb2be2d3fca68053dda267ca11b5998f2
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005]
+md5=585b5943fadf0875ced243b245adde58
+sha256=e7fecdecb12320cd6fe9aca83fab1828b76aeb5313b991883764cb9139d845b7
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006]
+md5=1d5732e01ea938aeed42f3def131fa4d
+sha256=8f14f81ced32bc057bc10abf6842f4a5ac172816631f2b87a5a3be4f01c0847d
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007]
+md5=dcd0cc5d801607827f7c851e72b0eabc
+sha256=6863a712e5a68eccfb77162a9f947ffd80af648f0124c38f795ebba2be12eff8
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008]
+md5=bb3c7dd11198c0ab93d0e960bebf6256
+sha256=ccf303b4d199d89d5efc659235f8a645376e86d294260dda4becbb61ec06667b
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009]
+md5=434a6f29b0ca5f1ab784b2437ae8eaed
+sha256=ef30c579419106b4b4a2d0064ef7e57ceee6cdf657f4ccd7b89c8e4fd70560d8
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010]
+md5=2efff04dd246fcf63bd4b99f77c9a081
+sha256=bb7df9fefe88d62ee371353edf62402a667cffba6ea202aa1c8b220308a0c612
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011]
+md5=1dd104342f6920dfaf5efb3131e922e0
+sha256=85bf656cfc49b1447b061341a4b1cb93ba89a41d8d1699a65aa971d1853ba472
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012]
+md5=4f24b696ab78bdfae4f9cb7eb59b835d
+sha256=45ef4ad98f2f218aa3acec15842ae1b833769c1dbe2f90c9bba00bbe4949fc43
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013]
+md5=7c40addbf1187a26ae1c8373ed383442
+sha256=9fbf893c383f45d25e5bc5c9eae8d2b349521f288945b3bd21c781784b81f693
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014]
+md5=28e88c9f8679e99ac590d4a4a8227c56
+sha256=62bb1a4d70f6f7938ca70a6aa7fe6f4b377ab5f450c7756b22b41de3bbd98ed6
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015]
+md5=7c17d29675bd0d49470f162774385f80
+sha256=de40425e83628eb7431f39340ac09b42b5fcf484a565352851961b3e917d8771
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016]
+md5=a1edaa98b4449fe2205fa75448b7b105
+sha256=7abf66bbba3ebd6b6428190f3ebca59abdc0bfa3957f1a725489de7391c2d9f1
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017]
+md5=889ed119bbf9d363660b9a0127f35efa
+sha256=951aa2a07b38db8eea8e7368d3ac36af60af7f5ade455215006229ce3815dfe0
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018]
+md5=a7d3f85fa687d2c1b5a134839f6d395d
+sha256=c85e2bca6084a79774adbf801698c62905662836334e54355b77fbf1c529074c
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019]
+md5=f0399da4007e46fc5820ce25d07425b9
+sha256=d83f1d740cb103be444589dcd9da61c2802815e8c256a01cfa7e484c50a9eb85
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020]
+md5=b76602281c3104d904fd064510fe0c21
+sha256=3e66a1d05566d5501c2f868d3c94b8d71821a21d0daf9baaf594369697793013
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021]
+md5=923374ae4403c92820f711e62e1d01a5
+sha256=a5e54704e6867c969a3e60556a5fbacedecca7404c3ddbe8180a92b6898a2a58
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022]
+md5=c82d3bd14e373878b2a680dce18d1596
+sha256=057e03d593b858637056c0458b168e9c012db914727abba964afcaf377f2c5a4
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023]
+md5=987c949a77b4b0ffe4a2597141e77635
+sha256=869466d80807cde59c0eab9a39ef1909be4d5e8698ea1e3daa530ad59baaa97a
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024]
+md5=5a2b976e761ab83f0fc7daae11451b86
+sha256=d13c59fa6b182f79bbf9ba35f72085aeb755f9785985eaf9f4a55d58045fe327
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025]
+md5=08668dc2825f65eced9cac6b09ce1b45
+sha256=abfc1e1db3af956d4e71deb6a1ea9de1164c49fca4020b2546df3aa56f08cebe
+
[http://www.caliban.org/files/bash/bash-completion-20040711.tar.gz]
md5=90ee706965dbf7b24515220d3bdc1f85
sha256=8e4ddca8aa5ae4261bfcba056292aec4c8bf26fe847e01b67f4b3065fc512a54
@@ -1134,6 +1238,10 @@ sha256=f25791ae3c83fe739a3c810c5fe0d7ac3
md5=58fff2bc38594fe8ab0803f66cce2325
sha256=f25791ae3c83fe739a3c810c5fe0d7ac3e2ed02df9d3a65edff382703f5d2c65
+[http://bluez.sourceforge.net/download/bluez-hcidump-1.38.tar.gz]
+md5=b7a44fb9b498780e66542b943b25a90f
+sha256=b860e314b984d3f9ba5341e2eea08e3d988863748aa16a18bfd3fe5188899239
+
[http://bluez.sourceforge.net/download/bluez-hcidump-1.40.tar.gz]
md5=c5793b79c3e7fea3a367c08c26c8e23c
sha256=00dbb7513115d2fcdb7ca3bd777e4bc38e5ed80964fec2d1454e4acadc950094
@@ -1154,6 +1262,10 @@ sha256=3ea7817c91b8cff9cacba23392f4a4163
md5=8f0368c6213abef36f1e563b44b2eed4
sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
+[http://bluez.sourceforge.net/download/bluez-libs-3.28.tar.gz]
+md5=3cb2072e11c81398710d8f565ac3c88f
+sha256=540b807559b3d753644db5a4f849226b0dbf27746df8a761878d848fc9710e05
+
[http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
md5=8b73b0ccbcef6a4270468487b1309990
sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
@@ -1186,6 +1298,10 @@ sha256=4f3d52cc207e438018b3a4c307d996986
md5=767ad814bff4e1806f873ecf2434ba89
sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
+[http://bluez.sourceforge.net/download/bluez-utils-3.28.tar.gz]
+md5=9966fe59e228efc6626d47f2f2732d43
+sha256=1e038d406998dee998b88927cd25c725398c5b8f78d1d31b7be986c5f6603ac4
+
[http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
md5=f63b440396baee7dee9259395a205d48
sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
@@ -1226,6 +1342,10 @@ sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1
md5=00b1eee7f98b68fa762c4efb3b34caa1
sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf
+[http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz]
+md5=77a1ba78f37bdd7f024b67e1e36ad151
+sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26
+
[http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz]
md5=b86fb56a824d4a3dedcbda12f8b1a2b3
sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66
@@ -1346,6 +1466,14 @@ sha256=3400bf837d214adc8522d1e78bae936c0
md5=12851f4844bcda78ef4ba9168e16cc56
sha256=3400bf837d214adc8522d1e78bae936c0c2cde2127ab1ee095587b946a6b5131
+[http://www.busybox.net/downloads/busybox-1.9.1.tar.gz]
+md5=b9ae7be6e9a112ea5653855bbe70b501
+sha256=722071b14aba77ce6e2a83608b2ae4d4dab318d7f339d83e6c1719886b21aed9
+
+[http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch]
+md5=9e5d99b89d79dd117310ee675322d9f2
+sha256=3fe138dc567d0fcda304f89523686aaec2f83c9193403cfc68d1ba32fa554511
+
[http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz]
md5=b9d77c57bda2e019207a1874d9bb4dea
sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
@@ -1890,10 +2018,18 @@ sha256=a1fa714482f25a67a19490303a0164326
md5=200b9f5d74175875fcb3ee54adbf0007
sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
+[http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz]
+md5=200b9f5d74175875fcb3ee54adbf0007
+sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
+
[http://samba.org/ftp/tridge/dbench/dbench-3.04.tar.gz]
md5=efd0c958da79c1cd941ecd3f63e637ae
sha256=055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b
+[http://samba.org/ftp/tridge/dbench/dbench-4.0.tar.gz]
+md5=1fe56ff71b9a416f8889d7150ac54da4
+sha256=6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a
+
[http://downloads.sourceforge.net/dbh/dbh_1.0-18.tar.bz2]
md5=dca09e2949616471669320e3429a49ef
sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6
@@ -2282,6 +2418,10 @@ sha256=75a4861bf7dcc96a871611350276f10a8
md5=e5d8dcb5995913ae6b7f205e7ac28dbe
sha256=75a4861bf7dcc96a871611350276f10a87b0f7c44a1bbab1108374828bccf509
+[http://people.openmoko.org/stefan/e_nm-big-hack.patch]
+md5=91d8ce9e7bfcc0a61220ebc4ea83ab5f
+sha256=60ed501bd19b61f7d8456a2e906c890307e73f20ec1e4186d4eca312a74b0d05
+
[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.2.tar.bz2]
md5=9db49742bd4c17966fff7d76ac566d31
sha256=978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df
@@ -3266,6 +3406,10 @@ sha256=c119ce82f0e42d3412420c42c1ead75e0
md5=18be4e7a1ac713bda93d00fee20bbef8
sha256=c119ce82f0e42d3412420c42c1ead75e0b9de67131a5c9dd3cdab509f65ddfdd
+[ftp://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.gz]
+md5=925695333524108291dc4012c4c9cbb8
+sha256=a3c5455f30ffb3e6eeafb9e54598b48f9fbf46e3e99f431120360c183ddcc889
+
[ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz]
md5=1d1b1d5c0245b1c00aff92da751e9aa1
sha256=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
@@ -3410,6 +3554,10 @@ sha256=10e6ebecc2cbd07f193a5d26b88c3bf21
md5=7ee7874108cbe9ea7fff1f4ab3389ce8
sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.1.tar.bz2]
+md5=9852daf0605f827bfd7199ffe4f5b22d
+sha256=f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695
+
[http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
md5=aa214a10d873b68ddd67cd9de2ccae55
sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
@@ -3670,6 +3818,10 @@ sha256=098d920cb7d4a50e245deaafabfd8e06b
md5=bf4a6d95180d05981893e5d021c6695c
sha256=098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.22/gnome-vfs-2.22.0.tar.bz2]
+md5=369105fd82cb99e69e63acab8f3b89b7
+sha256=622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-2.6.0.tar.bz2]
md5=4d0323cf015dd006210fcacd4bfe7420
sha256=e2094c83a810319674e9c5ea24ac1325e8ea31e3df2e2efd41c70a07742caa6d
@@ -4346,6 +4498,10 @@ sha256=376796ba50ee251af63c1fe2aa17603aa
md5=4d33cbdf844fcee1c724e4cf2a32dd11
sha256=376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
+[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.gz]
+md5=0a2d20f70e6e01a4869ad6b7497404ae
+sha256=9b5c1d9dd51c4c8909219619412c7a983512b6ac958ab4cf661322d930c2a665
+
[http://downloads.sourceforge.net/gphoto/gphoto2-2.1.4.tar.bz2]
md5=5bbee55d4e59b063d3cff0fbc9121006
sha256=c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb
@@ -4386,6 +4542,10 @@ sha256=39e8d629da469d2032ad3554ff502d270
md5=1ad07e10f34e46ffdaf10688743f2f43
sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
+[http://download.berlios.de/gpsd/gpsd-2.36.tar.gz]
+md5=bb54e89ddb4fdc7af8bbc5534652f9ce
+sha256=0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a
+
[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz]
md5=28b13b7253c8f019433be68686070558
sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
@@ -4482,6 +4642,10 @@ sha256=9ac7eb27c9975d4cd24cd3da9b457e697
md5=395f3ed705928e77e5620cccf11a8cff
sha256=9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.6.tar.bz2]
+md5=fb47838aa0ccef52683cea5d89364053
+sha256=c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6
+
[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.11.tar.bz2]
md5=2e78ff25635b31d948def7c2b2d79054
sha256=2193e3f940f0fd2ca10a137efbb79bc1edc8a12543b618b9a97f680f9d15bfb4
@@ -4502,6 +4666,10 @@ sha256=7be5984162333dae48d8f7e58e6c7f4b4
md5=21ec9c7ac4b02de019a6d8e8c2aaa2a3
sha256=7be5984162333dae48d8f7e58e6c7f4b43726c78e2ca13aca6618b1342af8d37
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.17.tar.bz2]
+md5=151b66228e08ab0c7601713030fb1c3f
+sha256=f82cfd5669c756726f503dde5936e2fbe2969631095f0efc40df1fae1a74f70d
+
[http://telepathy.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.10.1.tar.gz]
md5=578ef83efd03124e7085abe719513bac
sha256=623e187f87037a690b5d0beef5991b3f2a58bb5058fad8c75329f48f0b07da4b
@@ -4522,6 +4690,10 @@ sha256=9e9cd6a5e134c29400b9dc302e523684d
md5=25f111360c2930705b91b4fcf93ae5c5
sha256=9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.7.tar.bz2]
+md5=e02d729b22451f75414a27456ae5c16a
+sha256=9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d
+
[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
md5=cf604b6acd80b57dc5173db7e93fc116
sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
@@ -4534,10 +4706,18 @@ sha256=9c514d4002fb2a2efc5c60e009c330be2
md5=f1016148ecbfba968c0ef1773066988b
sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.7.tar.bz2]
+md5=cff4f55138d12152cf580a3ee71c2519
+sha256=556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35
+
[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.4.tar.gz]
md5=7c60018e8b9ce7f62c7078bee5851f07
sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98
+[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.7.tar.gz]
+md5=166164eb07eacd1d70b965731eb6cbdb
+sha256=b9f1bb98917d9879d46b6a959ce9068471908763f2ca98e480837485e290b106
+
[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.7.tar.bz2]
md5=16dd6515fd011ad449e5ce191dbb94be
sha256=24520b3e33f98a3bcc79ad68f7d426475cbacf12e4c56338f58a05158523d71d
@@ -4562,6 +4742,10 @@ sha256=11d65e787ad24596af3f84744655f7c6a
md5=3b0ba3698bfdb0a59918563ca285cefd
sha256=11d65e787ad24596af3f84744655f7c6ad0c747e2c285248dda4e5893d0b317a
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.17.tar.bz2]
+md5=3232416ea6fceab628236d67a7d0a44a
+sha256=442862dc93e734aa58f13bcf3914dc7a40d3fa28f0ae2152c80457438dc3569c
+
[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.8.tar.bz2]
md5=a094ea86d4cea4f23ef2eb8c6e7bfc10
sha256=e17b33586d9f4ff656ed04559ed765b50affc19309074ef5bdf4ff62f5a1c863
@@ -4590,6 +4774,10 @@ sha256=faa1dc73f8077f72849ade14963202d8a
md5=e9c280afec29b11772af5a7c807abf41
sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
+[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.3.tar.bz2]
+md5=dc8455144f27945f2fcbe91e75acd118
+sha256=e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa
+
[http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
md5=c6697665e06cad01e87c2cf8d0913725
sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -5258,6 +5446,10 @@ sha256=038aabd2894f46d3a4a7583ab2bff13b2
md5=193b570128cf852afba337438413adf9
sha256=038aabd2894f46d3a4a7583ab2bff13b2da51682ccb921ceb7c87326ec1d344f
+[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.22-070710.tar.gz]
+md5=20ef2767896a0f156b6fbabd47936f79
+sha256=3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a
+
[http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.5-rc1.tar.bz2]
md5=74fc66f01937076f65079e194dd2b0d0
sha256=325bfc9607ccf56e7de0e7973e18fac76678e50b8cf24d3818b4feb734a0e45d
@@ -5670,6 +5862,10 @@ sha256=45ca55bdac904a07b8118618c65ddb5bf
md5=ee215536ea78798268ab3a444d10135a
sha256=45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514
+[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.4.tar.bz2]
+md5=73671d8f1cf36fdd81395328cc3539c9
+sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
md5=ded3c7ed6d6ca2c5e257f60079a1a824
sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
@@ -5790,6 +5986,10 @@ sha256=07567b9880f28d1a404389c024a185419
md5=d1d3fa170d74b066f1f23ca8574e7c90
sha256=07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd
+[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.3.1.tar.bz2]
+md5=b2f396b62633819bbdd9748383876e21
+sha256=dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfont-X11R7.0-1.0.0.tar.bz2]
md5=955c41694772c9fd214e3e206f5d2178
sha256=47d4de6986f6ca85bc48ecd76188d7f3f009e1aeb640008cab12ac5ca5896622
@@ -5870,6 +6070,10 @@ sha256=2d5c5242b8417db6aa758e5be387de333
md5=37b7d1826c6a02107269632a93b8791f
sha256=2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d
+[http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.7.tar.bz2]
+md5=cd15ee542d9f515538b4462a6f79d977
+sha256=64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXpm-X11R7.0-3.5.4.2.tar.bz2]
md5=f3b3b6e687f567bbff7688d60edc81ba
sha256=58bb490a8c97e8b7e57525f105378a65dc5f7571765aea6a8f473d93e8713807
@@ -5962,6 +6166,10 @@ sha256=eef98ad3d35254384c3714cd63826fc20
md5=032d5c1d3914fc0224837328c88aef96
sha256=eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
+[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.0.3.tar.bz2]
+md5=090c1ad04e34982eada5cf3b1a0792fd
+sha256=b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXtst-X11R7.0-1.0.1.tar.bz2]
md5=3a3a3b88b4bc2a82f0b6de8ff526cc8c
sha256=93d9c1fb831e2aaaab4627835e79ae0550837cbe18a0d6bc91edc2aa3ea67ad3
@@ -5990,6 +6198,10 @@ sha256=8c68f429942b1258cff0fb27505645a46
md5=5b0e752c71a23e9d1290cad44a7c7c75
sha256=8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.0.2.tar.bz2]
+md5=6f5f621804ee652b6cc6f2025c517c78
+sha256=59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86dga-X11R7.0-1.0.0.tar.bz2]
md5=d2154a588953d8db4ae6252ebc7db439
sha256=8bc2f9b7efe25f9765db6963501bcb06efef292006e184d5fe3f8b8f2a9c5199
@@ -6046,6 +6258,10 @@ sha256=99565c6f8a560abc24bf6c07726737d54
md5=12e136a4c0995068ff134997c84421ed
sha256=99565c6f8a560abc24bf6c07726737d54db64daae08c8708fc9e8f3aeb723985
+[http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz]
+md5=b92cba3cbcf1ee9bc221118a85d23dcd
+sha256=e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954
+
[http://www.25thandclement.com/~william/projects/releases/libarena-0.2.tgz]
md5=dc51d2466493d16a81af10ae0390b292
sha256=560a17bc5d9e8ef71579391703c2a138d365e68396a5d8b21b1d9e1b232e16d0
@@ -6782,6 +6998,10 @@ sha256=c1d5b4edeb1f2b20ce35ab13b2c0464b6
md5=0f57cb7085dc27e054691bff858613c9
sha256=c1d5b4edeb1f2b20ce35ab13b2c0464b6e03a43934d626161a780578bbbb8161
+[http://people.suug.ch/~tgr/libnl/files/libnl-1.0-pre8.tar.gz]
+md5=cc54b3ed25ba45d45a966b9355030810
+sha256=2cd7db997d6ac673b67655a9550844839427d7283ae6d6b1b86afa1b7bc865c1
+
[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.2.tar.gz]
md5=25585318503079a513af7064bb59c04d
sha256=9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e
@@ -6902,6 +7122,10 @@ sha256=cac67ef8837a2bdd20d7fb5e990e233d8
md5=2e1b5e983654c1d5991450e3e0e525ca
sha256=cac67ef8837a2bdd20d7fb5e990e233d80a9ff398cf08a62bb7fac068a419b3e
+[http://www.tcpdump.org/release/libpcap-0.9.8.tar.gz]
+md5=5208f24d0328ee7c20b52c43eaa9aa0e
+sha256=c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
+
[http://www.xmailserver.org/libpcl-1.4.tar.gz]
md5=6d63c462911349de80109c0161ed6d37
sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
@@ -7066,6 +7290,10 @@ sha256=6b498c1070e17f665625dc3e5113e8af5
md5=3b291762e0149c975dab9f5ea15bad15
sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4
+[http://downloads.sourceforge.net/libspiff/libspiff-0.8.2.tar.bz2]
+md5=e6505bdff9048bf61533c00caf48d553
+sha256=8451c7182a99f0f4a88b3c19234c5182689f91444c50fcb510452b5e5b8a7805
+
[http://www.0xbadc0de.be/libssh/libssh-0.11.tgz]
md5=ad703c4702646c83ca4fcace92c220d3
sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
@@ -7326,6 +7554,10 @@ sha256=ccefd4ceb29bb729dcaa9a9d4a86654a9
md5=59fe34e85692f71df2a38c2ee291b3ca
sha256=ccefd4ceb29bb729dcaa9a9d4a86654a9134adfd29bdd72be1a9d3726efb54e0
+[ftp://xmlsoft.org/libxml2/libxslt-1.1.22.tar.gz]
+md5=d6a9a020a76a3db17848d769d6c9c8a9
+sha256=4e1f39ee16596fd2a83d28d6c3b065f742254f3336f93ce8ed1cae48ecbe49da
+
[http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz]
md5=d775d6478391b95d841a1018c8db0b95
sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
@@ -7930,6 +8162,10 @@ sha256=81a23a4af797cf350759fd5ac73879701
md5=3e158dcf57823b55c926d95b245500fb
sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff
+[http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2]
+md5=3e158dcf57823b55c926d95b245500fb
+sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff
+
[http://openembedded.org/dl/matrixssl-1-1-1.tar.gz]
md5=0f867a7b5ce70650f36caf00c4941ebf
sha256=b46ade42d080851ba4c5a10d3c520eb169fc33ab5c259ee8ca147eff57741246
@@ -8270,6 +8506,10 @@ sha256=359f0d344f92d1f145ddcd37adf54f9b8
md5=cf7c743e4be122e63eb6f372fc58b657
sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
+[http://www.mpfr.org/mpfr-2.3.1/mpfr-2.3.1.tar.bz2]
+md5=8352b619e04dcc73411a38b39dd855f6
+sha256=d857f9df4a6cf50d0bc57dd11296dd1a8d1ac709442875ea4fcd757a89da8430
+
[http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
md5=bb403b35c2d25655d55f0f616b8f47bb
sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
@@ -8678,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
@@ -8894,6 +9142,10 @@ sha256=420e3508c74873f9b4c106d7c4d1b0800
md5=282dcff56292359f6a5c75be0b4fe3df
sha256=420e3508c74873f9b4c106d7c4d1b0800c138e8f3c07d1ec57aa5995f126899b
+[http://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-1.18.3.tar.bz2]
+md5=4a9862b5151f16dcad8e30dd6ef08549
+sha256=a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
+
[ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
md5=39868e0da250fd4c00b2970e4eb84389
sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
@@ -9262,6 +9514,10 @@ sha256=4e75cb28793f0d44134f71fae53057d5f
md5=5988e7aeb0ae4dac8d83561265984cc9
sha256=4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
+[http://freshmeat.net/redir/popt/72854/url_bz2/popt-1.13.tar.gz]
+md5=b5c47ce0185c83f947953c77000533bf
+sha256=722b939b14e8b510bbb24e3109a075c7d86b33bec05cb583e76769df9ef2661f
+
[http://downloads.sourceforge.net/poqetp/poqetp_0.0.6_src.tar.gz]
md5=b003614237445d23b512cb9571565524
sha256=4347a70fe84bd2ccecc90738fb121d28298cf0bfdb4963ceee088c56d3109899
@@ -9274,6 +9530,10 @@ sha256=02c820d39f3e6e729d1bea3287a2d8a6c
md5=ac108ab68bf0f34477f8317791aaf1ff
sha256=02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
+[http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz]
+md5=ac108ab68bf0f34477f8317791aaf1ff
+sha256=02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
+
[ftp://ftp.debian.org/debian/pool/main/p/portmap/portmap_5-25.diff.gz]
md5=b78c2ecfe378b03b8f1b36d2aed94eac
sha256=09595393c56b24d45476bf414f9e32cf13d675711c8ac3f7e0754c938814e085
@@ -9358,6 +9618,10 @@ sha256=8b375f8cda83dfc7d84be44af41eedd48
md5=0f4e7982c6d4ec3b2cf38502dd1293a3
sha256=8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235
+[http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.4.tar.bz2]
+md5=7321847a60748b4d2f1fa16db4b6ede8
+sha256=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/printproto-X11R7.0-1.0.3.tar.bz2]
md5=15c629a109b074d669886b1c6b7b319e
sha256=23bfd57906a1787814480f57763ded8fc10a696a903a4768869c56061283e972
@@ -9430,6 +9694,10 @@ sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83
md5=669d52a70fb9a7a83c2507005bfa2a6f
sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.9.tar.gz]
+md5=8fa6f7a9611bb194d94311764022b197
+sha256=9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
+
[http://www.warmi.net/zaurus/files/puzz-le_2.0.0.tar.gz]
md5=76535893b779926874f618d3fbf3e92b
sha256=e4b4217b81ab0885db11cf7e0f18afdeaa969392fc15647a10c2aab9cbf583d8
@@ -10130,6 +10398,10 @@ sha256=ca437301becd890e73300bc69a39189ff
md5=996d8d8831dbca17910094e56dcb5942
sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
+[http://rsync.samba.org/ftp/rsync/rsync-3.0.0.tar.gz]
+md5=2122d460b4119749c6e5993938a9b501
+sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
+
[http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip]
md5=c7536e907363ea1da63430b49e42931d
sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
@@ -10266,6 +10538,10 @@ sha256=c426660739a93f94364de29cde222f7c3
md5=8f8725fa9b3385042115e84a06866ce6
sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62
+[ftp://ftp.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]
+md5=659bf15bbbb31817ebad9372c8827618
+sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/scripts-X11R7.0-1.0.1.tar.bz2]
md5=b5b43aa53372b78f1d67c86301e3dc02
sha256=b502bc765cffc23189b77ba4d22e843fe03404bfab4e24b97ff4daee58176b33
@@ -10642,6 +10918,10 @@ sha256=af0b4ca361435e54316ddf715737b5b94
md5=b4f631268d811189cfca1d5259cb5dd8
sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500
+[http://www.sqlite.org/sqlite-3.5.6.tar.gz]
+md5=903c9e935c538af392364a9172a3d98d
+sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
+
[http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
md5=0b7fcaab8e634ae2385984885c731082
sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
@@ -11234,6 +11514,10 @@ sha256=faa9b6e000509039bbd4e1f24694adacf
md5=1ceb626a86630287cc28585eb16d7131
sha256=faa9b6e000509039bbd4e1f24694adacf2cd86228d22240ec1a13acc13517aa6
+[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-118.tar.gz]
+md5=a8233f2afc62a8a8971f79df8878d57e
+sha256=4467f57484124b735450e05617c2aa0f75e0e56306e92c74f9dfe59bd028fcd9
+
[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-115.tar.gz]
md5=3ee465beef2d19c212fdb52d9a89d62e
sha256=07b29dfdd2d63090c76df04c2dcde323640708c5a06b346cb299c0aba4351a3e
@@ -11494,6 +11778,10 @@ sha256=4f1f6ba6410e5f2aeb473d0a09caaa528
md5=80d3ae3bbae2a488d433d86b8fd64777
sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
+[http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz]
+md5=47845fd76f5f2354a3619c4097575487
+sha256=617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad
+
[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz]
md5=aaccdffc5656095a45dfe87c5bf612cb
sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
@@ -11518,6 +11806,10 @@ sha256=0e61bbccbc6689d8d9ea4842795498d3f
md5=a42c893a01e3d9818789be373e529422
sha256=0e61bbccbc6689d8d9ea4842795498d3ff85079b870eda899cbbd7beb80866ec
+[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.13.tar.bz2]
+md5=40480f20f6b7664f3d364e4f2ed27889
+sha256=edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
+
[http://downloads.sourceforge.net/vtun/vtun-2.6.tar.gz]
md5=309534fd03c5d13a19c43916f61f4bbf
sha256=fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
@@ -11662,6 +11954,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
@@ -11862,6 +12162,10 @@ sha256=cac2771b67942d9a00b46532176feb18b
md5=e3008eb0655da3026c162a5597d70869
sha256=cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053
+[http://xorg.freedesktop.org/releases/individual/app/xev-1.0.3.tar.bz2]
+md5=a9532c3d1683c99bb5df1895cb3a60b1
+sha256=d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xev-X11R7.0-1.0.1.tar.bz2]
md5=5d0d3c13b03e9516eafe536e6bd756c7
sha256=eb7ea9a7917fa6d603529e76f793e56baefa87a3034602634c73f9b284adc8b7
@@ -12542,6 +12846,10 @@ sha256=3ee1db2481ea222269bd201eef4d0e5d8
md5=461aa291a23e8cf387b70f3efa71b05c
sha256=3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
+[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.3.tar.bz2]
+md5=42fdcebc66efac02ab4beec2b1b0ad6e
+sha256=5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86dgaproto-X11R7.0-2.0.2.tar.bz2]
md5=48ddcc6b764dba7e711f8e25596abdb0
sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf
@@ -12798,6 +13106,10 @@ sha256=1e7056db4441ccb0dff0f77503e3fd49a
md5=9df52a504dc04313a6650fae364ae04a
sha256=1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.5.tar.bz2]
+md5=9a2aad51042141a0e6ad066015397595
+sha256=95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
md5=6d2df59fa328cbc99c0de98bc2e14597
sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
@@ -12914,6 +13226,10 @@ sha256=4bed79ba6efcaabb3ce055cf88419a519
md5=ea78b3e32e27c3662f86ea68b3aec22f
sha256=4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
+[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.3.tar.bz2]
+md5=626731003ec22a74ecf9e44ed098bbdf
+sha256=c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmodmap-X11R7.0-1.0.0.tar.bz2]
md5=240ed53111925e005d2f138ea98ef5e1
sha256=017530da4262a6e52c87cb8ea47aebc83fcd82346cc8072f02ba9de060407be3
@@ -12958,6 +13274,10 @@ sha256=93c656f142f37607c15372dd24c5de9ea
md5=a51a7d482e3c689394755bb17bda8526
sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.tar.bz2]
+md5=a06d9fe4f9f1d459ae02657f9ce64220
+sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
md5=0e7527480fb845a3c2e333bd0f47ff50
sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -13066,6 +13386,10 @@ sha256=a4a3b8cd821adc201a072f8c0214d73ee
md5=380b2ef545306354cc150834de567be7
sha256=a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c
+[http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.4.tar.bz2]
+md5=34eb2311a0c5279e7b4f492e826f63d1
+sha256=3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrdb-X11R7.0-1.0.1.tar.bz2]
md5=a3c1fd6f5391de7f810239a912d39fa5
sha256=adf3f97fcb0d768e19058e94dd4aaec70ea61afa8077f6c6e99aa70bc8564e14
@@ -13138,6 +13462,10 @@ sha256=ce1e17c513a4499526e648a59c39ba017
md5=1b781a0802c7b8fb9619a6665607b3f0
sha256=ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9
+[http://xorg.freedesktop.org/releases/individual/app/xset-1.0.3.tar.bz2]
+md5=657bbb43ce5470c33665d187c1740566
+sha256=0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xset-X11R7.0-1.0.1.tar.bz2]
md5=a0350e334a215829166266e2ce504b1c
sha256=db17d017fff06df2e47f9d123bfb4f1d63a063eb3c08ec017292cc206bb293d1
============================================================
--- conf/distro/include/sane-srcrevs.inc 3959d79eb2b982cbd834472ccedfa58de152d874
+++ conf/distro/include/sane-srcrevs.inc 08a36f5f6e39c385d9c689389a96689cc687ad5b
@@ -25,6 +25,7 @@ SRCREV_pn-eglibc-intermediate ?= "5522"
SRCREV_pn-eglibc ?= "5522"
SRCREV_pn-eglibc-initial ?= "5522"
SRCREV_pn-eglibc-intermediate ?= "5522"
+SRCREV_pn-enlazar = "37"
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
SRCREV_pn-exalt-module ?= "78"
@@ -41,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "31"
-SRCREV_pn-illume-theme ?= "31"
+SRCREV_pn-illume ?= "39"
+SRCREV_pn-illume-theme ?= "39"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
@@ -78,7 +79,7 @@ SRCREV_pn-netsurf ?= "3859"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-neod ?= "4336"
SRCREV_pn-netsurf ?= "3859"
-SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager ?= "3202"
SRCREV_pn-networkmanager-applet ?= "200"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
@@ -175,4 +176,4 @@ SRCREV_pn-xoo ?= "1971"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1971"
+SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-
============================================================
--- packages/alsa/alsa-state.bb 2590f4545ccf7d78835320f929293f7d773dc9f9
+++ packages/alsa/alsa-state.bb b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32
@@ -7,31 +7,17 @@ RRECOMMENDS_alsa-state = "alsa-states"
DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
-RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"
PV = "0.1.0"
-PR = "r14.1"
+PR = "r14.3"
SRC_URI = " \
file://asoundrc \
file://asound.state \
file://alsa-state "
-SRC_URI_append_om-gta01 = " \
- file://capturehandset.state \
- file://captureheadset.state \
- file://gsmbluetooth.state \
- file://gsmhandset.state \
- file://gsmheadset.state \
- file://gsmspeakerout.state \
- file://stereoout.state \
- file://voip-handset.state \
- file://voip-headset.state"
-SRC_URI_append_om-gta02 = "\
- file://stereoout.state \
- file://gsmhandset.state \
- "
-
inherit update-rc.d
INITSCRIPT_NAME = "alsa-state"
============================================================
--- packages/efl1/edbus_cvs.bb d3da1a158da97f38b8d2c32c4994ac557c07dc4e
+++ packages/efl1/edbus_cvs.bb ecd6cb444aeac48cd019c31f15055fb2cca6157a
@@ -2,11 +2,13 @@ PV = "0.1.0.042+cvs${SRCDATE}"
DEPENDS = "dbus ecore efreet ewl"
LICENSE = "MIT BSD"
PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r5"
inherit efl
-SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
+SRC_URI = "${E_CVS};module=e17/libs/e_dbus \
+ http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330 \
\ + "
S = "${WORKDIR}/e_dbus"
EXTRA_OECONF = "--enable-build-test-gui"
============================================================
--- 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/networkmanager/networkmanager.inc 1fda3eeff5fcb4c7cef4c98029cb884193f091d9
+++ packages/networkmanager/networkmanager.inc bbb1ef257c00587fd0792c0671c5da3bf098c0b6
@@ -6,8 +6,6 @@ RDEPENDS = "wpa-supplicant iproute2 dhcd
DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
-PR = "r0"
-
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
\ file://NetworkManager \
file://99_networkmanager"
@@ -21,7 +19,7 @@ EXTRA_OECONF = " \
--without-gcrypt \
--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
--with-dhcdbd=/sbin/dhcdbd \
- --with-ip=/sbin/ip"
+ --with-ip=/sbin/ip.iproute2"
inherit autotools pkgconfig
@@ -41,20 +39,25 @@ do_install () {
install -d ${D}/${datadir}/
}
-pkg_postinst_${PN} () {
-if [ "x$D" != "x" ]; then
- exit 1
-fi
-/etc/init.d/populate-volatile.sh update
+pkg_postinst () {
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ /etc/init.d/populate-volatile.sh update
}
-PACKAGES =+ "libnmutil libnmglib"
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn"
FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
-FILES_${PN} += "${datadir} \
- ${libexecdir}"
+FILES_${PN} += " \
+ ${libexecdir} \
+ ${libdir}/pppd/*/nm-pppd-plugin.so \
+ ${libdir}/NetworkManager/*.so"
+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
+ ${libdir}/pppd/*/.debug/ "
FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
============================================================
--- packages/networkmanager/networkmanager_0.6.5.bb c44eba44dd018961750b625359c57e42f53463aa
+++ packages/networkmanager/networkmanager_0.6.5.bb b6f945c3ef7f135e07832220bac70bc8b91016d8
@@ -1,6 +1,6 @@ require networkmanager.inc
require networkmanager.inc
-PR = "r0"
+PR = "r2"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
\ file://NetworkManager \
============================================================
--- packages/networkmanager/networkmanager_svn.bb 9b937ee39ef7fa695a9532effa744c53c1caec94
+++ packages/networkmanager/networkmanager_svn.bb 3999d93f5e5da815a8cf63fe164ae8ea1926420c
@@ -7,33 +7,33 @@ PV = "0.7+svnr${SRCREV}"
RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
PV = "0.7+svnr${SRCREV}"
-PR = "r2"
+PR = "r5"
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
file://no-restarts.diff;patch=1;pnum=0 \
file://25NetworkManager \
file://99_networkmanager"
+S = "${WORKDIR}/trunk"
+
EXTRA_OECONF = " \
--with-distro=debian \
- --with-ip=/sbin/ip"
-# TODO: will /bin/ip from busybox do?
+ --with-ip=/sbin/ip.iproute2"
-S = "${WORKDIR}/trunk"
+inherit autotools pkgconfig
-inherit autotools pkgconfig
+do_stage () {
+ autotools_stage_all
+}
do_install_append () {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
install -d ${D}/etc/dbus-1/event.d
install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
+ sed -i s,/sbin/ip,/sbin/ip.iproute2, ${D}/etc/init.d/NetworkManager
}
-do_stage () {
- autotools_stage_all
-}
-
pkg_postinst () {
if [ "x$D" != "x" ]; then
exit 1
@@ -41,15 +41,18 @@ pkg_postinst () {
/etc/init.d/populate-volatile.sh update
}
-PACKAGES =+ "libnmutil libnmglib"
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn"
FILES_libnmutil += "${libdir}/libnm-util.so.*"
-
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
+FILES_${PN} += " \
+ ${libexecdir} \
+ ${libdir}/pppd/*/nm-pppd-plugin.so \
+ ${libdir}/NetworkManager/*.so"
+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
+ ${libdir}/pppd/*/.debug/ "
+
+FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
+
-FILES_${PN}-dev = "${includedir}/* \
- ${libdir}/*.so \
- ${libdir}/*.a \
- ${libdir}/pkgconfig/*.pc \
- ${datadir}/NetworkManager/gdb-cmd \
- "
============================================================
--- packages/openmoko-projects/assassin_svn.bb 080e285125a168b5f6d613c3bbd62d5d53591ad0
+++ packages/openmoko-projects/assassin_svn.bb 1e8ad042e56fd3840bbbaf252f5b243db31955ec
@@ -3,7 +3,7 @@ PV = "0.2+svnr${SRCREV}"
LICENSE = "GPL"
DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
PV = "0.2+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
============================================================
--- packages/openmoko2/openmoko-alsa-scenarios.bb eb767fd7563c9ddc41f630dbd3dd444d81f8a950
+++ packages/openmoko2/openmoko-alsa-scenarios.bb b87a3d0e6b06598563cde82c1ac271dac1ef50da
@@ -1,4 +1,4 @@
-DESCRIPTION = "Package for the different scenarios used by OpenMoko"
+DESCRIPTION = "Package for the different scenarios used by Openmoko"
SECTION = "openmoko/base"
PV = "1.0+svnr${SRCREV}"
PR = "r1"
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 0e72debac8a32ac92bb891159d502240447deef4
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb a93597ca618095b4d174aa972afb07241bb3df6a
@@ -10,10 +10,11 @@ HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL"
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"
-RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +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 \ + tzdata-australia tzdata-europe tzdata-pacific \
gst-meta-audio" PROVIDES = "qtopia-phone"
-PR = "r8"
+PR = "r10"
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
file://Xsession.d/89qtopia \
============================================================
--- packages/tasks/task-openmoko-qtopia-x11.bb a655b432f441812cb360f6ef19a77ef83becbbfa
+++ packages/tasks/task-openmoko-qtopia-x11.bb 9ba089cc7d924228e8bf151d1ad3d5279cc23c13
@@ -3,7 +3,7 @@ LICENSE = "MIT"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
LICENSE = "MIT"
-PR = "r48"
+PR = "r51"
inherit task
@@ -16,7 +16,6 @@ RDEPENDS_task-openmoko-qtopia-x11 = "\
#
DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: The Qtopia/X11 based User \
Interface" RDEPENDS_task-openmoko-qtopia-x11 = "\
- alsa-state \
bluez-hcidump \
readline \
qtopia-phone-x11 \
@@ -24,6 +23,7 @@ RDEPENDS_task-openmoko-qtopia-x11 = "\
illume \
illume-theme \
assassin \
+ enlazar \
diversity-daemon \
diversity-nav \
${XSERVER} \
============================================================
--- packages/tasks/task-openmoko-qtopia.bb eac4758da810225f99e5ea824c618acbf74c5b18
+++ packages/tasks/task-openmoko-qtopia.bb 7d1cecae9b4ec98093b90bcf86c71d5a9144c9b4
@@ -3,7 +3,7 @@ LICENSE = "MIT"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
-PR = "r45"
+PR = "r47"
PACKAGES = "task-openmoko-qtopia"
@@ -12,7 +12,6 @@ RDEPENDS_task-openmoko-qtopia = "\
#
DESCRIPTION_task-openmoko-qtopia = "Openmoko: The Qtopia based native User \
Interface" RDEPENDS_task-openmoko-qtopia = "\
- alsa-state \
bluez-hcidump \
readline \
gstreamer \
============================================================
--- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb e0a1d661be0f01d4779998587e419896d9504ca9
+++ packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042
@@ -9,11 +9,10 @@ PE = "1"
RDEPENDS_${PN} = "xserver-kdrive"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r5"
+PR = "r6"
+PV = "1.3.0.0+git${SRCREV}"
-XGLAMO_GIT_REV = "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-
-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 \
[Attachment #16 (text/html)]
<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/stereoout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/stereoout.state"
#
# add_dir "packages/openssl/openssl-0.9.7m"
#
# add_dir "packages/openssl/openssl-0.9.8g"
#
# add_dir "packages/wvdial"
#
# add_dir "packages/wvstreams"
#
# add_dir "packages/wvstreams/files"
#
# add_file "packages/gdb/gdb-cross-sdk_6.8.bb"
# content [9444a910f04467593c5c669381d5ed60212c8324]
#
# add_file "packages/gdb/gdb-cross_6.8.bb"
# content [80cc44c65e3370b012eff9b3dc7c84f1f080bd88]
#
# add_file "packages/gdb/gdb_6.8.bb"
# content [70de988e33bb0f209d1bd9a050d5691c210ee877]
#
# add_file "packages/git/git_1.5.3.bb"
# content [bb6af29b2561ea01603ca6aa37a84ec16f597cb1]
#
# add_file "packages/libnl/files/linux-header.patch"
# content [c80bf7e1a37a991954debd494073a91d32f42ede]
#
# add_file "packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch"
# content [c4d94662df225a0ee6e10889d64e44b213e8a5e8]
#
# add_file "packages/libnl/libnl_1.0-pre8.bb"
# content [75a1ae1e39545b0ba22753221a95f7101f36a2cb]
#
# add_file "packages/openmoko-projects/enlazar_svn.bb"
# content [da06261f116197bb096f6cef1c9740f28fc8a734]
#
# 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/wvdial/wvdial_1.60.bb"
# content [ccbc1ba0ccfa6b93039796cdc3f11943de252a06]
#
# add_file "packages/wvstreams/files/build-fixes-and-sanity.patch"
# content [01f17efed1dad3b066472e2a1501896f72a5154b]
#
# add_file "packages/wvstreams/wvstreams_4.4.1.bb"
# content [663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3]
#
# patch "MAINTAINERS"
# from [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
# to [5556c9277c3381070987310400058abdd5f4c820]
#
# patch "classes/insane.bbclass"
# from [071cc4297bda486033be0ee2ba642fda644a63e8]
# to [8a4b746dec67863e553a4824eecb3a7e6e9830d9]
#
# patch "conf/checksums.ini"
# from [45003c6575eee344823ebc073a31240ba42d22cc]
# to [7133e53e683443e4522bb1dd79fea538f45d2bb9]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [3959d79eb2b982cbd834472ccedfa58de152d874]
# to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
#
# patch "packages/alsa/alsa-state.bb"
# from [2590f4545ccf7d78835320f929293f7d773dc9f9]
# to [b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [d3da1a158da97f38b8d2c32c4994ac557c07dc4e]
# to [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
#
# patch "packages/git/git.inc"
# from [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
# to [78d5cbf5201f942c64ae36ae924b01ac6152208a]
#
# patch "packages/networkmanager/networkmanager.inc"
# from [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
# to [bbb1ef257c00587fd0792c0671c5da3bf098c0b6]
#
# patch "packages/networkmanager/networkmanager_0.6.5.bb"
# from [c44eba44dd018961750b625359c57e42f53463aa]
# to [b6f945c3ef7f135e07832220bac70bc8b91016d8]
#
# patch "packages/networkmanager/networkmanager_svn.bb"
# from [9b937ee39ef7fa695a9532effa744c53c1caec94]
# to [3999d93f5e5da815a8cf63fe164ae8ea1926420c]
#
# patch "packages/openmoko-projects/assassin_svn.bb"
# from [080e285125a168b5f6d613c3bbd62d5d53591ad0]
# to [1e8ad042e56fd3840bbbaf252f5b243db31955ec]
#
# patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
# from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
# to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [0e72debac8a32ac92bb891159d502240447deef4]
# to [a93597ca618095b4d174aa972afb07241bb3df6a]
#
# patch "packages/tasks/task-openmoko-qtopia-x11.bb"
# from [a655b432f441812cb360f6ef19a77ef83becbbfa]
# to [9ba089cc7d924228e8bf151d1ad3d5279cc23c13]
#
# patch "packages/tasks/task-openmoko-qtopia.bb"
# from [eac4758da810225f99e5ea824c618acbf74c5b18]
# to [7d1cecae9b4ec98093b90bcf86c71d5a9144c9b4]
#
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
# from [e0a1d661be0f01d4779998587e419896d9504ca9]
# to [d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042]
#
============================================================
<font color="#FF6600">--- \
packages/gdb/gdb-cross-sdk_6.8.bb 9444a910f04467593c5c669381d5ed60212c8324</font> \
<font color="#009900">+++ \
packages/gdb/gdb-cross-sdk_6.8.bb 9444a910f04467593c5c669381d5ed60212c8324</font> \
<font color="#0000FF">@@ -0,0 +1,7 @@</font> <font color="#009900">+require \
gdb-cross.inc</font> <font color="#009900">+</font>
<font color="#009900">+inherit sdk</font>
<font color="#009900">+</font>
<font color="#009900">+do_stage() {</font>
<font color="#009900">+ :</font>
<font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- \
packages/gdb/gdb-cross_6.8.bb 80cc44c65e3370b012eff9b3dc7c84f1f080bd88</font> <font \
color="#009900">+++ packages/gdb/gdb-cross_6.8.bb 80cc44c65e3370b012eff9b3dc7c84f1f080bd88</font>
<font color="#0000FF">@@ -0,0 +1,7 @@</font>
<font color="#009900">+require gdb-cross.inc</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI += "file://sim-install-6.6.patch;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit cross</font>
<font color="#009900">+</font>
<font color="#009900">+PR = "r0"</font>
============================================================
<font color="#FF6600">--- \
packages/gdb/gdb_6.8.bb 70de988e33bb0f209d1bd9a050d5691c210ee877</font> <font \
color="#009900">+++ packages/gdb/gdb_6.8.bb 70de988e33bb0f209d1bd9a050d5691c210ee877</font>
<font color="#0000FF">@@ -0,0 +1,4 @@</font>
<font color="#009900">+require gdb.inc</font>
<font color="#009900">+</font>
<font color="#009900">+PR = "r0"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- \
packages/git/git_1.5.3.bb bb6af29b2561ea01603ca6aa37a84ec16f597cb1</font> <font \
color="#009900">+++ packages/git/git_1.5.3.bb bb6af29b2561ea01603ca6aa37a84ec16f597cb1</font>
<font color="#0000FF">@@ -0,0 +1,5 @@</font>
<font color="#009900">+require git.inc</font>
<font color="#009900">+DEPENDS = "openssl curl zlib expat"</font>
<font color="#009900">+RDEPENDS = "perl perl-module-file-path cpio findutils \
sed"</font> <font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- \
packages/libnl/files/linux-header.patch c80bf7e1a37a991954debd494073a91d32f42ede</font>
<font color="#009900">+++ \
packages/libnl/files/linux-header.patch c80bf7e1a37a991954debd494073a91d32f42ede</font>
<font color="#0000FF">@@ -0,0 +1,24 @@</font>
<font color="#009900">+Index: libnl-1.0-pre8/include/netlink/netlink.h</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- libnl-1.0-pre8.orig/include/netlink/netlink.h 2007-11-21 \
18:25:39.000000000 +0100</font> <font color="#009900">++++ \
libnl-1.0-pre8/include/netlink/netlink.h 2008-04-07 03:18:14.000000000 +0200</font> \
<font color="#009900">+@@ -24,7 +24,6 @@</font> <font color="#009900">+ #include \
<linux/netlink.h></font> <font color="#009900">+ #include \
<linux/rtnetlink.h></font> <font color="#009900">+ #include \
<linux/genetlink.h></font> <font color="#009900">+-#include \
<linux/ip_mp_alg.h></font> <font color="#009900">+ #include \
<linux/netfilter/nfnetlink.h></font> <font color="#009900">+ #include \
<netlink/types.h></font> <font color="#009900">+ #include \
<netlink/handlers.h></font> <font color="#009900">+Index: \
libnl-1.0-pre8/lib/route/route_obj.c</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- libnl-1.0-pre8.orig/lib/route/route_obj.c 2008-04-07 \
03:20:25.000000000 +0200</font> <font color="#009900">++++ \
libnl-1.0-pre8/lib/route/route_obj.c 2008-04-07 03:20:35.000000000 +0200</font> <font \
color="#009900">+@@ -33,6 +33,7 @@</font> <font color="#009900">+ * @{</font>
<font color="#009900">+ */</font>
<font color="#009900">+ </font>
<font color="#009900">++#include <linux/ip_mp_alg.h></font>
<font color="#009900">+ #include <netlink-local.h></font>
<font color="#009900">+ #include <netlink/netlink.h></font>
<font color="#009900">+ #include <netlink/cache.h></font>
============================================================
<font color="#FF6600">--- \
packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch c4d94662df225a0ee6e10889d64e44b213e8a5e8</font>
<font color="#009900">+++ \
packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch c4d94662df225a0ee6e10889d64e44b213e8a5e8</font>
<font color="#0000FF">@@ -0,0 +1,13 @@</font>
<font color="#009900">+--- libnl-1.0-pre8/Makefile.opts.in.orig 2007-11-21 \
18:25:39.000000000 +0100</font> <font color="#009900">++++ \
libnl-1.0-pre8/Makefile.opts.in 2008-04-04 23:38:40.000000000 +0200</font> <font \
color="#009900">+@@ -10,8 +10,8 @@</font> <font color="#009900">+ #</font>
<font color="#009900">+ </font>
<font color="#009900">+ CC := @CC@</font>
<font color="#009900">+-CFLAGS := @CFLAGS@</font>
<font color="#009900">+-LDFLAGS := @LDFLAGS@</font>
<font color="#009900">++CFLAGS := -I./include -I. -I../include \
@CFLAGS@</font> <font color="#009900">++LDFLAGS :=</font>
<font color="#009900">+ CPPFLAGS := @CPPFLAGS@</font>
<font color="#009900">+ PACKAGE_NAME := @PACKAGE_NAME@</font>
<font color="#009900">+ PACKAGE_VERSION := @PACKAGE_VERSION@</font>
============================================================
<font color="#FF6600">--- \
packages/libnl/libnl_1.0-pre8.bb 75a1ae1e39545b0ba22753221a95f7101f36a2cb</font> \
<font color="#009900">+++ \
packages/libnl/libnl_1.0-pre8.bb 75a1ae1e39545b0ba22753221a95f7101f36a2cb</font> \
<font color="#0000FF">@@ -0,0 +1,19 @@</font> <font color="#009900">+DESCRIPTION = \
"libnl is a library for applications dealing with netlink sockets"</font> <font \
color="#009900">+SECTION = "libs/network"</font> <font color="#009900">+LICENSE = \
"LGPL"</font> <font color="#009900">+HOMEPAGE = \
"http://people.suug.ch/~tgr/libnl/"</font> <font color="#009900">+PRIORITY = \
"optional"</font> <font color="#009900">+PV = "0.99+1.0-pre8"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig gpe</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI= \
"http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre8.tar.gz \</font> <font \
color="#009900">+ \
file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \</font> <font \
color="#009900">+ file://linux-header.patch;patch=1 "</font> <font \
color="#009900">+</font> <font color="#009900">+S = \
"${WORKDIR}/${PN}-1.0-pre8"</font> <font color="#009900">+</font>
<font color="#009900">+do_stage () {</font>
<font color="#009900">+ autotools_stage_all prefix=${prefix}</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- \
packages/openmoko-projects/enlazar_svn.bb da06261f116197bb096f6cef1c9740f28fc8a734</font>
<font color="#009900">+++ \
packages/openmoko-projects/enlazar_svn.bb da06261f116197bb096f6cef1c9740f28fc8a734</font>
<font color="#0000FF">@@ -0,0 +1,17 @@</font>
<font color="#009900">+DESCRIPTION = "Enlazar - Network part for Assasin"</font>
<font color="#009900">+HOMEPAGE = "http://enlazar.projects.openmoko.org/"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+DEPENDS = "evas edje ecore edbus"</font>
<font color="#009900">+RDEPENDS = "networkmanager"</font>
<font color="#009900">+SRCREV = "${AUTOREV}"</font>
<font color="#009900">+PV = "0.1+svn${SRCREV}"</font>
<font color="#009900">+PR = "r3"</font>
<font color="#009900">+PE = "1"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = \
"svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"</font> \
<font color="#009900">+</font> <font color="#009900">+S = "${WORKDIR}/trunk"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF = ""</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.7m/armeb.patch faf20afb99b155b2cddce4e15a0feca6c02bee82</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.7m/armeb.patch faf20afb99b155b2cddce4e15a0feca6c02bee82</font>
<font color="#0000FF">@@ -0,0 +1,18 @@</font>
<font color="#009900">+--- Configure.orig 2006-03-22 16:29:20.000000000 +0100</font>
<font color="#009900">++++ Configure 2006-03-22 16:31:44.000000000 +0100</font>
<font color="#009900">+@@ -395,6 +395,7 @@</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">+ #"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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ #"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)",</font>
<font color="#009900">+@@ -474,6 +475,7 @@</font>
<font color="#009900">+ # ARM comes in both little- and big-endian flavors. The \
following line is</font> <font color="#009900">+ # endian neutral, but ./config is \
free to throw in -D[BL]_ENDIAN...</font> <font color="#009900">+ \
"linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer \
-Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">+ </font>
<font color="#009900">+ # SCO/Caldera targets.</font>
<font color="#009900">+ #</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.7m/avr32.patch 3b5c9b4ba8231648a8048095d6054f16289d3515</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.7m/avr32.patch 3b5c9b4ba8231648a8048095d6054f16289d3515</font>
<font color="#0000FF">@@ -0,0 +1,10 @@</font>
<font color="#009900">+--- Configure~ 2008-01-23 17:44:04.000000000 +0100</font>
<font color="#009900">++++ Configure 2008-01-23 17:44:04.000000000 +0100</font>
<font color="#009900">+@@ -442,6 +442,7 @@</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ # -bpowerpc64-linux is transient option, -m64 should be the \
one to use...</font> <font color="#009900">++"linux-avr32","gcc:-DTERMIO -O3 \
-fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG \
DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",</font> <font \
color="#009900">+ "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)",</font>
<font color="#009900">+ "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 \
-fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",</font> <font \
color="#009900">+ "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)",</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.7m/debian.patch 2e7b0df685842cedf705926ea7cfb1a5f6ffbee4</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.7m/debian.patch 2e7b0df685842cedf705926ea7cfb1a5f6ffbee4</font>
<font color="#0000FF">@@ -0,0 +1,832 @@</font>
<font color="#009900">+Index: openssl-0.9.7m/tools/c_rehash.in</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/tools/c_rehash.in 2002-10-11 \
22:35:45.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/tools/c_rehash.in 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font \
color="#009900">+-#!/usr/local/bin/perl</font> <font \
color="#009900">++#!/usr/bin/perl</font> <font color="#009900">+ </font>
<font color="#009900">+ </font>
<font color="#009900">+ # Perl c_rehash script, scan all files in a directory</font>
<font color="#009900">+Index: openssl-0.9.7m/tools/c_rehash</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/tools/c_rehash 2007-02-23 \
13:52:38.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/tools/c_rehash 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -6,7 +6,7 @@</font> <font color="#009900">+ </font>
<font color="#009900">+ my $openssl;</font>
<font color="#009900">+ </font>
<font color="#009900">+-my $dir = "/usr/local/ssl";</font>
<font color="#009900">++my $dir = "/usr/lib/ssl";</font>
<font color="#009900">+ </font>
<font color="#009900">+ if(defined $ENV{OPENSSL}) {</font>
<font color="#009900">+ $openssl = $ENV{OPENSSL};</font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- \
openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S 2003-05-30 00:22:34.000000000 \
+0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S 2008-04-12 02:37:45.000000000 \
+0200</font> <font color="#009900">+@@ -74,14 +74,14 @@</font>
<font color="#009900">+ #define Dval R8</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if defined(MD5_BLOCK_DATA_ORDER)</font>
<font color="#009900">+-# if defined(OPENSSL_SYSNAME_ULTRASPARC)</font>
<font color="#009900">++/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/</font>
<font color="#009900">+ # define LOAD lda</font>
<font color="#009900">+ # define X(i) [%i1+i*4]%asi</font>
<font color="#009900">+ # define md5_block md5_block_asm_data_order_aligned</font>
<font color="#009900">+ # define ASI_PRIMARY_LITTLE 0x88</font>
<font color="#009900">+-# else</font>
<font color="#009900">++/*# else</font>
<font color="#009900">+ # error "MD5_BLOCK_DATA_ORDER is supported only on \
UltraSPARC!"</font> <font color="#009900">+-# endif</font>
<font color="#009900">++# endif*/</font>
<font color="#009900">+ #else</font>
<font color="#009900">+ # define LOAD ld</font>
<font color="#009900">+ # define X(i) [%i1+i*4]</font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/pkcs7/pk7_mime.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/pkcs7/pk7_mime.c 2005-05-01 \
14:47:33.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/pkcs7/pk7_mime.c 2008-04-12 02:37:45.000000000 +0200</font> \
<font color="#009900">+@@ -297,9 +297,9 @@</font> <font color="#009900">+ </font>
<font color="#009900">+ if(strcmp(hdr->value, "application/x-pkcs7-signature") \
&&</font> <font color="#009900">+ strcmp(hdr->value, \
"application/pkcs7-signature")) {</font> <font \
color="#009900">+- sk_MIME_HEADER_pop_free(headers, mime_hdr_free);</font> <font \
color="#009900">+ PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE);</font>
<font color="#009900">+ ERR_add_error_data(2, "type: ", hdr->value);</font>
<font color="#009900">++ sk_MIME_HEADER_pop_free(headers, mime_hdr_free);</font>
<font color="#009900">+ sk_BIO_pop_free(parts, BIO_vfree);</font>
<font color="#009900">+ return NULL;</font>
<font color="#009900">+ }</font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/dsa/dsa_ossl.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/dsa/dsa_ossl.c 2006-09-28 \
13:53:49.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/dsa/dsa_ossl.c 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -286,6 +286,18 @@</font> <font color="#009900">+ return \
-1;</font> <font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++ if (BN_num_bits(dsa->q) != 160)</font>
<font color="#009900">++ {</font>
<font color="#009900">++ DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE);</font>
<font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">++ if (BN_num_bits(dsa->p) > \
OPENSSL_DSA_MAX_MODULUS_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);</font>
<font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">+ BN_init(&u1);</font>
<font color="#009900">+ BN_init(&u2);</font>
<font color="#009900">+ BN_init(&t1);</font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/dsa/dsa.h</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/dsa/dsa.h 2006-09-28 \
13:53:49.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/dsa/dsa.h 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -83,6 +83,10 @@</font> <font color="#009900">+ # define \
OPENSSL_DSA_MAX_MODULUS_BITS 10000</font> <font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">++#ifndef OPENSSL_DSA_MAX_MODULUS_BITS</font>
<font color="#009900">++# define OPENSSL_DSA_MAX_MODULUS_BITS 10000</font>
<font color="#009900">++#endif</font>
<font color="#009900">++</font>
<font color="#009900">+ #define DSA_FLAG_CACHE_MONT_P 0x01</font>
<font color="#009900">+ #define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with \
0.9.7h; the built-in DSA</font> <font color="#009900">+ \
* implementation now uses constant time</font> <font color="#009900">+Index: \
openssl-0.9.7m/crypto/rc4/asm/rc4-x86_64.pl</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- \
openssl-0.9.7m.orig/crypto/rc4/asm/rc4-x86_64.pl 2005-05-04 18:12:07.000000000 \
+0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/rc4/asm/rc4-x86_64.pl 2008-04-12 02:37:45.000000000 \
+0200</font> <font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+Index: \
openssl-0.9.7m/crypto/asn1/charmap.pl</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/asn1/charmap.pl 2000-07-28 \
03:58:11.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/asn1/charmap.pl 2008-04-12 02:37:45.000000000 +0200</font> \
<font color="#009900">+@@ -1,4 +1,4 @@</font> <font \
color="#009900">+-#!/usr/local/bin/perl -w</font> <font \
color="#009900">++#!/usr/local/bin/perl</font> <font color="#009900">+ </font>
<font color="#009900">+ use strict;</font>
<font color="#009900">+ </font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/sha/asm/sha1-ia64.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- \
openssl-0.9.7m.orig/crypto/sha/asm/sha1-ia64.pl 2004-12-09 21:55:52.000000000 \
+0100</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/sha/asm/sha1-ia64.pl 2008-04-12 02:37:45.000000000 +0200</font> \
<font color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/bin/env \
perl</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+Index: \
openssl-0.9.7m/crypto/bn/asm/ppc.pl</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/bn/asm/ppc.pl 2005-07-03 \
11:24:35.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/bn/asm/ppc.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/bin/env \
perl</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # Implemented as a Perl wrapper as we want to support several \
different</font> <font color="#009900">+ # architectures with single file. We pick up \
the target based on the</font> <font color="#009900">+Index: \
openssl-0.9.7m/crypto/rsa/rsa_eay.c</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/rsa/rsa_eay.c 2006-12-04 \
21:41:46.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/rsa/rsa_eay.c 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -336,6 +336,28 @@</font> <font color="#009900">+ int \
local_blinding = 0;</font> <font color="#009900">+ BN_BLINDING *blinding = \
NULL;</font> <font color="#009900">+ </font>
<font color="#009900">++ if (BN_num_bits(rsa->n) > \
OPENSSL_RSA_MAX_MODULUS_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, \
RSA_R_MODULUS_TOO_LARGE);</font> <font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">++ if (BN_ucmp(rsa->n, rsa->e) <= 0)</font>
<font color="#009900">++ {</font>
<font color="#009900">++ RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, \
RSA_R_BAD_E_VALUE);</font> <font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">++ /* for large moduli, enforce exponent limit */</font>
<font color="#009900">++ if (BN_num_bits(rsa->n) > \
OPENSSL_RSA_SMALL_MODULUS_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ if (BN_num_bits(rsa->e) > \
OPENSSL_RSA_MAX_PUBEXP_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, \
RSA_R_BAD_E_VALUE);</font> <font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++ }</font>
<font color="#009900">++ </font>
<font color="#009900">+ BN_init(&f);</font>
<font color="#009900">+ BN_init(&ret);</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -644,6 +666,28 @@</font>
<font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++ if (BN_num_bits(rsa->n) > \
OPENSSL_RSA_MAX_MODULUS_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, \
RSA_R_MODULUS_TOO_LARGE);</font> <font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">++ if (BN_ucmp(rsa->n, rsa->e) <= 0)</font>
<font color="#009900">++ {</font>
<font color="#009900">++ RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, \
RSA_R_BAD_E_VALUE);</font> <font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">++ /* for large moduli, enforce exponent limit */</font>
<font color="#009900">++ if (BN_num_bits(rsa->n) > \
OPENSSL_RSA_SMALL_MODULUS_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ if (BN_num_bits(rsa->e) > \
OPENSSL_RSA_MAX_PUBEXP_BITS)</font> <font color="#009900">++ {</font>
<font color="#009900">++ RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, \
RSA_R_BAD_E_VALUE);</font> <font color="#009900">++ return -1;</font>
<font color="#009900">++ }</font>
<font color="#009900">++ }</font>
<font color="#009900">++ </font>
<font color="#009900">+ BN_init(&f);</font>
<font color="#009900">+ BN_init(&ret);</font>
<font color="#009900">+ ctx=BN_CTX_new();</font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/rsa/rsa.h</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/rsa/rsa.h 2006-09-28 \
13:53:50.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/rsa/rsa.h 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -165,6 +165,17 @@</font> <font color="#009900">+ # define \
OPENSSL_RSA_MAX_PUBEXP_BITS 64 /* exponent limit enforced for "large" modulus only \
*/</font> <font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">++#ifndef OPENSSL_RSA_MAX_MODULUS_BITS</font>
<font color="#009900">++# define OPENSSL_RSA_MAX_MODULUS_BITS 16384</font>
<font color="#009900">++#endif</font>
<font color="#009900">++</font>
<font color="#009900">++#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS</font>
<font color="#009900">++# define OPENSSL_RSA_SMALL_MODULUS_BITS 3072</font>
<font color="#009900">++#endif</font>
<font color="#009900">++#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS</font>
<font color="#009900">++# define OPENSSL_RSA_MAX_PUBEXP_BITS 64 /* exponent limit \
enforced for "small" modulus only */</font> <font color="#009900">++#endif</font>
<font color="#009900">++</font>
<font color="#009900">+ #define RSA_3 0x3L</font>
<font color="#009900">+ #define RSA_F4 0x10001L</font>
<font color="#009900">+ </font>
<font color="#009900">+Index: openssl-0.9.7m/crypto/opensslconf.h</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/crypto/opensslconf.h 2007-02-23 \
13:52:32.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/crypto/opensslconf.h 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -4,17 +4,38 @@</font> <font color="#009900">+ /* OpenSSL was \
configured with the following options: */</font> <font color="#009900">+ #ifndef \
OPENSSL_DOING_MAKEDEPEND</font> <font color="#009900">+ </font>
<font color="#009900">++#ifndef OPENSSL_NO_IDEA</font>
<font color="#009900">++# define OPENSSL_NO_IDEA</font>
<font color="#009900">++#endif</font>
<font color="#009900">++#ifndef OPENSSL_NO_MDC2</font>
<font color="#009900">++# define OPENSSL_NO_MDC2</font>
<font color="#009900">++#endif</font>
<font color="#009900">++#ifndef OPENSSL_NO_RC5</font>
<font color="#009900">++# define OPENSSL_NO_RC5</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ #ifndef OPENSSL_NO_KRB5</font>
<font color="#009900">+ # define OPENSSL_NO_KRB5</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ #endif /* OPENSSL_DOING_MAKEDEPEND */</font>
<font color="#009900">++#ifndef OPENSSL_THREADS</font>
<font color="#009900">++# define OPENSSL_THREADS</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ /* The OPENSSL_NO_* macros are also defined as NO_* if the \
application</font> <font color="#009900">+ asks for it. This is a transient \
feature that is provided for those</font> <font color="#009900">+ who haven't had \
the time to do the appropriate changes in their</font> <font color="#009900">+ \
applications. */</font> <font color="#009900">+ #ifdef \
OPENSSL_ALGORITHM_DEFINES</font> <font color="#009900">++# if \
defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)</font> <font \
color="#009900">++# define NO_IDEA</font> <font color="#009900">++# endif</font>
<font color="#009900">++# if defined(OPENSSL_NO_MDC2) && \
!defined(NO_MDC2)</font> <font color="#009900">++# define NO_MDC2</font>
<font color="#009900">++# endif</font>
<font color="#009900">++# if defined(OPENSSL_NO_RC5) && \
!defined(NO_RC5)</font> <font color="#009900">++# define NO_RC5</font>
<font color="#009900">++# endif</font>
<font color="#009900">+ # if defined(OPENSSL_NO_KRB5) && \
!defined(NO_KRB5)</font> <font color="#009900">+ # define NO_KRB5</font>
<font color="#009900">+ # endif</font>
<font color="#009900">+@@ -27,7 +48,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical \
names instead */</font> <font color="#009900">+ #if defined(HEADER_CRYPTLIB_H) \
&& !defined(OPENSSLDIR)</font> <font color="#009900">+-#define OPENSSLDIR \
"/usr/local/ssl"</font> <font color="#009900">++#define OPENSSLDIR \
"/usr/lib/ssl"</font> <font color="#009900">+ #endif</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -79,7 +100,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if defined(HEADER_BN_H) && \
!defined(CONFIG_HEADER_BN_H)</font> <font color="#009900">+ #define \
CONFIG_HEADER_BN_H</font> <font color="#009900">+-#undef BN_LLONG</font>
<font color="#009900">++#define BN_LLONG</font>
<font color="#009900">+ </font>
<font color="#009900">+ /* Should we define BN_DIV2W here? */</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -98,7 +119,7 @@</font>
<font color="#009900">+ #define CONFIG_HEADER_RC4_LOCL_H</font>
<font color="#009900">+ /* if this is defined data[i] is used instead of *data, this \
is a %20</font> <font color="#009900">+ * speedup on x86 */</font>
<font color="#009900">+-#undef RC4_INDEX</font>
<font color="#009900">++#define RC4_INDEX</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if defined(HEADER_BF_LOCL_H) && \
!defined(CONFIG_HEADER_BF_LOCL_H)</font> <font color="#009900">+@@ -112,14 +133,14 \
@@</font> <font color="#009900">+ /* the following is tweaked from a config script, \
that is why it is a</font> <font color="#009900">+ * protected undef/define \
*/</font> <font color="#009900">+ #ifndef DES_PTR</font>
<font color="#009900">+-#undef DES_PTR</font>
<font color="#009900">++#define DES_PTR</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ /* This helps C compiler generate the correct code for \
multiple functional</font> <font color="#009900">+ * units. It reduces register \
dependancies at the expense of 2 more</font> <font color="#009900">+ * registers \
*/</font> <font color="#009900">+ #ifndef DES_RISC1</font>
<font color="#009900">+-#undef DES_RISC1</font>
<font color="#009900">++#define DES_RISC1</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ #ifndef DES_RISC2</font>
<font color="#009900">+@@ -133,7 +154,7 @@</font>
<font color="#009900">+ /* Unroll the inner loop, this sometimes helps, sometimes \
hinders.</font> <font color="#009900">+ * Very mucy CPU dependant */</font>
<font color="#009900">+ #ifndef DES_UNROLL</font>
<font color="#009900">+-#undef DES_UNROLL</font>
<font color="#009900">++#define DES_UNROLL</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ /* These default values were supplied by</font>
<font color="#009900">+Index: openssl-0.9.7m/ms/fipscheck.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/ms/fipscheck.pl 2006-01-28 \
14:34:27.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/ms/fipscheck.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font \
color="#009900">+-#!/usr/bin/perl</font> <font \
color="#009900">++#!/usr/local/bin/perl</font> <font color="#009900">+ </font>
<font color="#009900">+ # fipscheck.pl</font>
<font color="#009900">+ # sample perl script to check integrity of critical FIPS \
files</font> <font color="#009900">+Index: openssl-0.9.7m/Configure</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/Configure 2007-02-22 \
23:30:49.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/Configure 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-:</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ eval 'exec perl -S $0 ${1+"$@"}'</font>
<font color="#009900">+ if $running_under_some_shell;</font>
<font color="#009900">+ ##</font>
<font color="#009900">+@@ -390,6 +390,43 @@</font>
<font color="#009900">+ # assembler versions -- currently defunct:</font>
<font color="#009900">+ ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 \
-fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR \
DES_RISC2:${alpha_asm}",</font> <font color="#009900">+ </font>
<font color="#009900">++# Debian GNU/* (various architectures)</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++#"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++#"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++#"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",</font> <font \
color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)", \
</font> <font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++</font>
<font color="#009900">+ # The intel boxes :-), It would be worth seeing if bsdi-gcc \
can use the</font> <font color="#009900">+ # bn86-elf.o file file since it is hand \
tweaked assembler.</font> <font color="#009900">+ "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)",</font>
<font color="#009900">+Index: openssl-0.9.7m/os2/backwardify.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/os2/backwardify.pl 2003-11-28 \
15:51:17.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/os2/backwardify.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/bin/perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ use strict;</font>
<font color="#009900">+ </font>
<font color="#009900">+ # Use as $0</font>
<font color="#009900">+Index: openssl-0.9.7m/Makefile.org</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/Makefile.org 2007-01-16 \
20:30:19.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/Makefile.org 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -57,6 +57,7 @@</font> <font color="#009900">+ # equal 4.</font>
<font color="#009900">+ # PKCS1_CHECK - pkcs1 tests.</font>
<font color="#009900">+ </font>
<font color="#009900">++#TOP=$(shell pwd)</font>
<font color="#009900">+ CC= gcc</font>
<font color="#009900">+ #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 \
-Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM</font> <font \
color="#009900">+ CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall \
-DSHA1_ASM -DMD5_ASM -DRMD160_ASM</font> <font color="#009900">+@@ -195,7 +196,7 \
@@</font> <font color="#009900">+ # we might set SHLIB_MARK to \
'$(SHARED_LIBS)'.</font> <font color="#009900">+ SHLIB_MARK=</font>
<font color="#009900">+ </font>
<font color="#009900">+-DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps test \
tools</font> <font color="#009900">++DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps \
doc tools</font> <font color="#009900">+ SHLIBDIRS= crypto ssl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # dirs in crypto to build</font>
<font color="#009900">+@@ -214,10 +215,10 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ MAKEFILE= Makefile</font>
<font color="#009900">+ </font>
<font color="#009900">+-MANDIR=$(OPENSSLDIR)/man</font>
<font color="#009900">++MANDIR=/usr/share/man</font>
<font color="#009900">+ MAN1=1</font>
<font color="#009900">+ MAN3=3</font>
<font color="#009900">+-MANSUFFIX=</font>
<font color="#009900">++MANSUFFIX=ssl</font>
<font color="#009900">+ SHELL=/bin/sh</font>
<font color="#009900">+ </font>
<font color="#009900">+ TOP= .</font>
<font color="#009900">+Index: openssl-0.9.7m/util/selftest.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/selftest.pl 2005-06-20 \
22:45:44.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/util/selftest.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/local/bin/perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # Run the test suite and generate a report</font>
<font color="#009900">+ #</font>
<font color="#009900">+Index: openssl-0.9.7m/util/extract-names.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/extract-names.pl 2004-03-25 \
20:52:36.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/util/extract-names.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font \
color="#009900">+-#!/usr/bin/perl</font> <font \
color="#009900">++#!/usr/local/bin/perl</font> <font color="#009900">+ </font>
<font color="#009900">+ $/ = ""; # Eat a paragraph at once.</font>
<font color="#009900">+ while(<STDIN>) {</font>
<font color="#009900">+Index: openssl-0.9.7m/util/checkhash.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/checkhash.pl 2005-05-26 \
23:29:03.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/util/checkhash.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/bin/env perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ my $package = caller;</font>
<font color="#009900">+ </font>
<font color="#009900">+Index: openssl-0.9.7m/util/clean-depend.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/clean-depend.pl 2001-10-10 \
10:27:28.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/util/clean-depend.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/local/bin/perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ # Clean the dependency list in a makefile of standard \
includes...</font> <font color="#009900">+ # Written by Ben Laurie \
<ben@algroup.co.uk> 19 Jan 1999</font> <font color="#009900">+ </font>
<font color="#009900">+Index: openssl-0.9.7m/util/mkerr.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/mkerr.pl 2006-11-21 \
20:19:09.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/util/mkerr.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/local/bin/perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ my $config = "crypto/err/openssl.ec";</font>
<font color="#009900">+ my $debug = 0;</font>
<font color="#009900">+Index: openssl-0.9.7m/util/mkdef.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/mkdef.pl 2006-02-05 \
00:05:40.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/util/mkdef.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/local/bin/perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # generate a .def file</font>
<font color="#009900">+ #</font>
<font color="#009900">+Index: openssl-0.9.7m/util/mkstack.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/mkstack.pl 2004-10-04 \
18:27:36.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/util/mkstack.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/local/bin/perl \
-w</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # This is a utility that searches out \
"DECLARE_STACK_OF()"</font> <font color="#009900">+ # declarations in .h and .c \
files, and updates/creates/replaces</font> <font color="#009900">+Index: \
openssl-0.9.7m/util/pod2man.pl</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/pod2man.pl 2005-06-18 \
06:27:11.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/util/pod2man.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-: \
#!/usr/bin/perl-5.005</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'</font>
<font color="#009900">+ if $running_under_some_shell;</font>
<font color="#009900">+ </font>
<font color="#009900">+Index: openssl-0.9.7m/util/fipslink.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/util/fipslink.pl 2006-02-06 \
00:49:06.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/util/fipslink.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font \
color="#009900">+-#!/usr/bin/perl</font> <font \
color="#009900">++#!/usr/local/bin/perl</font> <font color="#009900">+ </font>
<font color="#009900">+ sub check_env</font>
<font color="#009900">+ {</font>
<font color="#009900">+Index: openssl-0.9.7m/config</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/config 2007-01-16 14:48:16.000000000 \
+0100</font> <font color="#009900">++++ openssl-0.9.7m/config 2008-04-12 \
02:37:45.000000000 +0200</font> <font color="#009900">+@@ -179,8 +179,8 @@</font>
<font color="#009900">+ echo "${MACHINE}-whatever-linux1"; exit 0</font>
<font color="#009900">+ ;;</font>
<font color="#009900">+ </font>
<font color="#009900">+- GNU*)</font>
<font color="#009900">+- echo "hurd-x86"; exit 0;</font>
<font color="#009900">++ GNU:*|GNU/*:*)</font>
<font color="#009900">++ echo "${MACHINE}-gnuish"; exit 0;</font>
<font color="#009900">+ ;;</font>
<font color="#009900">+ </font>
<font color="#009900">+ LynxOS:*)</font>
<font color="#009900">+Index: openssl-0.9.7m/doc/Makefile</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- /dev/null 1970-01-01 00:00:00.000000000 +0000</font>
<font color="#009900">++++ openssl-0.9.7m/doc/Makefile 2008-04-12 02:37:45.000000000 \
+0200</font> <font color="#009900">+@@ -0,0 +1,40 @@</font>
<font color="#009900">++VERSION =</font>
<font color="#009900">++</font>
<font color="#009900">++#PODS = $(wildcard *.pod)</font>
<font color="#009900">++#MANS = $(addsuffix .man, $(basename $(PODS)))</font>
<font color="#009900">++</font>
<font color="#009900">++MANS = openssl.1 ssl.3 crypto.3</font>
<font color="#009900">++</font>
<font color="#009900">++P2M = pod2man --center='OpenSSL Documentation' \
--release="OpenSSL $(VERSION)"</font> <font color="#009900">++</font>
<font color="#009900">++all: manpages</font>
<font color="#009900">++</font>
<font color="#009900">++.PHONY: manpages </font>
<font color="#009900">++</font>
<font color="#009900">++manpages: openssl.1 crypto.3 ssl.3</font>
<font color="#009900">++</font>
<font color="#009900">++openssl.1:</font>
<font color="#009900">++ $(P2M) --section=1 openssl.pod > openssl.1</font>
<font color="#009900">++</font>
<font color="#009900">++crypto.3:</font>
<font color="#009900">++ $(P2M) --section=3 crypto.pod > crypto.3</font>
<font color="#009900">++</font>
<font color="#009900">++ssl.3:</font>
<font color="#009900">++ $(P2M) --section=3 ssl.pod > ssl.3</font>
<font color="#009900">++</font>
<font color="#009900">++.PHONY: install</font>
<font color="#009900">++install:</font>
<font color="#009900">++ mkdir -p \
$(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1</font> <font color="#009900">++ mkdir \
-p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3</font> <font \
color="#009900">++ install -m 644 -p openssl.1 \
$(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1</font> <font color="#009900">++ install \
-m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3</font> <font \
color="#009900">++ install -m 644 -p ssl.3 \
$(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3</font> <font color="#009900">++ rm -f \
$(MANS)</font> <font color="#009900">++</font>
<font color="#009900">++.PHONY: clean</font>
<font color="#009900">++clean:</font>
<font color="#009900">++ rm -f $(MANS)</font>
<font color="#009900">++</font>
<font color="#009900">++.PHONY: realclean</font>
<font color="#009900">++realclean:</font>
<font color="#009900">++ -$(MAKE) clean</font>
<font color="#009900">+Index: openssl-0.9.7m/Makefile</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/Makefile 2007-02-23 \
13:52:32.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/Makefile 2008-04-12 02:46:16.000000000 +0200</font> <font \
color="#009900">+@@ -11,11 +11,11 @@</font> <font color="#009900">+ \
SHLIB_VERSION_HISTORY=</font> <font color="#009900">+ SHLIB_MAJOR=0</font>
<font color="#009900">+ SHLIB_MINOR=9.7</font>
<font color="#009900">+-SHLIB_EXT=</font>
<font color="#009900">+-PLATFORM=dist</font>
<font color="#009900">+-OPTIONS= no-krb5</font>
<font color="#009900">+-CONFIGURE_ARGS=dist</font>
<font color="#009900">+-SHLIB_TARGET=</font>
<font color="#009900">++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)</font>
<font color="#009900">++PLATFORM=debian-i386</font>
<font color="#009900">++OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea \
no-mdc2 no-rc5 zlib-dynamic debug no-krb5</font> <font \
color="#009900">++CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea \
no-mdc2 no-rc5 zlib-dynamic debug debian-i386</font> <font \
color="#009900">++SHLIB_TARGET=linux-shared</font> <font color="#009900">+ </font>
<font color="#009900">+ # HERE indicates where this Makefile lives. This can be used \
to indicate</font> <font color="#009900">+ # where sub-Makefiles are expected to be. \
Currently has very limited usage,</font> <font color="#009900">+@@ -26,10 +26,10 \
@@</font> <font color="#009900">+ # for, say, /usr/ and yet have everything installed \
to /tmp/somedir/usr/.</font> <font color="#009900">+ # Normally it is left \
empty.</font> <font color="#009900">+ INSTALL_PREFIX=</font>
<font color="#009900">+-INSTALLTOP=/usr/local/ssl</font>
<font color="#009900">++INSTALLTOP=/usr</font>
<font color="#009900">+ </font>
<font color="#009900">+ # Do not edit this manually. Use Configure --openssldir=DIR \
do change this!</font> <font color="#009900">+-OPENSSLDIR=/usr/local/ssl</font>
<font color="#009900">++OPENSSLDIR=/usr/lib/ssl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # NO_IDEA - Define to build without the IDEA algorithm</font>
<font color="#009900">+ # NO_RC4 - Define to build without the RC4 algorithm</font>
<font color="#009900">+@@ -59,12 +59,12 @@</font>
<font color="#009900">+ # equal 4.</font>
<font color="#009900">+ # PKCS1_CHECK - pkcs1 tests.</font>
<font color="#009900">+ </font>
<font color="#009900">+-CC= cc</font>
<font color="#009900">++CC= gcc</font>
<font color="#009900">+ #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 \
-Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM</font> <font \
color="#009900">+-CFLAG= -DOPENSSL_NO_KRB5 -O</font> <font color="#009900">+-DEPFLAG= \
</font> <font color="#009900">++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</font> <font \
color="#009900">++DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 \
-DOPENSSL_NO_RC5</font> <font color="#009900">+ PEX_LIBS= </font>
<font color="#009900">+-EX_LIBS= </font>
<font color="#009900">++EX_LIBS= -ldl </font>
<font color="#009900">+ EXE_EXT= </font>
<font color="#009900">+ ARFLAGS= </font>
<font color="#009900">+ AR=ar $(ARFLAGS) r</font>
<font color="#009900">+@@ -72,7 +72,7 @@</font>
<font color="#009900">+ PERL= /usr/bin/perl</font>
<font color="#009900">+ TAR= tar</font>
<font color="#009900">+ TARFLAGS= --no-recursion</font>
<font color="#009900">+-MAKEDEPPROG=makedepend</font>
<font color="#009900">++MAKEDEPPROG= gcc</font>
<font color="#009900">+ </font>
<font color="#009900">+ # We let the C compiler driver to take care of .s files. This \
is done in</font> <font color="#009900">+ # order to be excused from maintaining a \
separate set of architecture</font> <font color="#009900">+@@ -197,13 +197,13 \
@@</font> <font color="#009900">+ # we might set SHLIB_MARK to \
'$(SHARED_LIBS)'.</font> <font color="#009900">+ SHLIB_MARK=</font>
<font color="#009900">+ </font>
<font color="#009900">+-DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps test \
tools</font> <font color="#009900">++DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps \
doc tools</font> <font color="#009900">+ SHLIBDIRS= crypto ssl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # dirs in crypto to build</font>
<font color="#009900">+ SDIRS= objects \</font>
<font color="#009900">+- md2 md4 md5 sha mdc2 hmac ripemd \</font>
<font color="#009900">+- des rc2 rc4 rc5 idea bf cast \</font>
<font color="#009900">++ md2 md4 md5 sha hmac ripemd \</font>
<font color="#009900">++ des rc2 rc4 bf cast \</font>
<font color="#009900">+ bn ec rsa dsa dh dso engine aes \</font>
<font color="#009900">+ buffer bio stack lhash rand err \</font>
<font color="#009900">+ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp \
ui krb5</font> <font color="#009900">+@@ -216,10 +216,10 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ MAKEFILE= Makefile</font>
<font color="#009900">+ </font>
<font color="#009900">+-MANDIR=$(OPENSSLDIR)/man</font>
<font color="#009900">++MANDIR=/usr/share/man</font>
<font color="#009900">+ MAN1=1</font>
<font color="#009900">+ MAN3=3</font>
<font color="#009900">+-MANSUFFIX=</font>
<font color="#009900">++MANSUFFIX=ssl</font>
<font color="#009900">+ SHELL=/bin/sh</font>
<font color="#009900">+ </font>
<font color="#009900">+ TOP= .</font>
<font color="#009900">+@@ -230,7 +230,7 @@</font>
<font color="#009900">+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)</font>
<font color="#009900">+ SHARED_SSL=libssl$(SHLIB_EXT)</font>
<font color="#009900">+ SHARED_LIBS=</font>
<font color="#009900">+-SHARED_LIBS_LINK_EXTS=</font>
<font color="#009900">++SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so</font>
<font color="#009900">+ SHARED_LDFLAGS=</font>
<font color="#009900">+ </font>
<font color="#009900">+ GENERAL= Makefile</font>
<font color="#009900">+Index: openssl-0.9.7m/VMS/VMSify-conf.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/VMS/VMSify-conf.pl 2004-05-13 \
23:38:23.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/VMS/VMSify-conf.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#! \
/usr/bin/perl</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ use strict;</font>
<font color="#009900">+ use warnings;</font>
<font color="#009900">+Index: openssl-0.9.7m/ssl/ssl_lib.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/ssl/ssl_lib.c 2006-09-28 \
13:53:51.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/ssl/ssl_lib.c 2008-04-12 02:48:25.000000000 +0200</font> <font \
color="#009900">+@@ -1169,7 +1169,6 @@</font> <font color="#009900">+ char \
*SSL_get_shared_ciphers(const SSL *s,char *buf,int len)</font> <font \
color="#009900">+ {</font> <font color="#009900">+ char *p;</font>
<font color="#009900">+- const char *cp;</font>
<font color="#009900">+ STACK_OF(SSL_CIPHER) *sk;</font>
<font color="#009900">+ SSL_CIPHER *c;</font>
<font color="#009900">+ int i;</font>
<font color="#009900">+@@ -1182,20 +1181,21 @@</font>
<font color="#009900">+ sk=s->session->ciphers;</font>
<font color="#009900">+ for (i=0; i<sk_SSL_CIPHER_num(sk); i++)</font>
<font color="#009900">+ {</font>
<font color="#009900">+- /* Decrement for either the ':' or a '\0' */</font>
<font color="#009900">+- len--;</font>
<font color="#009900">++ int n;</font>
<font color="#009900">++ </font>
<font color="#009900">+ c=sk_SSL_CIPHER_value(sk,i);</font>
<font color="#009900">+- for (cp=c->name; *cp; )</font>
<font color="#009900">++ n=strlen(c->name);</font>
<font color="#009900">++ if (n+1 > len)</font>
<font color="#009900">+ {</font>
<font color="#009900">+- if (len-- <= 0)</font>
<font color="#009900">+- {</font>
<font color="#009900">+- *p='\0';</font>
<font color="#009900">+- return(buf);</font>
<font color="#009900">+- }</font>
<font color="#009900">+- else</font>
<font color="#009900">+- *(p++)= *(cp++);</font>
<font color="#009900">++ if (p != buf)</font>
<font color="#009900">++ --p;</font>
<font color="#009900">++ *p='\0';</font>
<font color="#009900">++ return buf;</font>
<font color="#009900">+ }</font>
<font color="#009900">++ strcpy(p,c->name);</font>
<font color="#009900">++ p+=n;</font>
<font color="#009900">+ *(p++)=':';</font>
<font color="#009900">++ len-=n+1;</font>
<font color="#009900">+ }</font>
<font color="#009900">+ p[-1]='\0';</font>
<font color="#009900">+ return(buf);</font>
<font color="#009900">+Index: openssl-0.9.7m/ssl/ssl_algs.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/ssl/ssl_algs.c 2001-02-20 \
09:11:58.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/ssl/ssl_algs.c 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -109,3 +109,8 @@</font> <font color="#009900">+ \
return(1);</font> <font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++#undef SSLeay_add_ssl_algorithms</font>
<font color="#009900">++int SSLeay_add_ssl_algorithms(void)</font>
<font color="#009900">++ {</font>
<font color="#009900">++ return SSL_library_init();</font>
<font color="#009900">++ }</font>
<font color="#009900">+Index: openssl-0.9.7m/demos/tunala/configure.in</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/demos/tunala/configure.in 2002-01-08 \
03:58:54.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/demos/tunala/configure.in 2008-04-12 02:37:45.000000000 +0200</font> \
<font color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-dnl Process \
this file with autoconf to produce a configure script.</font> <font \
color="#009900">++#!/usr/local/bin/perl</font> <font color="#009900">+ \
AC_INIT(tunala.c)</font> <font color="#009900">+ AM_CONFIG_HEADER(config.h)</font>
<font color="#009900">+ AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)</font>
<font color="#009900">+Index: openssl-0.9.7m/apps/CA.pl</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/apps/CA.pl 2007-02-23 \
13:52:38.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7m/apps/CA.pl 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -63,6 +63,7 @@</font> <font color="#009900">+ foreach (@ARGV) \
{</font> <font color="#009900">+ if ( /^(-\?|-h|-help)$/ ) {</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 0;</font> <font color="#009900">+ } elsif (/^-newcert$/) {</font>
<font color="#009900">+ # create a certificate</font>
<font color="#009900">+@@ -159,6 +160,7 @@</font>
<font color="#009900">+ } else {</font>
<font color="#009900">+ print STDERR "Unknown arg $_\n";</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 1;</font> <font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+Index: openssl-0.9.7m/apps/CA.pl.in</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/apps/CA.pl.in 2005-07-04 \
23:44:19.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/apps/CA.pl.in 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -63,6 +63,7 @@</font> <font color="#009900">+ foreach (@ARGV) \
{</font> <font color="#009900">+ if ( /^(-\?|-h|-help)$/ ) {</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 0;</font> <font color="#009900">+ } elsif (/^-newcert$/) {</font>
<font color="#009900">+ # create a certificate</font>
<font color="#009900">+@@ -159,6 +160,7 @@</font>
<font color="#009900">+ } else {</font>
<font color="#009900">+ print STDERR "Unknown arg $_\n";</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 1;</font> <font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+Index: openssl-0.9.7m/apps/progs.h</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.7m.orig/apps/progs.h 2004-06-19 \
15:54:59.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.7m/apps/progs.h 2008-04-12 02:37:45.000000000 +0200</font> <font \
color="#009900">+@@ -35,11 +35,9 @@</font> <font color="#009900">+ extern int \
spkac_main(int argc,char *argv[]);</font> <font color="#009900">+ extern int \
smime_main(int argc,char *argv[]);</font> <font color="#009900">+ extern int \
rand_main(int argc,char *argv[]);</font> <font color="#009900">+-extern int \
prime_main(int argc,char *argv[]);</font> <font color="#009900">+-#ifndef \
OPENSSL_NO_ENGINE</font> <font color="#009900">+ extern int engine_main(int argc,char \
*argv[]);</font> <font color="#009900">+-#endif</font>
<font color="#009900">+ extern int ocsp_main(int argc,char *argv[]);</font>
<font color="#009900">++extern int prime_main(int argc,char *argv[]);</font>
<font color="#009900">+ </font>
<font color="#009900">+ #define FUNC_TYPE_GENERAL 1</font>
<font color="#009900">+ #define FUNC_TYPE_MD 2</font>
<font color="#009900">+@@ -95,9 +93,7 @@</font>
<font color="#009900">+ #if !defined(OPENSSL_NO_SOCK) && \
!(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))</font> <font \
color="#009900">+ {FUNC_TYPE_GENERAL,"s_client",s_client_main},</font> <font \
color="#009900">+ #endif</font> <font color="#009900">+-#ifndef \
OPENSSL_NO_SPEED</font> <font color="#009900">+ \
{FUNC_TYPE_GENERAL,"speed",speed_main},</font> <font color="#009900">+-#endif</font>
<font color="#009900">+ #if !defined(OPENSSL_NO_SOCK) && \
!(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))</font> <font \
color="#009900">+ {FUNC_TYPE_GENERAL,"s_time",s_time_main},</font> <font \
color="#009900">+ #endif</font> <font color="#009900">+@@ -116,11 +112,9 @@</font>
<font color="#009900">+ {FUNC_TYPE_GENERAL,"spkac",spkac_main},</font>
<font color="#009900">+ {FUNC_TYPE_GENERAL,"smime",smime_main},</font>
<font color="#009900">+ {FUNC_TYPE_GENERAL,"rand",rand_main},</font>
<font color="#009900">+- {FUNC_TYPE_GENERAL,"prime",prime_main},</font>
<font color="#009900">+-#ifndef OPENSSL_NO_ENGINE</font>
<font color="#009900">+ {FUNC_TYPE_GENERAL,"engine",engine_main},</font>
<font color="#009900">+-#endif</font>
<font color="#009900">+ {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},</font>
<font color="#009900">++ {FUNC_TYPE_GENERAL,"prime",prime_main},</font>
<font color="#009900">+ #ifndef OPENSSL_NO_MD2</font>
<font color="#009900">+ {FUNC_TYPE_MD,"md2",dgst_main},</font>
<font color="#009900">+ #endif</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.7m/gnueabi-arm.patch e12709094153709afff9c797c8fb84693556e5ab</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.7m/gnueabi-arm.patch e12709094153709afff9c797c8fb84693556e5ab</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+</font>
<font color="#009900">+#</font>
<font color="#009900">+# Patch managed by \
http://www.mn-logistik.de/unsupported/pxa250/patcher</font> <font \
color="#009900">+#</font> <font color="#009900">+</font>
<font color="#009900">+--- openssl-0.9.7e/Configure~gnueabi-arm 2006-03-19 \
21:04:31.000000000 +0100</font> <font color="#009900">++++ \
openssl-0.9.7e/Configure 2006-03-19 21:07:22.000000000 +0100</font> <font \
color="#009900">+@@ -462,6 +462,7 @@</font> <font color="#009900">+ # Linux on \
ARM</font> <font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">+ </font>
<font color="#009900">+ # SCO/Caldera targets.</font>
<font color="#009900">+ #</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch 6667972d27eb2ab7dfbb6189e987578a7feb9a1e</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch 6667972d27eb2ab7dfbb6189e987578a7feb9a1e</font>
<font color="#0000FF">@@ -0,0 +1,10 @@</font>
<font color="#009900">+--- openssl-0.9.7g/Configure~ 2007-07-07 21:08:27.000000000 \
+0930</font> <font color="#009900">++++ openssl-0.9.7g/Configure 2007-07-07 \
21:13:41.000000000 +0930</font> <font color="#009900">+@@ -477,6 +477,7 @@</font>
<font color="#009900">+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer \
-Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">+ </font>
<font color="#009900">+ # SCO/Caldera targets.</font>
<font color="#009900">+ #</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch bd1bc954b5c2e8539a39128f09661d686716eba9</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch bd1bc954b5c2e8539a39128f09661d686716eba9</font>
<font color="#0000FF">@@ -0,0 +1,12 @@</font>
<font color="#009900">+--- /tmp/Configure.patched 2007-08-27 18:34:23.412489103 \
+0200</font> <font color="#009900">++++ openssl-0.9.7g/Configure 2007-08-27 \
18:35:05.134866725 +0200</font> <font color="#009900">+@@ -478,6 +478,9 @@</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++</font>
<font color="#009900">+ </font>
<font color="#009900">+ # SCO/Caldera targets.</font>
<font color="#009900">+ #</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.8g/configure-targets.patch 40d57766f81e17ec56ee4b10fd84987ba1d73129</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.8g/configure-targets.patch 40d57766f81e17ec56ee4b10fd84987ba1d73129</font>
<font color="#0000FF">@@ -0,0 +1,24 @@</font>
<font color="#009900">+</font>
<font color="#009900">+The number of colons are important :)</font>
<font color="#009900">+</font>
<font color="#009900">+Index: openssl-0.9.8g/Configure</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openssl-0.9.8g.orig/Configure 2008-04-12 \
04:27:22.000000000 +0200</font> <font color="#009900">++++ \
openssl-0.9.8g/Configure 2008-04-12 04:38:56.000000000 +0200</font> <font \
color="#009900">+@@ -395,6 +395,16 @@</font> <font color="#009900">+ \
"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}",</font> <font color="#009900">+ \
"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}",</font> <font color="#009900">+ </font>
<font color="#009900">++ # Linux on ARM</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++</font>
<font color="#009900">++"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer \
-Wall::-D_REENTRANT::-ldl:BN_LLONG \
DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",</font> <font \
color="#009900">++</font> <font color="#009900">+ #### *BSD [do see comment about \
${BSDthreads} above!]</font> <font color="#009900">+ "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)",</font>
<font color="#009900">+ "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)",</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-0.9.8g/debian.patch e2524f821f3c1693aabb548a7c6c9cfac5a7a56b</font>
<font color="#009900">+++ \
packages/openssl/openssl-0.9.8g/debian.patch e2524f821f3c1693aabb548a7c6c9cfac5a7a56b</font>
<font color="#0000FF">@@ -0,0 +1,1281 @@</font>
<font color="#009900">+--- openssl-0.9.8g.orig/Makefile</font>
<font color="#009900">++++ openssl-0.9.8g/Makefile</font>
<font color="#009900">+@@ -11,11 +11,11 @@</font>
<font color="#009900">+ SHLIB_VERSION_HISTORY=</font>
<font color="#009900">+ SHLIB_MAJOR=0</font>
<font color="#009900">+ SHLIB_MINOR=9.8</font>
<font color="#009900">+-SHLIB_EXT=</font>
<font color="#009900">+-PLATFORM=dist</font>
<font color="#009900">+-OPTIONS= no-camellia no-gmp no-krb5 no-mdc2 no-rc5 no-rfc3779 \
no-seed no-shared no-tlsext no-zlib no-zlib-dynamic</font> <font \
color="#009900">+-CONFIGURE_ARGS=dist</font> <font \
color="#009900">+-SHLIB_TARGET=</font> <font \
color="#009900">++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)</font> <font \
color="#009900">++PLATFORM=debian-amd64</font> <font \
color="#009900">++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</font> <font color="#009900">++CONFIGURE_ARGS=--prefix=/usr \
--openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext \
debian-amd64</font> <font color="#009900">++SHLIB_TARGET=linux-shared</font>
<font color="#009900">+ </font>
<font color="#009900">+ # HERE indicates where this Makefile lives. This can be used \
to indicate</font> <font color="#009900">+ # where sub-Makefiles are expected to be. \
Currently has very limited usage,</font> <font color="#009900">+@@ -26,10 +26,10 \
@@</font> <font color="#009900">+ # for, say, /usr/ and yet have everything installed \
to /tmp/somedir/usr/.</font> <font color="#009900">+ # Normally it is left \
empty.</font> <font color="#009900">+ INSTALL_PREFIX=</font>
<font color="#009900">+-INSTALLTOP=/usr/local/ssl</font>
<font color="#009900">++INSTALLTOP=/usr</font>
<font color="#009900">+ </font>
<font color="#009900">+ # Do not edit this manually. Use Configure --openssldir=DIR \
do change this!</font> <font color="#009900">+-OPENSSLDIR=/usr/local/ssl</font>
<font color="#009900">++OPENSSLDIR=/usr/lib/ssl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # NO_IDEA - Define to build without the IDEA algorithm</font>
<font color="#009900">+ # NO_RC4 - Define to build without the RC4 algorithm</font>
<font color="#009900">+@@ -59,11 +59,11 @@</font>
<font color="#009900">+ # equal 4.</font>
<font color="#009900">+ # PKCS1_CHECK - pkcs1 tests.</font>
<font color="#009900">+ </font>
<font color="#009900">+-CC= cc</font>
<font color="#009900">+-CFLAG= -O</font>
<font color="#009900">+-DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP \
-DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED \
-DOPENSSL_NO_TLSEXT </font> <font color="#009900">++CC= gcc</font>
<font color="#009900">++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</font> <font color="#009900">++DEPFLAG= \
-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 \
-DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED </font> <font \
color="#009900">+ PEX_LIBS= </font> <font color="#009900">+-EX_LIBS= </font>
<font color="#009900">++EX_LIBS= -ldl -lz</font>
<font color="#009900">+ EXE_EXT= </font>
<font color="#009900">+ ARFLAGS= </font>
<font color="#009900">+ AR=ar $(ARFLAGS) r</font>
<font color="#009900">+@@ -71,7 +71,7 @@</font>
<font color="#009900">+ PERL= /usr/bin/perl</font>
<font color="#009900">+ TAR= tar</font>
<font color="#009900">+ TARFLAGS= --no-recursion</font>
<font color="#009900">+-MAKEDEPPROG=makedepend</font>
<font color="#009900">++MAKEDEPPROG= gcc</font>
<font color="#009900">+ </font>
<font color="#009900">+ # We let the C compiler driver to take care of .s files. This \
is done in</font> <font color="#009900">+ # order to be excused from maintaining a \
separate set of architecture</font> <font color="#009900">+@@ -86,15 +86,15 @@</font>
<font color="#009900">+ PROCESSOR= </font>
<font color="#009900">+ </font>
<font color="#009900">+ # CPUID module collects small commonly used assembler \
snippets</font> <font color="#009900">+-CPUID_OBJ= </font>
<font color="#009900">+-BN_ASM= bn_asm.o</font>
<font color="#009900">++CPUID_OBJ= x86_64cpuid.o</font>
<font color="#009900">++BN_ASM= x86_64-gcc.o</font>
<font color="#009900">+ DES_ENC= des_enc.o fcrypt_b.o</font>
<font color="#009900">+ AES_ASM_OBJ= aes_core.o aes_cbc.o</font>
<font color="#009900">+ BF_ENC= bf_enc.o</font>
<font color="#009900">+ CAST_ENC= c_enc.o</font>
<font color="#009900">+ RC4_ENC= rc4_enc.o</font>
<font color="#009900">+ RC5_ENC= rc5_enc.o</font>
<font color="#009900">+-MD5_ASM_OBJ= </font>
<font color="#009900">++MD5_ASM_OBJ= md5-x86_64.o</font>
<font color="#009900">+ SHA1_ASM_OBJ= </font>
<font color="#009900">+ RMD160_ASM_OBJ= </font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -106,14 +106,14 @@</font>
<font color="#009900">+ ZLIB_INCLUDE=</font>
<font color="#009900">+ LIBZLIB=</font>
<font color="#009900">+ </font>
<font color="#009900">+-DIRS= crypto ssl engines apps test tools</font>
<font color="#009900">++DIRS= crypto ssl engines apps tools</font>
<font color="#009900">+ SHLIBDIRS= crypto ssl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # dirs in crypto to build</font>
<font color="#009900">+ SDIRS= \</font>
<font color="#009900">+ objects \</font>
<font color="#009900">+ md2 md4 md5 sha hmac ripemd \</font>
<font color="#009900">+- des aes rc2 rc4 idea bf cast \</font>
<font color="#009900">++ des aes rc2 rc4 bf cast \</font>
<font color="#009900">+ bn ec rsa dsa ecdsa dh ecdh dso engine \</font>
<font color="#009900">+ buffer bio stack lhash rand err \</font>
<font color="#009900">+ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp \
ui krb5 \</font> <font color="#009900">+@@ -127,10 +127,11 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ MAKEFILE= Makefile</font>
<font color="#009900">+ </font>
<font color="#009900">+-MANDIR=$(OPENSSLDIR)/man</font>
<font color="#009900">++MANDIR=/usr/share/man</font>
<font color="#009900">+ MAN1=1</font>
<font color="#009900">+ MAN3=3</font>
<font color="#009900">+-MANSUFFIX=</font>
<font color="#009900">++MANSUFFIX=ssl</font>
<font color="#009900">++MANSECTION=SSL</font>
<font color="#009900">+ SHELL=/bin/sh</font>
<font color="#009900">+ </font>
<font color="#009900">+ TOP= .</font>
<font color="#009900">+@@ -141,8 +142,8 @@</font>
<font color="#009900">+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)</font>
<font color="#009900">+ SHARED_SSL=libssl$(SHLIB_EXT)</font>
<font color="#009900">+ SHARED_LIBS=</font>
<font color="#009900">+-SHARED_LIBS_LINK_EXTS=</font>
<font color="#009900">+-SHARED_LDFLAGS=</font>
<font color="#009900">++SHARED_LIBS_LINK_EXTS=.so</font>
<font color="#009900">++SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld</font>
<font color="#009900">+ </font>
<font color="#009900">+ GENERAL= Makefile</font>
<font color="#009900">+ BASENAME= openssl</font>
<font color="#009900">+@@ -310,7 +311,8 @@</font>
<font color="#009900">+ echo 'Description: OpenSSL cryptography library'; \
\</font> <font color="#009900">+ echo 'Version: '$(VERSION); \</font>
<font color="#009900">+ echo 'Requires: '; \</font>
<font color="#009900">+- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \</font>
<font color="#009900">++ echo 'Libs: -L$${libdir} -lcrypto'; \</font>
<font color="#009900">++ echo 'Libs.private: $(EX_LIBS)'; \</font>
<font color="#009900">+ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > \
libcrypto.pc</font> <font color="#009900">+ </font>
<font color="#009900">+ libssl.pc: Makefile</font>
<font color="#009900">+@@ -323,7 +325,8 @@</font>
<font color="#009900">+ echo 'Description: Secure Sockets Layer and cryptography \
libraries'; \</font> <font color="#009900">+ echo 'Version: '$(VERSION); \
\</font> <font color="#009900">+ echo 'Requires: '; \</font>
<font color="#009900">+- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
\</font> <font color="#009900">++ echo 'Libs: -L$${libdir} -lssl'; \</font>
<font color="#009900">++ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \</font>
<font color="#009900">+ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > \
libssl.pc</font> <font color="#009900">+ </font>
<font color="#009900">+ openssl.pc: Makefile</font>
<font color="#009900">+@@ -336,7 +339,8 @@</font>
<font color="#009900">+ echo 'Description: Secure Sockets Layer and cryptography \
libraries and tools'; \</font> <font color="#009900">+ echo 'Version: \
'$(VERSION); \</font> <font color="#009900">+ echo 'Requires: '; \</font>
<font color="#009900">+- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
\</font> <font color="#009900">++ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
\</font> <font color="#009900">++ echo 'Libs.private: $(EX_LIBS)'; \</font>
<font color="#009900">+ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > \
openssl.pc</font> <font color="#009900">+ </font>
<font color="#009900">+ Makefile: Makefile.org Configure config</font>
<font color="#009900">+@@ -480,7 +484,7 @@</font>
<font color="#009900">+ install_sw:</font>
<font color="#009900">+ @$(PERL) $(TOP)/util/mkdir-p.pl \
$(INSTALL_PREFIX)$(INSTALLTOP)/bin \</font> <font color="#009900">+ \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib \</font> <font \
color="#009900">+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \</font> <font \
color="#009900">++ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \</font> <font \
color="#009900">+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \</font> <font \
color="#009900">+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \</font> <font \
color="#009900">+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \</font> <font \
color="#009900">+@@ -558,7 +562,7 @@</font> <font color="#009900">+ echo \
"installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \</font> <font color="#009900">+ \
(cd `$(PERL) util/dirname.pl $$i`; \</font> <font color="#009900">+ sh -c \
"$$pod2man \</font> <font color="#009900">+- --section=$$sec --center=OpenSSL \
\</font> <font color="#009900">++ --section=$${sec}$(MANSECTION) --center=OpenSSL \
\</font> <font color="#009900">+ --release=$(VERSION) `basename $$i`") \</font>
<font color="#009900">+ > \
$(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \</font> <font \
color="#009900">+ $(PERL) util/extract-names.pl < $$i | \</font> <font \
color="#009900">+@@ -575,7 +579,7 @@</font> <font color="#009900">+ echo \
"installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \</font> <font color="#009900">+ \
(cd `$(PERL) util/dirname.pl $$i`; \</font> <font color="#009900">+ sh -c \
"$$pod2man \</font> <font color="#009900">+- --section=$$sec --center=OpenSSL \
\</font> <font color="#009900">++ --section=$${sec}$(MANSECTION) --center=OpenSSL \
\</font> <font color="#009900">+ --release=$(VERSION) `basename $$i`") \</font>
<font color="#009900">+ > \
$(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \</font> <font \
color="#009900">+ $(PERL) util/extract-names.pl < $$i | \</font> <font \
color="#009900">+--- openssl-0.9.8g.orig/VMS/VMSify-conf.pl</font> <font \
color="#009900">++++ openssl-0.9.8g/VMS/VMSify-conf.pl</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#! \
/usr/bin/perl</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ use strict;</font>
<font color="#009900">+ use warnings;</font>
<font color="#009900">+--- openssl-0.9.8g.orig/Netware/do_tests.pl</font>
<font color="#009900">++++ openssl-0.9.8g/Netware/do_tests.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-# perl script to run OpenSSL tests</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ </font>
<font color="#009900">+ my $base_path = "\\openssl";</font>
<font color="#009900">+--- openssl-0.9.8g.orig/apps/CA.sh</font>
<font color="#009900">++++ openssl-0.9.8g/apps/CA.sh</font>
<font color="#009900">+@@ -91,6 +91,7 @@</font>
<font color="#009900">+ -out ${CATOP}/$CAREQ</font>
<font color="#009900">+ $CA -out ${CATOP}/$CACERT $CADAYS -batch \</font>
<font color="#009900">+ -keyfile ${CATOP}/private/$CAKEY -selfsign \</font>
<font color="#009900">++ -extensions v3_ca \</font>
<font color="#009900">+ -infiles ${CATOP}/$CAREQ </font>
<font color="#009900">+ RET=$?</font>
<font color="#009900">+ fi</font>
<font color="#009900">+--- openssl-0.9.8g.orig/apps/CA.pl.in</font>
<font color="#009900">++++ openssl-0.9.8g/apps/CA.pl.in</font>
<font color="#009900">+@@ -65,6 +65,7 @@</font>
<font color="#009900">+ foreach (@ARGV) {</font>
<font color="#009900">+ if ( /^(-\?|-h|-help)$/ ) {</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 0;</font> <font color="#009900">+ } elsif (/^-newcert$/) {</font>
<font color="#009900">+ # create a certificate</font>
<font color="#009900">+@@ -165,6 +166,7 @@</font>
<font color="#009900">+ } else {</font>
<font color="#009900">+ print STDERR "Unknown arg $_\n";</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 1;</font> <font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+--- openssl-0.9.8g.orig/apps/speed.c</font>
<font color="#009900">++++ openssl-0.9.8g/apps/speed.c</font>
<font color="#009900">+@@ -577,7 +577,7 @@</font>
<font color="#009900">+ #define MAX_BLOCK_SIZE 64</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ unsigned char DES_iv[8];</font>
<font color="#009900">+- unsigned char iv[MAX_BLOCK_SIZE/8];</font>
<font color="#009900">++ unsigned char iv[2*MAX_BLOCK_SIZE/8];</font>
<font color="#009900">+ #ifndef OPENSSL_NO_DES</font>
<font color="#009900">+ DES_cblock *buf_as_des_cblock = NULL;</font>
<font color="#009900">+ static DES_cblock key \
={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/apps/CA.pl</font> <font color="#009900">++++ \
openssl-0.9.8g/apps/CA.pl</font> <font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # CA - wrapper around ca to make it easier to use ... \
basically ca requires</font> <font color="#009900">+ # some setup stuff to be \
done before you can use it and this makes</font> <font color="#009900">+@@ -65,6 \
+65,7 @@</font> <font color="#009900">+ foreach (@ARGV) {</font>
<font color="#009900">+ if ( /^(-\?|-h|-help)$/ ) {</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 0;</font> <font color="#009900">+ } elsif (/^-newcert$/) {</font>
<font color="#009900">+ # create a certificate</font>
<font color="#009900">+@@ -165,6 +166,7 @@</font>
<font color="#009900">+ } else {</font>
<font color="#009900">+ print STDERR "Unknown arg $_\n";</font>
<font color="#009900">+ print STDERR "usage: CA \
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";</font> <font \
color="#009900">++ print STDERR "usage: CA -signcert certfile \
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";</font> <font color="#009900">+ \
exit 1;</font> <font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+--- openssl-0.9.8g.orig/os2/backwardify.pl</font>
<font color="#009900">++++ openssl-0.9.8g/os2/backwardify.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ use strict;</font>
<font color="#009900">+ </font>
<font color="#009900">+ # Use as $0</font>
<font color="#009900">+--- openssl-0.9.8g.orig/Configure</font>
<font color="#009900">++++ openssl-0.9.8g/Configure</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-:</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ eval 'exec perl -S $0 ${1+"$@"}'</font>
<font color="#009900">+ if $running_under_some_shell;</font>
<font color="#009900">+ ##</font>
<font color="#009900">+@@ -118,7 +118,8 @@</font>
<font color="#009900">+ 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";</font> <font \
color="#009900">+ 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";</font> <font \
color="#009900">+ </font> <font color="#009900">+-my \
$x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";</font> \
<font color="#009900">++#my \
$x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";</font> \
<font color="#009900">++my \
$x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::::";</font> <font \
color="#009900">+ 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::";</font> <font \
color="#009900">+ </font> <font color="#009900">+ my $no_asm="::::::::::";</font>
<font color="#009900">+@@ -308,6 +309,47 @@</font>
<font color="#009900">+ "osf1-alpha-cc", "cc:-std1 -tune host -O4 \
-readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG \
RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",</font> <font color="#009900">+ \
"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",</font> <font \
color="#009900">+ </font> <font color="#009900">++# Debian GNU/* (various \
architectures)</font> <font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++#"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++#"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++#"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",</font> <font \
color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)", \
</font> <font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++"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)",</font>
<font color="#009900">++</font>
<font color="#009900">+ ####</font>
<font color="#009900">+ #### Variety of LINUX:-)</font>
<font color="#009900">+ ####</font>
<font color="#009900">+@@ -476,7 +518,7 @@</font>
<font color="#009900">+ # Cygwin</font>
<font color="#009900">+ "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",</font> <font color="#009900">+ "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",</font> \
<font color="#009900">+-"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",</font> \
<font color="#009900">++-"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",</font> \
<font color="#009900">+ </font> <font color="#009900">+ # NetWare from David Ward \
(dsward@novell.com) - requires MetroWerks NLM development tools</font> <font \
color="#009900">+ # netware-clib => legacy CLib c-runtime support</font> <font \
color="#009900">+@@ -1300,6 +1342,8 @@</font> <font color="#009900">+ \
$shlib_minor=$2;</font> <font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++$shared_ldflag .= " -Wl,--version-script=openssl.ld";</font>
<font color="#009900">++</font>
<font color="#009900">+ open(IN,'<Makefile.org') || die "unable to read \
Makefile.org:$!\n";</font> <font color="#009900">+ unlink("$Makefile.new") || die \
"unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";</font> <font \
color="#009900">+ open(OUT,">$Makefile.new") || die "unable to create \
$Makefile.new:$!\n";</font> <font color="#009900">+@@ -1371,7 +1415,8 @@</font>
<font color="#009900">+ elsif ($shared_extension ne "" && $shared_extension \
=~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)</font> <font color="#009900">+ {</font>
<font color="#009900">+ my $sotmp = $1;</font>
<font color="#009900">+- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) \
.s$sotmp/;</font> <font \
color="#009900">++# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) \
.s$sotmp/;</font> <font \
color="#009900">++ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;</font>
<font color="#009900">+ }</font>
<font color="#009900">+ elsif ($shared_extension ne "" && $shared_extension \
=~ /^\.[^\.]*\.[^\.]*\.dylib$/)</font> <font color="#009900">+ {</font>
<font color="#009900">+@@ -1490,7 +1535,7 @@</font>
<font color="#009900">+ if (/^#define\s+OPENSSLDIR/)</font>
<font color="#009900">+ { print OUT "#define OPENSSLDIR \"$openssldir\"\n"; \
}</font> <font color="#009900">+ elsif (/^#define\s+ENGINESDIR/)</font>
<font color="#009900">+- { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; \
}</font> <font color="#009900">++ { print OUT "#define ENGINESDIR \
\"$prefix/lib/ssl/engines\"\n"; }</font> <font color="#009900">+ \
elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)</font> <font \
color="#009900">+ { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"</font> \
<font color="#009900">+ if $export_var_as_fn;</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/engines/Makefile</font> <font color="#009900">++++ \
openssl-0.9.8g/engines/Makefile</font> <font color="#009900">+@@ -97,13 +97,13 \
@@</font> <font color="#009900">+ *DSO_DL*) sfx="sl";; \</font>
<font color="#009900">+ *) sfx="bad";; \</font>
<font color="#009900">+ esac; \</font>
<font color="#009900">+- cp lib$$l.$$sfx \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \</font> <font \
color="#009900">++ cp lib$$l.$$sfx \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \</font> <font \
color="#009900">+ else \</font> <font color="#009900">+ sfx="so"; \</font>
<font color="#009900">+ cp cyg$$l.dll \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \</font> <font \
color="#009900">+ fi; \</font> <font color="#009900">+- chmod 555 \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \</font> <font \
color="#009900">+- mv -f \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \</font> <font \
color="#009900">++ chmod 555 \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \</font> <font \
color="#009900">++ mv -f \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx ); \</font> <font \
color="#009900">+ done; \</font> <font color="#009900">+ fi</font>
<font color="#009900">+ </font>
<font color="#009900">+--- openssl-0.9.8g.orig/engines/openssl.ld</font>
<font color="#009900">++++ openssl-0.9.8g/engines/openssl.ld</font>
<font color="#009900">+@@ -0,0 +1,5 @@</font>
<font color="#009900">++OPENSSL_0.9.8 {</font>
<font color="#009900">++ global:</font>
<font color="#009900">++ *;</font>
<font color="#009900">++};</font>
<font color="#009900">++</font>
<font color="#009900">+--- openssl-0.9.8g.orig/tools/c_rehash</font>
<font color="#009900">++++ openssl-0.9.8g/tools/c_rehash</font>
<font color="#009900">+@@ -6,7 +6,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ my $openssl;</font>
<font color="#009900">+ </font>
<font color="#009900">+-my $dir = "/usr/local/ssl";</font>
<font color="#009900">++my $dir = "/usr/lib/ssl";</font>
<font color="#009900">+ </font>
<font color="#009900">+ if(defined $ENV{OPENSSL}) {</font>
<font color="#009900">+ $openssl = $ENV{OPENSSL};</font>
<font color="#009900">+@@ -59,12 +59,15 @@</font>
<font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+ closedir DIR;</font>
<font color="#009900">+- FILE: foreach $fname (grep {/\.pem$/} @flist) {</font>
<font color="#009900">++ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) \
{</font> <font color="#009900">+ # Check to see if certificates and/or CRLs \
present.</font> <font color="#009900">+ my ($cert, $crl) = \
check_file($fname);</font> <font color="#009900">+ if(!$cert && !$crl) \
{</font> <font color="#009900">+- print STDERR "WARNING: $fname does not contain a \
certificate or CRL: skipping\n";</font> <font color="#009900">+- next;</font>
<font color="#009900">++ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" \
-inform der -outform pem | ");</font> <font color="#009900">++ if(!$cert \
&& !$crl) {</font> <font color="#009900">++ print STDERR "WARNING: $fname \
does not contain a certificate or CRL: skipping\n";</font> <font \
color="#009900">++ next;</font> <font color="#009900">++ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+ link_hash_cert($fname) if($cert);</font>
<font color="#009900">+ link_hash_crl($fname) if($crl);</font>
<font color="#009900">+@@ -102,6 +105,9 @@</font>
<font color="#009900">+ my $fname = $_[0];</font>
<font color="#009900">+ $fname =~ s/'/'\\''/g;</font>
<font color="#009900">+ my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint \
-noout -in '$fname'`;</font> <font color="#009900">++ if(!$hash || !fprint) {</font>
<font color="#009900">++ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint \
-noout -in '$fname' -inform der`;</font> <font color="#009900">++ }</font>
<font color="#009900">+ chomp $hash;</font>
<font color="#009900">+ chomp $fprint;</font>
<font color="#009900">+ $fprint =~ s/^.*=//;</font>
<font color="#009900">+--- openssl-0.9.8g.orig/tools/c_rehash.in</font>
<font color="#009900">++++ openssl-0.9.8g/tools/c_rehash.in</font>
<font color="#009900">+@@ -59,12 +59,15 @@</font>
<font color="#009900">+ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+ closedir DIR;</font>
<font color="#009900">+- FILE: foreach $fname (grep {/\.pem$/} @flist) {</font>
<font color="#009900">++ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) \
{</font> <font color="#009900">+ # Check to see if certificates and/or CRLs \
present.</font> <font color="#009900">+ my ($cert, $crl) = \
check_file($fname);</font> <font color="#009900">+ if(!$cert && !$crl) \
{</font> <font color="#009900">+- print STDERR "WARNING: $fname does not contain a \
certificate or CRL: skipping\n";</font> <font color="#009900">+- next;</font>
<font color="#009900">++ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" \
-inform der -outform pem | ");</font> <font color="#009900">++ if(!$cert \
&& !$crl) {</font> <font color="#009900">++ print STDERR "WARNING: $fname \
does not contain a certificate or CRL: skipping\n";</font> <font \
color="#009900">++ next;</font> <font color="#009900">++ }</font>
<font color="#009900">+ }</font>
<font color="#009900">+ link_hash_cert($fname) if($cert);</font>
<font color="#009900">+ link_hash_crl($fname) if($crl);</font>
<font color="#009900">+@@ -102,6 +105,9 @@</font>
<font color="#009900">+ my $fname = $_[0];</font>
<font color="#009900">+ $fname =~ s/'/'\\''/g;</font>
<font color="#009900">+ my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint \
-noout -in '$fname'`;</font> <font color="#009900">++ if(!$hash || !fprint) {</font>
<font color="#009900">++ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint \
-noout -in '$fname' -inform der`;</font> <font color="#009900">++ }</font>
<font color="#009900">+ chomp $hash;</font>
<font color="#009900">+ chomp $fprint;</font>
<font color="#009900">+ $fprint =~ s/^.*=//;</font>
<font color="#009900">+--- openssl-0.9.8g.orig/Makefile.shared</font>
<font color="#009900">++++ openssl-0.9.8g/Makefile.shared</font>
<font color="#009900">+@@ -151,9 +151,9 @@</font>
<font color="#009900">+ SHLIB_SUFFIX=; \</font>
<font color="#009900">+ ALLSYMSFLAGS='-Wl,--whole-archive'; \</font>
<font color="#009900">+ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \</font>
<font color="#009900">+- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared \
-Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"</font> <font \
color="#009900">++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared \
-Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"</font> <font color="#009900">+ \
</font> <font color="#009900">+-DO_GNU_APP=LDFLAGS="$(CFLAGS) \
-Wl,-rpath,$(LIBRPATH)"</font> <font \
color="#009900">++DO_GNU_APP=LDFLAGS="$(CFLAGS)"</font> <font color="#009900">+ \
</font> <font color="#009900">+ #This is rather special. It's a special target with \
which one can link</font> <font color="#009900">+ #applications without bothering \
with any features that have anything to</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/ssl/t1_lib.c</font> <font color="#009900">++++ \
openssl-0.9.8g/ssl/t1_lib.c</font> <font color="#009900">+@@ -132,6 +132,10 @@</font>
<font color="#009900">+ int extdatalen=0;</font>
<font color="#009900">+ unsigned char *ret = p;</font>
<font color="#009900">+ </font>
<font color="#009900">++ /* don't add extensions for SSLv3 */</font>
<font color="#009900">++ if (s->client_version == SSL3_VERSION)</font>
<font color="#009900">++ return p;</font>
<font color="#009900">++</font>
<font color="#009900">+ ret+=2;</font>
<font color="#009900">+ </font>
<font color="#009900">+ if (ret>=limit) return NULL; /* this really never occurs, \
but ... */</font> <font color="#009900">+@@ -202,6 +206,10 @@</font>
<font color="#009900">+ int extdatalen=0;</font>
<font color="#009900">+ unsigned char *ret = p;</font>
<font color="#009900">+ </font>
<font color="#009900">++ /* don't add extensions for SSLv3 */</font>
<font color="#009900">++ if (s->version == SSL3_VERSION)</font>
<font color="#009900">++ return p;</font>
<font color="#009900">++ </font>
<font color="#009900">+ ret+=2;</font>
<font color="#009900">+ if (ret>=limit) return NULL; /* this really never occurs, \
but ... */</font> <font color="#009900">+ </font>
<font color="#009900">+--- openssl-0.9.8g.orig/ms/uplink.pl</font>
<font color="#009900">++++ openssl-0.9.8g/ms/uplink.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # For Microsoft CL this is implemented as inline assembler. \
So that</font> <font color="#009900">+ # even though this script can generate even \
Win32 code, we'll be</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/config</font> <font color="#009900">++++ \
openssl-0.9.8g/config</font> <font color="#009900">+@@ -162,8 +162,8 @@</font>
<font color="#009900">+ echo "${MACHINE}-whatever-linux1"; exit 0</font>
<font color="#009900">+ ;;</font>
<font color="#009900">+ </font>
<font color="#009900">+- GNU*)</font>
<font color="#009900">+- echo "hurd-x86"; exit 0;</font>
<font color="#009900">++ GNU:*|GNU/*:*)</font>
<font color="#009900">++ echo "${MACHINE}-gnuish"; exit 0;</font>
<font color="#009900">+ ;;</font>
<font color="#009900">+ </font>
<font color="#009900">+ LynxOS:*)</font>
<font color="#009900">+--- openssl-0.9.8g.orig/demos/tunala/configure.in</font>
<font color="#009900">++++ openssl-0.9.8g/demos/tunala/configure.in</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-dnl Process this file with autoconf to produce a configure \
script.</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ AC_INIT(tunala.c)</font>
<font color="#009900">+ AM_CONFIG_HEADER(config.h)</font>
<font color="#009900">+ AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)</font>
<font color="#009900">+--- openssl-0.9.8g.orig/doc/Makefile</font>
<font color="#009900">++++ openssl-0.9.8g/doc/Makefile</font>
<font color="#009900">+@@ -0,0 +1,40 @@</font>
<font color="#009900">++VERSION =</font>
<font color="#009900">++</font>
<font color="#009900">++#PODS = $(wildcard *.pod)</font>
<font color="#009900">++#MANS = $(addsuffix .man, $(basename $(PODS)))</font>
<font color="#009900">++</font>
<font color="#009900">++MANS = openssl.1 ssl.3 crypto.3</font>
<font color="#009900">++</font>
<font color="#009900">++P2M = pod2man --center='OpenSSL Documentation' \
--release="OpenSSL $(VERSION)"</font> <font color="#009900">++</font>
<font color="#009900">++all: manpages</font>
<font color="#009900">++</font>
<font color="#009900">++.PHONY: manpages </font>
<font color="#009900">++</font>
<font color="#009900">++manpages: openssl.1 crypto.3 ssl.3</font>
<font color="#009900">++</font>
<font color="#009900">++openssl.1:</font>
<font color="#009900">++ $(P2M) --section=1 openssl.pod > openssl.1</font>
<font color="#009900">++</font>
<font color="#009900">++crypto.3:</font>
<font color="#009900">++ $(P2M) --section=3 crypto.pod > crypto.3</font>
<font color="#009900">++</font>
<font color="#009900">++ssl.3:</font>
<font color="#009900">++ $(P2M) --section=3 ssl.pod > ssl.3</font>
<font color="#009900">++</font>
<font color="#009900">++.PHONY: install</font>
<font color="#009900">++install:</font>
<font color="#009900">++ mkdir -p \
$(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1</font> <font color="#009900">++ mkdir \
-p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3</font> <font \
color="#009900">++ install -m 644 -p openssl.1 \
$(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1</font> <font color="#009900">++ install \
-m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3</font> <font \
color="#009900">++ install -m 644 -p ssl.3 \
$(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3</font> <font color="#009900">++ rm -f \
$(MANS)</font> <font color="#009900">++</font>
<font color="#009900">++.PHONY: clean</font>
<font color="#009900">++clean:</font>
<font color="#009900">++ rm -f $(MANS)</font>
<font color="#009900">++</font>
<font color="#009900">++.PHONY: realclean</font>
<font color="#009900">++realclean:</font>
<font color="#009900">++ -$(MAKE) clean</font>
<font color="#009900">+--- openssl-0.9.8g.orig/doc/apps/c_rehash.pod</font>
<font color="#009900">++++ openssl-0.9.8g/doc/apps/c_rehash.pod</font>
<font color="#009900">+@@ -0,0 +1,55 @@</font>
<font color="#009900">++</font>
<font color="#009900">++=pod</font>
<font color="#009900">++</font>
<font color="#009900">++=head1 NAME</font>
<font color="#009900">++</font>
<font color="#009900">++c_rehash - Create symbolic links to files named by the hash \
values</font> <font color="#009900">++</font>
<font color="#009900">++=head1 SYNOPSIS</font>
<font color="#009900">++</font>
<font color="#009900">++B<c_rehash></font>
<font color="#009900">++[directory] ...</font>
<font color="#009900">++</font>
<font color="#009900">++=head1 DESCRIPTION</font>
<font color="#009900">++</font>
<font color="#009900">++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. </font> <font \
color="#009900">++</font> <font color="#009900">++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. </font> \
<font color="#009900">++</font> <font color="#009900">++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.</font> <font \
color="#009900">++</font> <font color="#009900">++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.</font> <font color="#009900">++</font>
<font color="#009900">++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.</font> <font color="#009900">++</font>
<font color="#009900">++The program will also warn if there are files with extension \
.pem which are not certificate or CRL files.</font> <font color="#009900">++</font>
<font color="#009900">++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 (=). </font> <font \
color="#009900">++</font> <font color="#009900">++=head1 OPTIONS</font>
<font color="#009900">++</font>
<font color="#009900">++None</font>
<font color="#009900">++</font>
<font color="#009900">++=head1 ENVIRONMENT</font>
<font color="#009900">++</font>
<font color="#009900">++=over 4</font>
<font color="#009900">++</font>
<font color="#009900">++=item B<OPENSSL></font>
<font color="#009900">++</font>
<font color="#009900">++The name (and path) of an executable to use to generate \
hashes and fingerprints (see above).</font> <font color="#009900">++</font>
<font color="#009900">++=item B<SSL_CERT_DIR></font>
<font color="#009900">++</font>
<font color="#009900">++Colon separated list of directories to operate on. Ignored if \
directories are listed on the command line.</font> <font color="#009900">++</font>
<font color="#009900">++=head1 SEE ALSO</font>
<font color="#009900">++</font>
<font color="#009900">++L<openssl(1)|openssl(1)>, \
L<x509(1)|x509(1)></font> <font color="#009900">++</font>
<font color="#009900">++=back</font>
<font color="#009900">++</font>
<font color="#009900">++=head1 BUGS</font>
<font color="#009900">++</font>
<font color="#009900">++No known bugs</font>
<font color="#009900">++</font>
<font color="#009900">++=cut</font>
<font color="#009900">+--- openssl-0.9.8g.orig/Makefile.org</font>
<font color="#009900">++++ openssl-0.9.8g/Makefile.org</font>
<font color="#009900">+@@ -104,7 +104,7 @@</font>
<font color="#009900">+ ZLIB_INCLUDE=</font>
<font color="#009900">+ LIBZLIB=</font>
<font color="#009900">+ </font>
<font color="#009900">+-DIRS= crypto ssl engines apps test tools</font>
<font color="#009900">++DIRS= crypto ssl engines apps tools</font>
<font color="#009900">+ SHLIBDIRS= crypto ssl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # dirs in crypto to build</font>
<font color="#009900">+@@ -125,10 +125,11 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ MAKEFILE= Makefile</font>
<font color="#009900">+ </font>
<font color="#009900">+-MANDIR=$(OPENSSLDIR)/man</font>
<font color="#009900">++MANDIR=/usr/share/man</font>
<font color="#009900">+ MAN1=1</font>
<font color="#009900">+ MAN3=3</font>
<font color="#009900">+-MANSUFFIX=</font>
<font color="#009900">++MANSUFFIX=ssl</font>
<font color="#009900">++MANSECTION=SSL</font>
<font color="#009900">+ SHELL=/bin/sh</font>
<font color="#009900">+ </font>
<font color="#009900">+ TOP= .</font>
<font color="#009900">+@@ -308,7 +309,8 @@</font>
<font color="#009900">+ echo 'Description: OpenSSL cryptography library'; \
\</font> <font color="#009900">+ echo 'Version: '$(VERSION); \</font>
<font color="#009900">+ echo 'Requires: '; \</font>
<font color="#009900">+- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \</font>
<font color="#009900">++ echo 'Libs: -L$${libdir} -lcrypto'; \</font>
<font color="#009900">++ echo 'Libs.private: $(EX_LIBS)'; \</font>
<font color="#009900">+ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > \
libcrypto.pc</font> <font color="#009900">+ </font>
<font color="#009900">+ libssl.pc: Makefile</font>
<font color="#009900">+@@ -321,7 +323,8 @@</font>
<font color="#009900">+ echo 'Description: Secure Sockets Layer and cryptography \
libraries'; \</font> <font color="#009900">+ echo 'Version: '$(VERSION); \
\</font> <font color="#009900">+ echo 'Requires: '; \</font>
<font color="#009900">+- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
\</font> <font color="#009900">++ echo 'Libs: -L$${libdir} -lssl'; \</font>
<font color="#009900">++ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \</font>
<font color="#009900">+ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > \
libssl.pc</font> <font color="#009900">+ </font>
<font color="#009900">+ openssl.pc: Makefile</font>
<font color="#009900">+@@ -334,7 +337,8 @@</font>
<font color="#009900">+ echo 'Description: Secure Sockets Layer and cryptography \
libraries and tools'; \</font> <font color="#009900">+ echo 'Version: \
'$(VERSION); \</font> <font color="#009900">+ echo 'Requires: '; \</font>
<font color="#009900">+- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
\</font> <font color="#009900">++ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
\</font> <font color="#009900">++ echo 'Libs.private: $(EX_LIBS)'; \</font>
<font color="#009900">+ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > \
openssl.pc</font> <font color="#009900">+ </font>
<font color="#009900">+ Makefile: Makefile.org Configure config</font>
<font color="#009900">+@@ -478,7 +482,7 @@</font>
<font color="#009900">+ install_sw:</font>
<font color="#009900">+ @$(PERL) $(TOP)/util/mkdir-p.pl \
$(INSTALL_PREFIX)$(INSTALLTOP)/bin \</font> <font color="#009900">+ \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib \</font> <font \
color="#009900">+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \</font> <font \
color="#009900">++ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \</font> <font \
color="#009900">+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \</font> <font \
color="#009900">+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \</font> <font \
color="#009900">+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \</font> <font \
color="#009900">+@@ -556,7 +560,7 @@</font> <font color="#009900">+ echo \
"installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \</font> <font color="#009900">+ \
(cd `$(PERL) util/dirname.pl $$i`; \</font> <font color="#009900">+ sh -c \
"$$pod2man \</font> <font color="#009900">+- --section=$$sec --center=OpenSSL \
\</font> <font color="#009900">++ --section=$${sec}$(MANSECTION) --center=OpenSSL \
\</font> <font color="#009900">+ --release=$(VERSION) `basename $$i`") \</font>
<font color="#009900">+ > \
$(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \</font> <font \
color="#009900">+ $(PERL) util/extract-names.pl < $$i | \</font> <font \
color="#009900">+@@ -573,7 +577,7 @@</font> <font color="#009900">+ echo \
"installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \</font> <font color="#009900">+ \
(cd `$(PERL) util/dirname.pl $$i`; \</font> <font color="#009900">+ sh -c \
"$$pod2man \</font> <font color="#009900">+- --section=$$sec --center=OpenSSL \
\</font> <font color="#009900">++ --section=$${sec}$(MANSECTION) --center=OpenSSL \
\</font> <font color="#009900">+ --release=$(VERSION) `basename $$i`") \</font>
<font color="#009900">+ > \
$(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \</font> <font \
color="#009900">+ $(PERL) util/extract-names.pl < $$i | \</font> <font \
color="#009900">+--- openssl-0.9.8g.orig/openssl.ld</font> <font color="#009900">++++ \
openssl-0.9.8g/openssl.ld</font> <font color="#009900">+@@ -0,0 +1,5 @@</font>
<font color="#009900">++OPENSSL_0.9.8 {</font>
<font color="#009900">++ global:</font>
<font color="#009900">++ *;</font>
<font color="#009900">++};</font>
<font color="#009900">++</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/md5/asm/md5-x86_64.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/md5/asm/md5-x86_64.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # MD5 optimized for AMD64.</font>
<font color="#009900">+ #</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/md5/asm/md5-sparcv9.S</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/md5/asm/md5-sparcv9.S</font>
<font color="#009900">+@@ -74,14 +74,14 @@</font>
<font color="#009900">+ #define Dval R8</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if defined(MD5_BLOCK_DATA_ORDER)</font>
<font color="#009900">+-# if defined(OPENSSL_SYSNAME_ULTRASPARC)</font>
<font color="#009900">++/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/</font>
<font color="#009900">+ # define LOAD lda</font>
<font color="#009900">+ # define X(i) [%i1+i*4]%asi</font>
<font color="#009900">+ # define md5_block md5_block_asm_data_order_aligned</font>
<font color="#009900">+ # define ASI_PRIMARY_LITTLE 0x88</font>
<font color="#009900">+-# else</font>
<font color="#009900">++/*# else</font>
<font color="#009900">+ # error "MD5_BLOCK_DATA_ORDER is supported only on \
UltraSPARC!"</font> <font color="#009900">+-# endif</font>
<font color="#009900">++# endif*/</font>
<font color="#009900">+ #else</font>
<font color="#009900">+ # define LOAD ld</font>
<font color="#009900">+ # define X(i) [%i1+i*4]</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/Makefile</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/Makefile</font>
<font color="#009900">+@@ -57,7 +57,7 @@</font>
<font color="#009900">+ echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
\</font> <font color="#009900">+ echo '#endif' ) >buildinf.h</font>
<font color="#009900">+ </font>
<font color="#009900">+-x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl</font>
<font color="#009900">++x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl</font>
<font color="#009900">+ $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > \
$@</font> <font color="#009900">+ x86cpuid-cof.s: x86cpuid.pl \
perlasm/x86asm.pl</font> <font color="#009900">+ $(PERL) x86cpuid.pl coff $(CFLAGS) \
$(PROCESSOR) > $@</font> <font color="#009900">+@@ -70,7 +70,7 @@</font>
<font color="#009900">+ uplink-cof.s: ../ms/uplink.pl</font>
<font color="#009900">+ $(PERL) ../ms/uplink.pl coff > $@</font>
<font color="#009900">+ </font>
<font color="#009900">+-x86_64cpuid.s: x86_64cpuid.pl</font>
<font color="#009900">++x86_64cpuid.S: x86_64cpuid.pl</font>
<font color="#009900">+ $(PERL) x86_64cpuid.pl $@</font>
<font color="#009900">+ ia64cpuid.s: ia64cpuid.S</font>
<font color="#009900">+ $(CC) $(CFLAGS) -E ia64cpuid.S > $@</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/sha/asm/sha1-ia64.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/sha/asm/sha1-ia64.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/crypto/sha/asm/sha512-sse2.pl</font> <font color="#009900">++++ \
openssl-0.9.8g/crypto/sha/asm/sha512-sse2.pl</font> <font color="#009900">+@@ -1,4 \
+1,4 @@</font> <font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/crypto/sha/asm/sha512-ia64.pl</font> <font color="#009900">++++ \
openssl-0.9.8g/crypto/sha/asm/sha512-ia64.pl</font> <font color="#009900">+@@ -1,4 \
+1,4 @@</font> <font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+--- openssl-0.9.8g.orig/crypto/sha/sha.h</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/sha/sha.h</font>
<font color="#009900">+@@ -59,6 +59,7 @@</font>
<font color="#009900">+ #ifndef HEADER_SHA_H</font>
<font color="#009900">+ #define HEADER_SHA_H</font>
<font color="#009900">+ </font>
<font color="#009900">++#include <stddef.h></font>
<font color="#009900">+ #include <openssl/e_os2.h></font>
<font color="#009900">+ #include <stddef.h></font>
<font color="#009900">+ </font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/rand/md_rand.c</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/rand/md_rand.c</font>
<font color="#009900">+@@ -271,7 +271,10 @@</font>
<font color="#009900">+ else</font>
<font color="#009900">+ MD_Update(&m,&(state[st_idx]),j);</font>
<font color="#009900">+ </font>
<font color="#009900">++/* </font>
<font color="#009900">++ * Don't add uninitialised data.</font>
<font color="#009900">+ MD_Update(&m,buf,j);</font>
<font color="#009900">++*/</font>
<font color="#009900">+ MD_Update(&m,(unsigned char \
*)&(md_c[0]),sizeof(md_c));</font> <font color="#009900">+ \
MD_Final(&m,local_md);</font> <font color="#009900">+ md_c[1]++;</font>
<font color="#009900">+@@ -465,8 +468,10 @@</font>
<font color="#009900">+ MD_Update(&m,local_md,MD_DIGEST_LENGTH);</font>
<font color="#009900">+ MD_Update(&m,(unsigned char \
*)&(md_c[0]),sizeof(md_c));</font> <font color="#009900">+ #ifndef PURIFY</font>
<font color="#009900">++#if 0 /* Don't add uninitialised data. */</font>
<font color="#009900">+ MD_Update(&m,buf,j); /* purify complains */</font>
<font color="#009900">+ #endif</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;</font>
<font color="#009900">+ if (k > 0)</font>
<font color="#009900">+ {</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/des/asm/desboth.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/des/asm/desboth.pl</font>
<font color="#009900">+@@ -16,6 +16,11 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ &push("edi");</font>
<font color="#009900">+ </font>
<font color="#009900">++ &call (&label("pic_point0"));</font>
<font color="#009900">++ &set_label("pic_point0");</font>
<font color="#009900">++ &blindpop("ebp");</font>
<font color="#009900">++ &add ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . \
&label("pic_point0") . "]");</font> <font color="#009900">++</font>
<font color="#009900">+ &comment("");</font>
<font color="#009900">+ &comment("Load the data words");</font>
<font color="#009900">+ &mov($L,&DWP(0,"ebx","",0));</font>
<font color="#009900">+@@ -47,15 +52,21 @@</font>
<font color="#009900">+ &mov(&swtmp(2), (DWC(($enc)?"1":"0")));</font>
<font color="#009900">+ &mov(&swtmp(1), "eax");</font>
<font color="#009900">+ &mov(&swtmp(0), "ebx");</font>
<font color="#009900">+- &call("DES_encrypt2");</font>
<font color="#009900">++ &exch("ebx", "ebp");</font>
<font color="#009900">++ &call("DES_encrypt2\@PLT");</font>
<font color="#009900">++ &exch("ebx", "ebp");</font>
<font color="#009900">+ &mov(&swtmp(2), (DWC(($enc)?"0":"1")));</font>
<font color="#009900">+ &mov(&swtmp(1), "edi");</font>
<font color="#009900">+ &mov(&swtmp(0), "ebx");</font>
<font color="#009900">+- &call("DES_encrypt2");</font>
<font color="#009900">++ &exch("ebx", "ebp");</font>
<font color="#009900">++ &call("DES_encrypt2\@PLT");</font>
<font color="#009900">++ &exch("ebx", "ebp");</font>
<font color="#009900">+ &mov(&swtmp(2), (DWC(($enc)?"1":"0")));</font>
<font color="#009900">+ &mov(&swtmp(1), "esi");</font>
<font color="#009900">+ &mov(&swtmp(0), "ebx");</font>
<font color="#009900">+- &call("DES_encrypt2");</font>
<font color="#009900">++ &exch("ebx", "ebp");</font>
<font color="#009900">++ &call("DES_encrypt2\@PLT");</font>
<font color="#009900">++ &exch("ebx", "ebp");</font>
<font color="#009900">+ </font>
<font color="#009900">+ &stack_pop(3);</font>
<font color="#009900">+ &mov($L,&DWP(0,"ebx","",0));</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/x86cpuid.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/x86cpuid.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ push(@INC,"perlasm");</font>
<font color="#009900">+ require "x86asm.pl";</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/rc4/asm/rc4-x86_64.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/rc4/asm/rc4-x86_64.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/crypto/perlasm/x86unix.pl</font> <font color="#009900">++++ \
openssl-0.9.8g/crypto/perlasm/x86unix.pl</font> <font color="#009900">+@@ -399,6 \
+399,29 @@</font> <font color="#009900">+ $stack=4;</font>
<font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++sub main'function_begin_B_static</font>
<font color="#009900">++ {</font>
<font color="#009900">++ local($func,$extra)=@_;</font>
<font color="#009900">++</font>
<font color="#009900">++ &main'external_label($func);</font>
<font color="#009900">++ $func=$under.$func;</font>
<font color="#009900">++</font>
<font color="#009900">++ local($tmp)=<<"EOF";</font>
<font color="#009900">++.text</font>
<font color="#009900">++EOF</font>
<font color="#009900">++ push(@out,$tmp);</font>
<font color="#009900">++ if ($main'cpp)</font>
<font color="#009900">++ { push(@out,"TYPE($func,\@function)\n"); }</font>
<font color="#009900">++ elsif ($main'coff)</font>
<font color="#009900">++ { \
$tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }</font> <font \
color="#009900">++ elsif ($main'aout and !$main'pic)</font> <font \
color="#009900">++ { }</font> <font color="#009900">++ else { \
push(@out,".type $func,\@function\n"); }</font> <font \
color="#009900">++ push(@out,".align\t$align\n");</font> <font \
color="#009900">++ push(@out,"$func:\n");</font> <font \
color="#009900">++ $stack=4;</font> <font color="#009900">++ }</font>
<font color="#009900">++</font>
<font color="#009900">+ sub main'function_end</font>
<font color="#009900">+ {</font>
<font color="#009900">+ local($func)=@_;</font>
<font color="#009900">+@@ -730,7 +753,17 @@</font>
<font color="#009900">+ {</font>
<font color="#009900">+ $tmp=<<___;</font>
<font color="#009900">+ .section .init</font>
<font color="#009900">++#ifdef OPENSSL_PIC</font>
<font color="#009900">++ pushl %ebx</font>
<font color="#009900">++ call .pic_point0</font>
<font color="#009900">++.pic_point0:</font>
<font color="#009900">++ popl %ebx</font>
<font color="#009900">++ addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx</font>
<font color="#009900">++ call $under$f\@PLT</font>
<font color="#009900">++ popl %ebx</font>
<font color="#009900">++#else</font>
<font color="#009900">+ call $under$f</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ jmp .Linitalign</font>
<font color="#009900">+ .align $align</font>
<font color="#009900">+ .Linitalign:</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/perlasm/cbc.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/perlasm/cbc.pl</font>
<font color="#009900">+@@ -122,7 +122,11 @@</font>
<font color="#009900">+ &mov(&DWP($data_off,"esp","",0), "eax"); # put in \
array for call</font> <font color="#009900">+ \
&mov(&DWP($data_off+4,"esp","",0), "ebx"); #</font> <font color="#009900">+ \
</font> <font color="#009900">+- &call($enc_func);</font>
<font color="#009900">++ &call (&label("pic_point0"));</font>
<font color="#009900">++ &set_label("pic_point0");</font>
<font color="#009900">++ &blindpop("ebx");</font>
<font color="#009900">++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . \
&label("pic_point0") . "]");</font> <font \
color="#009900">++ &call("$enc_func\@PLT");</font> <font color="#009900">+ \
</font> <font color="#009900">+ \
&mov("eax", &DWP($data_off,"esp","",0));</font> <font color="#009900">+ \
&mov("ebx", &DWP($data_off+4,"esp","",0));</font> <font color="#009900">+@@ \
-187,7 +191,11 @@</font> <font color="#009900">+ \
&mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call</font> <font \
color="#009900">+ &mov(&DWP($data_off+4,"esp","",0), "ebx"); #</font> <font \
color="#009900">+ </font> <font color="#009900">+- &call($enc_func);</font>
<font color="#009900">++ &call (&label("pic_point1"));</font>
<font color="#009900">++ &set_label("pic_point1");</font>
<font color="#009900">++ &blindpop("ebx");</font>
<font color="#009900">++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . \
&label("pic_point1") . "]");</font> <font \
color="#009900">++ &call("$enc_func\@PLT");</font> <font color="#009900">+ \
</font> <font color="#009900">+ \
&mov("eax", &DWP($data_off,"esp","",0));</font> <font color="#009900">+ \
&mov("ebx", &DWP($data_off+4,"esp","",0));</font> <font color="#009900">+@@ \
-220,7 +228,11 @@</font> <font color="#009900">+ \
&mov(&DWP($data_off,"esp","",0), "eax"); # put back</font> <font \
color="#009900">+ &mov(&DWP($data_off+4,"esp","",0), "ebx"); #</font> <font \
color="#009900">+ </font> <font color="#009900">+- &call($dec_func);</font>
<font color="#009900">++ &call (&label("pic_point2"));</font>
<font color="#009900">++ &set_label("pic_point2");</font>
<font color="#009900">++ &blindpop("ebx");</font>
<font color="#009900">++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . \
&label("pic_point2") . "]");</font> <font \
color="#009900">++ &call("$dec_func\@PLT");</font> <font color="#009900">+ \
</font> <font color="#009900">+ &mov("eax", &DWP($data_off,"esp","",0)); # \
get return</font> <font color="#009900">+ \
&mov("ebx", &DWP($data_off+4,"esp","",0)); #</font> <font color="#009900">+@@ \
-263,7 +275,11 @@</font> <font color="#009900">+ \
&mov(&DWP($data_off,"esp","",0), "eax"); # put back</font> <font \
color="#009900">+ &mov(&DWP($data_off+4,"esp","",0), "ebx"); #</font> <font \
color="#009900">+ </font> <font color="#009900">+- &call($dec_func);</font>
<font color="#009900">++ &call (&label("pic_point3"));</font>
<font color="#009900">++ &set_label("pic_point3");</font>
<font color="#009900">++ &blindpop("ebx");</font>
<font color="#009900">++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . \
&label("pic_point3") . "]");</font> <font \
color="#009900">++ &call("$dec_func\@PLT");</font> <font color="#009900">+ \
</font> <font color="#009900">+ &mov("eax", &DWP($data_off,"esp","",0)); # \
get return</font> <font color="#009900">+ \
&mov("ebx", &DWP($data_off+4,"esp","",0)); #</font> <font \
color="#009900">+--- openssl-0.9.8g.orig/crypto/perlasm/x86_64-xlate.pl</font> <font \
color="#009900">++++ openssl-0.9.8g/crypto/perlasm/x86_64-xlate.pl</font> <font \
color="#009900">+@@ -1,4 +1,4 @@</font> <font color="#009900">+-#!/usr/bin/env \
perl</font> <font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # Ascetic x86_64 AT&T to MASM assembler translator by \
<appro>.</font> <font color="#009900">+ #</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/opensslconf.h</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/opensslconf.h</font>
<font color="#009900">+@@ -10,6 +10,9 @@</font>
<font color="#009900">+ #ifndef OPENSSL_NO_GMP</font>
<font color="#009900">+ # define OPENSSL_NO_GMP</font>
<font color="#009900">+ #endif</font>
<font color="#009900">++#ifndef OPENSSL_NO_IDEA</font>
<font color="#009900">++# define OPENSSL_NO_IDEA</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ #ifndef OPENSSL_NO_KRB5</font>
<font color="#009900">+ # define OPENSSL_NO_KRB5</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+@@ -25,11 +28,11 @@</font>
<font color="#009900">+ #ifndef OPENSSL_NO_SEED</font>
<font color="#009900">+ # define OPENSSL_NO_SEED</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+-#ifndef OPENSSL_NO_TLSEXT</font>
<font color="#009900">+-# define OPENSSL_NO_TLSEXT</font>
<font color="#009900">+-#endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ #endif /* OPENSSL_DOING_MAKEDEPEND */</font>
<font color="#009900">++#ifndef OPENSSL_THREADS</font>
<font color="#009900">++# define OPENSSL_THREADS</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ #ifndef OPENSSL_NO_DYNAMIC_ENGINE</font>
<font color="#009900">+ # define OPENSSL_NO_DYNAMIC_ENGINE</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+@@ -45,6 +48,9 @@</font>
<font color="#009900">+ # if defined(OPENSSL_NO_GMP) && \
!defined(NO_GMP)</font> <font color="#009900">+ # define NO_GMP</font>
<font color="#009900">+ # endif</font>
<font color="#009900">++# if defined(OPENSSL_NO_IDEA) && \
!defined(NO_IDEA)</font> <font color="#009900">++# define NO_IDEA</font>
<font color="#009900">++# endif</font>
<font color="#009900">+ # if defined(OPENSSL_NO_KRB5) && \
!defined(NO_KRB5)</font> <font color="#009900">+ # define NO_KRB5</font>
<font color="#009900">+ # endif</font>
<font color="#009900">+@@ -60,11 +66,10 @@</font>
<font color="#009900">+ # if defined(OPENSSL_NO_SEED) && \
!defined(NO_SEED)</font> <font color="#009900">+ # define NO_SEED</font>
<font color="#009900">+ # endif</font>
<font color="#009900">+-# if defined(OPENSSL_NO_TLSEXT) && \
!defined(NO_TLSEXT)</font> <font color="#009900">+-# define NO_TLSEXT</font>
<font color="#009900">+-# endif</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">++#define OPENSSL_CPUID_OBJ</font>
<font color="#009900">++</font>
<font color="#009900">+ /* crypto/opensslconf.h.in */</font>
<font color="#009900">+ </font>
<font color="#009900">+ /* Generate 80386 code? */</font>
<font color="#009900">+@@ -72,8 +77,8 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical \
names instead */</font> <font color="#009900">+ #if defined(HEADER_CRYPTLIB_H) \
&& !defined(OPENSSLDIR)</font> <font color="#009900">+-#define ENGINESDIR \
"/usr/local/ssl/lib/engines"</font> <font color="#009900">+-#define OPENSSLDIR \
"/usr/local/ssl"</font> <font color="#009900">++#define ENGINESDIR \
"/usr/lib/ssl/engines"</font> <font color="#009900">++#define OPENSSLDIR \
"/usr/lib/ssl"</font> <font color="#009900">+ #endif</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -104,14 +109,14 @@</font>
<font color="#009900">+ * - Intel P6 because partial register stalls are very \
expensive;</font> <font color="#009900">+ * - elder Alpha because it lacks byte \
load/store instructions;</font> <font color="#009900">+ */</font>
<font color="#009900">+-#define RC4_INT unsigned int</font>
<font color="#009900">++#define RC4_INT unsigned char</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ #if !defined(RC4_CHUNK)</font>
<font color="#009900">+ /*</font>
<font color="#009900">+ * This enables code handling data aligned at natural CPU \
word</font> <font color="#009900">+ * boundary. See crypto/rc4/rc4_enc.c for further \
details.</font> <font color="#009900">+ */</font>
<font color="#009900">+-#undef RC4_CHUNK</font>
<font color="#009900">++#define RC4_CHUNK unsigned long</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -119,7 +124,7 @@</font>
<font color="#009900">+ /* If this is set to 'unsigned int' on a DEC Alpha, this \
gives about a</font> <font color="#009900">+ * %20 speed up (longs are 8 bytes, \
int's are 4). */</font> <font color="#009900">+ #ifndef DES_LONG</font>
<font color="#009900">+-#define DES_LONG unsigned long</font>
<font color="#009900">++#define DES_LONG unsigned int</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -133,9 +138,9 @@</font>
<font color="#009900">+ /* The prime number generation stuff may not work when</font>
<font color="#009900">+ * EIGHT_BIT but I don't care since I've only used this \
mode</font> <font color="#009900">+ * for debuging the bignum libraries */</font>
<font color="#009900">+-#undef SIXTY_FOUR_BIT_LONG</font>
<font color="#009900">++#define SIXTY_FOUR_BIT_LONG</font>
<font color="#009900">+ #undef SIXTY_FOUR_BIT</font>
<font color="#009900">+-#define THIRTY_TWO_BIT</font>
<font color="#009900">++#undef THIRTY_TWO_BIT</font>
<font color="#009900">+ #undef SIXTEEN_BIT</font>
<font color="#009900">+ #undef EIGHT_BIT</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+@@ -149,7 +154,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if defined(HEADER_BF_LOCL_H) && \
!defined(CONFIG_HEADER_BF_LOCL_H)</font> <font color="#009900">+ #define \
CONFIG_HEADER_BF_LOCL_H</font> <font color="#009900">+-#undef BF_PTR</font>
<font color="#009900">++#define BF_PTR2</font>
<font color="#009900">+ #endif /* HEADER_BF_LOCL_H */</font>
<font color="#009900">+ </font>
<font color="#009900">+ #if defined(HEADER_DES_LOCL_H) && \
!defined(CONFIG_HEADER_DES_LOCL_H)</font> <font color="#009900">+@@ -179,7 +184,7 \
@@</font> <font color="#009900">+ /* Unroll the inner loop, this sometimes helps, \
sometimes hinders.</font> <font color="#009900">+ * Very mucy CPU dependant \
*/</font> <font color="#009900">+ #ifndef DES_UNROLL</font>
<font color="#009900">+-#undef DES_UNROLL</font>
<font color="#009900">++#define DES_UNROLL</font>
<font color="#009900">+ #endif</font>
<font color="#009900">+ </font>
<font color="#009900">+ /* These default values were supplied by</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/pkcs7/pk7_mime.c</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c</font>
<font color="#009900">+@@ -335,9 +335,9 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ if(strcmp(hdr->value, "application/x-pkcs7-signature") \
&&</font> <font color="#009900">+ strcmp(hdr->value, \
"application/pkcs7-signature")) {</font> <font \
color="#009900">+- sk_MIME_HEADER_pop_free(headers, mime_hdr_free);</font> <font \
color="#009900">+ PKCS7err(PKCS7_F_SMIME_READ_PKCS7,PKCS7_R_SIG_INVALID_MIME_TYPE);</font>
<font color="#009900">+ ERR_add_error_data(2, "type: ", hdr->value);</font>
<font color="#009900">++ sk_MIME_HEADER_pop_free(headers, mime_hdr_free);</font>
<font color="#009900">+ sk_BIO_pop_free(parts, BIO_vfree);</font>
<font color="#009900">+ return NULL;</font>
<font color="#009900">+ }</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/bn/asm/ppc.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/bn/asm/ppc.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # Implemented as a Perl wrapper as we want to support several \
different</font> <font color="#009900">+ # architectures with single file. We pick up \
the target based on the</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/crypto/x86_64cpuid.pl</font> <font color="#009900">++++ \
openssl-0.9.8g/crypto/x86_64cpuid.pl</font> <font color="#009900">+@@ -1,4 +1,4 \
@@</font> <font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ $output=shift;</font>
<font color="#009900">+ $win64a=1 if ($output =~ /win64a\.[s|asm]/);</font>
<font color="#009900">+@@ -134,5 +134,9 @@</font>
<font color="#009900">+ .size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid</font>
<font color="#009900">+ </font>
<font color="#009900">+ .section .init</font>
<font color="#009900">++#ifdef OPENSSL_PIC</font>
<font color="#009900">++ call OPENSSL_cpuid_setup\@PLT</font>
<font color="#009900">++#else</font>
<font color="#009900">+ call OPENSSL_cpuid_setup</font>
<font color="#009900">++#endif</font>
<font color="#009900">+ ___</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/aes/asm/aes-586.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/aes/asm/aes-586.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/env perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # \
====================================================================</font> <font \
color="#009900">+ # Written by Andy Polyakov <appro@fy.chalmers.se> for the \
OpenSSL</font> <font color="#009900">+@@ -250,7 +250,7 @@</font>
<font color="#009900">+ sub _data_word() { my $i; while(defined($i=shift)) { \
&data_word($i,$i); } }</font> <font color="#009900">+ </font>
<font color="#009900">+ &public_label("AES_Te");</font>
<font color="#009900">+-&function_begin_B("_x86_AES_encrypt");</font>
<font color="#009900">++&function_begin_B_static("_x86_AES_encrypt");</font>
<font color="#009900">+ if ($vertical_spin) {</font>
<font color="#009900">+ # I need high parts of volatile registers to be \
accessible...</font> <font color="#009900">+ \
&exch ($s1="edi",$key="ebx");</font> <font color="#009900">+@@ -539,7 +539,7 \
@@</font> <font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">+ &public_label("AES_Td");</font>
<font color="#009900">+-&function_begin_B("_x86_AES_decrypt");</font>
<font color="#009900">++&function_begin_B_static("_x86_AES_decrypt");</font>
<font color="#009900">+ # note that caller is expected to allocate stack frame for \
me!</font> <font color="#009900">+ &mov (&DWP(12,"esp"),$key); # save \
key</font> <font color="#009900">+ </font>
<font color="#009900">+@@ -1460,15 +1460,22 @@</font>
<font color="#009900">+ &public_label("AES_Td");</font>
<font color="#009900">+ &public_label("AES_Te");</font>
<font color="#009900">+ &function_begin_B("AES_set_decrypt_key");</font>
<font color="#009900">++ &push ("ebx");</font>
<font color="#009900">+ &mov ("eax",&wparam(0));</font>
<font color="#009900">+ &mov ("ecx",&wparam(1));</font>
<font color="#009900">+ &mov ("edx",&wparam(2));</font>
<font color="#009900">+ &sub ("esp",12);</font>
<font color="#009900">++</font>
<font color="#009900">++ &call (&label("pic_point0")); </font>
<font color="#009900">++ &set_label("pic_point0");</font>
<font color="#009900">++ &blindpop("ebx");</font>
<font color="#009900">++ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . \
&label("pic_point0") . "]");</font> <font color="#009900">+ \
&mov (&DWP(0,"esp"),"eax");</font> <font color="#009900">+ \
&mov (&DWP(4,"esp"),"ecx");</font> <font color="#009900">+ \
&mov (&DWP(8,"esp"),"edx");</font> <font \
color="#009900">+- &call ("AES_set_encrypt_key");</font> <font \
color="#009900">++ &call ("AES_set_encrypt_key\@PLT");</font> <font \
color="#009900">+ &add ("esp",12);</font> <font \
color="#009900">++ &pop ("ebx");</font> <font color="#009900">+ \
&cmp ("eax",0);</font> <font color="#009900">+ \
&je (&label("proceed"));</font> <font color="#009900">+ &ret ();</font>
<font color="#009900">+--- openssl-0.9.8g.orig/crypto/asn1/charmap.pl</font>
<font color="#009900">++++ openssl-0.9.8g/crypto/asn1/charmap.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/local/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ use strict;</font>
<font color="#009900">+ </font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/mkerr.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/mkerr.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/local/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ my $config = "crypto/err/openssl.ec";</font>
<font color="#009900">+ my $debug = 0;</font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/clean-depend.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/clean-depend.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/local/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ # Clean the dependency list in a makefile of standard \
includes...</font> <font color="#009900">+ # Written by Ben Laurie \
<ben@algroup.co.uk> 19 Jan 1999</font> <font color="#009900">+ </font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/extract-names.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/extract-names.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ $/ = ""; # Eat a paragraph at once.</font>
<font color="#009900">+ while(<STDIN>) {</font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/pod2man.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/pod2man.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-: #!/usr/bin/perl-5.005</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'</font>
<font color="#009900">+ if $running_under_some_shell;</font>
<font color="#009900">+ </font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/mkstack.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/mkstack.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/local/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ # This is a utility that searches out \
"DECLARE_STACK_OF()"</font> <font color="#009900">+ # declarations in .h and .c \
files, and updates/creates/replaces</font> <font color="#009900">+--- \
openssl-0.9.8g.orig/util/selftest.pl</font> <font color="#009900">++++ \
openssl-0.9.8g/util/selftest.pl</font> <font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/local/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # Run the test suite and generate a report</font>
<font color="#009900">+ #</font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/extract-section.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/extract-section.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/bin/perl</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ </font>
<font color="#009900">+ while(<STDIN>) {</font>
<font color="#009900">+ if (/=for\s+comment\s+openssl_manual_section:(\S+)/)</font>
<font color="#009900">+--- openssl-0.9.8g.orig/util/pl/netware.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/pl/netware.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-# Metrowerks Codewarrior for NetWare</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ </font>
<font color="#009900">+ # The import files and other misc imports needed to \
link</font> <font color="#009900">+--- openssl-0.9.8g.orig/util/mkdef.pl</font>
<font color="#009900">++++ openssl-0.9.8g/util/mkdef.pl</font>
<font color="#009900">+@@ -1,4 +1,4 @@</font>
<font color="#009900">+-#!/usr/local/bin/perl -w</font>
<font color="#009900">++#!/usr/local/bin/perl</font>
<font color="#009900">+ #</font>
<font color="#009900">+ # generate a .def file</font>
<font color="#009900">+ #</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl-native_0.9.7m.bb aee940409bd5054fbf284dbe9b7adbfd5269d114</font>
<font color="#009900">+++ \
packages/openssl/openssl-native_0.9.7m.bb aee940409bd5054fbf284dbe9b7adbfd5269d114</font>
<font color="#0000FF">@@ -0,0 +1,16 @@</font>
<font color="#009900">+inherit pkgconfig native</font>
<font color="#009900">+</font>
<font color="#009900">+require openssl.inc</font>
<font color="#009900">+</font>
<font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI += "file://debian.patch;patch=1 \</font>
<font color="#009900">+ file://armeb.patch;patch=1;pnum=0 \</font>
<font color="#009900">+ file://gnueabi-arm.patch;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+FILESPATH = "${@base_set_filespath( \
['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', \
'${FILE_DIRNAME}' ], d)}"</font> <font color="#009900">+</font>
<font color="#009900">+do_install() {</font>
<font color="#009900">+ :</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl_0.9.7m.bb e1c49f5a11a86d7eb04595e34aeed012e99f1071</font> \
<font color="#009900">+++ \
packages/openssl/openssl_0.9.7m.bb e1c49f5a11a86d7eb04595e34aeed012e99f1071</font> \
<font color="#0000FF">@@ -0,0 +1,12 @@</font> <font color="#009900">+inherit \
pkgconfig</font> <font color="#009900">+</font>
<font color="#009900">+require openssl.inc</font>
<font color="#009900">+</font>
<font color="#009900">+PR = "r6"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI += "file://debian.patch;patch=1 \</font>
<font color="#009900">+ file://armeb.patch;patch=1;pnum=0 \</font>
<font color="#009900">+ file://gnueabi-arm.patch;patch=1 \</font>
<font color="#009900">+ file://gnueabi-armeb.patch;patch=1 \</font>
<font color="#009900">+ file://uclibcgnueabi.patch;patch=1 \</font>
<font color="#009900">+ file://avr32.patch;patch=1;pnum=0"</font>
============================================================
<font color="#FF6600">--- \
packages/openssl/openssl_0.9.8g.bb e326706f63f853e3243bfc002f2f8d924885404d</font> \
<font color="#009900">+++ \
packages/openssl/openssl_0.9.8g.bb e326706f63f853e3243bfc002f2f8d924885404d</font> \
<font color="#0000FF">@@ -0,0 +1,10 @@</font> <font color="#009900">+inherit \
pkgconfig</font> <font color="#009900">+</font>
<font color="#009900">+require openssl.inc</font>
<font color="#009900">+</font>
<font color="#009900">+PR = "r6"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI += "file://debian.patch;patch=1 \</font>
<font color="#009900">+ file://configure-targets.patch;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+PARALLEL_MAKE = ""</font>
============================================================
<font color="#FF6600">--- \
packages/wvdial/wvdial_1.60.bb ccbc1ba0ccfa6b93039796cdc3f11943de252a06</font> <font \
color="#009900">+++ packages/wvdial/wvdial_1.60.bb ccbc1ba0ccfa6b93039796cdc3f11943de252a06</font>
<font color="#0000FF">@@ -0,0 +1,17 @@</font>
<font color="#009900">+HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial"</font>
<font color="#009900">+DESCRIPTION = "WvDial is a program that makes it easy to \
connect your Linux workstation to the Internet."</font> <font \
color="#009900">+</font> <font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
<font color="#009900">+LICENSE = "LGPL"</font>
<font color="#009900">+SRC_URI = \
"http://www.alumnit.ca/download/wvdial-1.60.tar.gz"</font> <font \
color="#009900">+</font> <font color="#009900">+DEPENDS = "wvstreams"</font>
<font color="#009900">+RDEPENDS = "ppp"</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OEMAKE = ""</font>
<font color="#009900">+export WVLINK="${LD}"</font>
<font color="#009900">+</font>
<font color="#009900">+do_install() {</font>
<font color="#009900">+ oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers \
install</font> <font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- \
packages/wvstreams/files/build-fixes-and-sanity.patch 01f17efed1dad3b066472e2a1501896f72a5154b</font>
<font color="#009900">+++ \
packages/wvstreams/files/build-fixes-and-sanity.patch 01f17efed1dad3b066472e2a1501896f72a5154b</font>
<font color="#0000FF">@@ -0,0 +1,84 @@</font>
<font color="#009900">+Index: wvstreams-4.4.1/configure.ac</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- wvstreams-4.4.1.orig/configure.ac 2007-08-30 \
04:47:54.000000000 +0200</font> <font color="#009900">++++ \
wvstreams-4.4.1/configure.ac 2008-04-12 00:15:13.000000000 +0200</font> <font \
color="#009900">+@@ -445,7 +445,6 @@</font> <font color="#009900">+ # tcl</font>
<font color="#009900">+ if test "$with_tcl" != "no"; then</font>
<font color="#009900">+ CPPFLAGS_save="$CPPFLAGS"</font>
<font color="#009900">+- WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)</font>
<font color="#009900">+ AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])</font>
<font color="#009900">+ AC_CHECK_LIB(tcl8.3, TclInterpInit,, \
[with_tcl=no])</font> <font color="#009900">+ if test "$with_tcl" != "no"; \
then</font> <font color="#009900">+Index: wvstreams-4.4.1/Makefile</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- wvstreams-4.4.1.orig/Makefile 2007-08-30 \
04:48:09.000000000 +0200</font> <font color="#009900">++++ \
wvstreams-4.4.1/Makefile 2008-04-12 00:51:51.000000000 +0200</font> <font \
color="#009900">+@@ -76,7 +76,7 @@</font> <font color="#009900">+ $(call \
configure)</font> <font color="#009900">+ </font>
<font color="#009900">+ include/wvautoconf.h: include/wvautoconf.h.in</font>
<font color="#009900">+- $(call configure)</font>
<font color="#009900">++ </font>
<font color="#009900">+ </font>
<font color="#009900">+ gnulib/Makefile: gnulib/Makefile.in</font>
<font color="#009900">+ $(call configure)</font>
<font color="#009900">+@@ -97,9 +97,7 @@</font>
<font color="#009900">+ @touch $@</font>
<font color="#009900">+ </font>
<font color="#009900">+ configure: configure.ac include/wvautoconf.h.in \
aclocal.m4</font> <font color="#009900">+- autoconf</font>
<font color="#009900">+- @rm -f config.mk include/wvautoconf.h gnulib/Makefile</font>
<font color="#009900">+- @touch $@</font>
<font color="#009900">++ @echo hey@</font>
<font color="#009900">+ </font>
<font color="#009900">+ include/wvautoconf.h.in: configure.ac aclocal.m4</font>
<font color="#009900">+ autoheader</font>
<font color="#009900">+Index: wvstreams-4.4.1/config.mk.in</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- wvstreams-4.4.1.orig/config.mk.in 2007-08-17 \
07:15:31.000000000 +0200</font> <font color="#009900">++++ \
wvstreams-4.4.1/config.mk.in 2008-04-12 00:25:54.000000000 +0200</font> <font \
color="#009900">+@@ -31,6 +31,7 @@</font> <font color="#009900">+ </font>
<font color="#009900">+ prefix=@prefix@</font>
<font color="#009900">+ datadir=@datadir@</font>
<font color="#009900">++datarootdir=@datarootdir@</font>
<font color="#009900">+ includedir=@includedir@</font>
<font color="#009900">+ infodir=@infodir@</font>
<font color="#009900">+ localstatedir=@localstatedir@</font>
<font color="#009900">+Index: wvstreams-4.4.1/vars.mk</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- wvstreams-4.4.1.orig/vars.mk 2007-08-17 \
07:15:31.000000000 +0200</font> <font color="#009900">++++ \
wvstreams-4.4.1/vars.mk 2008-04-12 01:44:03.000000000 +0200</font> <font \
color="#009900">+@@ -174,7 +174,7 @@</font> <font color="#009900">+ </font>
<font color="#009900">+ libwvutils.a libwvutils.so: $(filter-out $(BASEOBJS) \
$(TESTOBJS),$(call objects,utils)) gnulib/libgnu.a</font> <font color="#009900">+ \
libwvutils.so: libwvbase.so</font> <font color="#009900">+-libwvutils.so: -lz \
-lcrypt</font> <font color="#009900">++libwvutils.so: LIBS+=-lz -lcrypt</font>
<font color="#009900">+ </font>
<font color="#009900">+ libwvstreams.a libwvstreams.so: $(filter-out $(BASEOBJS), \
\</font> <font color="#009900">+ $(call objects,configfile crypto ipstreams \</font>
<font color="#009900">+Index: wvstreams-4.4.1/wvrules.mk</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- wvstreams-4.4.1.orig/wvrules.mk 2007-08-17 \
07:15:31.000000000 +0200</font> <font color="#009900">++++ \
wvstreams-4.4.1/wvrules.mk 2008-04-12 01:00:05.000000000 +0200</font> <font \
color="#009900">+@@ -51,7 +51,7 @@</font> <font color="#009900">+ \
LIBWVTEST=$(WVSTREAMS_LIB)/libwvtest.a $(LIBWVUTILS)</font> <font color="#009900">+ \
</font> <font color="#009900">+ # Default compiler we use for linking</font>
<font color="#009900">+-WVLINK_CC = gcc</font>
<font color="#009900">++WVLINK_CC = $(CC)</font>
<font color="#009900">+ </font>
<font color="#009900">+ # FIXME: what does this do??</font>
<font color="#009900">+ XX_LIBS := $(XX_LIBS) $(shell $(CC) -lsupc++ -lgcc_eh \
2>&1 | grep -q "undefined reference" && echo " -lsupc++ \
-lgcc_eh")</font> <font color="#009900">+Index: \
wvstreams-4.4.1/xplc/config/config.mk.in</font> <font \
color="#009900">+===================================================================</font>
<font color="#009900">+--- wvstreams-4.4.1.orig/xplc/config/config.mk.in 2005-10-31 \
23:33:26.000000000 +0100</font> <font color="#009900">++++ \
wvstreams-4.4.1/xplc/config/config.mk.in 2008-04-12 00:27:33.000000000 +0200</font> \
<font color="#009900">+@@ -49,4 +49,4 @@</font> <font color="#009900">+ \
LN_S:=@LN_S@</font> <font color="#009900">+ LIBS:=@LIBS@</font>
<font color="#009900">+ CVS2CL:=@CVS2CL@</font>
<font color="#009900">+-</font>
<font color="#009900">++datarootdir:=@datarootdir@</font>
============================================================
<font color="#FF6600">--- \
packages/wvstreams/wvstreams_4.4.1.bb 663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3</font> \
<font color="#009900">+++ \
packages/wvstreams/wvstreams_4.4.1.bb 663bae3c70ee2f9f571ddfe10c2e3cc518f98dd3</font> \
<font color="#0000FF">@@ -0,0 +1,38 @@</font> <font color="#009900">+HOMEPAGE = \
"http://alumnit.ca/wiki/index.php?page=WvStreams"</font> <font \
color="#009900">+LICENSE = "LGPL"</font> <font color="#009900">+DESCRIPTION = \
"WvStreams is a network programming library in C++"</font> <font \
color="#009900">+DEPENDS = "zlib openssl (>= 0.9.8)"</font> <font \
color="#009900">+</font> <font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = \
"http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \</font> <font \
color="#009900">+ file://build-fixes-and-sanity.patch;patch=1 "</font> \
<font color="#009900">+</font> <font color="#009900">+inherit autotools</font>
<font color="#009900">+</font>
<font color="#009900">+LDFLAGS_append = " \
-Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"</font> <font color="#009900">+</font>
<font color="#009900">+EXTRA_AUTORECONF += " -I${S}/gnulib/m4"</font>
<font color="#009900">+EXTRA_OECONF = " --without-tcl --without-qt \
--without-pam"</font> <font color="#009900">+</font>
<font color="#009900">+PACKAGES_prepend = "libuniconf libuniconf-dbg "</font>
<font color="#009900">+PACKAGES_prepend = "uniconfd uniconfd-dbg "</font>
<font color="#009900">+PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg \
"</font> <font color="#009900">+PACKAGES_prepend = "libwvstreams-extras \
libwvstreams-extras-dbg "</font> <font color="#009900">+</font>
<font color="#009900">+FILES_libuniconf = "${libdir}/libuniconf.so.*"</font>
<font color="#009900">+FILES_libuniconf-dbg = \
"${libdir}/.debug/libuniconf.so.*"</font> <font color="#009900">+</font>
<font color="#009900">+FILES_uniconfd = "${sbindir}/uniconfd \
${sysconfdir}/uniconf.conf ${localstatedir}/uniconf"</font> <font \
color="#009900">+FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd"</font> <font \
color="#009900">+</font> <font color="#009900">+FILES_libwvstreams-base = \
"${libdir}/libwvutils.so.*"</font> <font color="#009900">+FILES_libwvstreams-base-dbg \
= "${libdir}/.debug/libwvutils.so.*"</font> <font color="#009900">+</font>
<font color="#009900">+FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* \
${libdir}/libwvstreams.so.*"</font> <font \
color="#009900">+FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* \
${libdir}/.debug/libwvstreams.so.*"</font> <font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+do_stage() {</font>
<font color="#009900">+ autotools_stage_all</font>
<font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- MAINTAINERS 68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb</font>
<font color="#009900">+++ MAINTAINERS 5556c9277c3381070987310400058abdd5f4c820</font>
<font color="#0000FF">@@ -165,7 +165,7 @@ Mail: mlauer@vanille-media.de</font>
Person: Michael 'Mickey' Lauer
Mail: mlauer@vanille-media.de
<font color="#FF6600">-Distros: OpenMoko, Ångström, Generic</font>
<font color="#009900">+Distros: Openmoko, Ångström, Generic</font>
Machines: om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
Interests: Core OE infrastructure, everything Python, EFL, E17, Qt4
Recipes: *python*, efl/*, e17*
============================================================
<font color="#FF6600">--- \
classes/insane.bbclass 071cc4297bda486033be0ee2ba642fda644a63e8</font> <font \
color="#009900">+++ classes/insane.bbclass 8a4b746dec67863e553a4824eecb3a7e6e9830d9</font>
<font color="#0000FF">@@ -336,7 +336,7 @@ def \
package_qa_check_staged(path,d):</font> workdir = os.path.join(tmpdir, "work")
installed = "installed=yes"
<font color="#FF6600">- if bb.data.inherits_class("native", d) or \
bb.data.inherits_class("cross", d):</font> <font color="#009900">+ if \
bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d) or \
bb.data.inherits_class("sdk", d):</font> pkgconfigcheck = workdir
else:
pkgconfigcheck = tmpdir
============================================================
<font color="#FF6600">--- \
conf/checksums.ini 45003c6575eee344823ebc073a31240ba42d22cc</font> <font \
color="#009900">+++ conf/checksums.ini 7133e53e683443e4522bb1dd79fea538f45d2bb9</font>
<font color="#0000FF">@@ -334,6 +334,10 @@ \
sha256=d0b5d4dce02c56d2eb0728db3ebd63afc</font> md5=70084ffa561660f07de466c2c8c4842d
sha256=d0b5d4dce02c56d2eb0728db3ebd63afc3dae906d158be6532ae4480d311e167
<font color="#009900">+[http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2]</font>
<font color="#009900">+md5=afb5451049eda91fbde10bd5a4b7fadc</font>
<font color="#009900">+sha256=f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e</font>
<font color="#009900">+</font>
[http://jerakeen.org/files/PythonDaap-0.4.tar.gz]
md5=f7672bfd563787a76fb7e9a43c062f18
sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
<font color="#0000FF">@@ -958,6 +962,106 @@ \
sha256=26c99025b59e30779300b68adb764f824</font> md5=00bfa16d58e034e3c2aa27f390390d30
sha256=26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001]</font>
<font color="#009900">+md5=d8e10c754f477e3f3a581af566b89301</font>
<font color="#009900">+sha256=beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002]</font>
<font color="#009900">+md5=d38a5288b2f0ea6c9ac76b66cc74ef7d</font>
<font color="#009900">+sha256=a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003]</font>
<font color="#009900">+md5=0b90d37911827d8cb95f3b4353cc225e</font>
<font color="#009900">+sha256=7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004]</font>
<font color="#009900">+md5=8062f3a59631f58d78b180d83759b68a</font>
<font color="#009900">+sha256=3de0938673637089c3b0f0f355de377bb2be2d3fca68053dda267ca11b5998f2</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005]</font>
<font color="#009900">+md5=585b5943fadf0875ced243b245adde58</font>
<font color="#009900">+sha256=e7fecdecb12320cd6fe9aca83fab1828b76aeb5313b991883764cb9139d845b7</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006]</font>
<font color="#009900">+md5=1d5732e01ea938aeed42f3def131fa4d</font>
<font color="#009900">+sha256=8f14f81ced32bc057bc10abf6842f4a5ac172816631f2b87a5a3be4f01c0847d</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007]</font>
<font color="#009900">+md5=dcd0cc5d801607827f7c851e72b0eabc</font>
<font color="#009900">+sha256=6863a712e5a68eccfb77162a9f947ffd80af648f0124c38f795ebba2be12eff8</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008]</font>
<font color="#009900">+md5=bb3c7dd11198c0ab93d0e960bebf6256</font>
<font color="#009900">+sha256=ccf303b4d199d89d5efc659235f8a645376e86d294260dda4becbb61ec06667b</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009]</font>
<font color="#009900">+md5=434a6f29b0ca5f1ab784b2437ae8eaed</font>
<font color="#009900">+sha256=ef30c579419106b4b4a2d0064ef7e57ceee6cdf657f4ccd7b89c8e4fd70560d8</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010]</font>
<font color="#009900">+md5=2efff04dd246fcf63bd4b99f77c9a081</font>
<font color="#009900">+sha256=bb7df9fefe88d62ee371353edf62402a667cffba6ea202aa1c8b220308a0c612</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011]</font>
<font color="#009900">+md5=1dd104342f6920dfaf5efb3131e922e0</font>
<font color="#009900">+sha256=85bf656cfc49b1447b061341a4b1cb93ba89a41d8d1699a65aa971d1853ba472</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012]</font>
<font color="#009900">+md5=4f24b696ab78bdfae4f9cb7eb59b835d</font>
<font color="#009900">+sha256=45ef4ad98f2f218aa3acec15842ae1b833769c1dbe2f90c9bba00bbe4949fc43</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013]</font>
<font color="#009900">+md5=7c40addbf1187a26ae1c8373ed383442</font>
<font color="#009900">+sha256=9fbf893c383f45d25e5bc5c9eae8d2b349521f288945b3bd21c781784b81f693</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014]</font>
<font color="#009900">+md5=28e88c9f8679e99ac590d4a4a8227c56</font>
<font color="#009900">+sha256=62bb1a4d70f6f7938ca70a6aa7fe6f4b377ab5f450c7756b22b41de3bbd98ed6</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015]</font>
<font color="#009900">+md5=7c17d29675bd0d49470f162774385f80</font>
<font color="#009900">+sha256=de40425e83628eb7431f39340ac09b42b5fcf484a565352851961b3e917d8771</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016]</font>
<font color="#009900">+md5=a1edaa98b4449fe2205fa75448b7b105</font>
<font color="#009900">+sha256=7abf66bbba3ebd6b6428190f3ebca59abdc0bfa3957f1a725489de7391c2d9f1</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017]</font>
<font color="#009900">+md5=889ed119bbf9d363660b9a0127f35efa</font>
<font color="#009900">+sha256=951aa2a07b38db8eea8e7368d3ac36af60af7f5ade455215006229ce3815dfe0</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018]</font>
<font color="#009900">+md5=a7d3f85fa687d2c1b5a134839f6d395d</font>
<font color="#009900">+sha256=c85e2bca6084a79774adbf801698c62905662836334e54355b77fbf1c529074c</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019]</font>
<font color="#009900">+md5=f0399da4007e46fc5820ce25d07425b9</font>
<font color="#009900">+sha256=d83f1d740cb103be444589dcd9da61c2802815e8c256a01cfa7e484c50a9eb85</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020]</font>
<font color="#009900">+md5=b76602281c3104d904fd064510fe0c21</font>
<font color="#009900">+sha256=3e66a1d05566d5501c2f868d3c94b8d71821a21d0daf9baaf594369697793013</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021]</font>
<font color="#009900">+md5=923374ae4403c92820f711e62e1d01a5</font>
<font color="#009900">+sha256=a5e54704e6867c969a3e60556a5fbacedecca7404c3ddbe8180a92b6898a2a58</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022]</font>
<font color="#009900">+md5=c82d3bd14e373878b2a680dce18d1596</font>
<font color="#009900">+sha256=057e03d593b858637056c0458b168e9c012db914727abba964afcaf377f2c5a4</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023]</font>
<font color="#009900">+md5=987c949a77b4b0ffe4a2597141e77635</font>
<font color="#009900">+sha256=869466d80807cde59c0eab9a39ef1909be4d5e8698ea1e3daa530ad59baaa97a</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024]</font>
<font color="#009900">+md5=5a2b976e761ab83f0fc7daae11451b86</font>
<font color="#009900">+sha256=d13c59fa6b182f79bbf9ba35f72085aeb755f9785985eaf9f4a55d58045fe327</font>
<font color="#009900">+</font>
<font color="#009900">+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025]</font>
<font color="#009900">+md5=08668dc2825f65eced9cac6b09ce1b45</font>
<font color="#009900">+sha256=abfc1e1db3af956d4e71deb6a1ea9de1164c49fca4020b2546df3aa56f08cebe</font>
<font color="#009900">+</font>
[http://www.caliban.org/files/bash/bash-completion-20040711.tar.gz]
md5=90ee706965dbf7b24515220d3bdc1f85
sha256=8e4ddca8aa5ae4261bfcba056292aec4c8bf26fe847e01b67f4b3065fc512a54
<font color="#0000FF">@@ -1134,6 +1238,10 @@ \
sha256=f25791ae3c83fe739a3c810c5fe0d7ac3</font> md5=58fff2bc38594fe8ab0803f66cce2325
sha256=f25791ae3c83fe739a3c810c5fe0d7ac3e2ed02df9d3a65edff382703f5d2c65
<font color="#009900">+[http://bluez.sourceforge.net/download/bluez-hcidump-1.38.tar.gz]</font>
<font color="#009900">+md5=b7a44fb9b498780e66542b943b25a90f</font>
<font color="#009900">+sha256=b860e314b984d3f9ba5341e2eea08e3d988863748aa16a18bfd3fe5188899239</font>
<font color="#009900">+</font>
[http://bluez.sourceforge.net/download/bluez-hcidump-1.40.tar.gz]
md5=c5793b79c3e7fea3a367c08c26c8e23c
sha256=00dbb7513115d2fcdb7ca3bd777e4bc38e5ed80964fec2d1454e4acadc950094
<font color="#0000FF">@@ -1154,6 +1262,10 @@ \
sha256=3ea7817c91b8cff9cacba23392f4a4163</font> md5=8f0368c6213abef36f1e563b44b2eed4
sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
<font color="#009900">+[http://bluez.sourceforge.net/download/bluez-libs-3.28.tar.gz]</font>
<font color="#009900">+md5=3cb2072e11c81398710d8f565ac3c88f</font>
<font color="#009900">+sha256=540b807559b3d753644db5a4f849226b0dbf27746df8a761878d848fc9710e05</font>
<font color="#009900">+</font>
[http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
md5=8b73b0ccbcef6a4270468487b1309990
sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
<font color="#0000FF">@@ -1186,6 +1298,10 @@ \
sha256=4f3d52cc207e438018b3a4c307d996986</font> md5=767ad814bff4e1806f873ecf2434ba89
sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
<font color="#009900">+[http://bluez.sourceforge.net/download/bluez-utils-3.28.tar.gz]</font>
<font color="#009900">+md5=9966fe59e228efc6626d47f2f2732d43</font>
<font color="#009900">+sha256=1e038d406998dee998b88927cd25c725398c5b8f78d1d31b7be986c5f6603ac4</font>
<font color="#009900">+</font>
[http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
md5=f63b440396baee7dee9259395a205d48
sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
<font color="#0000FF">@@ -1226,6 +1342,10 @@ \
sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1</font> md5=00b1eee7f98b68fa762c4efb3b34caa1
sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf
<font color="#009900">+[http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz]</font>
<font color="#009900">+md5=77a1ba78f37bdd7f024b67e1e36ad151</font>
<font color="#009900">+sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz]
md5=b86fb56a824d4a3dedcbda12f8b1a2b3
sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66
<font color="#0000FF">@@ -1346,6 +1466,14 @@ \
sha256=3400bf837d214adc8522d1e78bae936c0</font> md5=12851f4844bcda78ef4ba9168e16cc56
sha256=3400bf837d214adc8522d1e78bae936c0c2cde2127ab1ee095587b946a6b5131
<font color="#009900">+[http://www.busybox.net/downloads/busybox-1.9.1.tar.gz]</font>
<font color="#009900">+md5=b9ae7be6e9a112ea5653855bbe70b501</font>
<font color="#009900">+sha256=722071b14aba77ce6e2a83608b2ae4d4dab318d7f339d83e6c1719886b21aed9</font>
<font color="#009900">+</font>
<font color="#009900">+[http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch]</font>
<font color="#009900">+md5=9e5d99b89d79dd117310ee675322d9f2</font>
<font color="#009900">+sha256=3fe138dc567d0fcda304f89523686aaec2f83c9193403cfc68d1ba32fa554511</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz]
md5=b9d77c57bda2e019207a1874d9bb4dea
sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
<font color="#0000FF">@@ -1890,10 +2018,18 @@ \
sha256=a1fa714482f25a67a19490303a0164326</font> md5=200b9f5d74175875fcb3ee54adbf0007
sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
<font color="#009900">+[http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz]</font>
<font color="#009900">+md5=200b9f5d74175875fcb3ee54adbf0007</font>
<font color="#009900">+sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337</font>
<font color="#009900">+</font>
[http://samba.org/ftp/tridge/dbench/dbench-3.04.tar.gz]
md5=efd0c958da79c1cd941ecd3f63e637ae
sha256=055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b
<font color="#009900">+[http://samba.org/ftp/tridge/dbench/dbench-4.0.tar.gz]</font>
<font color="#009900">+md5=1fe56ff71b9a416f8889d7150ac54da4</font>
<font color="#009900">+sha256=6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/dbh/dbh_1.0-18.tar.bz2]
md5=dca09e2949616471669320e3429a49ef
sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6
<font color="#0000FF">@@ -2282,6 +2418,10 @@ \
sha256=75a4861bf7dcc96a871611350276f10a8</font> md5=e5d8dcb5995913ae6b7f205e7ac28dbe
sha256=75a4861bf7dcc96a871611350276f10a87b0f7c44a1bbab1108374828bccf509
<font color="#009900">+[http://people.openmoko.org/stefan/e_nm-big-hack.patch]</font>
<font color="#009900">+md5=91d8ce9e7bfcc0a61220ebc4ea83ab5f</font>
<font color="#009900">+sha256=60ed501bd19b61f7d8456a2e906c890307e73f20ec1e4186d4eca312a74b0d05</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.2.tar.bz2]
md5=9db49742bd4c17966fff7d76ac566d31
sha256=978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df
<font color="#0000FF">@@ -3266,6 +3406,10 @@ \
sha256=c119ce82f0e42d3412420c42c1ead75e0</font> md5=18be4e7a1ac713bda93d00fee20bbef8
sha256=c119ce82f0e42d3412420c42c1ead75e0b9de67131a5c9dd3cdab509f65ddfdd
<font color="#009900">+[ftp://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.gz]</font>
<font color="#009900">+md5=925695333524108291dc4012c4c9cbb8</font>
<font color="#009900">+sha256=a3c5455f30ffb3e6eeafb9e54598b48f9fbf46e3e99f431120360c183ddcc889</font>
<font color="#009900">+</font>
[ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz]
md5=1d1b1d5c0245b1c00aff92da751e9aa1
sha256=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
<font color="#0000FF">@@ -3410,6 +3554,10 @@ \
sha256=10e6ebecc2cbd07f193a5d26b88c3bf21</font> md5=7ee7874108cbe9ea7fff1f4ab3389ce8
sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff
<font color="#009900">+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.1.tar.bz2]</font>
<font color="#009900">+md5=9852daf0605f827bfd7199ffe4f5b22d</font>
<font color="#009900">+sha256=f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695</font>
<font color="#009900">+</font>
[http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
md5=aa214a10d873b68ddd67cd9de2ccae55
sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
<font color="#0000FF">@@ -3670,6 +3818,10 @@ \
sha256=098d920cb7d4a50e245deaafabfd8e06b</font> md5=bf4a6d95180d05981893e5d021c6695c
sha256=098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
<font color="#009900">+[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.22/gnome-vfs-2.22.0.tar.bz2]</font>
<font color="#009900">+md5=369105fd82cb99e69e63acab8f3b89b7</font>
<font color="#009900">+sha256=622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1</font>
<font color="#009900">+</font>
[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-2.6.0.tar.bz2]
md5=4d0323cf015dd006210fcacd4bfe7420
sha256=e2094c83a810319674e9c5ea24ac1325e8ea31e3df2e2efd41c70a07742caa6d
<font color="#0000FF">@@ -4346,6 +4498,10 @@ \
sha256=376796ba50ee251af63c1fe2aa17603aa</font> md5=4d33cbdf844fcee1c724e4cf2a32dd11
sha256=376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
<font color="#009900">+[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.gz]</font>
<font color="#009900">+md5=0a2d20f70e6e01a4869ad6b7497404ae</font>
<font color="#009900">+sha256=9b5c1d9dd51c4c8909219619412c7a983512b6ac958ab4cf661322d930c2a665</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/gphoto/gphoto2-2.1.4.tar.bz2]
md5=5bbee55d4e59b063d3cff0fbc9121006
sha256=c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb
<font color="#0000FF">@@ -4386,6 +4542,10 @@ \
sha256=39e8d629da469d2032ad3554ff502d270</font> md5=1ad07e10f34e46ffdaf10688743f2f43
sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
<font color="#009900">+[http://download.berlios.de/gpsd/gpsd-2.36.tar.gz]</font>
<font color="#009900">+md5=bb54e89ddb4fdc7af8bbc5534652f9ce</font>
<font color="#009900">+sha256=0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a</font>
<font color="#009900">+</font>
[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz]
md5=28b13b7253c8f019433be68686070558
sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
<font color="#0000FF">@@ -4482,6 +4642,10 @@ \
sha256=9ac7eb27c9975d4cd24cd3da9b457e697</font> md5=395f3ed705928e77e5620cccf11a8cff
sha256=9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed
<font color="#009900">+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.6.tar.bz2]</font>
<font color="#009900">+md5=fb47838aa0ccef52683cea5d89364053</font>
<font color="#009900">+sha256=c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6</font>
<font color="#009900">+</font>
[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.11.tar.bz2]
md5=2e78ff25635b31d948def7c2b2d79054
sha256=2193e3f940f0fd2ca10a137efbb79bc1edc8a12543b618b9a97f680f9d15bfb4
<font color="#0000FF">@@ -4502,6 +4666,10 @@ \
sha256=7be5984162333dae48d8f7e58e6c7f4b4</font> md5=21ec9c7ac4b02de019a6d8e8c2aaa2a3
sha256=7be5984162333dae48d8f7e58e6c7f4b43726c78e2ca13aca6618b1342af8d37
<font color="#009900">+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.17.tar.bz2]</font>
<font color="#009900">+md5=151b66228e08ab0c7601713030fb1c3f</font>
<font color="#009900">+sha256=f82cfd5669c756726f503dde5936e2fbe2969631095f0efc40df1fae1a74f70d</font>
<font color="#009900">+</font>
[http://telepathy.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.10.1.tar.gz]
md5=578ef83efd03124e7085abe719513bac
sha256=623e187f87037a690b5d0beef5991b3f2a58bb5058fad8c75329f48f0b07da4b
<font color="#0000FF">@@ -4522,6 +4690,10 @@ \
sha256=9e9cd6a5e134c29400b9dc302e523684d</font> md5=25f111360c2930705b91b4fcf93ae5c5
sha256=9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66
<font color="#009900">+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.7.tar.bz2]</font>
<font color="#009900">+md5=e02d729b22451f75414a27456ae5c16a</font>
<font color="#009900">+sha256=9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d</font>
<font color="#009900">+</font>
[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
md5=cf604b6acd80b57dc5173db7e93fc116
sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
<font color="#0000FF">@@ -4534,10 +4706,18 @@ \
sha256=9c514d4002fb2a2efc5c60e009c330be2</font> md5=f1016148ecbfba968c0ef1773066988b
sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62
<font color="#009900">+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.7.tar.bz2]</font>
<font color="#009900">+md5=cff4f55138d12152cf580a3ee71c2519</font>
<font color="#009900">+sha256=556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35</font>
<font color="#009900">+</font>
[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.4.tar.gz]
md5=7c60018e8b9ce7f62c7078bee5851f07
sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98
<font color="#009900">+[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.7.tar.gz]</font>
<font color="#009900">+md5=166164eb07eacd1d70b965731eb6cbdb</font>
<font color="#009900">+sha256=b9f1bb98917d9879d46b6a959ce9068471908763f2ca98e480837485e290b106</font>
<font color="#009900">+</font>
[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.7.tar.bz2]
md5=16dd6515fd011ad449e5ce191dbb94be
sha256=24520b3e33f98a3bcc79ad68f7d426475cbacf12e4c56338f58a05158523d71d
<font color="#0000FF">@@ -4562,6 +4742,10 @@ \
sha256=11d65e787ad24596af3f84744655f7c6a</font> md5=3b0ba3698bfdb0a59918563ca285cefd
sha256=11d65e787ad24596af3f84744655f7c6ad0c747e2c285248dda4e5893d0b317a
<font color="#009900">+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.17.tar.bz2]</font>
<font color="#009900">+md5=3232416ea6fceab628236d67a7d0a44a</font>
<font color="#009900">+sha256=442862dc93e734aa58f13bcf3914dc7a40d3fa28f0ae2152c80457438dc3569c</font>
<font color="#009900">+</font>
[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.8.tar.bz2]
md5=a094ea86d4cea4f23ef2eb8c6e7bfc10
sha256=e17b33586d9f4ff656ed04559ed765b50affc19309074ef5bdf4ff62f5a1c863
<font color="#0000FF">@@ -4590,6 +4774,10 @@ \
sha256=faa1dc73f8077f72849ade14963202d8a</font> md5=e9c280afec29b11772af5a7c807abf41
sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
<font color="#009900">+[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.3.tar.bz2]</font>
<font color="#009900">+md5=dc8455144f27945f2fcbe91e75acd118</font>
<font color="#009900">+sha256=e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa</font>
<font color="#009900">+</font>
[http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
md5=c6697665e06cad01e87c2cf8d0913725
sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
<font color="#0000FF">@@ -5258,6 +5446,10 @@ \
sha256=038aabd2894f46d3a4a7583ab2bff13b2</font> md5=193b570128cf852afba337438413adf9
sha256=038aabd2894f46d3a4a7583ab2bff13b2da51682ccb921ceb7c87326ec1d344f
<font color="#009900">+[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.22-070710.tar.gz]</font>
<font color="#009900">+md5=20ef2767896a0f156b6fbabd47936f79</font>
<font color="#009900">+sha256=3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.5-rc1.tar.bz2]
md5=74fc66f01937076f65079e194dd2b0d0
sha256=325bfc9607ccf56e7de0e7973e18fac76678e50b8cf24d3818b4feb734a0e45d
<font color="#0000FF">@@ -5670,6 +5862,10 @@ \
sha256=45ca55bdac904a07b8118618c65ddb5bf</font> md5=ee215536ea78798268ab3a444d10135a
sha256=45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.4.tar.bz2]</font>
<font color="#009900">+md5=73671d8f1cf36fdd81395328cc3539c9</font>
<font color="#009900">+sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
md5=ded3c7ed6d6ca2c5e257f60079a1a824
sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
<font color="#0000FF">@@ -5790,6 +5986,10 @@ \
sha256=07567b9880f28d1a404389c024a185419</font> md5=d1d3fa170d74b066f1f23ca8574e7c90
sha256=07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.3.1.tar.bz2]</font>
<font color="#009900">+md5=b2f396b62633819bbdd9748383876e21</font>
<font color="#009900">+sha256=dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfont-X11R7.0-1.0.0.tar.bz2]
md5=955c41694772c9fd214e3e206f5d2178
sha256=47d4de6986f6ca85bc48ecd76188d7f3f009e1aeb640008cab12ac5ca5896622
<font color="#0000FF">@@ -5870,6 +6070,10 @@ \
sha256=2d5c5242b8417db6aa758e5be387de333</font> md5=37b7d1826c6a02107269632a93b8791f
sha256=2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.7.tar.bz2]</font>
<font color="#009900">+md5=cd15ee542d9f515538b4462a6f79d977</font>
<font color="#009900">+sha256=64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXpm-X11R7.0-3.5.4.2.tar.bz2]
md5=f3b3b6e687f567bbff7688d60edc81ba
sha256=58bb490a8c97e8b7e57525f105378a65dc5f7571765aea6a8f473d93e8713807
<font color="#0000FF">@@ -5962,6 +6166,10 @@ \
sha256=eef98ad3d35254384c3714cd63826fc20</font> md5=032d5c1d3914fc0224837328c88aef96
sha256=eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.0.3.tar.bz2]</font>
<font color="#009900">+md5=090c1ad04e34982eada5cf3b1a0792fd</font>
<font color="#009900">+sha256=b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXtst-X11R7.0-1.0.1.tar.bz2]
md5=3a3a3b88b4bc2a82f0b6de8ff526cc8c
sha256=93d9c1fb831e2aaaab4627835e79ae0550837cbe18a0d6bc91edc2aa3ea67ad3
<font color="#0000FF">@@ -5990,6 +6198,10 @@ \
sha256=8c68f429942b1258cff0fb27505645a46</font> md5=5b0e752c71a23e9d1290cad44a7c7c75
sha256=8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.0.2.tar.bz2]</font>
<font color="#009900">+md5=6f5f621804ee652b6cc6f2025c517c78</font>
<font color="#009900">+sha256=59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86dga-X11R7.0-1.0.0.tar.bz2]
md5=d2154a588953d8db4ae6252ebc7db439
sha256=8bc2f9b7efe25f9765db6963501bcb06efef292006e184d5fe3f8b8f2a9c5199
<font color="#0000FF">@@ -6046,6 +6258,10 @@ \
sha256=99565c6f8a560abc24bf6c07726737d54</font> md5=12e136a4c0995068ff134997c84421ed
sha256=99565c6f8a560abc24bf6c07726737d54db64daae08c8708fc9e8f3aeb723985
<font color="#009900">+[http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz]</font>
<font color="#009900">+md5=b92cba3cbcf1ee9bc221118a85d23dcd</font>
<font color="#009900">+sha256=e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954</font>
<font color="#009900">+</font>
[http://www.25thandclement.com/~william/projects/releases/libarena-0.2.tgz]
md5=dc51d2466493d16a81af10ae0390b292
sha256=560a17bc5d9e8ef71579391703c2a138d365e68396a5d8b21b1d9e1b232e16d0
<font color="#0000FF">@@ -6782,6 +6998,10 @@ \
sha256=c1d5b4edeb1f2b20ce35ab13b2c0464b6</font> md5=0f57cb7085dc27e054691bff858613c9
sha256=c1d5b4edeb1f2b20ce35ab13b2c0464b6e03a43934d626161a780578bbbb8161
<font color="#009900">+[http://people.suug.ch/~tgr/libnl/files/libnl-1.0-pre8.tar.gz]</font>
<font color="#009900">+md5=cc54b3ed25ba45d45a966b9355030810</font>
<font color="#009900">+sha256=2cd7db997d6ac673b67655a9550844839427d7283ae6d6b1b86afa1b7bc865c1</font>
<font color="#009900">+</font>
[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.2.tar.gz]
md5=25585318503079a513af7064bb59c04d
sha256=9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e
<font color="#0000FF">@@ -6902,6 +7122,10 @@ \
sha256=cac67ef8837a2bdd20d7fb5e990e233d8</font> md5=2e1b5e983654c1d5991450e3e0e525ca
sha256=cac67ef8837a2bdd20d7fb5e990e233d80a9ff398cf08a62bb7fac068a419b3e
<font color="#009900">+[http://www.tcpdump.org/release/libpcap-0.9.8.tar.gz]</font>
<font color="#009900">+md5=5208f24d0328ee7c20b52c43eaa9aa0e</font>
<font color="#009900">+sha256=c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9</font>
<font color="#009900">+</font>
[http://www.xmailserver.org/libpcl-1.4.tar.gz]
md5=6d63c462911349de80109c0161ed6d37
sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
<font color="#0000FF">@@ -7066,6 +7290,10 @@ \
sha256=6b498c1070e17f665625dc3e5113e8af5</font> md5=3b291762e0149c975dab9f5ea15bad15
sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4
<font color="#009900">+[http://downloads.sourceforge.net/libspiff/libspiff-0.8.2.tar.bz2]</font>
<font color="#009900">+md5=e6505bdff9048bf61533c00caf48d553</font>
<font color="#009900">+sha256=8451c7182a99f0f4a88b3c19234c5182689f91444c50fcb510452b5e5b8a7805</font>
<font color="#009900">+</font>
[http://www.0xbadc0de.be/libssh/libssh-0.11.tgz]
md5=ad703c4702646c83ca4fcace92c220d3
sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
<font color="#0000FF">@@ -7326,6 +7554,10 @@ \
sha256=ccefd4ceb29bb729dcaa9a9d4a86654a9</font> md5=59fe34e85692f71df2a38c2ee291b3ca
sha256=ccefd4ceb29bb729dcaa9a9d4a86654a9134adfd29bdd72be1a9d3726efb54e0
<font color="#009900">+[ftp://xmlsoft.org/libxml2/libxslt-1.1.22.tar.gz]</font>
<font color="#009900">+md5=d6a9a020a76a3db17848d769d6c9c8a9</font>
<font color="#009900">+sha256=4e1f39ee16596fd2a83d28d6c3b065f742254f3336f93ce8ed1cae48ecbe49da</font>
<font color="#009900">+</font>
[http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz]
md5=d775d6478391b95d841a1018c8db0b95
sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
<font color="#0000FF">@@ -7930,6 +8162,10 @@ \
sha256=81a23a4af797cf350759fd5ac73879701</font> md5=3e158dcf57823b55c926d95b245500fb
sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff
<font color="#009900">+[http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2]</font>
<font color="#009900">+md5=3e158dcf57823b55c926d95b245500fb</font>
<font color="#009900">+sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff</font>
<font color="#009900">+</font>
[http://openembedded.org/dl/matrixssl-1-1-1.tar.gz]
md5=0f867a7b5ce70650f36caf00c4941ebf
sha256=b46ade42d080851ba4c5a10d3c520eb169fc33ab5c259ee8ca147eff57741246
<font color="#0000FF">@@ -8270,6 +8506,10 @@ \
sha256=359f0d344f92d1f145ddcd37adf54f9b8</font> md5=cf7c743e4be122e63eb6f372fc58b657
sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
<font color="#009900">+[http://www.mpfr.org/mpfr-2.3.1/mpfr-2.3.1.tar.bz2]</font>
<font color="#009900">+md5=8352b619e04dcc73411a38b39dd855f6</font>
<font color="#009900">+sha256=d857f9df4a6cf50d0bc57dd11296dd1a8d1ac709442875ea4fcd757a89da8430</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
md5=bb403b35c2d25655d55f0f616b8f47bb
sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
<font color="#0000FF">@@ -8678,6 +8918,14 @@ \
sha256=e7e1a287141dd1be7f4b4fedd54ec29fa</font> md5=991615f73338a571b6a1be7d74906934
sha256=e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062
<font color="#009900">+[http://www.openssl.org/source/openssl-0.9.7m.tar.gz]</font>
<font color="#009900">+md5=74a4d1b87e1e6e1ec95dbe58cb4c5b9a</font>
<font color="#009900">+sha256=c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572</font>
<font color="#009900">+</font>
<font color="#009900">+[http://www.openssl.org/source/openssl-0.9.8g.tar.gz]</font>
<font color="#009900">+md5=acf70a16359bf3658bdfb74bda1c4419</font>
<font color="#009900">+sha256=0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0</font>
<font color="#009900">+</font>
[http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz]
md5=5c54040bba6fea2bfb47df01056e953f
sha256=d35213dc854f1e1a08512154c7a92fb94d9f0506cc5107f8b2f248412679fb53
<font color="#0000FF">@@ -8894,6 +9142,10 @@ \
sha256=420e3508c74873f9b4c106d7c4d1b0800</font> md5=282dcff56292359f6a5c75be0b4fe3df
sha256=420e3508c74873f9b4c106d7c4d1b0800c138e8f3c07d1ec57aa5995f126899b
<font color="#009900">+[http://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-1.18.3.tar.bz2]</font>
<font color="#009900">+md5=4a9862b5151f16dcad8e30dd6ef08549</font>
<font color="#009900">+sha256=a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3</font>
<font color="#009900">+</font>
[ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
md5=39868e0da250fd4c00b2970e4eb84389
sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
<font color="#0000FF">@@ -9262,6 +9514,10 @@ \
sha256=4e75cb28793f0d44134f71fae53057d5f</font> md5=5988e7aeb0ae4dac8d83561265984cc9
sha256=4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
<font color="#009900">+[http://freshmeat.net/redir/popt/72854/url_bz2/popt-1.13.tar.gz]</font>
<font color="#009900">+md5=b5c47ce0185c83f947953c77000533bf</font>
<font color="#009900">+sha256=722b939b14e8b510bbb24e3109a075c7d86b33bec05cb583e76769df9ef2661f</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/poqetp/poqetp_0.0.6_src.tar.gz]
md5=b003614237445d23b512cb9571565524
sha256=4347a70fe84bd2ccecc90738fb121d28298cf0bfdb4963ceee088c56d3109899
<font color="#0000FF">@@ -9274,6 +9530,10 @@ \
sha256=02c820d39f3e6e729d1bea3287a2d8a6c</font> md5=ac108ab68bf0f34477f8317791aaf1ff
sha256=02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
<font color="#009900">+[http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz]</font>
<font color="#009900">+md5=ac108ab68bf0f34477f8317791aaf1ff</font>
<font color="#009900">+sha256=02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de</font>
<font color="#009900">+</font>
[ftp://ftp.debian.org/debian/pool/main/p/portmap/portmap_5-25.diff.gz]
md5=b78c2ecfe378b03b8f1b36d2aed94eac
sha256=09595393c56b24d45476bf414f9e32cf13d675711c8ac3f7e0754c938814e085
<font color="#0000FF">@@ -9358,6 +9618,10 @@ \
sha256=8b375f8cda83dfc7d84be44af41eedd48</font> md5=0f4e7982c6d4ec3b2cf38502dd1293a3
sha256=8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.4.tar.bz2]</font>
<font color="#009900">+md5=7321847a60748b4d2f1fa16db4b6ede8</font>
<font color="#009900">+sha256=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/printproto-X11R7.0-1.0.3.tar.bz2]
md5=15c629a109b074d669886b1c6b7b319e
sha256=23bfd57906a1787814480f57763ded8fc10a696a903a4768869c56061283e972
<font color="#0000FF">@@ -9430,6 +9694,10 @@ \
sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83</font> md5=669d52a70fb9a7a83c2507005bfa2a6f
sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
<font color="#009900">+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.9.tar.gz]</font>
<font color="#009900">+md5=8fa6f7a9611bb194d94311764022b197</font>
<font color="#009900">+sha256=9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d</font>
<font color="#009900">+</font>
[http://www.warmi.net/zaurus/files/puzz-le_2.0.0.tar.gz]
md5=76535893b779926874f618d3fbf3e92b
sha256=e4b4217b81ab0885db11cf7e0f18afdeaa969392fc15647a10c2aab9cbf583d8
<font color="#0000FF">@@ -10130,6 +10398,10 @@ \
sha256=ca437301becd890e73300bc69a39189ff</font> md5=996d8d8831dbca17910094e56dcb5942
sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
<font color="#009900">+[http://rsync.samba.org/ftp/rsync/rsync-3.0.0.tar.gz]</font>
<font color="#009900">+md5=2122d460b4119749c6e5993938a9b501</font>
<font color="#009900">+sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip]
md5=c7536e907363ea1da63430b49e42931d
sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
<font color="#0000FF">@@ -10266,6 +10538,10 @@ \
sha256=c426660739a93f94364de29cde222f7c3</font> md5=8f8725fa9b3385042115e84a06866ce6
sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62
<font color="#009900">+[ftp://ftp.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]</font>
<font color="#009900">+md5=659bf15bbbb31817ebad9372c8827618</font>
<font color="#009900">+sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/scripts-X11R7.0-1.0.1.tar.bz2]
md5=b5b43aa53372b78f1d67c86301e3dc02
sha256=b502bc765cffc23189b77ba4d22e843fe03404bfab4e24b97ff4daee58176b33
<font color="#0000FF">@@ -10642,6 +10918,10 @@ \
sha256=af0b4ca361435e54316ddf715737b5b94</font> md5=b4f631268d811189cfca1d5259cb5dd8
sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500
<font color="#009900">+[http://www.sqlite.org/sqlite-3.5.6.tar.gz]</font>
<font color="#009900">+md5=903c9e935c538af392364a9172a3d98d</font>
<font color="#009900">+sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
md5=0b7fcaab8e634ae2385984885c731082
sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
<font color="#0000FF">@@ -11234,6 +11514,10 @@ \
sha256=faa9b6e000509039bbd4e1f24694adacf</font> md5=1ceb626a86630287cc28585eb16d7131
sha256=faa9b6e000509039bbd4e1f24694adacf2cd86228d22240ec1a13acc13517aa6
<font color="#009900">+[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-118.tar.gz]</font>
<font color="#009900">+md5=a8233f2afc62a8a8971f79df8878d57e</font>
<font color="#009900">+sha256=4467f57484124b735450e05617c2aa0f75e0e56306e92c74f9dfe59bd028fcd9</font>
<font color="#009900">+</font>
[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-115.tar.gz]
md5=3ee465beef2d19c212fdb52d9a89d62e
sha256=07b29dfdd2d63090c76df04c2dcde323640708c5a06b346cb299c0aba4351a3e
<font color="#0000FF">@@ -11494,6 +11778,10 @@ \
sha256=4f1f6ba6410e5f2aeb473d0a09caaa528</font> md5=80d3ae3bbae2a488d433d86b8fd64777
sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
<font color="#009900">+[http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz]</font>
<font color="#009900">+md5=47845fd76f5f2354a3619c4097575487</font>
<font color="#009900">+sha256=617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad</font>
<font color="#009900">+</font>
[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz]
md5=aaccdffc5656095a45dfe87c5bf612cb
sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
<font color="#0000FF">@@ -11518,6 +11806,10 @@ \
sha256=0e61bbccbc6689d8d9ea4842795498d3f</font> md5=a42c893a01e3d9818789be373e529422
sha256=0e61bbccbc6689d8d9ea4842795498d3ff85079b870eda899cbbd7beb80866ec
<font color="#009900">+[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.13.tar.bz2]</font>
<font color="#009900">+md5=40480f20f6b7664f3d364e4f2ed27889</font>
<font color="#009900">+sha256=edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d</font>
<font color="#009900">+</font>
[http://downloads.sourceforge.net/vtun/vtun-2.6.tar.gz]
md5=309534fd03c5d13a19c43916f61f4bbf
sha256=fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
<font color="#0000FF">@@ -11662,6 +11954,14 @@ \
sha256=2f9755e2e3f96d26380857ef95be7765e</font> md5=7bb22f2bcdeed54b3fb5407d6d8bc9bb
sha256=2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
<font color="#009900">+[http://wvstreams.googlecode.com/files/wvstreams-4.4.1.tar.gz]</font>
<font color="#009900">+md5=907b0cba8931553d848620ea16f006b9</font>
<font color="#009900">+sha256=cff48f9a87e94672c7a819661a3a5c893ee44e763c6e5775d00aff3de43619b1</font>
<font color="#009900">+</font>
<font color="#009900">+[http://www.alumnit.ca/download/wvdial-1.60.tar.gz]</font>
<font color="#009900">+md5=27fbbde89f8fd9f6e735a8efa5217fc9</font>
<font color="#009900">+sha256=0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b</font>
<font color="#009900">+</font>
[http://switch.dl.sourceforge.net/sourceforge/wvware/wv-1.2.0.tar.gz]
md5=b6319d5e75611fe2210453b5feb82c0c
sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
<font color="#0000FF">@@ -11862,6 +12162,10 @@ \
sha256=cac2771b67942d9a00b46532176feb18b</font> md5=e3008eb0655da3026c162a5597d70869
sha256=cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/app/xev-1.0.3.tar.bz2]</font>
<font color="#009900">+md5=a9532c3d1683c99bb5df1895cb3a60b1</font>
<font color="#009900">+sha256=d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xev-X11R7.0-1.0.1.tar.bz2]
md5=5d0d3c13b03e9516eafe536e6bd756c7
sha256=eb7ea9a7917fa6d603529e76f793e56baefa87a3034602634c73f9b284adc8b7
<font color="#0000FF">@@ -12542,6 +12846,10 @@ \
sha256=3ee1db2481ea222269bd201eef4d0e5d8</font> md5=461aa291a23e8cf387b70f3efa71b05c
sha256=3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.3.tar.bz2]</font>
<font color="#009900">+md5=42fdcebc66efac02ab4beec2b1b0ad6e</font>
<font color="#009900">+sha256=5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86dgaproto-X11R7.0-2.0.2.tar.bz2]
md5=48ddcc6b764dba7e711f8e25596abdb0
sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf
<font color="#0000FF">@@ -12798,6 +13106,10 @@ \
sha256=1e7056db4441ccb0dff0f77503e3fd49a</font> md5=9df52a504dc04313a6650fae364ae04a
sha256=1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.5.tar.bz2]</font>
<font color="#009900">+md5=9a2aad51042141a0e6ad066015397595</font>
<font color="#009900">+sha256=95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
md5=6d2df59fa328cbc99c0de98bc2e14597
sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
<font color="#0000FF">@@ -12914,6 +13226,10 @@ \
sha256=4bed79ba6efcaabb3ce055cf88419a519</font> md5=ea78b3e32e27c3662f86ea68b3aec22f
sha256=4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.3.tar.bz2]</font>
<font color="#009900">+md5=626731003ec22a74ecf9e44ed098bbdf</font>
<font color="#009900">+sha256=c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmodmap-X11R7.0-1.0.0.tar.bz2]
md5=240ed53111925e005d2f138ea98ef5e1
sha256=017530da4262a6e52c87cb8ea47aebc83fcd82346cc8072f02ba9de060407be3
<font color="#0000FF">@@ -12958,6 +13274,10 @@ \
sha256=93c656f142f37607c15372dd24c5de9ea</font> md5=a51a7d482e3c689394755bb17bda8526
sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.tar.bz2]</font>
<font color="#009900">+md5=a06d9fe4f9f1d459ae02657f9ce64220</font>
<font color="#009900">+sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
md5=0e7527480fb845a3c2e333bd0f47ff50
sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
<font color="#0000FF">@@ -13066,6 +13386,10 @@ \
sha256=a4a3b8cd821adc201a072f8c0214d73ee</font> md5=380b2ef545306354cc150834de567be7
sha256=a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.4.tar.bz2]</font>
<font color="#009900">+md5=34eb2311a0c5279e7b4f492e826f63d1</font>
<font color="#009900">+sha256=3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrdb-X11R7.0-1.0.1.tar.bz2]
md5=a3c1fd6f5391de7f810239a912d39fa5
sha256=adf3f97fcb0d768e19058e94dd4aaec70ea61afa8077f6c6e99aa70bc8564e14
<font color="#0000FF">@@ -13138,6 +13462,10 @@ \
sha256=ce1e17c513a4499526e648a59c39ba017</font> md5=1b781a0802c7b8fb9619a6665607b3f0
sha256=ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9
<font color="#009900">+[http://xorg.freedesktop.org/releases/individual/app/xset-1.0.3.tar.bz2]</font>
<font color="#009900">+md5=657bbb43ce5470c33665d187c1740566</font>
<font color="#009900">+sha256=0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11</font>
<font color="#009900">+</font>
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xset-X11R7.0-1.0.1.tar.bz2]
md5=a0350e334a215829166266e2ce504b1c
sha256=db17d017fff06df2e47f9d123bfb4f1d63a063eb3c08ec017292cc206bb293d1
============================================================
<font color="#FF6600">--- \
conf/distro/include/sane-srcrevs.inc 3959d79eb2b982cbd834472ccedfa58de152d874</font> \
<font color="#009900">+++ \
conf/distro/include/sane-srcrevs.inc 08a36f5f6e39c385d9c689389a96689cc687ad5b</font> \
<font color="#0000FF">@@ -25,6 +25,7 @@ SRCREV_pn-eglibc-intermediate ?= \
"5522"</font> SRCREV_pn-eglibc ?= "5522"
SRCREV_pn-eglibc-initial ?= "5522"
SRCREV_pn-eglibc-intermediate ?= "5522"
<font color="#009900">+SRCREV_pn-enlazar = "37"</font>
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
SRCREV_pn-exalt-module ?= "78"
<font color="#0000FF">@@ -41,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"</font>
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
<font color="#FF6600">-SRCREV_pn-illume ?= "31"</font>
<font color="#FF6600">-SRCREV_pn-illume-theme ?= "31"</font>
<font color="#009900">+SRCREV_pn-illume ?= "39"</font>
<font color="#009900">+SRCREV_pn-illume-theme ?= "39"</font>
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
<font color="#0000FF">@@ -78,7 +79,7 @@ SRCREV_pn-netsurf ?= "3859"</font>
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-neod ?= "4336"
SRCREV_pn-netsurf ?= "3859"
<font color="#FF6600">-SRCREV_pn-networkmanager ?= "2887"</font>
<font color="#009900">+SRCREV_pn-networkmanager ?= "3202"</font>
SRCREV_pn-networkmanager-applet ?= "200"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
<font color="#0000FF">@@ -175,4 +176,4 @@ SRCREV_pn-xoo ?= "1971"</font>
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1971"
<font color="#009900">+SRCREV_pn-xserver-kdrive-glamo ?= \
"a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"</font> <font color="#FF6600">-</font>
============================================================
<font color="#FF6600">--- \
packages/alsa/alsa-state.bb 2590f4545ccf7d78835320f929293f7d773dc9f9</font> <font \
color="#009900">+++ packages/alsa/alsa-state.bb b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32</font>
<font color="#0000FF">@@ -7,31 +7,17 @@ RRECOMMENDS_alsa-state = \
"alsa-states"</font> DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
<font color="#FF6600">-RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"</font>
<font color="#009900">+RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"</font>
<font color="#009900">+RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"</font>
PV = "0.1.0"
<font color="#FF6600">-PR = "r14.1"</font>
<font color="#009900">+PR = "r14.3"</font>
SRC_URI = " \
file://asoundrc \
file://asound.state \
file://alsa-state "
<font color="#FF6600">-SRC_URI_append_om-gta01 = " \</font>
<font color="#FF6600">- file://capturehandset.state \</font>
<font color="#FF6600">- file://captureheadset.state \</font>
<font color="#FF6600">- file://gsmbluetooth.state \</font>
<font color="#FF6600">- file://gsmhandset.state \</font>
<font color="#FF6600">- file://gsmheadset.state \</font>
<font color="#FF6600">- file://gsmspeakerout.state \</font>
<font color="#FF6600">- file://stereoout.state \</font>
<font color="#FF6600">- file://voip-handset.state \</font>
<font color="#FF6600">- file://voip-headset.state"</font>
<font color="#FF6600">-SRC_URI_append_om-gta02 = "\</font>
<font color="#FF6600">- file://stereoout.state \</font>
<font color="#FF6600">- file://gsmhandset.state \</font>
<font color="#FF6600">- "</font>
<font color="#FF6600">-</font>
inherit update-rc.d
INITSCRIPT_NAME = "alsa-state"
============================================================
<font color="#FF6600">--- \
packages/efl1/edbus_cvs.bb d3da1a158da97f38b8d2c32c4994ac557c07dc4e</font> <font \
color="#009900">+++ packages/efl1/edbus_cvs.bb ecd6cb444aeac48cd019c31f15055fb2cca6157a</font>
<font color="#0000FF">@@ -2,11 +2,13 @@ PV = "0.1.0.042+cvs${SRCDATE}"</font>
DEPENDS = "dbus ecore efreet ewl"
LICENSE = "MIT BSD"
PV = "0.1.0.042+cvs${SRCDATE}"
<font color="#FF6600">-PR = "r0"</font>
<font color="#009900">+PR = "r5"</font>
inherit efl
<font color="#FF6600">-SRC_URI = "${E_CVS};module=e17/libs/e_dbus"</font>
<font color="#009900">+SRC_URI = "${E_CVS};module=e17/libs/e_dbus \</font>
<font color="#009900">+ \
http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330 \
\</font> <font color="#009900">+ "</font>
S = "${WORKDIR}/e_dbus"
EXTRA_OECONF = "--enable-build-test-gui"
============================================================
<font color="#FF6600">--- \
packages/git/git.inc 3453fcb16ca1b5323af9d9ede90cd878559c2ddb</font> <font \
color="#009900">+++ packages/git/git.inc 78d5cbf5201f942c64ae36ae924b01ac6152208a</font>
<font color="#0000FF">@@ -8,14 +8,14 @@ S = "${WORKDIR}/git-${PV}"</font>
"
S = "${WORKDIR}/git-${PV}"
<font color="#FF6600">-EXTRA_OEMAKE = "NO_TCLTL=1"</font>
<font color="#009900">+EXTRA_OEMAKE = "NO_TCLTK=1"</font>
inherit autotools
do_install () {
<font color="#FF6600">- oe_runmake install prefix=${D} bindir=${D}${bindir} \</font>
<font color="#FF6600">- template_dir=${D}${datadir}/git-core/templates \</font>
<font color="#FF6600">- GIT_PYTHON_DIR=${D}${datadir}/git-core/python</font>
<font color="#009900">+ oe_runmake install DESTDIR="${D}" bindir=${bindir} \</font>
<font color="#009900">+ template_dir=${datadir}/git-core/templates \</font>
<font color="#009900">+ GIT_PYTHON_DIR=${datadir}/git-core/python</font>
}
FILES_${PN} += "${datadir}/git-core"
============================================================
<font color="#FF6600">--- \
packages/networkmanager/networkmanager.inc 1fda3eeff5fcb4c7cef4c98029cb884193f091d9</font>
<font color="#009900">+++ \
packages/networkmanager/networkmanager.inc bbb1ef257c00587fd0792c0671c5da3bf098c0b6</font>
<font color="#0000FF">@@ -6,8 +6,6 @@ RDEPENDS = "wpa-supplicant iproute2 \
dhcd</font> DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
<font color="#FF6600">-PR = "r0"</font>
<font color="#FF6600">-</font>
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
\ file://NetworkManager \
file://99_networkmanager"
<font color="#0000FF">@@ -21,7 +19,7 @@ EXTRA_OECONF = " \</font>
--without-gcrypt \
--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
--with-dhcdbd=/sbin/dhcdbd \
<font color="#FF6600">- --with-ip=/sbin/ip"</font>
<font color="#009900">+ --with-ip=/sbin/ip.iproute2"</font>
inherit autotools pkgconfig
<font color="#0000FF">@@ -41,20 +39,25 @@ do_install () {</font>
install -d ${D}/${datadir}/
}
<font color="#FF6600">-pkg_postinst_${PN} () {</font>
<font color="#FF6600">-if [ "x$D" != "x" ]; then</font>
<font color="#FF6600">- exit 1</font>
<font color="#FF6600">-fi</font>
<font color="#FF6600">-/etc/init.d/populate-volatile.sh update</font>
<font color="#009900">+pkg_postinst () {</font>
<font color="#009900">+ if [ "x$D" != "x" ]; then</font>
<font color="#009900">+ exit 1</font>
<font color="#009900">+ fi</font>
<font color="#009900">+ /etc/init.d/populate-volatile.sh update</font>
}
<font color="#FF6600">-PACKAGES =+ "libnmutil libnmglib" </font>
<font color="#009900">+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" </font>
FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
<font color="#009900">+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"</font>
<font color="#FF6600">-FILES_${PN} += "${datadir} \</font>
<font color="#FF6600">- ${libexecdir}"</font>
<font color="#009900">+FILES_${PN} += " \</font>
<font color="#009900">+ ${libexecdir} \</font>
<font color="#009900">+ ${libdir}/pppd/*/nm-pppd-plugin.so \</font>
<font color="#009900">+ ${libdir}/NetworkManager/*.so"</font>
<font color="#009900">+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \</font>
<font color="#009900">+ ${libdir}/pppd/*/.debug/ "</font>
FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
============================================================
<font color="#FF6600">--- \
packages/networkmanager/networkmanager_0.6.5.bb c44eba44dd018961750b625359c57e42f53463aa</font>
<font color="#009900">+++ \
packages/networkmanager/networkmanager_0.6.5.bb b6f945c3ef7f135e07832220bac70bc8b91016d8</font>
<font color="#0000FF">@@ -1,6 +1,6 @@ require networkmanager.inc</font>
require networkmanager.inc
<font color="#FF6600">-PR = "r0"</font>
<font color="#009900">+PR = "r2"</font>
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
\ file://NetworkManager \
============================================================
<font color="#FF6600">--- \
packages/networkmanager/networkmanager_svn.bb 9b937ee39ef7fa695a9532effa744c53c1caec94</font>
<font color="#009900">+++ \
packages/networkmanager/networkmanager_svn.bb 3999d93f5e5da815a8cf63fe164ae8ea1926420c</font>
<font color="#0000FF">@@ -7,33 +7,33 @@ PV = "0.7+svnr${SRCREV}"</font>
RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
PV = "0.7+svnr${SRCREV}"
<font color="#FF6600">-PR = "r2"</font>
<font color="#009900">+PR = "r5"</font>
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
file://no-restarts.diff;patch=1;pnum=0 \
file://25NetworkManager \
file://99_networkmanager"
<font color="#009900">+S = "${WORKDIR}/trunk"</font>
<font color="#009900">+</font>
EXTRA_OECONF = " \
--with-distro=debian \
<font color="#FF6600">- --with-ip=/sbin/ip"</font>
<font color="#FF6600">-# TODO: will /bin/ip from busybox do?</font>
<font color="#009900">+ --with-ip=/sbin/ip.iproute2"</font>
<font color="#FF6600">-S = "${WORKDIR}/trunk"</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#FF6600">-inherit autotools pkgconfig</font>
<font color="#009900">+do_stage () {</font>
<font color="#009900">+ autotools_stage_all</font>
<font color="#009900">+}</font>
do_install_append () {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
install -d ${D}/etc/dbus-1/event.d
install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
<font color="#009900">+ sed -i s,/sbin/ip,/sbin/ip.iproute2, \
${D}/etc/init.d/NetworkManager</font> }
<font color="#FF6600">-do_stage () {</font>
<font color="#FF6600">- autotools_stage_all</font>
<font color="#FF6600">-}</font>
<font color="#FF6600">-</font>
pkg_postinst () {
if [ "x$D" != "x" ]; then
exit 1
<font color="#0000FF">@@ -41,15 +41,18 @@ pkg_postinst () {</font>
/etc/init.d/populate-volatile.sh update
}
<font color="#FF6600">-PACKAGES =+ "libnmutil libnmglib"</font>
<font color="#009900">+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" </font>
FILES_libnmutil += "${libdir}/libnm-util.so.*"
<font color="#FF6600">-</font>
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
<font color="#009900">+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"</font>
<font color="#009900">+FILES_${PN} += " \</font>
<font color="#009900">+ ${libexecdir} \</font>
<font color="#009900">+ ${libdir}/pppd/*/nm-pppd-plugin.so \</font>
<font color="#009900">+ ${libdir}/NetworkManager/*.so"</font>
<font color="#009900">+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \</font>
<font color="#009900">+ ${libdir}/pppd/*/.debug/ "</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd \
"</font> <font color="#009900">+</font>
<font color="#FF6600">-FILES_${PN}-dev = "${includedir}/* \</font>
<font color="#FF6600">- ${libdir}/*.so \</font>
<font color="#FF6600">- ${libdir}/*.a \</font>
<font color="#FF6600">- ${libdir}/pkgconfig/*.pc \</font>
<font color="#FF6600">- ${datadir}/NetworkManager/gdb-cmd \</font>
<font color="#FF6600">- "</font>
============================================================
<font color="#FF6600">--- \
packages/openmoko-projects/assassin_svn.bb 080e285125a168b5f6d613c3bbd62d5d53591ad0</font>
<font color="#009900">+++ \
packages/openmoko-projects/assassin_svn.bb 1e8ad042e56fd3840bbbaf252f5b243db31955ec</font>
<font color="#0000FF">@@ -3,7 +3,7 @@ PV = "0.2+svnr${SRCREV}"</font>
LICENSE = "GPL"
DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
PV = "0.2+svnr${SRCREV}"
<font color="#FF6600">-PR = "r4"</font>
<font color="#009900">+PR = "r5"</font>
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
============================================================
<font color="#FF6600">--- \
packages/openmoko2/openmoko-alsa-scenarios.bb eb767fd7563c9ddc41f630dbd3dd444d81f8a950</font>
<font color="#009900">+++ \
packages/openmoko2/openmoko-alsa-scenarios.bb b87a3d0e6b06598563cde82c1ac271dac1ef50da</font>
<font color="#0000FF">@@ -1,4 +1,4 @@</font>
<font color="#FF6600">-DESCRIPTION = "Package for the different scenarios used by \
OpenMoko"</font> <font color="#009900">+DESCRIPTION = "Package for the different \
scenarios used by Openmoko"</font> SECTION = "openmoko/base"
PV = "1.0+svnr${SRCREV}"
PR = "r1"
============================================================
<font color="#FF6600">--- \
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 0e72debac8a32ac92bb891159d502240447deef4</font>
<font color="#009900">+++ \
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb a93597ca618095b4d174aa972afb07241bb3df6a</font>
<font color="#0000FF">@@ -10,10 +10,11 @@ HOMEPAGE = \
"http://www.trolltech.com"</font> LICENSE = "GPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
<font color="#FF6600">-DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs \
virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"</font> \
<font color="#FF6600">-RDEPENDS = "atd tzdata tzdata-africa tzdata-americas \
tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia \
tzdata-europe tzdata-pacific"</font> <font color="#009900">+DEPENDS = "glib-2.0 dbus \
freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender \
libxrandr libxcursor libxtst gst-plugins-base"</font> <font color="#009900">+RDEPENDS \
= "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
tzdata-asia tzdata-atlantic \</font> <font color="#009900">+ \
tzdata-australia tzdata-europe tzdata-pacific gst-meta-audio"</font> PROVIDES = \
"qtopia-phone" <font color="#FF6600">-PR = "r8"</font>
<font color="#009900">+PR = "r10"</font>
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
file://Xsession.d/89qtopia \
============================================================
<font color="#FF6600">--- \
packages/tasks/task-openmoko-qtopia-x11.bb a655b432f441812cb360f6ef19a77ef83becbbfa</font>
<font color="#009900">+++ \
packages/tasks/task-openmoko-qtopia-x11.bb 9ba089cc7d924228e8bf151d1ad3d5279cc23c13</font>
<font color="#0000FF">@@ -3,7 +3,7 @@ LICENSE = "MIT"</font>
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
LICENSE = "MIT"
<font color="#FF6600">-PR = "r48"</font>
<font color="#009900">+PR = "r51"</font>
inherit task
<font color="#0000FF">@@ -16,7 +16,6 @@ RDEPENDS_task-openmoko-qtopia-x11 = "\</font>
#
DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: The Qtopia/X11 based User \
Interface" RDEPENDS_task-openmoko-qtopia-x11 = "\
<font color="#FF6600">- alsa-state \</font>
bluez-hcidump \
readline \
qtopia-phone-x11 \
<font color="#0000FF">@@ -24,6 +23,7 @@ RDEPENDS_task-openmoko-qtopia-x11 = "\</font>
illume \
illume-theme \
assassin \
<font color="#009900">+ enlazar \</font>
diversity-daemon \
diversity-nav \
${XSERVER} \
============================================================
<font color="#FF6600">--- \
packages/tasks/task-openmoko-qtopia.bb eac4758da810225f99e5ea824c618acbf74c5b18</font>
<font color="#009900">+++ \
packages/tasks/task-openmoko-qtopia.bb 7d1cecae9b4ec98093b90bcf86c71d5a9144c9b4</font>
<font color="#0000FF">@@ -3,7 +3,7 @@ LICENSE = "MIT"</font>
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
<font color="#FF6600">-PR = "r45"</font>
<font color="#009900">+PR = "r47"</font>
PACKAGES = "task-openmoko-qtopia"
<font color="#0000FF">@@ -12,7 +12,6 @@ RDEPENDS_task-openmoko-qtopia = "\</font>
#
DESCRIPTION_task-openmoko-qtopia = "Openmoko: The Qtopia based native User \
Interface" RDEPENDS_task-openmoko-qtopia = "\
<font color="#FF6600">- alsa-state \</font>
bluez-hcidump \
readline \
gstreamer \
============================================================
<font color="#FF6600">--- \
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb e0a1d661be0f01d4779998587e419896d9504ca9</font>
<font color="#009900">+++ \
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042</font>
<font color="#0000FF">@@ -9,11 +9,10 @@ PE = "1"</font>
RDEPENDS_${PN} = "xserver-kdrive"
PROVIDES = "virtual/xserver"
PE = "1"
<font color="#FF6600">-PR = "r5"</font>
<font color="#009900">+PR = "r6"</font>
<font color="#009900">+PV = "1.3.0.0+git${SRCREV}"</font>
<font color="#FF6600">-XGLAMO_GIT_REV = \
"a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"</font> <font color="#FF6600">-</font>
<font color="#FF6600">-SRC_URI = \
"git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
\</font> <font color="#009900">+SRC_URI = \
"git://people.freedesktop.org/~dodji/xglamo;protocol=git \</font> \
file://kmode.patch;patch=1 \ file://disable-apm.patch;patch=1 \
file://no-serial-probing.patch;patch=1 \
</tt></pre>
--===============0671634144==--
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic