/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: 2011-10-22 00:46:35 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: teddy@recompile.se-20111022004635-3hey47pvet46yccr
* Makefile (run-server): Remove obsolete warning.
* mandos: Clean up and demystify logging.  Add time stamp to console
          debug log messages.
  (AvahiServiceToSyslog): New; only to adjust syslog format.
  (AvahiService.rename): Don't touch syslog logger.
* mandos.xml (BUGS): Remove note about timestamps on console log.

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://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.14
 
26
version=1.4.1
25
27
SED=sed
26
28
 
27
29
## Use these settings for a traditional /usr/local install
52
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
53
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
54
56
        -DVERSION='"$(version)"'
55
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(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 $@);\
 
69
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
70
        --local-file $(notdir $@) >/dev/null)
67
71
# DocBook-to-man post-processing to fix a '\n' escape bug
68
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
69
73
 
70
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
74
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
71
75
        --param make.year.ranges                1 \
72
76
        --param make.single.year.ranges         1 \
73
77
        --param man.output.quietly              1 \
75
79
        --param citerefentry.link               1 \
76
80
        --output $@ \
77
81
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
78
 
        $<; $(HTMLPOST) $@
 
82
        $<; $(HTMLPOST) $@)
79
83
# Fix citerefentry links
80
84
HTMLPOST=$(SED) --in-place \
81
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'
82
86
 
83
87
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
84
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
88
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
89
        plugins.d/plymouth
85
90
CPROGS=plugin-runner $(PLUGINS)
86
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
87
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
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 \
88
94
        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
 
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
92
98
 
93
99
htmldocs=$(addsuffix .xhtml,$(DOCS))
94
100
 
115
121
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
116
122
        $(DOCBOOKTOHTML)
117
123
 
 
124
intro.8mandos: intro.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOMAN)
 
126
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
127
        $(DOCBOOKTOHTML)
 
128
 
118
129
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
119
130
                legalnotice.xml
120
131
        $(DOCBOOKTOMAN)
129
140
                 legalnotice.xml
130
141
        $(DOCBOOKTOHTML)
131
142
 
 
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
 
132
157
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
133
158
                legalnotice.xml
134
159
        $(DOCBOOKTOMAN)
156
181
 
157
182
# Update all these files with version number $(version)
158
183
common.ent: Makefile
159
 
        $(SED) --in-place \
 
184
        $(strip $(SED) --in-place \
160
185
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
161
 
                $@
 
186
                $@)
162
187
 
163
188
mandos: Makefile
164
 
        $(SED) --in-place \
 
189
        $(strip $(SED) --in-place \
165
190
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
191
                $@)
167
192
 
168
193
mandos-keygen: Makefile
169
 
        $(SED) --in-place \
 
194
        $(strip $(SED) --in-place \
170
195
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
196
                $@)
172
197
 
173
198
mandos-ctl: Makefile
174
 
        $(SED) --in-place \
175
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
 
                $@
 
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
                $@)
177
207
 
178
208
mandos.lsm: Makefile
179
 
        $(SED) --in-place \
 
209
        $(strip $(SED) --in-place \
180
210
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
181
 
                $@
182
 
        $(SED) --in-place \
 
211
                $@)
 
212
        $(strip $(SED) --in-place \
183
213
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
 
                $@
185
 
        $(SED) --in-place \
 
214
                $@)
 
215
        $(strip $(SED) --in-place \
186
216
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
 
217
                $@)
188
218
 
189
 
plugins.d/mandos-client: plugins.d/mandos-client.o
190
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
191
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
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 $@
192
222
 
193
223
.PHONY : all doc html clean distclean run-client run-server install \
194
224
        install-server install-client uninstall uninstall-server \
207
237
 
208
238
# Run the client with a local config and key
209
239
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 "###################################################################"
210
251
        ./plugin-runner --plugin-dir=plugins.d \
211
252
                --config-file=plugin-runner.conf \
212
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
241
282
install-server: doc
242
283
        install --directory $(CONFDIR)
243
284
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
285
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
286
                mandos-ctl
 
