components/privoxy/patches/solaris.patch
branchs11u2-sru
changeset 4596 642f95a97bb3
parent 407 371955ee7fe6
equal deleted inserted replaced
4595:84742988fa3b 4596:642f95a97bb3
     1 diff -ru privoxy-3.0.8-stable-orig/GNUmakefile.in privoxy-3.0.8-stable/GNUmakefile.in
     1 Changes directories where various files (i.e. logfiles, templates, config files)
     2 --- privoxy-3.0.8-stable-orig/GNUmakefile.in	Fri Aug  1 14:32:02 2008
     2 are stored from the privoxy defaults. 
     3 +++ privoxy-3.0.8-stable/GNUmakefile.in	Fri Aug  1 14:33:36 2008
     3 Solaris-specific patch; not suitable for upstream
     4 @@ -243,7 +243,7 @@
     4 
     5  # Add your flags here 
     5 diff -rupN privoxy-3.0.23-stable-orig/GNUmakefile.in privoxy-3.0.23-stable/GNUmakefile.in
     6  OTHER_CFLAGS =   
     6 --- privoxy-3.0.23-stable-orig/GNUmakefile.in   2015-06-02 13:26:57.665811110 -0700
     7  
     7 +++ privoxy-3.0.23-stable/GNUmakefile.in        2015-06-02 13:27:47.124881014 -0700
       
     8 @@ -241,7 +241,7 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@
       
     9  # Add your flags here
       
    10  OTHER_CFLAGS =
       
    11 
     8 -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
    12 -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
     9 +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \
    13 +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \
    10           @STATIC_PCRE_ONLY@ -Ipcre 
    14           @STATIC_PCRE_ONLY@ -Ipcre
    11  
    15 
    12  LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
    16  LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
    13 diff -ru privoxy-3.0.8-stable-orig/config privoxy-3.0.8-stable/config
    17 diff -rupN privoxy-3.0.23-stable-orig/config privoxy-3.0.23-stable/config
    14 --- privoxy-3.0.8-stable-orig/config	Fri Aug  1 14:32:01 2008
    18 --- privoxy-3.0.23-stable-orig/config	2015-06-02 13:27:15.297393314 -0700
    15 +++ privoxy-3.0.8-stable/config	Fri Aug  1 14:37:51 2008
    19 +++ privoxy-3.0.23-stable/config	2015-06-02 13:29:14.468549370 -0700
    16 @@ -260,7 +260,7 @@
    20 @@ -260,7 +260,7 @@
    17  #
    21  #
    18  #      No trailing "/", please.
    22  #      No trailing "/", please.
    19  #
    23  #
    20 -confdir .
    24 -confdir .
    21 +confdir /etc/privoxy
    25 +confdir /etc/privoxy 
    22  #
       
    23  #
    26  #
    24  #  2.2. templdir
    27  #  2.2. templdir
    25 @@ -315,7 +315,7 @@
    28  #  ==============
       
    29 @@ -345,7 +345,7 @@ confdir .
    26  #
    30  #
    27  #      No trailing "/", please.
    31  #      No trailing "/", please.
    28  #
    32  #
    29 -logdir .
    33 -logdir .
    30 +logdir /var/log/privoxy
    34 +logdir /var/log/privoxy 
    31  #
    35  #
    32  #
    36  #  2.5. actionsfile
    33  #  2.4. actionsfile
    37  #  =================
    34 @@ -452,7 +452,7 @@
    38 @@ -478,7 +478,7 @@ filterfile user.filter      # User custo
    35  #      Any log files must be writable by whatever user Privoxy is
    39  #      require additional software to do it. For details, please
    36  #      being run as (on Unix, default user id is "privoxy").
    40  #      refer to the documentation for your operating system.
    37  #
    41  #
    38 -logfile logfile
    42 -logfile logfile
    39 +logfile privoxy.log
    43 +logfile privoxy.log 
    40  #
    44  #
    41  #
    45  #  2.8. trustfile
    42  #  2.7. jarfile
    46  #  ===============