/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Björn Påhlsson
  • Date: 2011-06-23 22:27:15 UTC
  • mto: (237.7.33 trunk)
  • mto: This revision was merged to the branch mainline in revision 284.
  • Revision ID: belorn@fukt.bsnet.se-20110623222715-q5wro9ma9iyjl367
* Makefile (CFLAGS): Added "-lrt" to include real time library.
* plugins.d/mandos-client.c: use scandir(3) instead of readdir(3)
                             Prefix all debug output with "Mandos plugin " + program_invocation_short_name
                             Retry servers that failed to provide password.
                             New option --retry SECONDS that sets the interval between rechecking.
                             --retry also controls how often it retries a server when using --connect.
* plugins.d/splashy.c:  Prefix all debug output with "Mandos plugin " + program_invocation_short_name
* plugins.d/usplash.c: --||--
* plugins.d/askpass-fifo.c: --||--
* plugins.d/password-prompt.c: --||--
* plugins.d/plymouth.c: --||--
* mandos: Lower logger level from warning to info on failed client requests because client was disabled or unknown fingerprint.
* plugins.d/plymouth.c (get_pid): bug fix. Was not calling free on direntries. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.0.14
 
26
version=1.3.0
27
27
SED=sed
28
28
 
29
29
## Use these settings for a traditional /usr/local install
53
53
# Do not change these two
54
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
 
        -DVERSION='"$(version)"'
 
56
        -lrt -DVERSION='"$(version)"'
57
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
58
 
59
59
# Commands to format a DocBook <refentry> document into a manual page
86
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
87
        plugins.d/plymouth
88
88
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
 
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 \
91
92
        plugins.d/mandos-client.8mandos \
92
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
93
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
94
 
        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
95
96
 
96
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
97
98
 
132
133
                 legalnotice.xml
133
134
        $(DOCBOOKTOHTML)
134
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
 
135
150
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
136
151
                legalnotice.xml
137
152
        $(DOCBOOKTOMAN)
178
193
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
194
                $@)
180
195
 
 
196
mandos-monitor: Makefile
 
197
        $(strip $(SED) --in-place \
 
198
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
199
                $@)
 
200
 
181
201
mandos.lsm: Makefile
182
202
        $(strip $(SED) --in-place \
183
203
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
261
281
install-server: doc
262
282
        install --directory $(CONFDIR)
263
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
264
288
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
265
289
                mandos.conf
266
290
        install --mode=u=rw --target-directory=$(CONFDIR) \
276
300
        fi
277
301
        gzip --best --to-stdout mandos.8 \
278
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
279
307
        gzip --best --to-stdout mandos.conf.5 \
280
308
                > $(MANDIR)/man5/mandos.conf.5.gz
281
309
        gzip --best --to-stdout mandos-clients.conf.5 \
322
350
                > $(MANDIR)/man8/mandos-keygen.8.gz
323
351
        gzip --best --to-stdout plugin-runner.8mandos \
324
352
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
353
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
354
                > $(MANDIR)/man8/mandos-client.8mandos.gz
325
355
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
326
356
                > $(MANDIR)/man8/password-prompt.8mandos.gz
327
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
328
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
329
357
        gzip --best --to-stdout plugins.d/usplash.8mandos \
330
358
                > $(MANDIR)/man8/usplash.8mandos.gz
331
359
        gzip --best --to-stdout plugins.d/splashy.8mandos \
332
360
                > $(MANDIR)/man8/splashy.8mandos.gz
333
361
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
334
362
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
363
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
364
                > $(MANDIR)/man8/plymouth.8mandos.gz
335
365
 
336
366
install-client: install-client-nokey
337
367
# Post-installation stuff
343
373
 
344
374
uninstall-server:
345
375
        -rm --force $(PREFIX)/sbin/mandos \
 
376
                $(PREFIX)/sbin/mandos-ctl \
 
377
                $(PREFIX)/sbin/mandos-monitor \
346
378
                $(MANDIR)/man8/mandos.8.gz \
 
379
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
380
                $(MANDIR)/man8/mandos-ctl.8.gz \
347
381
                $(MANDIR)/man5/mandos.conf.5.gz \
348
382
                $(MANDIR)/man5/mandos-clients.conf.5.gz
349
383
        update-rc.d -f mandos remove
365
399
                $(INITRAMFSTOOLS)/hooks/mandos \
366
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
367
401
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
402
                $(MANDIR)/man8/mandos-keygen.8.gz \
368
403
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
369
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
404
                $(MANDIR)/man8/mandos-client.8mandos.gz
370
405
                $(MANDIR)/man8/password-prompt.8mandos.gz \
371
406
                $(MANDIR)/man8/usplash.8mandos.gz \
372
407
                $(MANDIR)/man8/splashy.8mandos.gz \
373
408
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
374
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
409
                $(MANDIR)/man8/plymouth.8mandos.gz \
375
410
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
376
411
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
377
412
        update-initramfs -k all -u