From patchwork Fri Mar 31 15:47:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 22040 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6E9FC76196 for ; Fri, 31 Mar 2023 15:47:29 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.58725.1680277647729919659 for ; Fri, 31 Mar 2023 08:47:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CLtfiZ4+; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id e15-20020a17090ac20f00b0023d1b009f52so25823360pjt.2 for ; Fri, 31 Mar 2023 08:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680277647; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0FLRefZgeD/75TJbLnwRMDXgUYVbsM+X1WiV8iUvu9o=; b=CLtfiZ4+DCXw2Q3AGloHUVEFXoqmS0cBEMUMEZ8PoVgpc+KN9e6oD2AcEjGF7Lj897 EKe1rhBXybrNkZMddAhXveCLfaslb8QphzgBhbOOLbvYU/O8yLVB1YMgbkmXQEMRYtxg Ci3jjjb7ynRIU/blAU1rIRQiMqDdVAjzw8SU6VSmTi/APYrdHBmfXN327CXCI/+L1hGq EwRDsFxza/vCXUJZG3+y1i+uccyq3lhXk2EbZRAnLZ2Bgy6GktTyHKlAlSTA/KujxB5Q tBXC4Nrp9B8V63m1+7694ZfowSAdBhpsUirlesLshUfT8reaupAch3DPYSd0aWycwFpm 2ErQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680277647; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0FLRefZgeD/75TJbLnwRMDXgUYVbsM+X1WiV8iUvu9o=; b=FYqQUFnyrcgIeojFb2vFjWCezdhN3gk94Il6xe9p5FzWrBpggZMfci62nbcscwHqhd rWQ2biE5cPquzfFl14tuJ/B9I4P8EMO633LncKw+BPXO9TnW71GtAT+EqhodNYg+vrtA UgXbRa75+FpN/AjbgVBI91YpSs8FvJW0lzrmPnIk70flbfDkgkO/TgsCMSlVXuhH6mIG u3ir7m0w/xL62fF7BWfdcsJ2f7PMx5p30HR9H3+KTlOpu6SZ4v2mJpUIoB21b0TviA39 RhRV84/z5vjPVCktMCC6DdYNVmsqggl4W1LILWa3Cidylr2e0I1A94QQn7qKTkh5Okvh l5uA== X-Gm-Message-State: AAQBX9fNLX56cSOJ4HLHcOG9qHqwjJ/uWA3E1HVPRbL16hKzPJh2EiY0 wI9FZRSrxBmnJNnHoeup8SEHHjsIr797IQ== X-Google-Smtp-Source: AKy350YLOgROFGJ1qvqXyGCWhhVCEiPDwLXiWveJA+GjUTK2xv5GvpzqxMvNMhOVx5Gq9XHoWLxZMA== X-Received: by 2002:a17:90b:4c45:b0:23d:35d9:d065 with SMTP id np5-20020a17090b4c4500b0023d35d9d065mr27851146pjb.48.1680277646750; Fri, 31 Mar 2023 08:47:26 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::bed3]) by smtp.gmail.com with ESMTPSA id u18-20020a17090adb5200b00233d6547000sm1624567pjx.54.2023.03.31.08.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 08:47:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/4] krb5: Fix build with autoconf 2.72 Date: Fri, 31 Mar 2023 08:47:21 -0700 Message-Id: <20230331154724.1302078-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 31 Mar 2023 15:47:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101858 Fixes checking for IPv6 compile-time support without -DINET6... ./configure: line 10004: syntax error near unexpected token `;;' Signed-off-by: Khem Raj --- ...al.m4-syntax-error-for-autoconf-2.72.patch | 40 +++++++++++++++++++ .../recipes-connectivity/krb5/krb5_1.20.1.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch new file mode 100644 index 0000000000..9d0b066b10 --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch @@ -0,0 +1,40 @@ +From 0aa127afa52fd265a4f1bbded1623201390ae96a Mon Sep 17 00:00:00 2001 +From: Julien Rische +Date: Thu, 17 Nov 2022 15:01:24 +0100 +Subject: [PATCH] Fix aclocal.m4 syntax error for autoconf 2.72 + +An incorrect closure inside KRB5_AC_INET6 is innocuous with autoconf +versions up to 2.71, but will cause an error at configure time with +the forthcoming autoconf 2.72. + +[ghudson@mit.edu: added more context to commit message] + +ticket: 9077 (new) +tags: pullup +target_version: 1.20-next +target_version: 1.19-next + +Upstream-Status: Backport [https://github.com/krb5/krb5/commit/d864d740d019fdf2c640460f2aa2760c7fa4d5e9] +Signed-off-by: Khem Raj +--- + src/aclocal.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/aclocal.m4 b/src/aclocal.m4 +index 9920476..3d66a87 100644 +--- a/src/aclocal.m4 ++++ b/src/aclocal.m4 +@@ -409,8 +409,8 @@ else + [[struct sockaddr_in6 in; + AF_INET6; + IN6_IS_ADDR_LINKLOCAL(&in.sin6_addr);]])], +- [krb5_cv_inet6=yes], [krb5_cv_inet6=no])]) +-fi ++ [krb5_cv_inet6=yes], [krb5_cv_inet6=no]) ++fi]) + AC_MSG_RESULT($krb5_cv_inet6) + if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then + AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6) +-- +2.40.0 + diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb index 6fc630d99a..10fff11c25 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb @@ -22,6 +22,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ file://crosscompile_nm.patch \ + file://0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch;striplevel=2 \ file://etc/init.d/krb5-kdc \ file://etc/init.d/krb5-admin-server \ file://etc/default/krb5-kdc \ From patchwork Fri Mar 31 15:47:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 22042 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6EE3C761AF for ; Fri, 31 Mar 2023 15:47:29 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.58626.1680277648471471086 for ; Fri, 31 Mar 2023 08:47:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Qa2wYJy5; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id le6so21586999plb.12 for ; Fri, 31 Mar 2023 08:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680277647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=38kr+Ytsc6Fze/dP6FHbo5xFbaT07rQKUslgOapSXZE=; b=Qa2wYJy5Z4iiUsb/ZwzI+y/ZtKdeWbF1yCwBxnTtmHfCvqE/SCnd53RG0JI6yOj9k6 9bGXcKxNs8X580UXVC9IoBQ1UyXnrGhYwtmTk8Drpj1bmb4cDpuxCTUD3h470IX8cqK8 Ehy7Hwn9Pvq7TuieoqQJQWDvzqCTAl2zMs9G9cxvQGChHEE3hqBGjyMXgCoIbEBr93gV 2L91+FWPdypeKcdi5hH/lrutcdSa8j7Col7YIx15kWnPk35xWuvMWrkeJidVTPquyEip 6stppZbxrcILUv/gKp7/4MCyNkP2rkfzkrEFqnL7ywlR0MWfW/H662CvIh/xi+9580wD 97mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680277647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=38kr+Ytsc6Fze/dP6FHbo5xFbaT07rQKUslgOapSXZE=; b=fmykHtJ+gIcIPxmehFI7Gfe76XSnenVvsj7qgK40QeTeSVA5wwW3/Q0pWgAzX/JKd+ UKcGkIwbs41ta0j62VEwpWhkUxSgwn6fnpVkZEs8n2PKVKvIwk9d7Bf0eUawWIXbvSEi XHSVsGbWKVeui0t+2srJ5UmupxaDZ1Y/vaWzgp6QptN2PDkkk6QgNVArIkQ7iR6vIv4z HAyKkWlc+/QvbCAJhm+GCm05zbjz6TcNzaPziBwLELvkFM6QDfT1wYxyLT74GPlDsi/h LZLBm9gK9V27LlW13zv6S7YO/JkQi6p1mw6HDji0Hd6NT9KfsV4ouFb/r4qtDJyQmYQt OnEg== X-Gm-Message-State: AO0yUKUwqnze0TkSi6LX5Jn+cMgn4b0GxqEuNT9zW6ODyBYHOr884zS6 xrOpzxop3XiXRaparMZGhBicGf9RSZbaDw== X-Google-Smtp-Source: AK7set+c1MMg/6r2/RQxESmmgtqIlhJcr1RTpB705pqhXSnawCgU8I8pEXOOPVETKXsnEWs2xBYVMQ== X-Received: by 2002:a17:90a:9485:b0:23c:feb9:2cea with SMTP id s5-20020a17090a948500b0023cfeb92ceamr31277039pjo.42.1680277647425; Fri, 31 Mar 2023 08:47:27 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::bed3]) by smtp.gmail.com with ESMTPSA id u18-20020a17090adb5200b00233d6547000sm1624567pjx.54.2023.03.31.08.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 08:47:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/4] cyrus-sasl: Fix autoconf patch to work with new autoconf 2.72 Date: Fri, 31 Mar 2023 08:47:22 -0700 Message-Id: <20230331154724.1302078-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331154724.1302078-1-raj.khem@gmail.com> References: <20230331154724.1302078-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 31 Mar 2023 15:47:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101859 Signed-off-by: Khem Raj --- .../cyrus-sasl/0001-Fix-time.h-check.patch | 9 +-- .../cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch | 73 ++++++++----------- 2 files changed, 32 insertions(+), 50 deletions(-) diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch index a6df213fee..3b7054a799 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch @@ -28,11 +28,9 @@ Signed-off-by: Sam James plugins/cram.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index e1bf53b6..ad781830 100644 --- a/configure.ac +++ b/configure.ac -@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) +@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) AC_HEADER_DIRENT AC_HEADER_SYS_WAIT @@ -41,8 +39,6 @@ index e1bf53b6..ad781830 100644 IPv6_CHECK_SS_FAMILY() IPv6_CHECK_SA_LEN() -diff --git a/plugins/cram.c b/plugins/cram.c -index d02e9baa..695aaa91 100644 --- a/plugins/cram.c +++ b/plugins/cram.c @@ -53,6 +53,10 @@ @@ -56,6 +52,3 @@ index d02e9baa..695aaa91 100644 #include #include #include --- -2.37.3 - diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch index 1e6f99603c..308d88204f 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch @@ -1,50 +1,39 @@ -From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001 -From: "Roy.Li" -Date: Tue, 25 Jun 2013 09:22:59 +0800 -Subject: [PATCH] Avoid to call AC_TRY_RUN +Remove AC_TRY_RUN -Upstream-Status: Inappropriate [configuration] +It can not be run during cross compile -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 ---- - m4/sasl2.m4 | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 -index 80371ef..ff70083 100644 +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj --- a/m4/sasl2.m4 +++ b/m4/sasl2.m4 -@@ -316,6 +316,18 @@ if test "$gssapi" != no; then +@@ -316,28 +316,8 @@ if test "$gssapi" != no; then AC_CACHE_CHECK([for SPNEGO support in GSSAPI libraries],[ac_cv_gssapi_supports_spnego],[ cmu_save_LIBS="$LIBS" LIBS="$LIBS $GSSAPIBASE_LIBS" -+ AC_ARG_ENABLE([spnego], -+ [AC_HELP_STRING([--enable-spnego=], -+ [enable SPNEGO support in GSSAPI libraries [no]])], -+ [spnego=$enableval], -+ [spnego=no]) -+ -+ if test "$spnego" = no; then -+ echo "no" -+ 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_TRY_RUN([ - #ifdef HAVE_GSSAPI_H - #include -@@ -343,7 +355,7 @@ int main(void) - AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ - AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) - ]) +- AC_TRY_RUN([ +-#ifdef HAVE_GSSAPI_H +-#include +-#else +-#include +-#endif - -+ fi - else - AC_MSG_RESULT([disabled]) - fi --- -2.25.1 - +-int main(void) +-{ +- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; +- gss_OID_set mech_set; +- OM_uint32 min_stat; +- int have_spnego = 0; +- +- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) { +- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego); +- gss_release_oid_set(&min_stat, &mech_set); +- } +- +- return (!have_spnego); // 0 = success, 1 = failure +-} +-],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no]) ++ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) ++ AC_MSG_RESULT(yes) + LIBS="$cmu_save_LIBS" + ]) + AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ From patchwork Fri Mar 31 15:47:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 22041 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE791C761A6 for ; Fri, 31 Mar 2023 15:47:29 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.58627.1680277649014955079 for ; Fri, 31 Mar 2023 08:47:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gC8PGNRS; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id l9-20020a17090a3f0900b0023d32684e7fso8663365pjc.1 for ; Fri, 31 Mar 2023 08:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680277648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/2jFMBE6Tzlqj2chkRJZhoHiojsV58Z5t28vSJ8Lp/4=; b=gC8PGNRSjA8InVzC5MFNCqB22BbHazTKWIvXgTOiz4w84CsAqwjD6vb7ozEFeiqO8q ONP2q0hSr2rlH5yriDBIT/iRqdNdDCxha79mFGuMA/sUVz6AdYRx0PSFnwx+O5V/L4AM CSDv3dRFPifLaG1SFmX5Blrk9Mv6/l5M0SLBhiU2JaW11bSGvnU+5D3FOHUa5grGyWWB ys33OI95m+IxlfNuQPAkvG5oU3q7b+HU98MD5f7Uw/9nXSWCx1VSJ54/nzHOn78gbtvr B8+SYnm5Yl6nOWRrkGt8lBMg98q/bPswGKg0VC80RsLX7CwLq7T9soSgda9WczG0l3BW 5dFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680277648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/2jFMBE6Tzlqj2chkRJZhoHiojsV58Z5t28vSJ8Lp/4=; b=Mo2wVZUQrN+3lXB9hEos25MCZ93GgUqFW/nEt485uxxEntpztbMfDt+rnCxesNE+1U q97rznTa97b30TlZcxVFGNebpZWbeJOtvrLE6TB9KXky5/z/tm7mB2eKzHJ/15UjOiRw g/iGCDfdvjCMXFKQnDp9wMi0XixmGSN26DX/IhOPsI+PefWGOuuAuoLTJmFjUiEBdnC+ rEPkSmIkmHePAWnjSvDzxMiBs1U+ZY5+k322NGbXytkLkZXE/HL6sl4HW6ECSWKcI8O5 hrB4sUuAggkYwRfUdvHsHZ6Lc3z0EksoHjnhbe1zPYsBglKDEHUyK9lGRu7vOyIsB4hh DZqA== X-Gm-Message-State: AAQBX9fWKTvMYt94Jx4E4iuB1NaUa19NJeXd3YALJt0h1CJtvUbwNl/R NX4eIjxnF8ZsmQ1+zMQrO9vsy+oQ24EUWw== X-Google-Smtp-Source: AKy350YN1prz7e9DQQXtVfh6EGhI7gzq12cWJqR/UUiQeErTtvyYqoO3OEwfoFQXV3b1tatIbe/1yQ== X-Received: by 2002:a17:90b:4d12:b0:23d:c49:3875 with SMTP id mw18-20020a17090b4d1200b0023d0c493875mr32671944pjb.33.1680277648157; Fri, 31 Mar 2023 08:47:28 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::bed3]) by smtp.gmail.com with ESMTPSA id u18-20020a17090adb5200b00233d6547000sm1624567pjx.54.2023.03.31.08.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 08:47:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/4] gmime: Update to 3.2.13 Date: Fri, 31 Mar 2023 08:47:23 -0700 Message-Id: <20230331154724.1302078-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331154724.1302078-1-raj.khem@gmail.com> References: <20230331154724.1302078-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 31 Mar 2023 15:47:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101860 - Drop nodolt.patch patch its applied upstream - Enable largefile and set ac_cv_sys_file_offset_bits=64 Signed-off-by: Khem Raj --- meta-oe/recipes-gnome/gmime/gmime/nodolt.patch | 10 ---------- .../gmime/{gmime_3.2.7.bb => gmime_3.2.13.bb} | 10 +++++++--- 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 meta-oe/recipes-gnome/gmime/gmime/nodolt.patch rename meta-oe/recipes-gnome/gmime/{gmime_3.2.7.bb => gmime_3.2.13.bb} (56%) diff --git a/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch b/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch deleted file mode 100644 index 1f9bdd3041..0000000000 --- a/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -150,7 +150,6 @@ AC_EXEEXT - AC_PROG_LIBTOOL - dnl when using libtool 2.x create libtool early, because it's used in configure - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) --DOLT - - dnl Checks for header files. - AC_CHECK_HEADERS(sys/mman.h) diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb similarity index 56% rename from meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb rename to meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb index 2677f5c615..c4738b25bc 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb @@ -7,11 +7,15 @@ DEPENDS = "glib-2.0 zlib" inherit gnomebase gobject-introspection vala -SRC_URI += "file://iconv-detect.h \ - file://nodolt.patch" -SRC_URI[archive.sha256sum] = "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44" +SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://iconv-detect.h \ +" +SRC_URI[sha256sum] = "2e10a54d4821daf8b16c019ad5d567e0fb8e766f8ffe5fec3d4c6a37373d6406" + +EXTRA_OECONF += "--enable-largefile" export ac_cv_have_iconv_detect_h="yes" +export ac_cv_sys_file_offset_bits="64" do_configure:append () { cp ${WORKDIR}/iconv-detect.h ${S} From patchwork Fri Mar 31 15:47:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 22043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B7BEC761A6 for ; Fri, 31 Mar 2023 15:47:39 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.58727.1680277649923317494 for ; Fri, 31 Mar 2023 08:47:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eblemYQn; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id iw3so21610369plb.6 for ; Fri, 31 Mar 2023 08:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680277649; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=btqRW0724c9ZpDYvQ6R981LgDsaecxhw4W2S/Pm8zTU=; b=eblemYQnl/eS4YOoCvAy50NjsPMIf8KFpkgyDV2XUGSLkLETPIrhhvXu/l0+sY5ztY jooYdybuDDnewD4UkBiwCei93TmitS+GpzuXKCJg0aEa1LlWJ/lK0FmyXVsojwcuQI8q r6Yoc6v0MXL3dBxf1I0zKM8t+D7+5dpP4tHcWiOSrB+fwX1ZdAMJOvN6DCwrf8VaAZwt TK83hsQNHFoOre+dVYQo57Jd4GBer3520C467VaRCADZXFVpRdhboP3ExfnFwG8Dboql mjl5ev1K1s+yvilv69SoJ0dfWt0BslEBCOTWSK43v4gzlIwJ/Na4PXKd/BvXQbI0jpAF 7F4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680277649; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=btqRW0724c9ZpDYvQ6R981LgDsaecxhw4W2S/Pm8zTU=; b=HEbDXTBLJJ9dPVgE1tzN/IZCSD21aihlJ8Fwedjcxp6y8yDJCw8qioI+IaEtqkCNt0 HOIBVzbMGtuTCZMgwmilDQNrLRcVDERthCqqdBSlwoyO9NJN6I53GhLQN+XnFE97vgPB FR/Zwx2AXIBxxm+gpaKehDSEM27xF73UgDsiVjEu+weatPqFW6I4rx5YMW0Qn8vh4UM+ ILrgJLgp+JJ4rc7Aah8HKErDAm4OAgyn86sZZl8Q+5DTwTipPpnQ4IZokMWvwymZ6AH1 XfHNhXtSLv1KMNlvZ+62CNG8ckvwMrAxOF+D6krZKnQ8w3PYXhb2PlyWlZB5TXdbKO7B ubPw== X-Gm-Message-State: AAQBX9cFfm0oxtxOLaT3OVAuIJndFHUCLZNQyGgjREX/zwndOE52bgdp gnp74Kh3rs3yk9+16Af04j3cg+RMQdMoAQ== X-Google-Smtp-Source: AK7set9epMZ5ABUrt5gi9VaYJyyDvHYZkiXrvIU5triXPGkpVlh/R/R/dZ3m7bhXDN4tp6qtbcCadw== X-Received: by 2002:a17:90a:31c:b0:23f:ec0f:aab8 with SMTP id 28-20020a17090a031c00b0023fec0faab8mr30527753pje.40.1680277649030; Fri, 31 Mar 2023 08:47:29 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::bed3]) by smtp.gmail.com with ESMTPSA id u18-20020a17090adb5200b00233d6547000sm1624567pjx.54.2023.03.31.08.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 08:47:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/4] imagemagick: Update to 7.1.1 Date: Fri, 31 Mar 2023 08:47:24 -0700 Message-Id: <20230331154724.1302078-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331154724.1302078-1-raj.khem@gmail.com> References: <20230331154724.1302078-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 31 Mar 2023 15:47:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101861 Add a patch to fix build with upcoming autoconf 2.72 Signed-off-by: Khem Raj --- ...-Use-autconf-provided-AC_FUNC_FSEEKO.patch | 42 +++++++++++++++++++ ...emagick_7.0.10.bb => imagemagick_7.1.1.bb} | 16 ++++--- 2 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch rename meta-oe/recipes-support/imagemagick/{imagemagick_7.0.10.bb => imagemagick_7.1.1.bb} (90%) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch b/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch new file mode 100644 index 0000000000..6b225a10cf --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch @@ -0,0 +1,42 @@ +From 0912e49d58c2a5f455fabf76ab7dc61cfc44cfb9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2023 20:50:26 -0700 +Subject: [PATCH] m4: Use autconf provided AC_FUNC_FSEEKO + +This helps in building with autoconf 2.72 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + m4/ac_func_fseeko.m4 | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +diff --git a/m4/ac_func_fseeko.m4 b/m4/ac_func_fseeko.m4 +index eaeabb978..f9b8859cf 100644 +--- a/m4/ac_func_fseeko.m4 ++++ b/m4/ac_func_fseeko.m4 +@@ -53,20 +53,4 @@ + # -------------- + AN_FUNCTION([ftello], [AC_FUNC_FSEEKO]) + AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO]) +-AC_DEFUN([AC_FUNC_FSEEKO], +-[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, +- [ac_cv_sys_largefile_source], +- [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).], +- [[#include /* for off_t */ +- #include ]], +- [[int (*fp) (FILE *, off_t, int) = fseeko; +- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]]) +- +-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +-# in glibc 2.1.3, but that breaks too many other things. +-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-if test $ac_cv_sys_largefile_source != unknown; then +- AC_DEFINE(HAVE_FSEEKO, 1, +- [Define to 1 if fseeko (and presumably ftello) exists and is declared.]) +-fi +-])# AC_FUNC_FSEEKO ++AC_FUNC_FSEEKO +-- +2.40.0 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb similarity index 90% rename from meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb rename to meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index b6344a381f..07434c0564 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -4,23 +4,27 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b97c12a9213df1499565d69b92c73dd7 \ - file://NOTICE;md5=d8b9d2ccf273687ad12ebd06e5d8478f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac58ac14f9d9d02cafd2d81ef38fb2cc \ + file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "-62" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" -SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" +PV .= "-5" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https \ + file://0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch" +SRCREV = "2d24be538f286962c355cf422bb525375ac77998" S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives +export ac_cv_sys_file_offset_bits="64" # xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 # if someone needs xml support then fix it first -EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" +EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl \ + --disable-openmp --without-xml --disable-opencl \ + --enable-largefile" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"