/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

Code cleanup.

* mandos (ForkingMixInWithPipe.handle_ipc): Take "self" argument.
  (IPv6_TCPServer): Split off attributes "enabled", "clients",
                   "use_dbus", "gnutls_priority", and methods
                   "server_activate", "enable", and "handle" into
                   separate class "MandosServer".
  (MandosServer): New.
  (main): Use MandosServer instead of IPv6_TCPServer.

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.4.0
 
19
version=1.0.8
27
20
SED=sed
28
21
 
29
22
## Use these settings for a traditional /usr/local install
42
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
36
##
44
37
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
54
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
49
        -DVERSION='"$(version)"'
57
 
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))
58
51
 
59
52
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
54
        --param man.charmap.use.subset          0 \
62
55
        --param make.year.ranges                1 \
63
56
        --param make.single.year.ranges         1 \
65
58
        --param man.authors.section.enabled     0 \
66
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
60
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
71
62
# DocBook-to-man post-processing to fix a '\n' escape bug
72
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
64
 
74
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
75
66
        --param make.year.ranges                1 \
76
67
        --param make.single.year.ranges         1 \
77
68
        --param man.output.quietly              1 \
79
70
        --param citerefentry.link               1 \
80
71
        --output $@ \
81
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
82
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
83
74
# Fix citerefentry links
84
75
HTMLPOST=$(SED) --in-place \
85
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'
86
77
 
87
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
88
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
89
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
90
80
CPROGS=plugin-runner $(PLUGINS)
91
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
 
        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 \
94
83
        plugins.d/mandos-client.8mandos \
95
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
96
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
97
 
        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
98
87
 
99
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
100
89
 
121
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
122
111
        $(DOCBOOKTOHTML)
123
112
 
124
 
intro.8mandos: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOMAN)
126
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
130
114
                legalnotice.xml
131
115
        $(DOCBOOKTOMAN)
140
124
                 legalnotice.xml
141
125
        $(DOCBOOKTOHTML)
142
126
 
143
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
144
 
                legalnotice.xml
145
 
        $(DOCBOOKTOMAN)
146
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
147
 
                 legalnotice.xml
148
 
        $(DOCBOOKTOHTML)
149
 
 
150
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
158
128
                legalnotice.xml
159
129
        $(DOCBOOKTOMAN)
181
151
 
182
152
# Update all these files with version number $(version)
183
153
common.ent: Makefile
184
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
185
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
186
 
                $@)
 
156
                $@
187
157
 
188
158
mandos: Makefile
189
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
190
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
191
 
                $@)
 
161
                $@
192
162
 
193
163
mandos-keygen: Makefile
194
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
195
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
196
 
                $@)
 
166
                $@
197
167
 
198
168
mandos-ctl: Makefile
199
 
        $(strip $(SED) --in-place \
200
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
201
 
                $@)
202
 
 
203
 
mandos-monitor: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
207
172
 
208
173
mandos.lsm: Makefile
209
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
210
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
211
 
                $@)
212
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
213
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
214
 
                $@)
215
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
216
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
217
 
                $@)
 
182
                $@
218
183
 
219
 
plugins.d/mandos-client: plugins.d/mandos-client.c
220
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
 
                ) $(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 $@
222
187
 
223
188
.PHONY : all doc html clean distclean run-client run-server install \
224
189
        install-server install-client uninstall uninstall-server \
237
202
 
238
203
# Run the client with a local config and key
239
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
240
 
        @echo "###################################################################"
241
 
        @echo "# The following error messages are harmless and can be safely     #"
242
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
243
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
244
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
245
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
246
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
247
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
248
 
        @echo "#                     seteuid: Operation not permitted            #"
249
 
        @echo "#                     klogctl: Operation not permitted            #"
250
 
        @echo "###################################################################"
251
205
        ./plugin-runner --plugin-dir=plugins.d \
252
206
                --config-file=plugin-runner.conf \
253
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
260
214
 
261
215
# Run the server with a local config
262
216
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
268
 
        @echo "#################################################################"
269
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
218
 
271
219
# Used by run-server
288
236
install-server: doc
289
237
        install --directory $(CONFDIR)
290
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
291
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
 
                mandos-ctl
293
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
294
 
                mandos-monitor
295
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
296
240
                mandos.conf
297
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
298
242
                clients.conf
299
 
        install --mode=u=rw,go=r dbus-mandos.conf \
300
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
301
243
        install --mode=u=rwx,go=rx init.d-mandos \
302
244
                $(DESTDIR)/etc/init.d/mandos
303
245
        install --mode=u=rw,go=r default-mandos \
307
249
        fi
308
250
        gzip --best --to-stdout mandos.8 \
309
251
                > $(MANDIR)/man8/mandos.8.gz
310
 
        gzip --best --to-stdout mandos-monitor.8 \
311
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
312
 
        gzip --best --to-stdout mandos-ctl.8 \
313
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
314
252
        gzip --best --to-stdout mandos.conf.5 \
315
253
                > $(MANDIR)/man5/mandos.conf.5.gz
316
254
        gzip --best --to-stdout mandos-clients.conf.5 \
343
281
        install --mode=u=rwxs,go=rx \
344
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
345
283
                plugins.d/askpass-fifo
346
 
        install --mode=u=rwxs,go=rx \
347
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
348
 
                plugins.d/plymouth
349
284
        install initramfs-tools-hook \
350
285
                $(INITRAMFSTOOLS)/hooks/mandos
351
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
357
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
358
293
        gzip --best --to-stdout plugin-runner.8mandos \
359
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
360
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
361
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
362
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
363
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
364
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
365
300
                > $(MANDIR)/man8/usplash.8mandos.gz
366
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
367
302
                > $(MANDIR)/man8/splashy.8mandos.gz
368
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
369
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
370
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
371
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
372
305
 
373
306
install-client: install-client-nokey
374
307
# Post-installation stuff
380
313
 
381
314
uninstall-server:
382
315
        -rm --force $(PREFIX)/sbin/mandos \
383
 
                $(PREFIX)/sbin/mandos-ctl \
384
 
                $(PREFIX)/sbin/mandos-monitor \
385
316
                $(MANDIR)/man8/mandos.8.gz \
386
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
387
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
388
317
                $(MANDIR)/man5/mandos.conf.5.gz \
389
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
390
319
        update-rc.d -f mandos remove
402
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
403
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
404
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
405
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
406
334
                $(INITRAMFSTOOLS)/hooks/mandos \
407
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
408
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
409
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
410
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
411
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
412
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
413
340
                $(MANDIR)/man8/usplash.8mandos.gz \
414
341
                $(MANDIR)/man8/splashy.8mandos.gz \
415
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
416
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
417
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
418
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
419
346
        update-initramfs -k all -u
422
349
 
423
350
purge-server: uninstall-server
424
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
425
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
426
352
                $(DESTDIR)/etc/default/mandos \
427
353
                $(DESTDIR)/etc/init.d/mandos \
428
354
                $(DESTDIR)/var/run/mandos.pid