/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

  • Committer: Teddy Hogeborn
  • Date: 2009-04-16 10:41:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416104141-19m1kqbwr5v1q416
Code cleanup.

* mandos: Move some global stuff into classes.
  (server, group): Moved into "AvahiService".  All users changed.
  (AvahiService.group, AvahiService.server): New attributes.
  (entry_group_state_changed, server_state_changed): Moved into
                                                     "AvahiService".
                                                     All callers
                                                     changed.
  (AvahiService.cleanup, AvahiService.activate): New.
  (_datetime_to_dbus): Moved into "ClientDBus".  All callers changed.
  (ClientDBus._datetime_to_dbus): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
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
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
22
15
#COVERAGE=--coverage
23
16
OPTIMIZE=-Os
24
17
LANGUAGE=-std=gnu99
25
18
htmldir=man
26
 
version=1.6.2
 
19
version=1.0.8
27
20
SED=sed
28
21
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
22
## Use these settings for a traditional /usr/local install
33
23
# PREFIX=$(DESTDIR)/usr/local
34
24
# CONFDIR=$(DESTDIR)/etc/mandos
35
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
26
# MANDIR=$(PREFIX)/man
37
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
28
##
40
29
 
41
30
## These settings are for a package-type install
44
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
34
MANDIR=$(PREFIX)/share/man
46
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
36
##
49
37
 
50
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
51
 
 
52
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
53
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
54
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
55
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
56
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
58
44
        getconf LFS_LDFLAGS)
59
45
 
60
46
# Do not change these two
61
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
62
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
63
49
        -DVERSION='"$(version)"'
64
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
65
51
 
66
52
# Commands to format a DocBook <refentry> document into a manual page
67
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
68
54
        --param man.charmap.use.subset          0 \
69
55
        --param make.year.ranges                1 \
70
56
        --param make.single.year.ranges         1 \
71
57
        --param man.output.quietly              1 \
72
58
        --param man.authors.section.enabled     0 \
73
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
74
60
        $(notdir $<); \
75
 
        $(MANPOST) $(notdir $@);\
76
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
77
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
78
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
79
 
        fi >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
80
62
# DocBook-to-man post-processing to fix a '\n' escape bug
81
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
82
64
 
83
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
84
66
        --param make.year.ranges                1 \
85
67
        --param make.single.year.ranges         1 \
86
68
        --param man.output.quietly              1 \
88
70
        --param citerefentry.link               1 \
89
71
        --output $@ \
90
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
91
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
92
74
# Fix citerefentry links
93
75
HTMLPOST=$(SED) --in-place \
94
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
95
77
 
96
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
97
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
98
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
99
80
CPROGS=plugin-runner $(PLUGINS)
100
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
101
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
102
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
103
83
        plugins.d/mandos-client.8mandos \
104
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
105
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
106
 
        plugins.d/plymouth.8mandos intro.8mandos
 
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
107
87
 
108
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
109
89
 
130
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
131
111
        $(DOCBOOKTOHTML)
132
112
 
133
 
intro.8mandos: intro.xml common.ent legalnotice.xml
134
 
        $(DOCBOOKTOMAN)
135
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
136
 
        $(DOCBOOKTOHTML)
137
 
 
138
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
139
114
                legalnotice.xml
140
115
        $(DOCBOOKTOMAN)
149
124
                 legalnotice.xml
150
125
        $(DOCBOOKTOHTML)
151
126
 
152
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
153
 
                legalnotice.xml
154
 
        $(DOCBOOKTOMAN)
155
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
156
 
                 legalnotice.xml
157
 
        $(DOCBOOKTOHTML)
158
 
 
159
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
160
 
                legalnotice.xml
161
 
        $(DOCBOOKTOMAN)
162
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
163
 
                 legalnotice.xml
164
 
        $(DOCBOOKTOHTML)
165
 
 
166
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
167
128
                legalnotice.xml
168
129
        $(DOCBOOKTOMAN)
190
151
 
191
152
# Update all these files with version number $(version)
192
153
common.ent: Makefile
193
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
194
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
195
 
                $@)
 
156
                $@
196
157
 
197
158
mandos: Makefile
198
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
199
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
200
 
                $@)
 
161
                $@
201
162
 
202
163
mandos-keygen: Makefile
203
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
204
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
205
 
                $@)
 
166
                $@
206
167
 
207
168
mandos-ctl: Makefile
208
 
        $(strip $(SED) --in-place \
209
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
210
 
                $@)
211
 
 
212
 
mandos-monitor: Makefile
213
 
        $(strip $(SED) --in-place \
214
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
215
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
216
172
 
217
173
mandos.lsm: Makefile
218
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
219
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
220
 
                $@)
221
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
222
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
223
 
                $@)
224
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
225
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
226
 
                $@)
 
182
                $@
227
183
 
228
 
plugins.d/mandos-client: plugins.d/mandos-client.c
229
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
230
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
231
187
 
232
188
.PHONY : all doc html clean distclean run-client run-server install \
233
189
        install-server install-client uninstall uninstall-server \
239
195
distclean: clean
240
196
mostlyclean: clean
241
197
maintainer-clean: clean
242
 
        -rm --force --recursive keydir confdir statedir
 
198
        -rm --force --recursive keydir confdir
243
199
 
244
200
check:  all
245
201
        ./mandos --check
246
 
        ./mandos-ctl --check
247
202
 
