/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.3.1
 
25
version=1.0.14
27
26
SED=sed
28
27
 
29
28
## Use these settings for a traditional /usr/local install
54
53
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
54
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
55
        -DVERSION='"$(version)"'
57
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
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 intro.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
 
119
116
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
117
        $(DOCBOOKTOHTML)
121
118
 
122
 
intro.8mandos: intro.xml common.ent legalnotice.xml
123
 
        $(DOCBOOKTOMAN)
124
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOHTML)
126
 
 
127
119
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
128
120
                legalnotice.xml
129
121
        $(DOCBOOKTOMAN)
138
130
                 legalnotice.xml
139
131
        $(DOCBOOKTOHTML)
140
132
 
141
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
142
 
                legalnotice.xml
143
 
        $(DOCBOOKTOMAN)
144
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
145
 
                 legalnotice.xml
146
 
        $(DOCBOOKTOHTML)
147
 
 
148
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
149
 
                legalnotice.xml
150
 
        $(DOCBOOKTOMAN)
151
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
152
 
                 legalnotice.xml
153
 
        $(DOCBOOKTOHTML)
154
 
 
155
133
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
156
134
                legalnotice.xml
157
135
        $(DOCBOOKTOMAN)
179
157
 
180
158
# Update all these files with version number $(version)
181
159
common.ent: Makefile
182
 
        $(strip $(SED) --in-place \
 
160
        $(SED) --in-place \
183
161
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
184
 
                $@)
 
162
                $@
185
163
 
186
164
mandos: Makefile
187
 
        $(strip $(SED) --in-place \
 
165
        $(SED) --in-place \
188
166
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
189
 
                $@)
 
167
                $@
190
168
 
191
169
mandos-keygen: Makefile
192
 
        $(strip $(SED) --in-place \
 
170
        $(SED) --in-place \
193
171
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
194
 
                $@)
 
172
                $@
195
173
 
196
174
mandos-ctl: Makefile
197
 
        $(strip $(SED) --in-place \
198
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
199
 
                $@)
200
 
 
201
 
mandos-monitor: Makefile
202
 
        $(strip $(SED) --in-place \
203
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
204
 
                $@)
 
175
        $(SED) --in-place \
 
176
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
177
                $@
205
178
 
206
179
mandos.lsm: Makefile
207
 
        $(strip $(SED) --in-place \
 
180
        $(SED) --in-place \
208
181
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
209
 
                $@)
210
 
        $(strip $(SED) --in-place \
 
182
                $@
 
183
        $(SED) --in-place \
211
184
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
212
 
                $@)
213
 
        $(strip $(SED) --in-place \
 
185
                $@
 
186
        $(SED) --in-place \
214
187
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
215
 
                $@)
 
188
                $@
216
189
 
217
 
plugins.d/mandos-client: plugins.d/mandos-client.c
218
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
219
 
                ) $(GPGME_LIBS) $(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 $@
220
193
 
221
194
.PHONY : all doc html clean distclean run-client run-server install \
222
195
        install-server install-client uninstall uninstall-server \
235
208
 
236
209
# Run the client with a local config and key
237
210
run-client: all keydir/seckey.txt keydir/pubkey.txt
238
 
        @echo "###################################################################"
239
 
        @echo "# The following error messages are harmless and can be safely     #"
240
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
241
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
242
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
243
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
244
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
245
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
246
 
        @echo "#                     seteuid: Operation not permitted            #"
247
 
        @echo "#                     klogctl: Operation not permitted            #"
248
 
        @echo "###################################################################"
249
211
        ./plugin-runner --plugin-dir=plugins.d \
250
212
                --config-file=plugin-runner.conf \
251
213
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
258
220
 
259
221
# Run the server with a local config
260
222
run-server: confdir/mandos.conf confdir/clients.conf
261
 
        @echo "#################################################################"
262
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
263
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
264
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
265
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
266
 
        @echo "#################################################################"
267
223
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
268
224
 
269
225
# Used by run-server
286
242
install-server: doc
287
243
        install --directory $(CONFDIR)
288
244
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
289
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
290
 
                mandos-ctl
291
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
 
                mandos-monitor
293
245
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
294
246
                mandos.conf
295
247
        install --mode=u=rw --target-directory=$(CONFDIR) \
296
248
                clients.conf
297
 
        install --mode=u=rw,go=r dbus-mandos.conf \
298
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
299
249
        install --mode=u=rwx,go=rx init.d-mandos \
300
250
                $(DESTDIR)/etc/init.d/mandos
301
251
        install --mode=u=rw,go=r default-mandos \
305
255
        fi
306
256
        gzip --best --to-stdout mandos.8 \
307
257
                > $(MANDIR)/man8/mandos.8.gz
308
 
        gzip --best --to-stdout mandos-monitor.8 \
309
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
310
 
        gzip --best --to-stdout mandos-ctl.8 \
311
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
312
258
        gzip --best --to-stdout mandos.conf.5 \
313
259
                > $(MANDIR)/man5/mandos.conf.5.gz
314
260
        gzip --best --to-stdout mandos-clients.conf.5 \
341
287
        install --mode=u=rwxs,go=rx \
342
288
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
343
289
                plugins.d/askpass-fifo
344
 
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
 
                plugins.d/plymouth
347
290
        install initramfs-tools-hook \
348
291
                $(INITRAMFSTOOLS)/hooks/mandos
349
292
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
355
298
                > $(MANDIR)/man8/mandos-keygen.8.gz
356
299
        gzip --best --to-stdout plugin-runner.8mandos \
357
300
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
301
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
302
                > $(MANDIR)/man8/password-prompt.8mandos.gz
358
303
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
359
304
                > $(MANDIR)/man8/mandos-client.8mandos.gz
360
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
361
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
362
305
        gzip --best --to-stdout plugins.d/usplash.8mandos \
363
306
                > $(MANDIR)/man8/usplash.8mandos.gz
364
307
        gzip --best --to-stdout plugins.d/splashy.8mandos \
365
308
                > $(MANDIR)/man8/splashy.8mandos.gz
366
309
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
367
310
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
369
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
370
311
 
371
312
install-client: install-client-nokey
372
313
# Post-installation stuff
378
319
 
379
320
uninstall-server:
380
321
        -rm --force $(PREFIX)/sbin/mandos \
381
 
                $(PREFIX)/sbin/mandos-ctl \
382
 
                $(PREFIX)/sbin/mandos-monitor \
383
322
                $(MANDIR)/man8/mandos.8.gz \
384
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
385
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
386
323
                $(MANDIR)/man5/mandos.conf.5.gz \
387
324
                $(MANDIR)/man5/mandos-clients.conf.5.gz
388
325
        update-rc.d -f mandos remove
400
337
                $(PREFIX)/lib/mandos/plugins.d/usplash \
401
338
                $(PREFIX)/lib/mandos/plugins.d/splashy \
402
339
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
403
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
404
340
                $(INITRAMFSTOOLS)/hooks/mandos \
405
341
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
406
342
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
343
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
407
344
                $(MANDIR)/man8/mandos-keygen.8.gz \
408
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
409
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
410
345
                $(MANDIR)/man8/password-prompt.8mandos.gz \
411
346
                $(MANDIR)/man8/usplash.8mandos.gz \
412
347
                $(MANDIR)/man8/splashy.8mandos.gz \
413
348
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
414
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
349
                $(MANDIR)/man8/mandos-client.8mandos.gz
415
350
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
416
351
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
417
352
        update-initramfs -k all -u
420
355
 
421
356
purge-server: uninstall-server
422
357
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
423
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
424
358
                $(DESTDIR)/etc/default/mandos \
425
359
                $(DESTDIR)/etc/init.d/mandos \
426
360
                $(DESTDIR)/var/run/mandos.pid