/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 (Required-Start, Required-Stop): Bug fix: Added
                 "$syslog", thanks to Petter Reinholdtsen
                 <pere@hungry.com> (Debian bug #546928).

* initramfs-tools-script: Removed erroneous comment.

* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
                            not needed.

* plugins.d/mandos-client.c (main): Bug fix: Initialize
                                    "old_sigterm_action".

* plugins.d/splashy.c (main): Bug fix: really check return value from
                              "sigaddset".  Fix some warnings on
                              64-bit systems.

* plugins.d/usplash.c (termination_handler, main): Save received
                                                   signal and
                                                   re-raise it on
                                                   exit.
  (usplash_write): Do not close FIFO, instead, take an additional file
                   descriptor pointer to it and open only when needed
                   (all callers changed).  Abort immediately on EINTR.
                   Bug fix:  Add NUL byte on single-word commands.
                   Ignore "interrupted_by_signal".
  (makeprompt, find_usplash): New; broken out from "main()".
  (find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
  (main): Reorganized to jump to a new "failure" label on any error.
          Bug fix: check return values from sigaddset.
          New variable "usplash_accessed" to flag if usplash(8) needs
          to be killed and restarted.  Removed the "an_error_occured"
          variable.

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.1
 
19
version=1.0.11
27
20
SED=sed
28
21
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
22
## Use these settings for a traditional /usr/local install
33
23
# PREFIX=$(DESTDIR)/usr/local
34
24
# CONFDIR=$(DESTDIR)/etc/mandos
35
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
26
# MANDIR=$(PREFIX)/man
37
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
28
##
40
29
 
41
30
## These settings are for a package-type install
44
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
34
MANDIR=$(PREFIX)/share/man
46
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
36
##
49
37
 
50
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
59
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
49
        -DVERSION='"$(version)"'
62
 
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))
63
51
 
64
52
# Commands to format a DocBook <refentry> document into a manual page
65
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
66
54
        --param man.charmap.use.subset          0 \
67
55
        --param make.year.ranges                1 \
68
56
        --param make.single.year.ranges         1 \
70
58
        --param man.authors.section.enabled     0 \
71
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
60
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
76
62
# DocBook-to-man post-processing to fix a '\n' escape bug
77
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
64
 
79
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
80
66
        --param make.year.ranges                1 \
81
67
        --param make.single.year.ranges         1 \
82
68
        --param man.output.quietly              1 \
84
70
        --param citerefentry.link               1 \
85
71
        --output $@ \
86
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
87
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
88
74
# Fix citerefentry links
89
75
HTMLPOST=$(SED) --in-place \
90
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'
91
77
 
92
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
93
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
94
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
95
80
CPROGS=plugin-runner $(PLUGINS)
96
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
97
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
98
 
        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 \
99
83
        plugins.d/mandos-client.8mandos \
100
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
101
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
102
 
        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
103
87
 
104
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
89
 
126
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
111
        $(DOCBOOKTOHTML)
128
112
 
129
 
intro.8mandos: intro.xml common.ent legalnotice.xml
130
 
        $(DOCBOOKTOMAN)
131
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
114
                legalnotice.xml
136
115
        $(DOCBOOKTOMAN)
145
124
                 legalnotice.xml
146
125
        $(DOCBOOKTOHTML)
147
126
 
148
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
149
 
                legalnotice.xml
150
 
        $(DOCBOOKTOMAN)
151
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
152
 
                 legalnotice.xml
153
 
        $(DOCBOOKTOHTML)
154
 
 
155
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
156
 
                legalnotice.xml
157
 
        $(DOCBOOKTOMAN)
158
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
159
 
                 legalnotice.xml
160
 
        $(DOCBOOKTOHTML)
161
 
 
162
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
128
                legalnotice.xml
164
129
        $(DOCBOOKTOMAN)
186
151
 
187
152
# Update all these files with version number $(version)
188
153
common.ent: Makefile
189
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
190
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
191
 
                $@)
 
156
                $@
192
157
 
193
158
mandos: Makefile
194
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
195
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
196
 
                $@)
 
161
                $@
197
162
 
198
163
mandos-keygen: Makefile
199
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
200
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
201
 
                $@)
 
166
                $@
202
167
 
203
168
mandos-ctl: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
207
 
 
208
 
mandos-monitor: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
212
172
 
213
173
mandos.lsm: Makefile
214
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
215
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
216
 
                $@)
217
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
218
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
219
 
                $@)
220
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
221
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
222
 
                $@)
 
182
                $@
223
183
 
