author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Tue, 17 Jun 2014 11:01:17 -0700 | |
branch | s11-update |
changeset 3185 | a2c8acba414a |
parent 407 | 371955ee7fe6 |
child 4511 | dd483456146f |
permissions | -rw-r--r-- |
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
diff -ru privoxy-3.0.8-stable-orig/GNUmakefile.in privoxy-3.0.8-stable/GNUmakefile.in |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
--- privoxy-3.0.8-stable-orig/GNUmakefile.in Fri Aug 1 14:32:02 2008 |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
+++ privoxy-3.0.8-stable/GNUmakefile.in Fri Aug 1 14:33:36 2008 |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
@@ -243,7 +243,7 @@ |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
# Add your flags here |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
OTHER_CFLAGS = |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
|
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
+CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \ |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
@STATIC_PCRE_ONLY@ -Ipcre |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
|
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
diff -ru privoxy-3.0.8-stable-orig/config privoxy-3.0.8-stable/config |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
--- privoxy-3.0.8-stable-orig/config Fri Aug 1 14:32:01 2008 |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+++ privoxy-3.0.8-stable/config Fri Aug 1 14:37:51 2008 |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
@@ -260,7 +260,7 @@ |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
# No trailing "/", please. |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
-confdir . |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+confdir /etc/privoxy |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
# 2.2. templdir |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
@@ -315,7 +315,7 @@ |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
# No trailing "/", please. |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
-logdir . |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+logdir /var/log/privoxy |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
# 2.4. actionsfile |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
@@ -452,7 +452,7 @@ |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
# Any log files must be writable by whatever user Privoxy is |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
# being run as (on Unix, default user id is "privoxy"). |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
-logfile logfile |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
+logfile privoxy.log |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
# |
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
# 2.7. jarfile |