Re: [PR PATCH] [Updated] libcgroup: update to 2.0

[wibed <wibed@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup: update to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 4609 bytes --]

From ec5cd87e952557b4c131f813265e8212cec99d90 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH] upgrade to 2.0

upgrade to 2.0
---
 srcpkgs/libcgroup/patches/CVE-2018-14348.patch |  4 ++--
 .../patches/api.c-fix-infinite-loop.patch      |  4 ++--
 srcpkgs/libcgroup/patches/musl-decls.patch     |  4 ++--
 .../libcgroup/patches/musl-strerror_r.patch    |  4 ++--
 srcpkgs/libcgroup/template                     | 18 +++++++-----------
 srcpkgs/libcgroup/update                       |  1 -
 6 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
index bd083c2aad97..0aa1f906ff63 100644
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -1,5 +1,5 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
+--- src/daemon/cgrulesengd.c
++++ src/daemon/cgrulesengd.c
 @@ -889,9 +889,6 @@
  		} else if (pid > 0) {
  			exit(EXIT_SUCCESS);
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
index 12ee0eeebc84..13be3795dfd3 100644
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -11,8 +11,8 @@ to the next iteration.
 
 diff --git a/src/api.c b/src/api.c
 index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
+--- src/api.c
++++ src/api.c
 @@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
  			/* Get the group data. */
  			sp = &(rule->username[1]);
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..eaebdb8936c3 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -1,8 +1,8 @@
 In musl libc these macros are defined in the deprecated
 include file sys/cdefs.h
 
---- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
-+++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
+--- include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
++++ include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
 @@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f54e12b05d2..eac640ba994f 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -1,8 +1,8 @@
 The musl libc strerror_r(3) semantics are different from
 GNU libc's if _GNU_SOURCE is defined.
 
---- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
-+++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
+--- src/api.c	2014-01-13 15:05:56.000000000 +0100
++++ src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
  
  const char *cgroup_strerror(int code)
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..70dccea0068f 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"