/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

Several memory leaks detected by valgrind fixed
A bugg fixed that could cause seg fault.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
17
17
PREFIX=$(DESTDIR)/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
19
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
20
# MANDIR=/usr/local/man
23
21
MANDIR=$(DESTDIR)/usr/share/man
24
22
 
123
121
# Used by run-server
124
122
confdir/mandos.conf: mandos.conf
125
123
        install --directory confdir
126
 
        install --mode=u=rw,go=r $^ $@
 
124
        install --mode=0644 $^ $@
127
125
confdir/clients.conf: clients.conf keydir/seckey.txt
128
126
        install --directory confdir
129
 
        install --mode=u=rw $< $@
 
127
        install --mode=0640 $< $@
130
128
# Add a client password
131
129
        ./mandos-keygen --dir keydir --password >> $@
132
130
 
133
131
install: install-server install-client
134
132
 
135
133
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
134
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
137
135
                $(MANDIR)/man8
138
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
 
                mandos.conf
141
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
136
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
137
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
138
        install --mode=0640 --target-directory=$(CONFDIR) \
142
139
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
 
        update-rc.d mandos defaults
146
140
        gzip --best --to-stdout mandos.8 \
147
141
                > $(MANDIR)/man8/mandos.8.gz
148
142
        gzip --best --to-stdout mandos.conf.5 \
151
145
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
146
 
153
147
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
158
 
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)/plugins.d" \
160
 
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
 
                install --mode=u=rwx \
162
 
                        --directory "$(CONFDIR)/plugins.d"; \
163
 
        fi
164
 
        install --mode=u=rwx,go=rx \
165
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
166
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
148
        install --directory --parents $(PREFIX)/lib/mandos \
 
149
                $(CONFDIR) $(MANDIR)/man8
 
150
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
151
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
152
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
153
                plugin-runner
 
154
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
167
155
                mandos-keygen
168
 
        install --mode=u=rwx,go=rx \
 
156
        install --mode=0755 \
169
157
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
170
158
                plugins.d/password-prompt
171
 
        install --mode=u=rwxs,go=rx \
 
159
        install --mode=4755 \
172
160
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
173
161
                plugins.d/password-request
174
 
        install --mode=u=rwx,go=rx \
175
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
176
 
                plugins.d/usplash
177
162
        install initramfs-tools-hook \
178
163
                /usr/share/initramfs-tools/hooks/mandos
179
164
        install initramfs-tools-hook-conf \
180
165
                /usr/share/initramfs-tools/conf-hooks.d/mandos
181
166
        install initramfs-tools-script \
182
167
                /usr/share/initramfs-tools/scripts/local-top/mandos
183
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
184
168
        gzip --best --to-stdout mandos-keygen.8 \
185
169
                > $(MANDIR)/man8/mandos-keygen.8.gz
186
170
        gzip --best --to-stdout plugin-runner.8mandos \
189
173
                > $(MANDIR)/man8/password-prompt.8mandos.gz
190
174
        gzip --best --to-stdout plugins.d/password-request.8mandos \
191
175
                > $(MANDIR)/man8/password-request.8mandos.gz
192
 
# Post-installation stuff
193
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
176
        -$(PREFIX)/sbin/mandos-keygen
194
177
        update-initramfs -k all -u
195
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
196
178
 
197
179
uninstall: uninstall-server uninstall-client
198
180
 
199
 
uninstall-server:
 
181
uninstall-server: $(PREFIX)/sbin/mandos
200
182
        -rm --force $(PREFIX)/sbin/mandos \
201
183
                $(MANDIR)/man8/mandos.8.gz \
202
184
                $(MANDIR)/man5/mandos.conf.5.gz \
203
185
                $(MANDIR)/man5/mandos-clients.conf.5.gz
204
 
        update-rc.d -f mandos remove
205
186
        -rmdir $(CONFDIR)
206
187
 
207
188
uninstall-client:
213
194
                $(PREFIX)/lib/mandos/plugin-runner \
214
195
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
215
196
                $(PREFIX)/lib/mandos/plugins.d/password-request \
216
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
217
197
                /usr/share/initramfs-tools/hooks/mandos \
218
198
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
219
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
220
199
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
221
200
                $(MANDIR)/man8/mandos-keygen.8.gz \
222
201
                $(MANDIR)/man8/password-prompt.8mandos.gz \
223
202
                $(MANDIR)/man8/password-request.8mandos.gz
224
203
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
225
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
204
                 $(PREFIX)/lib/mandos $(CONFDIR)
226
205
        update-initramfs -k all -u
227
206
 
228
207
purge: purge-server purge-client
229
208
 
230
209
purge-server: uninstall-server
231
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
232
 
                /etc/default/mandos /etc/init.d/mandos \
233
 
                /var/run/mandos.pid
 
210
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
234
211
        -rmdir $(CONFDIR)
235
212
 
236
213
purge-client: uninstall-client
237
 
        -shred --remove $(KEYDIR)/seckey.txt
238
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
239
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
240
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
214
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
215
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d