Subversion Repositories

?revision_form?Rev ?revision_input??revision_submit??revision_endform?

Rev 5 | Rev 15 | Go to most recent revision | Details | Compare with Previous | Last modification | View Log | RSS feed

Rev Author Line No. Line
12 magnus 1
--- a/files/etc/prayer-accountd.cf
2
+++ b/files/etc/prayer-accountd.cf
3 magnus 3
@@ -8,6 +8,8 @@
4
 # Default accountd.cf file suitable for RedHat Linux only.
5
 # See distribution for some sample files for FreeBSD and Solaris
6
 
7
+accountd_port = 145
8
+
9
 msforward_name      = ".MSforward"
10
 forward_name        = ".forward"
11
 aliases_name        = "vacation.aliases"
12 magnus 12
--- a/files/Makefile
13
+++ b/files/Makefile
5 magnus 14
@@ -53,41 +53,44 @@ distclean:
3 magnus 15
 install-cert:
16
        if [ -f certs/prayer.pem ]; then \
17
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
18
-       -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
19
+       -m $(PRIVATE_FILE) certs/prayer.pem ${DESTDIR}${PREFIX}/certs; \
20
        fi
21
 
22
 install-config: etc/prayer.cf
23
        $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
24
-       etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
25
+       etc/prayer.cf ${DESTDIR}${PRAYER_CONFIG_FILE}
26
 
27
 install-aconfig:
28
        $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
29
-       etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
30
+       etc/prayer-accountd.cf ${DESTDIR}${ACCOUNTD_CONFIG_FILE}
31
 
32
 install-motd:
33
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
34
-       etc/motd.html ${BROOT}${PREFIX}/etc
35
+       etc/motd.html ${DESTDIR}/etc/prayer
36
 
37
 install-welcome:
38
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
39
-       etc/welcome.html ${BROOT}${PREFIX}/etc
40
+       etc/welcome.html ${DESTDIR}/etc/prayer
41
 
42
 install:
43
-       PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
44
+       ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}${PREFIX}
45
+       ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}/etc/prayer
46
+
47
+       PREFIX=$(DESTDIR)$(PREFIX) VAR_PREFIX=$(DESTDIR)$(VAR_PREFIX) \
48
        RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \
49
        RW_USER=$(RW_USER) RW_GROUP=$(RW_GROUP) \
50
        PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
51
        PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
52
        PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
53
-       BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
54
+       BIN_DIR=$(DESTDIR)$(BIN_DIR) INSTALL=$(INSTALL) \
55
        ./install.sh
