1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
--- Makefile Tue Jun 29 02:07:35 2004
+++ Makefile Mon Dec 27 15:35:40 2004
@@ -2,8 +2,8 @@
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/man
INFODIR = $(PREFIX)/info
-LOCAL_ROOT = /usr/share/polipo/www
-DISK_CACHE_ROOT = /var/cache/polipo
+LOCAL_ROOT = $(PREFIX)/share/polipo/www
+DISK_CACHE_ROOT ?= /var/cache/polipo
# CDEBUGFLAGS = -O
@@ -47,7 +47,8 @@
DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
-CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
+CFLAGS ?= $(CDEBUGFLAGS)
+CFLAGS += $(MD5INCLUDES) $(DEFINES) $(EXTRA_DEFINES)
SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
config.c local.c http.c client.c server.c auth.c tunnel.c \
--- config.sample Mon Sep 6 23:31:57 2004
+++ config.sample Mon Dec 27 15:35:40 2004
@@ -65,6 +65,11 @@
# localDocumentRoot = ""
+# Access rights for new cache files.
+diskCacheFilePermissions=0640
+# Access rights for new directories.
+diskCacheDirectoryPermissions=0750
+
### Domain Name System
### ******************
--- forbidden.c Sat Sep 11 00:31:24 2004
+++ forbidden.c Mon Dec 27 15:35:40 2004
@@ -158,8 +158,8 @@
}
if(forbiddenFile == NULL) {
- if(access("/etc/polipo/forbidden", F_OK) >= 0)
- forbiddenFile = internAtom("/etc/polipo/forbidden");
+ if(access("/usr/local/etc/polipo/forbidden", F_OK) >= 0)
+ forbiddenFile = internAtom("/usr/local/etc/polipo/forbidden");
}
if(have_forbiddenDomains) {
--- main.c Tue Oct 5 23:41:49 2004
+++ main.c Mon Dec 27 15:35:40 2004
@@ -106,8 +106,8 @@
}
if(configFile == NULL) {
- if(access("/etc/polipo/config", F_OK) >= 0)
- configFile = internAtom("/etc/polipo/config");
+ if(access("/usr/local/etc/polipo/config", F_OK) >= 0)
+ configFile = internAtom("/usr/local/etc/polipo/config");
if(configFile && access(configFile->string, F_OK) < 0) {
releaseAtom(configFile);
configFile = NULL;
--- polipo.man Tue Jun 29 02:07:35 2004
+++ polipo.man Mon Dec 27 15:35:40 2004
@@ -43,16 +43,16 @@
Change the value of a configuration variable.
.SH FILES
.TP
-.B /etc/polipo/config
+.B /usr/local/etc/polipo/config
The default location of Polipo's configuration file.
.TP
-.B /etc/polipo/forbidden
+.B /usr/local/etc/polipo/forbidden
The default location of the list of forbidden URLs.
.TP
.B /var/cache/polipo/
The default location of the on-disk cache.
.TP
-.B /usr/share/polipo/www/
+.B /usr/local/share/polipo/www/
The default root of the local web space.
.SH SIGNALS
.TP
|
