/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

  • Committer: Björn Påhlsson
  • Date: 2011-06-23 22:27:15 UTC
  • mto: (237.7.33 trunk)
  • mto: This revision was merged to the branch mainline in revision 284.
  • Revision ID: belorn@fukt.bsnet.se-20110623222715-q5wro9ma9iyjl367
* Makefile (CFLAGS): Added "-lrt" to include real time library.
* plugins.d/mandos-client.c: use scandir(3) instead of readdir(3)
                             Prefix all debug output with "Mandos plugin " + program_invocation_short_name
                             Retry servers that failed to provide password.
                             New option --retry SECONDS that sets the interval between rechecking.
                             --retry also controls how often it retries a server when using --connect.
* plugins.d/splashy.c:  Prefix all debug output with "Mandos plugin " + program_invocation_short_name
* plugins.d/usplash.c: --||--
* plugins.d/askpass-fifo.c: --||--
* plugins.d/password-prompt.c: --||--
* plugins.d/plymouth.c: --||--
* mandos: Lower logger level from warning to info on failed client requests because client was disabled or unknown fingerprint.
* plugins.d/plymouth.c (get_pid): bug fix. Was not calling free on direntries. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
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
14
22
#COVERAGE=--coverage
15
23
OPTIMIZE=-Os
16
24
LANGUAGE=-std=gnu99
17
25
htmldir=man
18
 
version=1.0
 
26
version=1.3.0
19
27
SED=sed
20
28
 
21
29
## Use these settings for a traditional /usr/local install
34
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
35
43
##
36
44
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
51
        getconf LFS_LDFLAGS)
43
52
 
44
53
# Do not change these two
45
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
 
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
56
        -lrt -DVERSION='"$(version)"'
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
58
 
50
59
# Commands to format a DocBook <refentry> document into a manual page
51
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
52
61
        --param man.charmap.use.subset          0 \
53
62
        --param make.year.ranges                1 \
54
63
        --param make.single.year.ranges         1 \
56
65
        --param man.authors.section.enabled     0 \
57
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
67
        $(notdir $<); \
59
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
60
69
# DocBook-to-man post-processing to fix a '\n' escape bug
61
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
62
71
 
63
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
64
73
        --param make.year.ranges                1 \
65
74
        --param make.single.year.ranges         1 \
66
75
        --param man.output.quietly              1 \
68
77
        --param citerefentry.link               1 \
69
78
        --output $@ \
70
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
72
81
# Fix citerefentry links
73
 
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
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'
74
84
 
75
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
76
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
87
        plugins.d/plymouth
77
88
CPROGS=plugin-runner $(PLUGINS)
78
 
PROGS=mandos mandos-keygen $(CPROGS)
79
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
90
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
91
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
80
92
        plugins.d/mandos-client.8mandos \
81
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
82
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
83
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
95
        plugins.d/plymouth.8mandos
84
96
 
85
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
86
98
 
87
99
objects=$(addsuffix .o,$(CPROGS))
88
100
 
89
 
all: $(PROGS)
 
101
all: $(PROGS) mandos.lsm
90
102
 
91
103
doc: $(DOCS)
92
104
 
121
133
                 legalnotice.xml
122
134
        $(DOCBOOKTOHTML)
123
135
 
 
136
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
137
                legalnotice.xml
 
138
        $(DOCBOOKTOMAN)
 
139
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
140
                 legalnotice.xml
 
141
        $(DOCBOOKTOHTML)
 
142
 
 
143
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
144
                legalnotice.xml
 
145
        $(DOCBOOKTOMAN)
 
146
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
147
                 legalnotice.xml
 
148
        $(DOCBOOKTOHTML)
 
149
 
124
150
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
125
151
                legalnotice.xml
126
152
        $(DOCBOOKTOMAN)
148
174
 
149
175
# Update all these files with version number $(version)
150
176
common.ent: Makefile
151
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
177
        $(strip $(SED) --in-place \
 
178
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
179
                $@)
152
180
 
153
181
mandos: Makefile
154
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
182
        $(strip $(SED) --in-place \
 
183
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
184
                $@)
155
185
 
156
186
mandos-keygen: Makefile
157
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
158
 
 
159
 
plugins.d/mandos-client: plugins.d/mandos-client.o
160
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
161
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
187
        $(strip $(SED) --in-place \
 
188
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
189
                $@)
 
190
 
 
191
mandos-ctl: Makefile
 
192
        $(strip $(SED) --in-place \
 
193
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
194
                $@)
 
195
 
 
196
mandos-monitor: Makefile
 
197
        $(strip $(SED) --in-place \
 
198
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
199
                $@)
 
200
 
 
201
mandos.lsm: Makefile
 
202
        $(strip $(SED) --in-place \
 
203
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
204
                $@)
 
205
        $(strip $(SED) --in-place \
 
206
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
207
                $@)
 
208
        $(strip $(SED) --in-place \
 
209
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
210
                $@)
 
211
 
 
212
plugins.d/mandos-client: plugins.d/mandos-client.c
 
213
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
214
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
162
215
 
163
216
.PHONY : all doc html clean distclean run-client run-server install \
164
217
        install-server install-client uninstall uninstall-server \
177
230
 
178
231
# Run the client with a local config and key
179
232
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
233
        @echo "###################################################################"
 
234
        @echo "# The following error messages are harmless and can be safely     #"
 
