/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: 2009-11-01 00:10:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091101001028-hf4mbnoz1yum7bkf
* Makefile (BROKEN_PIE): Add comment.
* debian/rules (BROKEN_PIE): - '' -
* plugin-runner.c: Really always use <sysexits.h> exit codes.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes.
  (start_mandos_communication): Make sure errno is always set when
                                returning -1.

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 \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
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_LD += -fPIE
 
21
LINK_FORTIFY += -pie
 
22
endif
13
23
#COVERAGE=--coverage
14
24
OPTIMIZE=-Os
15
25
LANGUAGE=-std=gnu99
 
26
htmldir=man
 
27
version=1.0.14
 
28
SED=sed
16
29
 
17
30
## Use these settings for a traditional /usr/local install
18
31
# PREFIX=$(DESTDIR)/usr/local
19
 
# CONFDIR=$(PREFIX)/lib/mandos
20
 
# KEYDIR=$(PREFIX)/lib/mandos/keys
 
32
# CONFDIR=$(DESTDIR)/etc/mandos
 
33
# KEYDIR=$(DESTDIR)/etc/mandos/keys
21
34
# MANDIR=$(PREFIX)/man
22
 
# INITRAMFSTOOLS=/etc/initramfs-tools
 
35
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
36
##
23
37
 
 
38
## These settings are for a package-type install
24
39
PREFIX=$(DESTDIR)/usr
25
40
CONFDIR=$(DESTDIR)/etc/mandos
26
41
KEYDIR=$(DESTDIR)/etc/keys/mandos
27
42
MANDIR=$(PREFIX)/share/man
28
43
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
44
##
29
45
 
30
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
31
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
46
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
47
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
32
48
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
33
49
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
34
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
35
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
50
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
51
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
52
        getconf LFS_LDFLAGS)
36
53
 
37
54
# Do not change these two
38
55
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
39
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
40
 
LDFLAGS=$(COVERAGE)
 
56
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
57
        -DVERSION='"$(version)"'
 
58
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
41
59
 
42
60
# Commands to format a DocBook <refentry> document into a manual page
43
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
61
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
44
62
        --param man.charmap.use.subset          0 \
45
63
        --param make.year.ranges                1 \
46
64
        --param make.single.year.ranges         1 \
48
66
        --param man.authors.section.enabled     0 \
49
67
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
50
68
        $(notdir $<); \
51
 
        $(MANPOST) $(notdir $@)
 
69
        $(MANPOST) $(notdir $@))
52
70
# DocBook-to-man post-processing to fix a '\n' escape bug
53
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
54
 
 
55
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
56
 
PROGS=plugin-runner $(PLUGINS)
 
71
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
72
 
 
73
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
74
        --param make.year.ranges                1 \
 
75
        --param make.single.year.ranges         1 \
 
76
        --param man.output.quietly              1 \
 
77
        --param man.authors.section.enabled     0 \
 
78
        --param citerefentry.link               1 \
 
79
        --output $@ \
 
80
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 
81
        $<; $(HTMLPOST) $@)
 
82
# Fix citerefentry links
 
83
HTMLPOST=$(SED) --in-place \
 
84
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
85
 
 
86
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
87
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
88
CPROGS=plugin-runner $(PLUGINS)
 
89
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
57
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
58
91
        plugins.d/mandos-client.8mandos \
59
92
        plugins.d/password-prompt.8mandos mandos.conf.5 \
60
 
        mandos-clients.conf.5
61
 
 
62
 
objects=$(addsuffix .o,$(PROGS))
63
 
 
64
 
all: $(PROGS)
 
93
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
94
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
95
 
 
96
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
97
 
 
98
objects=$(addsuffix .o,$(CPROGS))
 
99
 
 
100
all: $(PROGS) mandos.lsm
65
101
 
66
102
doc: $(DOCS)
67
103
 
68
 
%.5: %.xml legalnotice.xml
69
 
        $(DOCBOOKTOMAN)
70
 
 
71
 
%.8: %.xml legalnotice.xml
72
 
        $(DOCBOOKTOMAN)
73
 
 
74
 
%.8mandos: %.xml legalnotice.xml
75
 
        $(DOCBOOKTOMAN)
76
 
 
77
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
78
 
        $(DOCBOOKTOMAN)
79
 
 
80
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
81
 
        $(DOCBOOKTOMAN)
