Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages /
conmon
Commits:
329f6809 by Frederik Schwan at 2023-12-15T16:02:16+01:00
upgpkg: 1:2.1.9-2
fix regression leading to broken podman
fixes #1
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = conmon
pkgdesc = OCI container runtime monitor
pkgver = 2.1.9
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://github.com/containers/conmon
arch = x86_64
@@ -11,6 +11,8 @@ pkgbase = conmon
depends = glib2
depends = systemd
source =
git+https://github.com/containers/conmon#commit=3a9715d28cb4cf0e671dfbc4211d4458534db189
+ source =
https://patch-diff.githubusercontent.com/raw/containers/conmon/pull/476.patch
b2sums = SKIP
+ b2sums =
4fd862baa511162c4adcc70bc927686cdfe237603185a1618d0d2d0606b4564ade65f4bc89f18299f118c8c613143cf4c8e54f14b4fc13c685cb9a7c96e259c3
pkgname = conmon
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
pkgname=conmon
pkgver=2.1.9
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='OCI container runtime monitor'
arch=(x86_64)
@@ -12,14 +12,23 @@ license=(APACHE)
depends=(glibc glib2 systemd)
makedepends=(git)
_commit=3a9715d28cb4cf0e671dfbc4211d4458534db189 #refs/tags/v2.1.9
-source=("git+https://github.com/containers/conmon#commit=${_commit}";)
-b2sums=('SKIP')
+source=(
+ "git+https://github.com/containers/conmon#commit=${_commit}";
+ https://patch-diff.githubusercontent.com/raw/containers/conmon/pull/476.patch
+)
+b2sums=('SKIP'
+
'4fd862baa511162c4adcc70bc927686cdfe237603185a1618d0d2d0606b4564ade65f4bc89f18299f118c8c613143cf4c8e54f14b4fc13c685cb9a7c96e259c3')
pkgver() {
cd $pkgname
git describe --tags | sed 's/^v//;s/-/+/g'
}
+prepare() {
+ cd $pkgname
+ patch -Np1 < ../476.patch
+}
+
build() {
cd conmon
make PREFIX=/usr LIBEXECDIR=/usr/lib DESTDIR="$pkgdir"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/conmon/-/commit/329f680989713e5c13b4218b051820fbc1c80056
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/conmon/-/commit/329f680989713e5c13b4218b051820fbc1c80056
You're receiving this email because of your account on gitlab.archlinux.org.
