diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl')
9 files changed, 229 insertions, 104 deletions
diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch new file mode 100644 index 000000000..c89822c36 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch @@ -0,0 +1,41 @@ +From 6515f3e7656d97d40a6a1cf4eb3ada193a698309 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 12 Sep 2018 23:18:12 +0800 +Subject: [PATCH] Allow saslauthd to be built outside of source tree while + configuring with `--enable-ldapdb' + +[snip] +| powerpc-wrs-linux-gcc [snip] -I../common +|../../git/saslauthd/lak.c:58:10: fatal error: crypto-compat.h: +No such file or directory +[snip] + +The crypto-compat.h locates in git/common/, it should be | +`-I../../git/common' + +Remove useless `-I$(top_srcdir)/../include' which was incorrectly +added by commit `faae590 cleanup misc INCLUDES for different build paths' + +Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + saslauthd/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am +index d7244be..864b29b 100644 +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -34,7 +34,7 @@ saslcache_SOURCES = saslcache.c + + EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \ + getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD +-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include -I$(top_builddir)/common ++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/common -I$(top_srcdir)/common + DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. + + +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch new file mode 100644 index 000000000..bf232ac27 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch @@ -0,0 +1,95 @@ +From bb693db0e1d1d693e8ca31fcbc4f46d1674eeca1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 13 Sep 2018 14:20:57 +0800 +Subject: [PATCH] makeinit.sh: fix parallel build issue + +While building plugins, each <plugin>.c requires a <plugin>_init.c, +and the <plugin>_init.c is dynamically generated by makeinit.sh. + +But the makeinit.sh generates all *_init.c (13 mechanism plugins, +3 auxprop plugins) at one time, if there are multiple plugins, +there will be multiple makeinit.sh invoking. + +It caused a parallel issue, the *_init.c files will be generated +repeatedly. + +It occasionally generate dapdb_init.c incorrectly +[snip plugins/ldapdb_init.c] +SASL_CANONUSER_PLUG_INIT( ldapdb ) +SASL_CANONUSER_PLUG_INIT( ldapdb ) +SASL_CANONUSER_PLUG_INIT( ldapdb ) +[snip plugins/ldapdb_init.c] + +Let makeinit.sh generate the expected <plugin>_init.c which +is exactly required by <plugin>.c. + +Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/532] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + plugins/Makefile.am | 2 +- + plugins/makeinit.sh | 19 ++++++++++++++----- + 2 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 929f6a4..81e7f0b 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -149,4 +149,4 @@ passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c + CLEANFILES=$(init_src) + + ${init_src}: $(srcdir)/makeinit.sh +- $(SHELL) $(srcdir)/makeinit.sh ++ $(SHELL) $(srcdir)/makeinit.sh $@ +diff --git a/plugins/makeinit.sh b/plugins/makeinit.sh +index cc65f7d..3131877 100644 +--- a/plugins/makeinit.sh ++++ b/plugins/makeinit.sh +@@ -1,7 +1,9 @@ ++plugin_init="$1" + # mechanism plugins + for mech in anonymous crammd5 digestmd5 scram gssapiv2 kerberos4 login ntlm otp passdss plain srp gs2; do ++ if [ ${plugin_init} = "${mech}_init.c" ];then + +-echo " ++ echo " + #include <config.h> + + #include <string.h> +@@ -43,13 +45,16 @@ BOOL APIENTRY DllMain( HANDLE hModule, + + SASL_CLIENT_PLUG_INIT( $mech ) + SASL_SERVER_PLUG_INIT( $mech ) +-" > ${mech}_init.c ++" > ${mech}_init.c ++ echo "generating $1" ++ fi # End of `if [ ${plugin_init} = "${mech}_init.c" ];then' + done + + # auxprop plugins + for auxprop in sasldb sql ldapdb; do ++ if [ ${plugin_init} = "${auxprop}_init.c" ];then + +-echo " ++ echo " + #include <config.h> + + #include <string.h> +@@ -86,8 +91,12 @@ BOOL APIENTRY DllMain( HANDLE hModule, + #endif + + SASL_AUXPROP_PLUG_INIT( $auxprop ) +-" > ${auxprop}_init.c ++" > ${auxprop}_init.c ++ echo "generating $1" ++ fi # End of `if [ ${plugin_init} = "${auxprop}_init.c" ];then' + done + + # ldapdb is also a canon_user plugin +-echo "SASL_CANONUSER_PLUG_INIT( ldapdb )" >> ldapdb_init.c ++if [ ${plugin_init} = "ldapdb_init.c" ];then ++ echo "SASL_CANONUSER_PLUG_INIT( ldapdb )" >> ldapdb_init.c ++fi +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch new file mode 100644 index 000000000..68d09c385 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch @@ -0,0 +1,28 @@ +From 98082f81da1b49876081ff1ab340e952755f985a Mon Sep 17 00:00:00 2001 +From: OBATA Akio <obache@users.noreply.github.com> +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 <raj.khem@gmail.com> +--- + 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" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch index 3fa8431c3..f172362f4 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch @@ -1,25 +1,26 @@ -Fix hardcoded libdir. +From 188ad4497947259811ad32faeee95c20f9a44046 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +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 <rongqing.li@windriver.com> + --- - 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 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch index 6407721ae..aa271b8fb 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch @@ -1,4 +1,7 @@ -Avoid to call AC_TRY_RUN +From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +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 <rongqing.li@windriver.com> + --- - 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 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff deleted file mode 100644 index 8eff5a8bd..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff +++ /dev/null @@ -1,14 +0,0 @@ -Author: Fabian Fagerholm <fabbe@debian.org> -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]] ], diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff index 2e5b1750d..0479acfb0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff @@ -1,27 +1,28 @@ -Author: Fabian Fagerholm <fabbe@debian.org> +From 1a5f3004e9081eab6263a29cd5be792f06441e36 Mon Sep 17 00:00:00 2001 +From: Fabian Fagerholm <fabbe@debian.org> +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) - - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch deleted file mode 100644 index ecbab845d..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 92d72789c811b0d55f624a8bac5ccc4412f5996e Mon Sep 17 00:00:00 2001 -From: Ken Murchison <murch@andrew.cmu.edu> -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 <mark.asselstine@windriver.com> ---- - 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 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index 6dbff87dd..594e55da1 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -1,55 +1,56 @@ SUMMARY = "Generic client/server library for SASL authentication" SECTION = "libs" HOMEPAGE = "http://asg.web.cmu.edu/sasl/" -DEPENDS = "openssl db" +DEPENDS = "openssl db groff-native" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396" -SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \ - file://avoid-to-call-AC_TRY_RUN.patch \ - file://Fix-hardcoded-libdir.patch \ - file://debian_patches_0009_sasldb_al.diff \ - file://debian_patches_0014_avoid_pic_overwrite.diff \ - file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \ - file://saslauthd.service \ - file://saslauthd.conf \ -" +SRCREV = "e41cfb986c1b1935770de554872247453fdbb079" + +SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https \ + file://avoid-to-call-AC_TRY_RUN.patch \ + file://Fix-hardcoded-libdir.patch \ + file://debian_patches_0014_avoid_pic_overwrite.diff \ + file://saslauthd.service \ + file://saslauthd.conf \ + file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \ + file://0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch \ + file://0001-makeinit.sh-fix-parallel-build-issue.patch \ + " + +UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" -inherit autotools-brokensep pkgconfig useradd systemd +S = "${WORKDIR}/git" + +inherit autotools pkgconfig useradd systemd EXTRA_OECONF += "--with-dblib=berkeley \ - --with-bdb-libdir=${STAGING_LIBDIR} \ - --with-bdb-incdir=${STAGING_INCDIR} \ - --with-bdb=db-5.3 \ - --with-plugindir="${libdir}/sasl2" \ + --with-plugindir='${libdir}/sasl2' \ andrew_cv_runpath_switch=none" PACKAGECONFIG ??= "ntlm \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 ldap pam', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," PACKAGECONFIG[des] = "--with-des,--without-des,," PACKAGECONFIG[ldap] = "--with-ldap=${STAGING_LIBDIR} --enable-ldapdb,--without-ldap --disable-ldapdb,openldap," -PACKAGECONFIG[ntlm] = "--with-ntlm,--without-ntlm,," -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[ntlm] = "--enable-ntlm=yes,--enable-ntlm=no,," CFLAGS += "-fPIC" do_configure_prepend () { - rm -f acinclude.m4 config/libtool.m4 - # make it be able to work with db 5.0 version local sed_files="sasldb/db_berkeley.c utils/dbconverter-2.c" for sed_file in $sed_files; do - sed -i 's#DB_VERSION_MAJOR == 4.*#(&) || DB_VERSION_MAJOR == 5#' $sed_file + sed -i 's#DB_VERSION_MAJOR == 4.*#(&) || DB_VERSION_MAJOR == 5#' ${S}/$sed_file done } do_compile_prepend () { cd include - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} makemd5.c -o makemd5 + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} ${S}/include/makemd5.c -o makemd5 touch makemd5.o makemd5.lo makemd5 cd .. } |