235
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
236
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
237
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
238
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
239
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
240
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
241
        @echo "#                     seteuid: Operation not permitted            #"
 
242
        @echo "#                     klogctl: Operation not permitted            #"
 
243
        @echo "###################################################################"
180
244
        ./plugin-runner --plugin-dir=plugins.d \
181
245
                --config-file=plugin-runner.conf \
182
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
247
                $(CLIENTARGS)
183
248
 
184
249
# Used by run-client
185
250
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
188
253
 
189
254
# Run the server with a local config
190
255
run-server: confdir/mandos.conf confdir/clients.conf
191
 
        ./mandos --debug --configdir=confdir
 
256
        @echo "#################################################################"
 
257
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
258
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
259
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
260
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
261
        @echo "#################################################################"
 
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
192
263
 
193
264
# Used by run-server
194
265
confdir/mandos.conf: mandos.conf
202
273
 
203
274
install: install-server install-client-nokey
204
275
 
205
 
install-html: $(htmldocs)
 
276
install-html: html
206
277
        install --directory $(htmldir)
207
278
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
208
279
                $(htmldocs)
210
281
install-server: doc
211
282
        install --directory $(CONFDIR)
212
283
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
284
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
285
                mandos-ctl
 
286
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
287
                mandos-monitor
213
288
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
214
289
                mandos.conf
215
290
        install --mode=u=rw --target-directory=$(CONFDIR) \
216
291
                clients.conf
 
292
        install --mode=u=rw,go=r dbus-mandos.conf \
 
293
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
217
294
        install --mode=u=rwx,go=rx init.d-mandos \
218
295
                $(DESTDIR)/etc/init.d/mandos
219
296
        install --mode=u=rw,go=r default-mandos \
223
300
        fi
224
301
        gzip --best --to-stdout mandos.8 \
225
302
                > $(MANDIR)/man8/mandos.8.gz
 
303
        gzip --best --to-stdout mandos-monitor.8 \
 
304
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
305
        gzip --best --to-stdout mandos-ctl.8 \
 
306
                > $(MANDIR)/man8/mandos-ctl.8.gz
226
307
        gzip --best --to-stdout mandos.conf.5 \
227
308
                > $(MANDIR)/man5/mandos.conf.5.gz
228
309
        gzip --best --to-stdout mandos-clients.conf.5 \
255
336
        install --mode=u=rwxs,go=rx \
256
337
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
257
338
                plugins.d/askpass-fifo
 
339
        install --mode=u=rwxs,go=rx \
 
340
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
341
                plugins.d/plymouth
258
342
        install initramfs-tools-hook \
259
343
                $(INITRAMFSTOOLS)/hooks/mandos
260
344
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
261
345
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
262
346
        install initramfs-tools-script \
263
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
347
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
264
348
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
265
349
        gzip --best --to-stdout mandos-keygen.8 \
266
350
                > $(MANDIR)/man8/mandos-keygen.8.gz
267
351
        gzip --best --to-stdout plugin-runner.8mandos \
268
352
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
353
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
354
                > $(MANDIR)/man8/mandos-client.8mandos.gz
269
355
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
270
356
                > $(MANDIR)/man8/password-prompt.8mandos.gz
271
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
272
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
273
357
        gzip --best --to-stdout plugins.d/usplash.8mandos \
274
358
                > $(MANDIR)/man8/usplash.8mandos.gz
275
359
        gzip --best --to-stdout plugins.d/splashy.8mandos \
276
360
                > $(MANDIR)/man8/splashy.8mandos.gz
277
361
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
278
362
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
363
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
364
                > $(MANDIR)/man8/plymouth.8mandos.gz
279
365
 
280
366
install-client: install-client-nokey
281
367
# Post-installation stuff
287
373
 
288
374
uninstall-server:
289
375
        -rm --force $(PREFIX)/sbin/mandos \
 
376
                $(PREFIX)/sbin/mandos-ctl \
 
377
                $(PREFIX)/sbin/mandos-monitor \
290
378
                $(MANDIR)/man8/mandos.8.gz \
 
379
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
380
                $(MANDIR)/man8/mandos-ctl.8.gz \
291
381
                $(MANDIR)/man5/mandos.conf.5.gz \
292
382
                $(MANDIR)/man5/mandos-clients.conf.5.gz
293
383
        update-rc.d -f mandos remove
305
395
                $(PREFIX)/lib/mandos/plugins.d/usplash \
306
396
                $(PREFIX)/lib/mandos/plugins.d/splashy \
307
397
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
398
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
308
399
                $(INITRAMFSTOOLS)/hooks/mandos \
309
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
310
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
401
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
402
                $(MANDIR)/man8/mandos-keygen.8.gz \
311
403
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
312
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
404
                $(MANDIR)/man8/mandos-client.8mandos.gz
313
405
                $(MANDIR)/man8/password-prompt.8mandos.gz \
314
406
                $(MANDIR)/man8/usplash.8mandos.gz \
315
407
                $(MANDIR)/man8/splashy.8mandos.gz \
316
408
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
317
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
409
                $(MANDIR)/man8/plymouth.8mandos.gz \
318
410
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
319
411
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
320
412
        update-initramfs -k all -u
323
415
 
324
416
purge-server: uninstall-server
325
417
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
418
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
326
419
                $(DESTDIR)/etc/default/mandos \
327
420
                $(DESTDIR)/etc/init.d/mandos \
328
421
                $(DESTDIR)/var/run/mandos.pid