Accepting request 1032079 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/1032079
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxcfs?expand=0&rev=19

include-fixes.patch

@@ -1,13 +0,0 @@
-Index: lxcfs-4.0.12/src/utils.h
-===================================================================
---- lxcfs-4.0.12.orig/src/utils.h
-+++ lxcfs-4.0.12/src/utils.h
-@@ -46,6 +46,8 @@ static inline int pidfd_open(pid_t pid,
- {
- 	return syscall(__NR_pidfd_open, pid, flags);
- }
-+#else
-+#include <sys/pidfd.h>
- #endif
- 
- #if !HAVE_PIDFD_SEND_SIGNAL

lxcfs-4.0.12.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f502b7c99b5013e58f7d5c4117778c0bffe98532a42e023308eb72a287f0c969
-size 461251

lxcfs-4.0.12.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAmH6B34ACgkQxjiXTWR5
-LWcBJA//ctizd6QfCvv9YDGEGglospcWkrMIMUUO0FYmVz6H2KXtDIv6gR7x2JYN
-wZt99vECB9UYvLva7GLg4tMQX2vs6zxlXPxC6wGPW6HGgiUP7INYoDD5JdQMDmVS
-xNCcsehWLHbz9Opt2ZzXmUvXplVGsFnajw8WVDiNEAlHzHFx2W/0jfy7e5qLvBid
-yhGSmc916X+zADZCrsDv6c/Nm0eoSoPCMStDKMNdytJYm2vl2SqKCBknzz8UQv1T
-tFU39AXDTkzQtQQDFDSeMMsvye3HLsBHkXOWE8JI8CBW19Fvn/ATxLoWxTCSgxqI
-4h2xScvNQ2oJKnxAo/mTAfMaUzFpGLVVOEJPAz3mr2sjgx4/h9avuo8kTQSAjEFp
-wLtYAPb8SrQUHESMS9YBRB2v49Y9qAIVSAzJC4sYrfCOEIszMsbxtf/jfZFH1MZA
-1nyVsmDVxQdfomLqdGWsmY32Qud30CI9uQPA8+ZmD/2ALTTZDH9g1ty2HZgnbhlh
-3zMUCEJbbtNfEEMo3V4GIWJ+KoHTMqCWmsJd1ouSbzvuZ8Sq4EYE19ufhLW8brTU
-AOcSPVzfBAfeF8O+IPcN9DdygmfeLEgXWxztG6Y0fneaXNDRQM7OJzrzAomqKEfF
-UBD3/AVpT+CK0QG7ZgIXSjRDC+heHop7KZ0yc23e8mJdeQ4LPlI=
-=izVX
------END PGP SIGNATURE-----

lxcfs-5.0.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3df03629ee8955de60a28da7490350ad1eb7aa3134b6917d40ec68ef092d039
+size 103236

lxcfs-5.0.2.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAmLy0RgACgkQxjiXTWR5
+LWddFw//Qv7CfwndukeNa90hc23zh2kFZxJkrP23jZ80gRhxzk/W1ETWErmFmv1h
+YDPwEJ5ATMYO8uzqRbY64eZn45UOvTJ5FTuVd13uK/kzXfyPmYEOIKhNSjJjvoES
+z5mq+IyBfCKGhkpFgJAIuRz720dDDBPX/K9Cw/VbfUBak3xA8pFP6zoivDz7q5Nu
+L/a+X3TpbTVsO+BN9Eyo/N2jlKMBrtwnZWUbCUQWQpzTJTdmQUyP0O1sM/OjOcXM
+7BZrDpZ1udLiv8yaETyG7YCy22G9oS67VKop9+/tyj9T4R6aEjqieB4DQ1wWx4kD
+L2qKFs7DqJlQwjM2D6BNulvbKHf1aRQkyXd1zPPUE2o8xO/MOQ6dc81DR7yyQFGP
+Bz0Y0eVqQYCQ7OVM0UOqv2N8hBkjI6QQahmOPK2SmlCDlhAPaGMFa7y4pGMT13o3
+L140OkH8kmtj/tDMklpbxtApLAhyE+uAx+cOKPnh8ukkcf9QYdh9qE+WVaXO8UcK
+LS2gs5Uyth1y3UXP9N2SYgrsh0JcoX6wcC/RvxParaQeYA0UY+0Kc3VpxVmRI8OY
+FcL86PDGXSBJODifOazGsNPWGGwByHRi4xjJZUJIvinCbAc8WNBNUBhYVwKyXnKV
+/W/KZq591z7NwcDf+t9uSUaJNHODtnTOifxCiQaUH6MAXs7BX/8=
+=i7ry
+-----END PGP SIGNATURE-----

lxcfs.changes

@@ -1,8 +1,34 @@
+-------------------------------------------------------------------
+Sat Oct 29 00:02:49 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+- Update to LXCFS 5.0.2. The full upstream changelog is available from:
+  https://discuss.linuxcontainers.org/t/lxcfs-5-0-lts-has-been-released/13535
+  https://discuss.linuxcontainers.org/t/lxcfs-5-0-1-has-been-released/14709
+  https://discuss.linuxcontainers.org/t/lxcfs-5-0-2-has-been-released/14811
+  boo#1204842
+
+  LXCFS 5.0.2:
+  * Fix crash during load/reload on FUSE 3
+
+  LXCFS 5.0.1:
+  * Fixes to /sys/devices/system/cpu handling on FUSE 2
+  * Fix for a formatting issue in /proc/stat
+  * Fix for a cgroup2 issue in handling cgroups with no CPU limits
+  * Fix for library reload logic
+
+  LXCFS 5.0:
+  * Switch to meson
+  + Complete cgroup2 support
+  + /proc/slabinfo support
+  + /sys/devices/system/cpu support
+- Drop no-longer needed patches.
+  - include-fixes.patch
+
 -------------------------------------------------------------------
 Fri Sep 30 20:50:08 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
 - add include-fixes.patch
-- reenable FORTIFY_SOURCE=3 
+- reenable FORTIFY_SOURCE=3
 
 -------------------------------------------------------------------
 Sun Sep 25 17:00:54 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>
@@ -58,12 +84,12 @@ Mon May 24 06:34:21 UTC 2021 - Johannes Kastl <kastl@b1-systems.de>
   *  Update for new diskstats fields
   *  Fix some build issues
   * for full list of changes see
-  https://discuss.linuxcontainers.org/t/lxcfs-4-0-6-lts-has-been-released/9236 
+  https://discuss.linuxcontainers.org/t/lxcfs-4-0-6-lts-has-been-released/9236
 
 -------------------------------------------------------------------
 Wed Aug 12 04:44:02 UTC 2020 - Pavol Cupka <palica@liguros.net>
 
-- update to LXCFS 4.0.5 
+- update to LXCFS 4.0.5
   detailed changelog:
   https://discuss.linuxcontainers.org/t/lxcfs-4-0-5-lts-has-been-released/8602
 
@@ -72,14 +98,14 @@ Sat Jun 27 06:20:52 UTC 2020 - Pavol Cupka <palica@liguros.net>
 
 - update to LXCFS 4.0.4 (released on the 18th of June 2020)
   detailed changelog:
-  https://discuss.linuxcontainers.org/t/lxcfs-4-0-4-lts-has-been-released/8212 
+  https://discuss.linuxcontainers.org/t/lxcfs-4-0-4-lts-has-been-released/8212
 
 -------------------------------------------------------------------
 Sun May 10 05:58:58 UTC 2020 - Pavol Cupka <palica@liguros.net>
 
 - update to LXCFS 4.0.3 (released on the 17th of April 2020)
   detailed changelog:
-  https://discuss.linuxcontainers.org/t/lxcfs-4-0-3-lts-has-been-released/7470 
+  https://discuss.linuxcontainers.org/t/lxcfs-4-0-3-lts-has-been-released/7470
 
 -------------------------------------------------------------------
 Wed Apr  1 14:23:25 UTC 2020 - Aleksa Sarai <asarai@suse.com>

lxcfs.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           lxcfs
-Version:        4.0.12
+Version:        5.0.2
 Release:        0
 Summary:        FUSE filesystem for LXC
 License:        Apache-2.0
@@ -31,14 +31,14 @@ URL:            https://linuxcontainers.org/lxcfs
 Source:         https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1:        https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
-Patch1:         include-fixes.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  help2man
 BuildRequires:  libtool
+BuildRequires:  meson >= 0.50
 BuildRequires:  pam-devel
 BuildRequires:  pkg-config
+BuildRequires:  python3
+BuildRequires:  python3-jinja2
 BuildRequires:  pkgconfig(fuse)
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
@@ -67,19 +67,20 @@ with LXC for all containers.
 %autosetup -p1
 
 %build
-autoreconf -vif
+%meson \
-%configure --with-distro=opensuse
+	-D init-script=systemd \
-make %{?_smp_mflags}
+	-D runtime-path=%{_rundir} \
+	%{nil}
+%meson_build
 
 %install
 # The shared library liblxcfs.so used by lxcfs is not supposed to be used by
 # any other program. lxcfs will automatically install it to {_libdir}/{name}
 # which is out of the way of any other users.
-%make_install
+%meson_install
 install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
 
 # systemd service and sysv-init compat wrapper.
-install -D -m 0644 config/init/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
 mkdir -p %{buildroot}%{_sbindir}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}