From dad374f34c7eb159a86f2afc50804a458af7b215 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 14:24:22 +0000 Subject: Add dpkg configure hints --- site/arm-linux | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/arm-linux b/site/arm-linux index e3e9968725..dbed723cc0 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -362,3 +362,7 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# dpkg +dpkg_cv_va_copy=${ac_cv_va_copy=no} +dpkg_cv___va_copy=${ac_cv___va_copy=yes} -- cgit v1.2.3 From 03020e6c6db6f23b1052ee6f5d55149ac6c9d2a1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 14:29:12 +0000 Subject: dvbtools: Change CVSDATE references -> SRCDATE --- packages/dvbtools/dvbtraffic.bb | 2 +- packages/dvbtools/sctzap_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dvbtools/dvbtraffic.bb b/packages/dvbtools/dvbtraffic.bb index 4558038e92..14dd0af97d 100644 --- a/packages/dvbtools/dvbtraffic.bb +++ b/packages/dvbtools/dvbtraffic.bb @@ -3,7 +3,7 @@ SECTION = "console/multimedia" PRIORITY = "optional" LICENSE = "GPLv2" MAINTAINER = "Felix Domke " -PV = "0.0cvs${CVSDATE}" +PV = "0.0cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/dvbtraffic" diff --git a/packages/dvbtools/sctzap_cvs.bb b/packages/dvbtools/sctzap_cvs.bb index 4d33e89f0e..e2900e873d 100644 --- a/packages/dvbtools/sctzap_cvs.bb +++ b/packages/dvbtools/sctzap_cvs.bb @@ -3,7 +3,7 @@ SECTION = "console/multimedia" PRIORITY = "optional" LICENSE = "GPLv2" MAINTAINER = "Felix Domke " -PV = "0.0cvs${CVSDATE}" +PV = "0.0cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/szap \ cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/lib" -- cgit v1.2.3 From 7186c570571872f9889006c2aac50fa7ae64306f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 14:37:30 +0000 Subject: konqueror-embedded: Add information about pcre workaround to .bb file. --- packages/konqueror/konqueror-embedded_20030705.bb | 5 +++++ packages/konqueror/konqueror-embedded_20050322.bb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index e3fc55a88f..d3b5dd46a8 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -5,6 +5,11 @@ DEPENDS = "libqpe-opie openssl pcre" LICENSE = "LGPL/GPL" PR = "r3" +# Note if this .bb files fails with the error: +# "No rule to make target `-lpcre', needed by `konqueror'. Stop." +# a workaround is to install the libpcre3-dev package onto your build +# machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel). + SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \ file://opie1.patch;patch=1 \ file://packing.patch;patch=1 \ diff --git a/packages/konqueror/konqueror-embedded_20050322.bb b/packages/konqueror/konqueror-embedded_20050322.bb index 36a59b0834..1fec1375c5 100644 --- a/packages/konqueror/konqueror-embedded_20050322.bb +++ b/packages/konqueror/konqueror-embedded_20050322.bb @@ -7,6 +7,11 @@ DEPENDS = "openssl pcre" LICENSE = "LGPL/GPL" PR = "r3" +# Note if this .bb files fails with the error: +# "No rule to make target `-lpcre', needed by `konqueror'. Stop." +# a workaround is to install the libpcre3-dev package onto your build +# machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel). + SRC_URI = "http://www.cirulla.net/kdenox-snapshots/snapshots/konqueror3-embedded-0.2-${PV}.tar.bz2 \ file://qt-embedded.patch;patch=1" S = "${WORKDIR}/konqueror3-embedded-0.2-${PV}" -- cgit v1.2.3 From 10c1d3f5b7af531af5844b6839e8d95d2beab2a8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 16:59:50 +0000 Subject: udev 084: Make default --- packages/udev/udev_084.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 904f73783c..85393315c5 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -1,5 +1,3 @@ -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." -- cgit v1.2.3 From f608281b4ead0f27a6344c1ace2aaadffc7b3939 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 17:02:03 +0000 Subject: base-files: Update spitz and borzoi fstab for usbdevfs -> usbfs change. --- packages/base-files/base-files/borzoi/fstab | 2 +- packages/base-files/base-files/spitz/fstab | 2 +- packages/base-files/base-files_3.0.14.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab index c693378d33..3d0e508dfd 100644 --- a/packages/base-files/base-files/borzoi/fstab +++ b/packages/base-files/base-files/borzoi/fstab @@ -19,7 +19,7 @@ tmpfs /media/ram tmpfs defaults 0 0 # /dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +usbfs /proc/bus/usb usbfs noauto 0 0 # # Harddisk diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index c693378d33..3d0e508dfd 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -19,7 +19,7 @@ tmpfs /media/ram tmpfs defaults 0 0 # /dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +usbfs /proc/bus/usb usbfs noauto 0 0 # # Harddisk diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 0689cfa0f3..25cb1b1bbe 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r47" +PR = "r48" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From e1cc1d218ba5ba5dc7d10b686c895e4a1b553130 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 17:09:53 +0000 Subject: hostap-modules/hostap-utils: Cleanup DEPENDS/(R)PROVIDERS - virtual/kernel-hostap is a runtime entity and allows the hostap modules to be external kernel modules, internal kernel modules or built into the kernel. --- packages/hostap/hostap-modules.inc | 2 ++ packages/hostap/hostap-modules_0.3.10.bb | 3 +-- packages/hostap/hostap-modules_0.3.7.bb | 3 +-- packages/hostap/hostap-modules_0.3.9.bb | 3 +-- packages/hostap/hostap-modules_0.4.4.bb | 3 +-- packages/hostap/hostap-modules_0.4.7.bb | 2 +- packages/hostap/hostap-utils_0.3.7.bb | 4 ++-- packages/hostap/hostap-utils_0.4.0.bb | 1 - 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc index 838924a75b..72f2dc2da3 100644 --- a/packages/hostap/hostap-modules.inc +++ b/packages/hostap/hostap-modules.inc @@ -3,6 +3,8 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" +PROVIDES = "hostap-conf" +RPROVIDES = "virtual/kernel-hostap" SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ file://hostap_cs.conf" diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb index 7f2cc5628a..2a09550772 100644 --- a/packages/hostap/hostap-modules_0.3.10.bb +++ b/packages/hostap/hostap-modules_0.3.10.bb @@ -1,6 +1,5 @@ include hostap-modules.inc -LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index aead35d25b..5980783840 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -1,6 +1,5 @@ include hostap-modules.inc -PROVIDES = "virtual/kernel-hostap hostap-conf" -PR = "r6" +PR = "r7" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index 95bcbff5a6..508c653230 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -1,6 +1,5 @@ include hostap-modules.inc -PROVIDES = "virtual/kernel-hostap hostap-conf" -PR = "r8" +PR = "r9" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb index 278b2ed0bc..b3d0a8e949 100644 --- a/packages/hostap/hostap-modules_0.4.4.bb +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -1,5 +1,4 @@ include hostap-modules.inc -PROVIDES = "virtual/kernel-hostap hostap-conf" -PR = "r4" +PR = "r5" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb index 57905fffed..e9efcb5617 100644 --- a/packages/hostap/hostap-modules_0.4.7.bb +++ b/packages/hostap/hostap-modules_0.4.7.bb @@ -1,4 +1,4 @@ include hostap-modules.inc -PR = "r2" +PR = "r3" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-utils_0.3.7.bb b/packages/hostap/hostap-utils_0.3.7.bb index cdfb0c1e3e..c5c5d5b3f9 100644 --- a/packages/hostap/hostap-utils_0.3.7.bb +++ b/packages/hostap/hostap-utils_0.3.7.bb @@ -4,8 +4,8 @@ SECTION = "kernel/userland" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -RDEPENDS = "virtual/kernel-hostap" -PR = "r2" +RRECOMMENDS = "virtual/kernel-hostap" +PR = "r3" SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ file://hostap-fw-load.patch;patch=1" diff --git a/packages/hostap/hostap-utils_0.4.0.bb b/packages/hostap/hostap-utils_0.4.0.bb index 98254602aa..c5c5d5b3f9 100644 --- a/packages/hostap/hostap-utils_0.4.0.bb +++ b/packages/hostap/hostap-utils_0.4.0.bb @@ -4,7 +4,6 @@ SECTION = "kernel/userland" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -DEPENDS = "virtual/kernel-hostap" RRECOMMENDS = "virtual/kernel-hostap" PR = "r3" -- cgit v1.2.3 From 0dd5ac8eefd3a69fb30fcc202047f1753a480c48 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 19 Mar 2006 18:16:14 +0000 Subject: angstrom-2006.9: specify extra machine specific installs * See? It can be done without polluting conf/machine/ --- conf/distro/angstrom-2006.9.conf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 9c9f751bff..2771df6e61 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -63,3 +63,21 @@ PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" PREFERRED_VERSION_dbus = "0.61" + +#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff + +#### GPE section ### + +#Install libgtkinput in devices without a keyboard +GPE_EXTRA_INSTALL_append_ipaq-pxa270 = "libgtkinput" +GPE_EXTRA_INSTALL_append_h2200 = "libgtkinput" +GPE_EXTRA_INSTALL_append_simpad = "libgtkinput" +GPE_EXTRA_INSTALL_append_nokia770 = "libgtkinput" +#As soon as a kill switch is in place we can add it to devices with a keyboard +#GPE_EXTRA_INSTALL_append_c7x0 = "libgtkinput" +#GPE_EXTRA_INSTALL_append_tosa = "libgtkinput" +#GPE_EXTRA_INSTALL_append_akita = "libgtkinput" +#GPE_EXTRA_INSTALL_append_spitz = "libgtkinput" +#GPE_EXTRA_INSTALL_append_borzoi = "libgtkinput" + + -- cgit v1.2.3 From 0e411760a86e6bf483cc75af5d0962d5770422a4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 19 Mar 2006 18:21:55 +0000 Subject: angstrom-2006.9: _append needs a leading space --- conf/distro/angstrom-2006.9.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 2771df6e61..b0147aad55 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -69,15 +69,15 @@ PREFERRED_VERSION_dbus = "0.61" #### GPE section ### #Install libgtkinput in devices without a keyboard -GPE_EXTRA_INSTALL_append_ipaq-pxa270 = "libgtkinput" -GPE_EXTRA_INSTALL_append_h2200 = "libgtkinput" -GPE_EXTRA_INSTALL_append_simpad = "libgtkinput" -GPE_EXTRA_INSTALL_append_nokia770 = "libgtkinput" +GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" +GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" #As soon as a kill switch is in place we can add it to devices with a keyboard -#GPE_EXTRA_INSTALL_append_c7x0 = "libgtkinput" -#GPE_EXTRA_INSTALL_append_tosa = "libgtkinput" -#GPE_EXTRA_INSTALL_append_akita = "libgtkinput" -#GPE_EXTRA_INSTALL_append_spitz = "libgtkinput" -#GPE_EXTRA_INSTALL_append_borzoi = "libgtkinput" +#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" +#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" +#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" +#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" -- cgit v1.2.3 From 63e9b71a88c9cebec1bff318c7854d64bc7d41d4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Mar 2006 18:34:37 +0000 Subject: Add sanity.conf/sanity.bbclass. This checks for common user misconfigurations and gives helpful information about fixing them. The checks can be expanded over time. It can be disabled by following the slightly cryptic instructions in sanity.conf. --- classes/sanity.bbclass | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ conf/bitbake.conf | 1 + conf/sanity.conf | 8 ++++++ 3 files changed, 78 insertions(+) create mode 100644 classes/sanity.bbclass create mode 100644 conf/sanity.conf diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass new file mode 100644 index 0000000000..f82af18d74 --- /dev/null +++ b/classes/sanity.bbclass @@ -0,0 +1,69 @@ +# +# Sanity check the users setup for common misconfigurations +# + +BB_MIN_VERSION = "1.3.3" + +def raise_sanity_error(msg): + import bb + bb.fatal("Openembedded's config sanity checker detected a potential misconfiguration.\nEither fix cause of this error or at your own risk disable the checker (see sanity.conf).\n%s" % msg) + +def check_conf_exists(fn, data): + import bb, os + + bbpath = [] + fn = bb.data.expand(fn, data) + vbbpath = bb.data.getVar("BBPATH", data) + if vbbpath: + bbpath += vbbpath.split(":") + for p in bbpath: + currname = os.path.join(bb.data.expand(p, data), fn) + if os.access(currname, os.R_OK): + return True + return False + +addhandler check_sanity_eventhandler +python check_sanity_eventhandler() { + from bb import note, error, data, __version__ + from bb.event import Handled, NotHandled, getName + from distutils.version import LooseVersion + import os + + sanity_checked = bb.data.getVar('SANITY_CHECKED', e.data) + if sanity_checked == "1": + return + + # Check the bitbake version meets minimum requirements + minversion = bb.data.getVar('BB_MIN_VERSION', e.data , True) + if not minversion: + # Hack: BB_MIN_VERSION hasn't been parsed yet so return + # and wait for the next call + return + + if (LooseVersion(bb.__version__) < LooseVersion(minversion)): + raise_sanity_error('Bitbake version %s is required and version %s was found' % (minversion, bb.__version__)) + + # Check TARGET_ARCH is set + if bb.data.getVar('TARGET_ARCH', e.data, True) == 'INVALID': + raise_sanity_error('Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.') + + # Check TARGET_OS is set + if bb.data.getVar('TARGET_OS', e.data, True) == 'INVALID': + raise_sanity_error('Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.') + + # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf + if "diffstat-native" not in bb.data.getVar('ASSUME_PROVIDED', e.data, True).split(): + raise_sanity_error('Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf') + + # Check the MACHINE is valid + if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data): + raise_sanity_error('Please set a valid MACHINE in your local.conf') + + # Check the distro is valid + if not check_conf_exists("conf/distro/${DISTRO}.conf", e.data): + raise_sanity_error('Please set a valid DISTRO in your local.conf') + + bb.data.setVar('SANITY_CHECKED', "1", e.data) + return +} + diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a2ba5e6382..cd435a9cad 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -394,3 +394,4 @@ include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf include conf/distro/${DISTRO}.conf include conf/documentation.conf +require conf/sanity.conf diff --git a/conf/sanity.conf b/conf/sanity.conf new file mode 100644 index 0000000000..df2ec3e82a --- /dev/null +++ b/conf/sanity.conf @@ -0,0 +1,8 @@ +# Sanity checks for common user misconfigurations +# +# See sanity.bbclass +# +# Expert users can confirm their sanity with "touch conf/sanity.conf" + +INHERIT += "sanity" + -- cgit v1.2.3 From 8af2d9aae7eee195262852eef654e77900c6d056 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 19 Mar 2006 21:13:30 +0000 Subject: openssl 0.9.7e make it work with gnueabi-arm drop older versions --- packages/openssl/openssl-0.9.7b/.mtn2git_empty | 0 packages/openssl/openssl-0.9.7b/armeb.patch | 12 - packages/openssl/openssl-0.9.7b/debian.patch | 682 ---------------------- packages/openssl/openssl-0.9.7d/.mtn2git_empty | 0 packages/openssl/openssl-0.9.7d/armeb.patch | 20 - packages/openssl/openssl-0.9.7d/debian.patch | 670 --------------------- packages/openssl/openssl-0.9.7e/armeb.patch | 20 - packages/openssl/openssl-0.9.7e/gnueabi-arm.patch | 15 + packages/openssl/openssl_0.9.7b.bb | 6 - packages/openssl/openssl_0.9.7d.bb | 6 - packages/openssl/openssl_0.9.7e.bb | 5 +- 11 files changed, 18 insertions(+), 1418 deletions(-) delete mode 100644 packages/openssl/openssl-0.9.7b/.mtn2git_empty delete mode 100644 packages/openssl/openssl-0.9.7b/armeb.patch delete mode 100644 packages/openssl/openssl-0.9.7b/debian.patch delete mode 100644 packages/openssl/openssl-0.9.7d/.mtn2git_empty delete mode 100644 packages/openssl/openssl-0.9.7d/armeb.patch delete mode 100644 packages/openssl/openssl-0.9.7d/debian.patch delete mode 100644 packages/openssl/openssl-0.9.7e/armeb.patch create mode 100644 packages/openssl/openssl-0.9.7e/gnueabi-arm.patch delete mode 100644 packages/openssl/openssl_0.9.7b.bb delete mode 100644 packages/openssl/openssl_0.9.7d.bb diff --git a/packages/openssl/openssl-0.9.7b/.mtn2git_empty b/packages/openssl/openssl-0.9.7b/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openssl/openssl-0.9.7b/armeb.patch b/packages/openssl/openssl-0.9.7b/armeb.patch deleted file mode 100644 index dc1d866bee..0000000000 --- a/packages/openssl/openssl-0.9.7b/armeb.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: openssl-0.9.7b/Configure -=================================================================== ---- openssl-0.9.7b.orig/Configure 2005-02-03 13:02:06.876524776 -0500 -+++ openssl-0.9.7b/Configure 2005-02-03 13:03:12.869492320 -0500 -@@ -415,6 +415,7 @@ - - # Linux on ARM - "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - # SCO/Caldera targets. - # diff --git a/packages/openssl/openssl-0.9.7b/debian.patch b/packages/openssl/openssl-0.9.7b/debian.patch deleted file mode 100644 index 176789a2b9..0000000000 --- a/packages/openssl/openssl-0.9.7b/debian.patch +++ /dev/null @@ -1,682 +0,0 @@ ---- openssl-0.9.7b.orig/apps/der_chop -+++ openssl-0.9.7b/apps/der_chop -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # der_chop ... this is one total hack that Eric is really not proud of - # so don't look at it and don't ask for support ---- openssl-0.9.7b.orig/apps/Makefile.ssl -+++ openssl-0.9.7b/apps/Makefile.ssl -@@ -3,7 +3,7 @@ - # - - DIR= apps --TOP= .. -+TOP= $(shell pwd)/.. - CC= cc - INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) - CFLAG= -g -static -@@ -30,9 +30,14 @@ - - GENERAL=Makefile makeapps.com install.com - -+TOP=$(shell pwd)/.. -+#DLIBCRYPTO=../crypto/.libs/libcrypto.a - DLIBCRYPTO=../libcrypto.a -+#DLIBSSL=../ssl/.libs/libssl.a - DLIBSSL=../libssl.a -+#LIBCRYPTO=-L$(TOP)/crypto/.libs -lcrypto - LIBCRYPTO=-L.. -lcrypto -+#LIBSSL=-L$(TOP)/ssl/.libs -lssl - LIBSSL=-L.. -lssl - - PROGRAM= openssl -@@ -136,6 +141,8 @@ - clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) - rm -f req -+ rm -f *.lo -+ rm -fr .libs - - $(DLIBSSL): - (cd ..; $(MAKE) DIRS=ssl all) ---- openssl-0.9.7b.orig/apps/progs.h -+++ openssl-0.9.7b/apps/progs.h -@@ -35,9 +35,7 @@ - extern int spkac_main(int argc,char *argv[]); - extern int smime_main(int argc,char *argv[]); - extern int rand_main(int argc,char *argv[]); --#ifndef OPENSSL_NO_ENGINE - extern int engine_main(int argc,char *argv[]); --#endif - extern int ocsp_main(int argc,char *argv[]); - - #define FUNC_TYPE_GENERAL 1 -@@ -94,9 +92,7 @@ - #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) - {FUNC_TYPE_GENERAL,"s_client",s_client_main}, - #endif --#ifndef OPENSSL_NO_SPEED - {FUNC_TYPE_GENERAL,"speed",speed_main}, --#endif - #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) - {FUNC_TYPE_GENERAL,"s_time",s_time_main}, - #endif -@@ -115,9 +111,7 @@ - {FUNC_TYPE_GENERAL,"spkac",spkac_main}, - {FUNC_TYPE_GENERAL,"smime",smime_main}, - {FUNC_TYPE_GENERAL,"rand",rand_main}, --#ifndef OPENSSL_NO_ENGINE - {FUNC_TYPE_GENERAL,"engine",engine_main}, --#endif - {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, - #ifndef OPENSSL_NO_MD2 - {FUNC_TYPE_MD,"md2",dgst_main}, ---- openssl-0.9.7b.orig/Configure -+++ openssl-0.9.7b/Configure -@@ -1,4 +1,4 @@ --: -+#!/usr/bin/perl - eval 'exec perl -S $0 ${1+"$@"}' - if $running_under_some_shell; - ## -@@ -1257,7 +1290,8 @@ - elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) - { - my $sotmp = $1; -- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) - { ---- openssl-0.9.7b.orig/crypto/asn1/charmap.pl -+++ openssl-0.9.7b/crypto/asn1/charmap.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl - - use strict; - ---- openssl-0.9.7b.orig/crypto/Makefile.ssl -+++ openssl-0.9.7b/crypto/Makefile.ssl -@@ -34,6 +34,7 @@ - - GENERAL=Makefile README crypto-lib.com install.com - -+#LIB= libcrypto.la - LIB= $(TOP)/libcrypto.a - SHARED_LIB= libcrypto$(SHLIB_EXT) - LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c -@@ -69,8 +70,9 @@ - @for i in $(SDIRS) ;\ - do \ - (cd $$i && echo "making all in crypto/$$i..." && \ -- $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ -+ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='true' all ) || exit 1; \ - done; -+# $(AR) $(LIB) *.lo */*.lo - - files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO -@@ -145,7 +147,9 @@ - done; - - clean: -- rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff -+ rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff date.h -+ $(RM) -f *.lo */*.lo *.la -+ $(RM) -rf .libs - @for i in $(SDIRS) ;\ - do \ - (cd $$i && echo "making clean in crypto/$$i..." && \ ---- openssl-0.9.7b.orig/crypto/md5/asm/md5-sparcv9.S -+++ openssl-0.9.7b/crypto/md5/asm/md5-sparcv9.S -@@ -72,14 +72,14 @@ - #define Dval R8 - - #if defined(MD5_BLOCK_DATA_ORDER) --# if defined(OPENSSL_SYSNAME_ULTRASPARC) -+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/ - # define LOAD lda - # define X(i) [%i1+i*4]%asi - # define md5_block md5_block_asm_data_order_aligned - # define ASI_PRIMARY_LITTLE 0x88 --# else -+/*# else - # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!" --# endif -+# endif*/ - #else - # define LOAD ld - # define X(i) [%i1+i*4] ---- openssl-0.9.7b.orig/crypto/opensslconf.h -+++ openssl-0.9.7b/crypto/opensslconf.h -@@ -4,17 +4,38 @@ - /* OpenSSL was configured with the following options: */ - #ifndef OPENSSL_DOING_MAKEDEPEND - -+#ifndef OPENSSL_NO_IDEA -+# define OPENSSL_NO_IDEA -+#endif -+#ifndef OPENSSL_NO_MDC2 -+# define OPENSSL_NO_MDC2 -+#endif -+#ifndef OPENSSL_NO_RC5 -+# define OPENSSL_NO_RC5 -+#endif - #ifndef OPENSSL_NO_KRB5 - # define OPENSSL_NO_KRB5 - #endif - - #endif /* OPENSSL_DOING_MAKEDEPEND */ -+#ifndef OPENSSL_THREADS -+# define OPENSSL_THREADS -+#endif - - /* The OPENSSL_NO_* macros are also defined as NO_* if the application - asks for it. This is a transient feature that is provided for those - who haven't had the time to do the appropriate changes in their - applications. */ - #ifdef OPENSSL_ALGORITHM_DEFINES -+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) -+# define NO_IDEA -+# endif -+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -+# define NO_MDC2 -+# endif -+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) -+# define NO_RC5 -+# endif - # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) - # define NO_KRB5 - # endif -@@ -27,7 +48,7 @@ - - #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ - #if defined(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 ---- openssl-0.9.7b.orig/demos/tunala/configure.in -+++ openssl-0.9.7b/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.7b.orig/doc/crypto/RAND_add.pod -+++ openssl-0.9.7b/doc/crypto/RAND_add.pod -@@ -2,8 +2,7 @@ - - =head1 NAME - --RAND_add, RAND_seed, RAND_status, RAND_event, RAND_screen - add --entropy to the PRNG -+RAND_add, RAND_seed, RAND_status, RAND_event, RAND_screen - add entropy to the PRNG - - =head1 SYNOPSIS - ---- openssl-0.9.7b.orig/doc/Makefile.ssl -+++ openssl-0.9.7b/doc/Makefile.ssl -@@ -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.7b.orig/Makefile.org -+++ openssl-0.9.7b/Makefile.org -@@ -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 -@@ -173,7 +174,7 @@ - # we might set SHLIB_MARK to '$(SHARED_LIBS)'. - SHLIB_MARK= - --DIRS= crypto ssl $(SHLIB_MARK) apps test tools -+DIRS= crypto ssl $(SHLIB_MARK) apps doc tools - SHLIBDIRS= crypto ssl - - # dirs in crypto to build -@@ -191,7 +192,8 @@ - MAKEFILE= Makefile.ssl - MAKE= make -f Makefile.ssl - --MANDIR=$(OPENSSLDIR)/man -+MANDIR=/usr/share/man -+MANSUF=ssl - MAN1=1 - MAN3=3 - SHELL=/bin/sh -@@ -792,7 +794,7 @@ - do \ - if [ -f "$$i" ]; then \ - ( echo installing $$i; \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ -@@ -847,33 +849,35 @@ - for i in doc/apps/*.pod; do \ - fn=`basename $$i .pod`; \ - if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ -- echo "installing man$$sec/$$fn.$$sec"; \ -+ secsuf=`echo -n $$sec; echo $(MANSUF)`; \ -+ echo "installing man$$sec/$$fn.$$secsuf"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ - sh -c "$$pod2man \ -- --section=$$sec --center=OpenSSL \ -+ --section=$$secsuf --center=OpenSSL \ - --release=$(VERSION) `basename $$i`") \ -- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ -+ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$secsuf; \ - $(PERL) util/extract-names.pl < $$i | \ - grep -v $$filecase "^$$fn\$$" | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ -- $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ -+ $$here/util/point.sh $$fn.$$secsuf $$n.$$secsuf; \ - done); \ - done; \ - for i in doc/crypto/*.pod doc/ssl/*.pod; do \ - fn=`basename $$i .pod`; \ - if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ -- echo "installing man$$sec/$$fn.$$sec"; \ -+ secsuf=`echo -n $$sec; echo $(MANSUF)`; \ -+ echo "installing man$$sec/$$fn.$$secsuf"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ - sh -c "$$pod2man \ -- --section=$$sec --center=OpenSSL \ -+ --section=$$secsuf --center=OpenSSL \ - --release=$(VERSION) `basename $$i`") \ -- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ -+ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$secsuf; \ - $(PERL) util/extract-names.pl < $$i | \ - grep -v $$filecase "^$$fn\$$" | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ -- $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ -+ $$here/util/point.sh $$fn.$$secsuf $$n.$$secsuf; \ - done); \ - done - ---- openssl-0.9.7b.orig/Makefile.ssl -+++ openssl-0.9.7b/Makefile.ssl -@@ -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 no-krb5 -+CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 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,20 +59,21 @@ - # equal 4. - # PKCS1_CHECK - pkcs1 tests. - --CC= cc -+#TOP=$(shell pwd) -+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= -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 -fomit-frame-pointer -Wall -+DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 - PEX_LIBS= --EX_LIBS= -+EX_LIBS= -ldl - EXE_EXT= - ARFLAGS= - AR=ar $(ARFLAGS) r - RANLIB= /usr/bin/ranlib --PERL= /usr/local/bin/perl -+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 -@@ -175,13 +176,13 @@ - # we might set SHLIB_MARK to '$(SHARED_LIBS)'. - SHLIB_MARK= - --DIRS= crypto ssl $(SHLIB_MARK) apps test tools -+DIRS= crypto ssl $(SHLIB_MARK) apps doc tools - SHLIBDIRS= crypto ssl - - # dirs in crypto to build - SDIRS= \ -- 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 objects \ - evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 -@@ -193,7 +194,8 @@ - MAKEFILE= Makefile.ssl - MAKE= make -f Makefile.ssl - --MANDIR=$(OPENSSLDIR)/man -+MANDIR=/usr/share/man -+MANSUF=ssl - MAN1=1 - MAN3=3 - SHELL=/bin/sh -@@ -206,7 +208,7 @@ - SHARED_CRYPTO=libcrypto$(SHLIB_EXT) - SHARED_SSL=libssl$(SHLIB_EXT) - SHARED_LIBS= --SHARED_LIBS_LINK_EXTS= -+SHARED_LIBS_LINK_EXTS=.so - SHARED_LDFLAGS= - - GENERAL= Makefile -@@ -794,7 +796,7 @@ - do \ - if [ -f "$$i" ]; then \ - ( echo installing $$i; \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ -@@ -849,33 +851,35 @@ - for i in doc/apps/*.pod; do \ - fn=`basename $$i .pod`; \ - if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ -- echo "installing man$$sec/$$fn.$$sec"; \ -+ secsuf=`echo -n $$sec; echo $(MANSUF)`; \ -+ echo "installing man$$sec/$$fn.$$secsuf"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ - sh -c "$$pod2man \ -- --section=$$sec --center=OpenSSL \ -+ --section=$$secsuf --center=OpenSSL \ - --release=$(VERSION) `basename $$i`") \ -- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ -+ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$secsuf; \ - $(PERL) util/extract-names.pl < $$i | \ - grep -v $$filecase "^$$fn\$$" | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ -- $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ -+ $$here/util/point.sh $$fn.$$secsuf $$n.$$secsuf; \ - done); \ - done; \ - for i in doc/crypto/*.pod doc/ssl/*.pod; do \ - fn=`basename $$i .pod`; \ - if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ -- echo "installing man$$sec/$$fn.$$sec"; \ -+ secsuf=`echo -n $$sec; echo $(MANSUF)`; \ -+ echo "installing man$$sec/$$fn.$$secsuf"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ - sh -c "$$pod2man \ -- --section=$$sec --center=OpenSSL \ -+ --section=$$secsuf --center=OpenSSL \ - --release=$(VERSION) `basename $$i`") \ -- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ -+ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$secsuf; \ - $(PERL) util/extract-names.pl < $$i | \ - grep -v $$filecase "^$$fn\$$" | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ -- $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ -+ $$here/util/point.sh $$fn.$$secsuf $$n.$$secsuf; \ - done); \ - done - ---- openssl-0.9.7b.orig/ssl/Makefile.ssl -+++ openssl-0.9.7b/ssl/Makefile.ssl -@@ -24,6 +24,7 @@ - TEST=ssltest.c - APPS= - -+#LIB=libssl.la - LIB=$(TOP)/libssl.a - SHARED_LIB= libssl$(SHLIB_EXT) - LIBSRC= \ -@@ -58,6 +59,7 @@ - all: lib shared - - lib: $(LIBOBJ) -+# $(AR) $(LIB) *.lo - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib -@@ -100,6 +102,8 @@ - - clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff -+ rm -f *.lo *.la -+ rm -rf .libs - - # DO NOT DELETE THIS LINE -- make depend depends on it. - ---- openssl-0.9.7b.orig/ssl/ssl_algs.c -+++ openssl-0.9.7b/ssl/ssl_algs.c -@@ -109,3 +109,8 @@ - return(1); - } - -+#undef SSLeay_add_ssl_algorithms -+int SSLeay_add_ssl_algorithms(void) -+ { -+ return SSL_library_init(); -+ } ---- openssl-0.9.7b.orig/test/Makefile.ssl -+++ openssl-0.9.7b/test/Makefile.ssl -@@ -3,7 +3,7 @@ - # - - DIR= test --TOP= .. -+TOP= $(shell pwd)/.. - CC= cc - INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) - CFLAG= -g -@@ -29,6 +29,10 @@ - tpkcs7.com tpkcs7d.com tverify.com testgen.com testss.com testssl.com \ - testca.com VMSca-response.1 VMSca-response.2 - -+#DLIBCRYPTO= ../crypto/.libs/libcrypto.a -+#DLIBSSL= ../ssl/.libs/libssl.a -+#LIBCRYPTO= -L$(TOP)/crypto/.libs -lcrypto -+#LIBSSL= -L$(TOP)/ssl/.libs -lssl - DLIBCRYPTO= ../libcrypto.a - DLIBSSL= ../libssl.a - LIBCRYPTO= -L.. -lcrypto ---- openssl-0.9.7b.orig/tools/c_rehash -+++ openssl-0.9.7b/tools/c_rehash -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - - # Perl c_rehash script, scan all files in a directory -@@ -6,7 +6,7 @@ - - my $openssl; - --my $dir = "/usr/local/ssl"; -+my $dir = "/usr/lib/ssl"; - - if(defined $ENV{OPENSSL}) { - $openssl = $ENV{OPENSSL}; ---- openssl-0.9.7b.orig/tools/c_rehash.in -+++ openssl-0.9.7b/tools/c_rehash.in -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - - # Perl c_rehash script, scan all files in a directory ---- openssl-0.9.7b.orig/util/clean-depend.pl -+++ openssl-0.9.7b/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 19 Jan 1999 - ---- openssl-0.9.7b.orig/util/extract-names.pl -+++ openssl-0.9.7b/util/extract-names.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/local/bin/perl - - $/ = ""; # Eat a paragraph at once. - while() { ---- openssl-0.9.7b.orig/util/mkdef.pl -+++ openssl-0.9.7b/util/mkdef.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/local/bin/perl - # - # generate a .def file - # ---- openssl-0.9.7b.orig/util/mkerr.pl -+++ openssl-0.9.7b/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.7b.orig/util/mkstack.pl -+++ openssl-0.9.7b/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.7b.orig/util/pod2man.pl -+++ openssl-0.9.7b/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.7b.orig/util/selftest.pl -+++ openssl-0.9.7b/util/selftest.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/local/bin/perl - # - # Run the test suite and generate a report - # diff --git a/packages/openssl/openssl-0.9.7d/.mtn2git_empty b/packages/openssl/openssl-0.9.7d/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openssl/openssl-0.9.7d/armeb.patch b/packages/openssl/openssl-0.9.7d/armeb.patch deleted file mode 100644 index 881604a0c4..0000000000 --- a/packages/openssl/openssl-0.9.7d/armeb.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: openssl-0.9.7d/Configure -=================================================================== ---- openssl-0.9.7d.orig/Configure 2005-02-03 13:20:33.949224144 -0500 -+++ openssl-0.9.7d/Configure 2005-02-03 13:21:26.543228640 -0500 -@@ -378,6 +378,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 -O3 -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 -O3 -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)", -@@ -452,6 +453,7 @@ - - # Linux on ARM - "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - # SCO/Caldera targets. - # diff --git a/packages/openssl/openssl-0.9.7d/debian.patch b/packages/openssl/openssl-0.9.7d/debian.patch deleted file mode 100644 index 4d0eed03e9..0000000000 --- a/packages/openssl/openssl-0.9.7d/debian.patch +++ /dev/null @@ -1,670 +0,0 @@ ---- openssl-0.9.7d.orig/apps/der_chop -+++ openssl-0.9.7d/apps/der_chop -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # der_chop ... this is one total hack that Eric is really not proud of - # so don't look at it and don't ask for support ---- openssl-0.9.7d.orig/apps/der_chop.in -+++ openssl-0.9.7d/apps/der_chop.in -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # der_chop ... this is one total hack that Eric is really not proud of - # so don't look at it and don't ask for support ---- openssl-0.9.7d.orig/apps/Makefile.ssl -+++ openssl-0.9.7d/apps/Makefile.ssl -@@ -3,7 +3,7 @@ - # - - DIR= apps --TOP= .. -+TOP= $(shell pwd)/.. - CC= cc - INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) - CFLAG= -g -static -@@ -30,9 +30,14 @@ - - GENERAL=Makefile makeapps.com install.com - -+TOP=$(shell pwd)/.. -+#DLIBCRYPTO=../crypto/.libs/libcrypto.a - DLIBCRYPTO=../libcrypto.a -+#DLIBSSL=../ssl/.libs/libssl.a - DLIBSSL=../libssl.a -+#LIBCRYPTO=-L$(TOP)/crypto/.libs -lcrypto - LIBCRYPTO=-L.. -lcrypto -+#LIBSSL=-L$(TOP)/ssl/.libs -lssl - LIBSSL=-L.. -lssl - - PROGRAM= openssl -@@ -136,6 +141,8 @@ - clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) - rm -f req -+ rm -f *.lo -+ rm -fr .libs - - $(DLIBSSL): - (cd ..; $(MAKE) DIRS=ssl all) ---- openssl-0.9.7d.orig/apps/progs.h -+++ openssl-0.9.7d/apps/progs.h -@@ -35,9 +35,7 @@ - extern int spkac_main(int argc,char *argv[]); - extern int smime_main(int argc,char *argv[]); - extern int rand_main(int argc,char *argv[]); --#ifndef OPENSSL_NO_ENGINE - extern int engine_main(int argc,char *argv[]); --#endif - extern int ocsp_main(int argc,char *argv[]); - - #define FUNC_TYPE_GENERAL 1 -@@ -94,9 +92,7 @@ - #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) - {FUNC_TYPE_GENERAL,"s_client",s_client_main}, - #endif --#ifndef OPENSSL_NO_SPEED - {FUNC_TYPE_GENERAL,"speed",speed_main}, --#endif - #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) - {FUNC_TYPE_GENERAL,"s_time",s_time_main}, - #endif -@@ -115,9 +111,7 @@ - {FUNC_TYPE_GENERAL,"spkac",spkac_main}, - {FUNC_TYPE_GENERAL,"smime",smime_main}, - {FUNC_TYPE_GENERAL,"rand",rand_main}, --#ifndef OPENSSL_NO_ENGINE - {FUNC_TYPE_GENERAL,"engine",engine_main}, --#endif - {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, - #ifndef OPENSSL_NO_MD2 - {FUNC_TYPE_MD,"md2",dgst_main}, ---- openssl-0.9.7d.orig/config -+++ openssl-0.9.7d/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.7d.orig/Configure -+++ openssl-0.9.7d/Configure -@@ -1,4 +1,4 @@ --: -+#!/usr/local/bin/perl - eval 'exec perl -S $0 ${1+"$@"}' - if $running_under_some_shell; - ## -@@ -373,6 +373,42 @@ - # 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 -O3 -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-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-freebsd-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 -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 -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 -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-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)", -@@ -1260,7 +1296,8 @@ - elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) - { - my $sotmp = $1; -- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) - { ---- openssl-0.9.7d.orig/crypto/asn1/charmap.pl -+++ openssl-0.9.7d/crypto/asn1/charmap.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/local/bin/perl - - use strict; - ---- openssl-0.9.7d.orig/crypto/Makefile.ssl -+++ openssl-0.9.7d/crypto/Makefile.ssl -@@ -34,6 +34,7 @@ - - GENERAL=Makefile README crypto-lib.com install.com - -+#LIB= libcrypto.la - LIB= $(TOP)/libcrypto.a - SHARED_LIB= libcrypto$(SHLIB_EXT) - LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c -@@ -69,8 +70,9 @@ - @for i in $(SDIRS) ;\ - do \ - (cd $$i && echo "making all in crypto/$$i..." && \ -- $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ -+ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='true' all ) || exit 1; \ - done; -+# $(AR) $(LIB) *.lo */*.lo - - files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO -@@ -145,7 +147,9 @@ - done; - - clean: -- rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff -+ rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff date.h -+ $(RM) -f *.lo */*.lo *.la -+ $(RM) -rf .libs - @for i in $(SDIRS) ;\ - do \ - (cd $$i && echo "making clean in crypto/$$i..." && \ ---- openssl-0.9.7d.orig/crypto/md5/asm/md5-sparcv9.S -+++ openssl-0.9.7d/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.7d.orig/crypto/opensslconf.h -+++ openssl-0.9.7d/crypto/opensslconf.h -@@ -4,17 +4,38 @@ - /* OpenSSL was configured with the following options: */ - #ifndef OPENSSL_DOING_MAKEDEPEND - -+#ifndef OPENSSL_NO_IDEA -+# define OPENSSL_NO_IDEA -+#endif -+#ifndef OPENSSL_NO_MDC2 -+# define OPENSSL_NO_MDC2 -+#endif -+#ifndef OPENSSL_NO_RC5 -+# define OPENSSL_NO_RC5 -+#endif - #ifndef OPENSSL_NO_KRB5 - # define OPENSSL_NO_KRB5 - #endif - - #endif /* OPENSSL_DOING_MAKEDEPEND */ -+#ifndef OPENSSL_THREADS -+# define OPENSSL_THREADS -+#endif - - /* The OPENSSL_NO_* macros are also defined as NO_* if the application - asks for it. This is a transient feature that is provided for those - who haven't had the time to do the appropriate changes in their - applications. */ - #ifdef OPENSSL_ALGORITHM_DEFINES -+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) -+# define NO_IDEA -+# endif -+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -+# define NO_MDC2 -+# endif -+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) -+# define NO_RC5 -+# endif - # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) - # define NO_KRB5 - # endif -@@ -27,7 +48,7 @@ - - #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ - #if defined(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 ---- openssl-0.9.7d.orig/demos/tunala/configure.in -+++ openssl-0.9.7d/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.7d.orig/doc/crypto/pem.pod -+++ openssl-0.9.7d/doc/crypto/pem.pod -@@ -471,6 +471,6 @@ - =head1 RETURN CODES - - The read routines return either a pointer to the structure read or NULL --is an error occurred. -+if an error occurred. - - The write routines return 1 for success or 0 for failure. ---- openssl-0.9.7d.orig/doc/Makefile.ssl -+++ openssl-0.9.7d/doc/Makefile.ssl -@@ -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.7d.orig/Makefile.org -+++ openssl-0.9.7d/Makefile.org -@@ -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 -@@ -173,7 +174,7 @@ - # we might set SHLIB_MARK to '$(SHARED_LIBS)'. - SHLIB_MARK= - --DIRS= crypto ssl $(SHLIB_MARK) apps test tools -+DIRS= crypto ssl $(SHLIB_MARK) apps doc tools - SHLIBDIRS= crypto ssl - - # dirs in crypto to build -@@ -191,10 +192,10 @@ - MAKEFILE= Makefile.ssl - MAKE= make -f Makefile.ssl - --MANDIR=$(OPENSSLDIR)/man -+MANDIR=/usr/share/man - MAN1=1 - MAN3=3 --MANSUFFIX= -+MANSUFFIX=ssl - SHELL=/bin/sh - - TOP= . -@@ -795,7 +796,7 @@ - do \ - if [ -f "$$i" ]; then \ - ( echo installing $$i; \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ ---- openssl-0.9.7d.orig/Makefile.ssl -+++ openssl-0.9.7d/Makefile.ssl -@@ -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 no-krb5 -+CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 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,20 +59,21 @@ - # equal 4. - # PKCS1_CHECK - pkcs1 tests. - --CC= cc -+#TOP=$(shell pwd) -+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= -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 -fomit-frame-pointer -Wall -+DEPFLAG= -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 - PEX_LIBS= --EX_LIBS= -+EX_LIBS= -ldl - EXE_EXT= - ARFLAGS= - AR=ar $(ARFLAGS) r - RANLIB= /usr/bin/ranlib --PERL= /usr/local/bin/perl -+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 -@@ -175,13 +176,13 @@ - # we might set SHLIB_MARK to '$(SHARED_LIBS)'. - SHLIB_MARK= - --DIRS= crypto ssl $(SHLIB_MARK) apps test tools -+DIRS= crypto ssl $(SHLIB_MARK) apps doc tools - SHLIBDIRS= crypto ssl - - # dirs in crypto to build - SDIRS= \ -- 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 objects \ - evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 -@@ -193,10 +194,10 @@ - MAKEFILE= Makefile.ssl - MAKE= make -f Makefile.ssl - --MANDIR=$(OPENSSLDIR)/man -+MANDIR=/usr/share/man - MAN1=1 - MAN3=3 --MANSUFFIX= -+MANSUFFIX=ssl - SHELL=/bin/sh - - TOP= . -@@ -207,7 +208,7 @@ - SHARED_CRYPTO=libcrypto$(SHLIB_EXT) - SHARED_SSL=libssl$(SHLIB_EXT) - SHARED_LIBS= --SHARED_LIBS_LINK_EXTS= -+SHARED_LIBS_LINK_EXTS=.so - SHARED_LDFLAGS= - - GENERAL= Makefile -@@ -797,7 +798,7 @@ - do \ - if [ -f "$$i" ]; then \ - ( echo installing $$i; \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -+ cp -d $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ ---- openssl-0.9.7d.orig/os2/backwardify.pl -+++ openssl-0.9.7d/os2/backwardify.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/usr/local/bin/perl - use strict; - - # Use as $0 ---- openssl-0.9.7d.orig/ssl/Makefile.ssl -+++ openssl-0.9.7d/ssl/Makefile.ssl -@@ -24,6 +24,7 @@ - TEST=ssltest.c - APPS= - -+#LIB=libssl.la - LIB=$(TOP)/libssl.a - SHARED_LIB= libssl$(SHLIB_EXT) - LIBSRC= \ -@@ -58,6 +59,7 @@ - all: shared - - lib: $(LIBOBJ) -+# $(AR) $(LIB) *.lo - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib -@@ -100,6 +102,8 @@ - - clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff -+ rm -f *.lo *.la -+ rm -rf .libs - - # DO NOT DELETE THIS LINE -- make depend depends on it. - ---- openssl-0.9.7d.orig/ssl/ssl_algs.c -+++ openssl-0.9.7d/ssl/ssl_algs.c -@@ -109,3 +109,8 @@ - return(1); - } - -+#undef SSLeay_add_ssl_algorithms -+int SSLeay_add_ssl_algorithms(void) -+ { -+ return SSL_library_init(); -+ } ---- openssl-0.9.7d.orig/test/Makefile.ssl -+++ openssl-0.9.7d/test/Makefile.ssl -@@ -3,7 +3,7 @@ - # - - DIR= test --TOP= .. -+TOP= $(shell pwd)/.. - CC= cc - INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) - CFLAG= -g -@@ -29,6 +29,10 @@ - tpkcs7.com tpkcs7d.com tverify.com testgen.com testss.com testssl.com \ - testca.com VMSca-response.1 VMSca-response.2 - -+#DLIBCRYPTO= ../crypto/.libs/libcrypto.a -+#DLIBSSL= ../ssl/.libs/libssl.a -+#LIBCRYPTO= -L$(TOP)/crypto/.libs -lcrypto -+#LIBSSL= -L$(TOP)/ssl/.libs -lssl - DLIBCRYPTO= ../libcrypto.a - DLIBSSL= ../libssl.a - LIBCRYPTO= -L.. -lcrypto ---- openssl-0.9.7d.orig/tools/c_issuer -+++ openssl-0.9.7d/tools/c_issuer -@@ -6,5 +6,5 @@ - for i in $* - do - n=`openssl x509 -issuer -noout -in $i` -- echo "$i\t$n" -+ echo -e "$i\t$n" - done ---- openssl-0.9.7d.orig/tools/c_rehash -+++ openssl-0.9.7d/tools/c_rehash -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - - # Perl c_rehash script, scan all files in a directory ---- openssl-0.9.7d.orig/tools/c_rehash.in -+++ openssl-0.9.7d/tools/c_rehash.in -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - - # Perl c_rehash script, scan all files in a directory ---- openssl-0.9.7d.orig/util/clean-depend.pl -+++ openssl-0.9.7d/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 19 Jan 1999 - ---- openssl-0.9.7d.orig/util/extract-names.pl -+++ openssl-0.9.7d/util/extract-names.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/local/bin/perl - - $/ = ""; # Eat a paragraph at once. - while() { ---- openssl-0.9.7d.orig/util/mkdef.pl -+++ openssl-0.9.7d/util/mkdef.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/local/bin/perl - # - # generate a .def file - # ---- openssl-0.9.7d.orig/util/mkerr.pl -+++ openssl-0.9.7d/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.7d.orig/util/mkstack.pl -+++ openssl-0.9.7d/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.7d.orig/util/pod2man.pl -+++ openssl-0.9.7d/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.7d.orig/util/selftest.pl -+++ openssl-0.9.7d/util/selftest.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/local/bin/perl - # - # Run the test suite and generate a report - # diff --git a/packages/openssl/openssl-0.9.7e/armeb.patch b/packages/openssl/openssl-0.9.7e/armeb.patch deleted file mode 100644 index 46632d568a..0000000000 --- a/packages/openssl/openssl-0.9.7e/armeb.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: openssl-0.9.7e/Configure -=================================================================== ---- openssl-0.9.7e.orig/Configure 2005-02-03 00:58:18.600626232 -0500 -+++ openssl-0.9.7e/Configure 2005-02-03 00:59:59.178336096 -0500 -@@ -385,6 +385,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)", -@@ -460,6 +461,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)", - - # SCO/Caldera targets. - # diff --git a/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch b/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch new file mode 100644 index 0000000000..be0adbdea7 --- /dev/null +++ b/packages/openssl/openssl-0.9.7e/gnueabi-arm.patch @@ -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. + # diff --git a/packages/openssl/openssl_0.9.7b.bb b/packages/openssl/openssl_0.9.7b.bb deleted file mode 100644 index e502020dd0..0000000000 --- a/packages/openssl/openssl_0.9.7b.bb +++ /dev/null @@ -1,6 +0,0 @@ -include openssl.inc - -PR = "r1" - -SRC_URI += "file://debian.patch;patch=1 \ - file://armeb.patch;patch=1" diff --git a/packages/openssl/openssl_0.9.7d.bb b/packages/openssl/openssl_0.9.7d.bb deleted file mode 100644 index 8882de683c..0000000000 --- a/packages/openssl/openssl_0.9.7d.bb +++ /dev/null @@ -1,6 +0,0 @@ -include openssl.inc - -PR = "r3" - -SRC_URI += "file://debian.patch;patch=1 \ - file://armeb.patch;patch=1" diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb index e502020dd0..887bf96a61 100644 --- a/packages/openssl/openssl_0.9.7e.bb +++ b/packages/openssl/openssl_0.9.7e.bb @@ -1,6 +1,7 @@ include openssl.inc -PR = "r1" +PR = "r2" SRC_URI += "file://debian.patch;patch=1 \ - file://armeb.patch;patch=1" + file://armeb.patch;patch=1 \ + file://gnueabi-arm.patch;patch=1" -- cgit v1.2.3 From dbc441f78f44380fb31d944cf73e08dfd15cf98a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 19 Mar 2006 22:30:45 +0000 Subject: libmodplug: use oe_libinstall, not cp --- packages/libmodplug/libmodplug_0.7.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.7.bb index 72bd6adfbd..369120e685 100644 --- a/packages/libmodplug/libmodplug_0.7.bb +++ b/packages/libmodplug/libmodplug_0.7.bb @@ -1,12 +1,13 @@ -SECTION = "libs" DESCRIPTION = "Library for reading mod-like audio files." +HOMEPAGE = "http://modplug-xmms.sf.net" +SECTION = "libs" +LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -LICENSE = "GPL" -inherit autotools pkgconfig + +inherit autotools pkgconfig do_stage() { install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR} -#FIXME! - cp -pPR src/.libs/libmodplug.so* ${STAGING_LIBDIR} + oe_libinstall -C src -so libmodplug ${STAGING_LIBDIR} } -- cgit v1.2.3 From f192d71b439c706796b4fd3876720b8614e16bcb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 19 Mar 2006 22:33:59 +0000 Subject: libxine-fb 1.0: apply gcc4 patch --- packages/libxine/files/libxine-gcc4.patch | 138 +++++++++++++++++++++ packages/libxine/libxine-fb_1.0.bb | 7 +- .../libxine/libxine-x11-1.0/libxine-gcc4.patch | 138 --------------------- packages/libxine/libxine-x11_1.0.bb | 2 +- 4 files changed, 143 insertions(+), 142 deletions(-) create mode 100644 packages/libxine/files/libxine-gcc4.patch delete mode 100644 packages/libxine/libxine-x11-1.0/libxine-gcc4.patch diff --git a/packages/libxine/files/libxine-gcc4.patch b/packages/libxine/files/libxine-gcc4.patch new file mode 100644 index 0000000000..0a370b9579 --- /dev/null +++ b/packages/libxine/files/libxine-gcc4.patch @@ -0,0 +1,138 @@ +--- xine-lib-1.0.orig/src/xine-engine/post.c 2004-10-17 22:14:30.000000000 +0300 ++++ xine-lib-1.0/src/xine-engine/post.c 2006-02-09 22:15:08.000000000 +0200 +@@ -241,7 +241,7 @@ + if (!*input) return port; + (*input)->xine_in.name = "video in"; + (*input)->xine_in.type = XINE_POST_DATA_VIDEO; +- (xine_video_port_t *)(*input)->xine_in.data = &port->new_port; ++ (*input)->xine_in.data = &port->new_port; + (*input)->post = post; + xine_list_append_content(post->input, *input); + } +@@ -251,7 +251,7 @@ + if (!*output) return port; + (*output)->xine_out.name = "video out"; + (*output)->xine_out.type = XINE_POST_DATA_VIDEO; +- (xine_video_port_t **)(*output)->xine_out.data = &port->original_port; ++ (*output)->xine_out.data = &port->original_port; + (*output)->xine_out.rewire = post_video_rewire; + (*output)->post = post; + (*output)->user_data = port; +@@ -718,7 +718,7 @@ + if (!*input) return port; + (*input)->xine_in.name = "audio in"; + (*input)->xine_in.type = XINE_POST_DATA_AUDIO; +- (xine_audio_port_t *)(*input)->xine_in.data = &port->new_port; ++ (*input)->xine_in.data = &port->new_port; + (*input)->post = post; + xine_list_append_content(post->input, *input); + } +@@ -728,7 +728,7 @@ + if (!*output) return port; + (*output)->xine_out.name = "audio out"; + (*output)->xine_out.type = XINE_POST_DATA_AUDIO; +- (xine_audio_port_t **)(*output)->xine_out.data = &port->original_port; ++ (*output)->xine_out.data = &port->original_port; + (*output)->xine_out.rewire = post_audio_rewire; + (*output)->post = post; + (*output)->user_data = port; +--- xine-lib-1.0.orig/src/xine-utils/color.c 2003-12-09 02:02:38.000000000 +0200 ++++ xine-lib-1.0/src/xine-utils/color.c 2006-02-09 22:13:36.000000000 +0200 +@@ -495,8 +495,10 @@ + + /* process blocks of 4 pixels */ + for (x=0; x < (width / 4); x++) { +- n1 = *(((unsigned int *) src1)++); +- n2 = *(((unsigned int *) src2)++); ++ n1 = *((unsigned int *) src1); ++ src1+=sizeof(unsigned int); ++ n2 = *((unsigned int *) src2); ++ src2+=sizeof(unsigned int); + n3 = (n1 & 0xFF00FF00) >> 8; + n4 = (n2 & 0xFF00FF00) >> 8; + n1 &= 0x00FF00FF; +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/avcodec.h 2004-05-30 22:24:19.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/avcodec.h 2006-02-09 22:33:27.000000000 +0200 +@@ -1639,6 +1639,13 @@ + #define FF_OPT_MAX_DEPTH 10 + } AVOption; + ++#ifdef HAVE_MMX ++extern const struct AVOption avoptions_common[3 + 5]; ++#else ++extern const struct AVOption avoptions_common[3]; ++#endif ++extern const struct AVOption avoptions_workaround_bug[11]; ++ + /** + * Parse option(s) and sets fields in passed structure + * @param strct structure where the parsed results will be written +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/common.h 2004-05-30 22:24:19.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/common.h 2006-02-09 22:32:56.000000000 +0200 +@@ -66,13 +66,13 @@ + #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } + #define AVOPTION_END() AVOPTION_SUB(NULL) + +-struct AVOption; ++/*struct AVOption; + #ifdef HAVE_MMX + extern const struct AVOption avoptions_common[3 + 5]; + #else + extern const struct AVOption avoptions_common[3]; + #endif +-extern const struct AVOption avoptions_workaround_bug[11]; ++extern const struct AVOption avoptions_workaround_bug[11];*/ + + #endif /* HAVE_AV_CONFIG_H */ + +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h 2004-05-30 22:24:22.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/mpegvideo.h 2006-02-09 22:35:54.000000000 +0200 +@@ -904,7 +904,7 @@ + int ff_h263_resync(MpegEncContext *s); + int ff_h263_get_gob_height(MpegEncContext *s); + int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); +-int ff_h263_round_chroma(int x); ++/*int ff_h263_round_chroma(int x);*/ + void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); + int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); + +--- xine-lib-1.0.orig/src/libxineadec/nosefart/nes_apu.c 2004-12-12 08:55:59.000000000 +0200 ++++ xine-lib-1.0/src/libxineadec/nosefart/nes_apu.c 2006-02-11 22:42:29.000000000 +0200 +@@ -1012,9 +1012,15 @@ + + /* signed 16-bit output, unsigned 8-bit */ + if (16 == apu->sample_bits) +- *((int16 *) buffer)++ = (int16) accum; ++ { ++ *((int16 *) buffer) = (int16) accum; ++ buffer=((int16 *)buffer)+1; ++ } + else +- *((uint8 *) buffer)++ = (accum >> 8) ^ 0x80; ++ { ++ *((uint8 *) buffer) = (accum >> 8) ^ 0x80; ++ buffer=((int8 *)buffer)+1; ++ } + } + + /* resync cycle counter */ +--- xine-lib-1.0.orig/src/post/audio/stretch.c 2004-10-30 02:11:38.000000000 +0300 ++++ xine-lib-1.0/src/post/audio/stretch.c 2006-02-11 22:45:14.000000000 +0200 +@@ -476,7 +476,7 @@ + memcpy( outbuf->mem, data_out, + outbuf->num_frames * this->bytes_per_frame ); + num_frames_out -= outbuf->num_frames; +- (uint8_t *)data_out += outbuf->num_frames * this->bytes_per_frame; ++ data_out = (uint8_t *)data_out + outbuf->num_frames * this->bytes_per_frame; + + outbuf->vpts = this->pts; + this->pts = 0; +@@ -587,7 +587,7 @@ + memcpy( (uint8_t *)this->audiofrag + this->num_frames * this->bytes_per_frame, + data_in, frames_to_copy * this->bytes_per_frame ); + +- (uint8_t *)data_in += frames_to_copy * this->bytes_per_frame; ++ data_in = (uint8_t *)data_in + frames_to_copy * this->bytes_per_frame; + this->num_frames += frames_to_copy; + buf->num_frames -= frames_to_copy; + diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index 668a2176fb..62f1ac393e 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -5,11 +5,11 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "zlib libogg tremor libmad libmodplug" PROVIDES = "virtual/libxine" -PR = "r0" +PR = "r1" inherit autotools pkgconfig gettext -SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-${PV}.tar.gz \ file://cpu-${PV}.patch;patch=1 \ file://configure-${PV}.patch;patch=1 \ file://demuxogg.patch;patch=1 \ @@ -20,7 +20,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://libxine-tremor-autoconf.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ file://libxine-arm-configure.patch;patch=1 \ - file://no-caca.patch;patch=1 " + file://no-caca.patch;patch=1 \ + file://libxine-gcc4.patch;patch=1" S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" diff --git a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch b/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch deleted file mode 100644 index 0a370b9579..0000000000 --- a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- xine-lib-1.0.orig/src/xine-engine/post.c 2004-10-17 22:14:30.000000000 +0300 -+++ xine-lib-1.0/src/xine-engine/post.c 2006-02-09 22:15:08.000000000 +0200 -@@ -241,7 +241,7 @@ - if (!*input) return port; - (*input)->xine_in.name = "video in"; - (*input)->xine_in.type = XINE_POST_DATA_VIDEO; -- (xine_video_port_t *)(*input)->xine_in.data = &port->new_port; -+ (*input)->xine_in.data = &port->new_port; - (*input)->post = post; - xine_list_append_content(post->input, *input); - } -@@ -251,7 +251,7 @@ - if (!*output) return port; - (*output)->xine_out.name = "video out"; - (*output)->xine_out.type = XINE_POST_DATA_VIDEO; -- (xine_video_port_t **)(*output)->xine_out.data = &port->original_port; -+ (*output)->xine_out.data = &port->original_port; - (*output)->xine_out.rewire = post_video_rewire; - (*output)->post = post; - (*output)->user_data = port; -@@ -718,7 +718,7 @@ - if (!*input) return port; - (*input)->xine_in.name = "audio in"; - (*input)->xine_in.type = XINE_POST_DATA_AUDIO; -- (xine_audio_port_t *)(*input)->xine_in.data = &port->new_port; -+ (*input)->xine_in.data = &port->new_port; - (*input)->post = post; - xine_list_append_content(post->input, *input); - } -@@ -728,7 +728,7 @@ - if (!*output) return port; - (*output)->xine_out.name = "audio out"; - (*output)->xine_out.type = XINE_POST_DATA_AUDIO; -- (xine_audio_port_t **)(*output)->xine_out.data = &port->original_port; -+ (*output)->xine_out.data = &port->original_port; - (*output)->xine_out.rewire = post_audio_rewire; - (*output)->post = post; - (*output)->user_data = port; ---- xine-lib-1.0.orig/src/xine-utils/color.c 2003-12-09 02:02:38.000000000 +0200 -+++ xine-lib-1.0/src/xine-utils/color.c 2006-02-09 22:13:36.000000000 +0200 -@@ -495,8 +495,10 @@ - - /* process blocks of 4 pixels */ - for (x=0; x < (width / 4); x++) { -- n1 = *(((unsigned int *) src1)++); -- n2 = *(((unsigned int *) src2)++); -+ n1 = *((unsigned int *) src1); -+ src1+=sizeof(unsigned int); -+ n2 = *((unsigned int *) src2); -+ src2+=sizeof(unsigned int); - n3 = (n1 & 0xFF00FF00) >> 8; - n4 = (n2 & 0xFF00FF00) >> 8; - n1 &= 0x00FF00FF; ---- xine-lib-1.0.orig/src/libffmpeg/libavcodec/avcodec.h 2004-05-30 22:24:19.000000000 +0300 -+++ xine-lib-1.0/src/libffmpeg/libavcodec/avcodec.h 2006-02-09 22:33:27.000000000 +0200 -@@ -1639,6 +1639,13 @@ - #define FF_OPT_MAX_DEPTH 10 - } AVOption; - -+#ifdef HAVE_MMX -+extern const struct AVOption avoptions_common[3 + 5]; -+#else -+extern const struct AVOption avoptions_common[3]; -+#endif -+extern const struct AVOption avoptions_workaround_bug[11]; -+ - /** - * Parse option(s) and sets fields in passed structure - * @param strct structure where the parsed results will be written ---- xine-lib-1.0.orig/src/libffmpeg/libavcodec/common.h 2004-05-30 22:24:19.000000000 +0300 -+++ xine-lib-1.0/src/libffmpeg/libavcodec/common.h 2006-02-09 22:32:56.000000000 +0200 -@@ -66,13 +66,13 @@ - #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } - #define AVOPTION_END() AVOPTION_SUB(NULL) - --struct AVOption; -+/*struct AVOption; - #ifdef HAVE_MMX - extern const struct AVOption avoptions_common[3 + 5]; - #else - extern const struct AVOption avoptions_common[3]; - #endif --extern const struct AVOption avoptions_workaround_bug[11]; -+extern const struct AVOption avoptions_workaround_bug[11];*/ - - #endif /* HAVE_AV_CONFIG_H */ - ---- xine-lib-1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h 2004-05-30 22:24:22.000000000 +0300 -+++ xine-lib-1.0/src/libffmpeg/libavcodec/mpegvideo.h 2006-02-09 22:35:54.000000000 +0200 -@@ -904,7 +904,7 @@ - int ff_h263_resync(MpegEncContext *s); - int ff_h263_get_gob_height(MpegEncContext *s); - int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); --int ff_h263_round_chroma(int x); -+/*int ff_h263_round_chroma(int x);*/ - void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); - int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); - ---- xine-lib-1.0.orig/src/libxineadec/nosefart/nes_apu.c 2004-12-12 08:55:59.000000000 +0200 -+++ xine-lib-1.0/src/libxineadec/nosefart/nes_apu.c 2006-02-11 22:42:29.000000000 +0200 -@@ -1012,9 +1012,15 @@ - - /* signed 16-bit output, unsigned 8-bit */ - if (16 == apu->sample_bits) -- *((int16 *) buffer)++ = (int16) accum; -+ { -+ *((int16 *) buffer) = (int16) accum; -+ buffer=((int16 *)buffer)+1; -+ } - else -- *((uint8 *) buffer)++ = (accum >> 8) ^ 0x80; -+ { -+ *((uint8 *) buffer) = (accum >> 8) ^ 0x80; -+ buffer=((int8 *)buffer)+1; -+ } - } - - /* resync cycle counter */ ---- xine-lib-1.0.orig/src/post/audio/stretch.c 2004-10-30 02:11:38.000000000 +0300 -+++ xine-lib-1.0/src/post/audio/stretch.c 2006-02-11 22:45:14.000000000 +0200 -@@ -476,7 +476,7 @@ - memcpy( outbuf->mem, data_out, - outbuf->num_frames * this->bytes_per_frame ); - num_frames_out -= outbuf->num_frames; -- (uint8_t *)data_out += outbuf->num_frames * this->bytes_per_frame; -+ data_out = (uint8_t *)data_out + outbuf->num_frames * this->bytes_per_frame; - - outbuf->vpts = this->pts; - this->pts = 0; -@@ -587,7 +587,7 @@ - memcpy( (uint8_t *)this->audiofrag + this->num_frames * this->bytes_per_frame, - data_in, frames_to_copy * this->bytes_per_frame ); - -- (uint8_t *)data_in += frames_to_copy * this->bytes_per_frame; -+ data_in = (uint8_t *)data_in + frames_to_copy * this->bytes_per_frame; - this->num_frames += frames_to_copy; - buf->num_frames -= frames_to_copy; - diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index ea70778517..03a47474b0 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -22,7 +22,7 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://libxine-cut-memusage.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ file://libxine-libavcodec.patch;patch=1 \ - file://libxine-gcc4.patch;patch=1" + file://libxine-gcc4.patch;patch=1" S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -- cgit v1.2.3 From 3edbcedcf193ba5058fd0bbb1c82c8dfeb79813c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 20 Mar 2006 07:52:14 +0000 Subject: rsync: update to 2.6.7 --- packages/rsync/rsync_2.6.5.bb | 11 ----------- packages/rsync/rsync_2.6.6.bb | 11 ----------- packages/rsync/rsync_2.6.7.bb | 11 +++++++++++ 3 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 packages/rsync/rsync_2.6.5.bb delete mode 100644 packages/rsync/rsync_2.6.6.bb create mode 100644 packages/rsync/rsync_2.6.7.bb diff --git a/packages/rsync/rsync_2.6.5.bb b/packages/rsync/rsync_2.6.5.bb deleted file mode 100644 index 064e924789..0000000000 --- a/packages/rsync/rsync_2.6.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A file-synchronization tool" -SECTION = "console/network" -PRIORITY = "optional" -MAINTAINER = "Chris Larson " - -SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz" - -inherit autotools - -EXTRA_OEMAKE='STRIP=""' diff --git a/packages/rsync/rsync_2.6.6.bb b/packages/rsync/rsync_2.6.6.bb deleted file mode 100644 index 064e924789..0000000000 --- a/packages/rsync/rsync_2.6.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A file-synchronization tool" -SECTION = "console/network" -PRIORITY = "optional" -MAINTAINER = "Chris Larson " - -SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz" - -inherit autotools - -EXTRA_OEMAKE='STRIP=""' diff --git a/packages/rsync/rsync_2.6.7.bb b/packages/rsync/rsync_2.6.7.bb new file mode 100644 index 0000000000..064e924789 --- /dev/null +++ b/packages/rsync/rsync_2.6.7.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +DESCRIPTION = "A file-synchronization tool" +SECTION = "console/network" +PRIORITY = "optional" +MAINTAINER = "Chris Larson " + +SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz" + +inherit autotools + +EXTRA_OEMAKE='STRIP=""' -- cgit v1.2.3