287
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
288
                mandos-monitor
244
289
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
245
290
                mandos.conf
246
291
        install --mode=u=rw --target-directory=$(CONFDIR) \
247
292
                clients.conf
 
293
        install --mode=u=rw,go=r dbus-mandos.conf \
 
294
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
248
295
        install --mode=u=rwx,go=rx init.d-mandos \
249
296
                $(DESTDIR)/etc/init.d/mandos
250
297
        install --mode=u=rw,go=r default-mandos \
254
301
        fi
255
302
        gzip --best --to-stdout mandos.8 \
256
303
                > $(MANDIR)/man8/mandos.8.gz
 
304
        gzip --best --to-stdout mandos-monitor.8 \
 
305
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
306
        gzip --best --to-stdout mandos-ctl.8 \
 
307
                > $(MANDIR)/man8/mandos-ctl.8.gz
257
308
        gzip --best --to-stdout mandos.conf.5 \
258
309
                > $(MANDIR)/man5/mandos.conf.5.gz
259
310
        gzip --best --to-stdout mandos-clients.conf.5 \
286
337
        install --mode=u=rwxs,go=rx \
287
338
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
288
339
                plugins.d/askpass-fifo
 
340
        install --mode=u=rwxs,go=rx \
 
341
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
342
                plugins.d/plymouth
289
343
        install initramfs-tools-hook \
290
344
                $(INITRAMFSTOOLS)/hooks/mandos
291
345
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
297
351
                > $(MANDIR)/man8/mandos-keygen.8.gz
298
352
        gzip --best --to-stdout plugin-runner.8mandos \
299
353
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
354
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
355
                > $(MANDIR)/man8/mandos-client.8mandos.gz
300
356
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
301
357
                > $(MANDIR)/man8/password-prompt.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
303
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
304
358
        gzip --best --to-stdout plugins.d/usplash.8mandos \
305
359
                > $(MANDIR)/man8/usplash.8mandos.gz
306
360
        gzip --best --to-stdout plugins.d/splashy.8mandos \
307
361
                > $(MANDIR)/man8/splashy.8mandos.gz
308
362
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
309
363
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
364
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
365
                > $(MANDIR)/man8/plymouth.8mandos.gz
310
366
 
311
367
install-client: install-client-nokey
312
368
# Post-installation stuff
318
374
 
319
375
uninstall-server:
320
376
        -rm --force $(PREFIX)/sbin/mandos \
 
377
                $(PREFIX)/sbin/mandos-ctl \
 
378
                $(PREFIX)/sbin/mandos-monitor \
321
379
                $(MANDIR)/man8/mandos.8.gz \
 
380
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
381
                $(MANDIR)/man8/mandos-ctl.8.gz \
322
382
                $(MANDIR)/man5/mandos.conf.5.gz \
323
383
                $(MANDIR)/man5/mandos-clients.conf.5.gz
324
384
        update-rc.d -f mandos remove
336
396
                $(PREFIX)/lib/mandos/plugins.d/usplash \
337
397
                $(PREFIX)/lib/mandos/plugins.d/splashy \
338
398
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
399
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
339
400
                $(INITRAMFSTOOLS)/hooks/mandos \
340
401
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
341
402
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
403
                $(MANDIR)/man8/mandos-keygen.8.gz \
342
404
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
343
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
405
                $(MANDIR)/man8/mandos-client.8mandos.gz
344
406
                $(MANDIR)/man8/password-prompt.8mandos.gz \
345
407
                $(MANDIR)/man8/usplash.8mandos.gz \
346
408
                $(MANDIR)/man8/splashy.8mandos.gz \
347
409
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
348
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
410
                $(MANDIR)/man8/plymouth.8mandos.gz \
349
411
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
350
412
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
351
413
        update-initramfs -k all -u
354
416
 
355
417
purge-server: uninstall-server
356
418
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
419
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
357
420
                $(DESTDIR)/etc/default/mandos \
358
421
                $(DESTDIR)/etc/init.d/mandos \
359
422
                $(DESTDIR)/var/run/mandos.pid