From 4dcb76b3a71017fe2bf433a8f152b1f54785f3b8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 31 Jan 2004 01:15:33 +0000 Subject: [PATCH] Synthetic commit for tag v_3_0_3 --- debian/README.Debian | 8 +- debian/changelog | 50 ------- debian/control | 2 +- debian/doc-base.developer | 6 - debian/doc-base.faq | 6 - debian/doc-base.user | 6 - debian/docs | 5 - debian/init.d | 1 - debian/logrotate | 19 ++- debian/manpages | 2 +- debian/rules | 54 +------- doc/webserver/submit/confirmad.php | 58 -------- doc/webserver/submit/index.php | 207 ----------------------------- filters.c | 10 +- 14 files changed, 25 insertions(+), 409 deletions(-) delete mode 100644 doc/webserver/submit/confirmad.php delete mode 100644 doc/webserver/submit/index.php diff --git a/debian/README.Debian b/debian/README.Debian index 5b5cb350..1e13c06f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -7,11 +7,5 @@ privoxy for Debian want to use these features, you can enable them in /etc/privoxy/config and do a "/etc/init.d/privoxy restart". -- A patch was applied to access the local copy of the user manual - (/usr/share/doc/privoxy/user-manual/*) was applied. With the option - user-manual /usr/share/doc/privoxy/user-manual - in /etc/privoxy/config this is activated and the manual can be - accessed as http://config.privoxy.org/user-manual - Roland Rosenfeld -$Id: README.Debian,v 1.2 2003/04/26 12:45:33 roland Exp $ +$Id$ diff --git a/debian/changelog b/debian/changelog index 1c17369d..41003059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,53 +1,3 @@ -privoxy (3.0.2-5) unstable; urgency=low - - * Merge corrections from upstream default.action 1.7. - - demoronizer filter (which caused trouble on non latin1 charsets) is - now switched off by default (Closes: #202234). - - -- Roland Rosenfeld Tue, 9 Sep 2003 21:31:51 +0200 - -privoxy (3.0.2-4) unstable; urgency=low - - * Add a versioned build dependency on htmldoc (>= 1.8.20), because there - seem to be some options mission in the old 1.8.17 (Closes: #192457). - * Merge rotation of logfile and jarfile in logrotate script. - * Test whether /var/run/privoxy.pid is existing and don't bother when no - privoxy is running in logrotate script (Closes: #191838). - * Remove /var/run/privoxy.pid on privoxy stop in init.d script. - * Mention apt-get instead of dpkg in user-manual (Closes: #189239). - * Remove trailing whitespace from text versions of user-manual, - developer-manual and faq (Closes: #192566). - - -- Roland Rosenfeld Fri, 9 May 2003 08:21:30 +0200 - -privoxy (3.0.2-3) unstable; urgency=low - - * Stop filtering favicon.ico, which may cause trouble (Closes: #188947). - * Send SIGHUP to privoxy instead of touching /etc/provoxy/config in - logrotate script to tell privoxy that the logfiles were rotated - (Closes: #189240). - * Remove trailing spaces from config file (Closes: #189240). - * Install man page as privoxy(8) instead of privoxy(1), because this is - a system binary. - * Build HTML, text, and PDF versions of the documentation from source. - * Fix setting of dodk in configure.in. - * Add option "--linkcolor #0000ff" to htmldoc call in ldp_print to be - independent of ~/.htmldocrc color setting. - * Mention PDF and text version of the documentation in doc-base files. - * Install PDF version of the documentation, too. - * Install HTML version of the man page, too. - - -- Roland Rosenfeld Mon, 21 Apr 2003 11:11:31 +0200 - -privoxy (3.0.2-2) unstable; urgency=low - - * Don't apply any filters to {bugs|lists}.debian.org (Closes: #186537). - * Prepend "http://config.privoxy.org" before "/user-manual/" to always - get a correct URL for the local user-manual (also on 404 error pages). - (Closes SF-719724). - - -- Roland Rosenfeld Sun, 13 Apr 2003 12:49:15 +0200 - privoxy (3.0.2-1) unstable; urgency=low * New upstream version 3.0.2. diff --git a/debian/control b/debian/control index 165d5978..eb46f322 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: privoxy Section: web Priority: optional Maintainer: Roland Rosenfeld -Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev, jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc (>= 1.8.20) +Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev Standards-Version: 3.5.9 Package: privoxy diff --git a/debian/doc-base.developer b/debian/doc-base.developer index 4b5abbcb..6a606b90 100644 --- a/debian/doc-base.developer +++ b/debian/doc-base.developer @@ -10,9 +10,3 @@ Section: Apps/Net Format: HTML Index: /usr/share/doc/privoxy/developer-manual/index.html Files: /usr/share/doc/privoxy/developer-manual/*.html - -Format: text -Files: /usr/share/doc/privoxy/developer-manual.txt.gz - -Format: pdf -Files: /usr/share/doc/privoxy/privoxy-developer-manual.pdf diff --git a/debian/doc-base.faq b/debian/doc-base.faq index 210e3278..117c2a3b 100644 --- a/debian/doc-base.faq +++ b/debian/doc-base.faq @@ -9,9 +9,3 @@ Section: Apps/Net Format: HTML Index: /usr/share/doc/privoxy/faq/index.html Files: /usr/share/doc/privoxy/faq/*.html - -Format: text -Files: /usr/share/doc/privoxy/faq.txt.gz - -Format: pdf -Files: /usr/share/doc/privoxy/privoxy-faq.pdf diff --git a/debian/doc-base.user b/debian/doc-base.user index 1828834b..2a7f5e69 100644 --- a/debian/doc-base.user +++ b/debian/doc-base.user @@ -8,9 +8,3 @@ Section: Apps/Net Format: HTML Index: /usr/share/doc/privoxy/user-manual/index.html Files: /usr/share/doc/privoxy/user-manual/*.html - -Format: text -Files: /usr/share/doc/privoxy/user-manual.txt.gz - -Format: pdf -Files: /usr/share/doc/privoxy/privoxy-user-manual.pdf diff --git a/debian/docs b/debian/docs index bb8f2b44..43320693 100644 --- a/debian/docs +++ b/debian/docs @@ -8,8 +8,3 @@ doc/webserver/user-manual doc/webserver/developer-manual doc/webserver/images doc/webserver/p_doc.css -doc/webserver/privoxy-index.html -doc/webserver/man-page -doc/pdf/privoxy-developer-manual.pdf -doc/pdf/privoxy-user-manual.pdf -doc/pdf/privoxy-faq.pdf diff --git a/debian/init.d b/debian/init.d index 55b37155..012668da 100644 --- a/debian/init.d +++ b/debian/init.d @@ -24,7 +24,6 @@ case "$1" in echo -n "Stopping $DESC: " start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \ --exec $DAEMON - rm -f $PIDFILE echo "$NAME." ;; #reload) diff --git a/debian/logrotate b/debian/logrotate index a0e7c612..d230a8b0 100644 --- a/debian/logrotate +++ b/debian/logrotate @@ -1,14 +1,21 @@ -/var/log/privoxy/logfile /var/log/privoxy/jarfile { +/var/log/privoxy/logfile { create 0640 privoxy adm missingok weekly rotate 7 compress - sharedscripts postrotate - if [ -f /var/run/privoxy.pid ] - then - kill -HUP `cat /var/run/privoxy.pid` > /dev/null - fi + touch /etc/privoxy/config + endscript +} + +/var/log/privoxy/jarfile { + create 0640 privoxy adm + missingok + weekly + rotate 7 + compress + postrotate + touch /etc/privoxy/config endscript } diff --git a/debian/manpages b/debian/manpages index 51ec1109..66709657 100644 --- a/debian/manpages +++ b/debian/manpages @@ -1 +1 @@ -privoxy.8 +privoxy.1 diff --git a/debian/rules b/debian/rules index 90f6a04e..33384c7d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ configure-stamp: env CFLAGS="$(OPTIMIZE) -g" \ ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man $(WITHDEBUG) \ - --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular + --with-docbook=no touch configure-stamp @@ -38,27 +38,7 @@ build: build-stamp build-stamp: configure-stamp dh_testdir -# backup formatted upstream documentation: - for x in source text webserver pdf; do \ - if [ ! -d doc/$$x.dist ]; then \ - cp -a doc/$$x doc/$$x.dist; \ - fi; \ - done - for x in INSTALL README AUTHORS privoxy.1; do \ - if [ ! -f $$x.dist ]; then \ - cp -a $$x $$x.dist; \ - fi; \ - done - $(MAKE) - $(MAKE) dok-pdf - $(MAKE) dok - -# remove trailing whitespaces: - for x in developer-manual user-manual faq; do \ - sed -e 's/[ ]*$$//' < doc/text/$$x.txt > doc/text/$$x.nws;\ - mv -f doc/text/$$x.nws doc/text/$$x.txt; \ - done touch build-stamp @@ -69,27 +49,8 @@ clean: -$(MAKE) clean -$(MAKE) distclean - rm -f privoxy privoxy.8 + rm -f privoxy rm -f configure config.h GNUmakefile - - rm -rf obj - rm -f ActivityConsole.jar - rm -f src/java/org/privoxy/activityconsole/*.class - -# restore formatted upstream documentation: - for x in source text webserver pdf; do \ - if [ -d doc/$$x.dist ]; then \ - rm -rf doc/$$x; \ - mv doc/$$x.dist doc/$$x; \ - fi; \ - done - for x in INSTALL README AUTHORS privoxy.1; do \ - if [ -f $$x.dist ]; then \ - rm -f $$x; \ - mv $$x.dist $$x; \ - fi; \ - done - rm -f doc/source/ldp.dsl dh_clean @@ -104,12 +65,11 @@ install: build sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/' \ -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)[ ]*1/\1 0/' \ - -e 's#^confdir .*#confdir /etc/privoxy#' \ - -e 's#^logdir .*#logdir /var/log/privoxy#' \ + -e 's#^confdir \.#confdir /etc/privoxy#' \ + -e 's#^logdir \.#logdir /var/log/privoxy#' \ -e 's%^#\(user-manual\).*%\1 /usr/share/doc/privoxy/user-manual%' \ -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \ -e 's/Id: config,v.*/Id: config,v $$/' \ - -e 's/ *$$//' \ < config > $(DEBDIR)/etc/privoxy/config install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.action @@ -117,8 +77,6 @@ install: build install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter install -m 0644 trust $(DEBDIR)/etc/privoxy/trust - sed -e 's/"1"/"8"/' < privoxy.1 > privoxy.8 - cp -r templates $(DEBDIR)/etc/privoxy/ rm -f $(DEBDIR)/etc/privoxy/templates/*~ rm -rf $(DEBDIR)/etc/privoxy/templates/CVS @@ -134,8 +92,6 @@ binary-arch: build install dh_testroot # dh_installdebconf dh_installdocs -XCVS - (cd $(DEBDIR)/usr/share/doc/privoxy/; \ - mv privoxy-index.html index.html) dh_installexamples dh_installmenu dh_installlogrotate @@ -150,7 +106,7 @@ binary-arch: build install dh_installchangelogs ChangeLog dh_link dh_strip - dh_compress -Xpdf + dh_compress dh_fixperms # dh_makeshlibs dh_installdeb diff --git a/doc/webserver/submit/confirmad.php b/doc/webserver/submit/confirmad.php deleted file mode 100644 index cfd1eaeb..00000000 --- a/doc/webserver/submit/confirmad.php +++ /dev/null @@ -1,58 +0,0 @@ - - - - Privoxy|Confirm ad submission - - - -

Privoxy Feedback

- -

Confirm Ad Submission

- -

We have detemined that ...

- - - - - \ No newline at end of file diff --git a/doc/webserver/submit/index.php b/doc/webserver/submit/index.php deleted file mode 100644 index 47a76739..00000000 --- a/doc/webserver/submit/index.php +++ /dev/null @@ -1,207 +0,0 @@ - - - - Privoxy|Submit - - - -

Privoxy Feedback

- -

Compared to bug -reports or feature -requests, this page is intended to optimize the blocking behavior -of Privoxy. Therefor we need your feedback.

If you have -observed and advertisement, that was not blocked or an image that was -incorrectly blocked, please use the forms below to report this.

- -

New Advertisement

- - - - - 0) - $np = $ip; - else - $np = $REMOTE_ADDR; - if ($np != $ip) - $count += 1; - rewind ($fp); - fputs ($fp,substr($np." ",0,15).$count); - fclose ($fp); - echo $count; -} -else { - $fp = fopen($cfile,"w"); - $np = $REMOTE_ADDR; - $count = "1"; - fputs ($fp,substr($np." ",0,15).$count); - fclose ($fp); - echo $count; -} -?> - - -

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Your name: - -optional
Your email address: - -optional
Website, where I observed an ad: - -Please change, if necessary
How annoying is the ad: - -Please select one
Privoxy Version: - -Automatically determined
Action File: - -Automatically determined
Action File Version: - -Automatically determined
Remarks: - -Please change, if necessary
- - -
-
-

