diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-28 14:18:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:15:06 +0000 |
commit | ebb15d22803637af81a38fc12638cde8388c084e (patch) | |
tree | 5dbdf40e94a2a126328b5386d74076f94c6bb55d | |
parent | c2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2 (diff) | |
download | poky-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.inc | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/bind/bind_9.8.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_5.9p1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/git/git_1.7.7.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/iputils/iputils_s20101006.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb | 2 |
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 b9fa4d96ae..664a0bcafb 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" |
4 | DEPENDS = "gtk+ libetpan openssl libowl" | 4 | DEPENDS = "gtk+ libetpan openssl libowl" |
5 | LICENSE = "GPL" | 5 | LICENSE = "GPL" |
6 | PR = "r6" | 6 | PR = "r7" |
7 | 7 | ||
8 | SRC_URI = "\ | 8 | SRC_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 af473e9559..c2efa47819 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" | |||
6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c" | 6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c" |
7 | 7 | ||
8 | DEPENDS = "openssl" | 8 | DEPENDS = "openssl" |
9 | PR = "r1" | 9 | PR = "r2" |
10 | 10 | ||
11 | SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ | 11 | SRC_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 f9493d7224..749f89e033 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" | |||
7 | LICENSE = "BSD" | 7 | LICENSE = "BSD" |
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e" |
9 | 9 | ||
10 | PR = "r2" | 10 | PR = "r3" |
11 | 11 | ||
12 | DEPENDS = "zlib openssl" | 12 | DEPENDS = "zlib openssl" |
13 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 13 | DEPENDS += "${@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 22caf422b1..470df504f4 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" | |||
5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPLv2.1" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 6 | LIC_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" |
8 | PR = "r0" | 8 | PR = "r1" |
9 | 9 | ||
10 | SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz" | 10 | SRC_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 d383c1077f..9d24911c5f 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 @@ | |||
1 | require git.inc | 1 | require git.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz" | 5 | SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz" |
6 | SRC_URI[md5sum] = "5d645884e688921e773186783b65ce33" | 6 | SRC_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 5682e05473..5417d5eb78 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 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" |
3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" | 3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" |
4 | PR = "${INC_PR}.2" | 4 | PR = "${INC_PR}.3" |
5 | 5 | ||
6 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 6 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
7 | DISTRO_SRC_URI_linuxstdbase = "" | 7 | DISTRO_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 7795914a70..2c0c076ebd 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" | |||
45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" | 45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" |
46 | extrarpmdeps = "python perl" | 46 | extrarpmdeps = "python perl" |
47 | extrarpmdeps_virtclass-native = "file-native" | 47 | extrarpmdeps_virtclass-native = "file-native" |
48 | PR = "r25" | 48 | PR = "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 37591c2b18..2c11628f1f 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 | ||
9 | SRCREV = "1855" | 9 | SRCREV = "1855" |
10 | PV = "0.0+svnr${SRCPV}" | 10 | PV = "0.0+svnr${SRCPV}" |
11 | PR = "r1" | 11 | PR = "r2" |
12 | 12 | ||
13 | SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=agent;proto=http \ | 13 | SRC_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 5216c10821..912a346e93 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 | ||
14 | DEPENDS = "sysfsutils openssl docbook-utils-native sgmlspl-native" | 14 | DEPENDS = "sysfsutils openssl docbook-utils-native sgmlspl-native" |
15 | 15 | ||
16 | PR = "r1" | 16 | PR = "r2" |
17 | 17 | ||
18 | SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ | 18 | SRC_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 a6b270c50a..f494f1b43c 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" | |||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" | 12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" |
13 | PV = "0.0-git${SRCPV}" | 13 | PV = "0.0-git${SRCPV}" |
14 | PR = "r16" | 14 | PR = "r17" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ | 16 | SRC_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 1c66318814..9bf7d4162d 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 | ||
10 | DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" | 10 | DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" |
11 | 11 | ||
12 | PR = "r1" | 12 | PR = "r2" |
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ |
15 | file://starting-fix.patch \ | 15 | file://starting-fix.patch \ |