/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 \
8
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.3.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 $@))
 
58
        $(MANPOST) $(notdir $@)
69
59
# DocBook-to-man post-processing to fix a '\n' escape bug
70
60
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
61
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
62
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
63
        --param make.year.ranges                1 \
74
64
        --param make.single.year.ranges         1 \
75
65
        --param man.output.quietly              1 \
77
67
        --param citerefentry.link               1 \
78
68
        --output $@ \
79
69
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
70
        $<; $(HTMLPOST) $@
81
71
# Fix citerefentry links
82
 
HTMLPOST=$(SED) --in-place \
83
 
        --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'
84
73
 
85
74
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
75
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
76
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 \
 
77
PROGS=mandos mandos-keygen $(CPROGS)
 
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
92
79
        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
 
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
81
        mandos-clients.conf.5
96
82
 
97
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
84
 
99
85
objects=$(addsuffix .o,$(CPROGS))
100
86
 
101
 
all: $(PROGS) mandos.lsm
 
87
all: $(PROGS)
102
88
 
103
89
doc: $(DOCS)
104
90
 
119
105
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
106
        $(DOCBOOKTOHTML)
121
107
 
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
108
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
128
109
                legalnotice.xml
129
110
        $(DOCBOOKTOMAN)
138
119
                 legalnotice.xml
139
120
        $(DOCBOOKTOHTML)
140
121
 
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
122
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
156
123
                legalnotice.xml
157
124
        $(DOCBOOKTOMAN)
179
146
 
180
147
# Update all these files with version number $(version)
181
148
common.ent: Makefile
182
 
        $(strip $(SED) --in-place \
183
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
184
 
                $@)
 
149
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
185
150
 
186
151
mandos: Makefile
187
 
        $(strip $(SED) --in-place \
188
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
189
 
                $@)
 
152
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
190
153
 
191
154
mandos-keygen: Makefile
192
 
        $(strip $(SED) --in-place \
193
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
194
 
                $@)
195
 
 
196
 
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
 
                $@)
205
 
 
206
 
mandos.lsm: Makefile
207
 
        $(strip $(SED) --in-place \
208
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
209
 
                $@)
210
 
        $(strip $(SED) --in-place \
211
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
212
 
                $@)
213
 
        $(strip $(SED) --in-place \
214
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
215
 
                $@)
216
 
 
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 $@
 
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 $@
220
160
 
221
161
.PHONY : all doc html clean distclean run-client run-server install \
222
162
        install-server install-client uninstall uninstall-server \
235
175
 
236
176
# Run the client with a local config and key
237
177
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
178
        ./plugin-runner --plugin-dir=plugins.d \
250
179
                --config-file=plugin-runner.conf \
251
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
252
 
                $(CLIENTARGS)
 
180
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
253
181
 
254
182
# Used by run-client
255
183
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
258
186
 
259
187
# Run the server with a local config
260
188
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
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
189
        ./mandos --debug --configdir=confdir
268
190
 
269
191
# Used by run-server
270
192
confdir/mandos.conf: mandos.conf
278
200
 
279
201
install: install-server install-client-nokey
280
202
 
281
 
install-html: html
 
203
install-html: $(htmldocs)
282
204
        install --directory $(htmldir)
283
205
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
284
206
                $(htmldocs)
286
208
install-server: doc
287
209
        install --directory $(CONFDIR)
288
210
        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
211
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
294
212
                mandos.conf
295
213
        install --mode=u=rw --target-directory=$(CONFDIR) \
296
214
                clients.conf
297
 
        install --mode=u=rw,go=r dbus-mandos.conf \
298
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
299
215
        install --mode=u=rwx,go=rx init.d-mandos \
300
216
                $(DESTDIR)/etc/init.d/mandos
301
217
        install --mode=u=rw,go=r default-mandos \
305
221
        fi
306
222
        gzip --best --to-stdout mandos.8 \
307
223
                > $(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
224
        gzip --best --to-stdout mandos.conf.5 \
313
225
                > $(MANDIR)/man5/mandos.conf.5.gz
314
226
        gzip --best --to-stdout mandos-clients.conf.5 \
341
253
        install --mode=u=rwxs,go=rx \
342
254
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
343
255
                plugins.d/askpass-fifo
344
 
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
 
                plugins.d/plymouth
347
256
        install initramfs-tools-hook \
348
257
                $(INITRAMFSTOOLS)/hooks/mandos
349
258
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
350
259
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
351
260
        install initramfs-tools-script \
352
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
261
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
353
262
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
354
263
        gzip --best --to-stdout mandos-keygen.8 \
355
264
                > $(MANDIR)/man8/mandos-keygen.8.gz
356
265
        gzip --best --to-stdout plugin-runner.8mandos \
357
266
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
267
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
358
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
359
270
                > $(MANDIR)/man8/mandos-client.8mandos.gz
360
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
361
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
362
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
363
 
                > $(MANDIR)/man8/usplash.8mandos.gz
364
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
365
 
                > $(MANDIR)/man8/splashy.8mandos.gz
366
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
367
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
369
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
370
271
 
371
272
install-client: install-client-nokey
372
273
# Post-installation stuff
378
279
 
379
280
uninstall-server:
380
281
        -rm --force $(PREFIX)/sbin/mandos \
381
 
                $(PREFIX)/sbin/mandos-ctl \
382
 
                $(PREFIX)/sbin/mandos-monitor \
383
282
                $(MANDIR)/man8/mandos.8.gz \
384
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
385
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
386
283
                $(MANDIR)/man5/mandos.conf.5.gz \
387
284
                $(MANDIR)/man5/mandos-clients.conf.5.gz
388
285
        update-rc.d -f mandos remove
399
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
400
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
401
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
402
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
403
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
404
299
                $(INITRAMFSTOOLS)/hooks/mandos \
405
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
406
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
407
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
408
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
 
304
                $(MANDIR)/man8/password-prompt.8mandos.gz \
409
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
410
 
                $(MANDIR)/man8/password-prompt.8mandos.gz \
411
 
                $(MANDIR)/man8/usplash.8mandos.gz \
412
 
                $(MANDIR)/man8/splashy.8mandos.gz \
413
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
414
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
415
306
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
416
307
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
417
308
        update-initramfs -k all -u
420
311
 
421
312
purge-server: uninstall-server
422
313
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
423
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
424
314
                $(DESTDIR)/etc/default/mandos \
425
315
                $(DESTDIR)/etc/init.d/mandos \
426
316
                $(DESTDIR)/var/run/mandos.pid