Skip to content

Commit 85a028a

Browse files
authored
podman: Update to 5.3.1 (msys2#22759)
* replace /etc patch with just setting it during make * make envsubst work for the docker wrapper (this regressed in MSYS2 at some point)
1 parent 49b3cb3 commit 85a028a

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

mingw-w64-podman/0001-etc-prefix.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

mingw-w64-podman/PKGBUILD

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_realname=podman
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
6-
pkgver=5.2.5
6+
pkgver=5.3.1
77
pkgrel=1
88
pkgdesc='Tool for running OCI-based containers in pods (mingw-w64)'
99
arch=('any')
@@ -17,16 +17,17 @@ makedepends=(
1717
"${MINGW_PACKAGE_PREFIX}-go"
1818
"${MINGW_PACKAGE_PREFIX}-cc"
1919
"${MINGW_PACKAGE_PREFIX}-python"
20-
"git"
20+
"${MINGW_PACKAGE_PREFIX}-gettext-runtime"
21+
"git" # needed during the build
2122
)
2223
options=('!strip')
2324
_GV_VERSION="0.7.5" # See GVPROXY_VERSION in Makefile
2425
source=("https://github.com/containers/podman/archive/v$pkgver/${_realname}-${pkgver}.tar.gz"
2526
"https://github.com/containers/gvisor-tap-vsock/archive/v${_GV_VERSION}/gvisor-tap-vsock-${_GV_VERSION}.tar.gz"
26-
"0001-etc-prefix.patch")
27-
sha256sums=('18bbf2c26534229c030590d65da88154bed31f0207041d30fed5f508b933a66c'
27+
"https://github.com/containers/podman/pull/24793.patch")
28+
sha256sums=('5b4e9ddce69cc2c8c8b8529e90093ae3ea9cb2959e2fceb98469b282dbffbcc7'
2829
'd635bc55dbb97cf2a469427fb84b7a90f37540f14b090c21356cce2e549b46e0'
29-
'2a1a5c9d126634e871853cfa0e17af8f1597a6ed9c709f59c4a19e1bbb76c68d')
30+
'8272a7635e81f66126e2fd611c12831e219dcf1c756ea5543398aa1269a9dc3f')
3031
noextract=("${_realname}-${pkgver}.tar.gz")
3132

3233
prepare() {
@@ -35,7 +36,8 @@ prepare() {
3536
rm -rf build-${MSYSTEM}
3637

3738
cd "${_realname}-${pkgver}"
38-
patch -Np1 -i "${srcdir}/0001-etc-prefix.patch"
39+
# https://github.com/containers/podman/pull/24793
40+
patch -Np1 -i "${srcdir}/24793.patch"
3941
cd "${srcdir}"
4042

4143
cp -r ${_realname}-${pkgver} build-${MSYSTEM}
@@ -73,7 +75,8 @@ package() {
7375
# copy the proxy binaries where install.remote expects them
7476
cp "${srcdir}/build-proxy-${MSYSTEM}/bin/"* "./bin/windows"
7577

76-
make install.remote install.docker-full install.man install.completions DESTDIR="$pkgdir" PREFIX=${MINGW_PREFIX}
78+
# skip convert for mingw envsubst
79+
MSYS2_ENV_CONV_EXCL="BINDIR;ETCDIR" \
80+
make install.remote install.docker-full install.man install.completions DESTDIR="$pkgdir" PREFIX=${MINGW_PREFIX} ETCDIR=${MINGW_PREFIX}/etc
7781
rm -Rf "${pkgdir}${MINGW_PREFIX}/lib"
78-
sed -i "s|/usr/bin/||g" "${pkgdir}${MINGW_PREFIX}/bin/docker"
7982
}

0 commit comments

Comments
 (0)