From 551ff0f8108b41432dc593ed4b159a132196ce1c Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Mon, 25 Mar 2024 09:28:07 +0200 Subject: [PATCH] podman: update to v5.0.0 Major version update to podman - Obsolete patch removed - patch 010-do-not-build-docs.patch refreshed Changelog: https://github.com/containers/podman/releases/tag/v5.0.0 Signed-off-by: Oskari Rauta --- utils/podman/Makefile | 4 ++-- utils/podman/patches/010-do-not-build-docs.patch | 4 ++-- .../patches/020-fix-build-with-musl-1.2.4.patch | 16 ---------------- 3 files changed, 4 insertions(+), 20 deletions(-) delete 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 dfa5cebb5d..b8b4c571b0 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman -PKG_VERSION:=4.9.3 +PKG_VERSION:=5.0.0 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:=37afc5bba2738c68dc24400893b99226c658cc9a2b22309f4d7abe7225d8c437 +PKG_HASH:=818db636955a1eeec4dcb586d18783ab86a8afd07e3f4adaf25920b3697316c9 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/podman/patches/010-do-not-build-docs.patch b/utils/podman/patches/010-do-not-build-docs.patch index 4ff46a3fd4..ab9a51a26d 100644 --- a/utils/podman/patches/010-do-not-build-docs.patch +++ b/utils/podman/patches/010-do-not-build-docs.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -224,7 +224,7 @@ GV_VERSION=v0.7.2 +@@ -227,7 +227,7 @@ GV_VERSION=v0.7.3 default: all .PHONY: all @@ -9,7 +9,7 @@ .PHONY: binaries ifeq ($(shell uname -s),FreeBSD) -@@ -803,7 +803,7 @@ rpm-install: package ## Install rpm pac +@@ -810,7 +810,7 @@ rpm-install: package ## Install rpm pac /usr/bin/podman info # will catch a broken conmon .PHONY: install 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 deleted file mode 100644 index 9d56ca780b..0000000000 --- a/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch +++ /dev/null @@ -1,16 +0,0 @@ -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