Subversion Repositories

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

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