/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 at bsnet
  • Date: 2010-09-24 18:33:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100924183339-268yiitwo9yjp3gj
* plugins.d/plymouth.c: Break lines, fix whitespace.  Remove
                        unnecessary casts.

  (main) Exit with EX_UNAVAILABLE if plymouth is not found.  Use first
         argument of error() where useful.  Simplify logic of checking
         results of running the ask-for-password command.  Simplify
         assigning value to "plymouthd_argv".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
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>.
12
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
14
LINK_FORTIFY_LD=-z relro -z now
14
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
15
18
ifndef BROKEN_PIE
16
19
FORTIFY += -fPIE
17
 
LINK_FORTIFY_LD += -fPIE
18
20
LINK_FORTIFY += -pie
19
21
endif
20
22
#COVERAGE=--coverage
21
23
OPTIMIZE=-Os
22
24
LANGUAGE=-std=gnu99
23
25
htmldir=man
24
 
version=1.0.13
 
26
version=1.0.14
25
27
SED=sed
26
28
 
27
29
## Use these settings for a traditional /usr/local install
55
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
56
58
 
57
59
# Commands to format a DocBook <refentry> document into a manual page
58
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
59
61
        --param man.charmap.use.subset          0 \
60
62
        --param make.year.ranges                1 \
61
63
        --param make.single.year.ranges         1 \
63
65
        --param man.authors.section.enabled     0 \
64
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
65
67
        $(notdir $<); \
66
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
67
69
# DocBook-to-man post-processing to fix a '\n' escape bug
68
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
69
71
 
70
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
71
73
        --param make.year.ranges                1 \
72
74
        --param make.single.year.ranges         1 \
73
75
        --param man.output.quietly              1 \
75
77
        --param citerefentry.link               1 \
76
78
        --output $@ \
77
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
78
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
79
81
# Fix citerefentry links
80
82
HTMLPOST=$(SED) --in-place \
81
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'
82
84
 
83
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
84
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
87
        plugins.d/plymouth
85
88
CPROGS=plugin-runner $(PLUGINS)
86
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
87
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
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 \
88
92
        plugins.d/mandos-client.8mandos \
89
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
90
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
91
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
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
92
96
 
93
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
94
98
 
129
133
                 legalnotice.xml
130
134
        $(DOCBOOKTOHTML)
131
135
 
 
136
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
137
                legalnotice.xml
 
138
        $(DOCBOOKTOMAN)
 
139
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
140
                 legalnotice.xml
 
141
        $(DOCBOOKTOHTML)
 
142
 
 
143
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
144
                legalnotice.xml
 
145
        $(DOCBOOKTOMAN)
 
146
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
147
                 legalnotice.xml
 
148
        $(DOCBOOKTOHTML)
 
149
 
132
150
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
133
151
                legalnotice.xml
134
152
        $(DOCBOOKTOMAN)
156
174
 
157
175
# Update all these files with version number $(version)
158
176
common.ent: Makefile
159
 
        $(SED) --in-place \
 
177
        $(strip $(SED) --in-place \
160
178
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
161
 
                $@
 
179
                $@)
162
180
 
163
181
mandos: Makefile
164
 
        $(SED) --in-place \
 
182
        $(strip $(SED) --in-place \
165
183
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
184
                $@)
167
185
 
168
186
mandos-keygen: Makefile
169
 
        $(SED) --in-place \
 
187
        $(strip $(SED) --in-place \
170
188
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
189
                $@)
172
190
 
173
191
mandos-ctl: Makefile
174
 
        $(SED) --in-place \
175
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
 
                $@
 
192
        $(strip $(SED) --in-place \
 
193
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
194
                $@)
 
195
 
 
196
mandos-monitor: Makefile
 
197
        $(strip $(SED) --in-place \
 
198
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
199
                $@)
177
200
 
178
201
mandos.lsm: Makefile
179
 
        $(SED) --in-place \
 
202
        $(strip $(SED) --in-place \
180
203
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
181
 
                $@
182
 
        $(SED) --in-place \
 
204
                $@)
 
205
        $(strip $(SED) --in-place \
183
206
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
 
                $@
185
 
        $(SED) --in-place \
 
207
                $@)
 
208
        $(strip $(SED) --in-place \
186
209
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
 
210
                $@)
188
211
 
189
 
plugins.d/mandos-client: plugins.d/mandos-client.o
190
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
191
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
212
plugins.d/mandos-client: plugins.d/mandos-client.c
 
213
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
214
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
192
215
 
193
216
.PHONY : all doc html clean distclean run-client run-server install \
194
217
        install-server install-client uninstall uninstall-server \
207
230
 
208
231
# Run the client with a local config and key
209
232
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
233
        @echo "###################################################################"
 
234
        @echo "# The following error messages are harmless and can be safely     #"
 