82
 
 
83
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
84
 
        $(DOCBOOKTOMAN)
85
 
 
86
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
87
 
        $(DOCBOOKTOMAN)
 
104
html: $(htmldocs)
 
105
 
 
106
%.5: %.xml common.ent legalnotice.xml
 
107
        $(DOCBOOKTOMAN)
 
108
%.5.xhtml: %.xml common.ent legalnotice.xml
 
109
        $(DOCBOOKTOHTML)
 
110
 
 
111
%.8: %.xml common.ent legalnotice.xml
 
112
        $(DOCBOOKTOMAN)
 
113
%.8.xhtml: %.xml common.ent legalnotice.xml
 
114
        $(DOCBOOKTOHTML)
 
115
 
 
116
%.8mandos: %.xml common.ent legalnotice.xml
 
117
        $(DOCBOOKTOMAN)
 
118
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
119
        $(DOCBOOKTOHTML)
 
120
 
 
121
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
122
                legalnotice.xml
 
123
        $(DOCBOOKTOMAN)
 
124
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
125
                overview.xml legalnotice.xml
 
126
        $(DOCBOOKTOHTML)
 
127
 
 
128
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
129
                legalnotice.xml
 
130
        $(DOCBOOKTOMAN)
 
131
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
132
                 legalnotice.xml
 
133
        $(DOCBOOKTOHTML)
 
134
 
 
135
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
136
                legalnotice.xml
 
137
        $(DOCBOOKTOMAN)
 
138
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
139
                legalnotice.xml
 
140
        $(DOCBOOKTOHTML)
 
141
 
 
142
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
143
                legalnotice.xml
 
144
        $(DOCBOOKTOMAN)
 
145
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
146
                overview.xml legalnotice.xml
 
147
        $(DOCBOOKTOHTML)
88
148
 
89
149
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
150
                                        common.ent \
90
151
                                        mandos-options.xml \
91
152
                                        overview.xml legalnotice.xml
92
153
        $(DOCBOOKTOMAN)
93
 
 
94
 
plugins.d/mandos-client: plugins.d/mandos-client.o
95
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
96
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
97
 
 
98
 
.PHONY : all doc clean distclean run-client run-server install \
 
154
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
155
                                        common.ent \
 
156
                                        mandos-options.xml \
 
157
                                        overview.xml legalnotice.xml
 
158
        $(DOCBOOKTOHTML)
 
159
 
 
160
# Update all these files with version number $(version)
 
161
common.ent: Makefile
 
162
        $(strip $(SED) --in-place \
 
163
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
164
                $@)
 
165
 
 
166
mandos: Makefile
 
167
        $(strip $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@)
 
170
 
 
171
mandos-keygen: Makefile
 
172
        $(strip $(SED) --in-place \
 
173
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
174
                $@)
 
175
 
 
176
mandos-ctl: Makefile
 
177
        $(strip $(SED) --in-place \
 
178
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
179
                $@)
 
180
 
 
181
mandos.lsm: Makefile
 
182
        $(strip $(SED) --in-place \
 
183
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
184
                $@)
 
185
        $(strip $(SED) --in-place \
 
186
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
187
                $@)
 
188
        $(strip $(SED) --in-place \
 
189
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
190
                $@)
 
191
 
 
192
plugins.d/mandos-client: plugins.d/mandos-client.c
 
193
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
194
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
195
 
 
196
.PHONY : all doc html clean distclean run-client run-server install \
99
197
        install-server install-client uninstall uninstall-server \
100
198
        uninstall-client purge purge-server purge-client
101
199
 
102
200
clean:
103
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
201
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
104
202
 
105
203
distclean: clean
106
204
mostlyclean: clean
107
205
maintainer-clean: clean
108
206
        -rm --force --recursive keydir confdir
109
207
 
110
 
check:
 
208
check:  all
111
209
        ./mandos --check
112
210
 
113
211
# Run the client with a local config and key
114
212
run-client: all keydir/seckey.txt keydir/pubkey.txt
115
213
        ./plugin-runner --plugin-dir=plugins.d \
116
214
                --config-file=plugin-runner.conf \
117
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
215
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
216
                $(CLIENTARGS)
118
217
 
119
218
# Used by run-client
120
219
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
123
222
 
