[Privoxy-devel] Privoxy 3.0.31 windows upload

[Lee]

On 2/19/21, Fabian Keil <fk at fabiankeil.de> wrote:
> Lee <ler762 at gmail.com> wrote on 2021-02-18:
>
>> On 2/16/21, Fabian Keil <fk at fabiankeil.de> wrote:
>> > Fabian Keil <fk at fabiankeil.de> wrote on 2021-01-31:
>> >
>> >> Lee <ler762 at gmail.com> wrote on 2021-01-31:
>> >>
>> >> > Windows files uploaded to sourceforge.  Hopefully this is enough to
>> >> > explain the difference between 3.0.31 and 3.0.31-X:
>> >> >
>> >> > Privoxy 3.0.31-X has the experimental https inspection feature
>> >> > enabled which allows filtering https traffic.  Configure the
>> >> > directives in section 7 of the config file and then add the
>> >> > +https-inspection action.
>> >>
>> >> I think it is enough. Thanks.
>> >
>> > Lee, could you please document how you built the 3.0.31-X packages?
>>
>> Sorry about that.  I got totally sidetracked on formatting <screen>
>> output.. What do you think of standardizing on two leading spaces in
>> screen and programlisting output -- ie. add this in ldp.dsp
>>
>> (define %indent-programlisting-lines%
>>   ;; Indent lines in a 'ProgramListing'?
>>   ;; "#f" or string to be used as the indent on 'programlisting'
>>   "  ")
>>
>> (define %indent-screen-lines%
>>   ;; Indent lines in a 'Screen'?
>>   ;; "#f" or string to be used as the indent on 'screen'
>>   "  ")
>
> I have no objections to standardising on two leading spaces but
> ldp.dsp seems to be generated by configure.
>
> Did you already figure out where to add the proposed changes
> so they make it into the generated file?

Yes, see attached.  The definitions have to be added/updated in both the
  <style-specification id="print" use="docbook">
(which doesn't cause a stack overflow for me) and
  <style-specification id="html" use="docbook">
sections.

>> Which, at least with cygwin, causes a stack overflow processing this
>> bit in user-manual.sgml
>>   <screen><![ RCDATA [ &GPLv2; ]]></screen>
>
> This doesn't seem to be an issue on ElectroBSD.
>
>> workaround is
>> @@ -8065,11 +8066,11 @@ Requests</title>
>>  <sect2 id="license"><title>License</title>
>>
>>  <sect3 id="gplv2"><title>GNU General Public License version 2</title>
>> - <screen><![ RCDATA [ &GPLv2; ]]></screen>
>> + <literallayout class="Monospaced"><![ RCDATA [ &GPLv2;
>> ]]></literallayout> </sect3>
>>
>>  <sect3 id="gplv3"><title>GNU General Public License version 3</title>
>> - <screen><![ RCDATA [ &GPLv3; ]]></screen>
>> + <literallayout class="Monospaced"><![ RCDATA [ &GPLv3;
>> ]]></literallayout> </sect3>
>
> That seems acceptable to me.
>
>> > By the way, do you have any objections to removing the obsolete pcre
>> > code before the next release?
>>
>> How about the release after next?
>
> Okay.
>
>> I'd rather play it safe and do one release with the built-in pcre code
>> disabled, but easily re-enabled.  Something like
>>   exit 1
>> added after the line
>>   AC_MSG_WARN([You are using the static PCRE code which is out of date
>> and scheduled for removal, for details see:
>>
>> https://sourceforge.net/p/ijbswa/mailman/ijbswa-developers/thread/20080511195555.2dc6cfdc@fabiankeil.de/])
>>
>> in configure.in so anyone else building privoxy on windows will be put
>> on notice that the out of date code _really is_ going to be removed.
>
> I think adding another warning that mentions that the removal is scheduled
> before the 3.0.33 release will do.

I added the 'exit 1' because it's so easy to miss the warning, but ok

Lee
-------------- next part --------------
diff --git a/doc/source/ldp.dsl.in b/doc/source/ldp.dsl.in
index 95dc16b6..1dc92926 100644
--- a/doc/source/ldp.dsl.in
+++ b/doc/source/ldp.dsl.in
@@ -29,10 +29,15 @@
 ;; see http://docbook.sourceforge.net/projects/dsssl/doc/print.html
 ;;
 
+(define %indent-programlisting-lines%
+  ;; Indent lines in a 'ProgramListing'?
+  ;; "#f" or string to be used as the indent on 'programlisting'
+  "  ")
+
 (define %indent-screen-lines%
   ;; Indent lines in a 'Screen'?
   ;; "#f" or string to be used as the indent on 'screen'
-  "")
+  "  ")
 
 (define %callout-fancy-bug%
   ;; Use fancy callout bugs?
@@ -278,6 +283,16 @@
   "UNREGISTERED::James Clark//Characteristic::preserve-sdata?"
   #t)
 
+(define %indent-programlisting-lines%
+  ;; Indent lines in a 'ProgramListing'?
+  ;; "#f" or string to be used as the indent on 'programlisting'
+  "  ")
+
+(define %indent-screen-lines%
+  ;; Indent lines in a 'Screen'?
+  ;; "#f" or string to be used as the indent on 'screen'
+  "  ")
+
 ;; put the legal notice in a separate file
 (define %generate-legalnotice-link%
   #t)