/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

* plugins.d/password-prompt.c: Use environment variables and prompt
                               text from cryptsetup 1.1.
* plugins.d/password-prompt.xml (ENVIRONMENT): Document change in
                                               environment variables
                                               used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
13
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
14
LINK_FORTIFY_LD=-z relro -z now
15
15
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
16
ifndef BROKEN_PIE
19
17
FORTIFY += -fPIE
 
18
LINK_FORTIFY_LD += -fPIE
20
19
LINK_FORTIFY += -pie
21
20
endif
22
21
#COVERAGE=--coverage
23
22
OPTIMIZE=-Os
24
23
LANGUAGE=-std=gnu99
25
24
htmldir=man
26
 
version=1.2
 
25
version=1.0.14
27
26
SED=sed
28
27
 
29
28
## Use these settings for a traditional /usr/local install
57
56
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
57
 
59
58
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
59
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
60
        --param man.charmap.use.subset          0 \
62
61
        --param make.year.ranges                1 \
63
62
        --param make.single.year.ranges         1 \
65
64
        --param man.authors.section.enabled     0 \
66
65
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
66
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
67
        $(MANPOST) $(notdir $@)
69
68
# DocBook-to-man post-processing to fix a '\n' escape bug
70
69
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
70
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
71
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
72
        --param make.year.ranges                1 \
74
73
        --param make.single.year.ranges         1 \
75
74
        --param man.output.quietly              1 \
77
76
        --param citerefentry.link               1 \
78
77
        --output $@ \
79
78
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
79
        $<; $(HTMLPOST) $@
81
80
# Fix citerefentry links
82
81
HTMLPOST=$(SED) --in-place \
83
82
        --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
83
 
85
84
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
85
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
86
CPROGS=plugin-runner $(PLUGINS)
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 \
 
87
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
88
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
92
89
        plugins.d/mandos-client.8mandos \
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
 
90
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
91
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
92
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
96
93
 
97
94
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
95
 
133
130
                 legalnotice.xml
134
131
        $(DOCBOOKTOHTML)
135
132
 
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
 
 
150
133
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
151
134
                legalnotice.xml
152
135
        $(DOCBOOKTOMAN)
174
157
 
175
158
# Update all these files with version number $(version)
176
159
common.ent: Makefile
177
 
        $(strip $(SED) --in-place \
 
160
        $(SED) --in-place \
178
161
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
179
 
                $@)
 
162
                $@
180
163
 
181
164
mandos: Makefile
182
 
        $(strip $(SED) --in-place \
 
165
        $(SED) --in-place \
183
166
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
184
 
                $@)
 
167
                $@
185
168
 
186
169
mandos-keygen: Makefile
187
 
        $(strip $(SED) --in-place \
 
170
        $(SED) --in-place \
188
171
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
189
 
                $@)
 
172
                $@
190
173
 
191
174
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
 
                $@)
 
175
        $(SED) --in-place \
 
176
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
177
                $@
200
178
 
201
179
mandos.lsm: Makefile
202
 
        $(strip $(SED) --in-place \
 
180
        $(SED) --in-place \
203
181
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
204
 
                $@)
205
 
        $(strip $(SED) --in-place \
 
182
                $@
 
183
        $(SED) --in-place \
206
184
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
207
 
                $@)
208
 
        $(strip $(SED) --in-place \
 
185
                $@
 
186
        $(SED) --in-place \
209
187
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
210
 
                $@)
 
188
                $@
211
189
 
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 $@
 
190
plugins.d/mandos-client: plugins.d/mandos-client.o
 
191
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
192
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
215
193
 
216
194
.PHONY : all doc html clean distclean run-client run-server install \
217
195
        install-server install-client uninstall uninstall-server \
230
208
 
231
209
# Run the client with a local config and key
232
210
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 "###################################################################"
244
211
        ./plugin-runner --plugin-dir=plugins.d \
