diff options
Diffstat (limited to 'source/ap/cgmanager')
| -rw-r--r-- | source/ap/cgmanager/cgmanager-0.39-remove-pam-requirement.patch | 76 | ||||
| -rwxr-xr-x | source/ap/cgmanager/cgmanager.SlackBuild | 31 | ||||
| -rw-r--r-- | source/ap/cgmanager/config/rc.cgmanager | 2 | ||||
| -rw-r--r-- | source/ap/cgmanager/config/rc.cgproxy | 4 | ||||
| -rw-r--r-- | source/ap/cgmanager/slack-desc | 8 |
5 files changed, 31 insertions, 90 deletions
diff --git a/source/ap/cgmanager/cgmanager-0.39-remove-pam-requirement.patch b/source/ap/cgmanager/cgmanager-0.39-remove-pam-requirement.patch deleted file mode 100644 index 412e4d563..000000000 --- a/source/ap/cgmanager/cgmanager-0.39-remove-pam-requirement.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Nur cgmanager-0.39.orig/Makefile.in cgmanager-0.39/Makefile.in ---- cgmanager-0.39.orig/Makefile.in 2015-09-03 17:59:13.000000000 -0500 -+++ cgmanager-0.39/Makefile.in 2015-11-19 19:48:33.407492836 -0600 -@@ -503,15 +503,6 @@ - libcgmanager_la_LIBADD = \ - $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS) - --pam_LTLIBRARIES = pam_cgm.la --pam_cgm_la_SOURCES = pam/pam_cgm.c pam/cgmanager.c pam/cgmanager.h --pam_cgm_la_CFLAGS = $(AM_CFLAGS) --pam_cgm_la_LIBADD = $(AM_LIBS) $(PAM_LIBS) -L$(top_srcdir) -lcgmanager --pam_cgm_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared --pam_cgm_la_DEPENDENCIES = libcgmanager.la --all: $(BUILT_SOURCES) config.h -- $(MAKE) $(AM_MAKEFLAGS) all-recursive -- - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj - am--refresh: Makefile -diff -Nur cgmanager-0.39.orig/configure cgmanager-0.39/configure ---- cgmanager-0.39.orig/configure 2015-09-03 17:59:14.000000000 -0500 -+++ cgmanager-0.39/configure 2015-11-19 19:48:08.425776320 -0600 -@@ -13401,53 +13401,6 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_authenticate in -lpam" >&5 --$as_echo_n "checking for pam_authenticate in -lpam... " >&6; } --if ${ac_cv_lib_pam_pam_authenticate+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lpam $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char pam_authenticate (); --int --main () --{ --return pam_authenticate (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_pam_pam_authenticate=yes --else -- ac_cv_lib_pam_pam_authenticate=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_authenticate" >&5 --$as_echo "$ac_cv_lib_pam_pam_authenticate" >&6; } --if test "x$ac_cv_lib_pam_pam_authenticate" = xyes; then : -- PAM_LIBS="-lpam" --else -- as_fn_error $? "*** libpam not found." "$LINENO" 5 -- --fi -- -- -- -- -- - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure diff --git a/source/ap/cgmanager/cgmanager.SlackBuild b/source/ap/cgmanager/cgmanager.SlackBuild index d5862eaa5..397138809 100755 --- a/source/ap/cgmanager/cgmanager.SlackBuild +++ b/source/ap/cgmanager/cgmanager.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2014, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,11 @@ # Modified by Matteo Bernardini <ponce@slackbuilds.org> (2014) +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=cgmanager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -71,7 +80,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/cgmanager-0.39-remove-pam-requirement.patch.gz | patch -p1 || exit 1 +./bootstrap.sh # Configure: CFLAGS="$SLKCFLAGS" \ @@ -85,12 +94,17 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --enable-static=no \ --with-distro=slackware \ - --build=$ARCH-slackware-linux + --with-pamdir=none \ + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Install compat symlink +mkdir -p $PKG/usr/sbin +ln -s /usr/libexec/cgmanager/cgm-release-agent $PKG/usr/sbin/cgm-release-agent + # Remove .la files: rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la @@ -100,7 +114,10 @@ rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) -# Add init scripts +# Remove broken init scripts: +rm -f $PKG/etc/rc.d/rc.* + +# Add good init scripts: mkdir -p $PKG/etc/rc.d cat $CWD/config/rc.cgmanager > $PKG/etc/rc.d/rc.cgmanager.new cat $CWD/config/rc.cgproxy > $PKG/etc/rc.d/rc.cgproxy.new diff --git a/source/ap/cgmanager/config/rc.cgmanager b/source/ap/cgmanager/config/rc.cgmanager index 83c190619..56f355d61 100644 --- a/source/ap/cgmanager/config/rc.cgmanager +++ b/source/ap/cgmanager/config/rc.cgmanager @@ -31,7 +31,7 @@ stop_cgmanager() { /bin/sh /etc/rc.d/rc.cgproxy stop >/dev/null 2>&1 || true echo "Stopping cgmanager." /bin/kill $(cat /run/cgmanager.pid 2>/dev/null) 2>/dev/null - /usr/bin/pkill cgmanager 2>/dev/null + /usr/bin/pkill --exact /usr/sbin/cgmanager 2>/dev/null rm -f /run/cgmanager.pid } diff --git a/source/ap/cgmanager/config/rc.cgproxy b/source/ap/cgmanager/config/rc.cgproxy index bd96902cb..59a61b78d 100644 --- a/source/ap/cgmanager/config/rc.cgproxy +++ b/source/ap/cgmanager/config/rc.cgproxy @@ -23,10 +23,10 @@ stop_cgproxy() { if ! /bin/kill $(cat /run/cgproxy.pid 2>/dev/null) 2>/dev/null ; then sleep 1 echo "Sending cgproxy the TERM signal." - if ! /usr/bin/pkill -TERM cgproxy ; then + if ! /usr/bin/pkill --exact -TERM /usr/sbin/cgproxy ; then sleep 5 echo "Sending cgproxy the KILL signal." - /usr/bin/pkill -KILL cgproxy + /usr/bin/pkill --exact -KILL /usr/sbin/cgproxy sleep 5 if ps -C cgproxy | grep -q cgproxy 2>/dev/null ; then echo "Error: couldn't stop cgproxy." diff --git a/source/ap/cgmanager/slack-desc b/source/ap/cgmanager/slack-desc index 89d4122f3..f60cd2fcf 100644 --- a/source/ap/cgmanager/slack-desc +++ b/source/ap/cgmanager/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| @@ -12,7 +12,7 @@ cgmanager: CGManager manages all your cgroups for you through a simple DBus API. cgmanager: It's designed to work with nested LXC containers as well as accepting cgmanager: unprivileged requests including resolving user namespaces UIDs/GIDs. cgmanager: -cgmanager: The package contains two daemons: cgmanager (which runs on the host), +cgmanager: The package contains two daemons: cgmanager (which runs on the host), cgmanager: and cgproxy (which runs in containers). cgmanager: cgmanager: Homepage: https://linuxcontainers.org/cgmanager/ |