Bug#990990: unblock: libcgroup/2.0
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Background:
https://www.debian.org/releases/testing/amd64/release-notes/ch-information.en.html#openstack-cgroups
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959022#66
I noticed a version of libcgroup with support for control groups v2
is now in experimental.
Given then known problems with the libcgroup currently in bullseye
(it only works when booting with special kernel parameters),
this bug is a question to the release team and the OpenStack
maintainer whether updating libcgroup in bullseye to the version
currently in experimental might be the smaller evil compared
to the current release notes approach.
Complete diffstat compared to the version in testing:
223 files changed, 73421 insertions(+), 34626 deletions(-)
Diff of debian/ is attached.
The new version adds autopkgtests, but they aren't currently run:
SKIP Test requires machine-level isolation but testbed does not provide that
No new bugs are reported in the BTS.
Tnd the debdiff of debian/ looks sane, except for a 12 -> 13 dh compat
bump that is revertable if requested.
Both libcgroup1.symbols and abidiff of the shared library look sane.
There are new libraries (libcgset and libcgroupfortesting) that are unused.
They lack .so symlinks in libcgroup-dev, which is an easily fixable bug.
The only package currently linked with libcgroup1 in bullseye
is clsync (OpenStack uses cgroup-tools), debdiff and diffoscope
find no code changes when rebuilding with libcgroup from experimental.
diff -Nru libcgroup-0.41/debian/changelog libcgroup-2.0/debian/changelog
--- libcgroup-0.41/debian/changelog 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/changelog 2021-05-11 16:54:21.000000000 +0300
@@ -1,3 +1,36 @@
+libcgroup (2.0-1) experimental; urgency=medium
+
+ * New upstream version 2.0
+ - Fix cgroup-tools does not work in cgroup2 / unified hierarchy
+ (Closes: #959022)
+ * Add upstream signing key
+ * Update debian/watch to include matching signature
+ * Fix test-cgroupv1, set linux cmdline to support cgroupv1
+ * Redirect update-grub stderr to stdout in d/test/tools-cgroupv1. Thanks to
+ Simon McVittie
+ * Add debian/tests/tools-cgroupv2
+ * Update d/copyright to include googletest
+ * Update debian/libcgroup1.symbols
+ * Add Build-Depends-Package field to libcgroup1.symbols
+
+ -- Santiago Ruano Rincón <santiago.ruano-rincon@imt-atlantique.fr> Tue, 11 May 2021 15:54:21 +0200
+
+libcgroup (0.42.2-1) experimental; urgency=medium
+
+ * Update d/watch to point to the new upstream at github
+ * New upstream version 0.42.2
+ * Remove no longer needed debian/patches/CVE-2018-14348.patch
+ * Bump debhelper-compat to 13
+ * Bump Standards-Version to 4.5.1. No changes required
+ * Install *.a files into libcgroup-dev
+ * d/rules: remove security/*.a to avoid --fail-missing error
+ * Add debian/salsa-ci.yml
+ * Add d/tests/tools-cgroupv1
+ * Update debian/libcgroup1.symbols
+ * Adopt libcgroup (Closes: #823161)
+
+ -- Santiago Ruano Rincón <santiago.ruano-rincon@imt-atlantique.fr> Tue, 13 Apr 2021 20:48:31 +0200
+
libcgroup (0.41-11) unstable; urgency=medium
* QA upload.
diff -Nru libcgroup-0.41/debian/control libcgroup-2.0/debian/control
--- libcgroup-0.41/debian/control 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/control 2021-04-13 22:51:58.000000000 +0300
@@ -1,14 +1,14 @@
Source: libcgroup
Priority: optional
Section: libs
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Santiago Ruano Rincón <santiago.ruano-rincon@imt-atlantique.fr>
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
bison,
flex,
libpam-dev,
Rules-Requires-Root: no
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
Homepage: http://libcg.sourceforge.net/
Vcs-Git: https://salsa.debian.org/debian/libcgroup.git
Vcs-Browser: https://salsa.debian.org/debian/libcgroup
diff -Nru libcgroup-0.41/debian/copyright libcgroup-2.0/debian/copyright
--- libcgroup-0.41/debian/copyright 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/copyright 2021-04-30 16:30:55.000000000 +0300
@@ -13,6 +13,10 @@
2008 Vivek Goyal <vgoyal@redhat.com>
License: BSD-3-clause or GPL-2, and LGPL-2.1
+Files: googletest/*
+Copyright: 2008, Google Inc.
+License: BSD-3-clause-google
+
Files: debian/*
Copyright: 2009 Jon Bernard <jbernard@debian.org>
2013-2014 Daniel Baumann <mail@daniel-baumann.ch>
@@ -46,6 +50,33 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
+License: BSD-3-clause-google
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
License: GPL-2
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru libcgroup-0.41/debian/gbp.conf libcgroup-2.0/debian/gbp.conf
--- libcgroup-0.41/debian/gbp.conf 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/gbp.conf 2021-04-13 18:00:45.000000000 +0300
@@ -1,5 +1,6 @@
[DEFAULT]
pristine-tar = True
+debian-branch=debian/master
[buildpackage]
compression = xz
diff -Nru libcgroup-0.41/debian/libcgroup1.symbols libcgroup-2.0/debian/libcgroup1.symbols
--- libcgroup-0.41/debian/libcgroup1.symbols 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/libcgroup1.symbols 2021-05-11 16:35:34.000000000 +0300
@@ -1,4 +1,5 @@
libcgroup.so.1 libcgroup1 #MINVER#
+* Build-Depends-Package: libcgroup-dev
CGROUP_0.32.1@CGROUP_0.32.1 0.36.2
CGROUP_0.32@CGROUP_0.32 0.36.2
CGROUP_0.33@CGROUP_0.33 0.36.2
@@ -8,7 +9,15 @@
CGROUP_0.37@CGROUP_0.37 0.37.1
CGROUP_0.38@CGROUP_0.38 0.38
CGROUP_0.39@CGROUP_0.39 0.40~rc1
+ CGROUP_0.40@CGROUP_0.40 0.42.2
+ CGROUP_0.41@CGROUP_0.41 0.42.2
+ CGROUP_0.42@CGROUP_0.42 0.42.2
+ CGROUP_2.0@CGROUP_2.0 2.0
+ cg_build_path_locked@CGROUP_2.0 2.0
cg_chmod_recursive@CGROUP_0.37 0.37.1
+ cg_mount_table@CGROUP_2.0 2.0
+ cg_mount_table_lock@CGROUP_2.0 2.0
+ cgroup_add_all_controllers@CGROUP_0.42 0.42.2
cgroup_add_controller@CGROUP_0.32 0.36.2
cgroup_add_value_bool@CGROUP_0.32 0.36.2
cgroup_add_value_int64@CGROUP_0.32 0.36.2
@@ -16,6 +25,7 @@
cgroup_add_value_uint64@CGROUP_0.32 0.36.2
cgroup_attach_task@CGROUP_0.32 0.36.2
cgroup_attach_task_pid@CGROUP_0.32 0.36.2
+ cgroup_build_tasks_procs_path@CGROUP_2.0 2.0
cgroup_change_all_cgroups@CGROUP_0.39 0.40~rc1
cgroup_change_cgroup_flags@CGROUP_0.34 0.36.2
cgroup_change_cgroup_path@CGROUP_0.32 0.36.2
@@ -32,6 +42,7 @@
cgroup_create_cgroup_from_parent@CGROUP_0.32 0.36.2
cgroup_delete_cgroup@CGROUP_0.32 0.36.2
cgroup_delete_cgroup_ext@CGROUP_0.35 0.36.2
+ cgroup_fill_cgc@CGROUP_2.0 2.0
cgroup_free@CGROUP_0.32 0.36.2
cgroup_free_controllers@CGROUP_0.32 0.36.2
cgroup_get_all_controller_begin@CGROUP_0.35 0.36.2
@@ -42,6 +53,7 @@
cgroup_get_controller_begin@CGROUP_0.34 0.36.2
cgroup_get_controller_end@CGROUP_0.34 0.36.2
cgroup_get_controller_next@CGROUP_0.34 0.36.2
+ cgroup_get_controller_version@CGROUP_2.0 2.0
cgroup_get_current_controller_path@CGROUP_0.32 0.36.2
cgroup_get_last_errno@CGROUP_0.33 0.36.2
cgroup_get_procname_from_procfs@CGROUP_0.34 0.36.2
@@ -64,6 +76,7 @@
cgroup_init@CGROUP_0.32 0.36.2
cgroup_init_rules_cache@CGROUP_0.32 0.36.2
cgroup_init_templates_cache@CGROUP_0.39 0.40~rc1
+ cgroup_load_templates_cache_from_files@CGROUP_0.40 0.42.2
cgroup_log@CGROUP_0.39 0.40~rc1
cgroup_modify_cgroup@CGROUP_0.32 0.36.2
cgroup_new_cgroup@CGROUP_0.32 0.36.2
@@ -88,9 +101,222 @@
cgroup_set_value_string@CGROUP_0.32 0.36.2
cgroup_set_value_uint64@CGROUP_0.32 0.36.2
cgroup_strerror@CGROUP_0.32.1 0.36.2
+ cgroup_templates_cache_set_source_files@CGROUP_0.40 0.42.2
+ cgroup_test_subsys_mounted@CGROUP_2.0 2.0
cgroup_unload_cgroups@CGROUP_0.34 0.36.2
cgroup_walk_tree_begin@CGROUP_0.33 0.36.2
cgroup_walk_tree_end@CGROUP_0.33 0.36.2
cgroup_walk_tree_next@CGROUP_0.33 0.36.2
cgroup_walk_tree_set_flags@CGROUP_0.34 0.36.2
create_cgroup_from_name_value_pairs@CGROUP_0.35 0.36.2
+libcgroupfortesting.so.1 libcgroup1 #MINVER#
+ CGROUP_0.32.1@CGROUP_0.32.1 0.42.2
+ CGROUP_0.32@CGROUP_0.32 0.42.2
+ CGROUP_0.33@CGROUP_0.33 0.42.2
+ CGROUP_0.34@CGROUP_0.34 0.42.2
+ CGROUP_0.35@CGROUP_0.35 0.42.2
+ CGROUP_0.36@CGROUP_0.36 0.42.2
+ CGROUP_0.37@CGROUP_0.37 0.42.2
+ CGROUP_0.38@CGROUP_0.38 0.42.2
+ CGROUP_0.39@CGROUP_0.39 0.42.2
+ CGROUP_0.40@CGROUP_0.40 0.42.2
+ CGROUP_0.41@CGROUP_0.41 0.42.2
+ CGROUP_0.42@CGROUP_0.42 0.42.2
+ MAX_CGROUPS@CGROUP_0.32 0.42.2
+ MAX_TEMPLATES@CGROUP_0.32 0.42.2
+ _cgroup_config_compare_groups@CGROUP_0.32 0.42.2
+ cg_add_duplicate_mount@CGROUP_0.32 0.42.2
+ cg_build_path@CGROUP_0.32 0.42.2
+ cg_build_path_locked@CGROUP_0.32 2.0
+ cg_chmod_file@CGROUP_0.32 0.42.2
+ cg_chmod_path@CGROUP_0.32 0.42.2
+ cg_chmod_recursive@CGROUP_0.37 0.42.2
+ cg_get_cgroups_from_proc_cgroups@CGROUP_0.32 0.42.2
+ cg_mkdir_p@CGROUP_0.32 0.42.2
+ cg_mount_table@CGROUP_0.32 0.42.2
+ cg_mount_table_lock@CGROUP_0.32 0.42.2
+ cg_namespace_table@CGROUP_0.32 0.42.2
+ cgroup_add_all_controllers@CGROUP_0.42 0.42.2
+ cgroup_add_cgroup_templates@CGROUP_0.32 0.42.2
+ cgroup_add_controller@CGROUP_0.32 0.42.2
+ cgroup_add_value_bool@CGROUP_0.32 0.42.2
+ cgroup_add_value_int64@CGROUP_0.32 0.42.2
+ cgroup_add_value_string@CGROUP_0.32 0.42.2
+ cgroup_add_value_uint64@CGROUP_0.32 0.42.2
+ cgroup_attach_task@CGROUP_0.32 0.42.2
+ cgroup_attach_task_pid@CGROUP_0.32 0.42.2
+ cgroup_build_tasks_procs_path@CGROUP_0.32 2.0
+ cgroup_change_all_cgroups@CGROUP_0.39 0.42.2
+ cgroup_change_cgroup_flags@CGROUP_0.34 0.42.2
+ cgroup_change_cgroup_path@CGROUP_0.32 0.42.2
+ cgroup_change_cgroup_uid_gid@CGROUP_0.32 0.42.2
+ cgroup_change_cgroup_uid_gid_flags@CGROUP_0.32 0.42.2
+ cgroup_chown_chmod_tasks@CGROUP_0.32 2.0
+ cgroup_compare_cgroup@CGROUP_0.32 0.42.2
+ cgroup_compare_controllers@CGROUP_0.32 0.42.2
+ cgroup_compare_ignore_rule@CGROUP_0.32 0.42.2
+ cgroup_compare_wildcard_procname@CGROUP_0.32 0.42.2
+ cgroup_config_cleanup_mount_table@CGROUP_0.32 0.42.2
+ cgroup_config_cleanup_namespace_table@CGROUP_0.32 0.42.2
+ cgroup_config_create_template_group@CGROUP_0.39 0.42.2
+ cgroup_config_define_default@CGROUP_0.32 0.42.2
+ cgroup_config_group_admin_perm@CGROUP_0.32 0.42.2
+ cgroup_config_group_task_perm@CGROUP_0.32 0.42.2
+ cgroup_config_insert_cgroup@CGROUP_0.32 0.42.2
+ cgroup_config_insert_into_mount_table@CGROUP_0.32 0.42.2
+ cgroup_config_insert_into_namespace_table@CGROUP_0.32 0.42.2
+ cgroup_config_load_config@CGROUP_0.32 0.42.2
+ cgroup_config_parse_controller_options@CGROUP_0.32 0.42.2
+ cgroup_config_set_default@CGROUP_0.38 0.42.2
+ cgroup_config_unload_config@CGROUP_0.38 0.42.2
+ cgroup_copy_cgroup@CGROUP_0.32 0.42.2
+ cgroup_copy_with_slash@CGROUP_0.32 0.42.2
+ cgroup_create_cgroup@CGROUP_0.32 0.42.2
+ cgroup_create_cgroup_from_parent@CGROUP_0.32 0.42.2
+ cgroup_delete_cgroup@CGROUP_0.32 0.42.2
+ cgroup_delete_cgroup_ext@CGROUP_0.35 0.42.2
+ cgroup_dictionary_add@CGROUP_0.32 0.42.2
+ cgroup_dictionary_create@CGROUP_0.32 0.42.2
+ cgroup_dictionary_free@CGROUP_0.32 0.42.2
+ cgroup_dictionary_iterator_begin@CGROUP_0.32 0.42.2
+ cgroup_dictionary_iterator_end@CGROUP_0.32 0.42.2
+ cgroup_dictionary_iterator_next@CGROUP_0.32 0.42.2
+ cgroup_exist_in_subsystem@CGROUP_0.32 0.42.2
+ cgroup_expand_template_table@CGROUP_0.32 0.42.2
+ cgroup_fill_cgc@CGROUP_0.32 2.0
+ cgroup_free@CGROUP_0.32 0.42.2
+ cgroup_free_controllers@CGROUP_0.32 0.42.2
+ cgroup_get_all_controller_begin@CGROUP_0.35 0.42.2
+ cgroup_get_all_controller_end@CGROUP_0.35 0.42.2
+ cgroup_get_all_controller_next@CGROUP_0.35 0.42.2
+ cgroup_get_cgroup@CGROUP_0.32 0.42.2
+ cgroup_get_cgroup_name@CGROUP_0.32 0.42.2
+ cgroup_get_controller@CGROUP_0.34 0.42.2
+ cgroup_get_controller_begin@CGROUP_0.34 0.42.2
+ cgroup_get_controller_end@CGROUP_0.34 0.42.2
+ cgroup_get_controller_next@CGROUP_0.34 0.42.2
+ cgroup_get_controller_version@CGROUP_0.32 2.0
+ cgroup_get_current_controller_path@CGROUP_0.32 0.42.2
+ cgroup_get_last_errno@CGROUP_0.33 0.42.2
+ cgroup_get_procname_from_procfs@CGROUP_0.34 0.42.2
+ cgroup_get_procs@CGROUP_0.37 0.42.2
+ cgroup_get_subsys_mount_point@CGROUP_0.34 0.42.2
+ cgroup_get_subsys_mount_point_begin@CGROUP_0.38 0.42.2
+ cgroup_get_subsys_mount_point_end@CGROUP_0.38 0.42.2
+ cgroup_get_subsys_mount_point_next@CGROUP_0.38 0.42.2
+ cgroup_get_task_begin@CGROUP_0.34 0.42.2
+ cgroup_get_task_end@CGROUP_0.34 0.42.2
+ cgroup_get_task_next@CGROUP_0.34 0.42.2
+ cgroup_get_uid_gid@CGROUP_0.32 0.42.2
+ cgroup_get_uid_gid_from_procfs@CGROUP_0.34 0.42.2
+ cgroup_get_value_bool@CGROUP_0.32 0.42.2
+ cgroup_get_value_int64@CGROUP_0.32 0.42.2
+ cgroup_get_value_name@CGROUP_0.35 0.42.2
+ cgroup_get_value_name_count@CGROUP_0.35 0.42.2
+ cgroup_get_value_string@CGROUP_0.32 0.42.2
+ cgroup_get_value_uint64@CGROUP_0.32 0.42.2
+ cgroup_init@CGROUP_0.32 0.42.2
+ cgroup_init_rules_cache@CGROUP_0.32 0.42.2
+ cgroup_init_templates_cache@CGROUP_0.39 0.42.2
+ cgroup_load_templates_cache_from_files@CGROUP_0.40 0.42.2
+ cgroup_log@CGROUP_0.39 0.42.2
+ cgroup_modify_cgroup@CGROUP_0.32 0.42.2
+ cgroup_new_cgroup@CGROUP_0.32 0.42.2
+ cgroup_parse_log_level_str@CGROUP_0.39 0.42.2
+ cgroup_parse_rules_options@CGROUP_0.32 0.42.2
+ cgroup_print_rules_config@CGROUP_0.32 0.42.2
+ cgroup_process_v1_mnt@CGROUP_0.32 2.0
+ cgroup_process_v2_mnt@CGROUP_0.32 2.0
+ cgroup_read_stats_begin@CGROUP_0.34 0.42.2
+ cgroup_read_stats_end@CGROUP_0.34 0.42.2
+ cgroup_read_stats_next@CGROUP_0.34 0.42.2
+ cgroup_read_value_begin@CGROUP_0.37 0.42.2
+ cgroup_read_value_end@CGROUP_0.37 0.42.2
+ cgroup_read_value_next@CGROUP_0.37 0.42.2
+ cgroup_register_unchanged_process@CGROUP_0.34 0.42.2
+ cgroup_reload_cached_rules@CGROUP_0.32 0.42.2
+ cgroup_reload_cached_templates@CGROUP_0.39 0.42.2
+ cgroup_set_default_logger@CGROUP_0.39 0.42.2
+ cgroup_set_logger@CGROUP_0.39 0.42.2
+ cgroup_set_loglevel@CGROUP_0.39 0.42.2
+ cgroup_set_permissions@CGROUP_0.38 0.42.2
+ cgroup_set_uid_gid@CGROUP_0.32 0.42.2
+ cgroup_set_value_bool@CGROUP_0.32 0.42.2
+ cgroup_set_value_int64@CGROUP_0.32 0.42.2
+ cgroup_set_value_string@CGROUP_0.32 0.42.2
+ cgroup_set_value_uint64@CGROUP_0.32 0.42.2
+ cgroup_set_values_recursive@CGROUP_0.32 2.0
+ cgroup_strerror@CGROUP_0.32.1 0.42.2
+ cgroup_strerror_codes@CGROUP_0.32 0.42.2
+ cgroup_templates_cache_set_source_files@CGROUP_0.40 0.42.2
+ cgroup_test_subsys_mounted@CGROUP_0.32 2.0
+ cgroup_unload_cgroups@CGROUP_0.34 0.42.2
+ cgroup_walk_tree_begin@CGROUP_0.33 0.42.2
+ cgroup_walk_tree_end@CGROUP_0.33 0.42.2
+ cgroup_walk_tree_next@CGROUP_0.33 0.42.2
+ cgroup_walk_tree_set_flags@CGROUP_0.34 0.42.2
+ cgroupv2_controller_enabled@CGROUP_0.32 2.0
+ cgroupv2_get_subtree_control@CGROUP_0.32 2.0
+ cgroupv2_subtree_control@CGROUP_0.32 2.0
+ cgroupv2_subtree_control_recursive@CGROUP_0.32 2.0
+ config_group_admin_perm@CGROUP_0.32 0.42.2
+ config_group_task_perm@CGROUP_0.32 0.42.2
+ config_insert_cgroup@CGROUP_0.32 0.42.2
+ config_parse_controller_options@CGROUP_0.32 0.42.2
+ create_cgroup_from_name_value_pairs@CGROUP_0.35 0.42.2
+ init_cgroup_table@CGROUP_0.32 0.42.2
+ last_errno@CGROUP_0.32 0.42.2
+ line_no@CGROUP_0.32 0.42.2
+ parser_error_env@CGROUP_0.32 0.42.2
+ template_config_group_admin_perm@CGROUP_0.32 0.42.2
+ template_config_group_task_perm@CGROUP_0.32 0.42.2
+ template_config_insert_cgroup@CGROUP_0.32 0.42.2
+ template_config_parse_controller_options@CGROUP_0.32 0.42.2
+ yy_create_buffer@CGROUP_0.32 0.42.2
+ yy_delete_buffer@CGROUP_0.32 0.42.2
+ yy_flex_debug@CGROUP_0.32 0.42.2
+ yy_flush_buffer@CGROUP_0.32 0.42.2
+ yy_scan_buffer@CGROUP_0.32 0.42.2
+ yy_scan_bytes@CGROUP_0.32 0.42.2
+ yy_scan_string@CGROUP_0.32 0.42.2
+ yy_switch_to_buffer@CGROUP_0.32 0.42.2
+ yyalloc@CGROUP_0.32 0.42.2
+ yychar@CGROUP_0.32 0.42.2
+ yyfree@CGROUP_0.32 0.42.2
+ yyget_debug@CGROUP_0.32 0.42.2
+ yyget_in@CGROUP_0.32 0.42.2
+ yyget_leng@CGROUP_0.32 0.42.2
+ yyget_lineno@CGROUP_0.32 0.42.2
+ yyget_out@CGROUP_0.32 0.42.2
+ yyget_text@CGROUP_0.32 0.42.2
+ yyin@CGROUP_0.32 0.42.2
+ yyleng@CGROUP_0.32 0.42.2
+ yylex@CGROUP_0.32 0.42.2
+ yylex_destroy@CGROUP_0.32 0.42.2
+ yylineno@CGROUP_0.32 0.42.2
+ yylval@CGROUP_0.32 0.42.2
+ yynerrs@CGROUP_0.32 0.42.2
+ yyout@CGROUP_0.32 0.42.2
+ yyparse@CGROUP_0.32 0.42.2
+ yypop_buffer_state@CGROUP_0.32 0.42.2
+ yypush_buffer_state@CGROUP_0.32 0.42.2
+ yyrealloc@CGROUP_0.32 0.42.2
+ yyrestart@CGROUP_0.32 0.42.2
+ yyset_debug@CGROUP_0.32 0.42.2
+ yyset_in@CGROUP_0.32 0.42.2
+ yyset_lineno@CGROUP_0.32 0.42.2
+ yyset_out@CGROUP_0.32 0.42.2
+ yytext@CGROUP_0.32 0.42.2
+ yywrap@CGROUP_0.32 0.42.2
+libcgset.so.0 libcgroup1 #MINVER#
+ cgroup_free_group_spec@Base 2.0
+ cgroup_string_list_add_directory@Base 2.0
+ cgroup_string_list_add_item@Base 2.0
+ cgroup_string_list_free@Base 2.0
+ cgroup_string_list_init@Base 2.0
+ flags@Base 2.0
+ main@Base 2.0
+ parse_cgroup_spec@Base 2.0
+ parse_mode@Base 2.0
+ parse_r_flag@Base 2.0
+ parse_uid_gid@Base 2.0
diff -Nru libcgroup-0.41/debian/libcgroup-dev.install libcgroup-2.0/debian/libcgroup-dev.install
--- libcgroup-0.41/debian/libcgroup-dev.install 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/libcgroup-dev.install 2021-04-13 17:16:18.000000000 +0300
@@ -1,3 +1,4 @@
usr/include
usr/lib/*/*.so
usr/lib/*/pkgconfig
+lib/*/*.a
diff -Nru libcgroup-0.41/debian/patches/CVE-2018-14348.patch libcgroup-2.0/debian/patches/CVE-2018-14348.patch
--- libcgroup-0.41/debian/patches/CVE-2018-14348.patch 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/patches/CVE-2018-14348.patch 1970-01-01 02:00:00.000000000 +0200
@@ -1,23 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Sun, 19 Aug 2018 23:09:25 +0200
-Subject: CVE-2018-14348
-
-Bug-Debian: https://bugs.debian.org/906308
-Origin: https://sourceforge.net/p/libcg/libcg/ci/0d88b73d189ea3440ccaab00418d6469f76fa590/
----
- src/daemon/cgrulesengd.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
-index 367b898..ffd1fc3 100644
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -886,8 +886,6 @@ int cgre_start_daemon(const char *logp, const int logf,
- exit(EXIT_SUCCESS);
- }
-
-- /* Change the file mode mask. */
-- umask(0);
- } else {
- flog(LOG_DEBUG, "Not using daemon mode\n");
- pid = getpid();
diff -Nru libcgroup-0.41/debian/patches/series libcgroup-2.0/debian/patches/series
--- libcgroup-0.41/debian/patches/series 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/patches/series 2021-04-13 17:12:35.000000000 +0300
@@ -4,5 +4,4 @@
initscript-return.patch
Syntax-fixes-for-man-pages.patch
pam_cgroup-Revert-broken-cache-usage.patch
-CVE-2018-14348.patch
cgrulesengd-_GNU_SOURCE.patch
diff -Nru libcgroup-0.41/debian/patches/Syntax-fixes-for-man-pages.patch libcgroup-2.0/debian/patches/Syntax-fixes-for-man-pages.patch
--- libcgroup-0.41/debian/patches/Syntax-fixes-for-man-pages.patch 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/patches/Syntax-fixes-for-man-pages.patch 2021-04-13 17:12:21.000000000 +0300
@@ -22,10 +22,10 @@
doc/man/lssubsys.1 | 28 ++++++++++----------
14 files changed, 150 insertions(+), 150 deletions(-)
-diff --git a/doc/man/cgclassify.1 b/doc/man/cgclassify.1
-index db4e086..4a24b31 100644
---- a/doc/man/cgclassify.1
-+++ b/doc/man/cgclassify.1
+Index: libcgroup/doc/man/cgclassify.1
+===================================================================
+--- libcgroup.orig/doc/man/cgclassify.1
++++ libcgroup/doc/man/cgclassify.1
@@ -6,7 +6,7 @@
cgclassify \- move running task(s) to given cgroups
@@ -53,7 +53,7 @@
If this option is used, the daemon of service cgred (cgrulesengd process)
does not change both the specified \fBpidlist\fR and their children tasks.
Without this option, the daemon does not change the specified \fBpidlist\fR
-@@ -42,7 +42,7 @@ but it automatically changes their child tasks to the right cgroup based on
+@@ -42,7 +42,7 @@ but it automatically changes their child
\fB/etc/cgrules.conf\fR.
.TP
@@ -62,10 +62,10 @@
If this option is used, the daemon of service cgred (cgrulesengd process)
can automatically change both the specified \fBpidlist\fR and their child
tasks to the right cgroup based on \fB/etc/cgrules.conf\fR.
-diff --git a/doc/man/cgclear.1 b/doc/man/cgclear.1
-index 318c925..ff179de 100644
---- a/doc/man/cgclear.1
-+++ b/doc/man/cgclear.1
+Index: libcgroup/doc/man/cgclear.1
+===================================================================
+--- libcgroup.orig/doc/man/cgclear.1
++++ libcgroup/doc/man/cgclear.1
@@ -6,7 +6,7 @@
cgclear \- unload the cgroup filesystem
@@ -75,7 +75,7 @@
.SH DESCRIPTION
-@@ -20,22 +20,22 @@ file on command line is processed first, so \fBcgclear\fR can have the same
+@@ -20,22 +20,22 @@ file on command line is processed first,
command line arguments as appropriate \fBcgconfigparser\fR.
.TP
@@ -105,11 +105,11 @@
.SH ENVIRONMENT VARIABLES
.TP
-diff --git a/doc/man/cgconfig.conf.5 b/doc/man/cgconfig.conf.5
-index 5ebd879..76a986d 100644
---- a/doc/man/cgconfig.conf.5
-+++ b/doc/man/cgconfig.conf.5
-@@ -275,7 +275,7 @@ inside. It corresponds to the following operations:
+Index: libcgroup/doc/man/cgconfig.conf.5
+===================================================================
+--- libcgroup.orig/doc/man/cgconfig.conf.5
++++ libcgroup/doc/man/cgconfig.conf.5
+@@ -280,7 +280,7 @@ inside. It corresponds to the following
.RS
.nf
mkdir /sys/fs/cgroup/cpu
@@ -118,7 +118,7 @@
.fi
.RE
-@@ -318,8 +318,8 @@ following operations:
+@@ -323,8 +323,8 @@ following operations:
.RS
.nf
mkdir /sys/fs/cgroup/cpu
@@ -129,7 +129,7 @@
mkdir /sys/fs/cgroup/cpu/daemons
echo 1000 > /sys/fs/cgroup/cpu/daemons/www/cpu.shares
-@@ -427,7 +427,7 @@ which are little bit trickier to emulate via chmod):
+@@ -432,7 +432,7 @@ which are little bit trickier to emulate
.RS
.nf
mkdir /sys/fs/cgroup/cpu
@@ -138,7 +138,7 @@
mkdir /sys/fs/cgroup/cpu/daemons
-@@ -437,23 +437,23 @@ chown root:webmaster /sys/fs/cgroup/cpu/daemons/www/tasks
+@@ -442,23 +442,23 @@ chown root:webmaster /sys/fs/cgroup/cpu/
echo 1000 > /sys/fs/cgroup/cpu/daemons/www/cpu.shares
# + chmod the files so the result looks like:
@@ -174,7 +174,7 @@
mkdir /sys/fs/cgroup/cpu/daemons/ftp
-@@ -462,23 +462,23 @@ chown root:ftpmaster /sys/fs/cgroup/cpu/daemons/ftp/tasks
+@@ -467,23 +467,23 @@ chown root:ftpmaster /sys/fs/cgroup/cpu/
echo 500 > /sys/fs/cgroup/cpu/daemons/ftp/cpu.shares
# + chmod the files so the result looks like:
@@ -210,7 +210,7 @@
.fi
.RE
-@@ -532,8 +532,8 @@ It corresponds to the following operations:
+@@ -537,8 +537,8 @@ It corresponds to the following operatio
.nf
mkdir /sys/fs/cgroup/cpu
mkdir /sys/fs/cgroup/cpuacct
@@ -221,7 +221,7 @@
mkdir /sys/fs/cgroup/cpu/daemons
mkdir /sys/fs/cgroup/cpuacct/daemons
-@@ -599,8 +599,8 @@ It corresponds to the following operations:
+@@ -604,8 +604,8 @@ It corresponds to the following operatio
.nf
mkdir /sys/fs/cgroup/cpu
mkdir /sys/fs/cgroup/cpuacct
@@ -232,7 +232,7 @@
mkdir /sys/fs/cgroup/cpuacct/daemons
mkdir /sys/fs/cgroup/cpu/daemons
-@@ -697,7 +697,7 @@ It corresponds to the following operations:
+@@ -702,7 +702,7 @@ It corresponds to the following operatio
.RS
.nf
mkdir /sys/fs/cgroup/cpu
@@ -241,10 +241,10 @@
chown root:operator /sys/fs/cgroup/cpu/*
chown root:operator /sys/fs/cgroup/cpu/tasks
-diff --git a/doc/man/cgconfigparser.8 b/doc/man/cgconfigparser.8
-index 0a20f95..dd70484 100644
---- a/doc/man/cgconfigparser.8
-+++ b/doc/man/cgconfigparser.8
+Index: libcgroup/doc/man/cgconfigparser.8
+===================================================================
+--- libcgroup.orig/doc/man/cgconfigparser.8
++++ libcgroup/doc/man/cgconfigparser.8
@@ -7,61 +7,61 @@
cgconfigparser \- setup control group file system
@@ -322,10 +322,10 @@
defines the default owner of tasks file of the defined control
group. I.e. this user and members
of this group have write access to the file.
-diff --git a/doc/man/cgcreate.1 b/doc/man/cgcreate.1
-index 7068073..e95873c 100644
---- a/doc/man/cgcreate.1
-+++ b/doc/man/cgcreate.1
+Index: libcgroup/doc/man/cgcreate.1
+===================================================================
+--- libcgroup.orig/doc/man/cgcreate.1
++++ libcgroup/doc/man/cgcreate.1
@@ -5,38 +5,38 @@
cgcreate \- create new cgroup(s)
@@ -371,9 +371,9 @@
-.B -g <controllers>:<path>
+.B \-g <controllers>:<path>
defines control groups to be added.
- \fBcontrollers\fR is a list of controllers and
- \fBpath\fR is the relative path to control groups
-@@ -44,20 +44,20 @@ in the given controllers list. This option can be specified
+ \fBcontrollers\fR is a list of controllers. Character "*" can be used
+ as a shortcut for "all mounted controllers".
+@@ -45,20 +45,20 @@ in the given controllers list. This opti
multiple times.
.TP
@@ -398,10 +398,10 @@
defines the name of the user and the group, which owns tasks
file of the defined control group. I.e. this user and members
of this group have write access to the file.
-diff --git a/doc/man/cgdelete.1 b/doc/man/cgdelete.1
-index 025a799..92dbcfb 100644
---- a/doc/man/cgdelete.1
-+++ b/doc/man/cgdelete.1
+Index: libcgroup/doc/man/cgdelete.1
+===================================================================
+--- libcgroup.orig/doc/man/cgdelete.1
++++ libcgroup/doc/man/cgdelete.1
@@ -7,7 +7,7 @@
cgdelete \- remove control group(s)
@@ -417,7 +417,7 @@
.TP
-.B [-g] <controllers>:<path>
+.B [\-g] <controllers>:<path>
- Defines the control group to delete. Multiple control groups nay be
+ Defines the control group to delete. Multiple control groups may be
specified.
-.B -g
+.B \-g
@@ -434,10 +434,10 @@
Recursively remove all subgroups.
.SH ENVIRONMENT VARIABLES
-diff --git a/doc/man/cgexec.1 b/doc/man/cgexec.1
-index cacbd3a..c34edf1 100644
---- a/doc/man/cgexec.1
-+++ b/doc/man/cgexec.1
+Index: libcgroup/doc/man/cgexec.1
+===================================================================
+--- libcgroup.orig/doc/man/cgexec.1
++++ libcgroup/doc/man/cgexec.1
@@ -7,7 +7,7 @@
cgexec \- run the task in given control groups
@@ -456,7 +456,7 @@
defines the control groups in which the task will be run.
\fBcontrollers\fR is a list of controllers and
\fBpath\fR is the relative path to control groups
-@@ -40,11 +40,11 @@ If the specifications are not present the group is created with the default
+@@ -40,11 +40,11 @@ If the specifications are not present th
kernel values.
.TP
@@ -470,7 +470,7 @@
If running the task \fBcommand\fR with this option, the daemon of
service cgred (cgrulesengd process) does not change both the task
of the \fBcommand\fR and the child tasks. Without this option,
-@@ -58,7 +58,7 @@ changes the child tasks to the right cgroup based on
+@@ -58,7 +58,7 @@ changes the child tasks to the right cgr
.nf
.ft B
@@ -502,10 +502,10 @@
in controllers cpu and memory and control group
test2 in controller swap.
-diff --git a/doc/man/cgget.1 b/doc/man/cgget.1
-index 744a329..73a1eb0 100644
---- a/doc/man/cgget.1
-+++ b/doc/man/cgget.1
+Index: libcgroup/doc/man/cgget.1
+===================================================================
+--- libcgroup.orig/doc/man/cgget.1
++++ libcgroup/doc/man/cgget.1
@@ -7,11 +7,11 @@
cgget \- print parameter(s) of given group(s)
@@ -522,7 +522,7 @@
.SH DESCRIPTION
Prints the parameter(s) of input cgroup(s).
-@@ -24,40 +24,40 @@ is the name of the cgroup which should be read.
+@@ -24,40 +24,40 @@ is the name of the cgroup which should b
This parameter can be used multiple times.
.TP
@@ -594,11 +594,11 @@
cpu.rt_period_us=1000000
cpu.rt_runtime_us=950000
cpu.shares=1024
-diff --git a/doc/man/cgred.conf.5 b/doc/man/cgred.conf.5
-index 3fe760f..f4ee956 100644
---- a/doc/man/cgred.conf.5
-+++ b/doc/man/cgred.conf.5
-@@ -21,13 +21,13 @@ variable specifies the file to which logs will be written
+Index: libcgroup/doc/man/cgred.conf.5
+===================================================================
+--- libcgroup.orig/doc/man/cgred.conf.5
++++ libcgroup/doc/man/cgred.conf.5
+@@ -21,13 +21,13 @@ variable specifies the file to which log
.TP
\fBNODAEMON\fR
@@ -615,11 +615,11 @@
.LP
-diff --git a/doc/man/cgrulesengd.8 b/doc/man/cgrulesengd.8
-index 2e89c5b..ee74870 100644
---- a/doc/man/cgrulesengd.8
-+++ b/doc/man/cgrulesengd.8
-@@ -21,40 +21,40 @@ The daemon opens a standard unix socket to receive 'sticky' requests from \fBcge
+Index: libcgroup/doc/man/cgrulesengd.8
+===================================================================
+--- libcgroup.orig/doc/man/cgrulesengd.8
++++ libcgroup/doc/man/cgrulesengd.8
+@@ -22,40 +22,40 @@ The daemon opens a standard unix socket
.SH OPTIONS
.TP
@@ -676,10 +676,10 @@
.SH ENVIRONMENT VARIABLES
.TP
-diff --git a/doc/man/cgset.1 b/doc/man/cgset.1
-index be886c6..4e63aa2 100644
---- a/doc/man/cgset.1
-+++ b/doc/man/cgset.1
+Index: libcgroup/doc/man/cgset.1
+===================================================================
+--- libcgroup.orig/doc/man/cgset.1
++++ libcgroup/doc/man/cgset.1
@@ -7,9 +7,9 @@
cgset \- set the parameters of given cgroup(s)
@@ -692,7 +692,7 @@
.SH DESCRIPTION
Set the parameters of input cgroups.
-@@ -20,13 +20,13 @@ is the name of the cgroup which should be changed.
+@@ -20,13 +20,13 @@ is the name of the cgroup which should b
This parameter can be used multiple times.
.TP
@@ -708,18 +708,18 @@
defines the name of the cgroup whose parameters will be
copied to the input cgroup.
-diff --git a/doc/man/cgsnapshot.1 b/doc/man/cgsnapshot.1
-index 03c85f6..a6bb96e 100644
---- a/doc/man/cgsnapshot.1
-+++ b/doc/man/cgsnapshot.1
+Index: libcgroup/doc/man/cgsnapshot.1
+===================================================================
+--- libcgroup.orig/doc/man/cgsnapshot.1
++++ libcgroup/doc/man/cgsnapshot.1
@@ -7,8 +7,8 @@
cgsnapshot \- generate the configuration file for given controllers
.SH SYNOPSIS
-\fBcgsnapshot\fR [\fB-h\fR] [\fB-s\fR] [\fB-t\fR] [\fB-b\fR \fIfile\fR]
--[\fB-w\fR \fIfile\fR] [\fB-f\fR \fIoutput_file\fR] [\fBcontroller\fR] [...]
+-[\fB-w\fR \fIfile\fR] [\fB-f\fR \fIoutput_file\fR] [\fBcontroller\fR] [...]
+\fBcgsnapshot\fR [\fB\-h\fR] [\fB\-s\fR] [\fB\-t\fR] [\fB\-b\fR \fIfile\fR]
-+[\fB\-w\fR \fIfile\fR] [\fB\-f\fR \fIoutput_file\fR] [\fBcontroller\fR] [...]
++[\fB\-w\fR \fIfile\fR] [\fB\-f\fR \fIoutput_file\fR] [\fBcontroller\fR] [...]
.SH DESCRIPTION
\fBcgsnapshot\fR
@@ -732,7 +732,7 @@
Display only variables from the blacklist.
The default location of the blacklist is
.B /etc/cgsnapshot_blacklist.conf.
-@@ -33,25 +33,25 @@ If it is not present on the blacklist, the whitelist
+@@ -33,25 +33,25 @@ If it is not present on the blacklist, t
is checked.
.TP
@@ -763,7 +763,7 @@
Set the blacklist configuration file.
This list contains all variables which should be displayed by
.B cgsnapshot
-@@ -65,10 +65,10 @@ the variable is displayed and a warning message is produced.
+@@ -65,10 +65,10 @@ the variable is displayed and a warning
By default the whitelist is not used.
The warning message can be omitted using the
@@ -776,10 +776,10 @@
flag is used, the variable which is not on the whitelist is
not displayed.
-diff --git a/doc/man/lscgroup.1 b/doc/man/lscgroup.1
-index 693fbbc..27fec7d 100644
---- a/doc/man/lscgroup.1
-+++ b/doc/man/lscgroup.1
+Index: libcgroup/doc/man/lscgroup.1
+===================================================================
+--- libcgroup.orig/doc/man/lscgroup.1
++++ libcgroup/doc/man/lscgroup.1
@@ -7,9 +7,9 @@
lscgroup \- list all cgroups
@@ -792,10 +792,10 @@
.SH DESCRIPTION
List all/chosen cgroups.
-diff --git a/doc/man/lssubsys.1 b/doc/man/lssubsys.1
-index 790c627..1be272e 100644
---- a/doc/man/lssubsys.1
-+++ b/doc/man/lssubsys.1
+Index: libcgroup/doc/man/lssubsys.1
+===================================================================
+--- libcgroup.orig/doc/man/lssubsys.1
++++ libcgroup/doc/man/lssubsys.1
@@ -7,13 +7,13 @@
lssubsys \- list hierarchies containing given subsystem
@@ -814,7 +814,7 @@
.SH DESCRIPTION
\fBlssubsys\fR list the hierarchies containing
-@@ -27,37 +27,37 @@ If this parameter is not used, the command will
+@@ -27,37 +27,37 @@ If this parameter is not used, the comma
list all mounted subsystems.
.TP
diff -Nru libcgroup-0.41/debian/rules libcgroup-2.0/debian/rules
--- libcgroup-0.41/debian/rules 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/rules 2021-04-13 21:48:06.000000000 +0300
@@ -51,7 +51,7 @@
# Remove unwanted/unused files (because of --fail-missing)
cd debian/tmp/lib/$(DEB_HOST_MULTIARCH) && \
- rm -f *.so security/pam_cgroup.so.* *.la security/*.la
+ rm -f *.so security/pam_cgroup.so.* *.la security/*.la security/*.a
override_dh_missing:
diff -Nru libcgroup-0.41/debian/salsa-ci.yml libcgroup-2.0/debian/salsa-ci.yml
--- libcgroup-0.41/debian/salsa-ci.yml 1970-01-01 02:00:00.000000000 +0200
+++ libcgroup-2.0/debian/salsa-ci.yml 2021-04-13 17:16:34.000000000 +0300
@@ -0,0 +1,3 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru libcgroup-0.41/debian/tests/control libcgroup-2.0/debian/tests/control
--- libcgroup-0.41/debian/tests/control 1970-01-01 02:00:00.000000000 +0200
+++ libcgroup-2.0/debian/tests/control 2021-04-30 12:06:43.000000000 +0300
@@ -0,0 +1,2 @@
+Tests: tools-cgroupv1, tools-cgroupv2
+Restrictions: needs-root, isolation-machine
diff -Nru libcgroup-0.41/debian/tests/tools-cgroupv1 libcgroup-2.0/debian/tests/tools-cgroupv1
--- libcgroup-0.41/debian/tests/tools-cgroupv1 1970-01-01 02:00:00.000000000 +0200
+++ libcgroup-2.0/debian/tests/tools-cgroupv1 2021-04-30 12:11:09.000000000 +0300
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Author: Santiago Ruano Rincón <santiago@debian.org>
+# 2021-03-18
+# License: GPLv3
+
+# Test some of the tools included in cgroup-tools on cgroupv1 support
+
+set -e
+
+if [ ! -d /sys/fs/cgroup/memory ]; then
+ if [ ! "$AUTOPKGTEST_REBOOT_MARK" = "cgroupv1-prepare" ]; then
+ sed -i '/GRUB_CMDLINE_LINUX_DEFAULT/ s/GRUB_CMDLINE_LINUX_DEFAULT="\(.*\)"/GRUB_CMDLINE_LINUX_DEFAULT="\1 systemd.unified_cgroup_hierarchy=false systemd.legacy_systemd_cgroup_controller=false cgroup_enable=cpu cgroup_enable=cpuset cgroup_enable=memory swapaccount=1"/' /etc/default/grub
+ update-grub 2>&1
+ /tmp/autopkgtest-reboot cgroupv1-prepare
+ fi
+fi
+
+cat /proc/mounts | grep cgroup
+
+echo "test cgcreate"
+cgcreate -g cpuset:test
+echo "test lscgroup"
+lscgroup | grep test
+echo "test cgset"
+cgset -r cpuset.cpus=0 test
+echo "test cgget"
+cgget -g cpuset:test
+#echo "test cgcreate"
+#cgexec -g cpuset:test ls -l
diff -Nru libcgroup-0.41/debian/tests/tools-cgroupv2 libcgroup-2.0/debian/tests/tools-cgroupv2
--- libcgroup-0.41/debian/tests/tools-cgroupv2 1970-01-01 02:00:00.000000000 +0200
+++ libcgroup-2.0/debian/tests/tools-cgroupv2 2021-04-30 12:11:06.000000000 +0300
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Author: Santiago Ruano Rincón <santiago@debian.org>
+# 2021-03-18
+# License: GPLv3
+
+# Test some of the tools included in cgroup-tools on cgroupv2 support
+
+set -e
+
+CGROUP2MOUNTED=$(grep cgroup2 /proc/mounts)
+if [ "$CGROUP2MOUNTED" != 0 ]; then
+ if [ ! "$AUTOPKGTEST_REBOOT_MARK" = "cgroupv2-prepare" ]; then
+ sed -i '/GRUB_CMDLINE_LINUX_DEFAULT/ s/GRUB_CMDLINE_LINUX_DEFAULT="\(.*\)"/GRUB_CMDLINE_LINUX_DEFAULT="\1 systemd.unified_cgroup_hierarchy=true swapaccount=1"/' /etc/default/grub
+ update-grub 2>&1
+ /tmp/autopkgtest-reboot cgroupv2-prepare
+ fi
+fi
+
+cat /proc/mounts | grep cgroup
+
+echo "test cgcreate"
+cgcreate -g cpuset:test
+echo "test lscgroup"
+lscgroup | grep test
+echo "test cgset"
+cgset -r cpuset.cpus=0 test
+echo "test cgget"
+cgget -g cpuset:test
+echo "test cgcreate"
+cgexec -g cpuset:test ls -l
diff -Nru libcgroup-0.41/debian/upstream/signing-key.asc libcgroup-2.0/debian/upstream/signing-key.asc
--- libcgroup-0.41/debian/upstream/signing-key.asc 1970-01-01 02:00:00.000000000 +0200
+++ libcgroup-2.0/debian/upstream/signing-key.asc 2021-04-29 16:32:11.000000000 +0300
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF3C4AkBEADQxp4jfxmbJ3t/ZuKcsV4JxG8mhuGXBkzMB0k2uGULCpY4yh7d
+sN4PBU7PuHgUMkxJnJlbg0xVR2nux20INzroYn8xzRe+jSmKTW0fTvNH+Nxyr4k+
+KgqmVZCcfyvwXuL7IOfG5luc/oSXJV62u+LHP891dVcJlVN0Ef9i5Sz9iRkkMUkn
+woTrOK9q1nZNOA+XoLMhCIdyWIPx6jFmPxfZpgEJw6YIeyOSRIPYtH4twuDj50bz
+QuTTfQ3ph9FdcXVLYwP3BayvfFasGhyJ6caqVW9GpMDa/OPvteNmt2WbqaRgcX9C
+WWOKonhFqkaWAXj0lYFkM65DTzSUKpNtoh2MRVA7qyGZ2zlHocNWSplQ8VJlly6c
+h9O95UEXlSIJFxAi/7NBNuG/CekHQxxQZhdslUe7LIsujlKS8Fy0bpYsTDPb/g+r
+UuIHWCOhEC+B0qOYVEf+wcc9jTQjZf6NP3zIV4dO+Mc9GVT+d3Kz0y11g1ON0b82
+qy2ONvRys1NmqXC2vCnXzKCQ6UTHRYt+EdV0nlo59G+lolCnT8t1sW7ezuByA4zW
+MI6hLyk0NLb8xwPK9BT732RGhzba7a7EaArTBsPA3rWvObC1kQWSaw+ule5rmnTL
+5Q4Jw3qDhgM9b2Bg3hLYP5/UU0INq7krH413Kin0C29T1aNmLfMTfmS5EwARAQAB
+tCZUb20gSHJvbWF0a2EgPHRvbS5ocm9tYXRrYUBvcmFjbGUuY29tPokCTgQTAQgA
+OBYhBEemj843x9cCT9ZeETVs5iwrUkCZBQJdwuAJAhsDBQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEDVs5iwrUkCZNL0P/3KFyrWXW5ouPuAzWeMMUZrQmyz31T70
+iVSS8PtPWb8S2QxQdzgpdVPrvxT+wfq5zJbdz3X5uPvdOXUeyv0bAQRqYQVX/tkz
+10zu6+m+Bgx0H6I5Xk9F7EDvag1EDDs/BDSLh9VbsTllSaNpLhFjSRj0dVmE1Dga
+UDX5F66npYMgSIspsAjEI1MZ1PDYQfhoyxEMiz0ld14yv6HE7hBPekcQW2mAWzlp
+Zmgw9NVIcqShy3znJNGGpQUbLEtGbrv/wRMNWjGWPJyfE5dLDvkfQjrdsTRWv5+S
+d5/z3fwp0G8dUq1iWeegu6mFe0KRLB5z3lcc+QJSlWetyyoYWOhq1Jzn0QHjakZp
+2Nb4rtp9/b9TdhvD5cOjpsECmL5qMri1mn/j4F63AG4yLQaYrwwjWzDcz+jQ8wNu
+yl7cXQFD6UYbywC1tC9DE0VppV2nOirtTOPz8+etXMx6sg40STJ4dbYn/gJLhiyc
+SaUAqGkSHpC24FbcvkVwKz5MBUYuLEgNH3RyNKVgnb5JWZofE7ehOVCc+VAmzMyo
+bjE+71FRXlPdmqD/im4vYDsqzb15wX79VsXqI0bij+xVYaR7GoQbTfVQ0a6f6slW
+ex6PmKOnZTjfLL7sEu1JhAteqlI9I0NlNJBF/y32T6lQpO+3CJGhY+2rSiCpnI31
+NMusAkcufnxquQINBF3C4AkBEAC9ReOzYf6nryTLn8lGg6M0kpMX3P7v8GlOV1hZ
+8hTDlUETpo+xxR3FvNjWEDNyuawCpvNz8Pu3OKqxKDIivyVdJNEc335glsMY7BmA
+evLvAtyfjb0rOzOXqLfhdsn108Nr6Ai+lkMs8xlK2hxGI3qpDHzImOYmhWD4J181
+gxlj5Gaj8fOyV8JZvfY6AZcei2tzlmHpj9SSh7K59trUZtaUDljUeVAEP4KfU1sL
+EYy3BUzS+eb4Qw1tleui+89E/J4zPrgwwuLg5OU+ScTigfbEF/05MMUAySiKieKh
+p8IFsT41+FXOlotBl0wz6Jbo4HxNtY5Ptrpv6BOrBlYfhfhZeANk4+y5OnLqRjjg
+Tvf1p9CHmsgs6sx/lkNyXpzoxKR89RzxHxnrgUATSa80JK9o/0tPZkN33HKJlkSn
+dPQEM4uLrTsIxvNsBSOPIKC09siMbbBeI0t811P1pMh8zvTnRl2FSQjiumLoVhr+
+xxZ2wWiPxztVQkMLuuWXkzcxQUfuw5nEQCH+WdqYKNmV6rw2kU6j10q0kvvspWPM
+TbsI/vBY3KyiP1F8dToXiwulNT1U05NGJ20YbzEHnYEKatBq9ZILLx63c8eLZ6Vp
+pkAE0ZlmgsOvn+zIcv81P4x9mDLvuqTOzRj/RuDAY6qJHuICpsV3F5A03z9ne/Z9
+u0mwSwARAQABiQI2BBgBCAAgFiEER6aPzjfH1wJP1l4RNWzmLCtSQJkFAl3C4AkC
+GwwACgkQNWzmLCtSQJkiQA/8Cm07bQf2FIKTdwRECJO7pvpuc3zE1XsSuLyu40qp
+sWX24Ll97S7cpOK7rN2jSZ6UDoXpNgXViOzma5yiC+GO6UUWxr8xE/CDXeuawxHU
+t0Xrn+UQnWsirsrZifjVPkXou71QM+kaQ9qXy4liOpRaJjf8B7iz3ilgMUACnMcw
+OVn+jbswLQpNetsKk+vrLwQlILPkWcKGxIu1Iro3E7WoIPojHHtT7Co7mSRzaNI0
+0VU7jMwZwXFQL/IbeGsKlaAyxh1BzRLnLdPN8hxiYtEq2IG66Uq3EmigtwOvh06d
+/Qi/gBH6CWxdahRk7HwATyrNvbjfduzNnhF+lPA39iKrI5+IGasK6Lp9HklUJD0Q
+9JK7yac/cUj5LptY/PBFC7eJKHJLyohmvlXYgRSeAXEm7uGpU5k/jUZDM4Z1o5Jb
+oiNVQoqDWs6iDYJb82cRjKKlvC2d2lFKxtBOR3xJZUUsIpoQrstxn1LA5DcBosPv
+d9ISyIZs38UyJNTz07GUedEpeE3YhLkesc6n2iL9D2Yjz/S4ANukxl9YZDW+EFS8
+LtTchvK11OHWubvWxWFV7txLFmkBYQwk2krCi2MVguRZGj8bodqjty1H8ZMfA5NY
+wAKeyQmsmTHqNmR1Ws/cdQCV7+3q9RurlUtY1AVxx4LtnS16GX+OVCybWzbK1uqL
+rfo=
+=6Js4
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru libcgroup-0.41/debian/watch libcgroup-2.0/debian/watch
--- libcgroup-0.41/debian/watch 2021-02-08 15:43:56.000000000 +0200
+++ libcgroup-2.0/debian/watch 2021-04-29 16:32:11.000000000 +0300
@@ -1,6 +1,5 @@
version=4
# We have to un-break some upstream version numbers, and transfrom .rc to ~rc
-
-opts="uversionmangle=s/v(\d\.\d+)/$1/;s/\.rc/~rc/" \
-https://sf.net/libcg/libcgroup-(.+)\.tar\.bz2
+opts="uversionmangle=s/v(\d\.\d+)/$1/;s/\.rc/~rc/,pgpsigurlmangle=s/$/.asc/" \
+ https://github.com/libcgroup/libcgroup/releases .*/libcgroup-(\d\S+)\.tar\.gz
Reply to: