/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: Björn Påhlsson
  • Date: 2011-09-18 14:28:47 UTC
  • mto: This revision was merged to the branch mainline in revision 497.
  • Revision ID: belorn@fukt.bsnet.se-20110918142847-wx9ru8lxxsc4timi
New feature:
extended timeout given once when password is sent to client

New dbus-API property (Expire):
Time and date when a client will be disabled

New dbus-API property (ExtendedTimeout):
The duration of extended timeout

Changed default values:
Timeout: Changed from 1 hour to 5 minutes
Interval: Changed from 5 minutes to 2 minutes

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.14
 
26
version=1.3.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 $@))
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 intro.8mandos
92
96
 
93
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
94
98
 
115
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
116
120
        $(DOCBOOKTOHTML)
117
121
 
 
122
intro.8mandos: intro.xml common.ent legalnotice.xml
 
123
        $(DOCBOOKTOMAN)
 
124
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOHTML)
 
126
 
118
127
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
119
128
                legalnotice.xml
120
129
        $(DOCBOOKTOMAN)
129
138
                 legalnotice.xml
130
139
        $(DOCBOOKTOHTML)
131
140
 
 
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
 
132
155
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
133
156
                legalnotice.xml
134
157
        $(DOCBOOKTOMAN)
156
179
 
157
180
# Update all these files with version number $(version)
158
181
common.ent: Makefile
159
 
        $(SED) --in-place \
 
182
        $(strip $(SED) --in-place \
160
183
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
161
 
                $@
 
184
                $@)
162
185
 
163
186
mandos: Makefile
164
 
        $(SED) --in-place \
 
187
        $(strip $(SED) --in-place \
165
188
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
189
                $@)
167
190
 
168
191
mandos-keygen: Makefile
169
 
        $(SED) --in-place \
 
192
        $(strip $(SED) --in-place \
170
193
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
194
                $@)
172
195
 
173
196
mandos-ctl: Makefile
174
 
        $(SED) --in-place \
175
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
 
                $@
 
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
                $@)
177
205
 
178
206
mandos.lsm: Makefile
179
 
        $(SED) --in-place \
 
207
        $(strip $(SED) --in-place \
180
208
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
181
 
                $@
182
 
        $(SED) --in-place \
 
209
                $@)
 
210
        $(strip $(SED) --in-place \
183
211
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
 
                $@
185
 
        $(SED) --in-place \
 
212
                $@)
 
213
        $(strip $(SED) --in-place \
186
214
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
 
215
                $@)
188
216
 
189
 
plugins.d/mandos-client: plugins.d/mandos-client.o
190
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
191
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
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 $@
192
220
 
193
221
.PHONY : all doc html clean distclean run-client run-server install \
194
222
        install-server install-client uninstall uninstall-server \
231
259
# Run the server with a local config
232
260
run-server: confdir/mandos.conf confdir/clients.conf
233
261
        @echo "#################################################################"
234
 
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
235
 
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
236
 
        @echo "# they are harmless and are caused by the server not running as #"
237
 
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
238
 
        @echo "# not also unpack and compile it as root.                       #"
 
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. #"
239
266
        @echo "#################################################################"
240
267
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
241
268
 
259
286
install-server: doc
260
287
        install --directory $(CONFDIR)
261
288
        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
262
293
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
263
294
                mandos.conf
264
295
        install --mode=u=rw --target-directory=$(CONFDIR) \
265
296
                clients.conf
 
297
        install --mode=u=rw,go=r dbus-mandos.conf \
 
298
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
266
299
        install --mode=u=rwx,go=rx init.d-mandos \
267
300
                $(DESTDIR)/etc/init.d/mandos
268
301
        install --mode=u=rw,go=r default-mandos \
272
305
        fi
273
306
        gzip --best --to-stdout mandos.8 \
274
307
                > $(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
275
312
        gzip --best --to-stdout mandos.conf.5 \
276
313
                > $(MANDIR)/man5/mandos.conf.5.gz
277
314
        gzip --best --to-stdout mandos-clients.conf.5 \
304
341
        install --mode=u=rwxs,go=rx \
305
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
306
343
                plugins.d/askpass-fifo
 
344
        install --mode=u=rwxs,go=rx \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
346
                plugins.d/plymouth
307
347
        install initramfs-tools-hook \
308
348
                $(INITRAMFSTOOLS)/hooks/mandos
309
349
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
315
355
                > $(MANDIR)/man8/mandos-keygen.8.gz
316
356
        gzip --best --to-stdout plugin-runner.8mandos \
317
357
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
358
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
359
                > $(MANDIR)/man8/mandos-client.8mandos.gz
318
360
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
319
361
                > $(MANDIR)/man8/password-prompt.8mandos.gz
320
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
321
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
322
362
        gzip --best --to-stdout plugins.d/usplash.8mandos \
323
363
                > $(MANDIR)/man8/usplash.8mandos.gz
324
364
        gzip --best --to-stdout plugins.d/splashy.8mandos \
325
365
                > $(MANDIR)/man8/splashy.8mandos.gz
326
366
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
327
367
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
368
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
369
                > $(MANDIR)/man8/plymouth.8mandos.gz
328
370
 
329
371
install-client: install-client-nokey
330
372
# Post-installation stuff
336
378
 
337
379
uninstall-server:
338
380
        -rm --force $(PREFIX)/sbin/mandos \
 
381
                $(PREFIX)/sbin/mandos-ctl \
 
382
                $(PREFIX)/sbin/mandos-monitor \
339
383
                $(MANDIR)/man8/mandos.8.gz \
 
384
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
385
                $(MANDIR)/man8/mandos-ctl.8.gz \
340
386
                $(MANDIR)/man5/mandos.conf.5.gz \
341
387
                $(MANDIR)/man5/mandos-clients.conf.5.gz
342
388
        update-rc.d -f mandos remove
354
400
                $(PREFIX)/lib/mandos/plugins.d/usplash \
355
401
                $(PREFIX)/lib/mandos/plugins.d/splashy \
356
402
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
403
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
357
404
                $(INITRAMFSTOOLS)/hooks/mandos \
358
405
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
359
406
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
407
                $(MANDIR)/man8/mandos-keygen.8.gz \
360
408
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
361
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
409
                $(MANDIR)/man8/mandos-client.8mandos.gz
362
410
                $(MANDIR)/man8/password-prompt.8mandos.gz \
363
411
                $(MANDIR)/man8/usplash.8mandos.gz \
364
412
                $(MANDIR)/man8/splashy.8mandos.gz \
365
413
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
366
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
414
                $(MANDIR)/man8/plymouth.8mandos.gz \
367
415
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
368
416
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
369
417
        update-initramfs -k all -u
372
420
 
373
421
purge-server: uninstall-server
374
422
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
375
424
                $(DESTDIR)/etc/default/mandos \
376
425
                $(DESTDIR)/etc/init.d/mandos \
377
426
                $(DESTDIR)/var/run/mandos.pid