/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-10-03 09:32:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.

* Makefile (FORTIFY): Added "-fstack-protector-all".
  (mandos, mandos-keygen): Use more strict regexps when updating the
                           version number.

* mandos (Client.__init__): Use os.path.expandvars() and
                            os.path.expanduser() on the "secfile"
                            config value.

* plugins.d/splashy.c: Update comments and order of #include's.
  (main): Check user and group when looking for running splashy
          process.  Do not ignore ENOENT from execl().  Use _exit()
          instead of "return" when an error happens in child
          processes.  Bug fix: Only wait for splashy_update
          completion if it was started.  Bug fix: detect failing
          waitpid().  Only kill splashy_update if it is running.  Do
          the killing of the old splashy process before the fork().
          Do setsid() and setuid(geteuid()) before starting the new
          splashy.  Report failing execl().

* plugins.d/usplash.c: Update comments and order of #include's.
  (main): Check user and group when looking for running usplash
          process.  Do not report execv() error if interrupted by a
          signal.

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=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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 \
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
22
13
#COVERAGE=--coverage
23
14
OPTIMIZE=-Os
24
15
LANGUAGE=-std=gnu99
25
16
htmldir=man
26
 
version=1.4.1
 
17
version=1.0
27
18
SED=sed
28
19
 
29
20
## Use these settings for a traditional /usr/local install
42
33
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
34
##
44
35
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
36
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
37
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
38
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
39
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
40
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
41
GPGME_LIBS=$(shell gpgme-config --libs)
52
42
 
53
43
# Do not change these two
54
44
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
45
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
46
        -DVERSION='"$(version)"'
57
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
LDFLAGS=$(COVERAGE)
58
48
 
59
49
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
50
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
51
        --param man.charmap.use.subset          0 \
62
52
        --param make.year.ranges                1 \
63
53
        --param make.single.year.ranges         1 \
65
55
        --param man.authors.section.enabled     0 \
66
56
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
57
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
58
        $(MANPOST) $(notdir $@)
71
59
# DocBook-to-man post-processing to fix a '\n' escape bug
72
60
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
61
 
74
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
62
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
75
63
        --param make.year.ranges                1 \
76
64
        --param make.single.year.ranges         1 \
77
65
        --param man.output.quietly              1 \
79
67
        --param citerefentry.link               1 \
80
68
        --output $@ \
81
69
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
82
 
        $<; $(HTMLPOST) $@)
 
70
        $<; $(HTMLPOST) $@
83
71
# Fix citerefentry links
84
 
HTMLPOST=$(SED) --in-place \
85
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
72
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'
86
73
 
87
74
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
88
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
89
 
        plugins.d/plymouth
 
75
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
90
76
CPROGS=plugin-runner $(PLUGINS)
91
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
77
PROGS=mandos mandos-keygen $(CPROGS)
 
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
94
79
        plugins.d/mandos-client.8mandos \
95
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
96
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
97
 
        plugins.d/plymouth.8mandos intro.8mandos
 
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
81
        mandos-clients.conf.5
98
82
 
99
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
100
84
 
101
85
objects=$(addsuffix .o,$(CPROGS))
102
86
 
103
 
all: $(PROGS) mandos.lsm
 
87
all: $(PROGS)
104
88
 
105
89
doc: $(DOCS)
106
90
 
121
105
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
122
106
        $(DOCBOOKTOHTML)
123
107
 
124
 
intro.8mandos: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOMAN)
126
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
108
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
130
109
                legalnotice.xml
131
110
        $(DOCBOOKTOMAN)
140
119
                 legalnotice.xml
141
120
        $(DOCBOOKTOHTML)
142
121
 
143
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
144
 
                legalnotice.xml
145
 
        $(DOCBOOKTOMAN)
146
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
147
 
                 legalnotice.xml
148
 
        $(DOCBOOKTOHTML)
149
 
 
150
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
122
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
158
123
                legalnotice.xml
159
124
        $(DOCBOOKTOMAN)
181
146
 
182
147
# Update all these files with version number $(version)
183
148
common.ent: Makefile
184
 
        $(strip $(SED) --in-place \
185
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
186
 
                $@)
 
149
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
187
150
 
188
151
mandos: Makefile
189
 
        $(strip $(SED) --in-place \
190
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
191
 
                $@)
 
152
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
192
153
 
193
154
mandos-keygen: Makefile
194
 
        $(strip $(SED) --in-place \
195
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
196
 
                $@)
197
 
 
198
 
mandos-ctl: Makefile
199
 
        $(strip $(SED) --in-place \
200
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
201
 
                $@)
202
 
 
203
 
mandos-monitor: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
207
 
 
208
 
mandos.lsm: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
211
 
                $@)
212
 
        $(strip $(SED) --in-place \
213
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
214
 
                $@)
215
 
        $(strip $(SED) --in-place \
216
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
217
 
                $@)
218
 
 
219
 
plugins.d/mandos-client: plugins.d/mandos-client.c
220
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
155
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
156
 
 
157
plugins.d/mandos-client: plugins.d/mandos-client.o
 