56
-       if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
57
-       if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
58
-       if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
59
-       if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
60
-       if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
61
+#      if [ ! -f $(DESTDIR)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
62
+       if [ ! -f $(DESTDIR)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
63
+       if [ ! -f $(DESTDIR)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
64
+       if [ ! -f $(DESTDIR)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
65
+       if [ ! -f $(DESTDIR)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi
66
 
67
 redhat-install-init.d:
68
        install -D -o root -g root -m 755 \
69
-               ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
70
+               ./init.d/prayer $(DESTDIR)/etc/rc.d/init.d/prayer
71
        #chkconfig prayer --level 2345 on
12 magnus 72
--- a/files/install.sh
73
+++ b/files/install.sh
3 magnus 74
@@ -4,77 +4,6 @@
75
 
76
 PATH=/bin:/sbin/:/usr/bin:/usr/sbin
77
 
78
-error=0
79
-
80
-if [ "x$PREFIX" = "x" ]; then
81
-    echo 'PREFIX not defined'
82
-    error=1
83
-fi
84
-
85
-if [ "x$VAR_PREFIX" = "x" ]; then
86
-    echo 'VAR_PREFIX not defined'
87
-    error=1
88
-fi
89
-
90
-if [ "x$RO_USER" = "x" ]; then
91
-    echo 'RO_USER not defined'
92
-    error=1
93
-fi
94
-
95
-if [ "x$RO_GROUP" = "x" ]; then
96
-    echo 'RO_GROUP not defined'
97
-    error=1
98
-fi
99
-
100
-if [ "x$RW_USER" = "x" ]; then
101
-    echo 'RW_USER not defined'
102
-    error=1
103
-fi
104
-
105
-if [ "x$RW_GROUP" = "x" ]; then
106
-    echo 'RW_GROUP not defined'
107
-    error=1
108
-fi
109
-
110
-if [ "x$PUBLIC_DIR" = "x" ]; then
111
-    echo 'PUBLIC_DIR not defined'
112
-    error=1
113
-fi
114
-
115
-if [ "x$PRIVATE_DIR" = "x" ]; then
116
-    echo 'PRIVATE_DIR not defined'
117
-    error=1
118
-fi
119
-
120
-if [ "x$BIN_DIR" = "x" ]; then
121
-    echo 'BIN_DIR not defined'
122
-    error=1
123
-fi
124
-
125
-if [ $error != 0 ]; then
126
-    exit 1
127
-fi
128
-
129
-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
130
-    ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
131
-fi
132
-
133
-if [ ! -d ${PREFIX} ]; then
134
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
135
-fi
136
-
137
-if [ ! -d ${PREFIX}/etc ]; then
138
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
139
-fi
140
-
141
-if [ ! -d ${PREFIX}/certs ]; then
142
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
143
-fi
144
-
145
-if [ ! -d ${BIN_DIR} ]; then
5 magnus 146
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
3 magnus 147
-fi
148
-
149
 for i in help icons
150
 do
151
     if [ -d "${PREFIX}/${i}" ]; then
12 magnus 152
--- a/files/etc/prayer.cf.SRC
153
+++ b/files/etc/prayer.cf.SRC
5 magnus 154
@@ -20,7 +20,7 @@ var_prefix  = "__VAR_PREFIX__"
3 magnus 155
 # User ID to run as if we start off as root
156
 prayer_user           = "prayer"
157
 # Group ID to run as if we start off as root
158
-prayer_group          = "prayer"
159
+prayer_group          = "nogroup"
160
 
161
 # Run prayer as background process.
162
 #   TRUE => will return as soon as valid configuration is found.
5 magnus 163
@@ -428,14 +428,14 @@ bin_dir             = "__BIN_DIR__"
3 magnus 164
 
165
 # Various directories used by the running system
166
 # Logs stored in $log_dir
167
-log_dir             = "$var_prefix/logs"
168
+log_dir             = "/var/log/prayer"
169
 
170
 # $lock_dir used for interlocking between prayer processes
171
-lock_dir            = "$var_prefix/locks"
172
+lock_dir            = "/var/lock"
173
 
174
 # $socket_dir is location for unix domain sockets which connect frontend
175
 # to backend in proxy mode of operation.
176
-socket_dir          = "$var_prefix/sockets"
177
+socket_dir          = "/var/run/prayer"
178
 
179
 # Split socket directory into 64 subdirs keyed on first letter of sessionID
180
 # Code provides compatibility in both directions: can switch back and forward
5 magnus 181
@@ -446,14 +446,14 @@ socket_split_dir    = TRUE
3 magnus 182
 init_socket_name    = init
183
 
184
 # $ssl_session_dir is location for SSL session cache
185
-ssl_session_dir     = "$var_prefix/ssl_scache"
186
+ssl_session_dir     = "/var/run/prayer/ssl_scache"
187
 
188
 # Location for temporary files e.g; attachments and folders in transist
189
 # during upload and download operation. Core files also end up here
190
-tmp_dir             = "$var_prefix/tmp"
191
+tmp_dir             = "/tmp"
192
 
193
 # Location for PID files for prayer and prayer-session master processes.
194
-pid_dir             = "$var_prefix/pid"
195
+pid_dir             = "/var/run/prayer"
196
 
197
 # Interface to Hermes finger database
198
 #lookup_rpasswd   = "/data/finger/rpasswd.cdb"
5 magnus 199
@@ -614,7 +614,7 @@ sent_mail_folder    = "sent-mail"
3 magnus 200
 # default_domain      = "<valid mail domain>"
201
 
202
 # Language for ispell.
203
-ispell_language     = "british"
204
+ispell_language     = "american"
205
 
206
 # Size of small and large compose windows
207
 small_cols          = 80
12 magnus 208
--- a/prayer/Makefile
209
+++ b/prayer/Makefile
5 magnus 210
@@ -102,8 +102,9 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
3 magnus 211
   SESSION_LIBS += $(KERB_LIBS)
212
 endif
213
 
214
-CFLAGS  = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
215
-LDFLAGS = $(BASELDFLAGS)
12 magnus 216
+CFLAGS  = 
217
+override CFLAGS += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
3 magnus 218
+LDFLAGS = $(BASELDFLAGS) -Wl,--as-needed
219
 
220
 SHARED_OBJS = \
221
  pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
5 magnus 222
@@ -175,21 +176,21 @@ clean:
3 magnus 223
 
224
 install: all
225
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
226
-         $(BROOT)$(BIN_DIR)
227
+         $(DESTDIR)$(BIN_DIR)
228
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
229
-         prayer           $(BROOT)$(BIN_DIR)
230
+         prayer           $(DESTDIR)$(BIN_DIR)
231
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
232
-         prayer-chroot           $(BROOT)$(BIN_DIR)
233
+         prayer-chroot           $(DESTDIR)$(BIN_DIR)
234
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
235
-         prayer-session   $(BROOT)$(BIN_DIR)
236
+         prayer-session   $(DESTDIR)$(BIN_DIR)
237
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
238
-         prayer-ssl-prune $(BROOT)$(BIN_DIR)
239
+         prayer-ssl-prune $(DESTDIR)$(BIN_DIR)
240
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
241
-         prayer-sem-prune $(BROOT)$(BIN_DIR)
242
+         prayer-sem-prune $(DESTDIR)$(BIN_DIR)
243
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
244
-         prayer-db-prune $(BROOT)$(BIN_DIR)
245
+         prayer-db-prune $(DESTDIR)$(BIN_DIR)
246
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
247
-         prayer-cyclog    $(BROOT)$(BIN_DIR)
248
+         prayer-cyclog    $(DESTDIR)$(BIN_DIR)
249
 
250
 prayer: $(PRAYER_OBJS) prayer_main.o
251
        $(CC) $(LDFLAGS) -o prayer $(PRAYER_OBJS) prayer_main.o $(PRAYER_LIBS)