/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-09-18 15:59:05 UTC
  • mfrom: (24.1.179 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110918155905-ngj2ig0yheralj1s
* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties.
* README: Refer to the installed manual page more simply.
* mandos (Client.extended_timeout, Client.expires): New attributes.
  (Client.extended_timeout_milliseconds): New.
  (Client.__init__, Client.enable, Client.disable): Set new attributes.
  (Client.checked_ok): Take new "timeout" argument.
  (ClientDBus.expires): Transform into a property which sends a D-Bus
                        signal when changed.
  (ClientDBus._datetime_to_dbus): Return empty D-Bus string on None.
                                  All callers changed to use this.

  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property,
  ClientDBus.Host_dbus_property, ClientDBus.Timeout_dbus_property,
  ClientDBus.Interval_dbus_property,
  ClientDBus.Checker_dbus_property): Bug fix: Only send D-Bus signal
                                     if new value is different.
  (ClientDBus.Timeout_dbus_property): Use new "expires" attribute.
  (ClientDBus.Expires_dbus_property,
  ClientDBus.ExtendedTimeout_dbus_property): New D-Bus properties.
  (ClientHandler.handle): Bump time using extended_timeout value.
  (main.client_defaults): Change default values of "timeout" and
                          "interval", added new default value for
                          "extended_timeout".
* mandos-clients.conf.xml (OPTIONS): Changed default values of
                                     "interval" and "timeout".  Add
                                     new "extended_timeout" option.
  (EXAMPLE): Updated default values.
* mandos-ctl: Show new "ExtendedTimeout" D-Bus property and change it
              using new "--extended-timeout" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new
                                      "--extended-timeout" option.
* mandos-monitor (MandosClientWidget.update): Use new "Expires" D-Bus
                                              property.
* mandos.xml (DESCRIPTION): Add reference to intro(8mandos) manual
                            page.
  (CHECKING): Refer to the new "extended_timeout" option in
  clients.conf.

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=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -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://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
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
15
22
#COVERAGE=--coverage
16
23
OPTIMIZE=-Os
17
24
LANGUAGE=-std=gnu99
18
25
htmldir=man
19
 
version=1.0.3
 
26
version=1.3.1
20
27
SED=sed
21
28
 
22
29
## Use these settings for a traditional /usr/local install
35
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
43
##
37
44
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
51
        getconf LFS_LDFLAGS)
44
52
 
45
53
# Do not change these two
46
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
56
        -DVERSION='"$(version)"'
49
 
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))
50
58
 
51
59
# Commands to format a DocBook <refentry> document into a manual page
52
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
53
61
        --param man.charmap.use.subset          0 \
54
62
        --param make.year.ranges                1 \
55
63
        --param make.single.year.ranges         1 \
57
65
        --param man.authors.section.enabled     0 \
58
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
59
67
        $(notdir $<); \
60
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
61
69
# DocBook-to-man post-processing to fix a '\n' escape bug
62
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
63
71
 
64
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
65
73
        --param make.year.ranges                1 \
66
74
        --param make.single.year.ranges         1 \
67
75
        --param man.output.quietly              1 \
69
77
        --param citerefentry.link               1 \
70
78
        --output $@ \
71
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
73
81
# Fix citerefentry links
74
82
HTMLPOST=$(SED) --in-place \
75
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'
76
84
 
77
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
 
        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
79
88
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
81
 
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 \
82
92
        plugins.d/mandos-client.8mandos \
83
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
84
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
85
 
        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
86
96
 
87
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
98
 
109
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
110
120
        $(DOCBOOKTOHTML)
111
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
 
112
127
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
113
128
                legalnotice.xml
114
129
        $(DOCBOOKTOMAN)
123
138
                 legalnotice.xml
124
139
        $(DOCBOOKTOHTML)
125
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
 
126
155
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
127
156
                legalnotice.xml
128
157
        $(DOCBOOKTOMAN)
150
179
 
151
180
# Update all these files with version number $(version)
152
181
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
 
182
        $(strip $(SED) --in-place \
 
183
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
184
                $@)
156
185
 
157
186
mandos: Makefile
158
 
        $(SED) --in-place \
 
187
        $(strip $(SED) --in-place \
159
188
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
 
189
                $@)
161
190
 
162
191
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
 
192
        $(strip $(SED) --in-place \
164
193
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
166
 
 
167
 
mandos-list: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
 
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
                $@)
171
205
 
172
206
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
 
207
        $(strip $(SED) --in-place \
174
208
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
 
209
                $@)
 
210
        $(strip $(SED) --in-place \
177
211
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
 
212
                $@)
 
213
        $(strip $(SED) --in-place \
180
214
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
 
215
                $@)
182
216
 
183
 
