[arch-commits] Commit in lxcfs/repos/community-x86_64 (4 files)

[Morten Linderud]

    Date: Sunday, March 13, 2022 @ 11:48:00
  Author: foxboron
Revision: 1150864

archrelease: copy trunk to community-x86_64

Added:
  lxcfs/repos/community-x86_64/PKGBUILD
    (from rev 1150863, lxcfs/trunk/PKGBUILD)
  lxcfs/repos/community-x86_64/lxcfs.service
    (from rev 1150863, lxcfs/trunk/lxcfs.service)
Deleted:
  lxcfs/repos/community-x86_64/PKGBUILD
  lxcfs/repos/community-x86_64/lxcfs.service

---------------+
 PKGBUILD      |   80 ++++++++++++++++++++++++++++++--------------------------
 lxcfs.service |   26 +++++++++---------
 2 files changed, 56 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-13 11:47:53 UTC (rev 1150863)
+++ PKGBUILD	2022-03-13 11:48:00 UTC (rev 1150864)
@@ -1,37 +0,0 @@
-# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
-# Maintainer: Christian Brauner <christianvanbrauner at gmail.com>
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-
-pkgname=lxcfs
-pkgver=4.0.12
-pkgrel=1
-pkgdesc="FUSE filesystem for LXC"
-arch=(x86_64)
-url="https://linuxcontainers.org/"
-license=('GPL')
-depends=('lxc' 'libnih' 'fuse3' 'dbus-glib')
-makedepends=('help2man')
-options=('emptydirs' 'debug')
-source=("https://linuxcontainers.org/downloads/lxcfs/lxcfs-$pkgver.tar.gz"{,.asc}
-	"lxcfs.service")
-validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
-sha256sums=('f502b7c99b5013e58f7d5c4117778c0bffe98532a42e023308eb72a287f0c969'
-            'SKIP'
-            '3549e83ebbd6ec5934be0c3137b0dbb1101cec098bc49d135fea29f733b9e2a1')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure \
-        --prefix=/usr \
-        --sbindir=/usr/bin \
-        --with-pamdir=/usr/lib/security \
-        --localstatedir=/var
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
-    install -dm0755 "$pkgdir"/var/lib/lxcfs
-    install -Dm0644 "$srcdir"/lxcfs.service "$pkgdir"/usr/lib/systemd/system/lxcfs.service
-}

Copied: lxcfs/repos/community-x86_64/PKGBUILD (from rev 1150863, lxcfs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-13 11:48:00 UTC (rev 1150864)
@@ -0,0 +1,43 @@
+# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
+# Maintainer: Christian Brauner <christianvanbrauner at gmail.com>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+
+pkgname=lxcfs
+pkgver=5.0.0
+pkgrel=1
+pkgdesc="FUSE filesystem for LXC"
+arch=(x86_64)
+url="https://linuxcontainers.org/"
+license=('GPL')
+depends=('lxc' 'libnih' 'fuse3' 'dbus-glib')
+makedepends=('help2man' 'meson' 'python-jinja')
+options=('emptydirs' 'debug')
+source=("https://linuxcontainers.org/downloads/lxcfs/lxcfs-$pkgver.tar.gz"{,.asc}
+        "lxcfs-fix-man.patch::https://patch-diff.githubusercontent.com/raw/lxc/lxcfs/pull/524.patch"
+        "lxcfs-fix-libdir.patch::https://patch-diff.githubusercontent.com/raw/lxc/lxcfs/pull/527.patch"
+        "lxcfs.service")
+validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
+sha256sums=('d131b2284437165eabdcdf3c392b96fc95e6ee4f7bf04a7e9999f63997a995ee'
+            'SKIP'
+            '5aaab31a34994c4496d7c1fa8d6e885c6c5d68e31f90bb04223da8d62afde5bc'
+            'ff88ab96041e63aaede9af280d7ee7d847ae6ba8ec98832e2f42267ee5ed46bc'
+            '3549e83ebbd6ec5934be0c3137b0dbb1101cec098bc49d135fea29f733b9e2a1')
+
+prepare() {
+    cd "${pkgname}-${pkgver}"
+    patch -Np1 < "$srcdir/lxcfs-fix-man.patch"
+    patch -Np1 < "$srcdir/lxcfs-fix-libdir.patch"
+}
+
+build() {
+    cd "$pkgname-$pkgver"
+    arch-meson ../build
+    meson compile -C ../build
+}
+
+package() {
+    cd "$pkgname-$pkgver"
+    DESTDIR="$pkgdir" meson install -C ../build
+    install -dm0755 "$pkgdir"/var/lib/lxcfs
+    install -Dm0644 "$srcdir"/lxcfs.service "$pkgdir"/usr/lib/systemd/system/lxcfs.service
+}

Deleted: lxcfs.service
===================================================================
--- lxcfs.service	2022-03-13 11:47:53 UTC (rev 1150863)
+++ lxcfs.service	2022-03-13 11:48:00 UTC (rev 1150864)
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
-KillMode=process
-Restart=on-failure
-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target

Copied: lxcfs/repos/community-x86_64/lxcfs.service (from rev 1150863, lxcfs/trunk/lxcfs.service)
===================================================================
--- lxcfs.service	                        (rev 0)
+++ lxcfs.service	2022-03-13 11:48:00 UTC (rev 1150864)
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target