Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libcgroup: update to 2.0. #32231

Closed
wants to merge 10 commits into from
Closed

libcgroup: update to 2.0. #32231

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3143a5f
libcgroup: update to 2.0.
HUSSEIN394 Jul 28, 2021
829c001
Merge branch 'void-linux:master' into master
wibed Aug 18, 2021
51408c6
libcgroup update version 2.o
mt3 Aug 18, 2021
2a257f4
checksum bz2 corrected
Aug 19, 2021
977070c
upgrade to 2.0
Aug 20, 2021
16430b5
empty
Aug 20, 2021
ef1055f
Revert "NO PUSH"
Aug 20, 2021
1c26c9c
Merge remote-tracking branch 'refs/remotes/origin/master'
Aug 20, 2021
54ca517
update to 2.0
Aug 21, 2021
ef978d8
libcgroup update version 2.o
mt3 Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions srcpkgs/libcgroup/patches/CVE-2018-14348.patch
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions srcpkgs/libcgroup/patches/musl-decls.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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
@@ -16,6 +16,16 @@
@@ -16,5 +16,15 @@
#ifndef _LIBCGROUP_H
#define _LIBCGROUP_H

Expand All @@ -18,5 +18,4 @@ include file sys/cdefs.h
+#endif /* !defined(__GLIBC__) */
+
#define _LIBCGROUP_H_INSIDE

#include <libcgroup/error.h>
4 changes: 2 additions & 2 deletions ...s/libcgroup/patches/musl-strerror_r.patch → ...gs/libcgroup/patches/musl-sterror_r.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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
@@ -3332,8 +3332,16 @@

wibed marked this conversation as resolved.
Show resolved Hide resolved
const char *cgroup_strerror(int code)
{
+#if defined(__GLIBC__)
Expand All @@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
+ return "strerror_r() failed";
+ }
+#endif

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert the changes on patches

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the file has been reverted as in the original

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something is wrong, GitHub still shows the change. Are you sure you reverted the changes?

return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
}
14 changes: 5 additions & 9 deletions srcpkgs/libcgroup/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
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
homepage="https://github.com/libcgroup/libcgroup"
distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't use $pkgname please

checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8

case "$XBPS_TARGET_MACHINE" in
*-musl) # Add musl-fts implementation
Expand All @@ -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;;"
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/libcgroup/update
View file
Open in desktop

This file was deleted.