- -

Incorrect blocking

-

We soon present a form where you can submit websites, where the -default action file was too agressive.

- -

Misc

-

Bla bla bla

- - - - - \ No newline at end of file diff --git a/filters.c b/filters.c index 579711c5..1d83e5f7 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.58.2.5 2003/11/11 13:10:31 oes Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.58.2.4 2003/02/28 12:52:45 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/Attic/filters.c,v $ @@ -38,9 +38,6 @@ const char filters_rcs[] = "$Id: filters.c,v 1.58.2.5 2003/11/11 13:10:31 oes Ex * * Revisions : * $Log: filters.c,v $ - * Revision 1.58.2.5 2003/11/11 13:10:31 oes - * Fixed bug #839859: "See why" link URL now gets url-encoded. - * * Revision 1.58.2.4 2003/02/28 12:52:45 oes * Fixed a typo * @@ -701,6 +698,9 @@ int match_portlist(const char *portlist, int port) *********************************************************************/ struct http_response *block_url(struct client_state *csp) { +#ifdef FEATURE_IMAGE_BLOCKING + char *p; +#endif /* def FEATURE_IMAGE_BLOCKING */ struct http_response *rsp; /* @@ -727,7 +727,6 @@ struct http_response *block_url(struct client_state *csp) if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) && is_imageurl(csp)) { - char *p; /* determine HOW images should be blocked */ p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; @@ -818,7 +817,6 @@ struct http_response *block_url(struct client_state *csp) { jb_err err; struct map * exports; - char *p; /* * Workaround for stupid Netscape bug which prevents -- 2.49.0