summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta-demoapps/recipes-connectivity')
-rw-r--r--meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb23
-rw-r--r--meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb23
-rw-r--r--meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch20
-rw-r--r--meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb20
-rw-r--r--meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb10
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch15
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch28
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch379
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb36
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch20
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch19
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch18
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch25
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb8
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb2
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb2
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb4
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch15
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb8
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb4
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc11
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb26
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsync_git.bb22
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch21
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb17
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb20
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch41
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb29
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb16
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager33
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb18
-rw-r--r--meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch17
-rw-r--r--meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb24
33 files changed, 0 insertions, 974 deletions
diff --git a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
deleted file mode 100644
index ee0ce8a45c..0000000000
--- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
2HOMEPAGE = "http://farsight.sf.net"
3SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz"
4LICENSE = "LGPLv2.1"
5DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
6
7inherit autotools
8
9PR = "r2"
10
11EXTRA_OECONF = " \
12 --disable-debug \
13 --disable-gtk-doc \
14 --disable-python \
15"
16
17FILES_${PN} += "${libdir}/*/*.so"
18FILES_${PN}-dev += "${libdir}/f*/*a ${libdir}/g*/*a"
19FILES_${PN}-dbg += "${libdir}/*/.debug"
20
21
22
23
diff --git a/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb b/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb
deleted file mode 100644
index 30cc7a1b9b..0000000000
--- a/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1SUMMARY = "IETF draft Interactice Connectivity Establishment standard"
2DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)."
3HOMEPAGE = "http://nice.freedesktop.org/wiki/"
4SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"
5
6LICENSE = "LGPL/MPL"
7DEPENDS = "glib-2.0 gstreamer"
8
9inherit autotools
10
11FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
12FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a"
13FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
14
15do_compile_append() {
16 for i in $(find ${S} -name "*.pc") ; do
17 sed -i -e s:${STAGING_DIR_TARGET}::g \
18 -e s:/${TARGET_SYS}::g \
19 $i
20 done
21}
22
23
diff --git a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch b/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
deleted file mode 100644
index 03d8da6858..0000000000
--- a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 1 +
5 1 file changed, 1 insertion(+)
6
7--- libetpan-0.54.orig/configure.ac
8+++ libetpan-0.54/configure.ac
9@@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then
10 fi
11 AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes)
12
13 # Check the C compiler.
14 AC_PROG_CC
15+AC_PROG_CXX
16
17 # Compiler flags.
18 AC_ARG_ENABLE(debug, [ --enable-debug setup flags (gcc) for debugging (default=no)],
19 if test "x$GCC" = xyes; then
20 CFLAGS="$CFLAGS -O2 -g"
diff --git a/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb b/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb
deleted file mode 100644
index 9b69471753..0000000000
--- a/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "Library for communicating with mail and news services"
2DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
3It supports the protocols SMTP, POP3, IMAP and NNTP."
4HOMEPAGE = "http://www.etpan.org"
5SECTION = "libs"
6DEPENDS = "curl expat gnutls"
7LICENSE = "BSD"
8PR = "r1"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
11 file://cxx-is-here.patch;patch=1"
12
13inherit autotools pkgconfig gettext binconfig
14
15EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
16
17PARALLEL_MAKE = ""
18
19FILES_${PN} = "${libdir}/lib*.so.*"
20FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
deleted file mode 100644
index b6af11d398..0000000000
--- a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1SUMMARY = "XMPP/Jabber library"
2DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the XMPP/Jabber protocol."
3HOMEPAGE = "http://www.loudmouth-project.org/"
4LICENSE = "LGPL"
5DEPENDS = "glib-2.0 gnutls libcheck"
6PR = "r2"
7
8SRC_URI = "http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2"
9
10inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
deleted file mode 100644
index ffebf2b504..0000000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: openswan-2.4.7/Makefile.inc
4===================================================================
5--- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100
6+++ openswan-2.4.7/Makefile.inc 2006-12-25 18:06:39.028154250 +0100
7@@ -158,7 +158,7 @@
8 # how backup names are composed.
9 # Note that the install procedures will never overwrite an existing config
10 # file, which is why -b is not specified for them.
11-INSTBINFLAGS=-b --suffix=.old
12+INSTBINFLAGS=
13 INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
14 INSTMANFLAGS=
15 INSTCONFFLAGS=
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
deleted file mode 100644
index 92f3547f90..0000000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200
4+++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100
5@@ -30,10 +30,6 @@
6
7 CFLAGS+= ${WERROR}
8
9-ifneq ($(LD_LIBRARY_PATH),)
10-LDFLAGS=-L$(LD_LIBRARY_PATH)
11-endif
12-
13 MANDIR8=$(MANTREE)/man8
14 MANDIR5=$(MANTREE)/man5
15
16--- openswan-2.2.0.orig/programs/pluto/Makefile 2005-01-03 20:40:45.000000000 +0100
17+++ openswan-2.2.0/programs/pluto/Makefile 2005-03-05 13:51:21.000000000 +0100
18@@ -234,10 +234,6 @@
19 LIBSPLUTO+=${CURL_LIBS}
20 LIBSPLUTO+= -lgmp -lresolv # -lefence
21
22-ifneq ($(LD_LIBRARY_PATH),)
23-LDFLAGS=-L$(LD_LIBRARY_PATH)
24-endif
25-
26 LIBSADNS = $(OPENSWANLIB)
27 LIBSADNS += -lresolv # -lefence
28
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
deleted file mode 100644
index c24227c18f..0000000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
+++ /dev/null
@@ -1,379 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
4--- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200
5+++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200
6@@ -1,6 +1,6 @@
7 # Makefile to generate various formats from HTML source
8 #
9-# Assumes the htmldoc utility is available.
10+# No longer cares if the htmldoc utility is available.
11 # This can be downloaded from www.easysw.com
12 #
13 # Also needs lynx(1) for HTML-to-text conversion
14diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl
15--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300
16+++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl 2006-12-06 22:46:54.732830840 +0200
17@@ -1,4 +1,4 @@
18-#!/usr/local/bin/perl
19+#!/usr/bin/perl
20 #
21 # The inner loop instruction sequence and the IP/FP modifications are from
22 # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
23diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl
24--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300
25+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-12-06 22:46:54.736831090 +0200
26@@ -1,4 +1,4 @@
27-#!/usr/local/bin/perl
28+#!/usr/bin/perl
29
30 # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
31 # des_cblock (*input);
32diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
33--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300
34+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-12-06 22:46:54.736831090 +0200
35@@ -1,4 +1,4 @@
36-#!/usr/local/bin/perl
37+#!/usr/bin/perl
38
39 # require 'x86asm.pl';
40 # &asm_init("cpp","des-586.pl");
41diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
42--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300
43+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-12-06 22:46:54.736831090 +0200
44@@ -1,4 +1,4 @@
45-#!/usr/local/bin/perl
46+#!/usr/bin/perl
47
48 package x86ms;
49
50diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
51--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300
52+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200
53@@ -1,4 +1,4 @@
54-#!/usr/local/bin/perl
55+#!/usr/bin/perl
56
57 package x86unix;
58
59diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile
60--- openswan-2.4.7.orig/lib/liblwres/Makefile 2004-12-18 20:13:34.000000000 +0200
61+++ openswan-2.4.7/lib/liblwres/Makefile 2006-12-06 22:46:54.736831090 +0200
62@@ -20,7 +20,7 @@
63 CDEFINES = -g
64 CWARNINGS = -Werror
65
66-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
67+CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
68
69 VERSION="@(\#) openswan-hacking-9.3-for-osw2"
70 LIBINTERFACE=2
71diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl
72--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300
73+++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl 2006-12-06 22:46:54.736831090 +0200
74@@ -1,4 +1,4 @@
75-#!/usr/local/bin/perl
76+#!/usr/bin/perl
77 #
78 # The inner loop instruction sequence and the IP/FP modifications are from
79 # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
80diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl
81--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300
82+++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl 2006-12-06 22:46:54.740831340 +0200
83@@ -1,4 +1,4 @@
84-#!/usr/local/bin/perl
85+#!/usr/bin/perl
86
87 $prog="des686.pl";
88
89diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl
90--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300
91+++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl 2006-12-06 22:46:54.740831340 +0200
92@@ -1,4 +1,4 @@
93-#!/usr/local/bin/perl
94+#!/usr/bin/perl
95
96 $L="edi";
97 $R="esi";
98diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc
99--- openswan-2.4.7.orig/Makefile.inc 2006-11-14 19:56:09.000000000 +0200
100+++ openswan-2.4.7/Makefile.inc 2006-12-06 22:48:32.534943089 +0200
101@@ -46,7 +46,7 @@
102 DESTDIR?=
103
104 # "local" part of tree, used in building other pathnames
105-INC_USRLOCAL=/usr/local
106+INC_USRLOCAL?=/usr
107
108 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
109 # settings which are assumed to include it (or at least, to include *some*
110@@ -80,7 +80,7 @@
111 MANPLACES=man3 man5 man8
112
113 # where configuration files go
114-FINALCONFFILE?=/etc/ipsec.conf
115+FINALCONFFILE?=/etc/ipsec/ipsec.conf
116 CONFFILE=$(DESTDIR)$(FINALCONFFILE)
117
118 FINALCONFDIR?=/etc
119@@ -91,7 +91,7 @@
120
121 # sample configuration files go into
122 INC_DOCDIR?=share/doc
123-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
124+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
125 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
126
127 FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
128@@ -239,7 +239,7 @@
129 # installed one in RH 7.2, won't work - you wind up depending upon
130 # openssl.
131
132-BIND9STATICLIBDIR?=/usr/local/lib
133+BIND9STATICLIBDIR?=/usr/lib
134
135 # if you install elsewere, you may need to point the include files to it.
136 #BIND9STATICLIBDIR?=/sandel/lib
137diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in
138--- openswan-2.4.7.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200
139+++ openswan-2.4.7/programs/barf/barf.in 2006-12-06 22:46:54.740831340 +0200
140@@ -16,7 +16,7 @@
141
142 LOGS=${LOGS-/var/log}
143 CONFS=${IPSEC_CONFS-/etc}
144-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
145+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
146 me="ipsec barf"
147 # Max lines to use for things like 'route -n'
148 maxlines=100
149@@ -238,13 +238,13 @@
150 done
151 fi
152 _________________________ ipsec/ls-libdir
153-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
154+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
155 _________________________ ipsec/ls-execdir
156-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
157+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
158 _________________________ ipsec/updowns
159-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
160+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
161 do
162- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
163+ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
164 done
165 _________________________ /proc/net/dev
166 cat /proc/net/dev
167diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5
168--- openswan-2.4.7.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300
169+++ openswan-2.4.7/programs/eroute/eroute.5 2006-12-06 22:57:19.307864340 +0200
170@@ -168,7 +168,7 @@
171 .SH "FILES"
172
173 .PP
174-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
175+/proc/net/ipsec_eroute, /usr/bin/ipsec
176
177 .SH "SEE ALSO"
178
179diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8
180--- openswan-2.4.7.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200
181+++ openswan-2.4.7/programs/eroute/eroute.8 2006-12-06 22:46:54.740831340 +0200
182@@ -308,7 +308,7 @@
183 .br
184 .LP
185 .SH FILES
186-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
187+/proc/net/ipsec_eroute, /usr/bin/ipsec
188 .SH "SEE ALSO"
189 ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
190 ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
191diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in
192--- openswan-2.4.7.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200
193+++ openswan-2.4.7/programs/_include/_include.in 2006-12-06 22:46:54.740831340 +0200
194@@ -47,10 +47,10 @@
195 do
196 if test ! -r "$f"
197 then
198- if test ! "$f" = "/etc/ipsec.conf"
199+ if test ! "$f" = "/etc/ipsec/ipsec.conf"
200 then
201 echo "#:cannot open configuration file \'$f\'"
202- if test "$f" = "/etc/ipsec.secrets"
203+ if test "$f" = "/etc/ipsec/ipsec.secrets"
204 then
205 echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
206 fi
207diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8
208--- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200
209+++ openswan-2.4.7/programs/ipsec/ipsec.8 2006-12-06 22:46:54.744831590 +0200
210@@ -81,7 +81,7 @@
211 .I ipsec
212 thinks the IPsec configuration files are stored.
213 .SH FILES
214-/usr/local/lib/ipsec usual utilities directory
215+/usr/lib/ipsec usual utilities directory
216 .SH ENVIRONMENT
217 .PP
218 The following environment variables control where FreeS/WAN finds its
219diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5
220--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300
221+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5 2006-12-06 22:58:04.150666840 +0200
222@@ -114,7 +114,7 @@
223 .SH "FILES"
224
225 .PP
226-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
227+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
228
229 .SH "SEE ALSO"
230
231diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8
232--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300
233+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8 2006-12-06 22:58:22.295800840 +0200
234@@ -111,7 +111,7 @@
235 .SH "FILES"
236
237 .PP
238-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
239+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
240
241 .SH "SEE ALSO"
242
243diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in
244--- openswan-2.4.7.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300
245+++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200
246@@ -60,7 +60,7 @@
247
248 "$test1st"
249
250-Common concerns: This account must be able to read /etc/ipsec.secrets.
251+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets.
252 If you haven't generated your key yet, please run 'ipsec newhostkey'."
253 exit 0
254 }
255diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile
256--- openswan-2.4.7.orig/programs/pluto/Makefile 2006-11-07 17:55:52.000000000 +0200
257+++ openswan-2.4.7/programs/pluto/Makefile 2006-12-06 22:46:54.832837088 +0200
258@@ -256,7 +256,7 @@
259 -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
260 -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
261
262-ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
263+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
264
265 # libefence is a free memory allocation debugger
266 # Solaris 2 needs -lsocket -lnsl
267diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile
268--- openswan-2.4.7.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200
269+++ openswan-2.4.7/programs/setup/Makefile 2006-12-06 22:46:54.832837088 +0200
270@@ -33,25 +33,10 @@
271 @rm -f $(BINDIR)/setup
272 @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
273 @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
274- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
275- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
276- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
277- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
278- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
279- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
280- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
281- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
282
283 install_file_list::
284 @echo $(RCDIR)/ipsec
285 @echo $(BINDIR)/setup
286- @echo $(RCDIR)/../rc0.d/K76ipsec
287- @echo $(RCDIR)/../rc1.d/K76ipsec
288- @echo $(RCDIR)/../rc2.d/S47ipsec
289- @echo $(RCDIR)/../rc3.d/S47ipsec
290- @echo $(RCDIR)/../rc4.d/S47ipsec
291- @echo $(RCDIR)/../rc5.d/S47ipsec
292- @echo $(RCDIR)/../rc6.d/K76ipsec
293
294 clean::
295 @rm -f setup
296diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in
297--- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in 2004-11-14 15:40:41.000000000 +0200
298+++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200
299@@ -18,7 +18,7 @@
300 usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
301 [--dhclient] [--ipseckey]"
302
303-file=/etc/ipsec.secrets
304+file=/etc/ipsec/ipsec.secrets
305 fmt=""
306 gw=
307 id=
308diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5
309--- openswan-2.4.7.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300
310+++ openswan-2.4.7/programs/spi/spi.5 2006-12-06 23:00:11.910340779 +0200
311@@ -157,7 +157,7 @@
312 .SH "FILES"
313
314 .PP
315-/proc/net/ipsec_spi, /usr/local/bin/ipsec
316+/proc/net/ipsec_spi, /usr/bin/ipsec
317
318 .SH "SEE ALSO"
319
320diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8
321--- openswan-2.4.7.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200
322+++ openswan-2.4.7/programs/spi/spi.8 2006-12-06 23:00:27.043286530 +0200
323@@ -215,7 +215,7 @@
324 .SH "FILES"
325
326 .PP
327-/proc/net/ipsec_spi, /usr/local/bin/ipsec
328+/proc/net/ipsec_spi, /usr/bin/ipsec
329
330 .SH "SEE ALSO"
331
332diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5
333--- openswan-2.4.7.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300
334+++ openswan-2.4.7/programs/spigrp/spigrp.5 2006-12-06 23:01:25.650949280 +0200
335@@ -67,7 +67,7 @@
336 .SH "FILES"
337
338 .PP
339-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
340+/proc/net/ipsec_spigrp, /usr/bin/ipsec
341
342 .SH "SEE ALSO"
343
344diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8
345--- openswan-2.4.7.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300
346+++ openswan-2.4.7/programs/spigrp/spigrp.8 2006-12-06 23:01:39.079788532 +0200
347@@ -87,7 +87,7 @@
348 .SH "FILES"
349
350 .PP
351-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
352+/proc/net/ipsec_spigrp, /usr/bin/ipsec
353
354 .SH "SEE ALSO"
355
356diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5
357--- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300
358+++ openswan-2.4.7/programs/tncfg/tncfg.5 2006-12-06 23:01:59.385057530 +0200
359@@ -101,7 +101,7 @@
360 .SH "FILES"
361
362 .PP
363-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
364+/proc/net/ipsec_tncfg, /usr/bin/ipsec
365
366 .SH "SEE ALSO"
367
368diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8
369--- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300
370+++ openswan-2.4.7/programs/tncfg/tncfg.8 2006-12-06 23:02:09.245673780 +0200
371@@ -63,7 +63,7 @@
372 .SH "FILES"
373
374 .PP
375-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
376+/proc/net/ipsec_tncfg, /usr/bin/ipsec
377
378 .SH "SEE ALSO"
379
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
deleted file mode 100644
index f783a8582b..0000000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SECTION = "console/network"
2SUMMARY = "IPsec implementation"
3DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
4Linux operating system."
5HOMEPAGE = "http://www.openswan.org"
6LICENSE = "GPLv2"
7DEPENDS = "gmp flex-native"
8RRECOMMENDS_${PN} = "kernel-module-ipsec"
9PR = "r2"
10
11SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
12 file://openswan-2.4.7-gentoo.patch;patch=1 \
13 file://installflags.patch;patch=1 \
14 file://ld-library-path-breakage.patch;patch=1"
15S = "${WORKDIR}/openswan-${PV}"
16
17PARALLEL_MAKE = ""
18EXTRA_OEMAKE = "DESTDIR=${D} \
19 USERCOMPILE="${CFLAGS}" \
20 FINALCONFDIR=${sysconfdir}/ipsec \
21 INC_RCDEFAULT=${sysconfdir}/init.d \
22 INC_USRLOCAL=${prefix} \
23 INC_MANDIR=share/man WERROR=''"
24
25do_compile () {
26 oe_runmake programs
27}
28
29do_install () {
30 oe_runmake install
31}
32
33FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*"
34FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
35
36CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
deleted file mode 100644
index fa61e15ffb..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 cmake/OpenSyncInternal.cmake.in | 1 -
5 1 file changed, 1 deletion(-)
6
7--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
8+++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
9@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
10 INCLUDE( OpenSyncPackaging )
11 INCLUDE( OpenSyncPlugin )
12 INCLUDE( OpenSyncPlatforms )
13 INCLUDE( MacroEnsureOutOfSourceBuild )
14
15-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
16
17
18 SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
19 SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
20 SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
deleted file mode 100644
index 20d09cf002..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 opensync/CMakeLists.txt | 1 -
5 1 file changed, 1 deletion(-)
6
7Index: libopensync-0.37/opensync/CMakeLists.txt
8===================================================================
9--- libopensync-0.37.orig/opensync/CMakeLists.txt 2008-10-15 13:56:45.000000000 +0100
10+++ libopensync-0.37/opensync/CMakeLists.txt 2008-10-15 13:59:03.000000000 +0100
11@@ -67,8 +67,6 @@
12 SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION ${OPENSYNC_LIBVERSION_VERSION} )
13 SET_TARGET_PROPERTIES( opensync PROPERTIES SOVERSION ${OPENSYNC_LIBVERSION_SOVERSION} )
14
15-SET_TARGET_PROPERTIES( opensync PROPERTIES COMPILE_FLAGS ${SYMBOLS_VISIBILITY} )
16-
17 IF ( OPENSYNC_UNITTESTS )
18 ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
19 TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES} ${SQLITE3_LIBRARIES} )
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
deleted file mode 100644
index d59fddbf20..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 CMakeLists.txt | 1 -
5 1 file changed, 1 deletion(-)
6
7Index: libopensync-0.37/CMakeLists.txt
8===================================================================
9--- libopensync-0.37.orig/CMakeLists.txt 2008-08-18 16:14:24.000000000 +0100
10+++ libopensync-0.37/CMakeLists.txt 2008-10-15 14:00:12.000000000 +0100
11@@ -65,7 +65,6 @@
12 FIND_PACKAGE( LibXslt REQUIRED )
13 FIND_PACKAGE( LibExslt REQUIRED )
14 FIND_PACKAGE( SWIG )
15-FIND_PACKAGE( PythonLibs )
16 FIND_PACKAGE( Check )
17
18 ADD_SUBDIRECTORY( opensync )
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
deleted file mode 100644
index 9ef0353332..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
4===================================================================
5--- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake 2008-10-20 13:07:14.000000000 +0100
6+++ libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake 2008-10-20 13:08:09.000000000 +0100
7@@ -23,15 +23,15 @@
8 ENDIF ( OpenSync_FIND_REQUIRED )
9
10 IF ( OPENSYNC_MIN_VERSION )
11- PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0>=${OPENSYNC_MIN_VERSION} )
12+ PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync>=${OPENSYNC_MIN_VERSION} )
13 ELSE ( OPENSYNC_MIN_VERSION )
14- PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0 )
15+ PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync )
16 ENDIF ( OPENSYNC_MIN_VERSION )
17
18 FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
19
20 IF ( PKGCONFIG_EXECUTABLE )
21- EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS opensync-1.0 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
22+ EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
23 STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}" )
24 ENDIF ( PKGCONFIG_EXECUTABLE )
25
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
deleted file mode 100644
index 42dc4dd33d..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
3
4DEPENDS += " evolution-data-server"
5
6SRC_URI += "file://0.37-fixes.patch;patch=1"
7
8PR = "r2"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
deleted file mode 100644
index 404c172490..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
deleted file mode 100644
index dbcb2aac12..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "GPLv2"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
deleted file mode 100644
index cb601f2dc7..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "GPLv2"
3
4DEPENDS += "openobex bluez4"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
deleted file mode 100644
index 9e7a260774..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [others]
2
3Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c
4===================================================================
5--- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c 2009-07-31 10:30:33.000000000 +0100
6+++ libopensync-plugin-syncml-0.38/src/syncml_callbacks.c 2009-07-31 10:30:39.000000000 +0100
7@@ -405,7 +405,7 @@
8 } else {
9 /* This problem should be fixed with the next SLOW-SYNC. */
10 osync_trace(TRACE_EXIT_ERROR, "%s - unexpected Add or Replace command", __func__);
11- smlErrorSet(error, SML_ERROR_TEMPORARY, "Unwanted Add or Replace command on second OMA DS session.");
12+ smlErrorSet(error, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session.");
13 return FALSE;
14 }
15 }
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
deleted file mode 100644
index e33336f57e..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
3
4DEPENDS += " libsyncml (>= 0.4.7)"
5
6SRC_URI += "file://fixerror.patch;patch=1"
7
8PR = "r1"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
deleted file mode 100644
index a7d50dc615..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
3
4DEPENDS += "libcheck"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
deleted file mode 100644
index cde47796dd..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1DEPENDS = "libopensync (>= 0.36)"
2
3DESCRIPTION ?= "OpenSync plugin"
4
5SRC_URI = "http://opensync.org/download/releases/${PV}/${BPN}-${PV}.tar.bz2"
6
7inherit cmake
8
9FILES_${PN} += "${libdir}/opensync*/plugins/*.so \
10 ${libdir}/opensync*/formats/*.so \
11 ${datadir}/opensync*/defaults/"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb
deleted file mode 100644
index 437bdd2885..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1LICENSE = "LGPL"
2HOMEPAGE = "http://www.opensync.org/"
3SUMMARY = "Synchronization framwork"
4DESCRIPTION = "The OpenSync project is an ongoing effort to create a synchronization framework that will be a platform independent, general purpose synchronization engine utilizing modular plugins for content formats and different kind of connection types. OpenSync's modularity should allow it to be extended easily to new devices and purposes without radically changing the architecture itself, allowing it to support wide variety of devices used today and in the future."
5DEPENDS = "sqlite3 libxml2 glib-2.0 libcheck zlib libxslt"
6
7PR = "r1"
8
9SRC_URI = "http://opensync.org/download/releases/${PV}/libopensync-${PV}.tar.bz2\
10 file://cmake.patch;patch=1 \
11 file://build-in-src.patch;patch=1 \
12 file://no-python-check.patch;patch=1"
13
14inherit cmake pkgconfig
15
16LEAD_SONAME = "libopensync.so"
17
18FILES_${PN} += " ${libdir}/opensync*/formats/*.so \
19 ${libdir}/opensync*/osplugin \
20 ${datadir}/opensync*/schemas \
21 ${datadir}/opensync*/capabilities \
22 ${datadir}/opensync*/descriptions \
23 "
24FILES_${PN}-dbg += " ${libdir}/opensync*/formats/.debug/*.so \
25 ${libdir}/opensync*/.debug/osplugin "
26
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb b/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
deleted file mode 100644
index 498620691d..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "GObject-based sync library"
2DESCRIPTION = "LibSync is a GObject-based framework for more convenient use of \
3OpenSync in GLib applications."
4LICENSE = "LGPLv2"
5SECTION = "x11"
6DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"
7RRECOMMENDS_${PN} = "\
8 libopensync-plugin-file \
9 "
10SRCREV = "3f375969d56028505db97cd25ef1679a167cfc59"
11PV = "0.0+gitr${SRCPV}"
12PR = "r2"
13
14SRC_URI = "git://git.yoctoproject.org/sync;protocol=git"
15
16inherit autotools pkgconfig
17
18S = "${WORKDIR}/sync"
19
20PACKAGES += "synctool"
21FILES_${PN} = "${libdir}/lib*.so.*"
22FILES_synctool = "${bindir} ${datadir}"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch b/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
deleted file mode 100644
index 9947af042d..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 CMakeLists.txt | 4 ----
5 1 file changed, 4 deletions(-)
6
7Index: libsyncml-0.5.4/CMakeLists.txt
8===================================================================
9--- libsyncml-0.5.4.orig/CMakeLists.txt 2009-07-31 09:56:16.000000000 +0100
10+++ libsyncml-0.5.4/CMakeLists.txt 2009-07-31 09:57:33.000000000 +0100
11@@ -72,10 +72,6 @@
12 CHECK_TYPE_SIZE( uint32_t UINT32_T )
13 CHECK_TYPE_SIZE( uint8_t UINT8_T )
14
15-# ensure out od source build
16-INCLUDE( MacroEnsureOutOfSourceBuild )
17-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
18-
19 # find requirements
20 SET ( GLIB2_MIN_VERSION "2.12" )
21 SET ( OPENOBEX_MIN_VERSION "1.1" )
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb b/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb
deleted file mode 100644
index e96463bbaf..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol."
2HOMEPAGE = "http://libsyncml.opensync.org/"
3LICENSE = "LGPL"
4DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez4 openobex libcheck"
5PR = "r1"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \
8 file://build-in-src.patch;patch=1"
9
10inherit cmake pkgconfig
11
12PACKAGES += "${PN}-tools"
13
14FILES_${PN}-tools = "${bindir}"
15FILES_${PN} = "${libdir}/*.so.*"
16
17export VERBOSE="1"
diff --git a/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb b/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb
deleted file mode 100644
index ff86a0b103..0000000000
--- a/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "Calendar (and other PIM data) synchronization program"
2DESCRIPTION = "msynctool is a program to synchronize calendars, \
3addressbooks and other PIM data between programs on your computer and \
4other computers, mobile devices, PDAs or cell phones. It uses the \
5OpenSync plugins when synchronizing data."
6HOMEPAGE = "http://www.opensync.org/"
7LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9 file://tools/msynctool.c;beginline=1;endline=20;md5=0b71ef245b75c74bff7d7ec58b9b4527"
10
11DEPENDS = "libopensync glib-2.0"
12
13SRC_URI = "http://www.opensync.org/download/releases/${PV}/msynctool-${PV}.tar.bz2"
14
15inherit cmake pkgconfig
16
17PR = "r0"
18
19SRC_URI[md5sum] = "495c45d6f12d3523a736864b0ced6ce5"
20SRC_URI[sha256sum] = "4a903d4db05bf2f677a675ec47e9791da9b1752c9feda0026157e82aa97e372b"
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
deleted file mode 100644
index ee15f4da58..0000000000
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3---
4 Makefile.am | 2 +-
5 configure.ac | 1 -
6 help/Makefile.am | 1 -
7 3 files changed, 1 insertion(+), 3 deletions(-)
8
9--- empathy-0.23.4.orig/Makefile.am
10+++ empathy-0.23.4/Makefile.am
11@@ -1,6 +1,6 @@
12-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
13+SUBDIRS = tools extensions po data libempathy libempathy-gtk src
14
15 if HAVE_MEGAPHONE
16 SUBDIRS += megaphone
17 endif
18
19--- empathy-0.23.4.orig/configure.ac
20+++ empathy-0.23.4/configure.ac
21@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL
22 AM_PROG_MKDIR_P
23 AM_PATH_GLIB_2_0
24 AC_PATH_XTRA
25 IT_PROG_INTLTOOL([0.35.0])
26 GTK_DOC_CHECK([1.3])
27-GNOME_DOC_INIT
28 IDT_COMPILE_WARNINGS
29 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
30 AC_PATH_PROG(GCONFTOOL, gconftool-2)
31 AM_GCONF_SOURCE_2
32 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
33--- empathy-0.23.4.orig/help/Makefile.am
34+++ empathy-0.23.4/help/Makefile.am
35@@ -1,6 +1,5 @@
36-include $(top_srcdir)/gnome-doc-utils.make
37
38 DOC_MODULE = empathy
39 DOC_ENTITIES = legal.xml
40 DOC_FIGURES = \
41 figures/empathy-main-window.png \
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
deleted file mode 100644
index f4f8faec63..0000000000
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "a Telepathy based IM client"
2DESCRIPTION = "Instant messaging program supporting text, voice, video, file \
3transfers and interapplication communication over many different protocols, \
4include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \
5Gadu-Gadu, Groupwise, ICQ and QQ."
6HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
7LICENSE = "GPL"
8DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade evolution-data-server"
9RDEPENDS_${PN} = "telepathy-mission-control"
10RRECOMMENDS_${PN} = "telepathy-gabble"
11PR = "r4"
12
13inherit gnome
14
15PARALLEL_MAKE = ""
16
17EXTRA_OECONF += "--disable-scrollkeeper"
18
19PACKAGES =+ "empathy-scrollkeeper-junk"
20FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
21
22FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
23 ${datadir}/dbus-1/services/*.service \
24 ${datadir}/telepathy/managers/*.chandler \
25 ${datadir}/icons \
26 ${libdir}/python*"
27
28FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
29
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
deleted file mode 100644
index 3ddee8f4ad..0000000000
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1SUMMARY = "Telepathy fasrsight"
2DESCRIPTION = "Glue library for telepathy media signalling and the media \
3streaming capabilities of Farsight2."
4HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
5DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
6LICENSE = "LGPLv2"
7
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${BPN}-${PV}.tar.gz \
9"
10
11inherit autotools
12
13EXTRA_OECONF = "--disable-python"
14
15FILES_${PN} += "${datadir}/telepathy \
16 ${datadir}/dbus-1"
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
deleted file mode 100644
index 9000cd41cc..0000000000
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
+++ /dev/null
@@ -1,33 +0,0 @@
1
2[ConnectionManager]
3BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
4ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
5
6[Protocol jabber]
7param-account=s required register
8param-password=s required register
9param-server=s
10param-resource=s
11param-priority=n
12param-port=q
13param-old-ssl=b
14param-register=b
15param-low-bandwidth=b
16param-https-proxy-server=s
17param-https-proxy-port=q
18param-fallback-conference-server=s
19param-stun-server=s
20param-stun-port=q
21param-ignore-ssl-errors=b
22param-alias=s
23param-mac=s
24param-btid=s
25default-resource=Telepathy
26default-priority=0
27default-port=5222
28default-old-ssl=false
29default-register=false
30default-low-bandwidth=false
31default-https-proxy-port=443
32default-stun-port=3478
33default-ignore-ssl-errors=false
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
deleted file mode 100644
index 36e9d65874..0000000000
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1SUMMARY = "Telepathy Jabber/XMPP connection manager"
2DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols."
3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
4DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
5LICENSE = "LGPL"
6
7# gabble.manager needs to get regenerated every release, so please don't copy it over blindly
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${BPN}-${PV}.tar.gz \
9 file://gabble.manager"
10
11inherit autotools pkgconfig
12
13do_compile_prepend() {
14 cp ${WORKDIR}/gabble.manager ${S}/data/
15}
16
17FILES_${PN} += "${datadir}/telepathy \
18 ${datadir}/dbus-1"
diff --git a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch b/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
deleted file mode 100644
index 1d9ea431c2..0000000000
--- a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1
2Upstream-Status: Inappropriate [configuration]
3--- wbxml2-0.9.2/Makefile.am.old 2007-01-03 19:50:24.000000000 +0000
4+++ wbxml2-0.9.2/Makefile.am 2007-01-03 19:50:39.000000000 +0000
5@@ -24,9 +24,9 @@
6 TODO\
7 doxygen.h
8
9-install-data-local:
10- $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
11- cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
12+#install-data-local:
13+# $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
14+# cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
15
16 dist-bz2: distdir
17 sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
diff --git a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb b/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
deleted file mode 100644
index 42655a1df8..0000000000
--- a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Parsing and Encoding of WBXML documents"
2DESCRIPTION = "The WBXML Library (aka libwbxml) contains a library and \
3its associated tools to Parse, Encode and Handle WBXML documents. The \
4WBXML format is a binary representation of XML, defined by the Wap \
5Forum, and used to reduce bandwidth in mobile communications."
6LICENSE = "GPLv2"
7
8DEPENDS = "libxml2 sed-native expat"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${BPN}-${PV}.tar.gz \
11 file://no-doc-install.patch;patch=1"
12
13inherit autotools pkgconfig
14
15do_configure_append() {
16 sed -i s:-I/usr/include::g Makefile
17 sed -i s:-I/usr/include::g */Makefile
18}
19
20PACKAGES += "${PN}-tools"
21
22FILES_${PN}-tools = "${bindir}"
23FILES_${PN} = "${libdir}/*.so.*"
24
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 03:26:38 +0000