From 1da9c0e1be29f1d54cdf451c52c802ae84e1b5f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Nov 2023 23:22:17 +0100 Subject: [PATCH] package/iodine: bump to version 0.8.0 - Replace non upstreamable patch - Use LICENSE file added with https://github.com/yarrick/iodine/commit/721b7f0d9bae2997328d53fb6fc351cf67eb5d9d https://github.com/yarrick/iodine/blob/v0.8.0/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-disable-systemd-and-selinux.patch | 29 -------------- ...-osflags-fully-fix-cross-compilation.patch | 40 +++++++++++++++++++ package/iodine/iodine.hash | 5 ++- package/iodine/iodine.mk | 10 +++-- 5 files changed, 50 insertions(+), 35 deletions(-) delete mode 100644 package/iodine/0001-disable-systemd-and-selinux.patch create mode 100644 package/iodine/0001-src-osflags-fully-fix-cross-compilation.patch diff --git a/.checkpackageignore b/.checkpackageignore index 45f175cd55..7740914ff9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -581,7 +581,6 @@ package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Va package/intel-gmmlib/0001-Drop-hardening-related-flags.patch Upstream package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch Upstream package/intltool/0001-perl-5.26-compatibility.patch Upstream -package/iodine/0001-disable-systemd-and-selinux.patch Upstream package/iotop/0001-Fix-build-error-with-Python-3.patch Upstream package/iozone/0001-Add-new-targets-for-iozone.patch Upstream package/iperf/0001-fix-single-threaded-compile-breakage.patch Upstream diff --git a/package/iodine/0001-disable-systemd-and-selinux.patch b/package/iodine/0001-disable-systemd-and-selinux.patch deleted file mode 100644 index 965abb7cff..0000000000 --- a/package/iodine/0001-disable-systemd-and-selinux.patch +++ /dev/null @@ -1,29 +0,0 @@ -Disable selinux and systemd support since they check for host headers. - -Signed-off-by: Gustavo Zacarias - -diff -Nura iodine-0.7.0.orig/src/osflags iodine-0.7.0/src/osflags ---- iodine-0.7.0.orig/src/osflags 2015-02-20 14:59:00.799958145 -0300 -+++ iodine-0.7.0/src/osflags 2015-02-20 15:05:54.791135141 -0300 -@@ -18,8 +18,8 @@ - ;; - Linux) - FLAGS=""; -- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; -- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon"; -+ #[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; -+ #[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon"; - echo $FLAGS; - ;; - esac -@@ -34,8 +34,8 @@ - ;; - Linux) - FLAGS="-D_GNU_SOURCE" -- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; -- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; -+ #[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; -+ #[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; - echo $FLAGS; - ;; - esac diff --git a/package/iodine/0001-src-osflags-fully-fix-cross-compilation.patch b/package/iodine/0001-src-osflags-fully-fix-cross-compilation.patch new file mode 100644 index 0000000000..c6dc321a6f --- /dev/null +++ b/package/iodine/0001-src-osflags-fully-fix-cross-compilation.patch @@ -0,0 +1,40 @@ +From a5d71d076168f8ad1e7dd30b35f1569f180f429c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 2 Nov 2023 23:03:15 +0100 +Subject: [PATCH] src/osflags: fully fix cross-compilation + +Cross-compilation was only partially fixed by +https://github.com/yarrick/iodine/commit/024481c94b97ef37981621cdc38f8b20f8919418 +as selinux was still enabled depending on host file existence + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/yarrick/iodine/pull/93 +--- + src/osflags | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/osflags b/src/osflags +index 9a437bd..39ca5fa 100755 +--- a/src/osflags ++++ b/src/osflags +@@ -20,7 +20,7 @@ link) + ;; + Linux) + FLAGS=""; +- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; ++ "$PKG_CONFIG" --exists libselinux && FLAGS="$FLAGS $($PKG_CONFIG --libs libselinux)"; + "$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd-daemon)"; + "$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd)"; + echo $FLAGS; +@@ -40,7 +40,7 @@ cflags) + ;; + Linux) + FLAGS="-D_GNU_SOURCE" +- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; ++ "$PKG_CONFIG" --exists libselinux && FLAGS="$FLAGS -DHAVE_SETCON"; + "$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS -DHAVE_SYSTEMD"; + "$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS -DHAVE_SYSTEMD"; + echo $FLAGS; +-- +2.42.0 + diff --git a/package/iodine/iodine.hash b/package/iodine/iodine.hash index 4ba7aa95b8..6f765a2462 100644 --- a/package/iodine/iodine.hash +++ b/package/iodine/iodine.hash @@ -1,4 +1,5 @@ # From http://code.kryo.se/iodine/ -md5 fdbf3b81cd69caf5230d76a8b039fd99 iodine-0.7.0.tar.gz +md5 6f2a53476cbc09bbffe7e07d6e9dd19d iodine-0.8.0.tar.gz # Locally computed -sha256 f41a252b2218759aa351270b7ad9791bdd323836b940e35c0614837a5d24dcb7 README +sha256 546e92cf8617f7970ea81c850b1063eb189c68c406d0c6a67e02c55e72e714c6 iodine-0.8.0.tar.gz +sha256 9541123931e4df4ec84612e056a92ecaab905fe201deaf932b895406565fbb85 LICENSE diff --git a/package/iodine/iodine.mk b/package/iodine/iodine.mk index 521ca3d927..998f92503d 100644 --- a/package/iodine/iodine.mk +++ b/package/iodine/iodine.mk @@ -4,13 +4,17 @@ # ################################################################################ -IODINE_VERSION = 0.7.0 +IODINE_VERSION = 0.8.0 IODINE_SITE = http://code.kryo.se/iodine -IODINE_DEPENDENCIES = zlib IODINE_LICENSE = MIT -IODINE_LICENSE_FILES = README +IODINE_LICENSE_FILES = LICENSE IODINE_CPE_ID_VENDOR = kryo IODINE_SELINUX_MODULES = iodine +IODINE_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBSELINUX),libselinux) \ + $(if $(BR2_PACKAGE_SYSTEMD),systemd) \ + zlib IODINE_CFLAGS = $(TARGET_CFLAGS)