224
 
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(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 $@
227
187
 
228
188
.PHONY : all doc html clean distclean run-client run-server install \
229
189
        install-server install-client uninstall uninstall-server \
235
195
distclean: clean
236
196
mostlyclean: clean
237
197
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
198
        -rm --force --recursive keydir confdir
239
199
 
240
200
check:  all
241
201
        ./mandos --check
242
202
 
243
203
# Run the client with a local config and key
244
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
245
 
        @echo "###################################################################"
246
 
        @echo "# The following error messages are harmless and can be safely     #"
247
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
248
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
249
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
250
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
251
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
252
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
253
 
        @echo "#                     seteuid: Operation not permitted            #"
254
 
        @echo "#                     klogctl: Operation not permitted            #"
255
 
        @echo "###################################################################"
256
205
        ./plugin-runner --plugin-dir=plugins.d \
257
206
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
259
208
                $(CLIENTARGS)
260
209
 
261
210
# Used by run-client
265
214
 
266
215
# Run the server with a local config
267
216
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
218
 
271
219
# Used by run-server
272
220
confdir/mandos.conf: mandos.conf
277
225
        install --mode=u=rw $< $@
278
226
# Add a client password
279
227
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
228
 
283
229
install: install-server install-client-nokey
284
230
 
289
235
 
290
236
install-server: doc
291
237
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
295
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
296
 
                mandos-ctl
297
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
298
 
                mandos-monitor
299
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
300
240
                mandos.conf
301
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
302
242
                clients.conf
303
 
        install --mode=u=rw,go=r dbus-mandos.conf \
304
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
243
        install --mode=u=rwx,go=rx init.d-mandos \
306
244
                $(DESTDIR)/etc/init.d/mandos
307
245
        install --mode=u=rw,go=r default-mandos \
311
249
        fi
312
250
        gzip --best --to-stdout mandos.8 \
313
251
                > $(MANDIR)/man8/mandos.8.gz
314
 
        gzip --best --to-stdout mandos-monitor.8 \
315
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
316
 
        gzip --best --to-stdout mandos-ctl.8 \
317
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
318
252
        gzip --best --to-stdout mandos.conf.5 \
319
253
                > $(MANDIR)/man5/mandos.conf.5.gz
320
254
        gzip --best --to-stdout mandos-clients.conf.5 \
328
262
                install --mode=u=rwx \
329
263
                        --directory "$(CONFDIR)/plugins.d"; \
330
264
        fi
331
 
        install --mode=u=rwx,go=rx --directory \
332
 
                "$(CONFDIR)/network-hooks.d"
333
265
        install --mode=u=rwx,go=rx \
334
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
335
267
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
349
281
        install --mode=u=rwxs,go=rx \
350
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
351
283
                plugins.d/askpass-fifo
352
 
        install --mode=u=rwxs,go=rx \
353
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
354
 
                plugins.d/plymouth
355
284
        install initramfs-tools-hook \
356
285
                $(INITRAMFSTOOLS)/hooks/mandos
357
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
363
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
364
293
        gzip --best --to-stdout plugin-runner.8mandos \
365
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
366
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
367
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
369
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
370
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
371
300
                > $(MANDIR)/man8/usplash.8mandos.gz
372
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
373
302
                > $(MANDIR)/man8/splashy.8mandos.gz
374
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
375
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
376
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
377
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
378
305
 
379
306
install-client: install-client-nokey
380
307
# Post-installation stuff
386
313
 
387
314
uninstall-server:
388
315
        -rm --force $(PREFIX)/sbin/mandos \
389
 
                $(PREFIX)/sbin/mandos-ctl \
390
 
                $(PREFIX)/sbin/mandos-monitor \
391
316
                $(MANDIR)/man8/mandos.8.gz \
392
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
393
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
394
317
                $(MANDIR)/man5/mandos.conf.5.gz \
395
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
396
319
        update-rc.d -f mandos remove
408
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
409
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
410
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
411
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
412
334
                $(INITRAMFSTOOLS)/hooks/mandos \
413
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
414
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
415
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
416
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
418
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
419
340
                $(MANDIR)/man8/usplash.8mandos.gz \
420
341
                $(MANDIR)/man8/splashy.8mandos.gz \
421
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
422
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
424
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
425
346
        update-initramfs -k all -u
428
349
 
429
350
purge-server: uninstall-server
430
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
431
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
432
352
                $(DESTDIR)/etc/default/mandos \
433
353
                $(DESTDIR)/etc/init.d/mandos \
434
354
                $(DESTDIR)/var/run/mandos.pid