From fd20da3288c419d01902990694c82b770d17b106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Sat, 12 Mar 2022 06:28:55 +0100
Subject: [PATCH] New upstream release 2.0.1 - resolves: #2063319

---
 .gitignore                             |  2 ++
 libcgroup-0.40.rc1-fread.patch         |  6 +++---
 libcgroup-0.40.rc1-templates-fix.patch |  4 ++--
 libcgroup.spec                         | 17 +++++++++--------
 sources                                |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 775f0fc..b167584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
 /libcgroup-v0.42.1.tar.gz
 /libcgroup-v0.42.2.tar.gz
 /libcgroup-v2.0.tar.gz
+/libcgroup-v2.0.1.tar.gz
 /3c0c7b164b4221d78459fccdd49643a5dcb3f73d.tar.gz
+/626dfc9e8dbad6dde09f43cfa086f31e945e2c8a.tar.gz
diff --git a/libcgroup-0.40.rc1-fread.patch b/libcgroup-0.40.rc1-fread.patch
index aec1e98..9cf23d1 100644
--- a/libcgroup-0.40.rc1-fread.patch
+++ b/libcgroup-0.40.rc1-fread.patch
@@ -1,8 +1,8 @@
 diff --git a/src/api.c b/src/api.c
-index df9afe8..537cf10 100644
+index 0a0f756..5aefe85 100644
 --- a/src/api.c
 +++ b/src/api.c
-@@ -2981,29 +2981,29 @@ static int cg_rd_ctrl_file(const char *subsys, const char *cgroup,
+@@ -3067,29 +3067,29 @@ static int cg_rd_ctrl_file(const char *subsys, const char *cgroup,
  					const char *file, char **value)
  {
  	char path[FILENAME_MAX];
@@ -39,7 +39,7 @@ index df9afe8..537cf10 100644
  	if (ret < 0) {
  		free(*value);
  		*value = NULL;
-@@ -3013,7 +3013,7 @@ static int cg_rd_ctrl_file(const char *subsys, const char *cgroup,
+@@ -3099,7 +3099,7 @@ static int cg_rd_ctrl_file(const char *subsys, const char *cgroup,
  			(*value)[ret-1] = '\0';
  	}
  
diff --git a/libcgroup-0.40.rc1-templates-fix.patch b/libcgroup-0.40.rc1-templates-fix.patch
index 1fc9fd0..5d15edb 100644
--- a/libcgroup-0.40.rc1-templates-fix.patch
+++ b/libcgroup-0.40.rc1-templates-fix.patch
@@ -1,8 +1,8 @@
 diff --git a/src/api.c b/src/api.c
-index 537cf10..483eabc 100644
+index 5aefe85..753f5ce 100644
 --- a/src/api.c
 +++ b/src/api.c
-@@ -3959,10 +3959,10 @@ int cgroup_change_cgroup_flags(uid_t uid, gid_t gid,
+@@ -4059,10 +4059,10 @@ int cgroup_change_cgroup_flags(uid_t uid, gid_t gid,
  						available, "%d", pid);
  					break;
  				case 'p':
diff --git a/libcgroup.spec b/libcgroup.spec
index 8fa2c8c..d4e9d45 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -1,11 +1,11 @@
 %bcond_with tests
 
-%global tests_commit 3c0c7b164b4221d78459fccdd49643a5dcb3f73d
+%global tests_commit 626dfc9e8dbad6dde09f43cfa086f31e945e2c8a
 
 Summary: Library to control and monitor control groups
 Name: libcgroup
-Version: 2.0
-Release: 4%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz
@@ -90,8 +90,7 @@ install -m 644 samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.con
 install -m 644 samples/cgsnapshot_blacklist.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgsnapshot_blacklist.conf
 
 # sanitize pam module, we need only pam_cgroup.so
-mv -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.{,l}a $RPM_BUILD_ROOT/%{_libdir}/security/pam_cgroup.so.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.{,l}a
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{,l}a
 
@@ -134,8 +133,7 @@ make -C tests/gunit check
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc README
-%{_libdir}/libcgroup.so.1*
-%{_libdir}/libcgset.so.0*
+%{_libdir}/libcgroup.so.2*
 
 %files tools
 %{!?_licensedir:%global license %%doc}
@@ -172,10 +170,13 @@ make -C tests/gunit check
 %{_includedir}/libcgroup.h
 %{_includedir}/libcgroup/*.h
 %{_libdir}/libcgroup.so
-%{_libdir}/libcgset.so
 %{_libdir}/pkgconfig/libcgroup.pc
 
 %changelog
+* Sat Mar 12 2022 Nikola Forró <nforro@redhat.com> - 2.0.1-1
+- New upstream release 2.0.1
+  resolves: #2063319
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 5fa79b2..382adb5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libcgroup-v2.0.tar.gz) = 22d867c6ff939d919c14d0e4af68b747bc21e9760344f12e9ed52574173d46822e85bace3976addd8a2826b4a985507eb78eb54c10df07442232bde30ba2181e
-SHA512 (3c0c7b164b4221d78459fccdd49643a5dcb3f73d.tar.gz) = db69e13f1814134bdc73af64e07adf7097da284a82d4733209b955f59bacd7970e223408703dff59f358b11b4fd7bdb6b6adab759065a40cc098802f90c0afce
+SHA512 (libcgroup-v2.0.1.tar.gz) = 2cb9df75e51b865e07c1f237b534a933d26cb923bf9db0d6924b0190fa71e66b9d416fa80767d88cf640e2dc6a7d6b1c5523ac54eadd3357d63853c60a1877e7
+SHA512 (626dfc9e8dbad6dde09f43cfa086f31e945e2c8a.tar.gz) = c3bebd2b54112547e1662243fb112d65dbbaf0b1ae1e04cf79d7588df2aee884165fa2b5a870a6925d343f763d0723327e395320054dcbabd133ec0dad59b5af