/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

  • Committer: Teddy Hogeborn
  • Date: 2008-09-30 07:23:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080930072339-jn15gyrtfpdk2dhx
* .bzrignore: Added "man" directory (created by "make install-html").

* Makefile: Add "common.ent" dependency to all manual pages.
  (htmldir, version, SED): New variables.
  (CFLAGS): Add -D option to define VERSION to $(version).
  (MANPOST, HTMLPOST): Use $(SED).
  (PROGS): Use $(CPROGS)
  (CPROGS): New; C-only programs.
  (objects): Use $(CPROGS).
  (common.ent, mandos, mandos-keygen): New targets; update version
                                       number to $(version).
  (clean): Use $(CPROGS).
  (check): Depend on "all".
  (install-html): Install to $(htmldir).

* common.ent: New file with "version" entity.

* mandos-clients.conf.xml: Use "common.ent".
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.xml: - '' -

* plugin-runner.c (argp_program_version): Use VERSION.
* plugins.d/mandos-client.c (argp_program_version): - '' -
* plugins.d/password-prompt.c (argp_program_version): - '' -

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=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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://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
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
22
13
#COVERAGE=--coverage
23
14
OPTIMIZE=-Os
24
15
LANGUAGE=-std=gnu99
25
16
htmldir=man
26
 
version=1.0.14
 
17
version=1.0
27
18
SED=sed
28
19
 
29
20
## Use these settings for a traditional /usr/local install
42
33
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
34
##
44
35
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
36
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
37
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
38
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
39
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
40
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
41
GPGME_LIBS=$(shell gpgme-config --libs)
52
42
 
53
43
# Do not change these two
54
44
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
45
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
46
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
LDFLAGS=$(COVERAGE)
58
48
 
59
49
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
50
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
51
        --param man.charmap.use.subset          0 \
62
52
        --param make.year.ranges                1 \
63
53
        --param make.single.year.ranges         1 \
65
55
        --param man.authors.section.enabled     0 \
66
56
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
57
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
58
        $(MANPOST) $(notdir $@)
69
59
# DocBook-to-man post-processing to fix a '\n' escape bug
70
60
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
61
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
62
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
63
        --param make.year.ranges                1 \
74
64
        --param make.single.year.ranges         1 \
75
65
        --param man.output.quietly              1 \
77
67
        --param citerefentry.link               1 \
78
68
        --output $@ \
79
69
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
70
        $<; $(HTMLPOST) $@
81
71
# Fix citerefentry links
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'
 
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'
84
73
 
85
74
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
75
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
87
76
CPROGS=plugin-runner $(PLUGINS)
88
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
77
PROGS=mandos mandos-keygen $(CPROGS)
89
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
90
79
        plugins.d/mandos-client.8mandos \
91
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
92
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
93
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
81
        mandos-clients.conf.5
94
82
 
95
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
96
84
 
97
85
objects=$(addsuffix .o,$(CPROGS))
98
86
 
99
 
all: $(PROGS) mandos.lsm
 
87
all: $(PROGS)
100
88
 
101
89
doc: $(DOCS)
102
90
 
158
146
 
159
147
# Update all these files with version number $(version)
160
148
common.ent: Makefile
161
 
        $(strip $(SED) --in-place \
162
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
163
 
                $@)
 
149
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
164
150
 
165
151
mandos: Makefile
166
 
        $(strip $(SED) --in-place \
167
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
168
 
                $@)
 
152
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"/\1$(version)"/' $@
169
153
 
170
154
mandos-keygen: Makefile
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 $@
 
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 $@
194
160
 
195
161
.PHONY : all doc html clean distclean run-client run-server install \
196
162
        install-server install-client uninstall uninstall-server \
209
175
 
210
176
# Run the client with a local config and key
211
177
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 "###################################################################"
223
178
        ./plugin-runner --plugin-dir=plugins.d \
224
179
                --config-file=plugin-runner.conf \
225
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
226
 
                $(CLIENTARGS)
 
180
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
227
181
 
228
182
# Used by run-client
229
183
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
232
186
 
233
187
# Run the server with a local config
234
188
run-server: confdir/mandos.conf confdir/clients.conf
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)
 
189
        ./mandos --debug --configdir=confdir
243
190
 
244
191
# Used by run-server
245
192
confdir/mandos.conf: mandos.conf
253
200
 
254
201
install: install-server install-client-nokey
255
202
 
256
 
install-html: html
 
203
install-html: $(htmldocs)
257
204
        install --directory $(htmldir)
258
205
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
259
206
                $(htmldocs)
311
258
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
312
259
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
313
260
        install initramfs-tools-script \
314
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
261
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
315
262
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
316
263
        gzip --best --to-stdout mandos-keygen.8 \
317
264
                > $(MANDIR)/man8/mandos-keygen.8.gz
321
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
322
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
323
270
                > $(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
330
271
 
331
272
install-client: install-client-nokey
332
273
# Post-installation stuff
355
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
356
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
357
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
358
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
359
299
                $(INITRAMFSTOOLS)/hooks/mandos \
360
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
361
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
362
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
363
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
364
304
                $(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 \
368
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
306
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
307
                rm --force $(CONFDIR)/plugins.d/README; \
 
308
        fi
369
309
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
370
310
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
371
311
        update-initramfs -k all -u