From 479087384d1d3e635199d0d4e0dd4680094504bc Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Mon, 20 Apr 2015 20:33:28 +0700
Subject: network/cherokee: Update UID/GID.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/cherokee/README              |  4 ++--
 network/cherokee/cherokee.SlackBuild | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'network/cherokee')

diff --git a/network/cherokee/README b/network/cherokee/README
index 085222d835..7214e5a3d4 100644
--- a/network/cherokee/README
+++ b/network/cherokee/README
@@ -45,8 +45,8 @@ Notes about using this SlackBuild
 
    You want to create first a dedicated user/group.
 
-     groupadd -g 299 cherokee
-     useradd -u 299 -g cherokee -d /var/www/htdocs-cherokee cherokee
+     groupadd -g 306 cherokee
+     useradd -u 306 -g cherokee -d /var/www/htdocs-cherokee cherokee
 
    See http://slackbuilds.org/uid_gid.txt for current reccomendations (if any)
 7) If you want to use it with php, remember to add your user to the
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index 0cdd97e02e..ee57d2b98a 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -58,14 +58,14 @@ TRACE=${TRACE:-no}
 if [ ! "$(grep "$WWWGROUP" /etc/group)" ]; then
   printf "\n         The \"$WWWGROUP\" group you choose is not available. Create one with
 
-         groupadd -g 299 $WWWGROUP
+         groupadd -g 306 $WWWGROUP
 
          (see http://slackbuilds.org/uid_gid.txt for current reccomendations - if any)\n\n"
   exit 1
 elif [ ! "$(grep "$WWWUSER" /etc/passwd)" ] ; then
   printf "\n         The \"$WWWUSER\" user you choose is not available. Create one with
 
-         useradd -u 299 -g $WWWGROUP -d ${WWWROOT} $WWWUSER
+         useradd -u 306 -g $WWWGROUP -d ${WWWROOT} $WWWUSER
 
          (see http://slackbuilds.org/uid_gid.txt for current reccomendations - if any)\n\n"
   exit 1
@@ -81,10 +81,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Apply all the patches in $CWD/patches (thanks Gentoo)
 for patch in $CWD/patches/* ; do
@@ -114,7 +114,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -124,9 +124,7 @@ mkdir -p $PKG/var/log/cherokee
 chown -R $WWWUSER:$WWWGROUP $PKG/var/log/cherokee
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README.rst \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 install -D -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-- 
cgit v1.2.3