From e25d417f1a3162bb2ecaad06a6b79ab6afb74659 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Fri, 13 Oct 2023 16:10:13 +0300 Subject: [PATCH] podman: update to 4.7.1 Bugfixes - Fixed a bug involving non-English locales of Windows where machine installs using user-mode networking were rejected due to erroneous version detection (#20209). - Fixed a regression in --env-file handling (#19565). - Fixed a bug where podman inspect would fail when stat'ing a device failed. API - The network list compat API endpoint is now much faster (#20035). Openwrt updates: added patch to allow building with musl-1.2.4 Patch source is from gentoo https://github.com/vimproved/gentoo/blob/c4c349f11a4352be1965726eadfe3a8bd8a6fa9c/app-containers/podman/files/podman-4.5.0-fix-build-with-musl-1.2.4.patch Issue was discussed by @jefferyto at mattn/go-sqlite3#1177 Signed-off-by: Oskari Rauta --- utils/podman/Makefile | 4 ++-- .../patches/020-fix-build-with-musl-1.2.4.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 utils/podman/patches/020-fix-build-with-musl-1.2.4.patch diff --git a/utils/podman/Makefile b/utils/podman/Makefile index 11afb8765c..7a785f5370 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman -PKG_VERSION:=4.7.0 +PKG_VERSION:=4.7.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) -PKG_HASH:=8fbeab8a821c59ac10ade87c9597d7bb13be4f7868b438278a9f6a17c50bf20d +PKG_HASH:=b785fe69041a0f222a8e1f8165816d767cb9bff5418f3f559547da82c0c279cc PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch b/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch new file mode 100644 index 0000000000..9d56ca780b --- /dev/null +++ b/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch @@ -0,0 +1,16 @@ +From https://github.com/mattn/go-sqlite3/pull/1177/commits/65d6085c5d87280c0d6883c884ddb25f9273942f Mon Sep 17 00:00:00 2001 +From: leso-kn +Date: Mon, 10 Jul 2023 14:58:52 +0200 +Subject: [PATCH] Fix musl build (#1164) + +--- a/vendor/github.com/mattn/go-sqlite3/sqlite3.go ++++ b/vendor/github.com/mattn/go-sqlite3/sqlite3.go +@@ -21,7 +21,7 @@ package sqlite3 + #cgo CFLAGS: -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 + #cgo CFLAGS: -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT + #cgo CFLAGS: -Wno-deprecated-declarations +-#cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1 ++#cgo linux,!android CFLAGS: -DHAVE_PREAD=1 -DHAVE_PWRITE=1 + #cgo openbsd CFLAGS: -I/usr/local/include + #cgo openbsd LDFLAGS: -L/usr/local/lib + #ifndef USE_LIBSQLITE3