15 files changed, 201 insertions, 33 deletions
diff --git a/network/cherokee/ChangeLog.txt b/network/cherokee/ChangeLog.txt
index 94c24d33a9..68176774fa 100644
--- a/network/cherokee/ChangeLog.txt
+++ b/network/cherokee/ChangeLog.txt
@@ -1,3 +1,6 @@
+Sun 08 Aug 2011 - ponce (matteo.bernardini@gmail.com)
+- SlackBuild script for Cherokee 1.2.98
+
 Mon 07 Sep 2009 - Pablo Hernan Saro (pablosaro@gmail.com)
 - SlackBuild script for Cherokee 0.99.24
 - Cherokee rc script updated
diff --git a/network/cherokee/README b/network/cherokee/README
index c0424311d2..ae3aa7f646 100644
--- a/network/cherokee/README
+++ b/network/cherokee/README
@@ -24,7 +24,7 @@ Notes about using this SlackBuild
 1) To specify the WWW root directory pass WWWROOT=/path/to/www/root
    to the script, like this:
 
-      WWWROOT=/var/www ./cherokee.SlackBuild
+      WWWROOT=/var/www/htdocs-cherokee ./cherokee.SlackBuild
 
 2) If you want to enable IPv6 support, pass IPV6=yes to the script.
 3) If you want to disable the Cherokee-admin installation, pass
@@ -35,9 +35,19 @@ Notes about using this SlackBuild
    to the script.
 5) If you want to build Cherokee with debugging options, enable trace
    facility by passing TRACE=yes to the script.
+6) The $WWWGROUP group and/or $WWWUSER user account are set to apache.
+   To run cherokee as a different user/group specify them passing the options
+   options WWWUSER/WWWGROUP to the slackbuild, like
+
+     WWWUSER=cherokee WWWGROUP=cherokee ./cherokee.SlackBuild
+
+   You may want to create first a dedicated user/group.
+
+     groupadd -g 249 cherokee
+     useradd -u 249 -g cherokee -d /var/www cherokee
 
 Comments, suggestions or bug reports
 ------------------------------------
 
-If you have anything to say about this SlackBuild, event reporting a
+If you have anything to say about this SlackBuild, even reporting a
 bug, don't hesitate to contact me at pablosaro@gmail.com
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index caff2d9f11..9c2e0266fe 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -3,13 +3,21 @@
 # Slackware build script for cherokee
 
 # Written by Pablo Hernan Saro (pablosaro@gmail.com)
+# updated  by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=cherokee
-VERSION=${VERSION:-0.99.24}
-ARCH=${ARCH:-i686}
+VERSION=${VERSION:-1.2.98}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -24,10 +32,19 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 # Set the WWW root directory
-WWWROOT=${WWWROOT:-/var/www}
+WWWROOT=${WWWROOT:-/var/www/htdocs-cherokee}
+
+# Set the WWW user - defaulted to root, but apache is better
+WWWUSER=${WWWUSER:-apache}
+
+# Set the WWW group - defaulted to root, but apache is better
+WWWGROUP=${WWWGROUP:-apache}
 
 # Enable/Disable IPv6 support
 IPV6=${IPV6:-no}
@@ -41,13 +58,27 @@ MYSQL=${MYSQL:-yes}
 # Enable/Disable trace facility (debugging options)
 TRACE=${TRACE:-no}
 
+## you can optionally specify to run as a cherokee user
+# See http://slackbuilds.org/uid_gid.txt for current recomendations.
+hintz() {
+  printf "         The cherokee group and/or the cherokee user account
+         are set to \"apache\". To run cherokee as a different
+         user/group specify them passing the options
+         WWWUSER/WWWGROUP to the slackbuild, like
+         WWWUSER=cherokee WWWGROUP=cherokee ./cherokee.SlackBuild
+
+         You may want to create first a dedicated user/group.
+           groupadd -g 259 cherokee
+           useradd -u 259 -g cherokee -d ${WWWROOT}\n"
+}
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -56,6 +87,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$WWWUSER" = "apache" ] ; then
+  hintz
+elif [ "$WWWGROUP" = "apache" ] ; then
+  hintz
+fi
+
+sh autogen.sh | true
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -67,9 +106,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
   --with-wwwroot=$WWWROOT \
+  --with-wwwuser=$WWWUSER \
+  --with-wwwgroup=$WWWGROUP \
   --with-mysql=$MYSQL \
   --enable-ipv6=$IPV6 \
   --enable-admin=$ADMIN \
+  --disable-pam \
   --enable-trace=$TRACE
 
 make
@@ -78,10 +120,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -99,4 +139,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
-
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index 427929e9cc..6fca29c687 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,10 +1,10 @@
 PRGNAM="cherokee"
-VERSION="0.99.24"
+VERSION="1.2.98"
 HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz"
