summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-11-28 22:18:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-30 15:15:06 (GMT)
commitebb15d22803637af81a38fc12638cde8388c084e (patch)
tree5dbdf40e94a2a126328b5386d74076f94c6bb55d
parentc2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2 (diff)
downloadpoky-ebb15d22803637af81a38fc12638cde8388c084e.tar.gz
PR Bump for OpenSSL 1.0
(From OE-Core rev: 59923e66e85471acdb70d72082a8906c69b17720) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-mail.inc2
-rw-r--r--meta/recipes-connectivity/bind/bind_9.8.1.bb2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_5.9p1.bb2
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb2
-rw-r--r--meta/recipes-devtools/git/git_1.7.7.bb2
-rw-r--r--meta/recipes-devtools/python/python_2.7.2.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb2
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb2
-rw-r--r--meta/recipes-extended/iputils/iputils_s20101006.bb2
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb2
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb2
11 files changed, 11 insertions, 11 deletions
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc b/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
index b9fa4d9..664a0bc 100644
--- a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Mail user agent"
3#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl" 3#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl"
4DEPENDS = "gtk+ libetpan openssl libowl" 4DEPENDS = "gtk+ libetpan openssl libowl"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r6" 6PR = "r7"
7 7
8SRC_URI = "\ 8SRC_URI = "\
9 ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \ 9 ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
index af473e9..c2efa47 100644
--- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
+++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
@@ -6,7 +6,7 @@ LICENSE = "ISC & BSD"
6LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c" 6LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
7 7
8DEPENDS = "openssl" 8DEPENDS = "openssl"
9PR = "r1" 9PR = "r2"
10 10
11SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ 11SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
12 file://conf.patch \ 12 file://conf.patch \
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index f9493d7..749f89e 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
9 9
10PR = "r2" 10PR = "r3"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb
index 22caf42..470df50 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 dbus telepathy-glib openssl"
5LICENSE = "LGPLv2.1" 5LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9" 7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz" 10SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz"
11 11
diff --git a/meta/recipes-devtools/git/git_1.7.7.bb b/meta/recipes-devtools/git/git_1.7.7.bb
index d383c10..9d24911 100644
--- a/meta/recipes-devtools/git/git_1.7.7.bb
+++ b/meta/recipes-devtools/git/git_1.7.7.bb
@@ -1,6 +1,6 @@
1require git.inc 1require git.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz" 5SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
6SRC_URI[md5sum] = "5d645884e688921e773186783b65ce33" 6SRC_URI[md5sum] = "5d645884e688921e773186783b65ce33"
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 5682e05..5417d5e 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" 3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
4PR = "${INC_PR}.2" 4PR = "${INC_PR}.3"
5 5
6DISTRO_SRC_URI ?= "file://sitecustomize.py" 6DISTRO_SRC_URI ?= "file://sitecustomize.py"
7DISTRO_SRC_URI_linuxstdbase = "" 7DISTRO_SRC_URI_linuxstdbase = ""
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 7795914..2c0c076 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" 45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
46extrarpmdeps = "python perl" 46extrarpmdeps = "python perl"
47extrarpmdeps_virtclass-native = "file-native" 47extrarpmdeps_virtclass-native = "file-native"
48PR = "r25" 48PR = "r26"
49 49
50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
51# in order to extract the distribution SRPM into a format we can extract... 51# in order to extract the distribution SRPM into a format we can extract...
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
index 37591c2..2c11628 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://../epl-v10.html;md5=7aa4215a330a0a4f6a1cbf8da1a0879f
8 8
9SRCREV = "1855" 9SRCREV = "1855"
10PV = "0.0+svnr${SRCPV}" 10PV = "0.0+svnr${SRCPV}"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=agent;proto=http \ 13SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=agent;proto=http \
14 http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk/epl-v10.html;name=epl \ 14 http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk/epl-v10.html;name=epl \
diff --git a/meta/recipes-extended/iputils/iputils_s20101006.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb
index 5216c10..912a346 100644
--- a/meta/recipes-extended/iputils/iputils_s20101006.bb
+++ b/meta/recipes-extended/iputils/iputils_s20101006.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
13 13
14DEPENDS = "sysfsutils openssl docbook-utils-native sgmlspl-native" 14DEPENDS = "sysfsutils openssl docbook-utils-native sgmlspl-native"
15 15
16PR = "r1" 16PR = "r2"
17 17
18SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ 18SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
19 file://debian/fix-dead-host-ping-stats.diff \ 19 file://debian/fix-dead-host-ping-stats.diff \
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index a6b270c..f494f1b 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
13PV = "0.0-git${SRCPV}" 13PV = "0.0-git${SRCPV}"
14PR = "r16" 14PR = "r17"
15 15
16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ 16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
17 file://no-doc.patch \ 17 file://no-doc.patch \
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
index 1c66318..9bf7d41 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
9 9
10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" 10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
11 11
12PR = "r1" 12PR = "r2"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ 14SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
15 file://starting-fix.patch \ 15 file://starting-fix.patch \