/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: 2010-09-26 17:36:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7
* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
 
LINK_FORTIFY_LD=-z relro -fPIE
15
 
LINK_FORTIFY=-pie
 
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
16
22
#COVERAGE=--coverage
17
23
OPTIMIZE=-Os
18
24
LANGUAGE=-std=gnu99
19
25
htmldir=man
20
 
version=1.0.12
 
26
version=1.0.14
21
27
SED=sed
22
28
 
23
29
## Use these settings for a traditional /usr/local install
51
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
52
58
 
53
59
# Commands to format a DocBook <refentry> document into a manual page
54
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
55
61
        --param man.charmap.use.subset          0 \
56
62
        --param make.year.ranges                1 \
57
63
        --param make.single.year.ranges         1 \
59
65
        --param man.authors.section.enabled     0 \
60
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
61
67
        $(notdir $<); \
62
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
63
69
# DocBook-to-man post-processing to fix a '\n' escape bug
64
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
65
71
 
66
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
67
73
        --param make.year.ranges                1 \
68
74
        --param make.single.year.ranges         1 \
69
75
        --param man.output.quietly              1 \
71
77
        --param citerefentry.link               1 \
72
78
        --output $@ \
73
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
74
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
75
81
# Fix citerefentry links
76
82
HTMLPOST=$(SED) --in-place \
77
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'
78
84
 
79
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
80
 
        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
81
88
CPROGS=plugin-runner $(PLUGINS)
82
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
83
 
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 \
84
92
        plugins.d/mandos-client.8mandos \
85
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
86
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
87
 
        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
88
96
 
89
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
90
98
 
125
133
                 legalnotice.xml
126
134
        $(DOCBOOKTOHTML)
127
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
 
128
150
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
129
151
                legalnotice.xml
130
152
        $(DOCBOOKTOMAN)
152
174
 
153
175
# Update all these files with version number $(version)
154
176
common.ent: Makefile
155
 
        $(SED) --in-place \
 
177
        $(strip $(SED) --in-place \
156
178
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
157
 
                $@
 
179
                $@)
158
180
 
159
181
mandos: Makefile
160
 
        $(SED) --in-place \
 
182
        $(strip $(SED) --in-place \
161
183
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
162
 
                $@
 
184
                $@)
163
185
 
164
186
mandos-keygen: Makefile
165
 
        $(SED) --in-place \
 
187
        $(strip $(SED) --in-place \
166
188
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
167
 
                $@
 
189
                $@)
168
190
 
169
191
mandos-ctl: Makefile
170
 
        $(SED) --in-place \
171
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
172
 
                $@
 
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
                $@)
173
200
 
174
201
mandos.lsm: Makefile
175
 
        $(SED) --in-place \
 
202
        $(strip $(SED) --in-place \
176
203
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
177
 
                $@
178
 
        $(SED) --in-place \
 
204
                $@)
 
205
        $(strip $(SED) --in-place \
179
206
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
180
 
                $@
181
 
        $(SED) --in-place \
 
207
                $@)
 
208
        $(strip $(SED) --in-place \
182
209
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
183
 
                $@
 
210
                $@)
184
211
 
185
 
plugins.d/mandos-client: plugins.d/mandos-client.o
186
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
187
 
                $(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 $@
188
215
 
189
216
.PHONY : all doc html clean distclean run-client run-server install \
190
217
        install-server install-client uninstall uninstall-server \
203
230
 
204
231
# Run the client with a local config and key
205
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 "###################################################################"
206
244
        ./plugin-runner --plugin-dir=plugins.d \
207
245
                --config-file=plugin-runner.conf \
208
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
215
253
 
216
254
# Run the server with a local config
217
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 "#################################################################"
218
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
219
263
 
220
264
# Used by run-server
237
281
install-server: doc
238
282
        install --directory $(CONFDIR)
239
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
240
288
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
241
289
                mandos.conf
242
290
        install --mode=u=rw --target-directory=$(CONFDIR) \
243
291
                clients.conf
 
292
        install --mode=u=rw,go=r dbus-mandos.conf \
 
293
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
244
294
        install --mode=u=rwx,go=rx init.d-mandos \
245
295
                $(DESTDIR)/etc/init.d/mandos
246
296
        install --mode=u=rw,go=r default-mandos \
250
300
        fi
251
301
        gzip --best --to-stdout mandos.8 \
252
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
253
307
        gzip --best --to-stdout mandos.conf.5 \
254
308
                > $(MANDIR)/man5/mandos.conf.5.gz
255
309
        gzip --best --to-stdout mandos-clients.conf.5 \
282
336
        install --mode=u=rwxs,go=rx \
283
337
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
284
338
                plugins.d/askpass-fifo
 
339
        install --mode=u=rwxs,go=rx \
 
340
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
341
                plugins.d/plymouth
285
342
        install initramfs-tools-hook \
286
343
                $(INITRAMFSTOOLS)/hooks/mandos
287
344
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
293
350
                > $(MANDIR)/man8/mandos-keygen.8.gz
294
351
        gzip --best --to-stdout plugin-runner.8mandos \
295
352
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
353
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
354
                > $(MANDIR)/man8/mandos-client.8mandos.gz
296
355
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
297
356
                > $(MANDIR)/man8/password-prompt.8mandos.gz
298
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
299
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
300
357
        gzip --best --to-stdout plugins.d/usplash.8mandos \
301
358
                > $(MANDIR)/man8/usplash.8mandos.gz
302
359
        gzip --best --to-stdout plugins.d/splashy.8mandos \
303
360
                > $(MANDIR)/man8/splashy.8mandos.gz
304
361
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
305
362
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
363
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
364
                > $(MANDIR)/man8/plymouth.8mandos.gz
306
365
 
307
366
install-client: install-client-nokey
308
367
# Post-installation stuff
314
373
 
315
374
uninstall-server:
316
375
        -rm --force $(PREFIX)/sbin/mandos \
 
376
                $(PREFIX)/sbin/mandos-ctl \
 
377
                $(PREFIX)/sbin/mandos-monitor \
317
378
                $(MANDIR)/man8/mandos.8.gz \
 
379
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
380
                $(MANDIR)/man8/mandos-ctl.8.gz \
318
381
                $(MANDIR)/man5/mandos.conf.5.gz \
319
382
                $(MANDIR)/man5/mandos-clients.conf.5.gz
320
383
        update-rc.d -f mandos remove
332
395
                $(PREFIX)/lib/mandos/plugins.d/usplash \
333
396
                $(PREFIX)/lib/mandos/plugins.d/splashy \
334
397
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
398
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
335
399
                $(INITRAMFSTOOLS)/hooks/mandos \
336
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
337
401
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
402
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
403
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
339
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
404
                $(MANDIR)/man8/mandos-client.8mandos.gz
340
405
                $(MANDIR)/man8/password-prompt.8mandos.gz \
341
406
                $(MANDIR)/man8/usplash.8mandos.gz \
342
407
                $(MANDIR)/man8/splashy.8mandos.gz \
343
408
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
344
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
409
                $(MANDIR)/man8/plymouth.8mandos.gz \
345
410
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
346
411
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
347
412
        update-initramfs -k all -u
350
415
 
351
416
purge-server: uninstall-server
352
417
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
418
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
353
419
                $(DESTDIR)/etc/default/mandos \
354
420
                $(DESTDIR)/etc/init.d/mandos \
355
421
                $(DESTDIR)/var/run/mandos.pid