diff mbox series

[meta-networking,1/5] fwknop: Upgrade to 2.6.11

Message ID 20240818225620.2226473-1-raj.khem@gmail.com
State New
Headers show
Series [meta-networking,1/5] fwknop: Upgrade to 2.6.11 | expand

Commit Message

Khem Raj Aug. 18, 2024, 10:56 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...with-GCC-s-fno-common-flag-fixes-305.patch | 27 -----------------
 ...figure.ac-Fix-missing-comma-in-AS_IF.patch | 29 -------------------
 .../{fwknop_2.6.10.bb => fwknop_2.6.11.bb}    |  8 ++---
 3 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch
 delete mode 100644 meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch
 rename meta-networking/recipes-support/fwknop/{fwknop_2.6.10.bb => fwknop_2.6.11.bb} (77%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch
deleted file mode 100644
index e696ac4ead..0000000000
--- a/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
-From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001
-From: Francois Marier <francois@debian.org>
-Date: Fri, 24 Jul 2020 21:22:47 -0700
-Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305)
-
-Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- client/log_msg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/log_msg.h b/client/log_msg.h
-index cc17716..3dda161 100644
---- a/client/log_msg.h
-+++ b/client/log_msg.h
-@@ -38,7 +38,7 @@ enum
-     LOG_VERBOSITY_INFO,         /*!< Constant to define a INFO message */
-     LOG_VERBOSITY_DEBUG,        /*!< Constant to define a DEBUG message */
-     LOG_LAST_VERBOSITY
--} log_level_t;
-+};
- 
- #define LOG_DEFAULT_VERBOSITY   LOG_VERBOSITY_NORMAL    /*!< Default verbosity to use */
- 
--- 
-2.28.0
-
diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch
deleted file mode 100644
index f3e1707408..0000000000
--- a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb
similarity index 77%
rename from meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb
rename to meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb
index a1f56cdf16..c9f9596eb4 100644
--- a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb
+++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb
@@ -1,16 +1,14 @@ 
 SUMMARY = "fwknop - Single Packet Authorization"
 HOMEPAGE = "http://www.cipherdyne.org/fwknop/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-		    "
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
 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[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77"
+SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64"
 
 DEPENDS = "libpcap gpgme"