Skip to contentSkip to conversation

Recipe version updates

PATCH In review Alexander Kanavin 7 participants 21 messages Dec 9, 2015 – Dec 22, 2015

lore
Share & tools
lore

Alexander Kanavin

author
#0 lore raw

cover Recipe version updates

This patchset contains various version updates and upstream check updates for recipes with Unknown upstream status. I wanted to handle those before updating out-of-date recipes where upstream version is known (which I'll be dong next).

The following changes since commit 7e8ff7b9d793b7be106415c3c80b687977217566:

bitbake: toaster: toasterui Add ParseStarted/ParseProgress events to mask (2015-12-09 09:03:35 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alexander Kanavin (10):
openssl: update to 1.0.2e
gnutls: update to 3.4.7
python-setuptools: update to 18.7.1
nspr: update to 4.11 mobile-broadband-provider-info: update to current commit
puzzles: update to current commit
mirrors: replace references to archive.apache.org
json-c: add manual upstream version check
subversion: update to 1.9.2
slang: update upstream URI to (official) jedsoft.org

 meta/classes/mirrors.bbclass                       |    2 +-
 meta/conf/bitbake.conf                             |    2 +-
 .../mobile-broadband-provider-info_git.bb          |    4 +-
 .../{openssl_1.0.2d.bb => openssl_1.0.2e.bb}       |    4 +-
 meta/recipes-devtools/json-c/json-c_0.12.bb        |    3 +
 ...uptools_18.2.bb => python-setuptools_18.7.1.bb} |    5 +-
 ...ptools_18.2.bb => python3-setuptools_18.7.1.bb} |    5 +-
 .../subversion/subversion-1.8.13/libtool2.patch    |   15 -
 .../subversion-CVE-2015-3184.patch                 | 2094 --------------------
 .../subversion-CVE-2015-3187.patch                 |  346 ----
 .../0001-Fix-libtool-name-in-configure.ac.patch    |   29 +
 .../disable_macos.patch                            |    0
 ...erf.m4-Regex-modified-to-allow-D-in-paths.patch |   14 +-
 .../{subversion_1.8.13.bb => subversion_1.9.2.bb}  |   12 +-
 meta/recipes-extended/slang/slang_2.2.4.bb         |    3 +-
 .../fix-compiling-failure-with-option-g-O.patch    |    9 -
 meta/recipes-sato/puzzles/puzzles_git.bb           |    6 +-
 meta/recipes-support/gnutls/gnutls.inc             |    3 +-
 ...tch => 0001-configure.ac-fix-sed-command.patch} |   29 +-
 .../gnutls/{gnutls_3.3.17.1.bb => gnutls_3.4.7.bb} |    6 +-
 .../nspr/{nspr_4.10.8.bb => nspr_4.11.bb}          |    9 +-
 21 files changed, 86 insertions(+), 2514 deletions(-)
 rename meta/recipes-connectivity/openssl/{openssl_1.0.2d.bb => openssl_1.0.2e.bb} (94%)
 rename meta/recipes-devtools/python/{python-setuptools_18.2.bb => python-setuptools_18.7.1.bb} (84%)
 rename meta/recipes-devtools/python/{python3-setuptools_18.2.bb => python3-setuptools_18.7.1.bb} (91%)
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/disable_macos.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/serf.m4-Regex-modified-to-allow-D-in-paths.patch (59%)
 rename meta/recipes-devtools/subversion/{subversion_1.8.13.bb => subversion_1.9.2.bb} (90%)
 rename meta/recipes-support/gnutls/gnutls/{configure.ac-fix-sed-command.patch => 0001-configure.ac-fix-sed-command.patch} (40%)
 rename meta/recipes-support/gnutls/{gnutls_3.3.17.1.bb => gnutls_3.4.7.bb} (42%)
 rename meta/recipes-support/nspr/{nspr_4.10.8.bb => nspr_4.11.bb} (93%)
Signature · 1 line
2.6.2
author
#1 lore raw

PATCH 1/10 openssl: update to 1.0.2e