248
203
# Run the client with a local config and key
249
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
250
 
        @echo "###################################################################"
251
 
        @echo "# The following error messages are harmless and can be safely     #"
252
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
253
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
254
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
255
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
256
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
257
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
258
 
        @echo "#                     seteuid: Operation not permitted            #"
259
 
        @echo "#                     klogctl: Operation not permitted            #"
260
 
        @echo "###################################################################"
261
205
        ./plugin-runner --plugin-dir=plugins.d \
262
206
                --config-file=plugin-runner.conf \
263
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
264
208
                $(CLIENTARGS)
265
209
 
266
210
# Used by run-client
269
213
        ./mandos-keygen --dir keydir --force
270
214
 
271
215
# Run the server with a local config
272
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
273
 
        ./mandos --debug --no-dbus --configdir=confdir \
274
 
                --statedir=statedir $(SERVERARGS)
 
216
run-server: confdir/mandos.conf confdir/clients.conf
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
275
218
 
276
219
# Used by run-server
277
220
confdir/mandos.conf: mandos.conf
282
225
        install --mode=u=rw $< $@
283
226
# Add a client password
284
227
        ./mandos-keygen --dir keydir --password >> $@
285
 
statedir:
286
 
        install --directory statedir
287
228
 
288
229
install: install-server install-client-nokey
289
230
 
294
235
 
295
236
install-server: doc
296
237
        install --directory $(CONFDIR)
297
 
        install --directory --mode=u=rwx --owner=$(USER) \
298
 
                --group=$(GROUP) $(STATEDIR)
299
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
300
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
301
 
                mandos-ctl
302
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
303
 
                mandos-monitor
304
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
305
240
                mandos.conf
306
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
307
242
                clients.conf
308
 
        install --mode=u=rw,go=r dbus-mandos.conf \
309
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
310
243
        install --mode=u=rwx,go=rx init.d-mandos \
311
244
                $(DESTDIR)/etc/init.d/mandos
312
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
313
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
314
 
        fi
315
245
        install --mode=u=rw,go=r default-mandos \
316
246
                $(DESTDIR)/etc/default/mandos
317
247
        if [ -z $(DESTDIR) ]; then \
319
249
        fi
320
250
        gzip --best --to-stdout mandos.8 \
321
251
                > $(MANDIR)/man8/mandos.8.gz
322
 
        gzip --best --to-stdout mandos-monitor.8 \
323
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
324
 
        gzip --best --to-stdout mandos-ctl.8 \
325
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
326
252
        gzip --best --to-stdout mandos.conf.5 \
327
253
                > $(MANDIR)/man5/mandos.conf.5.gz
328
254
        gzip --best --to-stdout mandos-clients.conf.5 \
329
255
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
330
 
        gzip --best --to-stdout intro.8mandos \
331
 
                > $(MANDIR)/man8/intro.8mandos.gz
332
256
 
333
257
install-client-nokey: all doc
334
258
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
338
262
                install --mode=u=rwx \
339
263
                        --directory "$(CONFDIR)/plugins.d"; \
340
264
        fi
341
 
        install --mode=u=rwx,go=rx --directory \
342
 
                "$(CONFDIR)/network-hooks.d"
343
265
        install --mode=u=rwx,go=rx \
344
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
345
267
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
359
281
        install --mode=u=rwxs,go=rx \
360
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
361
283
                plugins.d/askpass-fifo
362
 
        install --mode=u=rwxs,go=rx \
363
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
364
 
                plugins.d/plymouth
365
284
        install initramfs-tools-hook \
366
285
                $(INITRAMFSTOOLS)/hooks/mandos
367
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
373
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
374
293
        gzip --best --to-stdout plugin-runner.8mandos \
375
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
376
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
377
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
378
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
379
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
380
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
381
300
                > $(MANDIR)/man8/usplash.8mandos.gz
382
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
383
302
                > $(MANDIR)/man8/splashy.8mandos.gz
384
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
385
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
386
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
387
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
388
305
 
389
306
install-client: install-client-nokey
390
307
# Post-installation stuff
396
313
 
397
314
uninstall-server:
398
315
        -rm --force $(PREFIX)/sbin/mandos \
399
 
                $(PREFIX)/sbin/mandos-ctl \
400
 
                $(PREFIX)/sbin/mandos-monitor \
401
316
                $(MANDIR)/man8/mandos.8.gz \
402
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
403
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
404
317
                $(MANDIR)/man5/mandos.conf.5.gz \
405
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
406
319
        update-rc.d -f mandos remove
418
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
419
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
420
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
421
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
422
334
                $(INITRAMFSTOOLS)/hooks/mandos \
423
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
424
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
425
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
426
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
427
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
428
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
429
340
                $(MANDIR)/man8/usplash.8mandos.gz \
430
341
                $(MANDIR)/man8/splashy.8mandos.gz \
431
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
432
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
433
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
434
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
435
346
        update-initramfs -k all -u
438
349
 
439
350
purge-server: uninstall-server
440
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
441
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
442
352
                $(DESTDIR)/etc/default/mandos \
443
353
                $(DESTDIR)/etc/init.d/mandos \
444
 
                $(SYSTEMD)/mandos.service \
445
 
                $(DESTDIR)/run/mandos.pid \
446
354
                $(DESTDIR)/var/run/mandos.pid
447
355
        -rmdir $(CONFDIR)
448
356