Hello community,
here is the log from the commit of package libcgroup1.1128 for openSUSE:12.1:Update checked in at 2012-12-05 13:56:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/libcgroup1.1128 (Old)
and /work/SRC/openSUSE:12.1:Update/.libcgroup1.1128.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcgroup1.1128", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-11-30 12:21:47.308011256 +0100
+++ /work/SRC/openSUSE:12.1:Update/.libcgroup1.1128.new/libcgroup1.changes 2012-12-05 13:56:17.000000000 +0100
@@ -0,0 +1,134 @@
+-------------------------------------------------------------------
+Thu Nov 22 16:59:57 CET 2012 - mhocko@suse.de
+
+- initd_cgconfig-read-correctly-defaultcgroup.patch: fix defaultcgroup
+ detection (bnc#790934)
+
+-------------------------------------------------------------------
+Wed Aug 31 10:36:24 CEST 2011 - jslaby@suse.de
+
+- don't use /var/lock/subsys/ (bnc#714631)
+
+-------------------------------------------------------------------
+Fri Jun 24 21:40:52 CEST 2011 - jslaby@suse.de
+
+- kill _service
+
+-------------------------------------------------------------------
+Wed May 11 14:42:40 CEST 2011 - pth@suse.de
+
+- Enhance the man pages.
+
+-------------------------------------------------------------------
+Thu Mar 3 10:38:12 CET 2011 - jslaby@suse.de
+
+- update to 0.37.1
+ - get rid of the local patches
+ - fix buffer overflow (bnc#675506, CVE-2011-1006)
+ - verify the sender of netlink messages (bnc#675048, CVE-2011-1022)
+ - check length of netlink addresses (CVE-2011-1022)
+ - improve handling of out-of-memory.
+ - --sticky option works for setuid/setgid
+
+-------------------------------------------------------------------
+Wed Jan 12 16:15:05 CET 2011 - jslaby@suse.de
+
+- sync cgconfig and cgred init.d scripts with upstream
+- man pages fixes
+
+-------------------------------------------------------------------
+Tue Jan 4 11:45:34 CET 2011 - jslaby@suse.de
+
+- update cgconfig and cgred init.d scripts
+- fix segfault in cgconfigparser
+
+-------------------------------------------------------------------
+Mon Dec 20 09:47:28 CEST 2010 - jslaby@suse.de
+
+- update to 0.37
+ - init scripts fixes
+ - add new tools (scripts need not to do much work)
+ - fixes in what tools and scripts return
+ - many memory leaks fixed
+ - other small fixes
+
+-------------------------------------------------------------------
+Mon Jul 5 22:17:28 CEST 2010 - jslaby@suse.de
+
+- update to 0.36.2 final
+
+-------------------------------------------------------------------
+Fri Jun 4 15:37:17 CEST 2010 - kay.sievers@novell.com
+
+- update to 0.36.2.rc
+ - install pkg-config file
+ - do not call exit() on error
+- drop all patches which are upstream now or no longer needed
+- install library in the rootfs, not in /usr
+- enable verbose build
+
+-------------------------------------------------------------------
+Fri Feb 5 23:44:25 CET 2010 - jslaby@suse.de
+
+- really fail to start (forgotten %patch3)
+
+-------------------------------------------------------------------
+Thu Feb 4 14:58:10 CET 2010 - jslaby@suse.de
+
+- fail to start when a parsing error occurs (bnc#576932)
+
+-------------------------------------------------------------------
+Mon Feb 1 11:21:54 UTC 2010 - jengelh@medozas.de
+
+- package baselibs.conf
+
+-------------------------------------------------------------------
+Tue Aug 18 13:39:28 CEST 2009 - jslaby@suse.de
+
+- update init scripts. cgred moved to /usr/sbin/
+
+-------------------------------------------------------------------
+Wed Jun 24 19:37:22 CEST 2009 - sbrabec@suse.cz
+
+- Supplement pam-32bit/pam-64bit in baselibs.conf (bnc#354164).
+
+-------------------------------------------------------------------
+Mon May 4 14:51:53 CEST 2009 - jslaby@suse.de
+
+- update to 0.33
+- refresh patches and make them -p1
+- add pam module and manpages
+
+-------------------------------------------------------------------
+Fri Jan 2 09:50:34 CET 2009 - jslaby@suse.de
+
+- Update to 0.32.2
+- Fix devel package group (to Development/Libraries)
+- Fix cgred init script
+- Update cgconfig init script to create a default cgroup (bnc#458611)
+
+-------------------------------------------------------------------
+Thu Nov 6 00:41:19 CET 2008 - jslaby@suse.cz
+
+- Update to 0.32.1
+- Add init.d scripts configuration samples.
+
+-------------------------------------------------------------------
+Mon Oct 20 16:52:55 CEST 2008 - schwab@suse.de
+
+- Fix invalid use of sigaction.
+
+-------------------------------------------------------------------
+Wed Oct 15 15:08:31 CEST 2008 - kukuk@suse.de
+
+- Fix typo
+
+-------------------------------------------------------------------
+Tue Oct 14 23:34:53 CEST 2008 - kukuk@suse.de
+
+- Fix name of devel package
+
+-------------------------------------------------------------------
+Wed Oct 01 14:52:15 CEST 2008 - jslaby@suse.cz
+
+- initial package
New:
----
baselibs.conf
initd_cgconfig-read-correctly-defaultcgroup.patch
initd_cgconfig.patch
initd_cgred.patch
libcgroup-0.37.1.tar.bz2
libcgroup-man_pages.patch
libcgroup1.changes
libcgroup1.spec
sysconfig.cgred
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcgroup1.spec ++++++
#
# spec file for package libcgroup1
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libcgroup1
Version: 0.37.1
Release: 0
Summary: Control groups management tools
License: LGPL-2.1
Group: System/Management
Url: http://sourceforge.net/projects/libcg/
Source: http://sourceforge.net/projects/libcg/files/libcgroup/v%{version}/libcgroup-%{version}.tar.bz2
Source3: sysconfig.cgred
Source99: baselibs.conf
Patch5: initd_cgconfig.patch
Patch6: initd_cgred.patch
Patch7: libcgroup-man_pages.patch
Patch8: initd_cgconfig-read-correctly-defaultcgroup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: pam-devel
BuildRequires: pkg-config
Requires: insserv pam
%description
Control groups, a new kernel feature in Linux 2.6.24 provides a file
system interface to manipulate and control the details on task grouping
including creation of new task groups (control groups), permission
handling and task assignment.
Authors:
--------
Balbir Singh
Dhaval Giani
%package -n libcgroup-devel
Summary: Control groups management tools devel package
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
%description -n libcgroup-devel
Control groups, a new kernel feature in Linux 2.6.24 provides a file
system interface to manipulate and control the details on task grouping
including creation of new task groups (control groups), permission
handling and task assignment.
Authors:
--------
Balbir Singh
Dhaval Giani
%prep
%setup -n libcgroup-%{version}
%patch5 -p1
%patch6 -p1
%patch7
%patch8 -p1
%build
# only for GIT builds
%if 0
aclocal
libtoolize -c
autoconf
autoheader
automake --foreign --add-missing --copy
%endif
# ==============
%configure --enable-pam-module-dir=/%{_lib}/security --enable-initscript-install
export V=1
make %{?_smp_mflags}
%install
%makeinstall INITSCRIPTDIR=%{buildroot}/%{_sysconfdir}/init.d/
find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';'
rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.so.*
mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates/
install -m 644 %{SOURCE3} %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.cgred
# remove setuid
chmod u-s $RPM_BUILD_ROOT/%{_bindir}/cgexec
# move lib to rootfs
libcgso=$(basename $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.*.*.*)
mkdir -p $RPM_BUILD_ROOT/%{_lib}
mv -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.1
ln -sf $libcgso $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.1
ln -sf ../../%{_lib}/$libcgso $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
%clean
rm -rf %{buildroot}
%preun
%{stop_on_removal cgred}
%{stop_on_removal cgconfig}
%post
%{fillup_and_insserv -f cgconfig}
%{fillup_and_insserv -n cgred}
%{run_ldconfig}
%postun
%{insserv_cleanup}
%{run_ldconfig}
%files
%defattr(-,root,root)
%doc COPYING
%doc README
%doc README_daemon
%doc INSTALL
%doc samples/cgconfig.conf
%doc samples/cgrules.conf
%{_sysconfdir}/init.d/cgconfig
%{_sysconfdir}/init.d/cgred
%{_bindir}/cg*
%{_bindir}/ls*
%{_sbindir}/cg*
/%{_lib}/libcgroup.so.*
/%{_lib}/security/pam_cgroup.so
%{_localstatedir}/adm/fillup-templates/sysconfig.cgred
%{_mandir}/man[^3]/*
%files -n libcgroup-devel
%defattr(-,root,root)
%{_libdir}/libcgroup.so
%{_includedir}/libcgroup.h
%dir %{_includedir}/libcgroup
%{_includedir}/libcgroup/*.h
%{_libdir}/pkgconfig/libcgroup.pc
%changelog
++++++ baselibs.conf ++++++
libcgroup1
supplements "packageand(libcgroup1:pam-<targettype>)"
++++++ initd_cgconfig-read-correctly-defaultcgroup.patch ++++++
From: Robert Milasan
Subject: fix defaultcgroup detection
b55ce704 (scripts: cgconfig, cleanup) introduced a regression because
read is now executed in a subshell so the variables are not visible
in the outer context and so defaultcgtoup is never non-empty.
Fix the issue by using here text which doesn't involve subshell.
[mhocko@suse.cz: tweaked changelog a bit]
Signed-off-by: Robert Milasan
Index: libcgroup-0.37.1/scripts/init.d/cgconfig.in
===================================================================
--- libcgroup-0.37.1.orig/scripts/init.d/cgconfig.in
+++ libcgroup-0.37.1/scripts/init.d/cgconfig.in
@@ -55,8 +55,8 @@ create_default_groups() {
defaultcgroup=
if [ -f /etc/cgrules.conf ]; then
- grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf | \
- read user ctrl defaultcgroup
+ read user ctrl defaultcgroup <<< \
+ $(grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf)
if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
log_warning_msg "/etc/cgrules.conf incorrect"
log_warning_msg "Overriding it"
++++++ initd_cgconfig.patch ++++++
---
scripts/init.d/cgconfig.in | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -4,6 +4,8 @@
#
# Copyright IBM Corporation. 2008
#
+# Copyright (c) 2008,2010 Jiri Slaby
+#
# Authors: Balbir Singh
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2.1 of the GNU Lesser General Public License
@@ -21,10 +23,12 @@
### BEGIN INIT INFO
# Provides: cgconfig
-# Required-Start:
-# Required-Stop:
+# Required-Start: $local_fs $remote_fs $syslog $time
+# Required-Stop: $local_fs $remote_fs $syslog $time
# Should-Start:
# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
# Short-Description: start and stop the WLM configuration
# Description: This script allows us to create a default configuration
### END INIT INFO
@@ -34,7 +38,7 @@ prefix=@prefix@;exec_prefix=@exec_prefix
CGCONFIGPARSER_BIN=$sbindir/cgconfigparser
CONFIG_FILE=/etc/cgconfig.conf
servicename=cgconfig
-lockfile=/var/lock/subsys/$servicename
+lockfile=/run/$servicename
#
# Source LSB routines
@@ -96,10 +100,9 @@ create_default_groups() {
}
start() {
- echo -n "Starting cgconfig service: "
if [ -f "$lockfile" ]; then
log_warning_msg "lock file already exists"
- return 0
+ return 1
fi
if [ $? -eq 0 ]; then
@@ -126,15 +129,12 @@ start() {
log_failure_msg "Failed to touch $lockfile"
return 1
fi
- log_success_msg
return 0
}
stop() {
- echo -n "Stopping cgconfig service: "
cgclear
rm -f "$lockfile"
- log_success_msg
return 0
}
@@ -170,33 +170,41 @@ RETVAL=0
case $1 in
'stop')
+ echo -n "Stopping service $servicename"
common
stop
RETVAL=$?
+ rc_failed 0
+ rc_status -v
;;
'start')
+ echo -n "Starting service $servicename"
common
start
RETVAL=$?
+ rc_status -v
;;
'restart'|'reload')
restart
RETVAL=$?
+ rc_status
;;
'condrestart')
if [ -f "$lockfile" ]; then
restart
RETVAL=$?
fi
+ rc_status
;;
'status')
+ echo -n "Checking for service $servicename"
if [ -f "$lockfile" ]; then
- echo "Running"
- exit 0
+ rc_failed 0
else
- echo "Stopped"
- exit 3
+ rc_failed 3
+ RETVAL=3
fi
+ rc_status -v
;;
*)
usage
++++++ initd_cgred.patch ++++++
---
scripts/init.d/cgred.in | 64 ++++++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 26 deletions(-)
--- a/scripts/init.d/cgred.in
+++ b/scripts/init.d/cgred.in
@@ -4,6 +4,8 @@
#
# Copyright Red Hat Inc. 2008
#
+# Copyright (C) 2008,2010 Jiri Slaby
+#
# Authors: Steve Olivieri
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2.1 of the GNU Lesser General Public License
@@ -23,10 +25,12 @@
#
### BEGIN INIT INFO
# Provides: cgrulesengd
-# Required-Start: $local_fs $syslog $cgconfig
-# Required-Stop: $local_fs $syslog
+# Required-Start: $local_fs $remote_fs $syslog cgconfig
+# Required-Stop: $local_fs $remote_fs $syslog cgconfig
# Should-Start:
# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
# Short-Description: start and stop the cgroups rules engine daemon
# Description: CGroup Rules Engine is a tool for automatically using \
# cgroups to classify processes
@@ -39,14 +43,12 @@ CGRED_CONF=/etc/cgrules.conf
# Sanity checks
[ -x $CGRED_BIN ] || exit 1
-# Source function library & LSB routines
-. /etc/rc.d/init.d/functions
. /lib/lsb/init-functions
# Read in configuration options.
-if [ -f "/etc/sysconfig/cgred.conf" ] ; then
- . /etc/sysconfig/cgred.conf
- OPTIONS="$NODAEMON $LOG"
+if [ -f "/etc/sysconfig/cgred" ] ; then
+ . /etc/sysconfig/cgred
+ OPTIONS="$CGRED_OPTIONS"
if [ -n "$LOG_FILE" ]; then
OPTIONS="$OPTIONS --logfile=$LOG_FILE"
fi
@@ -63,15 +65,20 @@ fi
# For convenience
processname=cgrulesengd
servicename=cgred
-lockfile="/var/lock/subsys/$servicename"
+lockfile="/run/$servicename"
pidfile=/var/run/cgred.pid
start()
{
- echo -n $"Starting CGroup Rules Engine Daemon: "
if [ -f "$lockfile" ]; then
- log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
- return 0
+ pidofproc -k -p $pidfile $CGRED_BIN
+ if [ $? -eq 7 ]; then
+ log_warning_msg "Removing stale lock file $lockfile"
+ rm -f "$lockfile" "$pidfile"
+ else
+ log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
+ return 1
+ fi
fi
if [ ! -s $CGRED_CONF ]; then
log_failure_msg "not configured"
@@ -82,9 +89,8 @@ start()
log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
return 1
fi
- daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
+ start_daemon -p $pidfile $CGRED_BIN $OPTIONS
retval=$?
- echo
if [ $retval -ne 0 ]; then
return 7
fi
@@ -92,20 +98,18 @@ start()
if [ $? -ne 0 ]; then
return 1
fi
- echo "`pidof $processname`" > $pidfile
+ pidofproc $CGRED_BIN > $pidfile
return 0
}
stop()
{
- echo -n $"Stopping CGroup Rules Engine Daemon..."
if [ ! -f $pidfile ]; then
log_success_msg
return 0
fi
killproc -p $pidfile -TERM "$processname"
retval=$?
- echo
if [ $retval -ne 0 ]; then
return 1
fi
@@ -118,21 +122,32 @@ RETVAL=0
# See how we are called
case "$1" in
start)
+ echo -n "Starting CGroup Rules Engine Daemon"
start
RETVAL=$?
+ rc_status -v
;;
stop)
+ echo -n "Stopping CGroup Rules Engine Daemon"
stop
RETVAL=$?
+ rc_status -v
;;
status)
- status -p $pidfile $servicename
+ echo -n "Checking for CGroup Rules Engine Daemon"
+ checkproc -k -p $pidfile $CGRED_BIN
RETVAL=$?
+ if [ $RETVAL -eq 7 ] ; then
+ rc_failed 3
+ RETVAL=3
+ fi
+ rc_status -v
;;
restart)
stop
start
RETVAL=$?
+ rc_status
;;
condrestart)
if [ -f "$lockfile" ]; then
@@ -140,20 +155,17 @@ case "$1" in
start
RETVAL=$?
fi
+ rc_status
;;
reload|flash)
if [ -f "$lockfile" ]; then
- echo $"Reloading rules configuration..."
- kill -s 12 `cat ${pidfile}`
- RETVAL=$?
- if [ $RETVAL -eq 0 ] ; then
- log_success_msg
- else
- log_failure_msg
- fi
+ echo -n "Reloading rules configuration..."
+ killproc -SIGUSR2 -p $pidfile $CGRED_BIN
else
- log_failure_msg "$servicename is not running."
+ echo "$servicename is not running."
+ rc_failed 7
fi
+ rc_status -v
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
++++++ libcgroup-man_pages.patch ++++++
++++ 808 lines (skipped)
++++++ sysconfig.cgred ++++++
## Path: System/Management
## Description: CGroup Rules Engine configuration
## Type: string
## Default: "/var/log/cgred"
#
# The pathname to the log file for CGroup Rules Engine
#
LOG_FILE="/var/log/cgred"
## Type: string
## Default: ""
#
# Use --nodaemon to disable daemon mode.
# Use --nolog to disable logging.
#
CGRED_OPTIONS=""
## Type: string
## Default: ""
#
# Set owner (user) of cgrulesengd socket.
#
SOCKET_USER=""
## Type: string
## Default: ""
#
# Set owner (group) of cgrulesengd socket.
#
SOCKET_GROUP=""
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
