Tomohiro "Tomo-p" KATO před 9 měsíci
rodič
revize
d80136a96b
1 změnil soubory, kde provedl 32 přidání a 9 odebrání
  1. 32 9
      l/lxc/lxc-vl.spec

+ 32 - 9
l/lxc/lxc-vl.spec

@@ -9,7 +9,7 @@
 %define _unpackaged_files_terminate_build 1
 
 Name:           lxc
-Version:        5.0.1
+Version:        5.0.3
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Linux Resource Containers
 Summary(ja):    Linux リソースコンテナ
@@ -25,8 +25,6 @@ Source11:       vinelinux.common.conf
 Source12:       vinelinux.userns.conf
 
 Patch0:         0001-fix-initscript.patch
-# https://github.com/lxc/lxc/commit/d83051ea6a0df1dbaa255be1291b739f3a2f7f09
-Patch1:         lxc-glibc-2.36.patch
 Patch100:       0002-fix-launching-dnsmasq.patch
 
 BuildRequires:  meson
@@ -42,6 +40,8 @@ BuildRequires:  libtool
 %if %{with lua}
 BuildRequires:  lua-devel
 %endif
+BuildRequires:  openssl-devel
+BuildRequires:  pam-devel
 BuildRequires:  perl-XML-SAX
 %if %{with python3}
 BuildRequires:  python3-devel >= 3.2
@@ -182,20 +182,34 @@ developing applications that use %{name}.
 %if !%{with systemd}
 %patch0 -p1
 %endif
-%patch1 -p1
 %patch100 -p1
 
 
 %build
 %meson \
-	-Dapparmor=false \
-	-Dselinux=false \
+	-D examples=true \
+	-D man=true \
+	-D tools=true \
+	-D commands=true \
+	-D capabilities=true \
+	-D openssl=true \
+	-D apparmor=false \
+	-D selinux=false \
+	-D seccomp=true \
+	-D memfd-rexec=true \
+	-D thread-safety=true \
+	-D tests=false \
 %if %{with systemd}
-	-Dinit-script=systemd \
+	-D init-script=systemd \
+	-D systemd-unitdir=%{_unitdir} \
+	-D sd-bus=auto \
 %else
-	-Dinit-script=sysvinit \
-	-Dsd-bus=disabled \
+	-D init-script=sysvinit \
+	-D sd-bus=disabled \
 %endif # with_systemd
+	-D distrosysconfdir=sysconfig \
+	-D pam-cgroup=true \
+	-D runtime-path=%{_rundir} \
 	%{nil}
 
 %meson_build
@@ -204,6 +218,9 @@ developing applications that use %{name}.
 %install
 %meson_install
 
+mkdir -p %{buildroot}/%{_lib}
+mv -f %{buildroot}%{_libdir}/security %{buildroot}/%{_lib}/
+
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 %if %{with lua}
 chmod -x %{buildroot}%{luapkgdir}/lxc.lua
@@ -328,12 +345,15 @@ fi
 %{_mandir}/man7/%{name}*
 %{_mandir}/*/man5/%{name}*
 %{_mandir}/*/man7/%{name}*
+%{_mandir}/man8/pam_cgfs*
+%{_mandir}/*/man8/pam_cgfs*
 %if %{with systemd}
 %{_unitdir}/*.service
 %else
 %{_initdir}/*
 %endif # with_systemd
 %dir %{_localstatedir}/cache/%{name}
+/%{_lib}/security/pam_cgfs.so
 
 %if %{with python3}
 %files -n python3-%{name}
@@ -365,6 +385,9 @@ fi
 
 
 %changelog
+* Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.3-1
+- new upstream release.
+
 * Thu Oct 06 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.1-1
 - new upstream release.