/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

Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

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 -fPIE -pie
13
 
LINK_FORTIFY=-z relro -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
14
22
#COVERAGE=--coverage
15
23
OPTIMIZE=-Os
16
24
LANGUAGE=-std=gnu99
17
25
htmldir=man
18
 
version=1.0.3
 
26
version=1.0.14
19
27
SED=sed
20
28
 
21
29
## Use these settings for a traditional /usr/local install
34
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
35
43
##
36
44
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
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)
43
52
 
44
53
# Do not change these two
45
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
56
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
58
 
50
59
# Commands to format a DocBook <refentry> document into a manual page
51
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
52
61
        --param man.charmap.use.subset          0 \
53
62
        --param make.year.ranges                1 \
54
63
        --param make.single.year.ranges         1 \
56
65
        --param man.authors.section.enabled     0 \
57
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
67
        $(notdir $<); \
59
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
60
69
# DocBook-to-man post-processing to fix a '\n' escape bug
61
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
62
71
 
63
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
64
73
        --param make.year.ranges                1 \
65
74
        --param make.single.year.ranges         1 \
66
75
        --param man.output.quietly              1 \
68
77
        --param citerefentry.link               1 \
69
78
        --output $@ \
70
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
72
81
# Fix citerefentry links
73
82
HTMLPOST=$(SED) --in-place \
74
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
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
87
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
80
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
90
        plugins.d/mandos-client.8mandos \
82
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
149
158
 
150
159
# Update all these files with version number $(version)
151
160
common.ent: Makefile
152
 
        $(SED) --in-place \
153
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
154
 
                $@
 
161
        $(strip $(SED) --in-place \
 
162
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
163
                $@)
155
164
 
156
165
mandos: Makefile
157
 
        $(SED) --in-place \
 
166
        $(strip $(SED) --in-place \
158
167
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
159
 
                $@
 
168
                $@)
160
169
 
161
170
mandos-keygen: Makefile
162
 
        $(SED) --in-place \
 
171
        $(strip $(SED) --in-place \
163
172
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
 
                $@
 
173
                $@)
165
174
 
166
 
mandos-list: Makefile
167
 
        $(SED) --in-place \
 
175
mandos-ctl: Makefile
 
176
        $(strip $(SED) --in-place \
168
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@
 
178
                $@)
170
179
 
171
180
mandos.lsm: Makefile
172
 
        $(SED) --in-place \
 
181
        $(strip $(SED) --in-place \
173
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
174
 
                $@
175
 
        $(SED) --in-place \
 
183
                $@)
 
184
        $(strip $(SED) --in-place \
176
185
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
177
 
                $@
 
186
                $@)
 
187
        $(strip $(SED) --in-place \
 
188
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
189
                $@)
178
190
 
179
 
plugins.d/mandos-client: plugins.d/mandos-client.o
180
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
181
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
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 $@
182
194
 
183
195
.PHONY : all doc html clean distclean run-client run-server install \
184
196
        install-server install-client uninstall uninstall-server \
197
209
 
198
210
# Run the client with a local config and key
199
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 "###################################################################"
200
223
        ./plugin-runner --plugin-dir=plugins.d \
201
224
                --config-file=plugin-runner.conf \
202
 
                --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)
203
227
 
204
228
# Used by run-client
205
229
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
208
232
 
209
233
# Run the server with a local config
210
234
run-server: confdir/mandos.conf confdir/clients.conf
211
 
        ./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)
212
243
 
213
244
# Used by run-server
214
245
confdir/mandos.conf: mandos.conf
280
311
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
281
312
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
282
313
        install initramfs-tools-script \
283
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
314
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
284
315
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
285
316
        gzip --best --to-stdout mandos-keygen.8 \
286
317
                > $(MANDIR)/man8/mandos-keygen.8.gz
327
358
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
328
359
                $(INITRAMFSTOOLS)/hooks/mandos \
329
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
330
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
361
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
331
362
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
332
363
                $(MANDIR)/man8/mandos-keygen.8.gz \
333
364
                $(MANDIR)/man8/password-prompt.8mandos.gz \