/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-12 02:51:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912025119-7vvpqofpnbxf7i22
Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

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
 
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
13
22
#COVERAGE=--coverage
14
23
OPTIMIZE=-Os
15
24
LANGUAGE=-std=gnu99
16
25
htmldir=man
17
 
version=1.0
 
26
version=1.0.14
18
27
SED=sed
19
28
 
20
29
## Use these settings for a traditional /usr/local install
33
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
34
43
##
35
44
 
36
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
37
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
38
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
39
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
40
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
41
 
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)
42
52
 
43
53
# Do not change these two
44
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
45
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
46
56
        -DVERSION='"$(version)"'
47
 
LDFLAGS=$(COVERAGE)
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
48
58
 
49
59
# Commands to format a DocBook <refentry> document into a manual page
50
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
51
61
        --param man.charmap.use.subset          0 \
52
62
        --param make.year.ranges                1 \
53
63
        --param make.single.year.ranges         1 \
55
65
        --param man.authors.section.enabled     0 \
56
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
57
67
        $(notdir $<); \
58
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
59
69
# DocBook-to-man post-processing to fix a '\n' escape bug
60
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
61
71
 
62
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
63
73
        --param make.year.ranges                1 \
64
74
        --param make.single.year.ranges         1 \
65
75
        --param man.output.quietly              1 \
67
77
        --param citerefentry.link               1 \
68
78
        --output $@ \
69
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
70
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
71
81
# Fix citerefentry links
72
 
HTMLPOST=$(SED) --in-place --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
HTMLPOST=$(SED) --in-place \
 
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'
73
84
 
74
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
75
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
76
87
CPROGS=plugin-runner $(PLUGINS)
77
 
PROGS=mandos mandos-keygen $(CPROGS)
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
78
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
79
90
        plugins.d/mandos-client.8mandos \
80
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
81
 
        mandos-clients.conf.5
 
92
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
93
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
82
94
 
83
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
84
96
 
85
97
objects=$(addsuffix .o,$(CPROGS))
86
98
 
87
 
all: $(PROGS)
 
99
all: $(PROGS) mandos.lsm
88
100
 
89
101
doc: $(DOCS)
90
102
 
146
158
 
147
159
# Update all these files with version number $(version)
148
160
common.ent: Makefile
149
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
161
        $(strip $(SED) --in-place \
 
162
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
163
                $@)
150
164
 
151
165
mandos: Makefile
152
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"/\1$(version)"/' $@
 
166
        $(strip $(SED) --in-place \
 
167
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
168
                $@)
153
169
 
154
170
mandos-keygen: Makefile
155
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"/\1$(version)"/' $@
156
 
 
157
 
plugins.d/mandos-client: plugins.d/mandos-client.o
158
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
159
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
171
        $(strip $(SED) --in-place \
 
172
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
173
                $@)
 
174
 
 
175
mandos-ctl: Makefile
 
176
        $(strip $(SED) --in-place \
 
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
178
                $@)
 
179
 
 
180
mandos.lsm: Makefile
 
181
        $(strip $(SED) --in-place \
 
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
183
                $@)
 
184
        $(strip $(SED) --in-place \
 
185
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
186
                $@)
 
187
        $(strip $(SED) --in-place \
 
188
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
189
                $@)
 
190
 
 
191
plugins.d/mandos-client: plugins.d/mandos-client.c
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
160
194
 
161
195
.PHONY : all doc html clean distclean run-client run-server install \
162
196
        install-server install-client uninstall uninstall-server \
175
209
 
176
210
# Run the client with a local config and key
177
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
212
        @echo "###################################################################"
 
213
        @echo "# The following error messages are harmless and can be safely     #"
 
214
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
215
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
216
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
217
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
218
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
219
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
220
        @echo "#                     seteuid: Operation not permitted            #"
 
221
        @echo "#                     klogctl: Operation not permitted            #"
 
222
        @echo "###################################################################"
178
223
        ./plugin-runner --plugin-dir=plugins.d \
179
224
                --config-file=plugin-runner.conf \
180
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
225
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
226
                $(CLIENTARGS)
181
227
 
182
228
# Used by run-client
183
229
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
186
232
 
187
233
# Run the server with a local config
188
234
run-server: confdir/mandos.conf confdir/clients.conf
189
 
        ./mandos --debug --configdir=confdir
 
235
        @echo "#################################################################"
 
236
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
 
237
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
 
238
        @echo "# they are harmless and are caused by the server not running as #"
 
239
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
 
240
        @echo "# not also unpack and compile it as root.                       #"
 
241
        @echo "#################################################################"
 
242
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
190
243
 
191
244
# Used by run-server
192
245
confdir/mandos.conf: mandos.conf
200
253
 
201
254
install: install-server install-client-nokey
202
255
 
203
 
install-html: $(htmldocs)
 
256
install-html: html
204
257
        install --directory $(htmldir)
205
258
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
206
259
                $(htmldocs)
258
311
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
259
312
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
260
313
        install initramfs-tools-script \
261
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
314
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
262
315
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
263
316
        gzip --best --to-stdout mandos-keygen.8 \
264
317
                > $(MANDIR)/man8/mandos-keygen.8.gz
268
321
                > $(MANDIR)/man8/password-prompt.8mandos.gz
269
322
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
270
323
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
324
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
325
                > $(MANDIR)/man8/usplash.8mandos.gz
 
326
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
327
                > $(MANDIR)/man8/splashy.8mandos.gz
 
328
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
329
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
271
330
 
272
331
install-client: install-client-nokey
273
332
# Post-installation stuff
296
355
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
297
356
                $(PREFIX)/lib/mandos/plugins.d/usplash \
298
357
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
358
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
299
359
                $(INITRAMFSTOOLS)/hooks/mandos \
300
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
301
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
361
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
302
362
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
303
363
                $(MANDIR)/man8/mandos-keygen.8.gz \
304
364
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
365
                $(MANDIR)/man8/usplash.8mandos.gz \
 
366
                $(MANDIR)/man8/splashy.8mandos.gz \
 
367
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
305
368
                $(MANDIR)/man8/mandos-client.8mandos.gz
306
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
307
 
                rm --force $(CONFDIR)/plugins.d/README; \
308
 
        fi
309
369
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
310
370
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
311
371
        update-initramfs -k all -u