[YOCTO #8765]
[YOCTO #8758]

Signed-off-by Alexander Kanavin <[email protected]>
---
 .../openssl/{openssl_1.0.2d.bb => openssl_1.0.2e.bb}                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/openssl/{openssl_1.0.2d.bb => openssl_1.0.2e.bb} (94%)
meta/recipes-connectivity/openssl/openssl_1.0.2e.bb renamed from meta/recipes-connectivity/openssl/openssl_1.0.2d.bb +2 -2
similarity index 94%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2e.bb
index 249f8c4..e41f46b 100644
@@ -39,8 +39,8 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
             file://ptest_makefile_deps.patch  \
            "
 
-SRC_URI[md5sum] = "38dd619b2e77cbac69b99f52a053d25a"
-SRC_URI[sha256sum] = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8"
+SRC_URI[md5sum] = "5262bfa25b60ed9de9f28d5d52d77fc5"
+SRC_URI[sha256sum] = "e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff"
 
 PACKAGES =+ " \
 	${PN}-engines \
Signature · 1 line
2.6.2
#2 lore raw

Re: [PATCH 01/10] openssl: update to 1.0.2e

Can we get the CVE's fix by this update included in the commit?

- armin

Quoted 28 lines · Alexander Kanavin

[YOCTO #8765]
[YOCTO #8758]

Signed-off-by Alexander Kanavin <[email protected]>
---
 .../openssl/{openssl_1.0.2d.bb => openssl_1.0.2e.bb}                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/openssl/{openssl_1.0.2d.bb => openssl_1.0.2e.bb} (94%)
meta/recipes-connectivity/openssl/openssl_1.0.2e.bb renamed from meta/recipes-connectivity/openssl/openssl_1.0.2d.bb +2 -2
similarity index 94%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2e.bb
index 249f8c4..e41f46b 100644
@@ -39,8 +39,8 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
             file://ptest_makefile_deps.patch  \
            "
 
-SRC_URI[md5sum] = "38dd619b2e77cbac69b99f52a053d25a"
-SRC_URI[sha256sum] = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8"
+SRC_URI[md5sum] = "5262bfa25b60ed9de9f28d5d52d77fc5"
+SRC_URI[sha256sum] = "e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff"
 
 PACKAGES =+ " \
 	${PN}-engines \
author
#3 lore raw

Re: [PATCH 01/10] openssl: update to 1.0.2e

Quoted 1 line · On 12/09/2015 09:52 PM, akuster808 wrote:

Can we get the CVE's fix by this update included in the commit?

It's a version update to oe-core's development branch (e.g. non-production, frequently updated), why have the CVEs in the commit message? I understand why this is needed for already-released branches, but can't see why do it for something that hasn't been released yet.

Alex

#4 lore raw

Re: [PATCH 01/10] openssl: update to 1.0.2e

Quoted 6 lines · On Thu, 10 Dec 2015 12:50:20 Alexander Kanavin wrote:
Quoted 1 line · On 12/09/2015 09:52 PM, akuster808 wrote:

Can we get the CVE's fix by this update included in the commit?

It's a version update to oe-core's development branch (e.g. non-production, frequently updated), why have the CVEs in the commit message?

So that it's clearer when a CVE has been resolved, however we ended up resolving it. We currently have a massive gap in what we know about CVE resolution because upgrades that fix them aren't tracked in any way.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
author
#5 lore raw

Re: [PATCH 01/10] openssl: update to 1.0.2e

Quoted 9 lines · Paul Eggleton
Quoted 5 lines

Can we get the CVE's fix by this update included in the commit?

It's a version update to oe-core's development branch (e.g. non-production, frequently updated), why have the CVEs in the commit message?

So that it's clearer when a CVE has been resolved, however we ended up resolving it. We currently have a massive gap in what we know about CVE resolution because upgrades that fix them aren't tracked in any way.

CVE database includes information about which upstream versions are affected by the vulnerability and which have the fix. We can use this information in our RRS to determine if there are any CVEs to be fixed and even send notifications to maintainers.

Asking recipe maintainers to inspect the commit log for any new CVEs fixed when doing a version update of any package, and then placing those numbers into the recipe commit message is unnecessary manual work that is also error-prone.

Alex

#6 lore raw

Re: [PATCH 01/10] openssl: update to 1.0.2e

In reply to Alexander Kanavin
Quoted 4 lines · Alexander Kanavin

[YOCTO #8765]
[YOCTO #8758]

Signed-off-by Alexander Kanavin <[email protected]>

This update seems to have break imx53 build[1].

1. http://ci.ossystems.com.br/view/All%20failing%20jobs/job/fsl-community-bsp-master-next_x11-imx53qsb/909/consoleText

Has anyone seen something similar?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#7 lore raw

Re: [PATCH 01/10] openssl: update to 1.0.2e

Quoted 8 lines · Otavio Salvador
Quoted 3 lines · Alexander Kanavin

[YOCTO #8765]
[YOCTO #8758]

Quoted 7 lines
Quoted 1 line
Signed-off-by Alexander Kanavin <[email protected]>

This update seems to have break imx53 build[1].

1. http://ci.ossystems.com.br/view/All%20failing%20jobs/job/fsl-community-bsp-master-next_x11-imx53qsb/909/consoleText

Has anyone seen something similar?

the error is

x11 fsl-image-machine-test@imx53qsb | .../build-x11/tmp/sysroots/x86_64-linux/usr/libexec/arm-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/5.2.0/ld: libcrypto.a(v3_crld.o): bad reloc symbol index (0x800075 >= 0xbc) for offset 0x238e in section `.debug_info' x11 fsl-image-machine-test@imx53qsb | libcrypto.a(v3_crld.o): error adding symbols: Bad value

so either this v3_crld.o is corrupt or built for another architecture.

Quoted 10 lines

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#8 lore raw

PATCH 2/10 gnutls: update to 3.4.7

In reply to Alexander Kanavin

libidn is needed by the new version to compare hostnames. Openssl compatibility is no longer enabled by default, but is required by other packages in oe-core.

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-support/gnutls/gnutls.inc             |  3 ++-
 ...tch => 0001-configure.ac-fix-sed-command.patch} | 29 +++++++++++-----------
 .../gnutls/{gnutls_3.3.17.1.bb => gnutls_3.4.7.bb} |  6 ++---
 3 files changed, 20 insertions(+), 18 deletions(-)
 rename meta/recipes-support/gnutls/gnutls/{configure.ac-fix-sed-command.patch => 0001-configure.ac-fix-sed-command.patch} (40%)
 rename meta/recipes-support/gnutls/{gnutls_3.3.17.1.bb => gnutls_3.4.7.bb} (42%)
meta/recipes-support/gnutls/gnutls.inc +2 -1
index e9b138a..c1ec120 100644
@@ -1,7 +1,7 @@
 SUMMARY = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "nettle"
+DEPENDS = "nettle libidn"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"

@@ -26,6 +26,7 @@ EXTRA_OECONF="--disable-rpath \
               --disable-guile \
               --disable-crywrap \
               --without-p11-kit \
+              --enable-openssl-compatibility \
               "
 
 do_configure_prepend() {
meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch renamed from meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch +15 -14
similarity index 40%
rename from meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
rename to meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
index 44a9934..c5b95eb 100644
@@ -1,6 +1,6 @@
-From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Sat, 17 Jan 2015 17:02:15 +0000
+From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 4 Dec 2015 13:19:28 +0200
 Subject: [PATCH] configure.ac: fix sed command
 
 The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors

@@ -9,23 +9,24 @@ when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
 Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <[email protected]>
+Signed-off-by: Alexander Kanavin <[email protected]>
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index c6818a0..1c4582d 100644
+index e634236..dc9e6a8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
- 	dnl replace libopts-generated files with distributed backups, if present
- 	missing_baks=
- 	for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
--		nam=`echo $i|sed 's/.bak//g'`
-+		nam=`echo $i|sed 's/\.bak$//'`
- 		if test -f $i;then
- 			cp -f $i $nam
- 		else
+@@ -549,7 +549,7 @@ if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then
+ 		dnl replace libopts-generated files with distributed backups, if present
+ 		missing_baks=
+ 		for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+-			nam=`echo $i|sed 's/.bak//g'`
++                        nam=`echo $i|sed 's/\.bak$//'`
+ 			if test -f $i;then
+ 				cp -f $i $nam
+ 			else
 -- 
-2.0.1
+2.6.2
meta/recipes-support/gnutls/gnutls_3.4.7.bb renamed from meta/recipes-support/gnutls/gnutls_3.3.17.1.bb +3 -3
similarity index 42%
rename from meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
rename to meta/recipes-support/gnutls/gnutls_3.4.7.bb
index 0185797..c90b44a 100644
@@ -1,8 +1,8 @@
 require gnutls.inc
 
 SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
-            file://configure.ac-fix-sed-command.patch \
+            file://0001-configure.ac-fix-sed-command.patch \
             file://use-pkg-config-to-locate-zlib.patch \
            "
-SRC_URI[md5sum] = "8d01c7e7f2cbc5871fdca832d2260b6b"
-SRC_URI[sha256sum] = "b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4"
+SRC_URI[md5sum] = "e7556cec73c8b34fd2ff0b591e24e44c"
+SRC_URI[sha256sum] = "c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a"
Signature · 1 line
2.6.2
#9 lore raw

Re: [PATCH 02/10] gnutls: update to 3.4.7

Quoted 4 lines · Alexander Kanavin

libidn is needed by the new version to compare hostnames. Openssl compatibility is no longer enabled by default, but is required by other packages in oe-core.

ERROR: Nothing PROVIDES 'nativesdk-libidn' (but virtual:nativesdk:/home/ross/Yocto/poky/meta/recipes-support/gnutls/ gnutls_3.4.7.bb DEPENDS on or otherwise requires it). Close matches:

Can you enable and test the native and nativesdk forms of libidn (set BBCLASSEXTEND, check stuff builds as expected) as this breaks the building of wget-native and nativesdk-wget (the latter is part of the buildtools tarball, so is a blocker).

Ross

author
#10 lore raw

PATCH 3/10 python-setuptools: update to 18.7.1

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../{python-setuptools_18.2.bb => python-setuptools_18.7.1.bb}       | 5 +++--
 .../{python3-setuptools_18.2.bb => python3-setuptools_18.7.1.bb}     | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/python/{python-setuptools_18.2.bb => python-setuptools_18.7.1.bb} (84%)
 rename meta/recipes-devtools/python/{python3-setuptools_18.2.bb => python3-setuptools_18.7.1.bb} (91%)
meta/recipes-devtools/python/python-setuptools_18.7.1.bb renamed from meta/recipes-devtools/python/python-setuptools_18.2.bb +3 -2
similarity index 84%
rename from meta/recipes-devtools/python/python-setuptools_18.2.bb
rename to meta/recipes-devtools/python/python-setuptools_18.7.1.bb
index 1de2b2e..1cc8774 100644
@@ -14,8 +14,9 @@ DEPENDS_class-native += "python-native"
 inherit distutils
 
 SRC_URI = "https://pypi.python.org/packages/source/s/setuptools/setuptools-${PV}.tar.gz"
-SRC_URI[md5sum] = "52b4e48939ef311d7204f8fe940764f4"
-SRC_URI[sha256sum] = "0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d"
+SRC_URI[md5sum] = "a0984da9cd8d7b582e1fd7de67dfdbcc"
+SRC_URI[sha256sum] = "aff36c95035e0b311eacb1434e3f7e85f5ccaad477773847e582978f8f45bd74"
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
meta/recipes-devtools/python/python3-setuptools_18.7.1.bb renamed from meta/recipes-devtools/python/python3-setuptools_18.2.bb +2 -3
similarity index 91%
rename from meta/recipes-devtools/python/python3-setuptools_18.2.bb
rename to meta/recipes-devtools/python/python3-setuptools_18.7.1.bb
index 5687e30..eaf6e47 100644
@@ -11,9 +11,8 @@ DEPENDS_class-native += "python3-native"
 SRC_URI = " \
   http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
 "
-SRC_URI[md5sum] = "52b4e48939ef311d7204f8fe940764f4"
-SRC_URI[sha256sum] = "0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d"
-
+SRC_URI[md5sum] = "a0984da9cd8d7b582e1fd7de67dfdbcc"
+SRC_URI[sha256sum] = "aff36c95035e0b311eacb1434e3f7e85f5ccaad477773847e582978f8f45bd74"
 UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
Signature · 1 line
2.6.2
author
#11 lore raw

PATCH 4/10 nspr: update to 4.11

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-support/nspr/{nspr_4.10.8.bb => nspr_4.11.bb} | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename meta/recipes-support/nspr/{nspr_4.10.8.bb => nspr_4.11.bb} (93%)
meta/recipes-support/nspr/nspr_4.11.bb renamed from meta/recipes-support/nspr/nspr_4.10.8.bb +5 -4
similarity index 93%
rename from meta/recipes-support/nspr/nspr_4.10.8.bb
rename to meta/recipes-support/nspr/nspr_4.11.bb
index bc60018..e579d0b 100644
@@ -13,8 +13,11 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
 
 SRC_URI += "file://nspr.pc.in"
 
-SRC_URI[md5sum] = "8d7c5bd0a5b0a7d0e705be66479030a0"
-SRC_URI[sha256sum] = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15"
+UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
+UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
+
+SRC_URI[md5sum] = "4f24b2fb88ca03b5d6d6931d6a67ef9a"
+SRC_URI[sha256sum] = "cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2"
 
 S = "${WORKDIR}/nspr-${PV}/nspr"
 

@@ -137,8 +140,6 @@ TESTS = " \
     xnotify \
     zerolen"
 
-PR = "r1"
-
 inherit autotools
 
 do_compile_prepend() {
Signature · 1 line
2.6.2
author
#12 lore raw

PATCH 5/10 mobile-broadband-provider-info: update to current commit

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../mobile-broadband-provider-info_git.bb                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +2 -2
index 31cf2bb..2dce7aa 100644
@@ -2,8 +2,8 @@ SUMMARY = "Mobile Broadband Service Provider Database"
 SECTION = "network"
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04"
-SRCREV = "d06ebd314a7cdd087d38e4966c19de42c8c55246"
-PV = "20140618+gitr${SRCPV}"
+SRCREV = "c5e0139cdbb7d57399a804c1fddaa7759b7a4fa0"
+PV = "20151106+gitr${SRCPV}"
 PE = "1"
 
 SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info"
Signature · 1 line
2.6.2
author
#13 lore raw

PATCH 6/10 puzzles: update to current commit

In reply to Alexander Kanavin

Also, update gtk+ dependency to gtk+3, as the code has been ported to it.

Signed-off-by Alexander Kanavin <[email protected]>
---
 .../puzzles/files/fix-compiling-failure-with-option-g-O.patch    | 9 ---------
 meta/recipes-sato/puzzles/puzzles_git.bb                         | 6 ++++--
 2 files changed, 4 insertions(+), 11 deletions(-)
meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +0 -9
index d246fee..c134acd 100644
@@ -29,15 +29,6 @@ diff --git a/gtk.c b/gtk.c
 index a2eba2c..c54bf63 100644
 --- a/gtk.c
 +++ b/gtk.c
-@@ -381,7 +381,7 @@ static void clear_backing_store(frontend *fe)
- 
- static void setup_backing_store(frontend *fe)
- {
--    cairo_t *cr;
-+    cairo_t *cr = NULL;
-     int i;
- 
-     fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1);
 @@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp)
  int main(int argc, char **argv)
  {
meta/recipes-sato/puzzles/puzzles_git.bb +4 -2
index 95826c1..9d833b6 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Simon Tatham's Portable Puzzle Collection"
 HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
-DEPENDS = "gtk+ libxt"
+DEPENDS = "gtk+3 libxt"
 
 # The libxt requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"

@@ -13,7 +13,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            file://fix-compiling-failure-with-option-g-O.patch \
            file://0001-Use-labs-instead-of-abs.patch \
 "
-SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a"
+SRCREV = "346584bf6e38232be8773c24fd7dedcbd7b3d9ed"
 PE = "1"
 PV = "0.0+git${SRCPV}"
 

@@ -25,6 +25,8 @@ do_configure_prepend () {
     ./mkfiles.pl
 }
 
+EXTRA_OECONF_append = " --with-gtk=3"
+
 FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*"
 FILES_${PN}-dbg += "${prefix}/bin/.debug"
Signature · 1 line
2.6.2
author
#14 lore raw

PATCH 7/10 mirrors: replace references to archive.apache.org

In reply to Alexander Kanavin

archive.apache.org does not contain current releases, only historical ones, so upstream checks aren't accurate. It's replaced with official mirrors containing current versions.

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/classes/mirrors.bbclass | 2 +-
 meta/conf/bitbake.conf       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/mirrors.bbclass +1 -1
index b96c071..0f98479 100644
@@ -40,7 +40,7 @@ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tux.org/pub/sites/vic
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \n \
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \n \
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://the.wiretapped.net/pub/security/host-security/lsof/ \n \
-http://www.apache.org/dist  http://archive.apache.org/dist \n \
+http://www.eu.apache.org/dist  http://www.us.apache.org/dist \n \
 http://downloads.sourceforge.net/watchdog/ http://fossies.org/linux/misc/ \n \
 ${SAVANNAH_GNU_MIRROR} http://download-mirror.savannah.gnu.org/releases \n \
 ${SAVANNAH_NONGNU_MIRROR} http://download-mirror.savannah.nongnu.org/releases \n \
meta/conf/bitbake.conf +1 -1
index 06971da..3491b12 100644
@@ -567,7 +567,7 @@ BBLAYERS_FETCH_DIR ??= "${COREBASE}"
 # Download locations and utilities.
 ##################################################################
 
-APACHE_MIRROR = "http://archive.apache.org/dist"
+APACHE_MIRROR = "http://www.eu.apache.org/dist/"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
 GNOME_GIT = "git://git.gnome.org"
Signature · 1 line
2.6.2
#15 lore raw

Re: [PATCH 07/10] mirrors: replace references to archive.apache.org

Quoted 15 lines · Alexander Kanavin

archive.apache.org does not contain current releases, only historical ones, so upstream checks aren't accurate. It's replaced with official mirrors containing current versions.

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/classes/mirrors.bbclass | 2 +-
 meta/conf/bitbake.conf       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/mirrors.bbclass +0 -0
index b96c071..0f98479 100644

meta/classes/mirrors.bbclass ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic · line 43

Quoted 5 lines
meta/classes/mirrors.bbclass +1 -1
@@ -40,7 +40,7 @@ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.tux.org/pub/sites/vic
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \n \
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \n \
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://the.wiretapped.net/pub/security/host-security/lsof/ \n \
-http://www.apache.org/dist  http://archive.apache.org/dist \n \
+http://www.eu.apache.org/dist  http://www.us.apache.org/dist \n \

Is this change correct? Shouldn't mirrors.bbclass provide a fallback to the historical releases URL (so that things keep working if the oe-core version of an apache.org package is no longer a current version) ?

Quoted 24 lines
meta/classes/mirrors.bbclass +0 -0
 http://downloads.sourceforge.net/watchdog/ http://fossies.org/linux/misc/ \n \
 ${SAVANNAH_GNU_MIRROR} http://download-mirror.savannah.gnu.org/releases \n \
 ${SAVANNAH_NONGNU_MIRROR} http://download-mirror.savannah.nongnu.org/releases \n \
meta/conf/bitbake.conf +1 -2
index 06971da..3491b12 100644
@@ -567,7 +567,7 @@ BBLAYERS_FETCH_DIR ??= "${COREBASE}"
 # Download locations and utilities.
 ##################################################################
 
-APACHE_MIRROR = "http://archive.apache.org/dist"
+APACHE_MIRROR = "http://www.eu.apache.org/dist/"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
 GNOME_GIT = "git://git.gnome.org"
--

2.6.2

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#16 lore raw

Re: [PATCH 07/10] mirrors: replace references to archive.apache.org

Quoted 7 lines · Andre McCurdy

meta/classes/mirrors.bbclass ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic · line 43

Quoted 2 lines
meta/classes/mirrors.bbclass +1 -1
-http://www.apache.org/dist  http://archive.apache.org/dist \n \
+http://www.eu.apache.org/dist  http://www.us.apache.org/dist \n \

Is this change correct? Shouldn't mirrors.bbclass provide a fallback to the historical releases URL (so that things keep working if the oe-core version of an apache.org package is no longer a current version) ?

When I have checked, archive.apache.org did not have the latest releases of subversion, so it can't be relied on as a primary upstream source. On the other hand, primary mirrors only keep the latest releases, and remove anything else. So the right thing would be to first try to use those primary mirrors, and fall back to archive if those mirrors no longer have the version we need.

This problem also shows up with debian upstream.

Alex

#17 lore raw

Re: [PATCH 07/10] mirrors: replace references to archive.apache.org

Quoted 11 lines · Alexander Kanavin
Quoted 9 lines · Andre McCurdy

meta/classes/mirrors.bbclass ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic · line 43

Quoted 3 lines
meta/classes/mirrors.bbclass +1 -1
-http://www.apache.org/dist  http://archive.apache.org/dist \n \
+http://www.eu.apache.org/dist  http://www.us.apache.org/dist \n \

Is this change correct? Shouldn't mirrors.bbclass provide a fallback to the historical releases URL (so that things keep working if the oe-core version of an apache.org package is no longer a current version) ?

Quoted 6 lines

When I have checked, archive.apache.org did not have the latest releases of subversion, so it can't be relied on as a primary upstream source. On the other hand, primary mirrors only keep the latest releases, and remove anything else. So the right thing would be to first try to use those primary mirrors, and fall back to archive if those mirrors no longer have the version we need.

Yes, that's what I was getting at - there should be a fallback to the archives since oe-core releases typically won't be using the latest release versions. Your new patch looks good.

Checking subversion on http://archive.apache.org/dist today though, the archive site does seem to have copies of the latest versions, so not sure what was happening when you looked.

Quoted 4 lines

This problem also shows up with debian upstream.

Alex

author
#18 lore raw

PATCH 8/10 json-c: add manual upstream version check

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-devtools/json-c/json-c_0.12.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/json-c/json-c_0.12.bb +3 -0
index b56b37e..1a5c394 100644
@@ -15,6 +15,9 @@ UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar"
 # json-c releases page is fetching the list of releases in some weird XML format
 # from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
 #UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
+RECIPE_UPSTREAM_VERSION = "0.12"
+RECIPE_UPSTREAM_DATE = "Apr 11, 2014"
+CHECK_DATE = "Dec 04, 2015"
 
 RPROVIDES_${PN} = "libjson"
Signature · 1 line
2.6.2
author
#19 lore raw

PATCH 9/10 subversion: update to 1.9.2

In reply to Alexander Kanavin

Drop backported CVE fix patches
libtool2.patch has been rebased and renamed to 0001-Fix-libtool-name-in-configure.ac.patch LICENSE checksum has been updated because more 3rd party attributions have been added to it, it's otherwise still Apache 2.

Signed-off-by Alexander Kanavin <[email protected]>
---
 .../subversion/subversion-1.8.13/libtool2.patch    |   15 -
 .../subversion-CVE-2015-3184.patch                 | 2094 --------------------
 .../subversion-CVE-2015-3187.patch                 |  346 ----
 .../0001-Fix-libtool-name-in-configure.ac.patch    |   29 +
 .../disable_macos.patch                            |    0
 ...erf.m4-Regex-modified-to-allow-D-in-paths.patch |   14 +-
 .../{subversion_1.8.13.bb => subversion_1.9.2.bb}  |   12 +-
 7 files changed, 41 insertions(+), 2469 deletions(-)
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/disable_macos.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/serf.m4-Regex-modified-to-allow-D-in-paths.patch (59%)
 rename meta/recipes-devtools/subversion/{subversion_1.8.13.bb => subversion_1.9.2.bb} (90%)
meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch deleted +0 -15
deleted file mode 100644
index 5cd572b..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
---- a/configure.ac	2011-10-20 21:56:02.230663987 +0200
-+++ b/configure.ac	2011-08-17 15:01:30.000000000 +0200
-@@ -227,8 +227,8 @@
-   LIBTOOL="$sh_libtool"
-   SVN_LIBTOOL="$sh_libtool"
- else
--  sh_libtool="$abs_builddir/libtool"
--  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
-+  sh_libtool="$abs_builddir/$host_alias-libtool"
-+  SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
- fi
- AC_SUBST(SVN_LIBTOOL)
-
meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch deleted +0 -2094

2,094 lines not on this page · raw message

meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch deleted +0 -346

346 lines not on this page · raw message

meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch new file +29 -0
new file mode 100644
index 0000000..5a1b10b
@@ -0,0 +1,29 @@
+From cbcfe0399347989e45a8fb695f55c855d6b3da72 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 7 Dec 2015 17:11:02 +0200
+Subject: [PATCH] Fix libtool name in configure.ac
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ed66d4..ceb64f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -221,8 +221,8 @@ if test "$experimental_libtool" = "yes"; then
+   LIBTOOL="$sh_libtool"
+   SVN_LIBTOOL="$sh_libtool"
+ else
+-  sh_libtool="$abs_builddir/libtool"
+-  SVN_LIBTOOL="\$(SHELL) \"$sh_libtool\""
++  sh_libtool="$abs_builddir/$host_alias-libtool"
++  SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
+ fi
+ AC_SUBST(SVN_LIBTOOL)
+ 
+-- 
+2.6.2
+
meta/recipes-devtools/subversion/subversion/disable_macos.patch renamed from meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch
rename to meta/recipes-devtools/subversion/subversion/disable_macos.patch
meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch renamed from meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch +7 -7
similarity index 59%
rename from meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
rename to meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch
index 140e522..9fed3cf 100644
@@ -18,15 +18,15 @@ diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
 index ae11e75..ff8cbae 100644
 --- a/build/ac-macros/serf.m4
 +++ b/build/ac-macros/serf.m4
-@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
-         if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
+@@ -168,7 +168,7 @@
+         if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
            AC_MSG_RESULT([yes])
            serf_found=yes
--          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
-+          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
-           SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` 
-           break
-         else
+-          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`]
++          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
+           SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` 
+           dnl don't use --libs-only-L because then we might miss some options
+           LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
 -- 
 1.8.4.5
meta/recipes-devtools/subversion/subversion_1.9.2.bb renamed from meta/recipes-devtools/subversion/subversion_1.8.13.bb +5 -7
similarity index 90%
rename from meta/recipes-devtools/subversion/subversion_1.8.13.bb
rename to meta/recipes-devtools/subversion/subversion_1.9.2.bb
index 68934b7..f432b8f 100644
@@ -11,16 +11,14 @@ BBCLASSEXTEND = "native"
 inherit gettext pythonnative
 
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://libtool2.patch \
            file://disable_macos.patch \
            file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
-           file://subversion-CVE-2015-3184.patch \
-           file://subversion-CVE-2015-3187.patch \
-"
-SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b"
-SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579"
+           file://0001-Fix-libtool-name-in-configure.ac.patch \
+           "
+SRC_URI[md5sum] = "0a7e55bb58fe77072f19e108a56b468b"
+SRC_URI[sha256sum] = "023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709"
 
 PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
 PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring"
Signature · 1 line
2.6.2
author
#20 lore raw

PATCH 10/10 slang: update upstream URI to (official) jedsoft.org

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-extended/slang/slang_2.2.4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-extended/slang/slang_2.2.4.bb +2 -1
index 5122f53..e33e868 100644
@@ -16,7 +16,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
 
 
-SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
+SRC_URI = "http://www.jedsoft.org/releases/slang/old/slang-${PV}.tar.bz2 \
            file://rpathfix.patch \
            file://fix-check-pcre.patch \
            file://change-char-type-to-signed-char-in-macros.patch \

@@ -24,6 +24,7 @@ SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
            file://slang-fix-the-iconv-existence-checking.patch \
            file://0001-Fix-error-conflicting-types-for-posix_close.patch \
           "
+UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/"
 
 inherit autotools-brokensep
Signature · 1 line
2.6.2