From 45d281319ccadc1e61280a7b40314168b89bec64 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jul 2005 07:07:36 +0000 Subject: Update host-ldflags patch, courtesy Patrick Steiner. Closes bug #146 --- packages/mozilla/minimo/host_ldflags_fix.patch | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/mozilla/minimo/host_ldflags_fix.patch b/packages/mozilla/minimo/host_ldflags_fix.patch index 06028c9bf9..f4ff51fae1 100644 --- a/packages/mozilla/minimo/host_ldflags_fix.patch +++ b/packages/mozilla/minimo/host_ldflags_fix.patch @@ -1,9 +1,4 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mozilla/nsprpub/config/rules.mk~host_ldflags_fix.patch +--- mozilla/nsprpub/config/rules.mk.old +++ mozilla/nsprpub/config/rules.mk @@ -87,6 +87,9 @@ CCC=$(HOST_CXX) @@ -15,12 +10,12 @@ endif endif endif ---- mozilla/configure.in~host_ldflags_fix.patch +--- mozilla/configure.in.old +++ mozilla/configure.in -@@ -5496,12 +5496,17 @@ +@@ -6098,12 +6098,17 @@ if test -n "$CROSS_COMPILE"; then - if test -z "$HOST_LIBIDL_CONFIG"; then + if test -z "$HOST_LIBIDL_CONFIG"; then + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi @@ -35,12 +30,12 @@ HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" HOST_LIBIDL_LIBS="$LIBIDL_LIBS" fi ---- mozilla/configure~host_ldflags_fix.patch +--- mozilla/configure.old +++ mozilla/configure -@@ -16289,11 +16289,18 @@ +@@ -17604,11 +17604,18 @@ if test -n "$CROSS_COMPILE"; then - if test -z "$HOST_LIBIDL_CONFIG"; then + if test -z "$HOST_LIBIDL_CONFIG"; then + echo "HOST_LIBIDL_CONFIG nto defined" HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi -- cgit v1.2.3 From 670da3285ab2d6abedce54f473bb9598cdb9521f Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Wed, 20 Jul 2005 10:06:45 +0000 Subject: updated kernel conf for clamshell ppp should work again --- packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 index 8e4712da4f..b6b7cbc17d 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 @@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=m +CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m +CONFIG_PPP_ASYNC=y # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set -CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_BSDCOMP=y # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set -- cgit v1.2.3 From 75b30b534d4b0aac982cca591bc5ec2d5ae5b885 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Wed, 20 Jul 2005 10:33:26 +0000 Subject: updated kernel conf for clamshell ppp is now directly build into the kernel --- packages/linux/linux-openzaurus_2.6.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index d93006ffa7..02c61996f8 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r20" +PR = "r21" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" -- cgit v1.2.3 From 11fcbdfca45e3dd96b01e0286e76f7c04c53e34d Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Wed, 20 Jul 2005 10:39:57 +0000 Subject: fixed typos --- packages/linux/linux-openzaurus_2.6.11.bb | 2 +- packages/linux/linux-openzaurus_2.6.12-mm1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 02c61996f8..d93006ffa7 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r21" +PR = "r20" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fc519ecfbc..fe94202c9d 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r4" +PR = "r5" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" -- cgit v1.2.3 From ef1b1e31ebf2671c661b172749c0bb31370d2105 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Wed, 20 Jul 2005 15:38:22 +0000 Subject: removed ppp-modules from openzaurus-2.6.conf. because ppp is build fix into the kernel --- conf/machine/zaurus-clamshell-2.6.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 3ce5924d04..7b6761b250 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,8 +27,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- # Infrared Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -# PPP Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" #USB Gadget Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ -- cgit v1.2.3 From 0d2b56cbf8421fe8b67d282c22f9c3f6c36e2954 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 20 Jul 2005 16:19:59 +0000 Subject: Move away from broken udev. --- conf/machine/nokia770.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index a922d5b4da..7a39104c63 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -6,7 +6,6 @@ IPKG_ARCHS = "all arm armv4 armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" -#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo" XSERVER = "xserver-kdrive-omap" @@ -26,17 +25,18 @@ ROOT_FLASH_SIZE = "123" EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers" # serial console port on devboard rev. B3 -SERIAL_CONSOLE = "115200 tts/0" +#SERIAL_CONSOLE = "115200 tts/0" +SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools udev-utils console-tools" +BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" -- cgit v1.2.3 From a3ce6fb28ba8a98cff949310930a4407439dcecd Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 20 Jul 2005 17:00:35 +0000 Subject: Several tslib-maemo package metadata fixup, fixed configuration file to avoid trouble with incredibly bad config file parsing in maemo tslib. --- packages/tslib/tslib-maemo/nokia770/ts.conf | 2 +- packages/tslib/tslib-maemo_0.0.1-15.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/tslib/tslib-maemo/nokia770/ts.conf b/packages/tslib/tslib-maemo/nokia770/ts.conf index 24b00839e9..8eed62f7b9 100644 --- a/packages/tslib/tslib-maemo/nokia770/ts.conf +++ b/packages/tslib/tslib-maemo/nokia770/ts.conf @@ -1,2 +1,2 @@ module pressure -module linear \ No newline at end of file +module linear diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index 28a5f00fa9..6bc844e8dd 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -1,7 +1,8 @@ +DEFAULT_PREFERENCE = "-1" SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." PR = "r1" -PROVIDES = "virtual/tslib" +PROVIDES = "tslib" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -37,6 +38,12 @@ do_install_append() { RDEPENDS_libts-maemo = "tslib-maemo-conf" +RPROVIDES_tslib-maemo-conf = "tslib-conf" +RPROVIDES_libts-maemo = "libts" +RPROVIDES_libts-maemo-dev = "libts-dev" +RPROVIDES_tslib-maemo-calibrate = "tslib-calibrate" +RPROVIDES_tslib-maemo-tests = "tslib-tests" + FILES_tslib-maemo-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" FILES_libts-maemo = "${libdir}/*.so.* ${datadir}/ts/plugins/*.so*" FILES_libts-maemo-dev = "${FILES_tslib-maemo-dev}" -- cgit v1.2.3 From 7c29f05b1ff45426aefb3c3fa250d8b0d0f78094 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 20 Jul 2005 17:01:54 +0000 Subject: Remove useless cruft. --- packages/xserver/xserver-kdrive-omap_6.6.3.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xserver/xserver-kdrive-omap_6.6.3.bb index e4eed066dd..5b131de8bd 100644 --- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb +++ b/packages/xserver/xserver-kdrive-omap_6.6.3.bb @@ -1,13 +1,12 @@ LICENSE = "MIT" DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" -RDEPENDS = "libts-0.0-0" PROVIDES = "virtual/xserver" PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices" -PR = "r1" +PR = "r2" FILES_${PN} = "${bindir}/Xomap" -- cgit v1.2.3 From 79854f3a16e4bd18ae87450fde8061778f192585 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 20 Jul 2005 19:22:25 +0000 Subject: udev: repair stupidity introduced by last patch --- packages/udev/udev.inc | 4 ++-- packages/udev/udev_058.bb | 2 +- packages/udev/udev_063.bb | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 00abd36ba2..0b51df4797 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -12,6 +12,7 @@ inherit update-rc.d INITSCRIPT_NAME = "udev" INITSCRIPT_PARAMS = "start 04 S ." +export CROSS = "${TARGET_PREFIX}" export HOSTCC = "${BUILD_CC}" export udevdir ?= "/dev" export usrbindir := "${bindir}" @@ -21,7 +22,7 @@ LD = "${CC}" bindir = "/bin" sbindir = "/sbin" -UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/" +UDEV_EXTRAS = "" FILES_${PN} += "${usrbindir} ${usrsbindir}" EXTRA_OEMAKE = "-e \ 'EXTRAS=${UDEV_EXTRAS}' \ @@ -39,4 +40,3 @@ do_install () { install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/ } - diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb index 539e7aedb8..bab87e6cb2 100644 --- a/packages/udev/udev_058.bb +++ b/packages/udev/udev_058.bb @@ -7,4 +7,4 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc PR = "r3" -# CFLAGS += -I${STAGING_INCDIR}/sysfs +UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/" diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb index 083a6bf88a..83e237ed8e 100644 --- a/packages/udev/udev_063.bb +++ b/packages/udev/udev_063.bb @@ -7,7 +7,8 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc -PR = "r1" +PR = "r2" +UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" #FIXME UDEV MIGRATION PLAN: #FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) @@ -15,8 +16,6 @@ PR = "r1" #FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() #FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules -EXTRA_OEMAKE = "EXTRAS=extras/run_directory/" - do_install_append() { install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/ echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules -- cgit v1.2.3 From 5e265bc2371b32762a7c37fd57793e4a8f5be751 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Wed, 20 Jul 2005 21:00:48 +0000 Subject: move ppp from kernel to kernel module (save disk space) --- conf/machine/zaurus-clamshell-2.6.conf | 2 ++ packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 | 6 +++--- packages/linux/linux-openzaurus_2.6.12-mm1.bb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 7b6761b250..3ce5924d04 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,6 +27,8 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- # Infrared Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" +# PPP Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" #USB Gadget Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 index b6b7cbc17d..8e4712da4f 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 @@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=y +CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=y +CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set -CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fe94202c9d..b8f64bed78 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r5" +PR = "r6" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" -- cgit v1.2.3 From 17fcd2506c38346c8a72dd3cd567c4c4344b02b6 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Wed, 20 Jul 2005 21:04:51 +0000 Subject: changed MAINTAINER in sylpheed2.0.0beta6 .bb file --- packages/sylpheed/sylpheed_2.0.0beta6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb index 4fab8e8bb8..91c6c17db2 100644 --- a/packages/sylpheed/sylpheed_2.0.0beta6.bb +++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb @@ -1,7 +1,7 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent" DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Phil Blundell " +MAINTAINER = "Patrick Steiner " LICENSE = "GPL" PR = "r0" -- cgit v1.2.3 From e356d23405da545126dd7984e6fb977a459063b3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 20 Jul 2005 21:49:55 +0000 Subject: c7x0: set kernel 2.6 as default kernel --- conf/machine/c7x0.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 122f2de435..c5e42a2bed 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.4" +KERNEL_VERSION ?= "2.6" include conf/machine/zaurus-clamshell.conf include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf -- cgit v1.2.3 From 2c81967e3792d8317c52e9fbfec5bb8a44ec8b7b Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Thu, 21 Jul 2005 07:06:28 +0000 Subject: added openssl dependency to the sylpheed 2.0.0beta6 bb file --- packages/sylpheed/sylpheed_2.0.0beta6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb index 91c6c17db2..2c41c473f9 100644 --- a/packages/sylpheed/sylpheed_2.0.0beta6.bb +++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb @@ -1,9 +1,9 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" +DEPENDS = "gtk+ gpgme gnutls openssl" MAINTAINER = "Patrick Steiner " LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \ file://sylpheed-gnutls_2.0.0beta6.patch;patch=1" -- cgit v1.2.3 From 4d0a097e128e46bd4c7616881f2b8a53acdd27c2 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Thu, 21 Jul 2005 09:06:06 +0000 Subject: removed openssl from sylpheed again, added sylpheed-gnutls-extra.patch from XorA --- .../sylpheed/files/sylpheed-gnutls-extra.patch | 37 ++++++++++++++++++++++ packages/sylpheed/sylpheed_2.0.0beta6.bb | 7 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 packages/sylpheed/files/sylpheed-gnutls-extra.patch diff --git a/packages/sylpheed/files/sylpheed-gnutls-extra.patch b/packages/sylpheed/files/sylpheed-gnutls-extra.patch new file mode 100644 index 0000000000..ba24b5a1d7 --- /dev/null +++ b/packages/sylpheed/files/sylpheed-gnutls-extra.patch @@ -0,0 +1,37 @@ +--- sylpheed-2.0.0beta6/src/ssl.c.orig 2005-07-20 15:45:12.882201824 +0100 ++++ sylpheed-2.0.0beta6/src/ssl.c 2005-07-20 16:10:04.006516472 +0100 +@@ -54,9 +54,9 @@ + debug_print(_("SSLv23 not available\n")); + } else { + debug_print(_("SSLv23 available\n")); +- if (certs_dir && ++ if (certs_dir /*&& + !SSL_CTX_load_verify_locations(ssl_ctx_SSLv23, NULL, +- certs_dir)) ++ certs_dir)*/) + g_warning("SSLv23 SSL_CTX_load_verify_locations failed.\n"); + } + +@@ -65,9 +65,9 @@ + debug_print(_("TLSv1 not available\n")); + } else { + debug_print(_("TLSv1 available\n")); +- if (certs_dir && ++ if (certs_dir /*&& + !SSL_CTX_load_verify_locations(ssl_ctx_TLSv1, NULL, +- certs_dir)) ++ certs_dir)*/) + g_warning("TLSv1 SSL_CTX_load_verify_locations failed.\n"); + } + +@@ -151,8 +151,8 @@ + g_free(str); + } + +- verify_result = SSL_get_verify_result(sockinfo->ssl); +- if (verify_result == X509_V_OK) ++ verify_result = 0; /*SSL_get_verify_result(sockinfo->ssl);*/ ++ if (verify_result == 1) + debug_print("SSL verify OK\n"); + else + g_warning("%s: SSL certificate verify failed (%ld: %s)\n", diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb index 2c41c473f9..d95f21f343 100644 --- a/packages/sylpheed/sylpheed_2.0.0beta6.bb +++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb @@ -1,12 +1,13 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls openssl" +DEPENDS = "gtk+ gpgme gnutls" MAINTAINER = "Patrick Steiner " LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \ - file://sylpheed-gnutls_2.0.0beta6.patch;patch=1" + file://sylpheed-gnutls_2.0.0beta6.patch;patch=1 \ + file://sylpheed-gnutls-extra.patch;patch=1 " FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}" -- cgit v1.2.3