Skip to contentSkip to conversation

upgrades + gnupg.org SRC_URI change

PATCH Superseded Jussi Kukkonen 3 participants 15 messages May 25, 2016 – May 26, 2016 1 message not in the archive

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover upgrades + gnupg.org SRC_URI change

Bunch of unrelated upgrades and an update on everything hosted at gnupg.org: change from using the unreliable and slow FTP site to HTTPS.

- Jussi

The following changes since commit 56ab1a53453525f3200a8c4d1e1963df0e4e8890:

linux-yocto/4.4: integrate v4.4.11 (2016-05-25 07:50:18 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jku/gnupg-mirror-plus-upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gnupg-mirror-plus-upgrades

Jussi Kukkonen (7):
clutter-1.0: Upgrade 1.24.2 -> 1.26.0 clutter-gst-3.0: Upgrade 3.0.16 -> 3.0.18 gtk+: Upgrade 2.24.29 -> 2.24.30
dosfstools: Upgrade 3.0.28 -> 4.0
libevdev: Upgrade 1.4.6 -> 1.5.1 gnupg.org-hosted recipes: Change SRC_URI to https site
libgpg-error: Upgrade 1.21 -> 1.22

 meta/classes/mirrors.bbclass                       |   7 +-
 meta/conf/bitbake.conf                             |   2 +
 .../0001-mkfs.fat-fix-incorrect-int-type.patch     |  46 ---------
 .../dosfstools/dosfstools/largefile.patch          |  19 ----
 .../{dosfstools_3.0.28.bb => dosfstools_4.0.bb}    |  18 ++--
 .../gtk+/{gtk+_2.24.29.bb => gtk+_2.24.30.bb}      |   4 +-
 .../0001-build-Use-AC_COMPILE_IFELSE.patch         | 105 ---------------------
 ...clutter-1.0_1.24.2.bb => clutter-1.0_1.26.0.bb} |   5 +-
 ...gst-3.0_3.0.16.bb => clutter-gst-3.0_3.0.18.bb} |   4 +-
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   2 +-
 meta/recipes-support/gnupg/gnupg_2.1.11.bb         |   2 +-
 meta/recipes-support/gnutls/gnutls.inc             |   2 +-
 meta/recipes-support/gpgme/gpgme_1.6.0.bb          |   2 +-
 meta/recipes-support/libassuan/libassuan_2.4.2.bb  |   2 +-
 .../{libevdev_1.4.6.bb => libevdev_1.5.1.bb}       |   4 +-
 meta/recipes-support/libgcrypt/libgcrypt.inc       |   2 +-
 .../0001-libgpg-error-Add-nios2-support.patch      |  46 ---------
 .../{libgpg-error_1.21.bb => libgpg-error_1.22.bb} |  11 +--
 meta/recipes-support/libksba/libksba_1.3.3.bb      |   2 +-
 meta/recipes-support/npth/npth_1.2.bb              |   2 +-
 meta/recipes-support/pinentry/pinentry_0.9.2.bb    |   2 +-
 21 files changed, 33 insertions(+), 256 deletions(-)
 delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch
 delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/largefile.patch
 rename meta/recipes-devtools/dosfstools/{dosfstools_3.0.28.bb => dosfstools_4.0.bb} (60%)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.29.bb => gtk+_2.24.30.bb} (91%)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch
 rename meta/recipes-graphics/clutter/{clutter-1.0_1.24.2.bb => clutter-1.0_1.26.0.bb} (52%)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.16.bb => clutter-gst-3.0_3.0.18.bb} (58%)
 rename meta/recipes-support/libevdev/{libevdev_1.4.6.bb => libevdev_1.5.1.bb} (74%)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.21.bb => libgpg-error_1.22.bb} (74%)
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/7 clutter-1.0: Upgrade 1.24.2 -> 1.26.0

Remove a backported patch.

---
 .../0001-build-Use-AC_COMPILE_IFELSE.patch         | 105 ---------------------
 ...clutter-1.0_1.24.2.bb => clutter-1.0_1.26.0.bb} |   5 +-
 2 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch
 rename meta/recipes-graphics/clutter/{clutter-1.0_1.24.2.bb => clutter-1.0_1.26.0.bb} (52%)
meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch deleted +0 -105
deleted file mode 100644
index c4edff3..0000000
@@ -1,105 +0,0 @@
-From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <[email protected]>
-Date: Thu, 18 Feb 2016 17:19:09 +0000
-Subject: [PATCH] build: Use AC_COMPILE_IFELSE
-
-Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf.
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <[email protected]>
-
- configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4d72e0c..8ca3f94 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno],
-         # We need to manually check for Wayland support in Cogl because
-         # the windowing systems are not exposed in the pkg-config file
-         saved_CFLAGS="${CFLAGS}"
--        CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`"
-+        CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`"
- 
-         AC_MSG_CHECKING([for Wayland Cogl backend])
--        AC_TRY_COMPILE([#include <cogl/cogl.h>],
--                       [
--                         #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
--                         #error "No Wayland support in Cogl"
--                         #endif
--                         int main (void) { return 0; }
--                       ],
--                       [
--                         AC_MSG_RESULT(yes)
--                         have_cogl_wayland=yes
--                       ],
--                       [
--                         AC_MSG_RESULT(no)
--                         have_cogl_wayland=no
--                       ])
-+
-+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#include <cogl/cogl.h>
-+]],
-+[[
-+#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-+#error Cogl compiled without Wayland support
-+#endif
-+]])], [
-+          AC_MSG_RESULT(yes)
-+          have_cogl_wayland=yes
-+        ], [
-+          AC_MSG_RESULT(no)
-+          have_cogl_wayland=no
-+        ])
-+
-         CFLAGS="${saved_CFLAGS}"
-         AS_IF([test "x$have_cogl_wayland" = xyes],
-               [
-@@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"],
-         # We need to manually check for Mir support in Cogl because
-         # the windowing systems are not exposed in the pkg-config file
-         saved_CFLAGS="${CFLAGS}"
--        CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`"
-+        CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`"
- 
-         AC_MSG_CHECKING([for Mir Cogl backend])
--        AC_TRY_COMPILE([#include <cogl/cogl.h>],
--                       [
--                        #ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
--                        #error "No Mir support in Cogl"
--                        #endif
--                        int main (void) { return 0; }
--                       ],
--                       [
--                         AC_MSG_RESULT(yes)
--                         have_cogl_mir=yes
--                       ],
--                       [
--                         AC_MSG_RESULT(no)
--                         have_cogl_mir=no
--                       ])
- 
--        CFLAGS="${saved_CFLAGS}"
-+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#include <cogl/cogl.h>
-+]],
-+[[
-+#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
-+#error Cogl compiled without Mir support
-+#endif
-+]])], [
-+          AC_MSG_RESULT(yes)
-+          have_cogl_mir=yes
-+        ], [
-+          AC_MSG_RESULT(no)
-+          have_cogl_mir=no
-+        ])
-+
-         AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")])
- 
-         PKG_CHECK_EXISTS([mirclient],
--- 
-1.9.1
-
meta/recipes-graphics/clutter/clutter-1.0_1.26.0.bb renamed from meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb +2 -3
similarity index 52%
rename from meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb
rename to meta/recipes-graphics/clutter/clutter-1.0_1.26.0.bb
index c53b3e7..fba9959 100644
@@ -2,9 +2,8 @@ require clutter-1.0.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI[archive.md5sum] = "3b98e1b33719982a5736ae42cbf7183e"
-SRC_URI[archive.sha256sum] = "9631c98cb4bcbfec15e1bbe9eaa6eef0f127201552fce40d7d28f2133803cd63"
+SRC_URI[archive.md5sum] = "b065e9ca53d1f6bc1ec26aeb27338bb7"
+SRC_URI[archive.sha256sum] = "67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06"
 SRC_URI += "file://install-examples.patch \
             file://run-installed-tests-with-tap-output.patch \
-            file://0001-build-Use-AC_COMPILE_IFELSE.patch \
             file://run-ptest"
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/7 clutter-gst-3.0: Upgrade 3.0.16 -> 3.0.18

---
 .../clutter/{clutter-gst-3.0_3.0.16.bb => clutter-gst-3.0_3.0.18.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.16.bb => clutter-gst-3.0_3.0.18.bb} (58%)
meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.18.bb renamed from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb +2 -2
similarity index 58%
rename from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb
rename to meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.18.bb
index fcf5242..9626cd9 100644
@@ -3,5 +3,5 @@ require clutter-gst-3.0.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
 
-SRC_URI[archive.md5sum] = "ca24eb92a0d34fc9e66fd686a965d51c"
-SRC_URI[archive.sha256sum] = "803e8b7265e63e0581e21fd0c6064792dfe951512e9f515e9e7a9b452caaf9f0"
+SRC_URI[archive.md5sum] = "3e4f64477f26d9cfd2db06d3aaed203a"
+SRC_URI[archive.sha256sum] = "0aec0d0c6020cd19a5bb0dab1165a92748f81a9a3acdfabb0f966d5f53bc8093"
Signature · 1 line
2.1.4
#3 lore raw

PATCH 3/7 gtk+: Upgrade 2.24.29 -> 2.24.30

In reply to Jussi Kukkonen
---
 meta/recipes-gnome/gtk+/{gtk+_2.24.29.bb => gtk+_2.24.30.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.29.bb => gtk+_2.24.30.bb} (91%)
meta/recipes-gnome/gtk+/gtk+_2.24.30.bb renamed from meta/recipes-gnome/gtk+/gtk+_2.24.29.bb +2 -2
similarity index 91%
rename from meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.24.30.bb
index cf55d20..4fe990d 100644
@@ -12,8 +12,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
            file://strict-prototypes.patch \
 	  "
 
-SRC_URI[md5sum] = "1b7a3689f65617387b5b54520f4439e8"
-SRC_URI[sha256sum] = "0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8"
+SRC_URI[md5sum] = "04568ba5c58b75e3c7543e45628ad789"
+SRC_URI[sha256sum] = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50"
 
 EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
 
Signature · 1 line
2.1.4
#4 lore raw

PATCH 4/7 dosfstools: Upgrade 3.0.28 -> 4.0

In reply to Jussi Kukkonen

* Build system is now autotools
* Patches are no longer required

---
 .../0001-mkfs.fat-fix-incorrect-int-type.patch     | 46 ----------------------
 .../dosfstools/dosfstools/largefile.patch          | 19 ---------
 .../{dosfstools_3.0.28.bb => dosfstools_4.0.bb}    | 18 +++------
 3 files changed, 6 insertions(+), 77 deletions(-)
 delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch
 delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/largefile.patch
 rename meta/recipes-devtools/dosfstools/{dosfstools_3.0.28.bb => dosfstools_4.0.bb} (60%)
meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch deleted +0 -46
deleted file mode 100644
index 3497ca5..0000000
@@ -1,46 +0,0 @@
-From 3b95786af13e28157d889bd90a384ee255f2d91d Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-Date: Sun, 16 Aug 2015 15:55:43 +0200
-Subject: [PATCH] mkfs.fat: fix incorrect int type
-
-u_int32_t is not a stanard type, while uint32_t is. This fixes builds
-with the musl C library, which only defines so-called "clean" headers;
-build failures are like (back-quotes and elision manually added for
-readability):
-
-    http://autobuild.buildroot.org/results/a09/a0923d7f6d4dbae02eba4c5024bbdae3a52aa85a/build-end.log
-
-    /home/peko/autobuild/instance-1/output/host/usr/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE \
-        -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64   -Os  -D_GNU_SOURCE -D_LARGEFILE_SOURCE \
-        -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -c -o mkfs.fat.o src/mkfs.fat.c
-    src/mkfs.fat.c: In function 'main':
-    src/mkfs.fat.c:1415:18: error: 'u_int32_t' undeclared (first use in this function)
-         volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); [...]
-                      ^
-    src/mkfs.fat.c:1415:18: note: each undeclared identifier is reported only once for each
-    function it appears in
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-Signed-off-by: Andreas Bombe <[email protected]>
----
-Upstream-Status: Backport
-
- src/mkfs.fat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
-index b38d116..dddbe24 100644
---- a/src/mkfs.fat.c
-+++ b/src/mkfs.fat.c
-@@ -1412,7 +1412,7 @@ int main(int argc, char **argv)
- 
-     gettimeofday(&create_timeval, NULL);
-     create_time = create_timeval.tv_sec;
--    volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);	/* Default volume ID = creation time, fudged for more uniqueness */
-+    volume_id = (uint32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);	/* Default volume ID = creation time, fudged for more uniqueness */
-     check_atari();
- 
-     printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n");
--- 
-2.7.0
-
meta/recipes-devtools/dosfstools/dosfstools/largefile.patch deleted +0 -19
deleted file mode 100644
index 7f7d835..0000000
@@ -1,19 +0,0 @@
-defer setting largefile flags to build makery
-in a cross build we can not do runtime config tests
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Inappropriate[Cross compile Specific]
-Index: dosfstools-3.0.28/Makefile
-===================================================================
---- dosfstools-3.0.28.orig/Makefile
-+++ dosfstools-3.0.28/Makefile
-@@ -27,8 +27,7 @@ SBINDIR = $(PREFIX)/sbin
- DOCDIR = $(PREFIX)/share/doc
- MANDIR = $(PREFIX)/share/man
- 
--#OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--OPTFLAGS = -O2 -fomit-frame-pointer -D_GNU_SOURCE $(shell getconf LFS_CFLAGS)
-+OPTFLAGS = -O2 -fomit-frame-pointer
- #WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings
- DEBUGFLAGS = -g
meta/recipes-devtools/dosfstools/dosfstools_4.0.bb renamed from meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb +6 -12
similarity index 60%
rename from meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
rename to meta/recipes-devtools/dosfstools/dosfstools_4.0.bb
index 6fc3e41..f7e472b 100644
@@ -9,23 +9,17 @@ SECTION = "base"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v3.0.28/dosfstools-3.0.28.tar.xz \
-           file://largefile.patch \
-           file://0001-mkfs.fat-fix-incorrect-int-type.patch \
+SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.xz \
           "