-MD5SUM="5afed8bdd6020dc5bf0ba9ec83b947f1"
+DOWNLOAD="http://www.cherokee-project.com/download/1.2/1.2.98/cherokee-1.2.98.tar.gz"
+MD5SUM="21b01e7d45c0e82ecc0c4257a9c27feb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Pablo Hernan Saro"
 EMAIL="pablosaro@gmail.com" 
-APPROVED="dsomero"
+APPROVED=""
diff --git a/network/darkstat/darkstat.SlackBuild b/network/darkstat/darkstat.SlackBuild
index 3b585e000a..62508a77ef 100644
--- a/network/darkstat/darkstat.SlackBuild
+++ b/network/darkstat/darkstat.SlackBuild
@@ -70,10 +70,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/grsync/README b/network/grsync/README
new file mode 100644
index 0000000000..e471a95abd
--- /dev/null
+++ b/network/grsync/README
@@ -0,0 +1,6 @@
+grsync (rsync GUI)
+
+grsync is a GUI (Graphical User Interface) for rsync, the commandline
+directory synchronization tool.
+It can be effectively used to synchronize local directories and
+it supports remote targets as well.
diff --git a/network/grsync/doinst.sh b/network/grsync/doinst.sh
new file mode 100644
index 0000000000..51b4303ede
--- /dev/null
+++ b/network/grsync/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications > /dev/null 2>&1
+fi
+
diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild
new file mode 100644
index 0000000000..116db37a40
--- /dev/null
+++ b/network/grsync/grsync.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for grsync
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=grsync
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/grsync/grsync.info b/network/grsync/grsync.info
new file mode 100644
index 0000000000..e4129d29d7
--- /dev/null
+++ b/network/grsync/grsync.info
@@ -0,0 +1,10 @@
+PRGNAM="grsync"
+VERSION="1.1.1"
+HOMEPAGE="http://www.opbyte.it/grsync/"
+DOWNLOAD="http://www.opbyte.it/release/grsync-1.1.1.tar.gz"
+MD5SUM="81d3b6a1827fa1b06d87491f9bb1c8b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/network/grsync/slack-desc b/network/grsync/slack-desc
new file mode 100644
index 0000000000..7fecc7eb6c
--- /dev/null
+++ b/network/grsync/slack-desc
@@ -0,0 +1,19 @@
+# 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------------------------------------------------------|
+grsync: grsync (rsync GUI)
+grsync: 
+grsync: grsync is a GUI (Graphical User Interface) for rsync, the commandline
+grsync: directory synchronization tool.
+grsync: It can be effectively used to synchronize local directories and
+grsync: it supports remote targets as well.
+grsync:
+grsync: Homepage: http://www.opbyte.it/grsync/
+grsync:
+grsync:
+grsync:
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index a80574dfec..71c8ec4ec4 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -108,10 +108,8 @@ install -m 0644 docs/hping3.8 $PKG/usr/man/man8/
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd docs ; cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION )
diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild
index 38e3ffb593..d4cafe4793 100644
--- a/network/lighttpd/lighttpd.SlackBuild
+++ b/network/lighttpd/lighttpd.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lighttpd
-VERSION=1.4.28
+VERSION=1.4.29
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index 7231809265..f6d4460377 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,10 +1,10 @@
 PRGNAM="lighttpd"
-VERSION="1.4.28"
+VERSION="1.4.29"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.28.tar.bz2"
-MD5SUM="586eb535d31ac299652495b058dd87c4"
+DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.29.tar.bz2"
+MD5SUM="e6e67b09986cb504db630b5a86b2dd76"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
 EMAIL="paul@oldcode.org"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/network/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild
index 239d9e540d..84d322f0e3 100644
--- a/network/urlgrabber/urlgrabber.SlackBuild
+++ b/network/urlgrabber/urlgrabber.SlackBuild
@@ -25,7 +25,7 @@
 # modified by Javier Rojas to fit urlgrabber
 
 PRGNAM=urlgrabber
-VERSION=3.1.0
+VERSION=3.9.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/urlgrabber/urlgrabber.info b/network/urlgrabber/urlgrabber.info
index a29cbed0fa..bc84bd0aab 100644
--- a/network/urlgrabber/urlgrabber.info
+++ b/network/urlgrabber/urlgrabber.info
@@ -1,10 +1,10 @@
 PRGNAM="urlgrabber"
-VERSION="3.1.0"
+VERSION="3.9.1"
 HOMEPAGE="http://urlgrabber.baseurl.org/"
-DOWNLOAD="http://urlgrabber.baseurl.org/download/urlgrabber-3.1.0.tar.gz"
-MD5SUM="2a92d8ce0d89c5e772a98e9b8dcd5b73"
+DOWNLOAD="http://urlgrabber.baseurl.org/download/urlgrabber-3.9.1.tar.gz"
+MD5SUM="00c8359bf71062d0946bacea521f80b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Javier Rojas"
 EMAIL="jerojasro@devnull.li"
-APPROVED="dsomero"
+APPROVED=""