current/debian/patches 05_defaut_action.patch, NONE, 1.1 06_8bit_manual.patch, NONE, 1.1 14_config.patch, NONE, 1.1 15_mansection8.patch, NONE, 1.1 17_502_no_such_domain.patch, NONE, 1.1 25_standard_medium.patch, NONE, 1.1 27_remove_nsl.patch, NONE, 1.1 28_listen_localhost.patch, NONE, 1.1 32_bind_fixup.patch, NONE, 1.1 33_manpage_hyphen.patch, NONE, 1.1 34_system-docbook2man.patch, NONE, 1.1 series, NONE, 1.1 00list, 1.15, NONE 05_defaut_action.dpatch, 1.16, NONE 06_8bit_manual.dpatch, 1.4, NONE 10_backup_doc.dpatch, 1.5, NONE 11_backup_autotools.dpatch, 1.2, NONE 14_config.dpatch, 1.12, NONE 15_mansection8.dpatch, 1.10, NONE 17_502_no_such_domain.dpatch, 1.3, NONE 25_standard_medium.dpatch, 1.6, NONE 27_remove_nsl.dpatch, 1.7, NONE 28_listen_localhost.dpatch, 1.2, NONE 29_typos.dpatch, 1.1, NONE 32_bind_fixup.dpatch, 1.1, NONE
Roland Rosenfeld <[email protected]>
| Newsgroups | gmane.comp.web.privoxy.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ijbswa/current/debian/patches In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22145/patches Added Files: 05_defaut_action.patch 06_8bit_manual.patch 14_config.patch 15_mansection8.patch 17_502_no_such_domain.patch 25_standard_medium.patch 27_remove_nsl.patch 28_listen_localhost.patch 32_bind_fixup.patch 33_manpage_hyphen.patch 34_system-docbook2man.patch series Removed Files: 00list 05_defaut_action.dpatch 06_8bit_manual.dpatch 10_backup_doc.dpatch 11_backup_autotools.dpatch 14_config.dpatch 15_mansection8.dpatch 17_502_no_such_domain.dpatch 25_standard_medium.dpatch 27_remove_nsl.dpatch 28_listen_localhost.dpatch 29_typos.dpatch 32_bind_fixup.dpatch Log Message: Add all Debian changes from 3.0.19-2 to 3.0.24-1 --- NEW FILE: 34_system-docbook2man.patch --- Author: Roland Rosenfeld <[email protected]> Description: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local copy, to make package reproducible. --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -469,7 +469,7 @@ dok-man: # target for man page generation! man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ - nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ + nsgmls ../privoxy-man-page.sgml | sgmlspl /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl &&\ perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' $(MAN_PAGE) ;\ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ --- 15_mansection8.dpatch DELETED --- --- NEW FILE: series --- 05_defaut_action.patch 06_8bit_manual.patch 14_config.patch 15_mansection8.patch 17_502_no_such_domain.patch 25_standard_medium.patch 27_remove_nsl.patch 28_listen_localhost.patch 32_bind_fixup.patch 33_manpage_hyphen.patch 34_system-docbook2man.patch --- 00list DELETED --- --- NEW FILE: 28_listen_localhost.patch --- Author: Roland Rosenfeld <[email protected]> Description: Listen on localhost:8118 instead of 127.0.0.1:8118, because this is independent from localhost IP (127.0.0.1 vs. 127.0.1.1) and also supports IPv6 (Closes: #512888) Bug-Debian: http://bugs.debian.org/512888 --- a/config +++ b/config @@ -780,7 +780,7 @@ logfile logfile # # listen-address [::1]:8118 # -listen-address 127.0.0.1:8118 +listen-address localhost:8118 # # 4.2. toggle # ============ --- 10_backup_doc.dpatch DELETED --- --- 06_8bit_manual.dpatch DELETED --- --- NEW FILE: 33_manpage_hyphen.patch --- Author: Roland Rosenfeld <[email protected]> Description: Replace all -- in man page by \-\- to make lintian happy. --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -474,8 +474,7 @@ man: dok-release perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \ - perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(MAN_PAGE); \ - perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(MAN_PAGE); \ + perl -pi.bak -e 's/--/\\-\\-/g' $(MAN_PAGE); \ $(DB) ../privoxy-man-page.sgml && $(MV) -f $(MAN_PAGE) ../../../$(MAN_PAGE) # For those with man2html ala RH7s. --- 32_bind_fixup.dpatch DELETED --- --- 28_listen_localhost.dpatch DELETED --- --- NEW FILE: 17_502_no_such_domain.patch --- Author: Roland Rosenfeld <[email protected]> Description: Changes the 404 HTTP status code of the "No such Domain" template to 502 Bad Gateway, which seems to be more correct according to http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html --- a/templates/no-such-domain +++ b/templates/no-such-domain @@ -79,7 +79,7 @@ <html> <head> - <title>404 - No such Domain (Privoxy@@my-hostname@)</title> + <title>502 - Bad Gateway (Privoxy@@my-hostname@)</title> <meta http-equiv="Content-Style-Type" content="text/css"> <meta http-equiv="Content-Script-Type" content="text/javascript"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> @@ -95,7 +95,7 @@ <table summary="" cellpadding="20" cellspacing="10" border="0" width="100%"> <tr> <td class="status"> - 404 + 502 </td> <td class="title" style="width: 100%"> --- 25_standard_medium.dpatch DELETED --- --- 05_defaut_action.dpatch DELETED --- --- NEW FILE: 15_mansection8.patch --- Author: Roland Rosenfeld <[email protected]> Description: Move man page from man section 1 to man section 8. --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -60,7 +60,7 @@ CONF_BASE = @sysconfdir@ SBIN_DEST = @sbindir@ MAN_DIR = @mandir@ MAN_DEST = $(MAN_DIR)/man1 -MAN_PAGE = privoxy.1 +MAN_PAGE = privoxy.8 SHARE_DEST = @datadir@ DOC_DEST = $(SHARE_DEST)/doc/privoxy VAR_DEST = @localstatedir@ --- a/doc/source/privoxy-man-page.sgml +++ b/doc/source/privoxy-man-page.sgml @@ -58,7 +58,7 @@ </refentryinfo> <refmeta> <refentrytitle>privoxy</refentrytitle> - <manvolnum>1</manvolnum> + <manvolnum>8</manvolnum> <refmiscinfo> Privoxy &p-version;<![%p-not-stable;[ &p-status;]]> </refmiscinfo> --- 11_backup_autotools.dpatch DELETED --- --- 17_502_no_such_domain.dpatch DELETED --- --- NEW FILE: 06_8bit_manual.patch --- Author: Roland Rosenfeld <[email protected]> Description: Stop converting 8bit chars in the documentation (#203697) Bug-Debian: http://bugs.debian.org/203697 --- a/doc/source/ldp.dsl.in +++ b/doc/source/ldp.dsl.in @@ -47,9 +47,9 @@ ;; this is necessary because right now jadetex does not understand ;; symbolic entities, whereas things work well with numeric entities. -(declare-characteristic preserve-sdata? - "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" - #f) +;(declare-characteristic preserve-sdata? +; "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" +; #f) ;; put the legal notice in a separate file (define %generate-legalnotice-link% @@ -257,9 +257,9 @@ ;; this is necessary because right now jadetex does not understand ;; symbolic entities, whereas things work well with numeric entities. -(declare-characteristic preserve-sdata? - "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" - #f) +;(declare-characteristic preserve-sdata? +; "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" +; #f) ;; put the legal notice in a separate file (define %generate-legalnotice-link% --- 29_typos.dpatch DELETED --- --- NEW FILE: 32_bind_fixup.patch --- Author: Roland Rosenfeld <[email protected]> Description: Work around bind problems on startup (Closes: #534735) Bug-Debian: http://bugs.debian.org/534735 --- a/jbsockets.c +++ b/jbsockets.c @@ -867,20 +867,7 @@ int bind_port(const char *hostnam, int p } memset(&hints, 0, sizeof(struct addrinfo)); - if (hostnam == NULL) - { - /* - * XXX: This is a hack. The right thing to do - * would be to bind to both AF_INET and AF_INET6. - * This will also fail if there is no AF_INET - * version available. - */ - hints.ai_family = AF_INET; - } - else - { - hints.ai_family = AF_UNSPEC; - } + hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; hints.ai_protocol = 0; /* Really any stream protocol or TCP only */ --- NEW FILE: 27_remove_nsl.patch --- Author: Roland Rosenfeld <[email protected]> Description: Remove unnecessary linking against libnsl. --- a/configure.in +++ b/configure.in @@ -470,7 +470,7 @@ dnl gmtime and localtime dnl ================================================================= dnl Next line needed to find the gethost*_r functions on Solaris -AC_CHECK_LIB(nsl, gethostbyname) +dnl AC_CHECK_LIB(nsl, gethostbyname) AC_CHECK_FUNC(gethostbyaddr_r, [ AC_MSG_CHECKING([signature of gethostbyaddr_r]) --- NEW FILE: 14_config.patch --- Author: Roland Rosenfeld <[email protected]> Description: Several Debian specific changes to config file --- a/config +++ b/config @@ -1,6 +1,6 @@ -# Sample Configuration File for Privoxy 3.0.24 +# Sample Configuration File for Privoxy # -# $Id: 14_config.patch,v 1.1 2016/02/06 12:29:53 roro Exp $ +# Id: config,v # # Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/ # @@ -128,7 +128,7 @@ # config file, because it is used while the config file is # being read. # -#user-manual http://www.privoxy.org/user-manual/ +user-manual /usr/share/doc/privoxy/user-manual # # 1.2. trust-info-url # ==================== @@ -260,7 +260,7 @@ # # No trailing "/", please. # -confdir . +confdir /etc/privoxy # # 2.2. templdir # ============== @@ -345,7 +345,7 @@ confdir . # # No trailing "/", please. # -logdir . +logdir /var/log/privoxy # # 2.5. actionsfile # ================= --- 14_config.dpatch DELETED --- --- NEW FILE: 05_defaut_action.patch --- Author: Roland Rosenfeld <[email protected]> Description: Serveral changes/additons to default.action. --- a/default.action.master +++ b/default.action.master @@ -2413,6 +2413,9 @@ schneegans.de/sv/\?url=referer #MASTER# REMARKS: Exclude per Debian bug report #377843 # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx blogs.msdn.com +#MASTER# REMARKS: Exclude per Debian bug report #441256 +#MASTER# PROBLEM-URL: http://www.memo.de/ +www.memo.de {-filter{unsolicited-popups}} # Sticky Actions = -filter{unsolicited-popups} @@ -2471,6 +2474,11 @@ tr.anp.se/ {+filter{tiny-textforms}} .sourceforge.net/tracker +{-filter{ie-exploits}} +#MASTER# REMARKS: Allow %01 and %02 in URLs as they are used in Amazon's +#MASTER# REMARKS: multi-page results see http://bugs.debian.org/243245 +.amazon.de + {+downgrade-http-version} #MASTER# COMMENTS: This section not checked 10/17/06 HB #MASTER# REMARKS: This is work-around for CUPS http configuration. --- 27_remove_nsl.dpatch DELETED --- --- NEW FILE: 25_standard_medium.patch --- Author: Roland Rosenfeld <[email protected]> Description: Change the global default from standard.Cautious to standard.Medium, which is similar to the old 3.0.3 behavior and doesn't change too much. --- a/match-all.action +++ b/match-all.action @@ -10,7 +10,16 @@ +change-x-forwarded-for{block} \ +client-header-tagger{css-requests} \ +client-header-tagger{image-requests} \ ++deanimate-gifs{last} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{ie-exploits} \ +hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++session-cookies-only \ +set-image-blocker{pattern} \ } / # Match all URLs ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ ijbswa-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ijbswa-commits