Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3e7ab2fb2cb8941f86e0212b827e4d1994a8f2ed)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3e7ab2fb2cb8941f86e0212b827e4d1994a8f2ed)
  • Date: Sat, 26 Mar 2011 18:51:16 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/privoxy/BUILD | 8 ++++++--
http/privoxy/DEPENDS | 11 ++++++++---
http/privoxy/DETAILS | 3 +--
http/privoxy/HISTORY | 9 +++++++++
http/privoxy/PRE_BUILD | 10 +++-------
http/privoxy/init.d/junkbuster | 5 ++---
http/privoxy/mk.patch | 0
7 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 3e7ab2fb2cb8941f86e0212b827e4d1994a8f2ed
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

privoxy: fixed several bugs about running under non-privileged user and
spell clean up

diff --git a/http/privoxy/BUILD b/http/privoxy/BUILD
index cce4106..b299edc 100755
--- a/http/privoxy/BUILD
+++ b/http/privoxy/BUILD
@@ -1,2 +1,6 @@
- OPTS="--sysconfdir=${INSTALL_ROOT}/etc/privoxy -with-user=nobody
--with-group=nogroup ${OPTS}" &&
- default_build
+OPTS="--sysconfdir=${INSTALL_ROOT}/etc/privoxy \
+ --with-user=nobody \
+ --with-group=nogroup \
+ ${OPTS}" &&
+
+default_build
diff --git a/http/privoxy/DEPENDS b/http/privoxy/DEPENDS
index 01938ce..7f408c7 100755
--- a/http/privoxy/DEPENDS
+++ b/http/privoxy/DEPENDS
@@ -1,11 +1,16 @@
-depends zlib &&
depends autoconf &&

+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "to decompress data before filtering" &&
+
optional_depends pcre \
'--enable-dynamic-pcre' \
'--disable-dynamic-pcre' \
- 'PCRE (Perl regexp) support' &&
+ 'for PCRE (Perl regexp) support' &&
+
optional_depends docbook-dtd \
- '--with-docbook=/usr/share/sgml/docbook/xml-dtd-4.2' \
+
'--with-docbook=$INSTALL_ROOT/usr/share/sgml/docbook/xml-dtd-4.2' \
'--without-docbook' \
'generation of docs'
diff --git a/http/privoxy/DETAILS b/http/privoxy/DETAILS
index 91fb668..b5c2cd3 100755
--- a/http/privoxy/DETAILS
+++ b/http/privoxy/DETAILS
@@ -1,4 +1,3 @@
-
SPELL=privoxy
SF_PROJECT=ijbswa
VERSION=3.0.17
@@ -14,7 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VX
GATHER_DOCS=off
ENTERED=20030403
KEYWORDS="web http"
- SHORT='Privoxy is a web proxy with advanced filtering
capabilities for protecting privacy'
+ SHORT='web proxy with advanced filtering capabilities for
protecting privacy'
cat << EOF
Privoxy is a web proxy with advanced filtering capabilities for protecting
privacy,
filtering web page content, managing cookies, controlling access, and
removing ads,
diff --git a/http/privoxy/HISTORY b/http/privoxy/HISTORY
index be24d04..6d55217 100644
--- a/http/privoxy/HISTORY
+++ b/http/privoxy/HISTORY
@@ -1,3 +1,12 @@
+2011-03-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: made zlib optional; modified pcre comment; added
INSTALL_ROOT
+ for docbook-dtd dependency
+ * DETAILS: corrected short description
+ * BUILD: fixed user flag; cleaned up
+ * PRE_BUILD: cleaned up; quoting paths
+ * init.d/junkbuster: corrected important startup settings
+ * mk.patch: removed
+
2010-11-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.17

diff --git a/http/privoxy/PRE_BUILD b/http/privoxy/PRE_BUILD
index 1135ca2..545d68d 100755
--- a/http/privoxy/PRE_BUILD
+++ b/http/privoxy/PRE_BUILD
@@ -1,9 +1,5 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# add updated actions file
-#verify_file 3 &&
-#cp $SOURCE_CACHE/$SOURCE3 ./default.action &&
-# apply smgl patch
-patch -p0 <$SPELL_DIRECTORY/mk.patch &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
autoheader &&
autoconf
diff --git a/http/privoxy/init.d/junkbuster b/http/privoxy/init.d/junkbuster
index 53dd1db..ce65499 100755
--- a/http/privoxy/init.d/junkbuster
+++ b/http/privoxy/init.d/junkbuster
@@ -1,10 +1,9 @@
#!/bin/bash

PROGRAM=/usr/sbin/privoxy
-ARGS="/etc/privoxy/config"
+PIDFILE=/var/run/privoxy.pid
+ARGS="--pidfile $PIDFILE --user nobody.nogroup /etc/privoxy/config"
RUNLEVEL=3
NEEDS="+remote_fs"

. /etc/init.d/smgl_init
-
-
diff --git a/http/privoxy/mk.patch b/http/privoxy/mk.patch
deleted file mode 100644
index e69de29..0000000



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3e7ab2fb2cb8941f86e0212b827e4d1994a8f2ed), Vlad Glagolev, 03/26/2011

Archive powered by MHonArc 2.6.24.

Top of Page