plugins.d/mandos-client: plugins.d/mandos-client.o
184
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
 
                $(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 $@
186
220
 
187
221
.PHONY : all doc html clean distclean run-client run-server install \
188
222
        install-server install-client uninstall uninstall-server \
201
235
 
202
236
# Run the client with a local config and key
203
237
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 "###################################################################"
204
249
        ./plugin-runner --plugin-dir=plugins.d \
205
250
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
252
                $(CLIENTARGS)
207
253
 
208
254
# Used by run-client
209
255
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
212
258
 
213
259
# Run the server with a local config
214
260
run-server: confdir/mandos.conf confdir/clients.conf
215
 
        ./mandos --debug --configdir=confdir
 
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)
216
268
 
217
269
# Used by run-server
218
270
confdir/mandos.conf: mandos.conf
234
286
install-server: doc
235
287
        install --directory $(CONFDIR)
236
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
237
293
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
238
294
                mandos.conf
239
295
        install --mode=u=rw --target-directory=$(CONFDIR) \
240
296
                clients.conf
 
297
        install --mode=u=rw,go=r dbus-mandos.conf \
 
298
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
241
299
        install --mode=u=rwx,go=rx init.d-mandos \
242
300
                $(DESTDIR)/etc/init.d/mandos
243
301
        install --mode=u=rw,go=r default-mandos \
247
305
        fi
248
306
        gzip --best --to-stdout mandos.8 \
249
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
250
312
        gzip --best --to-stdout mandos.conf.5 \
251
313
                > $(MANDIR)/man5/mandos.conf.5.gz
252
314
        gzip --best --to-stdout mandos-clients.conf.5 \
279
341
        install --mode=u=rwxs,go=rx \
280
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
281
343
                plugins.d/askpass-fifo
 
344
        install --mode=u=rwxs,go=rx \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
346
                plugins.d/plymouth
282
347
        install initramfs-tools-hook \
283
348
                $(INITRAMFSTOOLS)/hooks/mandos
284
349
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
285
350
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
286
351
        install initramfs-tools-script \
287
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
352
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
288
353
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
289
354
        gzip --best --to-stdout mandos-keygen.8 \
290
355
                > $(MANDIR)/man8/mandos-keygen.8.gz
291
356
        gzip --best --to-stdout plugin-runner.8mandos \
292
357
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
358
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
359
                > $(MANDIR)/man8/mandos-client.8mandos.gz
293
360
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
294
361
                > $(MANDIR)/man8/password-prompt.8mandos.gz
295
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
296
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
297
362
        gzip --best --to-stdout plugins.d/usplash.8mandos \
298
363
                > $(MANDIR)/man8/usplash.8mandos.gz
299
364
        gzip --best --to-stdout plugins.d/splashy.8mandos \
300
365
                > $(MANDIR)/man8/splashy.8mandos.gz
301
366
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
302
367
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
368
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
369
                > $(MANDIR)/man8/plymouth.8mandos.gz
303
370
 
304
371
install-client: install-client-nokey
305
372
# Post-installation stuff
311
378
 
312
379
uninstall-server:
313
380
        -rm --force $(PREFIX)/sbin/mandos \
 
381
                $(PREFIX)/sbin/mandos-ctl \
 
382
                $(PREFIX)/sbin/mandos-monitor \
314
383
                $(MANDIR)/man8/mandos.8.gz \
 
384
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
385
                $(MANDIR)/man8/mandos-ctl.8.gz \
315
386
                $(MANDIR)/man5/mandos.conf.5.gz \
316
387
                $(MANDIR)/man5/mandos-clients.conf.5.gz
317
388
        update-rc.d -f mandos remove
329
400
                $(PREFIX)/lib/mandos/plugins.d/usplash \
330
401
                $(PREFIX)/lib/mandos/plugins.d/splashy \
331
402
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
403
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
332
404
                $(INITRAMFSTOOLS)/hooks/mandos \
333
405
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
334
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
406
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
407
                $(MANDIR)/man8/mandos-keygen.8.gz \
335
408
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
336
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
409
                $(MANDIR)/man8/mandos-client.8mandos.gz
337
410
                $(MANDIR)/man8/password-prompt.8mandos.gz \
338
411
                $(MANDIR)/man8/usplash.8mandos.gz \
339
412
                $(MANDIR)/man8/splashy.8mandos.gz \
340
413
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
341
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
414
                $(MANDIR)/man8/plymouth.8mandos.gz \
342
415
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
343
416
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
344
417
        update-initramfs -k all -u
347
420
 
348
421
purge-server: uninstall-server
349
422
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
350
424
                $(DESTDIR)/etc/default/mandos \
351
425
                $(DESTDIR)/etc/init.d/mandos \
352
426
                $(DESTDIR)/var/run/mandos.pid