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
- browse files at revision 16
- compare with another revision
- download diff
- download tarball
- view history from revision 16
- Committer: Teddy Hogeborn
- Date: 2008-07-21 01:50:31 UTC
- Revision ID: teddy@fukt.bsnet.se-20080721015031-ivjiclli2j06hwgs
* Makefile: Include targets for all binaries.
* plugins.d/Makefile: Do nothing but call the parent Makefile.
* server.py: Added copyright statement and information.
(Client.__init__): Added doc string.
(Client.stop): Bug fix: Only log message if stopping for the first
time. Check if the "stop_initiator_tag" and
"checker_initiator_tag" attributes exist before using
them.
(Client.__del__): Call self.stop() instead of doing things here.
(Client.checker_callback): Set self.checker_callback_tag and
self.checker to None unconditionally and
immediately.
(Client.stop_checker): Added some checks to handle multiple calls.
(tcp_handler.handle): Use "self.server.clients" instead of "clients".
(__main__): Moved all code to the "main" function.
(main): New. New option "--address". Instantiate IPv6_TCPServer
with "options.address". Log before starting main loop.
(main.cleanup) Use "clients.pop()" to remove clients from the set as
they are stopped.
* plugins.d/Makefile: Do nothing but call the parent Makefile.
* server.py: Added copyright statement and information.
(Client.__init__): Added doc string.
(Client.stop): Bug fix: Only log message if stopping for the first
time. Check if the "stop_initiator_tag" and
"checker_initiator_tag" attributes exist before using
them.
(Client.__del__): Call self.stop() instead of doing things here.
(Client.checker_callback): Set self.checker_callback_tag and
self.checker to None unconditionally and
immediately.
(Client.stop_checker): Added some checks to handle multiple calls.
(tcp_handler.handle): Use "self.server.clients" instead of "clients".
(__main__): Moved all code to the "main" function.
(main): New. New option "--address". Instantiate IPv6_TCPServer
with "options.address". Log before starting main loop.
(main.cleanup) Use "clients.pop()" to remove clients from the set as
they are stopped.
- files added:
- ca.pem
- files removed:
- .bzr-builddeb
- debian
- debian/po
- files renamed:
- clients.conf => mandos-clients.conf
- plugin-runner.c => plugbasedclient.c
- plugins.d/mandos-client.c => plugins.d/mandosclient.c
- plugins.d/password-prompt.c => plugins.d/passprompt.c
- mandos => server.py
- files modified:
- Makefile
added
removed
Makefile
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
-Wswitch-default -Wswitch-enum -Wunused-parameter \
3
-Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
-Wunsafe-loop-optimizations -Wpointer-arith \
5
-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
-Wconversion -Wstrict-prototypes -Wold-style-definition \
7
-Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
# -Wunreachable-code
9
#DEBUG=-ggdb3
10
# For info about _FORTIFY_SOURCE, see
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
LINK_FORTIFY_LD=-z relro -z now
15
LINK_FORTIFY=
16
17
# If BROKEN_PIE is set, do not build with -pie
18
ifndef BROKEN_PIE
19
FORTIFY += -fPIE
20
LINK_FORTIFY += -pie
21
endif
22
#COVERAGE=--coverage
23
OPTIMIZE=-Os
24
LANGUAGE=-std=gnu99
25
htmldir=man
26
version=1.0.14
27
SED=sed
28
29
## Use these settings for a traditional /usr/local install
30
# PREFIX=$(DESTDIR)/usr/local
31
# CONFDIR=$(DESTDIR)/etc/mandos
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
# MANDIR=$(PREFIX)/man
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
35
##
36
37
## These settings are for a package-type install
38
PREFIX=$(DESTDIR)/usr
39
CONFDIR=$(DESTDIR)/etc/mandos
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
MANDIR=$(PREFIX)/share/man
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
##
44
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
getconf LFS_LDFLAGS)
52
53
# Do not change these two
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
-DVERSION='"$(version)"'
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
59
# Commands to format a DocBook <refentry> document into a manual page
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
61
--param man.charmap.use.subset 0 \
62
--param make.year.ranges 1 \
63
--param make.single.year.ranges 1 \
64
--param man.output.quietly 1 \
65
--param man.authors.section.enabled 0 \
66
/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
$(notdir $<); \
68
$(MANPOST) $(notdir $@))
69
# DocBook-to-man post-processing to fix a '\n' escape bug
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
73
--param make.year.ranges 1 \
74
--param make.single.year.ranges 1 \
75
--param man.output.quietly 1 \
76
--param man.authors.section.enabled 0 \
77
--param citerefentry.link 1 \
78
--output $@ \
79
/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
$<; $(HTMLPOST) $@)
81
# Fix citerefentry links
82
HTMLPOST=$(SED) --in-place \
83
--expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
87
CPROGS=plugin-runner $(PLUGINS)
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
90
plugins.d/mandos-client.8mandos \
91
plugins.d/password-prompt.8mandos mandos.conf.5 \
92
plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
93
plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
94
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
96
97
objects=$(addsuffix .o,$(CPROGS))
98
99
all: $(PROGS) mandos.lsm
100
101
doc: $(DOCS)
102
103
html: $(htmldocs)
104
105
%.5: %.xml common.ent legalnotice.xml
106
$(DOCBOOKTOMAN)
107
%.5.xhtml: %.xml common.ent legalnotice.xml
108
$(DOCBOOKTOHTML)
109
110
%.8: %.xml common.ent legalnotice.xml
111
$(DOCBOOKTOMAN)
112
%.8.xhtml: %.xml common.ent legalnotice.xml
113
$(DOCBOOKTOHTML)
114
115
%.8mandos: %.xml common.ent legalnotice.xml
116
$(DOCBOOKTOMAN)
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
118
$(DOCBOOKTOHTML)
119
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
121
legalnotice.xml
122
$(DOCBOOKTOMAN)
123
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
124
overview.xml legalnotice.xml
125
$(DOCBOOKTOHTML)
126
127
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
128
legalnotice.xml
129
$(DOCBOOKTOMAN)
130
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
131
legalnotice.xml
132
$(DOCBOOKTOHTML)
133
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
135
legalnotice.xml
136
$(DOCBOOKTOMAN)
137
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
138
legalnotice.xml
139
$(DOCBOOKTOHTML)
140
141
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
142
legalnotice.xml
143
$(DOCBOOKTOMAN)
144
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
145
overview.xml legalnotice.xml
146
$(DOCBOOKTOHTML)
147
148
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
149
common.ent \
150
mandos-options.xml \
151
overview.xml legalnotice.xml
152
$(DOCBOOKTOMAN)
153
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
154
common.ent \
155
mandos-options.xml \
156
overview.xml legalnotice.xml
157
$(DOCBOOKTOHTML)
158
159
# Update all these files with version number $(version)
160
common.ent: Makefile
161
$(strip $(SED) --in-place \
162
--expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
163
$@)
164
165
mandos: Makefile
166
$(strip $(SED) --in-place \
167
--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
168
$@)
169
170
mandos-keygen: Makefile
171
$(strip $(SED) --in-place \
172
--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
173
$@)
174
175
mandos-ctl: Makefile
176
$(strip $(SED) --in-place \
177
--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
178
$@)
179
180
mandos.lsm: Makefile
181
$(strip $(SED) --in-place \
182
--expression='s/^\(Version:\).*/\1\t$(version)/' \
183
$@)
184
$(strip $(SED) --in-place \
185
--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
186
$@)
187
$(strip $(SED) --in-place \
188
--expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
189
$@)
190
191
plugins.d/mandos-client: plugins.d/mandos-client.c
192
$(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
193
) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
194
195
.PHONY : all doc html clean distclean run-client run-server install \
196
install-server install-client uninstall uninstall-server \
197
uninstall-client purge purge-server purge-client
198
1
CFLAGS=-Wall -g -std=gnu99
2
3
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
4
5
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
6
7
all: $(PROGS)
8
9
plugbasedclient: plugbasedclient.o
10
$(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
11
12
plugins.d/mandosclient: plugins.d/mandosclient.o
13
$(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
14
15
plugins.d/passprompt: plugins.d/passprompt.o
16
$(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
17
18
.PHONY : clean
199
19
clean:
200
-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
201
202
distclean: clean
203
mostlyclean: clean
204
maintainer-clean: clean
205
-rm --force --recursive keydir confdir
206
207
check: all
208
./mandos --check
209
210
# Run the client with a local config and key
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
212
@echo "###################################################################"
213
@echo "# The following error messages are harmless and can be safely #"
214
@echo "# ignored. The messages are caused by not running as root, but #"
215
@echo "# you should NOT run \"make run-client\" as root unless you also #"
216
@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
217
@echo "# From plugin-runner: setuid: Operation not permitted #"
218
@echo "# From askpass-fifo: mkfifo: Permission denied #"
219
@echo "# From mandos-client: setuid: Operation not permitted #"
220
@echo "# seteuid: Operation not permitted #"
221
@echo "# klogctl: Operation not permitted #"
222
@echo "###################################################################"
223
./plugin-runner --plugin-dir=plugins.d \
224
--config-file=plugin-runner.conf \
225
--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
226
$(CLIENTARGS)
227
228
# Used by run-client
229
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
230
install --directory keydir
231
./mandos-keygen --dir keydir --force
232
233
# Run the server with a local config
234
run-server: confdir/mandos.conf confdir/clients.conf
235
@echo "#################################################################"
236
@echo "# NOTE: Please IGNORE errors about \"No permission to bind to #"
237
@echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" - #"
238
@echo "# they are harmless and are caused by the server not running as #"
239
@echo "# root. Do NOT run \"make run-server\" server as root if you did #"
240
@echo "# not also unpack and compile it as root. #"
241
@echo "#################################################################"
242
./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
244
# Used by run-server
245
confdir/mandos.conf: mandos.conf
246
install --directory confdir
247
install --mode=u=rw,go=r $^ $@
248
confdir/clients.conf: clients.conf keydir/seckey.txt
249
install --directory confdir
250
install --mode=u=rw $< $@
251
# Add a client password
252
./mandos-keygen --dir keydir --password >> $@
253
254
install: install-server install-client-nokey
255
256
install-html: html
257
install --directory $(htmldir)
258
install --mode=u=rw,go=r --target-directory=$(htmldir) \
259
$(htmldocs)
260
261
install-server: doc
262
install --directory $(CONFDIR)
263
install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
264
install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
265
mandos.conf
266
install --mode=u=rw --target-directory=$(CONFDIR) \
267
clients.conf
268
install --mode=u=rwx,go=rx init.d-mandos \
269
$(DESTDIR)/etc/init.d/mandos
270
install --mode=u=rw,go=r default-mandos \
271
$(DESTDIR)/etc/default/mandos
272
if [ -z $(DESTDIR) ]; then \
273
update-rc.d mandos defaults 25 15;\
274
fi
275
gzip --best --to-stdout mandos.8 \
276
> $(MANDIR)/man8/mandos.8.gz
277
gzip --best --to-stdout mandos.conf.5 \
278
> $(MANDIR)/man5/mandos.conf.5.gz
279
gzip --best --to-stdout mandos-clients.conf.5 \
280
> $(MANDIR)/man5/mandos-clients.conf.5.gz
281
282
install-client-nokey: all doc
283
install --directory $(PREFIX)/lib/mandos $(CONFDIR)
284
install --directory --mode=u=rwx $(KEYDIR) \
285
$(PREFIX)/lib/mandos/plugins.d
286
if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
287
install --mode=u=rwx \
288
--directory "$(CONFDIR)/plugins.d"; \
289
fi
290
install --mode=u=rwx,go=rx \
291
--target-directory=$(PREFIX)/lib/mandos plugin-runner
292
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
293
mandos-keygen
294
install --mode=u=rwx,go=rx \
295
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
296
plugins.d/password-prompt
297
install --mode=u=rwxs,go=rx \
298
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
299
plugins.d/mandos-client
300
install --mode=u=rwxs,go=rx \
301
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
302
plugins.d/usplash
303
install --mode=u=rwxs,go=rx \
304
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
305
plugins.d/splashy
306
install --mode=u=rwxs,go=rx \
307
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
308
plugins.d/askpass-fifo
309
install initramfs-tools-hook \
310
$(INITRAMFSTOOLS)/hooks/mandos
311
install --mode=u=rw,go=r initramfs-tools-hook-conf \
312
$(INITRAMFSTOOLS)/conf-hooks.d/mandos
313
install initramfs-tools-script \
314
$(INITRAMFSTOOLS)/scripts/init-premount/mandos
315
install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
316
gzip --best --to-stdout mandos-keygen.8 \
317
> $(MANDIR)/man8/mandos-keygen.8.gz
318
gzip --best --to-stdout plugin-runner.8mandos \
319
> $(MANDIR)/man8/plugin-runner.8mandos.gz
320
gzip --best --to-stdout plugins.d/password-prompt.8mandos \
321
> $(MANDIR)/man8/password-prompt.8mandos.gz
322
gzip --best --to-stdout plugins.d/mandos-client.8mandos \
323
> $(MANDIR)/man8/mandos-client.8mandos.gz
324
gzip --best --to-stdout plugins.d/usplash.8mandos \
325
> $(MANDIR)/man8/usplash.8mandos.gz
326
gzip --best --to-stdout plugins.d/splashy.8mandos \
327
> $(MANDIR)/man8/splashy.8mandos.gz
328
gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
329
> $(MANDIR)/man8/askpass-fifo.8mandos.gz
330
331
install-client: install-client-nokey
332
# Post-installation stuff
333
-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
334
update-initramfs -k all -u
335
echo "Now run mandos-keygen --password --dir $(KEYDIR)"
336
337
uninstall: uninstall-server uninstall-client
338
339
uninstall-server:
340
-rm --force $(PREFIX)/sbin/mandos \
341
$(MANDIR)/man8/mandos.8.gz \
342
$(MANDIR)/man5/mandos.conf.5.gz \
343
$(MANDIR)/man5/mandos-clients.conf.5.gz
344
update-rc.d -f mandos remove
345
-rmdir $(CONFDIR)
346
347
uninstall-client:
348
# Refuse to uninstall client if /etc/crypttab is explicitly configured
349
# to use it.
350
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
351
$(DESTDIR)/etc/crypttab
352
-rm --force $(PREFIX)/sbin/mandos-keygen \
353
$(PREFIX)/lib/mandos/plugin-runner \
354
$(PREFIX)/lib/mandos/plugins.d/password-prompt \
355
$(PREFIX)/lib/mandos/plugins.d/mandos-client \
356
$(PREFIX)/lib/mandos/plugins.d/usplash \
357
$(PREFIX)/lib/mandos/plugins.d/splashy \
358
$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
359
$(INITRAMFSTOOLS)/hooks/mandos \
360
$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
361
$(INITRAMFSTOOLS)/scripts/init-premount/mandos \
362
$(MANDIR)/man8/plugin-runner.8mandos.gz \
363
$(MANDIR)/man8/mandos-keygen.8.gz \
364
$(MANDIR)/man8/password-prompt.8mandos.gz \
365
$(MANDIR)/man8/usplash.8mandos.gz \
366
$(MANDIR)/man8/splashy.8mandos.gz \
367
$(MANDIR)/man8/askpass-fifo.8mandos.gz \
368
$(MANDIR)/man8/mandos-client.8mandos.gz
369
-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
370
$(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
371
update-initramfs -k all -u
372
373
purge: purge-server purge-client
374
375
purge-server: uninstall-server
376
-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
377
$(DESTDIR)/etc/default/mandos \
378
$(DESTDIR)/etc/init.d/mandos \
379
$(DESTDIR)/var/run/mandos.pid
380
-rmdir $(CONFDIR)
381
382
purge-client: uninstall-client
383
-shred --remove $(KEYDIR)/seckey.txt
384
-rm --force $(CONFDIR)/plugin-runner.conf \
385
$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
386
-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
20
-rm -f $(PROGS) $(objects) core
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0