network/suphp: Updated for version 0.6.2

4 files changed, 23 insertions, 14 deletions

diff --git a/network/suphp/README b/network/suphp/README
index 14cce5e7929f..e1e4bb9c6b63 100644
--- a/network/suphp/README
+++ b/network/suphp/README
@@ -3,15 +3,15 @@ owners. It consists of an Apache module (mod_suphp) and a setuid root
 binary (suphp) that is called by the Apache module to change the uid of
 the process executing the PHP interpreter.
 
-This version was compiled to look for its config-file in /etc/apache
+This version was compiled to look for its config-file in /etc/httpd
 rather then just /etc as 'httpd' looks there aswell.
 
-Some of the 'standard' /etc/apache/httpd.conf directives include:
+Some of the 'standard' /etc/httpd/httpd.conf directives include:
 
-  LoadModule suphp_module  /usr/libexec/apache/mod_suphp.so
+  LoadModule suphp_module  /usr/lib/httpd/modules/mod_suphp.so
   suPHP_Engine on
   AddHandler x-httpd-php .php
-  suPHP_AddHandler x-httpd-php
+  suPHP_AddHandler x-httpd-php  
   suPHP_UserGroup someuser users
 
 To use different php versions 'per vhost' see:
diff --git a/network/suphp/slack-desc b/network/suphp/slack-desc
index e3a705a61d3a..4bbf41e9f98b 100644
--- a/network/suphp/slack-desc
+++ b/network/suphp/slack-desc
@@ -1,4 +1,12 @@
-suphp: suPHP
+# HOW TO EDIT THIS FILE:
+# 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
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+suphp: suPHP (a PHP module)
 suphp:
 suphp: mod_suphp is a module for executing PHP scripts with the permission
 suphp: of their owers rather then the user the webserver runs as. Similar
diff --git a/network/suphp/suphp.SlackBuild b/network/suphp/suphp.SlackBuild
index e2072d42b232..0fb2b13fb994 100644
--- a/network/suphp/suphp.SlackBuild
+++ b/network/suphp/suphp.SlackBuild
@@ -12,17 +12,17 @@ VERSION=0.6.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
 
 # The stock Apache on Slackware runs httpd onder system
-# user/group account 'nobody'. If you happen to use some
+# user/group account 'apache'. If you happen to use some
 # other account (which should improve security) change below
 # and make sure /etc/apache/suphp.conf matches
-HTTPD_USER=nobody
-HTTPD_GROUP=nobody
+HTTPD_USER=apache
+HTTPD_GROUP=apache
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -50,7 +50,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --with-apr=/usr/bin/apr-1-config \
   --with-apxs=/usr/sbin/apxs \
-  --sysconfdir=/etc/apache \
+  --sysconfdir=/etc/httpd \
   --with-apache-user=$HTTPD_USER \
   --with-logfile=/var/log/apache/suphp_log
 
@@ -69,10 +69,10 @@ cp -a AUTHORS COPYING ChangeLog doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Add a sample configuration file 
-mkdir -p $PKG/etc/apache
+mkdir -p $PKG/etc/httpd
 cat $CWD/suphp.conf \
-  | tr 'webserver_user=nobody' "webserver_user=$HTTPD_USER" \
-    >> $PKG/etc/apache/suphp.conf.new
+  | tr 'webserver_user=apache' "webserver_user=$HTTPD_USER" \
+    >> $PKG/etc/httpd/suphp.conf.new
 
 # Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
diff --git a/network/suphp/suphp.info b/network/suphp/suphp.info
index 4de41dcdb82c..9eed77561130 100644
--- a/network/suphp/suphp.info
+++ b/network/suphp/suphp.info
@@ -1,7 +1,8 @@
 PRGNAM="suphp"
+VERSION="0.6.2"
 HOMEPAGE="http://www.suphp.org/"
 DOWNLOAD="http://www.suphp.org/download/suphp-0.6.2.tar.gz"
 MD5SUM="06ca9e592a5c6dd3dcb9360c958369c1"
 MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="BP{k}"
\ No newline at end of file
+APPROVED="BP{k}"