| author | pkidd <patrick.kidd@oracle.com> |
| Wed, 20 Apr 2016 15:13:56 -0700 | |
| branch | s11u3-sru |
| changeset 5824 | dac901a9be59 |
| parent 4543 | b698738a8b26 |
| permissions | -rw-r--r-- |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
1 |
Changes directories where various files (i.e. logfiles, templates, config files) |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
2 |
are stored from the privoxy defaults. |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
3 |
Solaris-specific patch; not suitable for upstream |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
4 |
|
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
5 |
diff -rupN privoxy-3.0.23-stable-orig/GNUmakefile.in privoxy-3.0.23-stable/GNUmakefile.in |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
6 |
--- privoxy-3.0.23-stable-orig/GNUmakefile.in 2015-06-02 13:26:57.665811110 -0700 |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
7 |
+++ privoxy-3.0.23-stable/GNUmakefile.in 2015-06-02 13:27:47.124881014 -0700 |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
8 |
@@ -241,7 +241,7 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
9 |
# Add your flags here |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
10 |
OTHER_CFLAGS = |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
11 |
|
|
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ |
|
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \ |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
14 |
@STATIC_PCRE_ONLY@ -Ipcre |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
15 |
|
|
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
17 |
diff -rupN privoxy-3.0.23-stable-orig/config privoxy-3.0.23-stable/config |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
18 |
--- privoxy-3.0.23-stable-orig/config 2015-06-02 13:27:15.297393314 -0700 |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
19 |
+++ privoxy-3.0.23-stable/config 2015-06-02 13:29:14.468549370 -0700 |
|
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
@@ -260,7 +260,7 @@ |
|
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
# |
|
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
# No trailing "/", please. |
|
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 |
-confdir . |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
25 |
+confdir /etc/privoxy |
|
407
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 |
# 2.2. templdir |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
28 |
# ============== |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
29 |
@@ -345,7 +345,7 @@ confdir . |
|
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
# |
|
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
# No trailing "/", please. |
|
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 |
-logdir . |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
34 |
+logdir /var/log/privoxy |
|
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
# |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
36 |
# 2.5. actionsfile |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
37 |
# ================= |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
38 |
@@ -478,7 +478,7 @@ filterfile user.filter # User custo |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
39 |
# require additional software to do it. For details, please |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
40 |
# refer to the documentation for your operating system. |
|
407
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 |
-logfile logfile |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
43 |
+logfile privoxy.log |
|
407
371955ee7fe6
7067109 Move privoxy to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
44 |
# |
|
4543
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
45 |
# 2.8. trustfile |
|
b698738a8b26
21282917 update to privoxy 3.0.23
Stacy Yeh <stacy.yeh@oracle.com>
parents:
407
diff
changeset
|
46 |
# =============== |