network/privoxy: Updated for version 3.0.12

5 files changed, 32 insertions, 14 deletions

diff --git a/network/privoxy/README b/network/privoxy/README
index 3264d54e02ec8..587259a77a749 100644
--- a/network/privoxy/README
+++ b/network/privoxy/README
@@ -12,8 +12,4 @@ a privoxy user and group.  To do that, run the following commands:
 groupadd -g 206 privoxy
 useradd -u 206 -g 206 -c "Web Proxy" -d /dev/null -s /bin/false privoxy
 
-To run privoxy at boot, the following code needs to 
-be added to /etc/rc.d/rc.local:
-	if [ -x /etc/rc.d/rc.privoxy ];  then
-		/etc/rc.d/rc.privoxy start
-	fi
+See README.SLACKWARE for setup information.
diff --git a/network/privoxy/README.SLACKWARE b/network/privoxy/README.SLACKWARE
new file mode 100644
index 0000000000000..0e1e7c0ef850d
--- /dev/null
+++ b/network/privoxy/README.SLACKWARE
@@ -0,0 +1,15 @@
+README.SLACKWARE for privoxy
+
+To run privoxy at boot, the following code needs to
+be added to /etc/rc.d/rc.local:
+
+  if [ -x /etc/rc.d/rc.privoxy ];  then
+    /etc/rc.d/rc.privoxy start
+  fi
+
+Then add the following to /etc/rc.d/rc.local_shutdown:
+
+  if [ -x /etc/rc.d/rc.privoxy ];  then
+    /etc/rc.d/rc.privoxy stop
+  fi
+
diff --git a/network/privoxy/doinst.sh b/network/privoxy/doinst.sh
index 9187187491dad..712c6737b3968 100644
--- a/network/privoxy/doinst.sh
+++ b/network/privoxy/doinst.sh
@@ -63,6 +63,7 @@ config etc/privoxy/templates/cgi-error-file-read-only.new
 config etc/privoxy/templates/edit-actions-for-url-filter.new
 config etc/privoxy/templates/show-status.new
 config etc/privoxy/templates/show-url-info.new
+config etc/privoxy/templates/url-info-osd.xml.new
 config etc/privoxy/default.action.new
 config etc/privoxy/user.action.new
 config etc/privoxy/user.filter.new
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index c94a8cade8e1f..6ba6a90c330c1 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -29,7 +29,7 @@
 PRGNAM=privoxy
 VERSION=3.0.12
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -38,11 +38,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 ## privoxy user & group *MUST* exist before package creation
@@ -67,7 +70,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-stable
 tar xvf $CWD/$PRGNAM-$VERSION-stable-src.tar.gz
 cd $PRGNAM-$VERSION-stable
 chown -R root:root .
@@ -79,6 +82,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=$PKG/usr \
+  --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \
   --sbindir=$PKG/usr/bin \
   --sysconfdir=$PKG/etc/$PRGNAM \
   --localstatedir=$PKG/var \
@@ -99,16 +103,16 @@ make install-strip || exit 1
 
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir $PKG/etc/rc.d
 cat slackware/rc.privoxy.orig > $PKG/etc/rc.d/rc.$PRGNAM.new
 sed -i "	s/%PROGRAM%/$PRGNAM/
-		s/%SBIN_DEST%/\/usr\/bin/
-		s/%CONF_DEST%/\/etc\/$PRGNAM/
+		s,%SBIN_DEST%,/usr/bin,
+		s,%CONF_DEST%,/etc/$PRGNAM,
 		s/%USER%/$PRGNAM/
 		s/%GROUP%/$PRGNAM/
-		s/\/var\/run\/\$PRIVOXY_PRG/\/var\/run/
 " $PKG/etc/rc.d/rc.$PRGNAM.new 
 
 # Fix Path within the configuration files (thanks to h4kteur)
@@ -131,4 +135,4 @@ 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info
index 282aa9fb54c6b..3826047891fb6 100644
--- a/network/privoxy/privoxy.info
+++ b/network/privoxy/privoxy.info
@@ -3,6 +3,8 @@ VERSION="3.0.12"
 HOMEPAGE="http://www.privoxy.org/"
 DOWNLOAD="http://downloads.sourceforge.net/sourceforge/ijbswa/privoxy-3.0.12-stable-src.tar.gz"
 MD5SUM="c973e608d27b248ef567b47664308da1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="alkos333"
 EMAIL="me@alkos333.net"
 APPROVED="dsomero"