diff options
| author | Adrien Nader <adrien@notk.org> | 2017-03-01 02:45:11 +0100 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2017-03-01 02:45:11 +0100 |
| commit | 470c1463938fc2135747d08d14e09d9c78e60c85 (patch) | |
| tree | 0c70a77d79f419f58221e65c76b199c774a404bc /slackware64-current/source/a/libcgroup | |
| parent | 7381bfe5c70a40549ddc02221712eb4305dc405e (diff) | |
Minor update.
Diffstat (limited to 'slackware64-current/source/a/libcgroup')
| -rwxr-xr-x | slackware64-current/source/a/libcgroup/libcgroup.SlackBuild | 16 | ||||
| -rw-r--r-- | slackware64-current/source/a/libcgroup/libcgroup.init.diff.gz | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/slackware64-current/source/a/libcgroup/libcgroup.SlackBuild b/slackware64-current/source/a/libcgroup/libcgroup.SlackBuild index b15b91ecc..70659f275 100755 --- a/slackware64-current/source/a/libcgroup/libcgroup.SlackBuild +++ b/slackware64-current/source/a/libcgroup/libcgroup.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2011, 2014 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011, 2014, 2017 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,12 +23,12 @@ PKGNAM=libcgroup VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -37,8 +37,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -86,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --disable-pam \ --disable-static \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 @@ -95,6 +95,10 @@ make install DESTDIR=$PKG || exit 1 # If this directory is empty, do not include it in the package: rmdir $PKG/usr/lib${LIBDIRSUFFIX}/security 2> /dev/null +# cgexec doesn't need to be setuid root -- setgid cgred is sufficient: +chown root:cgred $PKG/usr/bin/cgexec +chmod 2755 $PKG/usr/bin/cgexec + # Install init scripts: mkdir -p $PKG/etc/rc.d cp -a scripts/init.d/cgconfig $PKG/etc/rc.d/rc.cgconfig.new diff --git a/slackware64-current/source/a/libcgroup/libcgroup.init.diff.gz b/slackware64-current/source/a/libcgroup/libcgroup.init.diff.gz index a74c4d4de..12ec69596 100644 --- a/slackware64-current/source/a/libcgroup/libcgroup.init.diff.gz +++ b/slackware64-current/source/a/libcgroup/libcgroup.init.diff.gz @@ -1 +1 @@ -4845e845be3553fae28281cae84b384e6f50e37e +cfec770937b5994fe9d5ae835955890e776d5bc5 |