jack: Fix build with python 3.7+
PATCH 1/6 jack: Fix build with python 3.7+
Signed-off-by Khem Raj <[email protected]>
--- .../jack/0001-Python-3.7-fixes-2126.patch | 26 +++++++++++++++++++ meta-oe/recipes-multimedia/jack/jack_git.bb | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch
meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 72564b04151b61fa8d954bbb43afc58108ee50ec Mon Sep 17 00:00:00 2001 +From: Thomas Nagy <[email protected]> +Date: Mon, 12 Mar 2018 20:42:55 +0100 +Subject: [PATCH] Python 3.7 fixes #2126 + +Upstream-Status: Backport +[https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c] + +Signed-off-by: Khem Raj <[email protected]> +--- + waflib/Node.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/waflib/Node.py b/waflib/Node.py +index fb3cd273..405a6fec 100644 +--- a/waflib/Node.py ++++ b/waflib/Node.py +@@ -537,8 +537,6 @@ class Node(object): + if maxdepth: + for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove): + yield k +- raise StopIteration +- + def ant_glob(self, *k, **kw): + """ + This method is used for finding files across folders. It behaves like ant patterns:
meta-oe/recipes-multimedia/jack/jack_git.bb +3 -1
@@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git" +SRC_URI = "git://github.com/jackaudio/jack2.git \ + file://0001-Python-3.7-fixes-2126.patch \ + " SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" PV = "1.9.12" S = "${WORKDIR}/git"
Signature · 1 line
2.18.0
PATCH 2/6 libp11: Fix build with openssl 1.1+
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-support/libp11/libp11_0.4.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/libp11/libp11_0.4.7.bb +2 -2
@@ -22,5 +22,5 @@ do_install_append () { rm -rf ${D}${docdir}/${BPN} } -FILES_${PN} += "${libdir}/engines/pkcs11.so" -FILES_${PN}-dev += "${libdir}/engines/libpkcs11${SOLIBSDEV}" +FILES_${PN} += "${libdir}/engines*/pkcs11.so" +FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}"
Signature · 1 line
2.18.0
PATCH 3/6 libgit2: Upgrade to 0.27.4
In reply to Khem RajLicense Update: Added SHA1 module which is under MIT license Upgrade will fix build with openSSL 1.1+
Signed-off-by Khem Raj <[email protected]>
---
.../libgit2/{libgit2_0.24.3.bb => libgit2_0.27.4.bb} | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
rename meta-oe/recipes-support/libgit2/{libgit2_0.24.3.bb => libgit2_0.27.4.bb} (69%)meta-oe/recipes-support/libgit2/libgit2_0.27.4.bb renamed from meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb +5 -4
@@ -1,12 +1,13 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2" +LICENSE = "GPL-2.0-with-GCC-exception & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" DEPENDS = "curl openssl zlib libssh2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.24" -SRCREV = "4cf1ec7cff28da8838a2f0a9fb330e312ea3f963" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.27" +#v0.27.4 +SRCREV = "8b89f362a34fcccdf1c6c5f3445895b71d9c6d56" S = "${WORKDIR}/git"
Signature · 1 line
2.18.0
PATCH 4/6 cyrus-sasl: Update to 2.1.27-rc7
In reply to Khem RajThis update also fixes build failures with openSSL 1.1.x Drop patches which are not required anymore
Backport a proposed patch to fix build on musl
Readjust configure options since some of the options are not available anymore
Signed-off-by Khem Raj <[email protected]>
---
...-condition-for-suppliment-snprintf-i.patch | 28 +++++++++++++
.../cyrus-sasl/Fix-hardcoded-libdir.patch | 21 +++++-----
.../cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch | 31 +++++++-------
.../debian_patches_0009_sasldb_al.diff | 14 -------
...bian_patches_0014_avoid_pic_overwrite.diff | 27 ++++++------
...nclude-stddef.h-for-size_t-on-NetBSD.patch | 31 --------------
...us-sasl_2.1.26.bb => cyrus-sasl_2.1.27.bb} | 42 +++++++++----------
7 files changed, 89 insertions(+), 105 deletions(-)
create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch
delete mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff
delete mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
rename meta-networking/recipes-daemons/cyrus-sasl/{cyrus-sasl_2.1.26.bb => cyrus-sasl_2.1.27.bb} (73%)meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 98082f81da1b49876081ff1ab340e952755f985a Mon Sep 17 00:00:00 2001 +From: OBATA Akio <[email protected]> +Date: Fri, 11 May 2018 18:36:26 +0900 +Subject: [PATCH] configure.ac: fix condition for suppliment snprintf + implementation + +$sasl_cv_snprintf means requremnt of suppliment snprintf +implementation, not existence of system snprintf implementation, + +Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/512] +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ac59f14..9804e98 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1264,7 +1264,7 @@ SNPRINTFOBJS="" + LTSNPRINTFOBJS="" + AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF,[],[Does the system have snprintf()?])], [sasl_cv_snprintf=yes]) + AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF,[],[Does the system have vsnprintf()?])], [sasl_cv_snprintf=yes]) +-if test $sasl_cv_snprintf = no; then ++if test $sasl_cv_snprintf = yes; then + AC_LIBOBJ(snprintf) + SNPRINTFOBJS="snprintf.o" + LTSNPRINTFOBJS="snprintf.lo"
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch +11 -10
@@ -1,25 +1,26 @@ -Fix hardcoded libdir. +From 188ad4497947259811ad32faeee95c20f9a44046 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <[email protected]> +Date: Fri, 19 Jul 2013 14:29:31 +0800 +Subject: [PATCH] Fix hardcoded libdir. -Upstream-Status: Pending +Upstream-Status: Pending Signed-off-by: Roy.Li <[email protected]> + --- - plugins/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + plugins/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index b00915f..25262a1 100644 +index 2b02a52..929f6a4 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am -@@ -62,7 +62,7 @@ plugindir = @plugindir@ +@@ -65,7 +65,7 @@ LIB_MYSQL = @LIB_MYSQL@ - common_sources = plugin_common.c plugin_common.h + plugindir = @plugindir@ -sasldir = $(prefix)/lib/sasl2 +sasldir = $(libdir)/sasl2 sasl_LTLIBRARIES = @SASL_MECHS@ EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ --- -1.7.4.1 -
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch +17 -14
@@ -1,4 +1,7 @@ -Avoid to call AC_TRY_RUN +From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <[email protected]> +Date: Tue, 25 Jun 2013 09:22:59 +0800 +Subject: [PATCH] Avoid to call AC_TRY_RUN Upstream-Status: Inappropriate [configuration]
@@ -6,18 +9,20 @@ Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO on cross-compile environment by definition AC_ARG_ENABLE enable-spnego Signed-off-by: Roy.Li <[email protected]> + --- - cmulocal/sasl2.m4 | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) + m4/sasl2.m4 | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) -diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4 -index 3c2841a..a5ecf81 100644 ---- a/cmulocal/sasl2.m4 -+++ b/cmulocal/sasl2.m4 -@@ -281,6 +281,17 @@ if test "$gssapi" != no; then - +diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 +index 56e0504..cf62607 100644 +--- a/m4/sasl2.m4 ++++ b/m4/sasl2.m4 +@@ -314,7 +314,18 @@ if test "$gssapi" != no; then cmu_save_LIBS="$LIBS" LIBS="$LIBS $GSSAPIBASE_LIBS" + +- AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) + AC_ARG_ENABLE([spnego], + [AC_HELP_STRING([--enable-spnego=<DIR>], + [enable SPNEGO support in GSSAPI libraries [no]])],
@@ -29,10 +34,11 @@ index 3c2841a..a5ecf81 100644 + elif test "$spnego" = yes; then + AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) + else - AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) ++ AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) AC_TRY_RUN([ #ifdef HAVE_GSSAPI_H -@@ -308,7 +319,7 @@ int main(void) + #include <gssapi.h> +@@ -341,7 +352,7 @@ int main(void) AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no)) LIBS="$cmu_save_LIBS"
@@ -41,6 +47,3 @@ index 3c2841a..a5ecf81 100644 else AC_MSG_RESULT([disabled]) fi --- -1.7.10.4 -
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff deleted +0 -14
@@ -1,14 +0,0 @@ -Author: Fabian Fagerholm <[email protected]> -Description: Fix linking with libsasldb.a when saslauthd is built with sasldb -support. ---- a/saslauthd/configure.in -+++ b/saslauthd/configure.in -@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then - AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) - SASL_DB_PATH_CHECK() - SASL_DB_CHECK() -- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" -+ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a" - fi - - AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ],
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff +14 -13
@@ -1,27 +1,28 @@ -Author: Fabian Fagerholm <[email protected]> +From 1a5f3004e9081eab6263a29cd5be792f06441e36 Mon Sep 17 00:00:00 2001 +From: Fabian Fagerholm <[email protected]> +Date: Wed, 24 Jul 2013 11:38:25 -0400 +Subject: [PATCH] cyrus-sasl: Add patches from Debian to fix linking + Description: This patch makes sure the non-PIC version of libsasldb.a, which is created out of non-PIC objects, is not going to overwrite the PIC version, which is created out of PIC objects. The PIC version is placed in .libs, and the non-PIC version in the current directory. This ensures that both non-PIC and PIC versions are available in the correct locations. + +--- + lib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index a158ca3..3137e19 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am -@@ -78,7 +78,7 @@ endif +@@ -99,7 +99,7 @@ endif libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) @echo adding static plugins and dependencies - $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) + $(AR) cru $@ $(SASL_STATIC_OBJS) - @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ + @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ if test ! -f $$i; then continue; fi; . $$i; \ for j in $$dependency_libs foo; do \ ---- a/sasldb/Makefile.am -+++ b/sasldb/Makefile.am -@@ -63,6 +63,6 @@ libsasldb_a_SOURCES = - EXTRA_libsasldb_a_SOURCES = - - libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) -- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) -+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) - -
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 92d72789c811b0d55f624a8bac5ccc4412f5996e Mon Sep 17 00:00:00 2001 -From: Ken Murchison <[email protected]> -Date: Thu, 20 Dec 2012 18:14:50 -0500 -Subject: [PATCH] sasl.h: #include <stddef.h> for size_t on NetBSD - -This patch was imported from git://git.cyrusimap.org/cyrus-sasl -commit 67a188693796a14e3a76ac603104807fbbfddfc4 - -Upstream-Status: Backport - -Signed-off-by: Mark Asselstine <[email protected]> ---- - include/sasl.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/sasl.h b/include/sasl.h -index fef4d51..8b8a63f 100755 ---- a/include/sasl.h -+++ b/include/sasl.h -@@ -121,6 +121,8 @@ - #ifndef SASL_H - #define SASL_H 1 - -+#include <stddef.h> /* For size_t */ -+ - /* Keep in sync with win32/common.mak */ - #define SASL_VERSION_MAJOR 2 - #define SASL_VERSION_MINOR 1 --- -1.8.3.2 -
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb renamed from meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +19 -23
78 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH 5/6 uw-imap_2007f: Depend on openssl10
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +1 -1
@@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a6a4ddbb7cd2999f6827ee143f6fcd97" -DEPENDS = "openssl virtual/crypt" +DEPENDS = "openssl10 virtual/crypt" SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://quote_cctype.patch \
Signature · 1 line
2.18.0
PATCH 6/6 liboauth: Depend on openssl10
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb +1 -1
@@ -7,7 +7,7 @@ LICENSE = "MIT|GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=6266718a5241c045c8099d9be48817df \ file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" SECTION = "libs" -DEPENDS = "curl openssl" +DEPENDS = "curl openssl10" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "689b46c2b3ab1a39735ac33f714c4f7f"
Signature · 1 line
2.18.0