124
223
# Run the server with a local config
125
224
run-server: confdir/mandos.conf confdir/clients.conf
126
 
        ./mandos --debug --configdir=confdir
 
225
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
127
226
 
128
227
# Used by run-server
129
228
confdir/mandos.conf: mandos.conf
135
234
# Add a client password
136
235
        ./mandos-keygen --dir keydir --password >> $@
137
236
 
138
 
install: install-server install-client
 
237
install: install-server install-client-nokey
 
238
 
 
239
install-html: html
 
240
        install --directory $(htmldir)
 
241
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
242
                $(htmldocs)
139
243
 
140
244
install-server: doc
141
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
142
 
                $(MANDIR)/man8
 
245
        install --directory $(CONFDIR)
143
246
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
144
247
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
145
248
                mandos.conf
149
252
                $(DESTDIR)/etc/init.d/mandos
150
253
        install --mode=u=rw,go=r default-mandos \
151
254
                $(DESTDIR)/etc/default/mandos
152
 
        update-rc.d mandos defaults
 
255
        if [ -z $(DESTDIR) ]; then \
 
256
                update-rc.d mandos defaults 25 15;\
 
257
        fi
153
258
        gzip --best --to-stdout mandos.8 \
154
259
                > $(MANDIR)/man8/mandos.8.gz
155
260
        gzip --best --to-stdout mandos.conf.5 \
157
262
        gzip --best --to-stdout mandos-clients.conf.5 \
158
263
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
159
264
 
160
 
install-client: all doc $(INITRAMFSTOOLS)/hooks/.
161
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
162
 
                $(MANDIR)/man8
163
 
        install --directory --mode=u=rwx $(KEYDIR)
164
 
        install --directory --mode=u=rwx \
 
265
install-client-nokey: all doc
 
266
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
267
        install --directory --mode=u=rwx $(KEYDIR) \
165
268
                $(PREFIX)/lib/mandos/plugins.d
166
269
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
167
270
                install --mode=u=rwx \
168
271
                        --directory "$(CONFDIR)/plugins.d"; \
169
 
                install --mode=u=rw,go=r etc-plugins.d-README \
170
 
                        $(CONFDIR)/plugins.d/README ; \
171
272
        fi
172
273
        install --mode=u=rwx,go=rx \
173
274
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
179
280
        install --mode=u=rwxs,go=rx \
180
281
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
181
282
                plugins.d/mandos-client
182
 
        install --mode=u=rwx,go=rx \
 
283
        install --mode=u=rwxs,go=rx \
183
284
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
184
285
                plugins.d/usplash
 
286
        install --mode=u=rwxs,go=rx \
 
287
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
288
                plugins.d/splashy
 
289
        install --mode=u=rwxs,go=rx \
 
290
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
291
                plugins.d/askpass-fifo
185
292
        install initramfs-tools-hook \
186
293
                $(INITRAMFSTOOLS)/hooks/mandos
187
 
        install initramfs-tools-hook-conf \
 
294
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
188
295
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
189
296
        install initramfs-tools-script \
190
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
297
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
191
298
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
192
299
        gzip --best --to-stdout mandos-keygen.8 \
193
300
                > $(MANDIR)/man8/mandos-keygen.8.gz
197
304
                > $(MANDIR)/man8/password-prompt.8mandos.gz
198
305
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
199
306
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
307
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
308
                > $(MANDIR)/man8/usplash.8mandos.gz
 
309
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
310
                > $(MANDIR)/man8/splashy.8mandos.gz
 
311
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
312
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
313
 
 
314
install-client: install-client-nokey
200
315
# Post-installation stuff
201
316
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
202
317
        update-initramfs -k all -u
222
337
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
223
338
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
224
339
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
340
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
341
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
225
342
                $(INITRAMFSTOOLS)/hooks/mandos \
226
343
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
227
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
344
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
228
345
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
229
346
                $(MANDIR)/man8/mandos-keygen.8.gz \
230
347
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
348
                $(MANDIR)/man8/usplash.8mandos.gz \
 
349
                $(MANDIR)/man8/splashy.8mandos.gz \
 
350
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
231
351
                $(MANDIR)/man8/mandos-client.8mandos.gz
232
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
233
 
                rm --force $(CONFDIR)/plugins.d/README; \
234
 
        fi
235
352
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
236
353
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
237
354
        update-initramfs -k all -u