-SRC_URI[md5sum] = "6a047a6c65186b9ebb1853709adb36db"
-SRC_URI[sha256sum] = "ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2"
+SRC_URI[md5sum] = "20f8388b99702f276c973d228c7cff45"
+SRC_URI[sha256sum] = "9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf"
 
 UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases"
 
-CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}"
+inherit autotools pkgconfig
 
-FILES_${PN} = "${base_sbindir}"
-FILES_${PN}-doc = "${mandir} ${docdir}"
+EXTRA_OECONF = "--without-udev"
 
-do_install () {
-	oe_runmake "PREFIX=${D}${prefix}" "SBINDIR=${D}${base_sbindir}" \
-		   "MANDIR=${D}${mandir}" "DOCDIR=${D}${docdir}" install
-}
+CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.1.4
#5 lore raw

PATCH 5/7 libevdev: Upgrade 1.4.6 -> 1.5.1

In reply to Jussi Kukkonen
---
 .../recipes-support/libevdev/{libevdev_1.4.6.bb => libevdev_1.5.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libevdev/{libevdev_1.4.6.bb => libevdev_1.5.1.bb} (74%)
meta/recipes-support/libevdev/libevdev_1.5.1.bb renamed from meta/recipes-support/libevdev/libevdev_1.4.6.bb +2 -2
similarity index 74%
rename from meta/recipes-support/libevdev/libevdev_1.4.6.bb
rename to meta/recipes-support/libevdev/libevdev_1.5.1.bb
index c8163e3..8d6d340 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \
 
 SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"
 
-SRC_URI[md5sum] = "9b3f25bd8fb0f8efa4944d34668dddc0"
-SRC_URI[sha256sum] = "7b2ae1a0c7f9f7a96198ddc8fd167f090f233d6cbd8168b847e4f968445132d3"
+SRC_URI[md5sum] = "c8a85eef889754bb77282554b6761873"
+SRC_URI[sha256sum] = "17630821a57e6e3f02e01ade836f24068df9bd530067091152b0d468c3a86f40"
 
 inherit autotools pkgconfig
Signature · 1 line
2.1.4
#6 lore raw

PATCH 6/7 gnupg.org-hosted recipes: Change SRC_URI to https site

In reply to Jussi Kukkonen

https version seems more reliable and in an informal test fetching all gnupg recipes now takes <20% of the time it used to.

Define GNUPG_MIRROR in bitbake.conf so future tweaks to this are easier. Replace some slower mirrors with the official ftp site and another from gnupg.org mirror list.

Change gnutls to use GNUPG_MIRROR as well: they have their own domain but the ftp site is the slow, unreliable gnupg.org one.

---
 meta/classes/mirrors.bbclass                           | 7 +++----
 meta/conf/bitbake.conf                                 | 2 ++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb              | 2 +-
 meta/recipes-support/gnupg/gnupg_2.1.11.bb             | 2 +-
 meta/recipes-support/gnutls/gnutls.inc                 | 2 +-
 meta/recipes-support/gpgme/gpgme_1.6.0.bb              | 2 +-
 meta/recipes-support/libassuan/libassuan_2.4.2.bb      | 2 +-
 meta/recipes-support/libgcrypt/libgcrypt.inc           | 2 +-
 meta/recipes-support/libgpg-error/libgpg-error_1.21.bb | 2 +-
 meta/recipes-support/libksba/libksba_1.3.3.bb          | 2 +-
 meta/recipes-support/npth/npth_1.2.bb                  | 2 +-
 meta/recipes-support/pinentry/pinentry_0.9.2.bb        | 2 +-
 12 files changed, 15 insertions(+), 14 deletions(-)
meta/classes/mirrors.bbclass +3 -4
index 9e6d483..773d0bb 100644
@@ -21,13 +21,12 @@ ${DEBIAN_MIRROR}	ftp://ftp.se.debian.org/debian/pool \n \
 ${DEBIAN_MIRROR}	ftp://ftp.tr.debian.org/debian/pool \n \
 ${GNU_MIRROR}	ftp://mirrors.kernel.org/gnu \n \
 ${KERNELORG_MIRROR}	http://www.kernel.org/pub \n \
-ftp://ftp.gnupg.org/gcrypt/     ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ \n \
-ftp://ftp.gnupg.org/gcrypt/     ftp://ftp.surfnet.nl/pub/security/gnupg/ \n \
-ftp://ftp.gnupg.org/gcrypt/     http://gulus.USherbrooke.ca/pub/appl/GnuPG/ \n \
+${GNUPG_MIRROR}	ftp://ftp.gnupg.org/gcrypt \n \
+${GNUPG_MIRROR}	ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt \n \
+${GNUPG_MIRROR}	ftp://mirrors.dotsrc.org/gcrypt \n \
 ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \
 ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \
 ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \
-ftp://ftp.gnutls.org/gcrypt/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \
 http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \
 http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \
meta/conf/bitbake.conf +2 -0
index acef30b..942b8b1 100644
@@ -583,6 +583,7 @@ GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
 GNOME_GIT = "git://git.gnome.org"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 GNU_MIRROR = "http://ftp.gnu.org/gnu"
+GNUPG_MIRROR = "https://www.gnupg.org/ftp/gcrypt"
 GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
 KERNELORG_MIRROR = "http://kernel.org/pub"
 SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net"
@@ -600,6 +601,7 @@ SRC_URI[vardepsexclude] += "\
     GNOME_GIT \
     GNOME_MIRROR \
     GNU_MIRROR \
+    GNUPG_MIRROR \
     GPE_MIRROR \
     KERNELORG_MIRROR \
     SAVANNAH_GNU_MIRROR \
meta/recipes-support/gnupg/gnupg_1.4.7.bb +1 -1
index b4ccbfe..6ccffd5 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
 PR = "r9"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
            file://configure.patch \
            file://mips_gcc4.4.patch \
meta/recipes-support/gnupg/gnupg_2.1.11.bb +1 -1
index 8e2189b..0e2ba98 100644
@@ -8,7 +8,7 @@ DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt"
 
 inherit autotools gettext texinfo pkgconfig
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://use-pkgconfig-instead-of-npth-config.patch \
            file://dirmngr-uses-libgpg-error.patch \
meta/recipes-support/gnutls/gnutls.inc +1 -1
index e7c91eb..1016407 100644
@@ -16,7 +16,7 @@ DEPENDS_append_libc-musl = " argp-standalone"
 
 SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
 
-SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
+SRC_URI = "${GNUPG_MIRROR}/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
 
 inherit autotools texinfo binconfig pkgconfig gettext lib_package
 
meta/recipes-support/gpgme/gpgme_1.6.0.bb +1 -1
index 86eda23..29c77b7 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \
                     file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
            file://gpgme.pc \
            file://pkgconfig.patch \
           "
meta/recipes-support/libassuan/libassuan_2.4.2.bb +1 -1
index f376d63..e38f5af 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
 
 DEPENDS = "libgpg-error"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
 	   file://libassuan-add-pkgconfig-support.patch"
 
 SRC_URI[md5sum] = "70151995c2330ae1261c0a7ca34cf478"
meta/recipes-support/libgcrypt/libgcrypt.inc +1 -1
index 5478253..a1e3af5 100644
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 DEPENDS = "libgpg-error libcap"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
+SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
            file://add-pkgconfig-support.patch \
            file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
            file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
meta/recipes-support/libgpg-error/libgpg-error_1.21.bb +1 -1
index 0dd1602..9755b07 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 SECTION = "libs"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
 	   file://0001-libgpg-error-Add-nios2-support.patch \
 	  "
meta/recipes-support/libksba/libksba_1.3.3.bb +1 -1
index bc21164..4967cca 100644
@@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ksba-config"
 
 inherit autotools binconfig-disabled pkgconfig texinfo
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://ksba-add-pkgconfig-support.patch"
 
 SRC_URI[md5sum] = "a5dd3c57fca254935f5cf8db26e39065"
meta/recipes-support/npth/npth_1.2.bb +1 -1
index 1b3962e..b917b94 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\
     file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
     file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\
     "
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
            file://pkgconfig.patch \
           "
 
meta/recipes-support/pinentry/pinentry_0.9.2.bb +1 -1
index d6b7130..56e6289 100644
@@ -12,7 +12,7 @@ inherit autotools
 
 DEPENDS = "gettext-native"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278"
 SRC_URI[sha256sum] = "fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1"
Signature · 1 line
2.1.4
#15 lore raw

PATCH 7/7 libgpg-error: Upgrade 1.21 -> 1.22

In reply to Jussi Kukkonen

License checksum changes are not license changes.
Remove a patch that's in upstream now.

---
 .../0001-libgpg-error-Add-nios2-support.patch      | 46 ----------------------
 .../{libgpg-error_1.21.bb => libgpg-error_1.22.bb} |  9 ++---
 2 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.21.bb => libgpg-error_1.22.bb} (78%)
meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch deleted +0 -46
deleted file mode 100644
index dab1c13..0000000
@@ -1,46 +0,0 @@
-From b2af652f43991e4ce6297917da542a9eb5135939 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <[email protected]>
-Date: Thu, 17 Sep 2015 03:28:06 +0200
-Subject: [PATCH] libgpg-error: Add nios2 support
-
-Add configuration for the NIOS2 processor.
-
-Signed-off-by: Marek Vasut <[email protected]>
-Upstream-Status: Submitted
----
- src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100644 src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h
-
-diff --git a/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h
-new file mode 100644
-index 0000000..3a24571
---- /dev/null
-+++ b/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h
-@@ -0,0 +1,23 @@
-+## lock-obj-pub.nios2-unknown-linux-gnu.h
-+## File created by gen-posix-lock-obj - DO NOT EDIT
-+## To be included by mkheader into gpg-error.h
-+
-+typedef struct
-+{
-+  long _vers;
-+  union {
-+    volatile char _priv[24];
-+    long _x_align;
-+    long *_xp_align;
-+  } u;
-+} gpgrt_lock_t;
-+
-+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
-+                                    0,0,0,0,0,0,0,0, \
-+                                    0,0,0,0,0,0,0,0}}}
-+##
-+## Local Variables:
-+## mode: c
-+## buffer-read-only: t
-+## End:
-+##
--- 
-2.5.1
-
meta/recipes-support/libgpg-error/libgpg-error_1.22.bb renamed from meta/recipes-support/libgpg-error/libgpg-error_1.21.bb +4 -5
similarity index 78%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.21.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.22.bb
index 9755b07..c58744f 100644
@@ -5,18 +5,17 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/gpg-error.h.in;endline=23;md5=93d3155af141ae3b369a5d09ca9d6234 \
-                    file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe"
+                    file://src/gpg-error.h.in;endline=23;md5=cf562f60b9dba7df20d6ee3f97ea1d5a \
+                    file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc"
 
 
 SECTION = "libs"
 
 SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch \
-	   file://0001-libgpg-error-Add-nios2-support.patch \
 	  "
-SRC_URI[md5sum] = "ab0b5aba6d0a185b41d07bda804fd8b2"
-SRC_URI[sha256sum] = "b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d"
+SRC_URI[md5sum] = "83c686abe3fa223ec89f3b51da830770"
+SRC_URI[sha256sum] = "f2a04ee6317bdb41a625bea23fdc7f0b5a63fb677f02447c647ed61fb9e69d7b"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
Signature · 1 line
2.1.4
#9 lore raw

Re: [PATCH 6/7] gnupg.org-hosted recipes: Change SRC_URI to https site

Quoted 6 lines · On 25 May 2016 at 17:42, <[email protected]> wrote:
Quoted 2 lines

Change gnutls to use GNUPG_MIRROR as well: they have their own domain but the ftp site is the slow, unreliable gnupg.org one.

Doesn't work for gnutls I'm afraid:

https://www.gnupg.org/ftp/gcrypt/gnutls/v3.4/

The tarball fetch works which I think is the important bit, they've just forgotten to either allow directory listing or generate a index.html for directories that deep. I've filed a bug
(https://bugs.gnupg.org/gnupg/issue2369).

I could add a UPSTREAM_CHECK_URI for the ftp site... except I can't actually test that since the server has not really responded to me in days (apparently a known issue for the gupnp.org people).

I'll see about using http://gnutls.org/download.html page for that but in my opinion the patch is a clear improvement as it is...

Jussi

#10 lore raw

Re: [PATCH 6/7] gnupg.org-hosted recipes: Change SRC_URI to https site

Quoted 3 lines

I could add a UPSTREAM_CHECK_URI for the ftp site... except I can't actually test that since the server has not really responded to me in days (apparently a known issue for the gupnp.org people).

Can you say which URL you cannot open? Everything works for me both behind and outside of proxy, and the RRS server is reporting upstream versions correctly as well:
http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/

Quoted 2 lines

I'll see about using http://gnutls.org/download.html page for that but in my opinion the patch is a clear improvement as it is...

You can't use http://gnutls.org/download.html because it doesn't have the latest version anywhere on it.

And https://www.gnupg.org/ftp/gcrypt/gnutls/index.html has another issue:
it's out of date and doesn't have v3.5 directory listed at all, even though it's there (visible via ftp and linked to from the downloads page). How can you be sure that other index.html files aren't similarly out of date? We should stick to the ftp directory listings for upstream checks until the upstream sorts this. I'm not sure if the patch should be held off altogether, or fixed so that the upstream check uri explicitly points to ftp for each affected recipe.

Alex

#11 lore raw

Re: [PATCH 6/7] gnupg.org-hosted recipes: Change SRC_URI to https site

Quoted 5 lines

How can you be sure that other index.html files aren't similarly out of date? We should stick to the ftp directory listings for upstream checks until the upstream sorts this. I'm not sure if the patch should be held off altogether, or fixed so that the upstream check uri explicitly points to ftp for each affected recipe.

Right, here's another out of date index.html, so they simply cannot be relied on:
https://www.gnupg.org/ftp/gcrypt/pinentry/

I think we can solve this, if for everything except gnutls, upstream check uri is set to
https://www.gnupg.org/download/index.html
(perhaps via a class).

For gnutls, it should still be set to the ftp:
ftp://ftp.gnutls.org/gcrypt/gnutls/

Alex

#12 lore raw

Re: [PATCH 6/7] gnupg.org-hosted recipes: Change SRC_URI to https site

Quoted 7 lines · On 26 May 2016 at 12:56, <[email protected]> wrote:
Quoted 5 lines

How can you be sure that other index.html files aren't similarly out of date? We should stick to the ftp directory listings for upstream checks until the upstream sorts this. I'm not sure if the patch should be held off altogether, or fixed so that the upstream check uri explicitly points to ftp for each affected recipe.

Quoted 8 lines

Right, here's another out of date index.html, so they simply cannot be relied on:
https://www.gnupg.org/ftp/gcrypt/pinentry/

I think we can solve this, if for everything except gnutls, upstream check uri is set to
https://www.gnupg.org/download/index.html
(perhaps via a class).

Thanks, that looks like a good option. I'll just add UPSTREAM_CHECK_URI in each recipe.

Quoted 2 lines

For gnutls, it should still be set to the ftp:
ftp://ftp.gnutls.org/gcrypt/gnutls/

I'll leave gnutls changes out of V2: let's revisit that if they ever fix the webserver.

Jussi

#13 lore raw

Re: [PATCH 6/7] gnupg.org-hosted recipes: Change SRC_URI to https site

In reply to Jussi Kukkonen
Quoted 12 lines · Jussi Kukkonen

https version seems more reliable and in an informal test fetching all gnupg recipes now takes <20% of the time it used to.

Define GNUPG_MIRROR in bitbake.conf so future tweaks to this are easier. Replace some slower mirrors with the official ftp site and another from gnupg.org mirror list.

Change gnutls to use GNUPG_MIRROR as well: they have their own domain but the ftp site is the slow, unreliable gnupg.org one.

---

...

meta/recipes-support/gnupg/gnupg_1.4.7.bb LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" · line 12

Quoted 2 lines
meta/recipes-support/gnupg/gnupg_1.4.7.bb +1 -1
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \

I'm not fond of having variables like these, since it makes the URL in the recipe harder to work with and interpret. Maybe not a deal breaker, but we already have PREMIRRORS, which can be used instead of variable indirection. A similar patch, almost a year ago, was rejected.

http://lists.openembedded.org/pipermail/openembedded-core/2015-July/108217.html

Signature · 1 line
olofjn
#14 lore raw

Re: [PATCH 6/7] gnupg.org-hosted recipes: Change SRC_URI to https site

Quoted 14 lines · Olof Johansson
Quoted 12 lines · Jussi Kukkonen

https version seems more reliable and in an informal test fetching all gnupg recipes now takes <20% of the time it used to.

Define GNUPG_MIRROR in bitbake.conf so future tweaks to this are easier. Replace some slower mirrors with the official ftp site and another from gnupg.org mirror list.

Change gnutls to use GNUPG_MIRROR as well: they have their own domain but the ftp site is the slow, unreliable gnupg.org one.

---

...

Quoted 8 lines

meta/recipes-support/gnupg/gnupg_1.4.7.bb LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" · line 12

Quoted 2 lines
meta/recipes-support/gnupg/gnupg_1.4.7.bb +1 -1
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
+SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \

I'm not fond of having variables like these, since it makes the URL in the recipe harder to work with and interpret. Maybe not a deal breaker, but we already have PREMIRRORS, which can be used instead of variable indirection. A similar patch, almost a year ago, was rejected.

I'm not attached to the variable, I'll change those to plain URLs if that's preferred.

Jussi

Quoted 4 lines

http://lists.openembedded.org/pipermail/openembedded-core/2015-July/108217.html

--
olofjn