235
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
236
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
237
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
238
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
239
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
240
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
241
        @echo "#                     seteuid: Operation not permitted            #"
 
242
        @echo "#                     klogctl: Operation not permitted            #"
 
243
        @echo "###################################################################"
210
244
        ./plugin-runner --plugin-dir=plugins.d \
211
245
                --config-file=plugin-runner.conf \
212
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
219
253
 
220
254
# Run the server with a local config
221
255
run-server: confdir/mandos.conf confdir/clients.conf
 
256
        @echo "#################################################################"
 
257
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
258
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
259
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
260
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
261
        @echo "#################################################################"
222
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
223
263
 
224
264
# Used by run-server
241
281
install-server: doc
242
282
        install --directory $(CONFDIR)
243
283
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
284
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
285
                mandos-ctl
 
286
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
287
                mandos-monitor
244
288
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
245
289
                mandos.conf
246
290
        install --mode=u=rw --target-directory=$(CONFDIR) \
247
291
                clients.conf
 
292
        install --mode=u=rw,go=r dbus-mandos.conf \
 
293
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
248
294
        install --mode=u=rwx,go=rx init.d-mandos \
249
295
                $(DESTDIR)/etc/init.d/mandos
250
296
        install --mode=u=rw,go=r default-mandos \
254
300
        fi
255
301
        gzip --best --to-stdout mandos.8 \
256
302
                > $(MANDIR)/man8/mandos.8.gz
 
303
        gzip --best --to-stdout mandos-monitor.8 \
 
304
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
305
        gzip --best --to-stdout mandos-ctl.8 \
 
306
                > $(MANDIR)/man8/mandos-ctl.8.gz
257
307
        gzip --best --to-stdout mandos.conf.5 \
258
308
                > $(MANDIR)/man5/mandos.conf.5.gz
259
309
        gzip --best --to-stdout mandos-clients.conf.5 \
286
336
        install --mode=u=rwxs,go=rx \
287
337
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
288
338
                plugins.d/askpass-fifo
 
339
        install --mode=u=rwxs,go=rx \
 
340
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
341
                plugins.d/plymouth
289
342
        install initramfs-tools-hook \
290
343
                $(INITRAMFSTOOLS)/hooks/mandos
291
344
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
297
350
                > $(MANDIR)/man8/mandos-keygen.8.gz
298
351
        gzip --best --to-stdout plugin-runner.8mandos \
299
352
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
353
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
354
                > $(MANDIR)/man8/mandos-client.8mandos.gz
300
355
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
301
356
                > $(MANDIR)/man8/password-prompt.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
303
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
304
357
        gzip --best --to-stdout plugins.d/usplash.8mandos \
305
358
                > $(MANDIR)/man8/usplash.8mandos.gz
306
359
        gzip --best --to-stdout plugins.d/splashy.8mandos \
307
360
                > $(MANDIR)/man8/splashy.8mandos.gz
308
361
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
309
362
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
363
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
364
                > $(MANDIR)/man8/plymouth.8mandos.gz
310
365
 
311
366
install-client: install-client-nokey
312
367
# Post-installation stuff
318
373
 
319
374
uninstall-server:
320
375
        -rm --force $(PREFIX)/sbin/mandos \
 
376
                $(PREFIX)/sbin/mandos-ctl \
 
377
                $(PREFIX)/sbin/mandos-monitor \
321
378
                $(MANDIR)/man8/mandos.8.gz \
 
379
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
380
                $(MANDIR)/man8/mandos-ctl.8.gz \
322
381
                $(MANDIR)/man5/mandos.conf.5.gz \
323
382
                $(MANDIR)/man5/mandos-clients.conf.5.gz
324
383
        update-rc.d -f mandos remove
336
395
                $(PREFIX)/lib/mandos/plugins.d/usplash \
337
396
                $(PREFIX)/lib/mandos/plugins.d/splashy \
338
397
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
398
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
339
399
                $(INITRAMFSTOOLS)/hooks/mandos \
340
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
341
401
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
402
                $(MANDIR)/man8/mandos-keygen.8.gz \
342
403
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
343
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
404
                $(MANDIR)/man8/mandos-client.8mandos.gz
344
405
                $(MANDIR)/man8/password-prompt.8mandos.gz \
345
406
                $(MANDIR)/man8/usplash.8mandos.gz \
346
407
                $(MANDIR)/man8/splashy.8mandos.gz \
347
408
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
348
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
409
                $(MANDIR)/man8/plymouth.8mandos.gz \
349
410
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
350
411
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
351
412
        update-initramfs -k all -u
354
415
 
355
416
purge-server: uninstall-server
356
417
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
418
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
357
419
                $(DESTDIR)/etc/default/mandos \
358
420
                $(DESTDIR)/etc/init.d/mandos \
359
421
                $(DESTDIR)/var/run/mandos.pid