diff --git a/config.patch b/config.patch deleted file mode 100644 index 4bb89f6a856008a161a82693425165ed69173cc6..0000000000000000000000000000000000000000 --- a/config.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libcgroup-0.42.2/samples/cgconfig.sysconfig.orig 2019-12-19 11:25:25.547000000 +0800 -+++ libcgroup-0.42.2/samples/cgconfig.sysconfig 2019-12-19 11:26:01.142000000 +0800 -@@ -5,8 +5,5 @@ - # controller to limit cpu.shares of this default group and allowing some more - # important group take most of the CPU. - # --# By default, create these groups: --CREATE_DEFAULT=yes -- --# Uncomment following line to disable creation of the default group on startup: --# CREATE_DEFAULT=no -+# By default, do not create these groups: -+CREATE_DEFAULT=no diff --git a/libcgroup-2.0.3.tar.gz b/libcgroup-2.0.3.tar.gz deleted file mode 100644 index 44c0b86f4d0f9452d743ba964ee0e7bea0053b4f..0000000000000000000000000000000000000000 Binary files a/libcgroup-2.0.3.tar.gz and /dev/null differ diff --git a/libcgroup-3.1.0.tar.gz b/libcgroup-3.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f5285a95fe08791d75faa95564494ca61832d6d7 Binary files /dev/null and b/libcgroup-3.1.0.tar.gz differ diff --git a/libcgroup.spec b/libcgroup.spec index f7201bf9dfbd264f4f3770854d8cde5ffa46e63e..7ac80d0ab4988628b8bff4f5fad2577d6bdaed5a 100644 --- a/libcgroup.spec +++ b/libcgroup.spec @@ -4,8 +4,8 @@ Summary: Libcgroup is a library that abstracts the control group file system in Linux Name: libcgroup -Version: 2.0.3 -Release: 2 +Version: 3.1.0 +Release: 1 License: LGPLv2+ URL: http://libcg.sourceforge.net/ Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -13,11 +13,9 @@ Source1: cgconfig.service Provides: libcgroup-pam libcgroup-tools Obsoletes: libcgroup-pam libcgroup-tools -Patch0:config.patch - BuildRequires: autoconf, automake, libtool BuildRequires: gcc,gcc-c++,byacc -BuildRequires: systemd-units,pam-devel,flex,coreutils +BuildRequires: systemd-units,pam-devel,flex,coreutils,systemd-devel Requires: systemd >= 217-0.2 Requires(pre): shadow-utils @@ -57,8 +55,8 @@ make DESTDIR=$RPM_BUILD_ROOT install # config install -d ${RPM_BUILD_ROOT}%{_sysconfdir} install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -install -m 644 samples/cgconfig.conf $RPM_BUILD_ROOT%{_sysconfdir}/cgconfig.conf -install -m 644 samples/cgsnapshot_blacklist.conf $RPM_BUILD_ROOT%{_sysconfdir}/cgsnapshot_blacklist.conf +install -m 644 samples/config/cgconfig.conf $RPM_BUILD_ROOT%{_sysconfdir}/cgconfig.conf +install -m 644 samples/config/cgsnapshot_denylist.conf $RPM_BUILD_ROOT%{_sysconfdir}/cgsnapshot_denylist.conf # Only one pam_cgroup.so is needed #mv -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so @@ -97,7 +95,7 @@ getent group cgred >/dev/null || groupadd -r cgred %{!?_licensedir:%global license %%doc} %license COPYING %{_libdir}/libcgroup.so.* -%config(noreplace) %{_sysconfdir}/cgsnapshot_blacklist.conf +%config(noreplace) %{_sysconfdir}/cgsnapshot_denylist.conf %config(noreplace) %{_sysconfdir}/cgconfig.conf /usr/bin/cgget /usr/bin/cgset @@ -106,12 +104,14 @@ getent group cgred >/dev/null || groupadd -r cgred /usr/bin/cgsnapshot /usr/bin/lscgroup /usr/bin/lssubsys -/usr/sbin/cgclear /usr/sbin/cgconfigparser %attr(2755, root, cgred) /usr/bin/cgexec %attr(2755, root, cgred) /usr/bin/cgclassify %attr(0755, root, root) %{_libdir}/security/pam_cgroup.so %{_unitdir}/cgconfig.service +%{_bindir}/cgxget +%{_bindir}/cgxset +%{_bindir}/libcgroup_systemd_idle_thread %files devel %{!?_licensedir:%global license %%doc} @@ -129,6 +129,12 @@ getent group cgred >/dev/null || groupadd -r cgred %attr(0644, root, root) %{_mandir}/man8/* %changelog +* Wed Aug 16 2023 luoyujie - 3.1.0-1 +- Type: upgrade +- Id:NA +- SUG:NA +- DESC:update release version to v3.1.0 + * Wed Apr 19 2023 jichengke - 2.0.3-2 - modify bogus date in changelog