/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

* mandos-monitor.xml: New.
* Makefile (PROGS): Add "mandos-monitor".
  (DOCS): Add "mandos-monitor.xml".
  (mandos-monitor.8, mandos-monitor.8.xhtml, mandos-monitor): New.
  (install-server): Install "mandos-ctl" and "mandos-monitor" too.
  (uninstall-server): Remove "mandos-ctl" and "mandos-monitor" too.
* mandos-monitor: Don't log uninteresting messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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.8
 
26
version=1.0.14
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
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
51
58
 
52
59
# Commands to format a DocBook <refentry> document into a manual page
53
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
54
61
        --param man.charmap.use.subset          0 \
55
62
        --param make.year.ranges                1 \
56
63
        --param make.single.year.ranges         1 \
58
65
        --param man.authors.section.enabled     0 \
59
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
60
67
        $(notdir $<); \
61
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
62
69
# DocBook-to-man post-processing to fix a '\n' escape bug
63
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
64
71
 
65
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
66
73
        --param make.year.ranges                1 \
67
74
        --param make.single.year.ranges         1 \
68
75
        --param man.output.quietly              1 \
70
77
        --param citerefentry.link               1 \
71
78
        --output $@ \
72
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
73
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
74
81
# Fix citerefentry links
75
82
HTMLPOST=$(SED) --in-place \
76
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'
77
84
 
78
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
79
 
        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
80
88
CPROGS=plugin-runner $(PLUGINS)
81
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
82
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
91
        mandos-monitor.8 \
83
92
        plugins.d/mandos-client.8mandos \
84
93
        plugins.d/password-prompt.8mandos mandos.conf.5 \
85
94
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
124
133
                 legalnotice.xml
125
134
        $(DOCBOOKTOHTML)
126
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
 
127
143
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
128
144
                legalnotice.xml
129
145
        $(DOCBOOKTOMAN)
151
167
 
152
168
# Update all these files with version number $(version)
153
169
common.ent: Makefile
154
 
        $(SED) --in-place \
 
170
        $(strip $(SED) --in-place \
155
171
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
156
 
                $@
 
172
                $@)
157
173
 
158
174
mandos: Makefile
159
 
        $(SED) --in-place \
 
175
        $(strip $(SED) --in-place \
160
176
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
161
 
                $@
 
177
                $@)
162
178
 
163
179
mandos-keygen: Makefile
164
 
        $(SED) --in-place \
 
180
        $(strip $(SED) --in-place \
165
181
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
182
                $@)
167
183
 
168
184
mandos-ctl: Makefile
169
 
        $(SED) --in-place \
170
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
185
        $(strip $(SED) --in-place \
 
186
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
187
                $@)
 
188
 
 
189
mandos-monitor: Makefile
 
190
        $(strip $(SED) --in-place \
 
191
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
192
                $@)
172
193
 
173
194
mandos.lsm: Makefile
174
 
        $(SED) --in-place \
 
195
        $(strip $(SED) --in-place \
175
196
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
176
 
                $@
177
 
        $(SED) --in-place \
 
197
                $@)
 
198
        $(strip $(SED) --in-place \
178
199
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
179
 
                $@
180
 
        $(SED) --in-place \
 
200
                $@)
 
201
        $(strip $(SED) --in-place \
181
202
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
182
 
                $@
 
203
                $@)
183
204
 
184
 
plugins.d/mandos-client: plugins.d/mandos-client.o
185
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
186
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
205
plugins.d/mandos-client: plugins.d/mandos-client.c
 
206
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
207
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
187
208
 
188
209
.PHONY : all doc html clean distclean run-client run-server install \
189
210
        install-server install-client uninstall uninstall-server \
202
223
 
203
224
# Run the client with a local config and key
204
225
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
226
        @echo "###################################################################"
 
227
        @echo "# The following error messages are harmless and can be safely     #"
 
228
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
229
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
230
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
231
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
232
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
233
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
234
        @echo "#                     seteuid: Operation not permitted            #"
 
235
        @echo "#                     klogctl: Operation not permitted            #"
 
236
        @echo "###################################################################"
205
237
        ./plugin-runner --plugin-dir=plugins.d \
206
238
                --config-file=plugin-runner.conf \
207
239
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
214
246
 
215
247
# Run the server with a local config
216
248
run-server: confdir/mandos.conf confdir/clients.conf
 
249
        @echo "#################################################################"
 
250
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
251
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
252
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
253
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
254
        @echo "#################################################################"
217
255
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
218
256
 
219
257
# Used by run-server
236
274
install-server: doc
237
275
        install --directory $(CONFDIR)
238
276
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
277
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
278
                mandos-ctl
 
279
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
280
                mandos-monitor
239
281
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
240
282
                mandos.conf
241
283
        install --mode=u=rw --target-directory=$(CONFDIR) \
242
284
                clients.conf
 
285
        install --mode=u=rw,go=r dbus-mandos.conf \
 
286
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
243
287
        install --mode=u=rwx,go=rx init.d-mandos \
244
288
                $(DESTDIR)/etc/init.d/mandos
245
289
        install --mode=u=rw,go=r default-mandos \
281
325
        install --mode=u=rwxs,go=rx \
282
326
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
283
327
                plugins.d/askpass-fifo
 
328
        install --mode=u=rwxs,go=rx \
 
329
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
330
                plugins.d/plymouth
284
331
        install initramfs-tools-hook \
285
332
                $(INITRAMFSTOOLS)/hooks/mandos
286
333
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
313
360
 
314
361
uninstall-server:
315
362
        -rm --force $(PREFIX)/sbin/mandos \
 
363
                $(PREFIX)/sbin/mandos-ctl \
 
364
                $(PREFIX)/sbin/mandos-monitor \
316
365
                $(MANDIR)/man8/mandos.8.gz \
317
366
                $(MANDIR)/man5/mandos.conf.5.gz \
318
367
                $(MANDIR)/man5/mandos-clients.conf.5.gz
331
380
                $(PREFIX)/lib/mandos/plugins.d/usplash \
332
381
                $(PREFIX)/lib/mandos/plugins.d/splashy \
333
382
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
383
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
334
384
                $(INITRAMFSTOOLS)/hooks/mandos \
335
385
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
336
386
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
349
399
 
350
400
purge-server: uninstall-server
351
401
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
402
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
352
403
                $(DESTDIR)/etc/default/mandos \
353
404
                $(DESTDIR)/etc/init.d/mandos \
354
405
                $(DESTDIR)/var/run/mandos.pid