diff options
| -rw-r--r-- | network/privoxy/doinst.sh | 1 | ||||
| -rw-r--r-- | network/privoxy/privoxy.SlackBuild | 27 | ||||
| -rw-r--r-- | network/privoxy/privoxy.info | 6 |
3 files changed, 16 insertions, 18 deletions
diff --git a/network/privoxy/doinst.sh b/network/privoxy/doinst.sh index 025c5a771f9ad..c1177c2a5f7f1 100644 --- a/network/privoxy/doinst.sh +++ b/network/privoxy/doinst.sh @@ -32,6 +32,7 @@ fi preserve_perms etc/rc.d/rc.privoxy.new config etc/privoxy/config.new config etc/privoxy/match-all.action.new +config etc/privoxy/regression-tests.action.new config etc/privoxy/trust.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 bf9cb7007f00d..213ac5c4b65f9 100644 --- a/network/privoxy/privoxy.SlackBuild +++ b/network/privoxy/privoxy.SlackBuild @@ -24,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=privoxy -VERSION=${VERSION:-3.0.24} +VERSION=${VERSION:-3.0.26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$(uname -m) ;; esac @@ -44,6 +44,9 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -90,6 +93,10 @@ sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in # .new suffix. Turn this behavior off. We will do it below. sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in +# rc.privoxy generation doesn't work well with $(DESTDIR). Help it along. +sed -i "s/ \/etc\/rc.d\// \$(DESTDIR)\/etc\/rc.d\//g" GNUmakefile.in +mkdir -p $PKG/etc/rc.d + autoheader autoconf CFLAGS="$SLKCFLAGS" \ @@ -116,26 +123,16 @@ find $PKG/usr/man -type f -exec gzip -9 {} + cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir -p $PKG/etc/rc.d -sed \ - -e "s/%PROGRAM%/$PRGNAM/" \ - -e "s,%SBIN_DEST%,/usr/sbin," \ - -e "s,%CONF_DEST%,/etc/$PRGNAM," \ - -e "s/%USER%/$PRIVOXY_USER/" \ - -e "s/%GROUP%/$PRIVOXY_GROUP/" \ - slackware/rc.privoxy.orig \ - > $PKG/etc/rc.d/rc.privoxy.new -chmod +x $PKG/etc/rc.d/rc.privoxy.new - # Make .new files so we don't clobber the existing configuration. -for i in config match-all.action trust user.action user.filter; do +for i in config match-all.action regression-tests.action trust user.action user.filter; do mv $PKG/etc/privoxy/$i $PKG/etc/privoxy/$i.new done # Others are not intended to be user-editable and will be overwritten. # To disregard, uncomment this and the corresponding lines in doinst.sh. #find $PKG/etc/privoxy -name '*.new' -prune -o -type f -exec mv {} {}.new \; -# Don't clobber the logfile either. +# Don't clobber the init script or logfile either. +mv $PKG/etc/rc.d/rc.privoxy $PKG/etc/rc.d/rc.privoxy.new mv $PKG/var/log/privoxy/logfile $PKG/var/log/privoxy/logfile.new # Remove empty directories that are part of Slackware base. diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info index 0277108a4b616..b4a8db2cda9e9 100644 --- a/network/privoxy/privoxy.info +++ b/network/privoxy/privoxy.info @@ -1,8 +1,8 @@ PRGNAM="privoxy" -VERSION="3.0.24" +VERSION="3.0.26" HOMEPAGE="https://www.privoxy.org/" -DOWNLOAD="https://downloads.sourceforge.net/ijbswa/privoxy-3.0.24-stable-src.tar.gz" -MD5SUM="44a47d1a5000db8cccd61ace0e25e7f7" +DOWNLOAD="https://downloads.sourceforge.net/ijbswa/privoxy-3.0.26-stable-src.tar.gz" +MD5SUM="8a1c842112ccea68c19b7ceb4a0e999f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |