/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

* init.d-mandos: Bug fix: Correct the LSB header.

* mandos.xml (CHECKING): Add text about client disabling requiring
                         manual intervention to reverse.

* plugin-runner.c: Cast return value of TEMP_FAILURE_RETRY to "int"
                   where necessary.

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.3.1
 
19
version=1.0.11
27
20
SED=sed
28
21
 
29
22
## Use these settings for a traditional /usr/local install
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 $@))
 
61
        $(MANPOST) $(notdir $@)
69
62
# DocBook-to-man post-processing to fix a '\n' escape bug
70
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
64
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
66
        --param make.year.ranges                1 \
74
67
        --param make.single.year.ranges         1 \
75
68
        --param man.output.quietly              1 \
77
70
        --param citerefentry.link               1 \
78
71
        --output $@ \
79
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
81
74
# Fix citerefentry links
82
75
HTMLPOST=$(SED) --in-place \
83
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'
84
77
 
85
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
80
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 \
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
92
83
        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
 
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
96
87
 
97
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
89
 
119
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
111
        $(DOCBOOKTOHTML)
121
112
 
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
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
128
114
                legalnotice.xml
129
115
        $(DOCBOOKTOMAN)
138
124
                 legalnotice.xml
139
125
        $(DOCBOOKTOHTML)
140
126
 
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
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
156
128
                legalnotice.xml
157
129
        $(DOCBOOKTOMAN)
179
151
 
180
152
# Update all these files with version number $(version)
181
153
common.ent: Makefile
182
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
183
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
184
 
                $@)
 
156
                $@
185
157
 
186
158
mandos: Makefile
187
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
188
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
189
 
                $@)
 
161
                $@
190
162
 
191
163
mandos-keygen: Makefile
192
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
193
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
194
 
                $@)
 
166
                $@
195
167
 
196
168
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
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
205
172
 
206
173
mandos.lsm: Makefile
207
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
208
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
209
 
                $@)
210
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
211
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
212
 
                $@)
213
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
214
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
215
 
                $@)
 
182
                $@
216
183
 
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 $@
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
220
187
 
221
188
.PHONY : all doc html clean distclean run-client run-server install \
222
189
        install-server install-client uninstall uninstall-server \
235
202
 
236
203
# Run the client with a local config and key
237
204
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
205
        ./plugin-runner --plugin-dir=plugins.d \
250
206
                --config-file=plugin-runner.conf \
251
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
258
214
 
259
215
# Run the server with a local config
260
216
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
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
268
218
 
269
219
# Used by run-server
286
236
install-server: doc
287
237
        install --directory $(CONFDIR)
288
238
        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
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
294
240
                mandos.conf
295
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
296
242
                clients.conf
297
 
        install --mode=u=rw,go=r dbus-mandos.conf \
298
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
299
243
        install --mode=u=rwx,go=rx init.d-mandos \
300
244
                $(DESTDIR)/etc/init.d/mandos
301
245
        install --mode=u=rw,go=r default-mandos \
305
249
        fi
306
250
        gzip --best --to-stdout mandos.8 \
307
251
                > $(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
252
        gzip --best --to-stdout mandos.conf.5 \
313
253
                > $(MANDIR)/man5/mandos.conf.5.gz
314
254
        gzip --best --to-stdout mandos-clients.conf.5 \
341
281
        install --mode=u=rwxs,go=rx \
342
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
343
283
                plugins.d/askpass-fifo
344
 
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
 
                plugins.d/plymouth
347
284
        install initramfs-tools-hook \
348
285
                $(INITRAMFSTOOLS)/hooks/mandos
349
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
355
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
356
293
        gzip --best --to-stdout plugin-runner.8mandos \
357
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
358
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
359
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
360
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
361
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
362
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
363
300
                > $(MANDIR)/man8/usplash.8mandos.gz
364
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
365
302
                > $(MANDIR)/man8/splashy.8mandos.gz
366
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
367
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
369
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
370
305
 
371
306
install-client: install-client-nokey
372
307
# Post-installation stuff
378
313
 
379
314
uninstall-server:
380
315
        -rm --force $(PREFIX)/sbin/mandos \
381
 
                $(PREFIX)/sbin/mandos-ctl \
382
 
                $(PREFIX)/sbin/mandos-monitor \
383
316
                $(MANDIR)/man8/mandos.8.gz \
384
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
385
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
386
317
                $(MANDIR)/man5/mandos.conf.5.gz \
387
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
388
319
        update-rc.d -f mandos remove
400
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
401
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
402
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
403
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
404
334
                $(INITRAMFSTOOLS)/hooks/mandos \
405
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
406
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
407
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
408
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
409
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
410
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
411
340
                $(MANDIR)/man8/usplash.8mandos.gz \
412
341
                $(MANDIR)/man8/splashy.8mandos.gz \
413
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
414
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
415
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
416
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
417
346
        update-initramfs -k all -u
420
349
 
421
350
purge-server: uninstall-server
422
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
423
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
424
352
                $(DESTDIR)/etc/default/mandos \
425
353
                $(DESTDIR)/etc/init.d/mandos \
426
354
                $(DESTDIR)/var/run/mandos.pid