158
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
159
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
222
160
 
223
161
.PHONY : all doc html clean distclean run-client run-server install \
224
162
        install-server install-client uninstall uninstall-server \
237
175
 
238
176
# Run the client with a local config and key
239
177
run-client: all keydir/seckey.txt keydir/pubkey.txt
240
 
        @echo "###################################################################"
241
 
        @echo "# The following error messages are harmless and can be safely     #"
242
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
243
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
244
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
245
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
246
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
247
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
248
 
        @echo "#                     seteuid: Operation not permitted            #"
249
 
        @echo "#                     klogctl: Operation not permitted            #"
250
 
        @echo "###################################################################"
251
178
        ./plugin-runner --plugin-dir=plugins.d \
252
179
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
254
 
                $(CLIENTARGS)
 
180
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
255
181
 
256
182
# Used by run-client
257
183
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
260
186
 
261
187
# Run the server with a local config
262
188
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
268
 
        @echo "#################################################################"
269
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
189
        ./mandos --debug --configdir=confdir
270
190
 
271
191
# Used by run-server
272
192
confdir/mandos.conf: mandos.conf
280
200
 
281
201
install: install-server install-client-nokey
282
202
 
283
 
install-html: html
 
203
install-html: $(htmldocs)
284
204
        install --directory $(htmldir)
285
205
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
286
206
                $(htmldocs)
288
208
install-server: doc
289
209
        install --directory $(CONFDIR)
290
210
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
291
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
 
                mandos-ctl
293
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
294
 
                mandos-monitor
295
211
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
296
212
                mandos.conf
297
213
        install --mode=u=rw --target-directory=$(CONFDIR) \
298
214
                clients.conf
299
 
        install --mode=u=rw,go=r dbus-mandos.conf \
300
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
301
215
        install --mode=u=rwx,go=rx init.d-mandos \
302
216
                $(DESTDIR)/etc/init.d/mandos
303
217
        install --mode=u=rw,go=r default-mandos \
307
221
        fi
308
222
        gzip --best --to-stdout mandos.8 \
309
223
                > $(MANDIR)/man8/mandos.8.gz
310
 
        gzip --best --to-stdout mandos-monitor.8 \
311
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
312
 
        gzip --best --to-stdout mandos-ctl.8 \
313
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
314
224
        gzip --best --to-stdout mandos.conf.5 \
315
225
                > $(MANDIR)/man5/mandos.conf.5.gz
316
226
        gzip --best --to-stdout mandos-clients.conf.5 \
343
253
        install --mode=u=rwxs,go=rx \
344
254
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
345
255
                plugins.d/askpass-fifo
346
 
        install --mode=u=rwxs,go=rx \
347
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
348
 
                plugins.d/plymouth
349
256
        install initramfs-tools-hook \
350
257
                $(INITRAMFSTOOLS)/hooks/mandos
351
258
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
352
259
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
353
260
        install initramfs-tools-script \
354
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
261
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
355
262
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
356
263
        gzip --best --to-stdout mandos-keygen.8 \
357
264
                > $(MANDIR)/man8/mandos-keygen.8.gz
358
265
        gzip --best --to-stdout plugin-runner.8mandos \
359
266
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
267
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
360
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
361
270
                > $(MANDIR)/man8/mandos-client.8mandos.gz
362
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
363
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
364
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
365
 
                > $(MANDIR)/man8/usplash.8mandos.gz
366
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
367
 
                > $(MANDIR)/man8/splashy.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
369
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
370
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
371
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
372
271
 
373
272
install-client: install-client-nokey
374
273
# Post-installation stuff
380
279
 
381
280
uninstall-server:
382
281
        -rm --force $(PREFIX)/sbin/mandos \
383
 
                $(PREFIX)/sbin/mandos-ctl \
384
 
                $(PREFIX)/sbin/mandos-monitor \
385
282
                $(MANDIR)/man8/mandos.8.gz \
386
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
387
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
388
283
                $(MANDIR)/man5/mandos.conf.5.gz \
389
284
                $(MANDIR)/man5/mandos-clients.conf.5.gz
390
285
        update-rc.d -f mandos remove
401
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
402
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
403
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
404
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
405
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
406
299
                $(INITRAMFSTOOLS)/hooks/mandos \
407
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
408
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
409
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
410
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
 
304
                $(MANDIR)/man8/password-prompt.8mandos.gz \
411
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
412
 
                $(MANDIR)/man8/password-prompt.8mandos.gz \
413
 
                $(MANDIR)/man8/usplash.8mandos.gz \
414
 
                $(MANDIR)/man8/splashy.8mandos.gz \
415
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
416
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
417
306
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
418
307
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
419
308
        update-initramfs -k all -u
422
311
 
423
312
purge-server: uninstall-server
424
313
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
425
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
426
314
                $(DESTDIR)/etc/default/mandos \
427
315
                $(DESTDIR)/etc/init.d/mandos \
428
316
                $(DESTDIR)/var/run/mandos.pid