fwknop: Use pkg-config instead of gpgme-config
PATCH 1/2 fwknop: Use pkg-config instead of gpgme-config
pkg-config is sysroot aware which is needed for cross-builds
Signed-off-by Khem Raj <[email protected]>
--- .../0001-Use-pkg-config-to-find-gpgme.patch | 27 +++++++++++++++++++ .../recipes-support/fwknop/fwknop_2.6.10.bb | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch
meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch new file +27 -0
@@ -0,0 +1,27 @@ +From f8f4e1a617c4610ea7dc40a60f1c696ebc37850c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 2 Apr 2023 09:27:42 -0700 +Subject: [PATCH] Use pkg-config to find gpgme + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Khem Raj <[email protected]> +--- + m4/gpgme.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/gpgme.m4 b/m4/gpgme.m4 +index 44bf43c..c9a8ae6 100644 +--- a/m4/gpgme.m4 ++++ b/m4/gpgme.m4 +@@ -18,7 +18,7 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + if test "x$gpgme_config_prefix" != x ; then + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" + fi +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) ++ GPGME_CONFIG="pkg-config gpgme" + + if test "$GPGME_CONFIG" != "no" ; then + gpgme_version=`$GPGME_CONFIG --version` +-- +2.40.0 +
meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +2 -1
@@ -3,10 +3,11 @@ HOMEPAGE = "http://www.cipherdyne.org/fwknop/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ " -inherit autotools-brokensep +inherit autotools-brokensep pkgconfig SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ + file://0001-Use-pkg-config-to-find-gpgme.patch \ " SRC_URI[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77"
Signature · 1 line
2.40.0
PATCH 2/2 fwknop: Fix AS_IF configure syntax
Signed-off-by Khem Raj <[email protected]>
--- ...figure.ac-Fix-missing-comma-in-AS_IF.patch | 29 +++++++++++++++++++ .../recipes-support/fwknop/fwknop_2.6.10.bb | 14 ++------- 2 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch
meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch new file +29 -0
@@ -0,0 +1,29 @@ +From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 2 Apr 2023 10:01:51 -0700 +Subject: [PATCH] configure.ac: Fix missing comma in AS_IF + +this is flagged with autconf 2.72 + +Upstream-Status: Pending +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 47a069e..9cdfd3f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -744,7 +744,7 @@ dnl + IPFW_EXE="" + IPTABLES_EXE="" + FIREWALLD_EXE="" +- ] ++ ], + ] + ] + ] +-- +2.40.0 +
meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +3 -11
@@ -8,25 +8,17 @@ inherit autotools-brokensep pkgconfig SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ file://0001-Use-pkg-config-to-find-gpgme.patch \ + file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \ " -SRC_URI[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" DEPENDS = "libpcap gpgme" -EXTRA_OECONF = " --with-iptables=/usr/sbin/iptables \ - " +EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" -do_configure () { +do_configure:prepend () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config - - aclocal - libtoolize --automake --copy --force - autoconf - autoheader - automake -a - oe_runconf } PACKAGES =+ "${PN}-client ${PN}-daemon"
Signature · 1 line
2.40.0