245
212
                --config-file=plugin-runner.conf \
246
213
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
253
220
 
254
221
# Run the server with a local config
255
222
run-server: confdir/mandos.conf confdir/clients.conf
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
223
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
263
224
 
264
225
# Used by run-server
281
242
install-server: doc
282
243
        install --directory $(CONFDIR)
283
244
        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
288
245
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
289
246
                mandos.conf
290
247
        install --mode=u=rw --target-directory=$(CONFDIR) \
291
248
                clients.conf
292
 
        install --mode=u=rw,go=r dbus-mandos.conf \
293
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
294
249
        install --mode=u=rwx,go=rx init.d-mandos \
295
250
                $(DESTDIR)/etc/init.d/mandos
296
251
        install --mode=u=rw,go=r default-mandos \
300
255
        fi
301
256
        gzip --best --to-stdout mandos.8 \
302
257
                > $(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
307
258
        gzip --best --to-stdout mandos.conf.5 \
308
259
                > $(MANDIR)/man5/mandos.conf.5.gz
309
260
        gzip --best --to-stdout mandos-clients.conf.5 \
336
287
        install --mode=u=rwxs,go=rx \
337
288
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
338
289
                plugins.d/askpass-fifo
339
 
        install --mode=u=rwxs,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
341
 
                plugins.d/plymouth
342
290
        install initramfs-tools-hook \
343
291
                $(INITRAMFSTOOLS)/hooks/mandos
344
292
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
350
298
                > $(MANDIR)/man8/mandos-keygen.8.gz
351
299
        gzip --best --to-stdout plugin-runner.8mandos \
352
300
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
301
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
302
                > $(MANDIR)/man8/password-prompt.8mandos.gz
353
303
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
354
304
                > $(MANDIR)/man8/mandos-client.8mandos.gz
355
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
356
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
357
305
        gzip --best --to-stdout plugins.d/usplash.8mandos \
358
306
                > $(MANDIR)/man8/usplash.8mandos.gz
359
307
        gzip --best --to-stdout plugins.d/splashy.8mandos \
360
308
                > $(MANDIR)/man8/splashy.8mandos.gz
361
309
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
362
310
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
363
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
364
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
365
311
 
366
312
install-client: install-client-nokey
367
313
# Post-installation stuff
373
319
 
374
320
uninstall-server:
375
321
        -rm --force $(PREFIX)/sbin/mandos \
376
 
                $(PREFIX)/sbin/mandos-ctl \
377
 
                $(PREFIX)/sbin/mandos-monitor \
378
322
                $(MANDIR)/man8/mandos.8.gz \
379
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
380
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
381
323
                $(MANDIR)/man5/mandos.conf.5.gz \
382
324
                $(MANDIR)/man5/mandos-clients.conf.5.gz
383
325
        update-rc.d -f mandos remove
395
337
                $(PREFIX)/lib/mandos/plugins.d/usplash \
396
338
                $(PREFIX)/lib/mandos/plugins.d/splashy \
397
339
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
398
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
399
340
                $(INITRAMFSTOOLS)/hooks/mandos \
400
341
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
401
342
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
343
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
402
344
                $(MANDIR)/man8/mandos-keygen.8.gz \
403
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
404
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
405
345
                $(MANDIR)/man8/password-prompt.8mandos.gz \
406
346
                $(MANDIR)/man8/usplash.8mandos.gz \
407
347
                $(MANDIR)/man8/splashy.8mandos.gz \
408
348
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
409
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
349
                $(MANDIR)/man8/mandos-client.8mandos.gz
410
350
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
411
351
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
412
352
        update-initramfs -k all -u
415
355
 
416
356
purge-server: uninstall-server
417
357
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
418
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
419
358
                $(DESTDIR)/etc/default/mandos \
420
359
                $(DESTDIR)/etc/init.d/mandos \
421
360
                $(DESTDIR)/var/run/mandos.pid